From 08b9e054251fb8f05de6173ca1f71e90467547b6 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 21 Sep 2014 17:42:38 +0200 Subject: [PATCH 001/412] New Module : Manage Financial Loan --- htdocs/admin/loan.php | 119 ++++ htdocs/compta/loan/card.php | 467 ++++++++++++++ htdocs/compta/loan/class/index.html | 0 htdocs/compta/loan/class/loan.class.php | 477 ++++++++++++++ .../compta/loan/class/paymentloan.class.php | 603 ++++++++++++++++++ htdocs/compta/loan/document.php | 178 ++++++ htdocs/compta/loan/index.html | 0 htdocs/compta/loan/index.php | 208 ++++++ htdocs/compta/loan/info.php | 65 ++ htdocs/core/lib/loan.lib.php | 66 ++ htdocs/core/menus/standard/eldy.lib.php | 19 +- htdocs/core/modules/modLoan.class.php | 173 +++++ htdocs/install/mysql/tables/llx_loan.sql | 47 ++ .../install/mysql/tables/llx_payment_loan.sql | 33 + 14 files changed, 2450 insertions(+), 5 deletions(-) create mode 100644 htdocs/admin/loan.php create mode 100644 htdocs/compta/loan/card.php create mode 100644 htdocs/compta/loan/class/index.html create mode 100644 htdocs/compta/loan/class/loan.class.php create mode 100644 htdocs/compta/loan/class/paymentloan.class.php create mode 100644 htdocs/compta/loan/document.php create mode 100644 htdocs/compta/loan/index.html create mode 100644 htdocs/compta/loan/index.php create mode 100644 htdocs/compta/loan/info.php create mode 100644 htdocs/core/lib/loan.lib.php create mode 100644 htdocs/core/modules/modLoan.class.php create mode 100644 htdocs/install/mysql/tables/llx_loan.sql create mode 100644 htdocs/install/mysql/tables/llx_payment_loan.sql diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php new file mode 100644 index 00000000000..4cd22ef2c8c --- /dev/null +++ b/htdocs/admin/loan.php @@ -0,0 +1,119 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/** + * \file htdocs/admin/loan.php + * \ingroup loan + * \brief Setup page to configure loan module + */ + +require '../main.inc.php'; + +// Class +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; + +$langs->load("admin"); +$langs->load("loan"); + +// Security check +if (!$user->admin) + accessforbidden(); + +$action = GETPOST('action', 'alpha'); + +// Other parameters LOAN_* +$list = array ( + 'LOAN_ACCOUNTING_ACCOUNT_CAPITAL', + 'LOAN_ACCOUNTING_ACCOUNT_INTEREST', + 'LOAN_ACCOUNTING_ACCOUNT_INSURANCE' +); + +/* + * Actions + */ + +if ($action == 'update') +{ + $error = 0; + + foreach ($list as $constname) { + $constvalue = GETPOST($constname, 'alpha'); + + if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) { + $error++; + } + } + + if (! $error) + { + setEventMessage($langs->trans("SetupSaved")); + } + else + { + setEventMessage($langs->trans("Error"),'errors'); + } +} + +/* + * View + */ + +llxHeader(); + +$form = new Form($db); + +$linkback=''.$langs->trans("BackToModuleList").''; +print_fiche_titre($langs->trans('ConfigLoan'),$linkback,'setup'); + +print '
'; +print ''; +print ''; + +/* + * Params + */ +print ''; +print ''; +print ''; +print "\n"; + +foreach ($list as $key) +{ + $var=!$var; + + print ''; + + // Param + $label = $langs->trans($key); + print ''; + + // Value + print ''; +} + +print ''; + +print ''; +print "
' . $langs->trans('Options') . '
'; + print ''; + print '
\n"; + +print '
'; + +llxFooter(); +$db->close(); \ No newline at end of file diff --git a/htdocs/compta/loan/card.php b/htdocs/compta/loan/card.php new file mode 100644 index 00000000000..f8cf4d29327 --- /dev/null +++ b/htdocs/compta/loan/card.php @@ -0,0 +1,467 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/loan/card.php + * \ingroup loan + * \brief Loan card + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; + +$langs->load("compta"); +$langs->load("bills"); +$langs->load("loan"); + +$id=GETPOST('id','int'); +$action=GETPOST("action"); +$confirm=GETPOST('confirm'); + +// Security check +$socid = GETPOST('socid','int'); +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'loan', $id, '',''); + +/* + * Actions + */ + +// Classify paid +if ($action == 'confirm_paid' && $confirm == 'yes') +{ + $loan = new Loan($db); + $loan->fetch($id); + $result = $loan->set_paid($user); +} + +// Delete loan +if ($action == 'confirm_delete' && $confirm == 'yes') +{ + $loan = new Loan($db); + $loan->fetch($id); + $result=$loan->delete($user); + if ($result > 0) + { + header("Location: index.php"); + exit; + } + else + { + setEventMessage($loan->error, 'errors'); + } +} + + +// Add loan +if ($action == 'add' && $user->rights->loan->write) +{ + $dateech=@dol_mktime($_POST["echhour"],$_POST["echmin"],$_POST["echsec"],$_POST["echmonth"],$_POST["echday"],$_POST["echyear"]); + $dateperiod=@dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]); + if (! $dateech) + { + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors'); + $action = 'create'; + } + elseif (! $dateperiod) + { + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors'); + $action = 'create'; + } + elseif (! $_POST["capital"]) + { + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Capital")), 'errors'); + $action = 'create'; + } + else + { + $loan = new Loan($db); + + $loan->label = $_POST["label"]; + $loan->date_ech = $dateech; + $loan->periode = $dateperiod; + $loan->capital = $_POST["capital"]; + + $id=$loan->create($user); + if ($id <= 0) + { + setEventMessage($loan->error, 'errors'); + } + } +} + + +if ($action == 'update' && ! $_POST["cancel"] && $user->rights->loan->write) +{ + $dateech=dol_mktime($_POST["echhour"],$_POST["echmin"],$_POST["echsec"],$_POST["echmonth"],$_POST["echday"],$_POST["echyear"]); + $dateperiod=dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]); + if (! $dateech) + { + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors'); + $action = 'edit'; + } + elseif (! $dateperiod) + { + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors'); + $action = 'edit'; + } + else + { + $loan = new Loan($db); + $result=$loan->fetch($_GET["id"]); + + $loan->lib=$_POST["label"]; + $loan->date_ech=$dateech; + $loan->periode=$dateperiod; + + $result=$loan->update($user); + if ($result <= 0) + { + setEventMessage($loan->error, 'errors'); + } + } +} + + + +/* + * View + */ + +$form = new Form($db); + +$help_url='EN:Module_Loan|FR:Module Emprunt'; +llxHeader("",$langs->trans("Loan"),$help_url); + + +// Create mode +if ($action == 'create') +{ + //WYSIWYG Editor + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; + + print_fiche_titre($langs->trans("NewLoan")); + + $datec = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int')); + + print '
' . "\n"; + print ''; + print ''; + + print ''; + + // Label + print ''; + + // Bank account + if (! empty($conf->banque->enabled)) + { + print ''; + } + else + { + print ''; + } + + // Capital + print ''; + + // Date Start + print ""; + print ''; + + // Date End + print ""; + print ''; + + // Number of terms + print ''; + + // Rate + print ''; + + // Note + print ''; + print ''; + print ''; + print '
'.$langs->trans("Label").'
'.$langs->trans("Account").''; + $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Show list of bank account with courant + print '
'.$langs->trans("Account").''; + print $langs->trans("NoBankAccountDefined"); + print '
'.$langs->trans("Capital").'
'.$langs->trans("DateStart").''; + print $form->select_date($datestart?$datestart:-1,'','','','','add',1,1); + print '
'.$langs->trans("DateEnd").''; + print $form->select_date($dateend?$dateend:-1,'','','','','add',1,1); + print '
'.$langs->trans("Nbterms").'
'.$langs->trans("Rate").'
'.$langs->trans('Note').''; + + $doleditor = new DolEditor('note', GETPOST('note', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100); + print $doleditor->Create(1); + + print '
'; + + print '
'; + + // Accountancy + print ''; + + if ($conf->accounting->enabled) + { + print ''; + print ''; + + print ''; + print ''; + + print ''; + print ''; + } + else + { + print ''; + print ''; + + print ''; + print ''; + + print ''; + print ''; + } + + print '
'.$langs->trans("LoanAccountancyCapitalCode").''; + print '
'.$langs->trans("LoanAccountancyInsuranceCode").''; + print '
'.$langs->trans("LoanAccountancyInterestCode").''; + print '
'.$langs->trans("LoanAccountancyCapitalCode").''; + print '
'.$langs->trans("LoanAccountancyInsuranceCode").''; + print '
'.$langs->trans("LoanAccountancyInterestCode").''; + print '
'; + + print '
    '; + print ''; +} + +// View +if ($id > 0) +{ + $object = new Loan($db); + $result=$object->fetch($id); + + if ($result > 0) + { + $head=loan_prepare_head($object); + + dol_fiche_head($head, 'card', $langs->trans("Loan"),0,'bill'); + + // Confirm for loan + if ($action == 'paid') + { + $text=$langs->trans('ConfirmPayLoan'); + print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans('PayLoan'),$text,"confirm_paid",'','',2); + } + + if ($action == 'delete') + { + $text=$langs->trans('ConfirmDeleteLoan'); + print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('DeleteLoan'),$text,'confirm_delete','','',2); + } + + if ($action == 'edit') + { + print "id&action=update\" method=\"post\">"; + print ''; + } + + print ''; + + // Ref + print '"; + + // Label + if ($action == 'edit') + { + print ''; + } + else + { + print ''; + } + + $rowspan=5; + print '"; + + print ""; + + // Period end date + print ""; + print ""; + + // Due date + if ($action == 'edit') + { + print '"; + } + else { + print ""; + } + + // Amount + print ''; + + // Status + print ''; + + print '
'.$langs->trans("Ref").''; + print $form->showrefnav($object,'id'); + print "
'.$langs->trans("Label").''; + print ''; + print '
'.$langs->trans("Label").''.$object->label.'
'; + + /* + * Payments + */ + $sql = "SELECT p.rowid, p.num_payment, datep as dp, p.amount,"; + $sql.= "c.libelle as paiement_type"; + $sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p"; + $sql.= ", ".MAIN_DB_PREFIX."c_paiement as c "; + $sql.= ", ".MAIN_DB_PREFIX."loan as l"; + $sql.= " WHERE p.fk_loan = ".$id; + $sql.= " AND p.fk_loan = l.rowid"; + $sql.= " AND l.entity = ".$conf->entity; + $sql.= " AND p.fk_typepayment = c.id"; + $sql.= " ORDER BY dp DESC"; + + //print $sql; + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; $total = 0; + echo ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + $var=True; + while ($i < $num) + { + $objp = $db->fetch_object($resql); + $var=!$var; + print "'; + print '\n"; + print "\n"; + print '\n"; + print ""; + $totalpaye += $objp->amount; + $i++; + } + + if ($object->paye == 0) + { + print "\n"; + print "\n"; + + $resteapayer = $object->amount - $totalpaye; + + print ""; + print "\n"; + } + print "
'.$langs->trans("RefPayment").''.$langs->trans("Date").''.$langs->trans("Type").''.$langs->trans("Amount").' 
"; + print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."".$objp->paiement_type.' '.$objp->num_paiement."'.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AlreadyPaid")." :".price($totalpaye)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AmountExpected")." :".price($object->amount)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("RemainderToPay")." :".price($resteapayer)." ".$langs->trans("Currency".$conf->currency)."
"; + $db->free($resql); + } + else + { + dol_print_error($db); + } + print "
".$langs->trans("PeriodEndDate").""; + if ($action == 'edit') + { + print $form->select_date($object->periode, 'period', 0, 0, 0, 'charge', 1); + } + else + { + print dol_print_date($object->periode,"day"); + } + print "
'.$langs->trans("DateDue").""; + print $form->select_date($object->date_ech, 'ech', 0, 0, 0, 'charge', 1); + print "
".$langs->trans("DateDue")."".dol_print_date($object->date_ech,'day')."
'.$langs->trans("AmountTTC").''.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'
'.$langs->trans("Status").''.$object->getLibStatut(4, $totalpaye).'
'; + + if ($action == 'edit') + { + print '
'; + print ''; + print '   '; + print ''; + print '\n"; + + dol_fiche_end(); + + + /* + * Boutons actions + */ + if ($action != 'edit') + { + print "
\n"; + + // Edit + if ($user->rights->loan->write) + { + print "id&action=edit\">".$langs->trans("Modify").""; + } + + // Emettre paiement + if ($object->paye == 0 && ((price2num($object->amount) < 0 && round($resteapayer) < 0) || (price2num($object->amount) > 0 && round($resteapayer) > 0)) && $user->rights->loan->write) + { + print "id&action=create\">".$langs->trans("DoPayment").""; + } + + // Classify 'paid' + if ($object->paye == 0 && round($resteapayer) <=0 && $user->rights->loan->write) + { + print "id&action=paid\">".$langs->trans("ClassifyPaid").""; + } + + // Delete + if ($user->rights->loan->delete) + { + print "id&action=delete\">".$langs->trans("Delete").""; + } + + print "
"; + } + } + else + { + // Loan not find + dol_print_error('',$object->error); + } +} + + +llxFooter(); + +$db->close(); diff --git a/htdocs/compta/loan/class/index.html b/htdocs/compta/loan/class/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/compta/loan/class/loan.class.php b/htdocs/compta/loan/class/loan.class.php new file mode 100644 index 00000000000..74aed1d048b --- /dev/null +++ b/htdocs/compta/loan/class/loan.class.php @@ -0,0 +1,477 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/loan/class/loan.class.php + * \ingroup loan + * \brief Class for loan module + */ +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; + + +/** \class Loan + * \brief Class to manage loan + */ +class Loan extends CommonObject +{ + public $element='loan'; + public $table='loan'; + public $table_element='loan'; + + var $id; + var $ref; + var $date_start; + var $dateend; + var $label; + var $capital; + var $nbterm; + var $rate; + var $note; + var $account_capital; + var $account_insurance; + var $account_interest; + var $date_creation; + var $date_modification; + var $date_validation; + + + /** + * Constructor + * + * @param DoliDB $db Database handler + */ + function __construct($db) + { + $this->db = $db; + return 1; + } + + /** + * Load object in memory from database + * + * @param int $id id object + * @return void + */ + function fetch($id) + { + $sql = "SELECT l.rowid, l.datestart,"; + $sql.= " l.label, l.capital"; + $sql.= " FROM ".MAIN_DB_PREFIX."loan as l"; + $sql.= " WHERE l.rowid = ".$id; + + dol_syslog(get_class($this)."::fetch", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + if ($this->db->num_rows($resql)) + { + $obj = $this->db->fetch_object($resql); + + $this->id = $obj->rowid; + $this->ref = $obj->rowid; + $this->datestart = $this->db->jdate($obj->datestart); + $this->label = $obj->label; + $this->capital = $obj->capital; + + return 1; + } + else + { + return 0; + } + $this->db->free($resql); + } + else + { + $this->error=$this->db->lasterror(); + return -1; + } + } + + + /** + * Create a social contribution into database + * + * @param User $user User making creation + * @return int <0 if KO, id if OK + */ + function create($user) + { + global $conf; + + // clean parameters + $newcapital=price2num($this->capital,'MT'); + + // Validation parametres + if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode)) + { + $this->error="ErrorBadParameter"; + return -2; + } + + $this->db->begin(); + + $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, periode, amount, entity)"; + $sql.= " VALUES (".$this->type.",'".$this->db->escape($this->lib)."',"; + $sql.= " '".$this->db->idate($this->date_ech)."','".$this->db->idate($this->periode)."',"; + $sql.= " '".price2num($newamount)."',"; + $sql.= " ".$conf->entity; + $sql.= ")"; + + dol_syslog(get_class($this)."::create", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales"); + + //dol_syslog("ChargesSociales::create this->id=".$this->id); + $this->db->commit(); + return $this->id; + } + else + { + $this->error=$this->db->error(); + $this->db->rollback(); + return -1; + } + } + + + /** + * Delete a social contribution + * + * @param User $user Object user making delete + * @return int <0 if KO, >0 if OK + */ + function delete($user) + { + $error=0; + + $this->db->begin(); + + // Get bank transaction lines for this social contributions + include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; + $account=new Account($this->db); + $lines_url=$account->get_url('',$this->id,'sc'); + + // Delete bank urls + foreach ($lines_url as $line_url) + { + if (! $error) + { + $accountline=new AccountLine($this->db); + $accountline->fetch($line_url['fk_bank']); + $result=$accountline->delete_urls($user); + if ($result < 0) + { + $error++; + } + } + } + + // Delete payments + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge where fk_charge='".$this->id."'"; + dol_syslog(get_class($this)."::delete", LOG_DEBUG); + $resql=$this->db->query($sql); + if (! $resql) + { + $error++; + $this->error=$this->db->lasterror(); + } + } + + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales where rowid='".$this->id."'"; + dol_syslog(get_class($this)."::delete", LOG_DEBUG); + $resql=$this->db->query($sql); + if (! $resql) + { + $error++; + $this->error=$this->db->lasterror(); + } + } + + if (! $error) + { + $this->db->commit(); + return 1; + } + else + { + $this->db->rollback(); + return -1; + } + + } + + + /** + * Met a jour une charge sociale + * + * @param User $user Utilisateur qui modifie + * @return int <0 si erreur, >0 si ok + */ + function update($user) + { + $this->db->begin(); + + $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales"; + $sql.= " SET libelle='".$this->db->escape($this->lib)."',"; + $sql.= " date_ech='".$this->db->idate($this->date_ech)."',"; + $sql.= " periode='".$this->db->idate($this->periode)."'"; + $sql.= " WHERE rowid=".$this->id; + + dol_syslog(get_class($this)."::update", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + $this->db->commit(); + return 1; + } + else + { + $this->error=$this->db->error(); + $this->db->rollback(); + return -1; + } + } + + /** + * Enter description here ... + * + * @param int $year Year + * @return number + */ + function solde($year = 0) + { + global $conf; + + $sql = "SELECT SUM(f.amount) as amount"; + $sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as f"; + $sql.= " WHERE f.entity = ".$conf->entity; + $sql.= " AND paye = 0"; + + if ($year) { + $sql .= " AND f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' "; + } + + $result = $this->db->query($sql); + if ($result) + { + if ($this->db->num_rows($result)) + { + $obj = $this->db->fetch_object($result); + return $obj->amount; + } + else + { + return 0; + } + + $this->db->free($result); + + } + else + { + print $this->db->error(); + return -1; + } + } + + /** + * Tag social contribution as payed completely + * + * @param User $user Object user making change + * @return int <0 if KO, >0 if OK + */ + function set_paid($user) + { + $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET"; + $sql.= " paye = 1"; + $sql.= " WHERE rowid = ".$this->id; + $return = $this->db->query($sql); + if ($return) return 1; + else return -1; + } + + /** + * Retourne le libelle du statut d'une charge (impaye, payee) + * + * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long + * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) + * @return string Label + */ + function getLibStatut($mode=0,$alreadypaid=-1) + { + return $this->LibStatut($this->paye,$mode,$alreadypaid); + } + + /** + * Return label for given status + * + * @param int $statut Id statut + * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto + * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) + * @return string Label + */ + function LibStatut($statut,$mode=0,$alreadypaid=-1) + { + global $langs; + $langs->load('customers'); + $langs->load('bills'); + + if ($mode == 0) + { + if ($statut == 0) return $langs->trans("Unpaid"); + if ($statut == 1) return $langs->trans("Paid"); + } + if ($mode == 1) + { + if ($statut == 0) return $langs->trans("Unpaid"); + if ($statut == 1) return $langs->trans("Paid"); + } + if ($mode == 2) + { + if ($statut == 0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid"); + if ($statut == 0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted"); + if ($statut == 1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid"); + } + if ($mode == 3) + { + if ($statut == 0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1'); + if ($statut == 0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3'); + if ($statut == 1) return img_picto($langs->trans("Paid"), 'statut6'); + } + if ($mode == 4) + { + if ($statut == 0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid"); + if ($statut == 0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted"); + if ($statut == 1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid"); + } + if ($mode == 5) + { + if ($statut == 0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1'); + if ($statut == 0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3'); + if ($statut == 1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6'); + } + + return "Error, mode/status not found"; + } + + + /** + * Return clicable name (with eventually the picto) + * + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto + * @param int $maxlen Label max length + * @return string Chaine with URL + */ + function getNameUrl($withpicto=0,$maxlen=0) + { + global $langs; + + $result=''; + + if (empty($this->ref)) $this->ref=$this->lib; + + $lien = ''; + $lienfin=''; + + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowSocialContribution").': '.$this->lib,'bill').$lienfin.' '); + if ($withpicto && $withpicto != 2) $result.=' '; + if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin; + return $result; + } + + /** + * Return amount of payments already done + * + * @return int Amount of payment already done, <0 if KO + */ + function getSumPayment() + { + $table='payment_loan'; + $field='fk_loan'; + + $sql = 'SELECT sum(amount) as amount'; + $sql.= ' FROM '.MAIN_DB_PREFIX.$table; + $sql.= ' WHERE '.$field.' = '.$this->id; + + dol_syslog(get_class($this)."::getSumPayment", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + $amount=0; + + $obj = $this->db->fetch_object($resql); + if ($obj) $amount=$obj->amount?$obj->amount:0; + + $this->db->free($resql); + return $amount; + } + else + { + return -1; + } + } + + /** + * Information on record + * + * @param int $id Id of record + * @return void + */ + function info($id) + { + $sql = "SELECT l.rowid, l.tms as datem, l.datec as datec"; + $sql.= " FROM ".MAIN_DB_PREFIX."loan as l"; + $sql.= " WHERE l.rowid = ".$id; + + dol_syslog(get_class($this)."::info", LOG_DEBUG); + $result=$this->db->query($sql); + if ($result) + { + if ($this->db->num_rows($result)) + { + $obj = $this->db->fetch_object($result); + + $this->id = $obj->rowid; + + if ($obj->fk_user_author) { + $cuser = new User($this->db); + $cuser->fetch($obj->fk_user_author); + $this->user_creation = $cuser; + } + + $this->date_creation = $this->db->jdate($obj->datec); + $this->date_modification = $this->db->jdate($obj->datem); + + } + + $this->db->free($result); + + } + else + { + dol_print_error($this->db); + } + } +} + diff --git a/htdocs/compta/loan/class/paymentloan.class.php b/htdocs/compta/loan/class/paymentloan.class.php new file mode 100644 index 00000000000..972fa762b96 --- /dev/null +++ b/htdocs/compta/loan/class/paymentloan.class.php @@ -0,0 +1,603 @@ + + * Copyright (C) 2004-2007 Laurent Destailleur + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/sociales/class/paymentsocialcontribution.class.php + * \ingroup facture + * \brief File of class to manage payment of social contributions + */ + +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; + + +/** \class PaymentSocialContribution + * \brief Class to manage payments of social contributions + */ +class PaymentSocialContribution extends CommonObject +{ + public $element='paiementcharge'; //!< Id that identify managed objects + public $table_element='paiementcharge'; //!< Name of table without prefix where object is stored + + var $id; + var $ref; + + var $fk_charge; + var $datec=''; + var $tms=''; + var $datep=''; + var $amount; // Total amount of payment + var $amounts=array(); // Array of amounts + var $fk_typepaiement; + var $num_paiement; + var $note; + var $fk_bank; + var $fk_user_creat; + var $fk_user_modif; + + /** + * Constructor + * + * @param DoliDB $db Database handler + */ + function __construct($db) + { + $this->db = $db; + } + + /** + * Create payment of social contribution into database. + * Use this->amounts to have list of lines for the payment + * + * @param User $user User making payment + * @return int <0 if KO, id of payment if OK + */ + function create($user) + { + global $conf, $langs; + + $error=0; + + $now=dol_now(); + + // Validate parametres + if (! $this->datepaye) + { + $this->error='ErrorBadValueForParameter'; + return -1; + } + + // Clean parameters + if (isset($this->fk_charge)) $this->fk_charge=trim($this->fk_charge); + if (isset($this->amount)) $this->amount=trim($this->amount); + if (isset($this->fk_typepaiement)) $this->fk_typepaiement=trim($this->fk_typepaiement); + if (isset($this->num_paiement)) $this->num_paiement=trim($this->num_paiement); + if (isset($this->note)) $this->note=trim($this->note); + if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); + if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); + if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); + + $totalamount = 0; + foreach ($this->amounts as $key => $value) // How payment is dispatch + { + $newvalue = price2num($value,'MT'); + $this->amounts[$key] = $newvalue; + $totalamount += $newvalue; + } + $totalamount = price2num($totalamount); + + // Check parameters + if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null + + + $this->db->begin(); + + if ($totalamount != 0) + { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."paiementcharge (fk_charge, datec, datep, amount,"; + $sql.= " fk_typepaiement, num_paiement, note, fk_user_creat, fk_bank)"; + $sql.= " VALUES ($this->chid, '".$this->db->idate($now)."',"; + $sql.= " '".$this->db->idate($this->datepaye)."',"; + $sql.= " ".$totalamount.","; + $sql.= " ".$this->paiementtype.", '".$this->db->escape($this->num_paiement)."', '".$this->db->escape($this->note)."', ".$user->id.","; + $sql.= " 0)"; + + dol_syslog(get_class($this)."::create", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."paiementcharge"); + } + else + { + $error++; + } + + } + + if ($totalamount != 0 && ! $error) + { + $this->amount=$totalamount; + $this->total=$totalamount; // deprecated + $this->db->commit(); + return $this->id; + } + else + { + $this->error=$this->db->error(); + $this->db->rollback(); + return -1; + } + } + + /** + * Load object in memory from database + * + * @param int $id Id object + * @return int <0 if KO, >0 if OK + */ + function fetch($id) + { + global $langs; + $sql = "SELECT"; + $sql.= " t.rowid,"; + $sql.= " t.fk_charge,"; + $sql.= " t.datec,"; + $sql.= " t.tms,"; + $sql.= " t.datep,"; + $sql.= " t.amount,"; + $sql.= " t.fk_typepaiement,"; + $sql.= " t.num_paiement,"; + $sql.= " t.note,"; + $sql.= " t.fk_bank,"; + $sql.= " t.fk_user_creat,"; + $sql.= " t.fk_user_modif,"; + $sql.= " pt.code as type_code, pt.libelle as type_libelle,"; + $sql.= ' b.fk_account'; + $sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX."paiementcharge as t)"; + $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid'; + $sql.= " WHERE t.rowid = ".$id." AND t.fk_typepaiement = pt.id"; + + dol_syslog(get_class($this)."::fetch", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + if ($this->db->num_rows($resql)) + { + $obj = $this->db->fetch_object($resql); + + $this->id = $obj->rowid; + $this->ref = $obj->rowid; + + $this->fk_charge = $obj->fk_charge; + $this->datec = $this->db->jdate($obj->datec); + $this->tms = $this->db->jdate($obj->tms); + $this->datep = $this->db->jdate($obj->datep); + $this->amount = $obj->amount; + $this->fk_typepaiement = $obj->fk_typepaiement; + $this->num_paiement = $obj->num_paiement; + $this->note = $obj->note; + $this->fk_bank = $obj->fk_bank; + $this->fk_user_creat = $obj->fk_user_creat; + $this->fk_user_modif = $obj->fk_user_modif; + + $this->type_code = $obj->type_code; + $this->type_libelle = $obj->type_libelle; + + $this->bank_account = $obj->fk_account; + $this->bank_line = $obj->fk_bank; + } + $this->db->free($resql); + + return 1; + } + else + { + $this->error="Error ".$this->db->lasterror(); + return -1; + } + } + + + /** + * Update database + * + * @param User $user User that modify + * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @return int <0 if KO, >0 if OK + */ + function update($user=0, $notrigger=0) + { + global $conf, $langs; + $error=0; + + // Clean parameters + + if (isset($this->fk_charge)) $this->fk_charge=trim($this->fk_charge); + if (isset($this->amount)) $this->amount=trim($this->amount); + if (isset($this->fk_typepaiement)) $this->fk_typepaiement=trim($this->fk_typepaiement); + if (isset($this->num_paiement)) $this->num_paiement=trim($this->num_paiement); + if (isset($this->note)) $this->note=trim($this->note); + if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); + if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); + if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); + + + + // Check parameters + // Put here code to add control on parameters values + + // Update request + $sql = "UPDATE ".MAIN_DB_PREFIX."paiementcharge SET"; + + $sql.= " fk_charge=".(isset($this->fk_charge)?$this->fk_charge:"null").","; + $sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').","; + $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').","; + $sql.= " datep=".(dol_strlen($this->datep)!=0 ? "'".$this->db->idate($this->datep)."'" : 'null').","; + $sql.= " amount=".(isset($this->amount)?$this->amount:"null").","; + $sql.= " fk_typepaiement=".(isset($this->fk_typepaiement)?$this->fk_typepaiement:"null").","; + $sql.= " num_paiement=".(isset($this->num_paiement)?"'".$this->db->escape($this->num_paiement)."'":"null").","; + $sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").","; + $sql.= " fk_bank=".(isset($this->fk_bank)?$this->fk_bank:"null").","; + $sql.= " fk_user_creat=".(isset($this->fk_user_creat)?$this->fk_user_creat:"null").","; + $sql.= " fk_user_modif=".(isset($this->fk_user_modif)?$this->fk_user_modif:"null").""; + + + $sql.= " WHERE rowid=".$this->id; + + $this->db->begin(); + + dol_syslog(get_class($this)."::update", LOG_DEBUG); + $resql = $this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + + if (! $error) + { + if (! $notrigger) + { + // Uncomment this and change MYOBJECT to your own tag if you + // want this action call a trigger. + + //// Call triggers + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; + //$interface=new Interfaces($this->db); + //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); + //if ($result < 0) { $error++; $this->errors=$interface->errors; } + //// End call triggers + } + } + + // Commit or rollback + if ($error) + { + foreach($this->errors as $errmsg) + { + dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR); + $this->error.=($this->error?', '.$errmsg:$errmsg); + } + $this->db->rollback(); + return -1*$error; + } + else + { + $this->db->commit(); + return 1; + } + } + + + /** + * Delete object in database + * + * @param User $user User that delete + * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @return int <0 if KO, >0 if OK + */ + function delete($user, $notrigger=0) + { + global $conf, $langs; + $error=0; + + $this->db->begin(); + + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url"; + $sql.= " WHERE type='payment_sc' AND url_id=".$this->id; + + dol_syslog(get_class($this)."::delete", LOG_DEBUG); + $resql = $this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + } + + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge"; + $sql.= " WHERE rowid=".$this->id; + + dol_syslog(get_class($this)."::delete", LOG_DEBUG); + $resql = $this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + } + + if (! $error) + { + if (! $notrigger) + { + // Uncomment this and change MYOBJECT to your own tag if you + // want this action call a trigger. + + //// Call triggers + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; + //$interface=new Interfaces($this->db); + //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); + //if ($result < 0) { $error++; $this->errors=$interface->errors; } + //// End call triggers + } + } + + // Commit or rollback + if ($error) + { + foreach($this->errors as $errmsg) + { + dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR); + $this->error.=($this->error?', '.$errmsg:$errmsg); + } + $this->db->rollback(); + return -1*$error; + } + else + { + $this->db->commit(); + return 1; + } + } + + + + /** + * Load an object from its id and create a new one in database + * + * @param int $fromid Id of object to clone + * @return int New id of clone + */ + function createFromClone($fromid) + { + global $user,$langs; + + $error=0; + + $object=new PaymentSocialContribution($this->db); + + $this->db->begin(); + + // Load source object + $object->fetch($fromid); + $object->id=0; + $object->statut=0; + + // Clear fields + // ... + + // Create clone + $result=$object->create($user); + + // Other options + if ($result < 0) + { + $this->error=$object->error; + $error++; + } + + if (! $error) + { + + + + } + + // End + if (! $error) + { + $this->db->commit(); + return $object->id; + } + else + { + $this->db->rollback(); + return -1; + } + } + + + /** + * Initialise an instance with random values. + * Used to build previews or test instances. + * id must be 0 if object instance is a specimen. + * + * @return void + */ + function initAsSpecimen() + { + $this->id=0; + + $this->fk_charge=''; + $this->datec=''; + $this->tms=''; + $this->datep=''; + $this->amount=''; + $this->fk_typepaiement=''; + $this->num_paiement=''; + $this->note=''; + $this->fk_bank=''; + $this->fk_user_creat=''; + $this->fk_user_modif=''; + + + } + + + /** + * Add record into bank for payment with links between this bank record and invoices of payment. + * All payment properties must have been set first like after a call to create(). + * + * @param User $user Object of user making payment + * @param string $mode 'payment_sc' + * @param string $label Label to use in bank record + * @param int $accountid Id of bank account to do link with + * @param string $emetteur_nom Name of transmitter + * @param string $emetteur_banque Name of bank + * @return int <0 if KO, >0 if OK + */ + function addPaymentToBank($user,$mode,$label,$accountid,$emetteur_nom,$emetteur_banque) + { + global $conf; + + $error=0; + + if (! empty($conf->banque->enabled)) + { + require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; + + $acc = new Account($this->db); + $acc->fetch($accountid); + + $total=$this->total; + if ($mode == 'payment_sc') $total=-$total; + + // Insert payment into llx_bank + $bank_line_id = $acc->addline( + $this->datepaye, + $this->paiementtype, // Payment mode id or code ("CHQ or VIR for example") + $label, + $total, + $this->num_paiement, + '', + $user, + $emetteur_nom, + $emetteur_banque + ); + + // Mise a jour fk_bank dans llx_paiement. + // On connait ainsi le paiement qui a genere l'ecriture bancaire + if ($bank_line_id > 0) + { + $result=$this->update_fk_bank($bank_line_id); + if ($result <= 0) + { + $error++; + dol_print_error($this->db); + } + + // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction + $url=''; + if ($mode == 'payment_sc') $url=DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='; + if ($url) + { + $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode); + if ($result <= 0) + { + $error++; + dol_print_error($this->db); + } + } + + // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment) + $linkaddedforthirdparty=array(); + foreach ($this->amounts as $key => $value) + { + if ($mode == 'payment_sc') + { + $socialcontrib = new ChargeSociales($this->db); + $socialcontrib->fetch($key); + $result=$acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_libelle.(($socialcontrib->lib && $socialcontrib->lib!=$socialcontrib->type_libelle)?' ('.$socialcontrib->lib.')':''),'sc'); + if ($result <= 0) dol_print_error($this->db); + } + } + } + else + { + $this->error=$acc->error; + $error++; + } + } + + if (! $error) + { + return 1; + } + else + { + return -1; + } + } + + + /** + * Mise a jour du lien entre le paiement de charge et la ligne dans llx_bank generee + * + * @param int $id_bank Id if bank + * @return int >0 if OK, <=0 if KO + */ + function update_fk_bank($id_bank) + { + $sql = "UPDATE ".MAIN_DB_PREFIX."paiementcharge SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id; + + dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG); + $result = $this->db->query($sql); + if ($result) + { + return 1; + } + else + { + $this->error=$this->db->error(); + return 0; + } + } + + /** + * Renvoie nom clicable (avec eventuellement le picto) + * + * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $maxlen Longueur max libelle + * @return string Chaine avec URL + */ + function getNomUrl($withpicto=0,$maxlen=0) + { + global $langs; + + $result=''; + + if (empty($this->ref)) $this->ref=$this->lib; + + if (!empty($this->id)) + { + $lien = ''; + $lienfin=''; + + if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$lienfin.' '); + if ($withpicto && $withpicto != 2) $result.=' '; + if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin; + } + + return $result; + } +} + + diff --git a/htdocs/compta/loan/document.php b/htdocs/compta/loan/document.php new file mode 100644 index 00000000000..ad5af8f84c2 --- /dev/null +++ b/htdocs/compta/loan/document.php @@ -0,0 +1,178 @@ + + * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2005 Marc Barilley / Ocebo + * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2005 Simon TOSSER + * Copyright (C) 2011 Juanjo Menent + * Copyright (C) 2013 Cédric Salvador + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/sociales/document.php + * \ingroup tax + * \brief Page with attached files on social contributions + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; + +$langs->load("other"); +$langs->load("companies"); +$langs->load("compta"); +$langs->load("bills"); + +$id = GETPOST('id','int'); +$action = GETPOST("action"); +$confirm = GETPOST('confirm', 'alpha'); + +// Security check +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'tax', $id, 'chargesociales','charges'); + + +// Get parameters +$sortfield = GETPOST("sortfield",'alpha'); +$sortorder = GETPOST("sortorder",'alpha'); +$page = GETPOST("page",'int'); +if ($page == -1) { + $page = 0; +} +$offset = $conf->liste_limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; +if (! $sortorder) $sortorder="ASC"; +if (! $sortfield) $sortfield="name"; + + +$object = new ChargeSociales($db); +if ($id > 0) $object->fetch($id); + +$upload_dir = $conf->tax->dir_output.'/'.dol_sanitizeFileName($object->ref); +$modulepart='tax'; + + +/* + * Actions + */ + +include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; + + +/* + * View + */ + +$form = new Form($db); + +$help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:Módulo Impuestos y cargas sociales (IVA, impuestos)'; +llxHeader("",$langs->trans("SocialContribution"),$help_url); + +if ($object->id) +{ + $alreadypayed=$object->getSommePaiement(); + + $head=tax_prepare_head($object, $user); + + dol_fiche_head($head, 'documents', $langs->trans("SocialContribution"), 0, 'bill'); + + + // Construit liste des fichiers + $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); + $totalsize=0; + foreach($filearray as $key => $file) + { + $totalsize+=$file['size']; + } + + + print ''; + + // Ref + print '"; + + // Label + if ($action == 'edit') + { + print ''; + } + else + { + print ''; + } + + // Type + print ""; + + // Period end date + print ""; + print ""; + print ""; + + // Due date + if ($action == 'edit') + { + print '"; + } + else { + print ""; + } + + // Amount + print ''; + + // Status + print ''; + + print ''; + print ''; + print '
'.$langs->trans("Ref").''; + print $form->showrefnav($object,'id'); + print "
'.$langs->trans("Label").''; + print ''; + print '
'.$langs->trans("Label").''.$object->lib.'
".$langs->trans("Type")."".$object->type_libelle."
".$langs->trans("PeriodEndDate").""; + if ($action == 'edit') + { + print $form->select_date($object->periode, 'period', 0, 0, 0, 'charge', 1); + } + else + { + print dol_print_date($object->periode,"day"); + } + print "
'.$langs->trans("DateDue").""; + print $form->select_date($object->date_ech, 'ech', 0, 0, 0, 'charge', 1); + print "
".$langs->trans("DateDue")."".dol_print_date($object->date_ech,'day')."
'.$langs->trans("AmountTTC").''.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).'
'.$langs->trans("Status").''.$object->getLibStatut(4,$alreadypayed).'
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
'; + + print '
'; + + $modulepart = 'tax'; + $permission = $user->rights->tax->charges->creer; + $param = '&id=' . $object->id; + include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; +} +else +{ + print $langs->trans("ErrorUnknown"); +} + + +llxFooter(); + +$db->close(); diff --git a/htdocs/compta/loan/index.html b/htdocs/compta/loan/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/compta/loan/index.php b/htdocs/compta/loan/index.php new file mode 100644 index 00000000000..d84d1897c24 --- /dev/null +++ b/htdocs/compta/loan/index.php @@ -0,0 +1,208 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/loan/index.php + * \ingroup loan + * \brief Page to list all loans + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; + +$langs->load("loan"); +$langs->load("compta"); +$langs->load("banks"); +$langs->load("bills"); + +// Security check +$socid = isset($_GET["socid"])?$_GET["socid"]:''; +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'loan', '', '', ''); + +$sortfield = GETPOST("sortfield",'alpha'); +$sortorder = GETPOST("sortorder",'alpha'); +$page = GETPOST("page",'int'); +if ($page == -1) { $page = 0; } +$offset = $conf->liste_limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; +$limit = $conf->liste_limit; +if (! $sortfield) $sortfield="l.rowid"; +if (! $sortorder) $sortorder="DESC"; + +$year=$_GET["year"]; +$filtre=$_GET["filtre"]; + +/* + * View + */ + +$form = new Form($db); +$loan = new Loan($db); + +llxHeader(); + +$sql = "SELECT cs.rowid as id, cs.fk_type as type, "; +$sql.= " cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode,"; +$sql.= " c.libelle as type_lib,"; +$sql.= " SUM(pc.amount) as alreadypayed"; +$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,"; +$sql.= " ".MAIN_DB_PREFIX."chargesociales as cs"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid"; +$sql.= " WHERE cs.fk_type = c.id"; +$sql.= " AND cs.entity = ".$conf->entity; +if (GETPOST("search_label")) $sql.=" AND cs.libelle LIKE '%".$db->escape(GETPOST("search_label"))."%'"; +if ($year > 0) +{ + $sql .= " AND ("; + // Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance, + // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire + $sql .= " (cs.periode IS NOT NULL AND date_format(cs.periode, '%Y') = '".$year."') "; + $sql .= "OR (cs.periode IS NULL AND date_format(cs.date_ech, '%Y') = '".$year."')"; + $sql .= ")"; +} +if ($filtre) { + $filtre=str_replace(":","=",$filtre); + $sql .= " AND ".$filtre; +} +if ($typeid) { + $sql .= " AND cs.fk_type=".$typeid; +} +$sql.= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle"; +$sql.= $db->order($sortfield,$sortorder); +$sql.= $db->plimit($limit+1,$offset); + + +$resql=$db->query($sql); +if ($resql) +{ + $num = $db->num_rows($resql); + $i = 0; + $var=true; + + $param=''; + if ($year) $param.='&year='.$year; + if ($typeid) $param.='&typeid='.$typeid; + + if ($year) + { + print_fiche_titre($langs->trans("SocialContributions"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); + } + else + { + print_barre_liste($langs->trans("SocialContributions"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines); + } + + if (empty($mysoc->country_id) && empty($mysoc->country_code)) + { + print '
'; + $langs->load("errors"); + $countrynotdefined=$langs->trans("ErrorSetACountryFirst"); + print $countrynotdefined; + print '
'; + } + else + { + + print ''; + + print ""; + + print ""; + print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"cs.libelle","",$param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"periode","",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"cs.amount","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"cs.date_ech","",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cs.paye","",$param,'align="right"',$sortfield,$sortorder); + print "\n"; + + print ''; + print ''; + print ''; + // Type + print ''; + // Period end date + print ''; + print ''; + print ''; + print ''; + print "\n"; + + while ($i < min($num,$limit)) + { + $obj = $db->fetch_object($resql); + + $var = !$var; + print ""; + + // Ref + print ''; + + // Label + print ''; + + // Type + print ''; + + // Date end period + print ''; + + print ''; + + // Due date + print ''; + + print ''; + + print ''; + $i++; + } + + print '
 '; + $formsocialcontrib->select_type_socialcontrib($typeid,'typeid',1,16,0); + print '   '; + print ''; + print '
'; + $loan->id=$obj->id; + $loan->lib=$obj->id; + $loan->ref=$obj->id; + print $loan->getNomUrl(1,'20'); + print ''.dol_trunc($obj->libelle,42).''.dol_trunc($obj->type_lib,16).''; + if ($obj->periode) + { + print 'jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode),'day').''; + } + else + { + print ' '; + } + print ''.price($obj->amount).''.dol_print_date($db->jdate($obj->date_ech), 'day').''.$loan->LibStatut($obj->paye,5,$obj->alreadypayed).'
'; + + print ''; + } +} +else +{ + dol_print_error($db); +} + +$db->close(); + +llxFooter(); diff --git a/htdocs/compta/loan/info.php b/htdocs/compta/loan/info.php new file mode 100644 index 00000000000..c41787b7d08 --- /dev/null +++ b/htdocs/compta/loan/info.php @@ -0,0 +1,65 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/sociales/info.php + * \ingroup tax + * \brief Page with info about social contribution + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + +$langs->load("compta"); +$langs->load("bills"); + +$id=GETPOST('id','int'); +$action=GETPOST("action"); + +// Security check +$socid = GETPOST('socid','int'); +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'tax', $id, 'chargesociales','charges'); + + +/* + * View + */ + +$help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:Módulo Impuestos y cargas sociales (IVA, impuestos)'; +llxHeader("",$langs->trans("SocialContribution"),$help_url); + +$chargesociales = new ChargeSociales($db); +$chargesociales->fetch($id); +$chargesociales->info($id); + +$head = tax_prepare_head($chargesociales); + +dol_fiche_head($head, 'info', $langs->trans("SocialContribution"), 0, 'bill'); + + +print '
'; +dol_print_object_info($chargesociales); +print '
'; + +print ''; + +llxFooter(); + +$db->close(); diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php new file mode 100644 index 00000000000..58ebaef7bfd --- /dev/null +++ b/htdocs/core/lib/loan.lib.php @@ -0,0 +1,66 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/core/lib/loan.lib.php + * \ingroup loan + * \brief Library for loan module + */ + + +/** + * Prepare array with list of tabs + * + * @param Object $object Object related to tabs + * @return array Array of tabs to show + */ +function loan_prepare_head($object) +{ + global $langs, $conf; + + $h = 0; + $head = array(); + + $head[$h][0] = DOL_URL_ROOT.'/compta/loan/card.php?id='.$object->id; + $head[$h][1] = $langs->trans('Card'); + $head[$h][2] = 'card'; + $h++; + + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname); to remove a tab + complete_head_from_modules($conf,$langs,$object,$head,$h,'loan'); + + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + $upload_dir = $conf->loan->dir_output . "/" . dol_sanitizeFileName($object->ref); + $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); + $head[$h][0] = DOL_URL_ROOT.'/compta/loan/document.php?id='.$object->id; + $head[$h][1] = $langs->trans("Documents"); + if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + $head[$h][2] = 'documents'; + $h++; + + $head[$h][0] = DOL_URL_ROOT.'/compta/loan/info.php?id='.$object->id; + $head[$h][1] = $langs->trans("Info"); + $head[$h][2] = 'info'; + $h++; + + complete_head_from_modules($conf,$langs,$object,$head,$h,'loan','remove'); + + return $head; +} \ No newline at end of file diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 1d7aa1a5a9a..fd37ccacaf9 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -134,9 +134,9 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) } // Financial - $tmpentry=array('enabled'=>(! empty($conf->comptabilite->enabled) || ! empty($conf->accounting->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->don->enabled) || ! empty($conf->tax->enabled) || ! empty($conf->salaries->enabled)), - 'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->plancompte->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read)), - 'module'=>'comptabilite|accounting|facture|don|tax|salaries'); + $tmpentry=array('enabled'=>(! empty($conf->comptabilite->enabled) || ! empty($conf->accounting->enabled) || ! empty($conf->facture->enabled) || ! empty($conf->don->enabled) || ! empty($conf->tax->enabled) || ! empty($conf->salaries->enabled) || ! empty($conf->loan->enabled)), + 'perms'=>(! empty($user->rights->compta->resultat->lire) || ! empty($user->rights->accounting->plancompte->lire) || ! empty($user->rights->facture->lire) || ! empty($user->rights->don->lire) || ! empty($user->rights->tax->charges->lire) || ! empty($user->rights->salaries->read) || ! empty($user->rights->loan->read)), + 'module'=>'comptabilite|accounting|facture|don|tax|salaries|loan'); $showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal); if ($showmode) { @@ -802,11 +802,11 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu } // Taxes and social contributions - if (! empty($conf->tax->enabled) || ! empty($conf->salaries->enabled)) + if (! empty($conf->tax->enabled) || ! empty($conf->salaries->enabled) || ! empty($conf->loan->enabled)) { global $mysoc; - $permtoshowmenu=((! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)); + $permtoshowmenu=((! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read) || (! empty($conf->loan->enabled) && $user->rights->loan->read)); $newmenu->add("/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy",$langs->trans("MenuSpecialExpenses"), 0, $permtoshowmenu, '', $mainmenu, 'tax'); // Salaries @@ -817,6 +817,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (empty($leftmenu) || preg_match('/^tax_salary/i',$leftmenu)) $newmenu->add("/compta/salaries/fiche.php?leftmenu=tax_salary&action=create",$langs->trans("NewPayment"),2,$user->rights->salaries->write); if (empty($leftmenu) || preg_match('/^tax_salary/i',$leftmenu)) $newmenu->add("/compta/salaries/index.php?leftmenu=tax_salary",$langs->trans("Payments"),2,$user->rights->salaries->read); } + + // Loan + if (! empty($conf->loan->enabled)) + { + $langs->load("loan"); + $newmenu->add("/compta/loan/index.php?leftmenu=tax_loan&mainmenu=accountancy",$langs->trans("Loans"),1,$user->rights->loan->read, '', $mainmenu, 'tax_loan'); + if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/card.php?leftmenu=tax_loan&action=create",$langs->trans("NewLoan"),2,$user->rights->loan->write); + if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/index.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read); + } // Social contributions if (! empty($conf->tax->enabled)) diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php new file mode 100644 index 00000000000..fb2de1e3a02 --- /dev/null +++ b/htdocs/core/modules/modLoan.class.php @@ -0,0 +1,173 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \defgroup tax Module Loans + * \brief Module to include loans management + * \file htdocs/core/modules/modLoan.class.php + * \ingroup loan + * \brief File to activate module loan + */ +include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php'; + + +/** + * Class to manage loan module + */ +class modLoan extends DolibarrModules +{ + + /** + * Constructor. Define names, constants, directories, boxes, permissions + * + * @param DoliDB $db Database handler + */ + function __construct($db) + { + global $conf; + + $this->db = $db; + $this->numero = 520; + + $this->family = "financial"; + // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module) + $this->name = preg_replace('/^mod/i','',get_class($this)); + // Module description used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module) + $this->description = "Loans management"; + + // Possible values for version are: 'development', 'experimental', 'dolibarr' or version + $this->version = 'development'; + + $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name); + $this->special = 0; + $this->picto='bill'; + + // Data directories to create when module is enabled + $this->dirs = array("/loan/temp"); + + // Config pages + $this->config_page_url = array('loan.php'); + + // Dependances + $this->depends = array(); + $this->requiredby = array(); + $this->conflictwith = array(); + $this->langfiles = array("loan"); + + // Constants + $this->const = array(); + $this->const[0] = array( + "LOAN_ACCOUNTING_ACCOUNT_CAPITAL", + "chaine", + "164" + ); + $this->const[1] = array( + "LOAN_ACCOUNTING_ACCOUNT_INTEREST", + "chaine", + "6611" + ); + $this->const[1] = array( + "LOAN_ACCOUNTING_ACCOUNT_INSURANCE", + "chaine", + "6162" + ); + + // Boxes + $this->boxes = array(); + + // Permissions + $this->rights = array(); + $this->rights_class = 'loan'; + $r=0; + + $r++; + $this->rights[$r][0] = 520; + $this->rights[$r][1] = 'Read loans'; + $this->rights[$r][2] = 'r'; + $this->rights[$r][3] = 1; + $this->rights[$r][4] = 'read'; + $this->rights[$r][5] = ''; + + $r++; + $this->rights[$r][0] = 522; + $this->rights[$r][1] = 'Create/modify loans'; + $this->rights[$r][2] = 'w'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'write'; + $this->rights[$r][5] = ''; + + $r++; + $this->rights[$r][0] = 524; + $this->rights[$r][1] = 'Delete loans'; + $this->rights[$r][2] = 'd'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'delete'; + $this->rights[$r][5] = ''; + + $r++; + $this->rights[$r][0] = 527; + $this->rights[$r][1] = 'Export loans'; + $this->rights[$r][2] = 'r'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'export'; + $this->rights[$r][5] = ''; + + + // Exports + //-------- + $r=0; + + } + + + /** + * Function called when module is enabled. + * The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database. + * It also creates data directories + * + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO + */ + function init($options='') + { + global $conf; + + // Clean before activation + $this->remove($options); + + $sql = array(); + + return $this->_init($sql,$options); + } + + /** + * Function called when module is disabled. + * Remove from database constants, boxes and permissions from Dolibarr database. + * Data directories are not deleted + * + * @param string $options Options when enabling module ('', 'noboxes') + * @return int 1 if OK, 0 if KO + */ + function remove($options='') + { + $sql = array(); + + return $this->_remove($sql,$options); + } + +} diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql new file mode 100644 index 00000000000..2ca026ba417 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_loan.sql @@ -0,0 +1,47 @@ +-- ======================================================================== +-- Copyright (C) 2014 Alexandre Spangaro +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ======================================================================== + +create table llx_loan +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + entity integer DEFAULT 1 NOT NULL, + datec datetime, + tms timestamp, + + label varchar(80) NOT NULL, + fk_bank integer, + + capital real default 0 NOT NULL, + datestart date, + dateend date, + nbterm real, + rate double NOT NULL, + + note text, + + capital_position real default 0, -- If not a new loan, just have the position of capital + date_position date, + + accountancy_account_capital varchar(32), + accountancy_account_insurance varchar(32), + accountancy_account_interest varchar(32), + + fk_user_author integer DEFAULT NULL, + fk_user_modif integer DEFAULT NULL, + active tinyint DEFAULT 1 NOT NULL +)ENGINE=innodb; \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql new file mode 100644 index 00000000000..83bb3ac2548 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_payment_loan.sql @@ -0,0 +1,33 @@ +-- =================================================================== +-- Copyright (C) 2014 Alexandre Spangaro +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + +create table llx_payment_loan +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_loan integer, + datec datetime, -- creation date + tms timestamp, + datep datetime, -- payment date + amount real DEFAULT 0, + fk_typepayment integer NOT NULL, + num_payment varchar(50), + note text, + fk_bank integer NOT NULL, + fk_user_creat integer, -- creation user + fk_user_modif integer -- last modification user +)ENGINE=innodb; From 1409c8f4503c7f527f7faf538d7031bbbfdc6adc Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 21 Sep 2014 21:38:33 +0200 Subject: [PATCH 002/412] Continue to work --- htdocs/compta/loan/card.php | 40 +++++++++++++++---------- htdocs/compta/loan/class/loan.class.php | 22 +++++++------- 2 files changed, 35 insertions(+), 27 deletions(-) diff --git a/htdocs/compta/loan/card.php b/htdocs/compta/loan/card.php index f8cf4d29327..3e7ce94520a 100644 --- a/htdocs/compta/loan/card.php +++ b/htdocs/compta/loan/card.php @@ -24,6 +24,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("compta"); $langs->load("bills"); @@ -71,16 +72,16 @@ if ($action == 'confirm_delete' && $confirm == 'yes') // Add loan if ($action == 'add' && $user->rights->loan->write) { - $dateech=@dol_mktime($_POST["echhour"],$_POST["echmin"],$_POST["echsec"],$_POST["echmonth"],$_POST["echday"],$_POST["echyear"]); - $dateperiod=@dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]); - if (! $dateech) + $datestart=dol_mktime(12,0,0, $_POST["startmonth"], $_POST["startday"], $_POST["startyear"]); + $dateend=dol_mktime(12,0,0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]); + if (! $datestart) { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors'); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateStart")), 'errors'); $action = 'create'; } - elseif (! $dateperiod) + elseif (! $dateend) { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors'); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateEnd")), 'errors'); $action = 'create'; } elseif (! $_POST["capital"]) @@ -92,10 +93,17 @@ if ($action == 'add' && $user->rights->loan->write) { $loan = new Loan($db); - $loan->label = $_POST["label"]; - $loan->date_ech = $dateech; - $loan->periode = $dateperiod; - $loan->capital = $_POST["capital"]; + $loan->label = GETPOST("label"); + $loan->fk_bank = GETPOST("accountid"); + $loan->capital = GETPOST("capital"); + $loan->datestart = $datestart; + $loan->dateend = $dateend; + $loan->nbterm = GETPOST("nbterm"); + $loan->rate = GETPOST("rate"); + + $loan->account_capital = GETPOST("accountancy_account_capital"); + $loan->account_insurance = GETPOST("accountancy_account_insurance"); + $loan->account_interest = GETPOST("accountancy_account_interest"); $id=$loan->create($user); if ($id <= 0) @@ -125,9 +133,9 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->loan->write) $loan = new Loan($db); $result=$loan->fetch($_GET["id"]); - $loan->lib=$_POST["label"]; - $loan->date_ech=$dateech; - $loan->periode=$dateperiod; + $loan->label=$_POST["label"]; + $loan->datestart=$datestart; + $loan->dateend=$dateend; $result=$loan->update($user); if ($result <= 0) @@ -188,13 +196,13 @@ if ($action == 'create') // Date Start print ""; print ''.$langs->trans("DateStart").''; - print $form->select_date($datestart?$datestart:-1,'','','','','add',1,1); + print $form->select_date($datestart?$datestart:-1,'start','','','','add',1,1); print ''; // Date End print ""; print ''.$langs->trans("DateEnd").''; - print $form->select_date($dateend?$dateend:-1,'','','','','add',1,1); + print $form->select_date($dateend?$dateend:-1,'end','','','','add',1,1); print ''; // Number of terms @@ -430,7 +438,7 @@ if ($id > 0) // Edit if ($user->rights->loan->write) { - print "id&action=edit\">".$langs->trans("Modify").""; + print "id&action=edit\">".$langs->trans("Modify").""; } // Emettre paiement diff --git a/htdocs/compta/loan/class/loan.class.php b/htdocs/compta/loan/class/loan.class.php index 74aed1d048b..8b6bba2abf5 100644 --- a/htdocs/compta/loan/class/loan.class.php +++ b/htdocs/compta/loan/class/loan.class.php @@ -34,7 +34,7 @@ class Loan extends CommonObject var $id; var $ref; - var $date_start; + var $datestart; var $dateend; var $label; var $capital; @@ -116,8 +116,8 @@ class Loan extends CommonObject // clean parameters $newcapital=price2num($this->capital,'MT'); - // Validation parametres - if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode)) + // Check parameters + if (! $newcapital > 0 || empty($this->datestart) || empty($this->dateend)) { $this->error="ErrorBadParameter"; return -2; @@ -125,10 +125,10 @@ class Loan extends CommonObject $this->db->begin(); - $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, libelle, date_ech, periode, amount, entity)"; - $sql.= " VALUES (".$this->type.",'".$this->db->escape($this->lib)."',"; - $sql.= " '".$this->db->idate($this->date_ech)."','".$this->db->idate($this->periode)."',"; - $sql.= " '".price2num($newamount)."',"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."loan (label, date_ech, periode, amount, entity)"; + $sql.= " VALUES ('".$this->db->escape($this->label)."',"; + $sql.= " '".$this->db->idate($this->datestart)."','".$this->db->idate($this->dateend)."',"; + $sql.= " '".price2num($newcapital)."',"; $sql.= " ".$conf->entity; $sql.= ")"; @@ -136,9 +136,9 @@ class Loan extends CommonObject $resql=$this->db->query($sql); if ($resql) { - $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales"); + $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."loan"); - //dol_syslog("ChargesSociales::create this->id=".$this->id); + //dol_syslog("Loans::create this->id=".$this->id); $this->db->commit(); return $this->id; } @@ -152,7 +152,7 @@ class Loan extends CommonObject /** - * Delete a social contribution + * Delete a loan * * @param User $user Object user making delete * @return int <0 if KO, >0 if OK @@ -223,7 +223,7 @@ class Loan extends CommonObject /** - * Met a jour une charge sociale + * Update loan * * @param User $user Utilisateur qui modifie * @return int <0 si erreur, >0 si ok From f51df9da705e6f42230f03e4f787f3d836b951f1 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 22 Sep 2014 08:24:58 +0200 Subject: [PATCH 003/412] Add loan language file --- .tx/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.tx/config b/.tx/config index a89b56c1013..bf62f32d9d6 100644 --- a/.tx/config +++ b/.tx/config @@ -176,6 +176,12 @@ source_file = htdocs/langs/en_US/link.lang source_lang = en_US type = MOZILLAPROPERTIES +[dolibarr.loan] +file_filter = htdocs/langs//loan.lang +source_file = htdocs/langs/en_US/loan.lang +source_lang = en_US +type = MOZILLAPROPERTIES + [dolibarr.mailmanspip] file_filter = htdocs/langs//mailmanspip.lang source_file = htdocs/langs/en_US/mailmanspip.lang From c53663c8858801ba1002a2be7a27c9127e2b2366 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 22 Sep 2014 08:25:39 +0200 Subject: [PATCH 004/412] Continue to work --- htdocs/compta/loan/card.php | 174 +++++++++--------- htdocs/compta/loan/class/loan.class.php | 54 +++++- .../compta/loan/class/paymentloan.class.php | 6 +- htdocs/compta/loan/document.php | 77 ++++---- htdocs/compta/loan/info.php | 31 ++-- 5 files changed, 189 insertions(+), 153 deletions(-) diff --git a/htdocs/compta/loan/card.php b/htdocs/compta/loan/card.php index 3e7ce94520a..6b075e3d758 100644 --- a/htdocs/compta/loan/card.php +++ b/htdocs/compta/loan/card.php @@ -153,7 +153,7 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->loan->write) $form = new Form($db); -$help_url='EN:Module_Loan|FR:Module Emprunt'; +$help_url='EN:Module_Loan|FR:Module_Emprunt'; llxHeader("",$langs->trans("Loan"),$help_url); @@ -268,7 +268,7 @@ if ($action == 'create') if ($id > 0) { $object = new Loan($db); - $result=$object->fetch($id); + $result = $object->fetch($id); if ($result > 0) { @@ -313,101 +313,41 @@ if ($id > 0) { print ''.$langs->trans("Label").''.$object->label.''; } + + // Capital + print ''.$langs->trans("Capital").''.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).''; - $rowspan=5; - print ''; - - /* - * Payments - */ - $sql = "SELECT p.rowid, p.num_payment, datep as dp, p.amount,"; - $sql.= "c.libelle as paiement_type"; - $sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p"; - $sql.= ", ".MAIN_DB_PREFIX."c_paiement as c "; - $sql.= ", ".MAIN_DB_PREFIX."loan as l"; - $sql.= " WHERE p.fk_loan = ".$id; - $sql.= " AND p.fk_loan = l.rowid"; - $sql.= " AND l.entity = ".$conf->entity; - $sql.= " AND p.fk_typepayment = c.id"; - $sql.= " ORDER BY dp DESC"; - - //print $sql; - $resql = $db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; $total = 0; - echo ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - - $var=True; - while ($i < $num) - { - $objp = $db->fetch_object($resql); - $var=!$var; - print "'; - print '\n"; - print "\n"; - print '\n"; - print ""; - $totalpaye += $objp->amount; - $i++; - } - - if ($object->paye == 0) - { - print "\n"; - print "\n"; - - $resteapayer = $object->amount - $totalpaye; - - print ""; - print "\n"; - } - print "
'.$langs->trans("RefPayment").''.$langs->trans("Date").''.$langs->trans("Type").''.$langs->trans("Amount").' 
"; - print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."".$objp->paiement_type.' '.$objp->num_paiement."'.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AlreadyPaid")." :".price($totalpaye)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AmountExpected")." :".price($object->amount)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("RemainderToPay")." :".price($resteapayer)." ".$langs->trans("Currency".$conf->currency)."
"; - $db->free($resql); - } - else - { - dol_print_error($db); - } - print ""; - - print ""; - - // Period end date - print "".$langs->trans("PeriodEndDate").""; + // Date start + print "".$langs->trans("DateStart").""; print ""; if ($action == 'edit') { - print $form->select_date($object->periode, 'period', 0, 0, 0, 'charge', 1); + print $form->select_date($object->datestart, 'start', 0, 0, 0, 'update', 1); } else { - print dol_print_date($object->periode,"day"); + print dol_print_date($object->datestart,"day"); } print ""; - // Due date + // Date end + print "".$langs->trans("DateEnd").""; + print ""; if ($action == 'edit') { - print ''.$langs->trans("DateDue").""; - print $form->select_date($object->date_ech, 'ech', 0, 0, 0, 'charge', 1); - print ""; + print $form->select_date($object->dateend, 'end', 0, 0, 0, 'update', 1); } - else { - print "".$langs->trans("DateDue")."".dol_print_date($object->date_ech,'day').""; + else + { + print dol_print_date($object->dateend,"day"); } - - // Amount - print ''.$langs->trans("AmountTTC").''.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).''; + print ""; + + // Nbterms + print ''.$langs->trans("Nbterms").''.$object->nbterm.''; + + // Rate + print ''.$langs->trans("Rate").''.$object->rate.''; // Status print ''.$langs->trans("Status").''.$object->getLibStatut(4, $totalpaye).''; @@ -461,6 +401,74 @@ if ($id > 0) print ""; } + + print '
'; + print ''; + print '"; + print "
'; + + /* + * Payments + */ + $sql = "SELECT p.rowid, p.num_payment, datep as dp, p.amount,"; + $sql.= "c.libelle as paiement_type"; + $sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p"; + $sql.= ", ".MAIN_DB_PREFIX."c_paiement as c "; + $sql.= ", ".MAIN_DB_PREFIX."loan as l"; + $sql.= " WHERE p.fk_loan = ".$id; + $sql.= " AND p.fk_loan = l.rowid"; + $sql.= " AND l.entity = ".$conf->entity; + $sql.= " AND p.fk_typepayment = c.id"; + $sql.= " ORDER BY dp DESC"; + + //print $sql; + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; $total = 0; + echo ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + $var=True; + while ($i < $num) + { + $objp = $db->fetch_object($resql); + $var=!$var; + print "'; + print '\n"; + print "\n"; + print '\n"; + print ""; + $totalpaye += $objp->amount; + $i++; + } + + if ($object->paye == 0) + { + print "\n"; + print "\n"; + + $resteapayer = $object->amount - $totalpaye; + + print ""; + print "\n"; + } + print "
'.$langs->trans("RefPayment").''.$langs->trans("Date").''.$langs->trans("Type").''.$langs->trans("Amount").' 
"; + print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."".$objp->paiement_type.' '.$objp->num_paiement."'.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AlreadyPaid")." :".price($totalpaye)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AmountExpected")." :".price($object->amount)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("RemainderToPay")." :".price($resteapayer)." ".$langs->trans("Currency".$conf->currency)."
"; + $db->free($resql); + } + else + { + dol_print_error($db); + } + print "
"; } else { diff --git a/htdocs/compta/loan/class/loan.class.php b/htdocs/compta/loan/class/loan.class.php index 8b6bba2abf5..b63f9b32eff 100644 --- a/htdocs/compta/loan/class/loan.class.php +++ b/htdocs/compta/loan/class/loan.class.php @@ -47,6 +47,9 @@ class Loan extends CommonObject var $date_creation; var $date_modification; var $date_validation; + var $fk_bank; + var $fk_user_creat; + var $fk_user_modif; /** @@ -68,8 +71,7 @@ class Loan extends CommonObject */ function fetch($id) { - $sql = "SELECT l.rowid, l.datestart,"; - $sql.= " l.label, l.capital"; + $sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note"; $sql.= " FROM ".MAIN_DB_PREFIX."loan as l"; $sql.= " WHERE l.rowid = ".$id; @@ -84,8 +86,12 @@ class Loan extends CommonObject $this->id = $obj->rowid; $this->ref = $obj->rowid; $this->datestart = $this->db->jdate($obj->datestart); + $this->dateend = $this->db->jdate($obj->dateend); $this->label = $obj->label; $this->capital = $obj->capital; + $this->nbterm = $obj->nbterm; + $this->rate = $obj->rate; + $this->note = $obj->note; return 1; } @@ -112,9 +118,20 @@ class Loan extends CommonObject function create($user) { global $conf; + + $error=0; + + $now=dol_now(); // clean parameters $newcapital=price2num($this->capital,'MT'); + if (isset($this->note)) $this->note = trim($this->note); + if (isset($this->account_capital)) $this->account_capital = trim($this->account_capital); + if (isset($this->account_insurance)) $this->account_insurance = trim($this->account_insurance); + if (isset($this->account_interest)) $this->account_interest = trim($this->account_interest); + if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); + if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); + if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); // Check parameters if (! $newcapital > 0 || empty($this->datestart) || empty($this->dateend)) @@ -122,14 +139,31 @@ class Loan extends CommonObject $this->error="ErrorBadParameter"; return -2; } + if (($conf->accounting->enabled) && empty($this->account_capital) && empty($this->account_insurance) && empty($this->account_interest)) + { + $this->error="ErrorAccountingParameter"; + return -2; + } $this->db->begin(); - $sql = "INSERT INTO ".MAIN_DB_PREFIX."loan (label, date_ech, periode, amount, entity)"; - $sql.= " VALUES ('".$this->db->escape($this->label)."',"; - $sql.= " '".$this->db->idate($this->datestart)."','".$this->db->idate($this->dateend)."',"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."loan (label, fk_bank, capital, datestart, dateend, nbterm, rate, note"; + $sql.= " ,accountancy_account_capital, accountancy_account_insurance, accountancy_account_interest, entity"; + $sql.= " ,datec, fk_user_author)"; + $sql.= " VALUES ('".$this->db->escape($this->label)."',"; + $sql.= " '".$this->db->escape($this->fk_bank)."',"; $sql.= " '".price2num($newcapital)."',"; - $sql.= " ".$conf->entity; + $sql.= " '".$this->db->idate($this->datestart)."',"; + $sql.= " '".$this->db->idate($this->dateend)."',"; + $sql.= " '".$this->db->escape($this->nbterm)."',"; + $sql.= " '".$this->db->escape($this->rate)."',"; + $sql.= " '".$this->db->escape($this->note)."',"; + $sql.= " '".$this->db->escape($this->account_capital)."',"; + $sql.= " '".$this->db->escape($this->account_insurance)."',"; + $sql.= " '".$this->db->escape($this->account_interest)."',"; + $sql.= " ".$conf->entity.","; + $sql.= " '".$this->db->idate($now)."',"; + $sql.= " ".$user->id; $sql.= ")"; dol_syslog(get_class($this)."::create", LOG_DEBUG); @@ -440,7 +474,7 @@ class Loan extends CommonObject */ function info($id) { - $sql = "SELECT l.rowid, l.tms as datem, l.datec as datec"; + $sql = "SELECT l.rowid, l.tms as datem, l.fk_user_author as user_author, l.datec as datec"; $sql.= " FROM ".MAIN_DB_PREFIX."loan as l"; $sql.= " WHERE l.rowid = ".$id; @@ -454,10 +488,10 @@ class Loan extends CommonObject $this->id = $obj->rowid; - if ($obj->fk_user_author) { + if ($obj->user_author) { $cuser = new User($this->db); - $cuser->fetch($obj->fk_user_author); - $this->user_creation = $cuser; + $cuser->fetch($obj->user_author); + $this->user_creation = $cuser; } $this->date_creation = $this->db->jdate($obj->datec); diff --git a/htdocs/compta/loan/class/paymentloan.class.php b/htdocs/compta/loan/class/paymentloan.class.php index 972fa762b96..24d59fb417b 100644 --- a/htdocs/compta/loan/class/paymentloan.class.php +++ b/htdocs/compta/loan/class/paymentloan.class.php @@ -28,10 +28,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; /** \class PaymentSocialContribution * \brief Class to manage payments of social contributions */ -class PaymentSocialContribution extends CommonObject +class PaymentLoan extends CommonObject { - public $element='paiementcharge'; //!< Id that identify managed objects - public $table_element='paiementcharge'; //!< Name of table without prefix where object is stored + public $element='payment_loan'; //!< Id that identify managed objects + public $table_element='payment_loan'; //!< Name of table without prefix where object is stored var $id; var $ref; diff --git a/htdocs/compta/loan/document.php b/htdocs/compta/loan/document.php index ad5af8f84c2..022340270ad 100644 --- a/htdocs/compta/loan/document.php +++ b/htdocs/compta/loan/document.php @@ -1,11 +1,5 @@ - * Copyright (C) 2004-2014 Laurent Destailleur - * Copyright (C) 2005 Marc Barilley / Ocebo - * Copyright (C) 2005-2009 Regis Houssin - * Copyright (C) 2005 Simon TOSSER - * Copyright (C) 2011 Juanjo Menent - * Copyright (C) 2013 Cédric Salvador +/* Copyright (C) 2014 Alexandre Spangaro * * 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 @@ -22,22 +16,23 @@ */ /** - * \file htdocs/compta/sociales/document.php - * \ingroup tax - * \brief Page with attached files on social contributions + * \file htdocs/compta/loan/document.php + * \ingroup loan + * \brief Page with attached files on loan */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("other"); $langs->load("companies"); $langs->load("compta"); $langs->load("bills"); +$langs->load("loan"); $id = GETPOST('id','int'); $action = GETPOST("action"); @@ -45,8 +40,7 @@ $confirm = GETPOST('confirm', 'alpha'); // Security check if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'tax', $id, 'chargesociales','charges'); - +$result = restrictedArea($user, 'loan', $id, '',''); // Get parameters $sortfield = GETPOST("sortfield",'alpha'); @@ -61,12 +55,11 @@ $pagenext = $page + 1; if (! $sortorder) $sortorder="ASC"; if (! $sortfield) $sortfield="name"; - -$object = new ChargeSociales($db); +$object = new Loan($db); if ($id > 0) $object->fetch($id); -$upload_dir = $conf->tax->dir_output.'/'.dol_sanitizeFileName($object->ref); -$modulepart='tax'; +$upload_dir = $conf->loan->dir_output.'/'.dol_sanitizeFileName($object->ref); +$modulepart='loan'; /* @@ -82,16 +75,16 @@ include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php $form = new Form($db); -$help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:Módulo Impuestos y cargas sociales (IVA, impuestos)'; -llxHeader("",$langs->trans("SocialContribution"),$help_url); +$help_url='EN:Module_Loan|FR:Module_Emprunt'; +llxHeader("",$langs->trans("Loan"),$help_url); if ($object->id) { - $alreadypayed=$object->getSommePaiement(); + $alreadypayed=$object->getSumPayment(); - $head=tax_prepare_head($object, $user); + $head = loan_prepare_head($object, $user); - dol_fiche_head($head, 'documents', $langs->trans("SocialContribution"), 0, 'bill'); + dol_fiche_head($head, 'documents', $langs->trans("Loan"), 0, 'bill'); // Construit liste des fichiers @@ -114,44 +107,44 @@ if ($object->id) if ($action == 'edit') { print ''.$langs->trans("Label").''; - print ''; + print ''; print ''; } else { - print ''.$langs->trans("Label").''.$object->lib.''; + print ''.$langs->trans("Label").''.$object->label.''; } - // Type - print "".$langs->trans("Type")."".$object->type_libelle.""; + // Amount + print ''.$langs->trans("Capital").''.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).''; - // Period end date - print "".$langs->trans("PeriodEndDate").""; + // Date start + print "".$langs->trans("Datestart").""; print ""; if ($action == 'edit') { - print $form->select_date($object->periode, 'period', 0, 0, 0, 'charge', 1); + print $form->select_date($object->datestart, 'start', 0, 0, 0, 'loan', 1); } else { - print dol_print_date($object->periode,"day"); + print dol_print_date($object->datestart,"day"); } print ""; print ""; - // Due date + // Date end + print "".$langs->trans("Dateend").""; + print ""; if ($action == 'edit') { - print ''.$langs->trans("DateDue").""; - print $form->select_date($object->date_ech, 'ech', 0, 0, 0, 'charge', 1); - print ""; + print $form->select_date($object->dateend, 'end', 0, 0, 0, 'loan', 1); } - else { - print "".$langs->trans("DateDue")."".dol_print_date($object->date_ech,'day').""; + else + { + print dol_print_date($object->dateend,"day"); } - - // Amount - print ''.$langs->trans("AmountTTC").''.price($object->amount,0,$outputlangs,1,-1,-1,$conf->currency).''; + print ""; + print ""; // Status print ''.$langs->trans("Status").''.$object->getLibStatut(4,$alreadypayed).''; @@ -162,8 +155,8 @@ if ($object->id) print ''; - $modulepart = 'tax'; - $permission = $user->rights->tax->charges->creer; + $modulepart = 'loan'; + $permission = $user->rights->loan->write; $param = '&id=' . $object->id; include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; } diff --git a/htdocs/compta/loan/info.php b/htdocs/compta/loan/info.php index c41787b7d08..74319ba40b8 100644 --- a/htdocs/compta/loan/info.php +++ b/htdocs/compta/loan/info.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2014 Alexandre Spangaro * * 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 @@ -16,18 +16,19 @@ */ /** - * \file htdocs/compta/sociales/info.php - * \ingroup tax - * \brief Page with info about social contribution + * \file htdocs/compta/loan/info.php + * \ingroup loan + * \brief Page with info about loan */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; $langs->load("compta"); $langs->load("bills"); +$langs->load("loan"); $id=GETPOST('id','int'); $action=GETPOST("action"); @@ -35,27 +36,27 @@ $action=GETPOST("action"); // Security check $socid = GETPOST('socid','int'); if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'tax', $id, 'chargesociales','charges'); +$result = restrictedArea($user, 'loan', $id, '',''); /* * View */ -$help_url='EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:Módulo Impuestos y cargas sociales (IVA, impuestos)'; -llxHeader("",$langs->trans("SocialContribution"),$help_url); +$help_url='EN:Module_Loan|FR:Module_Emprunt'; +llxHeader("",$langs->trans("Loan"),$help_url); -$chargesociales = new ChargeSociales($db); -$chargesociales->fetch($id); -$chargesociales->info($id); +$loan = new Loan($db); +$loan->fetch($id); +$loan->info($id); -$head = tax_prepare_head($chargesociales); +$head = loan_prepare_head($loan); -dol_fiche_head($head, 'info', $langs->trans("SocialContribution"), 0, 'bill'); +dol_fiche_head($head, 'info', $langs->trans("Loan"), 0, 'bill'); print '
'; -dol_print_object_info($chargesociales); +dol_print_object_info($loan); print '
'; print ''; From 1e15474495ec854b1baa4a62d4a56720cc518800 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 23 Sep 2014 21:21:38 +0200 Subject: [PATCH 005/412] Continue working --- htdocs/compta/loan/class/loan.class.php | 10 +-- htdocs/compta/loan/index.php | 92 +++++++------------------ 2 files changed, 28 insertions(+), 74 deletions(-) diff --git a/htdocs/compta/loan/class/loan.class.php b/htdocs/compta/loan/class/loan.class.php index b63f9b32eff..afd15ced451 100644 --- a/htdocs/compta/loan/class/loan.class.php +++ b/htdocs/compta/loan/class/loan.class.php @@ -423,14 +423,14 @@ class Loan extends CommonObject $result=''; - if (empty($this->ref)) $this->ref=$this->lib; + if (empty($this->ref)) $this->ref=$this->label; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowSocialContribution").': '.$this->lib,'bill').$lienfin.' '); + if ($withpicto) $result.=($link.img_object($langs->trans("ShowLoan").': '.$this->label,'bill').$linkend.' '); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin; + if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend; return $result; } diff --git a/htdocs/compta/loan/index.php b/htdocs/compta/loan/index.php index d84d1897c24..41299668dd1 100644 --- a/htdocs/compta/loan/index.php +++ b/htdocs/compta/loan/index.php @@ -45,7 +45,6 @@ $limit = $conf->liste_limit; if (! $sortfield) $sortfield="l.rowid"; if (! $sortorder) $sortorder="DESC"; -$year=$_GET["year"]; $filtre=$_GET["filtre"]; /* @@ -57,33 +56,19 @@ $loan = new Loan($db); llxHeader(); -$sql = "SELECT cs.rowid as id, cs.fk_type as type, "; -$sql.= " cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode,"; -$sql.= " c.libelle as type_lib,"; -$sql.= " SUM(pc.amount) as alreadypayed"; -$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,"; -$sql.= " ".MAIN_DB_PREFIX."chargesociales as cs"; -$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid"; -$sql.= " WHERE cs.fk_type = c.id"; -$sql.= " AND cs.entity = ".$conf->entity; -if (GETPOST("search_label")) $sql.=" AND cs.libelle LIKE '%".$db->escape(GETPOST("search_label"))."%'"; -if ($year > 0) -{ - $sql .= " AND ("; - // Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance, - // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire - $sql .= " (cs.periode IS NOT NULL AND date_format(cs.periode, '%Y') = '".$year."') "; - $sql .= "OR (cs.periode IS NULL AND date_format(cs.date_ech, '%Y') = '".$year."')"; - $sql .= ")"; -} +$sql = "SELECT l.rowid as id, l.label, l.capital, l.datestart, l.dateend,"; +$sql.= " SUM(pl.amount) as alreadypayed"; +$sql.= " FROM ".MAIN_DB_PREFIX."loan as l,"; +$sql.= " ".MAIN_DB_PREFIX."payment_loan as pl"; +$sql.= " WHERE pl.fk_loan = l.rowid"; +$sql.= " AND l.entity = ".$conf->entity; +if (GETPOST("search_label")) $sql.=" AND l.label LIKE '%".$db->escape(GETPOST("search_label"))."%'"; + if ($filtre) { $filtre=str_replace(":","=",$filtre); $sql .= " AND ".$filtre; } -if ($typeid) { - $sql .= " AND cs.fk_type=".$typeid; -} -$sql.= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle"; + $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1,$offset); @@ -96,18 +81,9 @@ if ($resql) $var=true; $param=''; - if ($year) $param.='&year='.$year; - if ($typeid) $param.='&typeid='.$typeid; - - if ($year) - { - print_fiche_titre($langs->trans("SocialContributions"),($year?"".img_previous()." ".$langs->trans("Year")." $year ".img_next()."":"")); - } - else - { - print_barre_liste($langs->trans("SocialContributions"),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$totalnboflines); - } - + + print_fiche_titre($langs->trans("Loans")); + if (empty($mysoc->country_id) && empty($mysoc->country_code)) { print '
'; @@ -125,24 +101,16 @@ if ($resql) print ""; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"cs.libelle","",$param,'align="left"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"type","",$param,'align="left"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("PeriodEndDate"),$_SERVER["PHP_SELF"],"periode","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"cs.amount","",$param,'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateDue"),$_SERVER["PHP_SELF"],"cs.date_ech","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"cs.paye","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"l.label","",$param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Capital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"l.paid","",$param,'align="right"',$sortfield,$sortorder); print "\n"; print ''; print ' '; print ''; - // Type - print ''; - $formsocialcontrib->select_type_socialcontrib($typeid,'typeid',1,16,0); - print ''; - // Period end date print ' '; - print ' '; print ' '; print ''; print ''; @@ -161,33 +129,19 @@ if ($resql) $loan->id=$obj->id; $loan->lib=$obj->id; $loan->ref=$obj->id; - print $loan->getNomUrl(1,'20'); + print $loan->getNameUrl(1,'20'); print ''; // Label - print ''.dol_trunc($obj->libelle,42).''; + print ''.dol_trunc($obj->label,42).''; - // Type - print ''.dol_trunc($obj->type_lib,16).''; + // Capital + print ''.price($obj->capital).''; - // Date end period - print ''; - if ($obj->periode) - { - print 'jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode),'day').''; - } - else - { - print ' '; - } - print ''; + // Date start + print ''.dol_print_date($db->jdate($obj->datestart), 'day').''; - print ''.price($obj->amount).''; - - // Due date - print ''.dol_print_date($db->jdate($obj->date_ech), 'day').''; - - print ''.$loan->LibStatut($obj->paye,5,$obj->alreadypayed).''; + print ''.$loan->LibStatut($obj->paid,5,$obj->alreadypayed).''; print ''; $i++; From 3d23319226f5b4054151ba7d59fef1d2cdb76821 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 24 Sep 2014 04:10:29 +0200 Subject: [PATCH 006/412] Update --- htdocs/compta/loan/index.php | 103 +++++++++++++---------------- htdocs/compta/prelevement/list.php | 2 +- 2 files changed, 46 insertions(+), 59 deletions(-) diff --git a/htdocs/compta/loan/index.php b/htdocs/compta/loan/index.php index 41299668dd1..16b9a10c054 100644 --- a/htdocs/compta/loan/index.php +++ b/htdocs/compta/loan/index.php @@ -72,8 +72,8 @@ if ($filtre) { $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($limit+1,$offset); - $resql=$db->query($sql); + if ($resql) { $num = $db->num_rows($resql); @@ -84,73 +84,60 @@ if ($resql) print_fiche_titre($langs->trans("Loans")); - if (empty($mysoc->country_id) && empty($mysoc->country_code)) - { - print '
'; - $langs->load("errors"); - $countrynotdefined=$langs->trans("ErrorSetACountryFirst"); - print $countrynotdefined; - print '
'; - } - else + print '
'; + + print ""; + + print ""; + print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"l.label","",$param,'align="left"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Capital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"l.paid","",$param,'align="right"',$sortfield,$sortorder); + print "\n"; + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + + while ($i < min($num,$limit)) { + $obj = $db->fetch_object($resql); - print ''; + $var = !$var; + print ""; - print "
   '; + print ''; + print '
"; - - print ""; - print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"l.label","",$param,'align="left"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Capital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"l.paid","",$param,'align="right"',$sortfield,$sortorder); - print "\n"; - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; - while ($i < min($num,$limit)) - { - $obj = $db->fetch_object($resql); + // Label + print ''; - $var = !$var; - print ""; + // Capital + print ''; - // Ref - print ''; + // Date start + print ''; - // Label - print ''; + print ''; - // Capital - print ''; - - // Date start - print ''; - - print ''; - - print ''; - $i++; - } - - print '
   '; - print ''; + // Ref + print ''; + $loan->id=$obj->id; + $loan->label=$obj->id; + $loan->ref=$obj->id; + print $loan->getNameUrl(1,'20'); print '
'.dol_trunc($obj->label,42).'
'.price($obj->capital).''; - $loan->id=$obj->id; - $loan->lib=$obj->id; - $loan->ref=$obj->id; - print $loan->getNameUrl(1,'20'); - print ''.dol_print_date($db->jdate($obj->datestart), 'day').''.dol_trunc($obj->label,42).''.$loan->LibStatut($obj->paid,5,$obj->alreadypayed).''.price($obj->capital).''.dol_print_date($db->jdate($obj->datestart), 'day').''.$loan->LibStatut($obj->paid,5,$obj->alreadypayed).'
'; - - print '
'; + print ''; + $i++; } + + print ''; + print ''; } else { diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php index 819d879b098..0608ea70431 100644 --- a/htdocs/compta/prelevement/list.php +++ b/htdocs/compta/prelevement/list.php @@ -120,7 +120,7 @@ if ($result) print ' '; print ''; - print '
'; + print ''; print ''; print ''; print ''; From d3252d1348cb736fe4cd4e809f313f9f30f76d82 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 29 Sep 2014 20:37:51 +0200 Subject: [PATCH 007/412] Update --- htdocs/compta/loan/card.php | 86 +++-- htdocs/compta/loan/class/loan.class.php | 76 +--- .../compta/loan/class/paymentloan.class.php | 168 +++------ htdocs/compta/loan/index.php | 48 ++- htdocs/compta/loan/payment.php | 331 ++++++++++++++++++ .../install/mysql/migration/3.6.0-3.7.0.sql | 42 +++ htdocs/install/mysql/tables/llx_loan.sql | 2 + 7 files changed, 498 insertions(+), 255 deletions(-) create mode 100644 htdocs/compta/loan/payment.php diff --git a/htdocs/compta/loan/card.php b/htdocs/compta/loan/card.php index 6b075e3d758..b3e31324cb0 100644 --- a/htdocs/compta/loan/card.php +++ b/htdocs/compta/loan/card.php @@ -367,42 +367,6 @@ if ($id > 0) dol_fiche_end(); - - /* - * Boutons actions - */ - if ($action != 'edit') - { - print "
\n"; - - // Edit - if ($user->rights->loan->write) - { - print "id&action=edit\">".$langs->trans("Modify").""; - } - - // Emettre paiement - if ($object->paye == 0 && ((price2num($object->amount) < 0 && round($resteapayer) < 0) || (price2num($object->amount) > 0 && round($resteapayer) > 0)) && $user->rights->loan->write) - { - print "id&action=create\">".$langs->trans("DoPayment").""; - } - - // Classify 'paid' - if ($object->paye == 0 && round($resteapayer) <=0 && $user->rights->loan->write) - { - print "id&action=paid\">".$langs->trans("ClassifyPaid").""; - } - - // Delete - if ($user->rights->loan->delete) - { - print "id&action=delete\">".$langs->trans("Delete").""; - } - - print "
"; - } - - print '
'; print ''; print ''; + print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''; print '\n"; - print "\n"; + print "\n"; print '\n"; print ""; - $totalpaye += $objp->amount; + $totalpaid += $objp->amount; $i++; } - if ($object->paye == 0) + if ($object->paid == 0) { - print "\n"; - print "\n"; + print "\n"; + print "\n"; - $resteapayer = $object->amount - $totalpaye; + $staytopay = $object->capital - $totalpaid; print ""; - print "\n"; + print "\n"; } print "
'; @@ -441,24 +405,24 @@ if ($id > 0) $objp = $db->fetch_object($resql); $var=!$var; print "
"; - print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."".$objp->paiement_type.' '.$objp->num_paiement."".$objp->paiement_type.' '.$objp->num_payment."'.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AlreadyPaid")." :".price($totalpaye)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AmountExpected")." :".price($object->amount)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AlreadyPaid")." :".price($totalpaid)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AmountExpected")." :".price($object->capital)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("RemainderToPay")." :".price($resteapayer)." ".$langs->trans("Currency".$conf->currency)."
".price($staytopay)." ".$langs->trans("Currency".$conf->currency)."
"; $db->free($resql); @@ -469,6 +433,40 @@ if ($id > 0) } print ""; print ""; + + /* + * Boutons actions + */ + if ($action != 'edit') + { + print "
\n"; + + // Edit + if ($user->rights->loan->write) + { + print "id&action=edit\">".$langs->trans("Modify").""; + } + + // Emit payment + if ($object->paid == 0 && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write) + { + print "id&action=create\">".$langs->trans("DoPayment").""; + } + + // Classify 'paid' + if ($object->paid == 0 && round($staytopay) <=0 && $user->rights->loan->write) + { + print "rowid&action=paid\">".$langs->trans("ClassifyPaid").""; + } + + // Delete + if ($user->rights->loan->delete) + { + print "id&action=delete\">".$langs->trans("Delete").""; + } + + print "
"; + } } else { diff --git a/htdocs/compta/loan/class/loan.class.php b/htdocs/compta/loan/class/loan.class.php index afd15ced451..a0cbf9a8224 100644 --- a/htdocs/compta/loan/class/loan.class.php +++ b/htdocs/compta/loan/class/loan.class.php @@ -33,6 +33,7 @@ class Loan extends CommonObject public $table_element='loan'; var $id; + var $rowid; var $ref; var $datestart; var $dateend; @@ -41,6 +42,7 @@ class Loan extends CommonObject var $nbterm; var $rate; var $note; + var $paid; var $account_capital; var $account_insurance; var $account_interest; @@ -71,7 +73,8 @@ class Loan extends CommonObject */ function fetch($id) { - $sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note"; + $sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note,"; + $sql.= " l.paid"; $sql.= " FROM ".MAIN_DB_PREFIX."loan as l"; $sql.= " WHERE l.rowid = ".$id; @@ -92,6 +95,7 @@ class Loan extends CommonObject $this->nbterm = $obj->nbterm; $this->rate = $obj->rate; $this->note = $obj->note; + $this->paid = $obj->paid; return 1; } @@ -220,7 +224,7 @@ class Loan extends CommonObject // Delete payments if (! $error) { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge where fk_charge='".$this->id."'"; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_loan where fk_loan='".$this->id."'"; dol_syslog(get_class($this)."::delete", LOG_DEBUG); $resql=$this->db->query($sql); if (! $resql) @@ -232,7 +236,7 @@ class Loan extends CommonObject if (! $error) { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales where rowid='".$this->id."'"; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."loan where rowid='".$this->id."'"; dol_syslog(get_class($this)."::delete", LOG_DEBUG); $resql=$this->db->query($sql); if (! $resql) @@ -266,10 +270,10 @@ class Loan extends CommonObject { $this->db->begin(); - $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales"; - $sql.= " SET libelle='".$this->db->escape($this->lib)."',"; - $sql.= " date_ech='".$this->db->idate($this->date_ech)."',"; - $sql.= " periode='".$this->db->idate($this->periode)."'"; + $sql = "UPDATE ".MAIN_DB_PREFIX."loan"; + $sql.= " SET label='".$this->db->escape($this->label)."',"; + $sql.= " datestart='".$this->db->idate($this->datestart)."',"; + $sql.= " dateend='".$this->db->idate($this->dateend)."'"; $sql.= " WHERE rowid=".$this->id; dol_syslog(get_class($this)."::update", LOG_DEBUG); @@ -288,57 +292,15 @@ class Loan extends CommonObject } /** - * Enter description here ... - * - * @param int $year Year - * @return number - */ - function solde($year = 0) - { - global $conf; - - $sql = "SELECT SUM(f.amount) as amount"; - $sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as f"; - $sql.= " WHERE f.entity = ".$conf->entity; - $sql.= " AND paye = 0"; - - if ($year) { - $sql .= " AND f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' "; - } - - $result = $this->db->query($sql); - if ($result) - { - if ($this->db->num_rows($result)) - { - $obj = $this->db->fetch_object($result); - return $obj->amount; - } - else - { - return 0; - } - - $this->db->free($result); - - } - else - { - print $this->db->error(); - return -1; - } - } - - /** - * Tag social contribution as payed completely + * Tag loan as payed completely * * @param User $user Object user making change * @return int <0 if KO, >0 if OK */ function set_paid($user) { - $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET"; - $sql.= " paye = 1"; + $sql = "UPDATE ".MAIN_DB_PREFIX."loan SET"; + $sql.= " paid = 1"; $sql.= " WHERE rowid = ".$this->id; $return = $this->db->query($sql); if ($return) return 1; @@ -346,22 +308,22 @@ class Loan extends CommonObject } /** - * Retourne le libelle du statut d'une charge (impaye, payee) + * Return label of loan status (unpaid, paid) * - * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long + * @param int $mode 0=label, 1=short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @return string Label */ function getLibStatut($mode=0,$alreadypaid=-1) { - return $this->LibStatut($this->paye,$mode,$alreadypaid); + return $this->LibStatut($this->paid,$mode,$alreadypaid); } /** * Return label for given status * * @param int $statut Id statut - * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto + * @param int $mode 0=Label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label, 5=Short label + Picto * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @return string Label */ @@ -425,7 +387,7 @@ class Loan extends CommonObject if (empty($this->ref)) $this->ref=$this->label; - $link = ''; + $link = ''; $linkend=''; if ($withpicto) $result.=($link.img_object($langs->trans("ShowLoan").': '.$this->label,'bill').$linkend.' '); diff --git a/htdocs/compta/loan/class/paymentloan.class.php b/htdocs/compta/loan/class/paymentloan.class.php index 24d59fb417b..c0cdb3cdb85 100644 --- a/htdocs/compta/loan/class/paymentloan.class.php +++ b/htdocs/compta/loan/class/paymentloan.class.php @@ -1,6 +1,5 @@ - * Copyright (C) 2004-2007 Laurent Destailleur +/* Copyright (C) 2014 Alexandre Spangaro * * 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 @@ -17,9 +16,9 @@ */ /** - * \file htdocs/compta/sociales/class/paymentsocialcontribution.class.php + * \file htdocs/compta/loan/class/paymentloan.class.php * \ingroup facture - * \brief File of class to manage payment of social contributions + * \brief File of class to manage payment of loans */ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; @@ -36,7 +35,7 @@ class PaymentLoan extends CommonObject var $id; var $ref; - var $fk_charge; + var $fk_loan; var $datec=''; var $tms=''; var $datep=''; @@ -74,18 +73,18 @@ class PaymentLoan extends CommonObject $now=dol_now(); - // Validate parametres - if (! $this->datepaye) + // Validate parameters + if (! $this->datepaid) { $this->error='ErrorBadValueForParameter'; return -1; } // Clean parameters - if (isset($this->fk_charge)) $this->fk_charge=trim($this->fk_charge); + if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan); if (isset($this->amount)) $this->amount=trim($this->amount); - if (isset($this->fk_typepaiement)) $this->fk_typepaiement=trim($this->fk_typepaiement); - if (isset($this->num_paiement)) $this->num_paiement=trim($this->num_paiement); + if (isset($this->fk_typepayment)) $this->fk_typepaiement=trim($this->fk_typepayment); + if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); if (isset($this->note)) $this->note=trim($this->note); if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); @@ -101,26 +100,26 @@ class PaymentLoan extends CommonObject $totalamount = price2num($totalamount); // Check parameters - if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null + if ($totalamount == 0) return -1; // Negative amounts are accepted for reject prelevement but not null $this->db->begin(); if ($totalamount != 0) { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."paiementcharge (fk_charge, datec, datep, amount,"; - $sql.= " fk_typepaiement, num_paiement, note, fk_user_creat, fk_bank)"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_loan (fk_loan, datec, datep, amount,"; + $sql.= " fk_typepayment, num_payment, note, fk_user_creat, fk_bank)"; $sql.= " VALUES ($this->chid, '".$this->db->idate($now)."',"; - $sql.= " '".$this->db->idate($this->datepaye)."',"; + $sql.= " '".$this->db->idate($this->datepaid)."',"; $sql.= " ".$totalamount.","; - $sql.= " ".$this->paiementtype.", '".$this->db->escape($this->num_paiement)."', '".$this->db->escape($this->note)."', ".$user->id.","; + $sql.= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".$user->id.","; $sql.= " 0)"; dol_syslog(get_class($this)."::create", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."paiementcharge"); + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_loan"); } else { @@ -155,22 +154,22 @@ class PaymentLoan extends CommonObject global $langs; $sql = "SELECT"; $sql.= " t.rowid,"; - $sql.= " t.fk_charge,"; + $sql.= " t.fk_loan,"; $sql.= " t.datec,"; $sql.= " t.tms,"; $sql.= " t.datep,"; $sql.= " t.amount,"; - $sql.= " t.fk_typepaiement,"; - $sql.= " t.num_paiement,"; + $sql.= " t.fk_typepayment,"; + $sql.= " t.num_payment,"; $sql.= " t.note,"; $sql.= " t.fk_bank,"; $sql.= " t.fk_user_creat,"; $sql.= " t.fk_user_modif,"; $sql.= " pt.code as type_code, pt.libelle as type_libelle,"; $sql.= ' b.fk_account'; - $sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX."paiementcharge as t)"; + $sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX."payment_loan as t)"; $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid'; - $sql.= " WHERE t.rowid = ".$id." AND t.fk_typepaiement = pt.id"; + $sql.= " WHERE t.rowid = ".$id." AND t.fk_typepayment = pt.id"; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $resql=$this->db->query($sql); @@ -183,13 +182,13 @@ class PaymentLoan extends CommonObject $this->id = $obj->rowid; $this->ref = $obj->rowid; - $this->fk_charge = $obj->fk_charge; + $this->fk_loan = $obj->fk_loan; $this->datec = $this->db->jdate($obj->datec); $this->tms = $this->db->jdate($obj->tms); $this->datep = $this->db->jdate($obj->datep); $this->amount = $obj->amount; - $this->fk_typepaiement = $obj->fk_typepaiement; - $this->num_paiement = $obj->num_paiement; + $this->fk_typepayment = $obj->fk_typepayment; + $this->num_payment = $obj->num_payment; $this->note = $obj->note; $this->fk_bank = $obj->fk_bank; $this->fk_user_creat = $obj->fk_user_creat; @@ -227,36 +226,33 @@ class PaymentLoan extends CommonObject // Clean parameters - if (isset($this->fk_charge)) $this->fk_charge=trim($this->fk_charge); + if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan); if (isset($this->amount)) $this->amount=trim($this->amount); - if (isset($this->fk_typepaiement)) $this->fk_typepaiement=trim($this->fk_typepaiement); - if (isset($this->num_paiement)) $this->num_paiement=trim($this->num_paiement); + if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment); + if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); if (isset($this->note)) $this->note=trim($this->note); if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); - - // Check parameters // Put here code to add control on parameters values // Update request - $sql = "UPDATE ".MAIN_DB_PREFIX."paiementcharge SET"; + $sql = "UPDATE ".MAIN_DB_PREFIX."payment_loan SET"; - $sql.= " fk_charge=".(isset($this->fk_charge)?$this->fk_charge:"null").","; + $sql.= " fk_loan=".(isset($this->fk_loan)?$this->fk_loan:"null").","; $sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').","; $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').","; $sql.= " datep=".(dol_strlen($this->datep)!=0 ? "'".$this->db->idate($this->datep)."'" : 'null').","; $sql.= " amount=".(isset($this->amount)?$this->amount:"null").","; - $sql.= " fk_typepaiement=".(isset($this->fk_typepaiement)?$this->fk_typepaiement:"null").","; - $sql.= " num_paiement=".(isset($this->num_paiement)?"'".$this->db->escape($this->num_paiement)."'":"null").","; + $sql.= " fk_typepayment=".(isset($this->fk_typepayment)?$this->fk_typepayment:"null").","; + $sql.= " num_payment=".(isset($this->num_payment)?"'".$this->db->escape($this->num_payment)."'":"null").","; $sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").","; $sql.= " fk_bank=".(isset($this->fk_bank)?$this->fk_bank:"null").","; $sql.= " fk_user_creat=".(isset($this->fk_user_creat)?$this->fk_user_creat:"null").","; $sql.= " fk_user_modif=".(isset($this->fk_user_modif)?$this->fk_user_modif:"null").""; - $sql.= " WHERE rowid=".$this->id; $this->db->begin(); @@ -317,7 +313,7 @@ class PaymentLoan extends CommonObject if (! $error) { $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url"; - $sql.= " WHERE type='payment_sc' AND url_id=".$this->id; + $sql.= " WHERE type='payment_loan' AND url_id=".$this->id; dol_syslog(get_class($this)."::delete", LOG_DEBUG); $resql = $this->db->query($sql); @@ -326,7 +322,7 @@ class PaymentLoan extends CommonObject if (! $error) { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge"; + $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_loan"; $sql.= " WHERE rowid=".$this->id; dol_syslog(get_class($this)."::delete", LOG_DEBUG); @@ -368,96 +364,12 @@ class PaymentLoan extends CommonObject } } - - - /** - * Load an object from its id and create a new one in database - * - * @param int $fromid Id of object to clone - * @return int New id of clone - */ - function createFromClone($fromid) - { - global $user,$langs; - - $error=0; - - $object=new PaymentSocialContribution($this->db); - - $this->db->begin(); - - // Load source object - $object->fetch($fromid); - $object->id=0; - $object->statut=0; - - // Clear fields - // ... - - // Create clone - $result=$object->create($user); - - // Other options - if ($result < 0) - { - $this->error=$object->error; - $error++; - } - - if (! $error) - { - - - - } - - // End - if (! $error) - { - $this->db->commit(); - return $object->id; - } - else - { - $this->db->rollback(); - return -1; - } - } - - - /** - * Initialise an instance with random values. - * Used to build previews or test instances. - * id must be 0 if object instance is a specimen. - * - * @return void - */ - function initAsSpecimen() - { - $this->id=0; - - $this->fk_charge=''; - $this->datec=''; - $this->tms=''; - $this->datep=''; - $this->amount=''; - $this->fk_typepaiement=''; - $this->num_paiement=''; - $this->note=''; - $this->fk_bank=''; - $this->fk_user_creat=''; - $this->fk_user_modif=''; - - - } - - /** * Add record into bank for payment with links between this bank record and invoices of payment. * All payment properties must have been set first like after a call to create(). * * @param User $user Object of user making payment - * @param string $mode 'payment_sc' + * @param string $mode 'payment_loan' * @param string $label Label to use in bank record * @param int $accountid Id of bank account to do link with * @param string $emetteur_nom Name of transmitter @@ -482,11 +394,11 @@ class PaymentLoan extends CommonObject // Insert payment into llx_bank $bank_line_id = $acc->addline( - $this->datepaye, - $this->paiementtype, // Payment mode id or code ("CHQ or VIR for example") + $this->datepaid, + $this->paymenttype, // Payment mode id or code ("CHQ or VIR for example") $label, $total, - $this->num_paiement, + $this->num_payment, '', $user, $emetteur_nom, @@ -506,10 +418,10 @@ class PaymentLoan extends CommonObject // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction $url=''; - if ($mode == 'payment_sc') $url=DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='; + if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/compta/loan/payment/card.php?id='; if ($url) { - $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode); + $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode); if ($result <= 0) { $error++; @@ -578,7 +490,7 @@ class PaymentLoan extends CommonObject * @param int $maxlen Longueur max libelle * @return string Chaine avec URL */ - function getNomUrl($withpicto=0,$maxlen=0) + function getNameUrl($withpicto=0,$maxlen=0) { global $langs; @@ -588,7 +500,7 @@ class PaymentLoan extends CommonObject if (!empty($this->id)) { - $lien = ''; + $lien = ''; $lienfin=''; if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$lienfin.' '); diff --git a/htdocs/compta/loan/index.php b/htdocs/compta/loan/index.php index 16b9a10c054..8bef47ff66e 100644 --- a/htdocs/compta/loan/index.php +++ b/htdocs/compta/loan/index.php @@ -41,17 +41,17 @@ if ($page == -1) { $page = 0; } $offset = $conf->liste_limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -$limit = $conf->liste_limit; if (! $sortfield) $sortfield="l.rowid"; if (! $sortorder) $sortorder="DESC"; +$limit = $conf->liste_limit; +$search_label=GETPOST('search_label','alpha'); $filtre=$_GET["filtre"]; /* * View */ -$form = new Form($db); $loan = new Loan($db); llxHeader(); @@ -68,34 +68,29 @@ if ($filtre) { $filtre=str_replace(":","=",$filtre); $sql .= " AND ".$filtre; } - $sql.= $db->order($sortfield,$sortorder); -$sql.= $db->plimit($limit+1,$offset); +$sql.= $db->plimit($limit + 1, $offset); +//print $sql; $resql=$db->query($sql); - if ($resql) { $num = $db->num_rows($resql); - $i = 0; - $var=true; - $param=''; - print_fiche_titre($langs->trans("Loans")); - - print ''; - print ""; - - print ""; + $i = 0; + print ''."\n"; + print '
'; + print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"l.label","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Capital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"l.paid","",$param,'align="right"',$sortfield,$sortorder); - print "\n"; + print "\n"; + // Filters lines print ''; print ''; print ''; @@ -103,9 +98,9 @@ if ($resql) print ''; print ''; - print "\n"; - + print "\n"; + + $var=true; while ($i < min($num,$limit)) { $obj = $db->fetch_object($resql); @@ -115,9 +110,9 @@ if ($resql) // Ref print ''; @@ -132,18 +127,19 @@ if ($resql) print ''; - print ''; + print "\n"; + $i++; } - print '
  '; print ''; - print '
'; - $loan->id=$obj->id; - $loan->label=$obj->id; - $loan->ref=$obj->id; + $loan->id=$obj->rowid; + $loan->label=$obj->rowid; + $loan->ref=$obj->rowid; print $loan->getNameUrl(1,'20'); print ''.$loan->LibStatut($obj->paid,5,$obj->alreadypayed).'
'; - print ''; + print ""; + print "\n"; + $db->free($resql); } else { - dol_print_error($db); + dol_print_error($db); } - $db->close(); llxFooter(); diff --git a/htdocs/compta/loan/payment.php b/htdocs/compta/loan/payment.php new file mode 100644 index 00000000000..a513ba212cd --- /dev/null +++ b/htdocs/compta/loan/payment.php @@ -0,0 +1,331 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/loan/payment.php + * \ingroup Loan + * \brief Page to add payment of a loan + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/paymentloan.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; + +$langs->load("bills"); + +$chid=GETPOST("id"); +$action=GETPOST('action'); +$amounts = array(); + +// Security check +$socid=0; +if ($user->societe_id > 0) +{ + $socid = $user->societe_id; +} + +/* + * Actions + */ + +if ($action == 'add_payment') +{ + $error=0; + + if ($_POST["cancel"]) + { + $loc = DOL_URL_ROOT.'/compta/loan/card.php?id='.$chid; + header("Location: ".$loc); + exit; + } + + $datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + + if (! $_POST["paymenttype"] > 0) + { + $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode")); + $error++; + } + if ($datepaid == '') + { + $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Date")); + $error++; + } + if (! empty($conf->banque->enabled) && ! $_POST["accountid"] > 0) + { + $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("AccountToCredit")); + $error++; + } + + if (! $error) + { + $paymentid = 0; + + // Read possible payments + foreach ($_POST as $key => $value) + { + if (substr($key,0,7) == 'amount_') + { + $other_chid = substr($key,7); + $amounts[$other_chid] = price2num($_POST[$key]); + } + } + + if (count($amounts) <= 0) + { + $error++; + $errmsg='ErrorNoPaymentDefined'; + } + + if (! $error) + { + $db->begin(); + + // Create a line of payments + $paiement = new PaymentSocialContribution($db); + $paiement->chid = $chid; + $paiement->datepaid = $datepaid; + $paiement->amounts = $amounts; // Tableau de montant + $paiement->paymenttype = $_POST["paymenttype"]; + $paiement->num_payment = $_POST["num_payment"]; + $paiement->note = $_POST["note"]; + + if (! $error) + { + $paymentid = $payment->create($user); + if ($paymentid < 0) + { + $errmsg=$paiement->error; + $error++; + } + } + + if (! $error) + { + $result=$paiement->addPaymentToBank($user,'payment_sc','(SocialContributionPayment)',$_POST['accountid'],'',''); + if (! $result > 0) + { + $errmsg=$paiement->error; + $error++; + } + } + + if (! $error) + { + $db->commit(); + $loc = DOL_URL_ROOT.'/compta/loan/card.php?id='.$chid; + header('Location: '.$loc); + exit; + } + else + { + $db->rollback(); + } + } + } + + $_GET["action"]='create'; +} + + +/* + * View + */ + +llxHeader(); + +$form=new Form($db); + + +// Form to create loan's payment +if ($_GET["action"] == 'create') +{ + + $loan = new Loan($db); + $loan->fetch($chid); + + $total = $loan->capital; + + print_fiche_titre($langs->trans("DoPayment")); + print "
\n"; + + if ($mesg) + { + print "
$mesg
"; + } + + print '
'; + print ''; + print ''; + print ''; + print ''; + + print ''; + + print ""; + + print ''; + print '\n"; + print '\n"; + print ''; + + $sql = "SELECT sum(p.amount) as total"; + $sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p"; + $sql.= " WHERE p.fk_loan = ".$chid; + $resql = $db->query($sql); + if ($resql) + { + $obj=$db->fetch_object($resql); + $sumpaid = $obj->total; + $db->free(); + } + print ''; + print ''; + print ''; + + print '
".$langs->trans("Loan")."
'.$langs->trans("Ref").''.$chid.'
'.$langs->trans("Period")."".dol_print_date($loan->datestart,'day')."
'.$langs->trans("Label").''.$loan->label."
'.$langs->trans("Amount")."".price($loan->capital,0,$outputlangs,1,-1,-1,$conf->currency).'
'.$langs->trans("AlreadyPaid").''.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'
'.$langs->trans("RemainderToPay").''.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'
'; + + print '
'; + + print ''; + print ''; + print "'; + print ''; + + print '"; + print ''; + + print '\n"; + print ''; + + print ''; + print ''; + print ''; + + // Number + print ''; + print ''."\n"; + + print ''; + print ''; + print ''; + print ''; + + print '
".$langs->trans("Payment").'
'.$langs->trans("Date").''; + $datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaye):0; + $form->select_date($datepayment,'','','','',"add_payment",1,1); + print "
'.$langs->trans("PaymentMode").''; + $form->select_types_paiements(isset($_POST["paymenttype"])?$_POST["paymenttype"]:$loan->paymenttype, "paymenttype"); + print "
'.$langs->trans('AccountToDebit').''; + $form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1); // Show opend bank account list + print '
'.$langs->trans('Number'); + print ' ('.$langs->trans("ChequeOrTransferNumber").')'; + print '
'.$langs->trans("Comments").'
'; + + print '
'; + + /* + * Autres charges impayees + */ + $num = 1; + $i = 0; + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + + $var=True; + $total=0; + $totalrecu=0; + + while ($i < $num) + { + $objp = $loan; + + $var=!$var; + + print ""; + + if ($objp->datestart > 0) + { + print "\n"; + } + else + { + print "\n"; + } + + print '"; + + print '"; + + print '"; + + print '"; + + print "\n"; + $total+=$objp->total; + $total_ttc+=$objp->total_ttc; + $totalrecu+=$objp->am; + $i++; + } + if ($i > 1) + { + // Print total + print ""; + print ''; + print ""; + print ""; + print ""; + print ''; + print "\n"; + } + + print "
'.$langs->trans("DateDue").''.$langs->trans("Amount").''.$langs->trans("AlreadyPaid").''.$langs->trans("RemainderToPay").''.$langs->trans("Amount").'
".dol_print_date($objp->datestart,'day')."!!!'.price($objp->capital)."'.price($sumpaid)."'.price($objp->capital - $sumpaid)."'; + if ($sumpaid < $objp->capital) + { + $namef = "amount_".$objp->id; + print ''; + } + else + { + print '-'; + } + print "
'.$langs->trans("Total").':".price($total_ttc)."".price($totalrecu)."".price($total_ttc - $totalrecu)." 
"; + + print '
'; + + print ''; + print '   '; + print ''; + + print '
'; + + print "
\n"; +} + + +$db->close(); + +llxFooter(); diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 9e109cd311f..5bffbc0e5be 100644 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1083,3 +1083,45 @@ CREATE TABLE llx_usergroup_extrafields ( ) ENGINE=innodb; ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_object); + +-- Loan +create table llx_loan +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + entity integer DEFAULT 1 NOT NULL, + datec datetime, + tms timestamp, + label varchar(80) NOT NULL, + fk_bank integer, + capital real default 0 NOT NULL, + datestart date, + dateend date, + nbterm real, + rate double NOT NULL, + note text, + capital_position real default 0, + date_position date, + paid smallint default 0 NOT NULL, + accountancy_account_capital varchar(32), + accountancy_account_insurance varchar(32), + accountancy_account_interest varchar(32), + fk_user_author integer DEFAULT NULL, + fk_user_modif integer DEFAULT NULL, + active tinyint DEFAULT 1 NOT NULL +)ENGINE=innodb; + +create table llx_payment_loan +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_loan integer, + datec datetime, + tms timestamp, + datep datetime, + amount real DEFAULT 0, + fk_typepayment integer NOT NULL, + num_payment varchar(50), + note text, + fk_bank integer NOT NULL, + fk_user_creat integer, + fk_user_modif integer +)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql index 2ca026ba417..bc152099a04 100644 --- a/htdocs/install/mysql/tables/llx_loan.sql +++ b/htdocs/install/mysql/tables/llx_loan.sql @@ -37,6 +37,8 @@ create table llx_loan capital_position real default 0, -- If not a new loan, just have the position of capital date_position date, + paid smallint default 0 NOT NULL, + accountancy_account_capital varchar(32), accountancy_account_insurance varchar(32), accountancy_account_interest varchar(32), From 3627f157d2d208882366ddd7615ed5eb0b2f525c Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 1 Oct 2014 07:16:29 +0200 Subject: [PATCH 008/412] Add langs & debug --- htdocs/compta/bank/account.php | 24 ++ htdocs/compta/loan/card.php | 25 +- htdocs/compta/loan/class/loan.class.php | 14 +- .../compta/loan/class/paymentloan.class.php | 62 ++-- htdocs/compta/loan/document.php | 4 +- htdocs/compta/loan/index.php | 4 +- htdocs/compta/loan/payment/card.php | 308 ++++++++++++++++++ htdocs/compta/loan/payment/index.html | 0 htdocs/compta/loan/{ => payment}/payment.php | 32 +- htdocs/langs/en_US/admin.lang | 6 + htdocs/langs/en_US/loan.lang | 15 + htdocs/langs/fr_FR/admin.lang | 6 + htdocs/langs/fr_FR/loan.lang | 15 + 13 files changed, 442 insertions(+), 73 deletions(-) create mode 100644 htdocs/compta/loan/payment/card.php create mode 100644 htdocs/compta/loan/payment/index.html rename htdocs/compta/loan/{ => payment}/payment.php (89%) create mode 100644 htdocs/langs/en_US/loan.lang create mode 100644 htdocs/langs/fr_FR/loan.lang diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 14b586c6d80..57329e9e93b 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -37,6 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php' require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; @@ -44,6 +45,7 @@ $langs->load("banks"); $langs->load("categories"); $langs->load("bills"); $langs->load("companies"); +$langs->load("loan"); $id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int')); $ref = GETPOST('ref','alpha'); @@ -148,6 +150,7 @@ llxHeader(); $societestatic=new Societe($db); $userstatic=new User($db); $chargestatic=new ChargeSociales($db); +$loanstatic=new Loan($db); $memberstatic=new Adherent($db); $paymentstatic=new Paiement($db); $paymentsupplierstatic=new PaiementFourn($db); @@ -606,6 +609,12 @@ if ($id > 0 || ! empty($ref)) $paymentsalstatic->ref=$links[$key]['url_id']; print ' '.$paymentsalstatic->getNomUrl(2); } + elseif ($links[$key]['type']=='payment_loan') + { + print ''; + print ' '.img_object($langs->trans('ShowPayment'),'payment').' '; + print ''; + } elseif ($links[$key]['type']=='banktransfert') { // Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail. @@ -705,6 +714,21 @@ if ($id > 0 || ! empty($ref)) $chargestatic->ref=$chargestatic->lib; print $chargestatic->getNomUrl(1,16); } + else if ($links[$key]['type']=='loan') + { + $loanstatic->id=$links[$key]['url_id']; + if (preg_match('/^\((.*)\)$/i',$links[$key]['label'],$reg)) + { + if ($reg[1]=='loan') $reg[1]='Loan'; + $loanstatic->label=$langs->trans($reg[1]); + } + else + { + $loanstatic->label=$links[$key]['label']; + } + $loanstatic->ref=$loanstatic->label; + print $loanstatic->getNameUrl(1,16); + } else if ($links[$key]['type']=='member') { $memberstatic->id=$links[$key]['url_id']; diff --git a/htdocs/compta/loan/card.php b/htdocs/compta/loan/card.php index b3e31324cb0..d2dc5362915 100644 --- a/htdocs/compta/loan/card.php +++ b/htdocs/compta/loan/card.php @@ -116,16 +116,16 @@ if ($action == 'add' && $user->rights->loan->write) if ($action == 'update' && ! $_POST["cancel"] && $user->rights->loan->write) { - $dateech=dol_mktime($_POST["echhour"],$_POST["echmin"],$_POST["echsec"],$_POST["echmonth"],$_POST["echday"],$_POST["echyear"]); - $dateperiod=dol_mktime($_POST["periodhour"],$_POST["periodmin"],$_POST["periodsec"],$_POST["periodmonth"],$_POST["periodday"],$_POST["periodyear"]); - if (! $dateech) + $datestart=dol_mktime(12,0,0, $_POST["startmonth"], $_POST["startday"], $_POST["startyear"]); + $dateend=dol_mktime(12,0,0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]); + if (! $datestart) { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateDue")), 'errors'); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateStart")), 'errors'); $action = 'edit'; } - elseif (! $dateperiod) + elseif (! $dateend) { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Period")), 'errors'); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateEnd")), 'errors'); $action = 'edit'; } else @@ -298,7 +298,7 @@ if ($id > 0) print ''; // Ref - print '"; @@ -360,10 +360,9 @@ if ($id > 0) print ''; print '   '; print ''; - print '\n"; + print ''; + print ''; + } dol_fiche_end(); @@ -450,13 +449,13 @@ if ($id > 0) // Emit payment if ($object->paid == 0 && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write) { - print "id&action=create\">".$langs->trans("DoPayment").""; + print "id&action=create\">".$langs->trans("DoPayment").""; } // Classify 'paid' if ($object->paid == 0 && round($staytopay) <=0 && $user->rights->loan->write) { - print "rowid&action=paid\">".$langs->trans("ClassifyPaid").""; + print "id&action=paid\">".$langs->trans("ClassifyPaid").""; } // Delete diff --git a/htdocs/compta/loan/class/loan.class.php b/htdocs/compta/loan/class/loan.class.php index a0cbf9a8224..07b842b708e 100644 --- a/htdocs/compta/loan/class/loan.class.php +++ b/htdocs/compta/loan/class/loan.class.php @@ -87,7 +87,7 @@ class Loan extends CommonObject $obj = $this->db->fetch_object($resql); $this->id = $obj->rowid; - $this->ref = $obj->rowid; + $this->ref = $obj->rowid; $this->datestart = $this->db->jdate($obj->datestart); $this->dateend = $this->db->jdate($obj->dateend); $this->label = $obj->label; @@ -114,7 +114,7 @@ class Loan extends CommonObject /** - * Create a social contribution into database + * Create a loan into database * * @param User $user User making creation * @return int <0 if KO, id if OK @@ -201,10 +201,10 @@ class Loan extends CommonObject $this->db->begin(); - // Get bank transaction lines for this social contributions + // Get bank transaction lines for this loan include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $account=new Account($this->db); - $lines_url=$account->get_url('',$this->id,'sc'); + $lines_url=$account->get_url('',$this->id,'loan'); // Delete bank urls foreach ($lines_url as $line_url) @@ -385,14 +385,12 @@ class Loan extends CommonObject $result=''; - if (empty($this->ref)) $this->ref=$this->label; - - $link = ''; + $link = ''; $linkend=''; if ($withpicto) $result.=($link.img_object($langs->trans("ShowLoan").': '.$this->label,'bill').$linkend.' '); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend; + if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->label,$maxlen):$this->label).$linkend; return $result; } diff --git a/htdocs/compta/loan/class/paymentloan.class.php b/htdocs/compta/loan/class/paymentloan.class.php index c0cdb3cdb85..0a558fc9bf4 100644 --- a/htdocs/compta/loan/class/paymentloan.class.php +++ b/htdocs/compta/loan/class/paymentloan.class.php @@ -24,8 +24,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; -/** \class PaymentSocialContribution - * \brief Class to manage payments of social contributions +/** \class PaymentLoan + * \brief Class to manage payments of loans */ class PaymentLoan extends CommonObject { @@ -41,8 +41,8 @@ class PaymentLoan extends CommonObject var $datep=''; var $amount; // Total amount of payment var $amounts=array(); // Array of amounts - var $fk_typepaiement; - var $num_paiement; + var $fk_typepayment; + var $num_payment; var $note; var $fk_bank; var $fk_user_creat; @@ -59,7 +59,7 @@ class PaymentLoan extends CommonObject } /** - * Create payment of social contribution into database. + * Create payment of loan into database. * Use this->amounts to have list of lines for the payment * * @param User $user User making payment @@ -81,14 +81,14 @@ class PaymentLoan extends CommonObject } // Clean parameters - if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan); - if (isset($this->amount)) $this->amount=trim($this->amount); - if (isset($this->fk_typepayment)) $this->fk_typepaiement=trim($this->fk_typepayment); - if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); - if (isset($this->note)) $this->note=trim($this->note); - if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); - if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); - if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); + if (isset($this->fk_loan)) $this->fk_loan = trim($this->fk_loan); + if (isset($this->amount)) $this->amount = trim($this->amount); + if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment); + if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment); + if (isset($this->note)) $this->note = trim($this->note); + if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank); + if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat); + if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif); $totalamount = 0; foreach ($this->amounts as $key => $value) // How payment is dispatch @@ -390,7 +390,7 @@ class PaymentLoan extends CommonObject $acc->fetch($accountid); $total=$this->total; - if ($mode == 'payment_sc') $total=-$total; + if ($mode == 'payment_loan') $total=-$total; // Insert payment into llx_bank $bank_line_id = $acc->addline( @@ -405,8 +405,8 @@ class PaymentLoan extends CommonObject $emetteur_banque ); - // Mise a jour fk_bank dans llx_paiement. - // On connait ainsi le paiement qui a genere l'ecriture bancaire + // Update fk_bank into llx_paiement. + // We know the payment who generated the account write if ($bank_line_id > 0) { $result=$this->update_fk_bank($bank_line_id); @@ -416,7 +416,7 @@ class PaymentLoan extends CommonObject dol_print_error($this->db); } - // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction + // Add link 'payment_loan' in bank_url between payment and bank transaction $url=''; if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/compta/loan/payment/card.php?id='; if ($url) @@ -433,11 +433,11 @@ class PaymentLoan extends CommonObject $linkaddedforthirdparty=array(); foreach ($this->amounts as $key => $value) { - if ($mode == 'payment_sc') + if ($mode == 'payment_loan') { - $socialcontrib = new ChargeSociales($this->db); - $socialcontrib->fetch($key); - $result=$acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_libelle.(($socialcontrib->lib && $socialcontrib->lib!=$socialcontrib->type_libelle)?' ('.$socialcontrib->lib.')':''),'sc'); + $loan = new Loan($this->db); + $loan->fetch($key); + $result=$acc->add_url_line($bank_line_id, $loan->id, DOL_URL_ROOT.'/compta/loan/card.php?id=', $loan->type_libelle.(($loan->lib && $loan->lib!=$loan->type_libelle)?' ('.$loan->lib.')':''),'loan'); if ($result <= 0) dol_print_error($this->db); } } @@ -461,14 +461,14 @@ class PaymentLoan extends CommonObject /** - * Mise a jour du lien entre le paiement de charge et la ligne dans llx_bank generee + * Update link between loan's payment and the line generate in llx_bank * * @param int $id_bank Id if bank * @return int >0 if OK, <=0 if KO */ function update_fk_bank($id_bank) { - $sql = "UPDATE ".MAIN_DB_PREFIX."paiementcharge SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id; + $sql = "UPDATE ".MAIN_DB_PREFIX."payment_loan SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id; dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG); $result = $this->db->query($sql); @@ -484,11 +484,11 @@ class PaymentLoan extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with eventually a picto) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul - * @param int $maxlen Longueur max libelle - * @return string Chaine avec URL + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=No picto + * @param int $maxlen Max length label + * @return string Chaine with URL */ function getNameUrl($withpicto=0,$maxlen=0) { @@ -500,12 +500,12 @@ class PaymentLoan extends CommonObject if (!empty($this->id)) { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$lienfin.' '); + if ($withpicto) $result.=($link.img_object($langs->trans("ShowPayment").': '.$this->ref,'payment').$linkend.' '); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin; + if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend; } return $result; diff --git a/htdocs/compta/loan/document.php b/htdocs/compta/loan/document.php index 022340270ad..b263fa1687d 100644 --- a/htdocs/compta/loan/document.php +++ b/htdocs/compta/loan/document.php @@ -119,7 +119,7 @@ if ($object->id) print ''; // Date start - print ""; + print ""; print ""; // Date end - print ""; + print ""; print "'; diff --git a/htdocs/compta/loan/payment/card.php b/htdocs/compta/loan/payment/card.php new file mode 100644 index 00000000000..d08c5f8ce0f --- /dev/null +++ b/htdocs/compta/loan/payment/card.php @@ -0,0 +1,308 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/loan/payment/card.php + * \ingroup loan + * \brief Payment's card of loan + */ + +require '../../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/paymentloan.class.php'; +// require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; +// require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; +if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; + +$langs->load('bills'); +$langs->load('banks'); +$langs->load('companies'); +$langs->load('loan'); + +// Security check +$id=GETPOST("id"); +$action=GETPOST("action"); +$confirm=GETPOST('confirm'); +if ($user->societe_id) $socid=$user->societe_id; +// TODO ajouter regle pour restreindre acces paiement +//$result = restrictedArea($user, 'facture', $id,''); + +$payment = new PaymentLoan($db); +if ($id > 0) +{ + $result=$payment->fetch($id); + if (! $result) dol_print_error($db,'Failed to get payment id '.$id); +} + + +/* + * Actions + */ + +// Delete payment +if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->delete) +{ + $db->begin(); + + $result = $payment->delete($user); + if ($result > 0) + { + $db->commit(); + header("Location: ".DOL_URL_ROOT."/compta/loan/index.php"); + exit; + } + else + { + setEventMessage($payment->error, 'errors'); + $db->rollback(); + } +} + +// Create payment +if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->loan->write) +{ + $db->begin(); + + $result=$payment->valide(); + + if ($result > 0) + { + $db->commit(); + + $factures=array(); // TODO Get all id of invoices linked to this payment + foreach($factures as $id) + { + $fac = new Facture($db); + $fac->fetch($id); + + $outputlangs = $langs; + if (! empty($_REQUEST['lang_id'])) + { + $outputlangs = new Translate("",$conf); + $outputlangs->setDefaultLang($_REQUEST['lang_id']); + } + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) { + $fac->generateDocument($fac->modelpdf, $outputlangs); + } + } + + header('Location: card.php?id='.$payment->id); + exit; + } + else + { + setEventMessage($payment->error); + $db->rollback(); + } +} + + +/* + * View + */ + +llxHeader(); + +$loan = new Loan($db); + +$form = new Form($db); + +$h=0; + +$head[$h][0] = DOL_URL_ROOT.'/compta/loan/payment/card.php?id='.$_GET["id"]; +$head[$h][1] = $langs->trans("Card"); +$hselected = $h; +$h++; + +dol_fiche_head($head, $hselected, $langs->trans("PaymentLoan"), 0, 'payment'); + +/* + * Confirm deletion of the payment + */ +if ($action == 'delete') +{ + print $form->formconfirm('card.php?id='.$payment->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2); + +} + +/* + * Confirm validation of the payment + */ +if ($action == 'valide') +{ + $facid = $_GET['facid']; + print $form->formconfirm('card.php?id='.$payment->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2); + +} + + +print '
'.$langs->trans("Ref").''; + print '
'.$langs->trans("Ref").''; print $form->showrefnav($object,'id'); print "
'.$langs->trans("Capital").''.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).'
".$langs->trans("Datestart")."
".$langs->trans("DateStart").""; if ($action == 'edit') { @@ -133,7 +133,7 @@ if ($object->id) print "
".$langs->trans("Dateend")."
".$langs->trans("DateEnd").""; if ($action == 'edit') { diff --git a/htdocs/compta/loan/index.php b/htdocs/compta/loan/index.php index 8bef47ff66e..a4432ba9ced 100644 --- a/htdocs/compta/loan/index.php +++ b/htdocs/compta/loan/index.php @@ -110,9 +110,7 @@ if ($resql) // Ref print ''; - $loan->id=$obj->rowid; - $loan->label=$obj->rowid; - $loan->ref=$obj->rowid; + $loan->id = $obj->id; print $loan->getNameUrl(1,'20'); print '
'; + +// Ref +print ''; +print ''; + +// Date +print ''; + +// Mode +print ''; + +// Number +print ''; + +// Amount +print ''; + +// Note +print ''; + +// Bank account +if (! empty($conf->banque->enabled)) +{ + if ($payment->bank_account) + { + $bankline=new AccountLine($db); + $bankline->fetch($payment->bank_line); + + print ''; + print ''; + print ''; + print ''; + } +} + +print '
'.$langs->trans('Ref').''; +print $form->showrefnav($payment,'id','',1,'rowid','id'); +print '
'.$langs->trans('Date').''.dol_print_date($payment->datep,'day').'
'.$langs->trans('Mode').''.$langs->trans("PaymentType".$payment->type_code).'
'.$langs->trans('Number').''.$payment->num_payment.'
'.$langs->trans('Amount').''.price($payment->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'
'.$langs->trans('Note').''.nl2br($payment->note).'
'.$langs->trans('BankTransactionLine').''; + print $bankline->getNomUrl(1,0,'showall'); + print '
'; + + +/* + * List of loans payed + */ + +$disable_delete = 0; +$sql = 'SELECT l.rowid as id, l.label, l.paid, l.capital as capital, pl.amount'; +$sql.= ' FROM '.MAIN_DB_PREFIX.'payment_loan as pl,'.MAIN_DB_PREFIX.'loan as l'; +$sql.= ' WHERE pl.fk_loan = l.rowid'; +$sql.= ' AND l.entity = '.$conf->entity; +$sql.= ' AND pl.rowid = '.$payment->id; + +dol_syslog("compta/loan/payment/card.php", LOG_DEBUG); +$resql=$db->query($sql); +if ($resql) +{ + $num = $db->num_rows($resql); + + $i = 0; + $total = 0; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + + if ($num > 0) + { + $var=True; + + while ($i < $num) + { + $objp = $db->fetch_object($resql); + + $var=!$var; + print ''; + // Ref + print '\n"; + // Label + print ''; + // Expected to pay + print ''; + // Status + print ''; + // Amount payed + print ''; + print "\n"; + if ($objp->paye == 1) // If at least one invoice is paid, disable delete + { + $disable_delete = 1; + } + $total = $total + $objp->amount; + $i++; + } + } + $var=!$var; + + print "
'.$langs->trans('Loan').''.$langs->trans('Label').''.$langs->trans('ExpectedToPay').''.$langs->trans('Status').''.$langs->trans('PayedByThisPayment').'
'; + $loan->fetch($objp->id); + print $loan->getNameUrl(1); + print "'.$objp->label.''.price($objp->capital).''.$loan->getLibStatut(4,$objp->amount).''.price($objp->amount).'
\n"; + $db->free($resql); +} +else +{ + dol_print_error($db); +} + +print '
'; + + +/* + * Boutons Actions + */ +print '
'; + +/* +if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) +{ + if ($user->societe_id == 0 && $payment->statut == 0 && $_GET['action'] == '') + { + if ($user->rights->facture->paiement) + { + print ''.$langs->trans('Valid').''; + } + } +} +*/ + +if ($_GET['action'] == '') +{ + if ($user->rights->loan->delete) + { + if (! $disable_delete) + { + print ''.$langs->trans('Delete').''; + } + else + { + print ''.$langs->trans('Delete').''; + } + } +} + +print '
'; + + + +llxFooter(); + +$db->close(); diff --git a/htdocs/compta/loan/payment/index.html b/htdocs/compta/loan/payment/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/compta/loan/payment.php b/htdocs/compta/loan/payment/payment.php similarity index 89% rename from htdocs/compta/loan/payment.php rename to htdocs/compta/loan/payment/payment.php index a513ba212cd..ed249d8f246 100644 --- a/htdocs/compta/loan/payment.php +++ b/htdocs/compta/loan/payment/payment.php @@ -21,12 +21,13 @@ * \brief Page to add payment of a loan */ -require '../../main.inc.php'; +require '../../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/paymentloan.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("bills"); +$langs->load("loan"); $chid=GETPOST("id"); $action=GETPOST('action'); @@ -42,7 +43,6 @@ if ($user->societe_id > 0) /* * Actions */ - if ($action == 'add_payment') { $error=0; @@ -97,30 +97,30 @@ if ($action == 'add_payment') $db->begin(); // Create a line of payments - $paiement = new PaymentSocialContribution($db); - $paiement->chid = $chid; - $paiement->datepaid = $datepaid; - $paiement->amounts = $amounts; // Tableau de montant - $paiement->paymenttype = $_POST["paymenttype"]; - $paiement->num_payment = $_POST["num_payment"]; - $paiement->note = $_POST["note"]; + $payment = new PaymentLoan($db); + $payment->chid = $chid; + $payment->datepaid = $datepaid; + $payment->amounts = $amounts; // Tableau de montant + $payment->paymenttype = $_POST["paymenttype"]; + $payment->num_payment = $_POST["num_payment"]; + $payment->note = $_POST["note"]; if (! $error) { $paymentid = $payment->create($user); if ($paymentid < 0) { - $errmsg=$paiement->error; + $errmsg=$payment->error; $error++; } } if (! $error) { - $result=$paiement->addPaymentToBank($user,'payment_sc','(SocialContributionPayment)',$_POST['accountid'],'',''); + $result=$payment->addPaymentToBank($user,'payment_loan','(LoanPayment)',$_POST['accountid'],'',''); if (! $result > 0) { - $errmsg=$paiement->error; + $errmsg=$payment->error; $error++; } } @@ -180,7 +180,7 @@ if ($_GET["action"] == 'create') print "".$langs->trans("Loan").""; print ''.$langs->trans("Ref").''.$chid.''; - print ''.$langs->trans("Period")."".dol_print_date($loan->datestart,'day')."\n"; + print ''.$langs->trans("DateStart")."".dol_print_date($loan->datestart,'day')."\n"; print ''.$langs->trans("Label").''.$loan->label."\n"; print ''.$langs->trans("Amount")."".price($loan->capital,0,$outputlangs,1,-1,-1,$conf->currency).''; @@ -222,14 +222,14 @@ if ($_GET["action"] == 'create') print ''; print ''.$langs->trans('AccountToDebit').''; print ''; - $form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$charge->accountid, "accountid", 0, '',1); // Show opend bank account list + $form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$loan->accountid, "accountid", 0, '',1); // Show opend bank account list print ''; // Number print ''.$langs->trans('Number'); print ' ('.$langs->trans("ChequeOrTransferNumber").')'; print ''; - print ''."\n"; + print ''."\n"; print ''; print ''.$langs->trans("Comments").''; @@ -241,7 +241,7 @@ if ($_GET["action"] == 'create') print '
'; /* - * Autres charges impayees + * Other loan unpaid */ $num = 1; $i = 0; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index fae312ee8e8..7650b14950e 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -483,6 +483,8 @@ Module500Name=Special expenses (tax, social contributions, dividends) Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries Module510Name=Salaries Module510Desc=Management of employees salaries and payments +Module520Name=Loan +Module520Desc=Management of loans Module600Name=Notifications Module600Desc=Send notifications by email on some Dolibarr business events to third party contacts Module700Name=Donations @@ -696,6 +698,10 @@ Permission510=Read Salaries Permission512=Create/modify salaries Permission514=Delete salaries Permission517=Export salaries +Permission520=Read Loans +Permission522=Create/modify loans +Permission524=Delete loans +Permission527=Export loans Permission531=Read services Permission532=Create/modify services Permission534=Delete services diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang new file mode 100644 index 00000000000..6be2f13a101 --- /dev/null +++ b/htdocs/langs/en_US/loan.lang @@ -0,0 +1,15 @@ +# Dolibarr language file - Source file is en_US - loan +Loan=Loan +Loans=Loans +NewLoan=New Loan +ShowLoan=Show Loan +PaymentLoan=Loan payment +Capital=Capital +Nbterms=Number of terms +LoanAccountancyCapitalCode=Accountancy code capital +LoanAccountancyInsuranceCode=Accountancy code insurance +LoanAccountancyInterestCode=Accountancy code interest +ConfigLoan=Configuration of the module loan +LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default +LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default +LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default \ No newline at end of file diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 0ea2d9d51f4..d8f1e3b0c16 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -482,6 +482,8 @@ Module500Name=Dépenses spéciales (taxes, charges, dividendes) Module500Desc=Gestion des dépenses spéciales comme les taxes, charges sociales et dividendes Module510Name=Salaires Module510Desc=Gestion des paiements des salaires des employés +Module520Name=Emprunts +Module520Desc=Suivi des emprunts Module600Name=Notifications Module600Desc=Envoi de notifications (par email) aux contacts de tiers sur certains événements métiers Module700Name=Dons @@ -695,6 +697,10 @@ Permission510=Consulter les salaires Permission512=Créer/modifier les salaires Permission514=Supprimer les salaires Permission517=Exporter les salaires +Permission520=Consulter les emprunts +Permission522=Créer/modifier les emprunts +Permission524=Supprimer les emprunts +Permission527=Exporter les emprunts Permission531=Consulter les services Permission532=Créer/modifier les services Permission534=Supprimer les services diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang new file mode 100644 index 00000000000..d230f7f0582 --- /dev/null +++ b/htdocs/langs/fr_FR/loan.lang @@ -0,0 +1,15 @@ +# Dolibarr language file - Source file is en_US - loan +Loan=Emprunt +Loans=Emprunts +NewLoan=Nouvel emprunt +ShowLoan=Voir emprunt +PaymentLoan=Règlement d'emprunt +Capital=Capital +Nbterms=Nombre d'échéances +LoanAccountancyCapitalCode=Compte comptable capital +LoanAccountancyInsuranceCode=Compte comptable assurance +LoanAccountancyInterestCode=Compte comptable intérêts +ConfigLoan=Configuration du module emprunt +LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable capital par défaut +LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte comptable intérêts par défaut +LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Compte comptable assurance par défaut \ No newline at end of file From a0b4a0a3cd33eb1c5926f50aad858ada3f835e22 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 1 Oct 2014 07:32:03 +0200 Subject: [PATCH 009/412] Update menu auguria --- htdocs/core/menus/init_menu_auguria.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 36a59d33109..3dfa9a546ba 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -12,7 +12,7 @@ insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, left insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('societe|fournisseur', '( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)', 2__+MAX_llx_menu__, __HANDLER__, 'top', 'companies', '', 0, '/societe/index.php?mainmenu=companies&leftmenu=', 'ThirdParties', -1, 'companies', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 20, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('product|service', '$conf->product->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, __HANDLER__, 'top', 'products', '', 0, '/product/index.php?mainmenu=products&leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 30, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('propal|commande|fournisseur|contrat|ficheinter', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 40, __ENTITY__); -insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|facture|deplacement|don|tax|salaries', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled || $conf->salaries->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read', '', 2, 50, __ENTITY__); +insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|facture|deplacement|don|tax|salaries|loan', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled || $conf->salaries->enabled || $conf->loan->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read', '', 2, 50, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/index.php?mainmenu=bank&leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 60, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 70, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('mailing|export|import|opensurvey', '$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools', '', 0, '/core/tools.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read', '', 2, 90, __ENTITY__); @@ -179,6 +179,9 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled', __HANDLER__, 'left', 2210__+MAX_llx_menu__, 'accountancy', 'tax_sal', 2200__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary&mainmenu=accountancy', 'Salaries', 1, 'salaries', '$user->rights->salaries->read', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2211__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/card.php?leftmenu=tax_salary&action=create', 'NewPayment', 2, 'companies', '$user->rights->salaries->write', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2212__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary', 'Payments', 2, 'companies', '$user->rights->salaries->read', '', 0, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled', __HANDLER__, 'left', 2220__+MAX_llx_menu__, 'accountancy', 'tax_loan', 2200__+MAX_llx_menu__, '/compta/loan/index.php?leftmenu=tax_loan&mainmenu=accountancy', 'Loans', 1, 'loan', '$user->rights->loan->read', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2221__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/loan/card.php?leftmenu=tax_loan&action=create', 'NewLoan', 2, 'loan', '$user->rights->loan->write', '', 0, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2222__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/loan/index.php?leftmenu=tax_loan', 'Payments', 2, 'companies', '$user->rights->loan->read', '', 0, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled', __HANDLER__, 'left', 2250__+MAX_llx_menu__, 'accountancy', 'tax_social', 2200__+MAX_llx_menu__, '/compta/sociales/index.php?leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2251__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/sociales/charges.php?leftmenu=tax_social&action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__); From ba7a4d6f8802fda8adcedd6e2cdb2aac7f4ae069 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 2 Oct 2014 19:56:41 +0200 Subject: [PATCH 010/412] Update card --- htdocs/compta/loan/card.php | 87 ++++++++++++++++++++----------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/htdocs/compta/loan/card.php b/htdocs/compta/loan/card.php index d2dc5362915..c97ca6d84b0 100644 --- a/htdocs/compta/loan/card.php +++ b/htdocs/compta/loan/card.php @@ -31,8 +31,9 @@ $langs->load("bills"); $langs->load("loan"); $id=GETPOST('id','int'); -$action=GETPOST("action"); +$action=GETPOST('action'); $confirm=GETPOST('confirm'); +$cancel=GETPOST('cancel'); // Security check $socid = GETPOST('socid','int'); @@ -46,17 +47,17 @@ $result = restrictedArea($user, 'loan', $id, '',''); // Classify paid if ($action == 'confirm_paid' && $confirm == 'yes') { - $loan = new Loan($db); - $loan->fetch($id); - $result = $loan->set_paid($user); + $object = new Loan($db); + $object->fetch($id); + $result = $object->set_paid($user); } // Delete loan if ($action == 'confirm_delete' && $confirm == 'yes') { - $loan = new Loan($db); - $loan->fetch($id); - $result=$loan->delete($user); + $object = new Loan($db); + $object->fetch($id); + $result=$object->delete($user); if ($result > 0) { header("Location: index.php"); @@ -72,8 +73,8 @@ if ($action == 'confirm_delete' && $confirm == 'yes') // Add loan if ($action == 'add' && $user->rights->loan->write) { - $datestart=dol_mktime(12,0,0, $_POST["startmonth"], $_POST["startday"], $_POST["startyear"]); - $dateend=dol_mktime(12,0,0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]); + $datestart=dol_mktime(12,0,0, $GETPOST("startmonth"), $GETPOST("startday"), $GETPOST("startyear")); + $dateend=dol_mktime(12,0,0, $GETPOST("endmonth"), $GETPOST("endday"), $GETPOST("endyear")); if (! $datestart) { setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateStart")), 'errors'); @@ -91,33 +92,33 @@ if ($action == 'add' && $user->rights->loan->write) } else { - $loan = new Loan($db); + $object = new Loan($db); - $loan->label = GETPOST("label"); - $loan->fk_bank = GETPOST("accountid"); - $loan->capital = GETPOST("capital"); - $loan->datestart = $datestart; - $loan->dateend = $dateend; - $loan->nbterm = GETPOST("nbterm"); - $loan->rate = GETPOST("rate"); + $object->label = GETPOST("label"); + $object->fk_bank = GETPOST("accountid"); + $object->capital = GETPOST("capital"); + $object->datestart = $datestart; + $object->dateend = $dateend; + $object->nbterm = GETPOST("nbterm"); + $object->rate = GETPOST("rate"); - $loan->account_capital = GETPOST("accountancy_account_capital"); - $loan->account_insurance = GETPOST("accountancy_account_insurance"); - $loan->account_interest = GETPOST("accountancy_account_interest"); + $object->account_capital = GETPOST("accountancy_account_capital"); + $object->account_insurance = GETPOST("accountancy_account_insurance"); + $object->account_interest = GETPOST("accountancy_account_interest"); - $id=$loan->create($user); + $id=$object->create($user); if ($id <= 0) { - setEventMessage($loan->error, 'errors'); + setEventMessage($object->error, 'errors'); } } } -if ($action == 'update' && ! $_POST["cancel"] && $user->rights->loan->write) +if ($action == 'update' && ! $cancel && $user->rights->loan->write) { - $datestart=dol_mktime(12,0,0, $_POST["startmonth"], $_POST["startday"], $_POST["startyear"]); - $dateend=dol_mktime(12,0,0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]); + $datestart=dol_mktime(12,0,0, $GETPOST("startmonth"), $GETPOST("startday"), $GETPOST("startyear")); + $dateend=dol_mktime(12,0,0, $GETPOST("endmonth"), $GETPOST("endday"), $GETPOST("endyear")); if (! $datestart) { setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateStart")), 'errors'); @@ -130,17 +131,22 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->loan->write) } else { - $loan = new Loan($db); - $result=$loan->fetch($_GET["id"]); - - $loan->label=$_POST["label"]; - $loan->datestart=$datestart; - $loan->dateend=$dateend; - - $result=$loan->update($user); - if ($result <= 0) + $object = new Loan($db); + if ($object->fetch($id)) { - setEventMessage($loan->error, 'errors'); + $object->label = $GETPOST("label"); + $object->datestart = $datestart; + $object->dateend = $dateend; + } + + if ($object->update($id, $user) > 0) + { + $action = ''; + } + else + { + $action = 'edit'; + setEventMessage($object->error, 'errors'); } } } @@ -180,7 +186,7 @@ if ($action == 'create') if (! empty($conf->banque->enabled)) { print ''.$langs->trans("Account").''; - $form->select_comptes($_POST["accountid"],"accountid",0,"courant=1",1); // Show list of bank account with courant + $form->select_comptes($GETPOST["accountid"],"accountid",0,"courant=1",1); // Show list of bank account with courant print ''; } else @@ -259,7 +265,7 @@ if ($action == 'create') print ''; print '
    '; - print '
'; print ''; } @@ -434,8 +440,8 @@ if ($id > 0) print ""; /* - * Boutons actions - */ + * Buttons actions + */ if ($action != 'edit') { print "
\n"; @@ -474,7 +480,6 @@ if ($id > 0) } } - llxFooter(); -$db->close(); +$db->close(); \ No newline at end of file From dca4591cdf7615eb400c53dd21da5cf1a98c004c Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 2 Oct 2014 20:00:35 +0200 Subject: [PATCH 011/412] Add calculator --- htdocs/compta/loan/calculator.php | 223 ++++++++++++++++++++++++ htdocs/compta/loan/calculator.tpl | 150 ++++++++++++++++ htdocs/core/menus/standard/eldy.lib.php | 1 + htdocs/langs/en_US/loan.lang | 6 + htdocs/langs/fr_FR/loan.lang | 6 + 5 files changed, 386 insertions(+) create mode 100644 htdocs/compta/loan/calculator.php create mode 100644 htdocs/compta/loan/calculator.tpl diff --git a/htdocs/compta/loan/calculator.php b/htdocs/compta/loan/calculator.php new file mode 100644 index 00000000000..562ce2c27d5 --- /dev/null +++ b/htdocs/compta/loan/calculator.php @@ -0,0 +1,223 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/loan/calculator.php + * \ingroup loan + * \brief Calculator for loan + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; + +$langs->load("loan"); +$langs->load("compta"); +$langs->load("banks"); +$langs->load("bills"); + +// Security check +$socid = isset($GETPOST["socid"])?$GETPOST["socid"]:''; +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'loan', '', '', ''); + +$action=GETPOST("action"); + +/* Defining Variables */ +$periods = array( + 52 => $langs->trans("Weekly"), + 26 => $langs->trans("Bi-weekly"), + 12 => $langs->trans("Monthly"), + 6 => $langs->trans("Bi-monthly"), + 4 => $langs->trans("Quarterly"), + 2 => $langs->trans("Semi-annually"), + 1 => $langs->trans("Annually") + ); + +$loan_capital = isset($GETPOST("loan_capital")) ? $GETPOST("loan_capital") : 0; +$loan_length = isset($GETPOST("loan_length")) ? $GETPOST("loan_length") : 0; +$loan_interest = isset(GETPOST("loan_interest")) ? $GETPOST("loan_interest") : 0; +$pay_periodicity = isset(GETPOST("pay_periodicity")) ? $GETPOST("pay_periodicity") : 12; +$periodicity = $periods[$pay_periodicity]; + +$pay_periods = ''; +foreach($periods as $value => $name) +{ + $selected = ($pay_periodicity == $value) ? 'selected' : ''; +} + +if ($action == 'calculate') +{ + /* Checking Variables */ + $error = 0; + + if(!is_numeric($loan_capital) || $loan_capital <= 0) + { + // $this->error="ErrorLoanCapital"; + return -1; + } + if(!is_numeric($loan_length) || $loan_length <= 0) + { + // $this->error="ErrorLoanLength"; + return -1; + } + if(!is_numeric($loan_interest) or $loan_interest <= 0) + { + // $this->error="ErrorLoanInterest"; + return -1; + } + + /* + * Calculating + */ + if(isset($_GET['action'])) + { + $c_balance = $loan_capital; + $total_periods = $loan_length * $pay_periodicity; + $interest_percent = $loan_interest / 100; + $period_interest = $interest_percent / $pay_periodicity; + $c_period_payment = $loan_capital * ($period_interest / (1 - pow((1 + $period_interest), -($total_periods)))); + $total_paid = number_format($c_period_payment * $total_periods, 2, '.', ' '); + $total_interest = number_format($c_period_payment * $total_periods - $loan_capital, 2, '.', ' '); + $total_principal = number_format($loan_capital, 2, '.', ' '); + + $loan_capital = number_format($loan_capital, 2, '.', ' '); + $loan_interest = number_format($loan_interest, 2, '.', ' '); + $period_payment = number_format($c_period_payment, 2, '.', ' '); + + for($period = 1; $period <= $total_periods; $period++) + { + $c_interest = $c_balance * $period_interest; + $c_principal = $c_period_payment - $c_interest; + $c_balance -= $c_principal; + + $interest = number_format($c_interest, 2, '.', ' '); + $principal = number_format($c_principal, 2, '.', ' '); + $balance = number_format($c_balance, 2, '.', ' '); + + $evenrow_row_modifier = ($period % 2) ? '' : 'class=evenrow'; + } + } + else + { + $amortization_table = ''; + $loan_summary = ''; + } +} + +/* + * View + */ + +$help_url='EN:Module_Loan|FR:Module_Emprunt'; +llxHeader("",$langs->trans("Loan"),$help_url); + +print_fiche_titre($langs->trans("CalculatorLoan")); + +print ''; + +print '' . "\n"; +print ''; +print ''; + +// Capital +print ''; + +// Length +print ''; + +// Interest +print ''; + +print '
'.$langs->trans("Capital").'
'.$langs->trans("LengthByYears").'
'.$langs->trans("Interest").' %
'; + +print '
'; + +print ''; + +if ($action == 'calculate') +{ +/* + + + + + + {amortization_table_rows} + + + +
PeriodInterest PaidPrincipal PaidRemaining Balance
Totals:{total_interest}${total_principal}$ 
+ + + + + {period} + {interest}$ + {principal}$ + {balance}$ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Loan Summary
Loan amount:{loan_amount}$
Loan length:{loan_length} years
Annual interest:{annual_interest}%
Pay periodicity:{periodicity}
{periodicity} payment:{period_payment}$
Total paid:{total_paid}$
Total interest:{total_interest}$
Total periods:{total_periods}
+ + */ +} +else +{ + +} + +$db->close(); + +llxFooter(); diff --git a/htdocs/compta/loan/calculator.tpl b/htdocs/compta/loan/calculator.tpl new file mode 100644 index 00000000000..7efbca9924b --- /dev/null +++ b/htdocs/compta/loan/calculator.tpl @@ -0,0 +1,150 @@ + + + + Loan Calculator + + + + + + + + + + +
+ {error} + + + + + +
+ {loan_summary} + {loan_parameters_form} + + {amortization_table} +
+
+ + + +
+ + + + + + + + + + +
Loan Parameters
+ + + + + + + + + + + + + + + + + + + + +
Loan amount: $
Loan length: years
Annual interest: %
Pay periodicity: + +
+
Powered by PC Calculators
+
+ + + + + + + + + + + + {amortization_table_rows} + + + +
PeriodInterest PaidPrincipal PaidRemaining Balance
Totals:{total_interest}${total_principal}$ 
+ + + + + {period} + {interest}$ + {principal}$ + {balance}$ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Loan Summary
Loan amount:{loan_amount}$
Loan length:{loan_length} years
Annual interest:{annual_interest}%
Pay periodicity:{periodicity}
{periodicity} payment:{period_payment}$
Total paid:{total_paid}$
Total interest:{total_interest}$
Total periods:{total_periods}
+ + + + + + diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index c3df5b82fff..bea92481d12 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -825,6 +825,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/compta/loan/index.php?leftmenu=tax_loan&mainmenu=accountancy",$langs->trans("Loans"),1,$user->rights->loan->read, '', $mainmenu, 'tax_loan'); if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/card.php?leftmenu=tax_loan&action=create",$langs->trans("NewLoan"),2,$user->rights->loan->write); if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/index.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read); + if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/calculator.php?leftmenu=tax_loan",$langs->trans("Calculator"),2,$user->rights->loan->read); } // Social contributions diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 6be2f13a101..37523b7408b 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -9,6 +9,12 @@ Nbterms=Number of terms LoanAccountancyCapitalCode=Accountancy code capital LoanAccountancyInsuranceCode=Accountancy code insurance LoanAccountancyInterestCode=Accountancy code interest +Calculator=Simulator +CalculatorLoan=Loan simulator +ErrorLoanCapital=Loan amount has to be numeric and greater than zero. +ErrorLoanLength=Loan length has to be numeric and greater than zero. +ErrorLoanInterest=Annual interest has to be numeric and greater than zero. +# Admin ConfigLoan=Configuration of the module loan LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang index d230f7f0582..c699388e0c0 100644 --- a/htdocs/langs/fr_FR/loan.lang +++ b/htdocs/langs/fr_FR/loan.lang @@ -9,6 +9,12 @@ Nbterms=Nombre d'échéances LoanAccountancyCapitalCode=Compte comptable capital LoanAccountancyInsuranceCode=Compte comptable assurance LoanAccountancyInterestCode=Compte comptable intérêts +Calculator=Simulateur +CalculatorLoan=Simulateur d'emprunt +ErrorLoanCapital=Le capital de l'emprunt doit être au format numérique et supérieur à zéro. +ErrorLoanLength=La durée de l'emprunt doit être au format numérique et supérieur à zéro. +ErrorLoanInterest=Les intérêts d'emprunt doivent être au format numérique et supérieur à zéro. +# Admin ConfigLoan=Configuration du module emprunt LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Compte comptable capital par défaut LOAN_ACCOUNTING_ACCOUNT_INTEREST=Compte comptable intérêts par défaut From 7fa2b6b3ebea20771d330ed97a5c339d2cdf2e2a Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 6 Oct 2014 05:34:45 +0200 Subject: [PATCH 012/412] Update --- htdocs/compta/loan/calculator.php | 223 ------------------------ htdocs/compta/loan/calculator.tpl | 150 ---------------- htdocs/compta/loan/card.php | 2 +- htdocs/core/menus/standard/eldy.lib.php | 1 - htdocs/langs/en_US/loan.lang | 4 +- htdocs/langs/fr_FR/loan.lang | 4 +- 6 files changed, 5 insertions(+), 379 deletions(-) delete mode 100644 htdocs/compta/loan/calculator.php delete mode 100644 htdocs/compta/loan/calculator.tpl diff --git a/htdocs/compta/loan/calculator.php b/htdocs/compta/loan/calculator.php deleted file mode 100644 index 562ce2c27d5..00000000000 --- a/htdocs/compta/loan/calculator.php +++ /dev/null @@ -1,223 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/compta/loan/calculator.php - * \ingroup loan - * \brief Calculator for loan - */ - -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; - -$langs->load("loan"); -$langs->load("compta"); -$langs->load("banks"); -$langs->load("bills"); - -// Security check -$socid = isset($GETPOST["socid"])?$GETPOST["socid"]:''; -if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'loan', '', '', ''); - -$action=GETPOST("action"); - -/* Defining Variables */ -$periods = array( - 52 => $langs->trans("Weekly"), - 26 => $langs->trans("Bi-weekly"), - 12 => $langs->trans("Monthly"), - 6 => $langs->trans("Bi-monthly"), - 4 => $langs->trans("Quarterly"), - 2 => $langs->trans("Semi-annually"), - 1 => $langs->trans("Annually") - ); - -$loan_capital = isset($GETPOST("loan_capital")) ? $GETPOST("loan_capital") : 0; -$loan_length = isset($GETPOST("loan_length")) ? $GETPOST("loan_length") : 0; -$loan_interest = isset(GETPOST("loan_interest")) ? $GETPOST("loan_interest") : 0; -$pay_periodicity = isset(GETPOST("pay_periodicity")) ? $GETPOST("pay_periodicity") : 12; -$periodicity = $periods[$pay_periodicity]; - -$pay_periods = ''; -foreach($periods as $value => $name) -{ - $selected = ($pay_periodicity == $value) ? 'selected' : ''; -} - -if ($action == 'calculate') -{ - /* Checking Variables */ - $error = 0; - - if(!is_numeric($loan_capital) || $loan_capital <= 0) - { - // $this->error="ErrorLoanCapital"; - return -1; - } - if(!is_numeric($loan_length) || $loan_length <= 0) - { - // $this->error="ErrorLoanLength"; - return -1; - } - if(!is_numeric($loan_interest) or $loan_interest <= 0) - { - // $this->error="ErrorLoanInterest"; - return -1; - } - - /* - * Calculating - */ - if(isset($_GET['action'])) - { - $c_balance = $loan_capital; - $total_periods = $loan_length * $pay_periodicity; - $interest_percent = $loan_interest / 100; - $period_interest = $interest_percent / $pay_periodicity; - $c_period_payment = $loan_capital * ($period_interest / (1 - pow((1 + $period_interest), -($total_periods)))); - $total_paid = number_format($c_period_payment * $total_periods, 2, '.', ' '); - $total_interest = number_format($c_period_payment * $total_periods - $loan_capital, 2, '.', ' '); - $total_principal = number_format($loan_capital, 2, '.', ' '); - - $loan_capital = number_format($loan_capital, 2, '.', ' '); - $loan_interest = number_format($loan_interest, 2, '.', ' '); - $period_payment = number_format($c_period_payment, 2, '.', ' '); - - for($period = 1; $period <= $total_periods; $period++) - { - $c_interest = $c_balance * $period_interest; - $c_principal = $c_period_payment - $c_interest; - $c_balance -= $c_principal; - - $interest = number_format($c_interest, 2, '.', ' '); - $principal = number_format($c_principal, 2, '.', ' '); - $balance = number_format($c_balance, 2, '.', ' '); - - $evenrow_row_modifier = ($period % 2) ? '' : 'class=evenrow'; - } - } - else - { - $amortization_table = ''; - $loan_summary = ''; - } -} - -/* - * View - */ - -$help_url='EN:Module_Loan|FR:Module_Emprunt'; -llxHeader("",$langs->trans("Loan"),$help_url); - -print_fiche_titre($langs->trans("CalculatorLoan")); - -print ''; - -print '' . "\n"; -print ''; -print ''; - -// Capital -print ''; - -// Length -print ''; - -// Interest -print ''; - -print '
'.$langs->trans("Capital").'
'.$langs->trans("LengthByYears").'
'.$langs->trans("Interest").' %
'; - -print '
'; - -print ''; - -if ($action == 'calculate') -{ -/* - - - - - - {amortization_table_rows} - - - -
PeriodInterest PaidPrincipal PaidRemaining Balance
Totals:{total_interest}${total_principal}$ 
- - - - - {period} - {interest}$ - {principal}$ - {balance}$ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Loan Summary
Loan amount:{loan_amount}$
Loan length:{loan_length} years
Annual interest:{annual_interest}%
Pay periodicity:{periodicity}
{periodicity} payment:{period_payment}$
Total paid:{total_paid}$
Total interest:{total_interest}$
Total periods:{total_periods}
- - */ -} -else -{ - -} - -$db->close(); - -llxFooter(); diff --git a/htdocs/compta/loan/calculator.tpl b/htdocs/compta/loan/calculator.tpl deleted file mode 100644 index 7efbca9924b..00000000000 --- a/htdocs/compta/loan/calculator.tpl +++ /dev/null @@ -1,150 +0,0 @@ - - - - Loan Calculator - - - - - - - - - - -
- {error} - - - - - -
- {loan_summary} - {loan_parameters_form} - - {amortization_table} -
-
- - - -
- - - - - - - - - - -
Loan Parameters
- - - - - - - - - - - - - - - - - - - - -
Loan amount: $
Loan length: years
Annual interest: %
Pay periodicity: - -
-
Powered by PC Calculators
-
- - - - - - - - - - - - {amortization_table_rows} - - - -
PeriodInterest PaidPrincipal PaidRemaining Balance
Totals:{total_interest}${total_principal}$ 
- - - - - {period} - {interest}$ - {principal}$ - {balance}$ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Loan Summary
Loan amount:{loan_amount}$
Loan length:{loan_length} years
Annual interest:{annual_interest}%
Pay periodicity:{periodicity}
{periodicity} payment:{period_payment}$
Total paid:{total_paid}$
Total interest:{total_interest}$
Total periods:{total_periods}
- - - - - - diff --git a/htdocs/compta/loan/card.php b/htdocs/compta/loan/card.php index c97ca6d84b0..e49aee1b61f 100644 --- a/htdocs/compta/loan/card.php +++ b/htdocs/compta/loan/card.php @@ -297,7 +297,7 @@ if ($id > 0) if ($action == 'edit') { - print "
id&action=update\" method=\"post\">"; + print 'id&action=update" method="POST">'; print ''; } diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 86e74cfcc5f..1e4f1197cb0 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -834,7 +834,6 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/compta/loan/index.php?leftmenu=tax_loan&mainmenu=accountancy",$langs->trans("Loans"),1,$user->rights->loan->read, '', $mainmenu, 'tax_loan'); if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/card.php?leftmenu=tax_loan&action=create",$langs->trans("NewLoan"),2,$user->rights->loan->write); if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/index.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read); - if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/calculator.php?leftmenu=tax_loan",$langs->trans("Calculator"),2,$user->rights->loan->read); } // Social contributions diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 37523b7408b..10fb0249f6d 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -9,8 +9,8 @@ Nbterms=Number of terms LoanAccountancyCapitalCode=Accountancy code capital LoanAccountancyInsuranceCode=Accountancy code insurance LoanAccountancyInterestCode=Accountancy code interest -Calculator=Simulator -CalculatorLoan=Loan simulator +ConfirmDeleteLoan=Confirm deleting this loan +ConfirmPayLoan=Confirm classify paid this loan ErrorLoanCapital=Loan amount has to be numeric and greater than zero. ErrorLoanLength=Loan length has to be numeric and greater than zero. ErrorLoanInterest=Annual interest has to be numeric and greater than zero. diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang index c699388e0c0..1e54f90e2be 100644 --- a/htdocs/langs/fr_FR/loan.lang +++ b/htdocs/langs/fr_FR/loan.lang @@ -9,8 +9,8 @@ Nbterms=Nombre d'échéances LoanAccountancyCapitalCode=Compte comptable capital LoanAccountancyInsuranceCode=Compte comptable assurance LoanAccountancyInterestCode=Compte comptable intérêts -Calculator=Simulateur -CalculatorLoan=Simulateur d'emprunt +ConfirmDeleteLoan=Confirmation de supression de cet emprunt +ConfirmPayLoan=Confirmation que cet emprunt est classé comme payé ErrorLoanCapital=Le capital de l'emprunt doit être au format numérique et supérieur à zéro. ErrorLoanLength=La durée de l'emprunt doit être au format numérique et supérieur à zéro. ErrorLoanInterest=Les intérêts d'emprunt doivent être au format numérique et supérieur à zéro. From aecb9856593d36d2226a6e952d51c433a052f1d9 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 4 Nov 2014 20:53:07 +0100 Subject: [PATCH 013/412] Update work --- htdocs/compta/loan/card.php | 28 ++++++++++++++-------------- htdocs/compta/loan/index.php | 23 +++++++++++++++++------ htdocs/compta/salaries/card.php | 2 +- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/htdocs/compta/loan/card.php b/htdocs/compta/loan/card.php index e49aee1b61f..49e3884562c 100644 --- a/htdocs/compta/loan/card.php +++ b/htdocs/compta/loan/card.php @@ -69,12 +69,12 @@ if ($action == 'confirm_delete' && $confirm == 'yes') } } - // Add loan if ($action == 'add' && $user->rights->loan->write) { - $datestart=dol_mktime(12,0,0, $GETPOST("startmonth"), $GETPOST("startday"), $GETPOST("startyear")); - $dateend=dol_mktime(12,0,0, $GETPOST("endmonth"), $GETPOST("endday"), $GETPOST("endyear")); + $datestart=@dol_mktime(12,0,0, $_POST["startmonth"], $_POST["startday"], $_POST["startyear"]); + $dateend=@dol_mktime(12,0,0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]); + if (! $datestart) { setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateStart")), 'errors'); @@ -94,17 +94,17 @@ if ($action == 'add' && $user->rights->loan->write) { $object = new Loan($db); - $object->label = GETPOST("label"); - $object->fk_bank = GETPOST("accountid"); - $object->capital = GETPOST("capital"); - $object->datestart = $datestart; - $object->dateend = $dateend; - $object->nbterm = GETPOST("nbterm"); - $object->rate = GETPOST("rate"); + $object->label = $_POST["label"]; + $object->fk_bank = $_POST["accountid"]; + $object->capital = $_POST["capital"]; + $object->datestart = $datestart; + $object->dateend = $dateend; + $object->nbterm = $_POST["nbterm"]; + $object->rate = $_POST["rate"]; - $object->account_capital = GETPOST("accountancy_account_capital"); - $object->account_insurance = GETPOST("accountancy_account_insurance"); - $object->account_interest = GETPOST("accountancy_account_interest"); + $object->account_capital = $_POST["accountancy_account_capital"]; + $object->account_insurance = $_POST["accountancy_account_insurance"]; + $object->account_interest = $_POST["accountancy_account_interest"]; $id=$object->create($user); if ($id <= 0) @@ -173,7 +173,7 @@ if ($action == 'create') $datec = dol_mktime(12, 0, 0, GETPOST('remonth','int'), GETPOST('reday','int'), GETPOST('reyear','int')); - print '' . "\n"; + print '' . "\n"; print ''; print ''; diff --git a/htdocs/compta/loan/index.php b/htdocs/compta/loan/index.php index a4432ba9ced..2834ce2069f 100644 --- a/htdocs/compta/loan/index.php +++ b/htdocs/compta/loan/index.php @@ -45,8 +45,16 @@ if (! $sortfield) $sortfield="l.rowid"; if (! $sortorder) $sortorder="DESC"; $limit = $conf->liste_limit; +$search_ref=GETPOST('search_ref','int'); $search_label=GETPOST('search_label','alpha'); -$filtre=$_GET["filtre"]; +$filtre=GETPOST("filtre"); + +if (GETPOST("button_removefilter")) +{ + $search_ref=""; + $search_label=""; + $search_amount=""; +} /* * View @@ -56,13 +64,14 @@ $loan = new Loan($db); llxHeader(); -$sql = "SELECT l.rowid as id, l.label, l.capital, l.datestart, l.dateend,"; +$sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend,"; $sql.= " SUM(pl.amount) as alreadypayed"; $sql.= " FROM ".MAIN_DB_PREFIX."loan as l,"; $sql.= " ".MAIN_DB_PREFIX."payment_loan as pl"; $sql.= " WHERE pl.fk_loan = l.rowid"; $sql.= " AND l.entity = ".$conf->entity; -if (GETPOST("search_label")) $sql.=" AND l.label LIKE '%".$db->escape(GETPOST("search_label"))."%'"; +if (GETPOST("search_ref")) $sql.=" AND (l.rowid = ".$db->escape($search_ref).")"; +if (GETPOST("search_label")) $sql.=" AND l.label LIKE '%".$db->escape($search_label)."%'"; if ($filtre) { $filtre=str_replace(":","=",$filtre); @@ -83,7 +92,7 @@ if ($resql) print ''."\n"; print ''; print ''; - print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"id","",$param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"l.rowid","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Label"),$_SERVER["PHP_SELF"],"l.label","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Capital"),$_SERVER["PHP_SELF"],"l.capital","",$param,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"l.datestart","",$param,'align="center"',$sortfield,$sortorder); @@ -96,9 +105,11 @@ if ($resql) print ''; print ''; print ''; - print '\n"; + print ''; + print ''; + print ''; $var=true; while ($i < min($num,$limit)) diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php index 3ee796c6134..c6e492cd787 100644 --- a/htdocs/compta/salaries/card.php +++ b/htdocs/compta/salaries/card.php @@ -206,7 +206,7 @@ if ($action == 'create') $datesp=dol_get_first_day($pastmonthyear,$pastmonth,false); $dateep=dol_get_last_day($pastmonthyear,$pastmonth,false); } - print "\n"; + print ''; print ''; print ''; From 3042bf4dc2a4fbaab5d759fcf94a2b809b1de2a8 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 10 Nov 2014 06:08:50 +0100 Subject: [PATCH 014/412] Correct lot of bugs --- htdocs/compta/loan/card.php | 176 +++++++++--------- htdocs/compta/loan/class/loan.class.php | 82 ++++---- .../compta/loan/class/paymentloan.class.php | 29 ++- htdocs/compta/loan/index.php | 42 ++--- htdocs/compta/loan/payment/card.php | 19 +- htdocs/compta/loan/payment/payment.php | 74 +++++--- .../install/mysql/migration/3.6.0-3.7.0.sql | 42 ----- .../install/mysql/migration/3.7.0-3.8.0.sql | 63 +++++++ .../install/mysql/tables/llx_payment_loan.sql | 4 +- htdocs/langs/en_US/loan.lang | 3 + htdocs/langs/fr_FR/loan.lang | 3 + 11 files changed, 306 insertions(+), 231 deletions(-) create mode 100644 htdocs/install/mysql/migration/3.7.0-3.8.0.sql diff --git a/htdocs/compta/loan/card.php b/htdocs/compta/loan/card.php index 49e3884562c..88a4429e7c5 100644 --- a/htdocs/compta/loan/card.php +++ b/htdocs/compta/loan/card.php @@ -33,13 +33,15 @@ $langs->load("loan"); $id=GETPOST('id','int'); $action=GETPOST('action'); $confirm=GETPOST('confirm'); -$cancel=GETPOST('cancel'); +$cancel=GETPOST('cancel','alpha'); // Security check $socid = GETPOST('socid','int'); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'loan', $id, '',''); +$object = new Loan($db); + /* * Actions */ @@ -47,7 +49,6 @@ $result = restrictedArea($user, 'loan', $id, '',''); // Classify paid if ($action == 'confirm_paid' && $confirm == 'yes') { - $object = new Loan($db); $object->fetch($id); $result = $object->set_paid($user); } @@ -55,7 +56,6 @@ if ($action == 'confirm_paid' && $confirm == 'yes') // Delete loan if ($action == 'confirm_delete' && $confirm == 'yes') { - $object = new Loan($db); $object->fetch($id); $result=$object->delete($user); if ($result > 0) @@ -72,86 +72,88 @@ if ($action == 'confirm_delete' && $confirm == 'yes') // Add loan if ($action == 'add' && $user->rights->loan->write) { - $datestart=@dol_mktime(12,0,0, $_POST["startmonth"], $_POST["startday"], $_POST["startyear"]); - $dateend=@dol_mktime(12,0,0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]); - - if (! $datestart) + if (! $cancel) { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateStart")), 'errors'); - $action = 'create'; - } - elseif (! $dateend) - { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateEnd")), 'errors'); - $action = 'create'; - } - elseif (! $_POST["capital"]) - { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Capital")), 'errors'); - $action = 'create'; - } - else - { - $object = new Loan($db); - - $object->label = $_POST["label"]; - $object->fk_bank = $_POST["accountid"]; - $object->capital = $_POST["capital"]; - $object->datestart = $datestart; - $object->dateend = $dateend; - $object->nbterm = $_POST["nbterm"]; - $object->rate = $_POST["rate"]; + $datestart=@dol_mktime(12,0,0, $_POST["startmonth"], $_POST["startday"], $_POST["startyear"]); + $dateend=@dol_mktime(12,0,0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]); - $object->account_capital = $_POST["accountancy_account_capital"]; - $object->account_insurance = $_POST["accountancy_account_insurance"]; - $object->account_interest = $_POST["accountancy_account_interest"]; - - $id=$object->create($user); - if ($id <= 0) + if (! $datestart) { - setEventMessage($object->error, 'errors'); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateStart")), 'errors'); + $action = 'create'; } - } -} - - -if ($action == 'update' && ! $cancel && $user->rights->loan->write) -{ - $datestart=dol_mktime(12,0,0, $GETPOST("startmonth"), $GETPOST("startday"), $GETPOST("startyear")); - $dateend=dol_mktime(12,0,0, $GETPOST("endmonth"), $GETPOST("endday"), $GETPOST("endyear")); - if (! $datestart) - { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateStart")), 'errors'); - $action = 'edit'; - } - elseif (! $dateend) - { - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateEnd")), 'errors'); - $action = 'edit'; - } - else - { - $object = new Loan($db); - if ($object->fetch($id)) + elseif (! $dateend) { - $object->label = $GETPOST("label"); - $object->datestart = $datestart; - $object->dateend = $dateend; + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("DateEnd")), 'errors'); + $action = 'create'; } - - if ($object->update($id, $user) > 0) + elseif (! $_POST["capital"]) { - $action = ''; + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Capital")), 'errors'); + $action = 'create'; } else { - $action = 'edit'; - setEventMessage($object->error, 'errors'); + $object->label = $_POST["label"]; + $object->fk_bank = $_POST["accountid"]; + $object->capital = $_POST["capital"]; + $object->datestart = $datestart; + $object->dateend = $dateend; + $object->nbterm = $_POST["nbterm"]; + $object->rate = $_POST["rate"]; + + $object->account_capital = $_POST["accountancy_account_capital"]; + $object->account_insurance = $_POST["accountancy_account_insurance"]; + $object->account_interest = $_POST["accountancy_account_interest"]; + + $id=$object->create($user); + if ($id <= 0) + { + setEventMessage($object->error, 'errors'); + } } } + else + { + header("Location: index.php"); + exit(); + } } +// Update record +else if ($action == 'update' && $user->rights->loan->write) +{ + if (! $cancel) + { + $result = $object->fetch($id); + + if ($object->fetch($id)) + { + $object->label = GETPOST("label"); + $object->datestart = dol_mktime(12, 0, 0, GETPOST('startmonth','int'), GETPOST('startday','int'), GETPOST('startyear','int')); + $object->dateend = dol_mktime(12, 0, 0, GETPOST('endmonth','int'), GETPOST('endday','int'), GETPOST('endyear','int')); + $object->nbterm = GETPOST("nbterm"); + $object->rate = GETPOST("rate"); + } + + $result = $object->update($user); + if ($result > 0) + { + header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); + exit; + } + else + { + setEventMessage($object->error, 'errors'); + } + } + else + { + header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id); + exit; + } +} /* * View @@ -212,10 +214,10 @@ if ($action == 'create') print ''; // Number of terms - print ''; + print ''; // Rate - print ''; + print ''; // Note print ''; @@ -273,7 +275,6 @@ if ($action == 'create') // View if ($id > 0) { - $object = new Loan($db); $result = $object->fetch($id); if ($result > 0) @@ -297,8 +298,10 @@ if ($id > 0) if ($action == 'edit') { - print 'id&action=update" method="POST">'; - print ''; + print '' . "\n"; + print ''; + print ''; + print ''; } print '
  '; + print ''; print ''; - print "
'.$langs->trans("Nbterms").'
'.$langs->trans("Nbterms").'
'.$langs->trans("Rate").'
'.$langs->trans("Rate").' %
'; @@ -353,7 +356,7 @@ if ($id > 0) print ''; // Rate - print ''; + print ''; // Status print ''; @@ -378,8 +381,9 @@ if ($id > 0) /* * Payments */ - $sql = "SELECT p.rowid, p.num_payment, datep as dp, p.amount,"; - $sql.= "c.libelle as paiement_type"; + $sql = "SELECT p.rowid, p.num_payment, datep as dp,"; + $sql.= " p.amount_capital, p.amount_insurance, p.amount_interest,"; + $sql.= " c.libelle as paiement_type"; $sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p"; $sql.= ", ".MAIN_DB_PREFIX."c_paiement as c "; $sql.= ", ".MAIN_DB_PREFIX."loan as l"; @@ -400,7 +404,9 @@ if ($id > 0) print ''; print ''; print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; @@ -413,21 +419,23 @@ if ($id > 0) print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''; print '\n"; print "\n"; - print '\n"; + print '\n"; + print '\n"; + print '\n"; print ""; - $totalpaid += $objp->amount; + $totalpaid += $objp->amount_capital; $i++; } if ($object->paid == 0) { - print "\n"; - print "\n"; + print ''; + print ''; $staytopay = $object->capital - $totalpaid; - print ""; - print "\n"; + print ''; + print ''; } print "
'.$langs->trans("Nbterms").''.$object->nbterm.'
'.$langs->trans("Rate").''.$object->rate.'
'.$langs->trans("Rate").''.$object->rate.' %
'.$langs->trans("Status").''.$object->getLibStatut(4, $totalpaye).'
'.$langs->trans("RefPayment").''.$langs->trans("Date").''.$langs->trans("Type").''.$langs->trans("Amount").''.$langs->trans("Insurance").''.$langs->trans("Interest").''.$langs->trans("Capital").' 
'.dol_print_date($db->jdate($objp->dp),'day')."".$objp->paiement_type.' '.$objp->num_payment."'.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)."'.price($objp->amount_insurance)." ".$langs->trans("Currency".$conf->currency)."'.price($objp->amount_interest)." ".$langs->trans("Currency".$conf->currency)."'.price($objp->amount_capital)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AlreadyPaid")." :".price($totalpaid)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AmountExpected")." :".price($object->capital)." ".$langs->trans("Currency".$conf->currency)."
'.$langs->trans("AlreadyPaid").' :'.price($totalpaid).' '.$langs->trans("Currency".$conf->currency).'
'.$langs->trans("AmountExpected").' :'.price($object->capital).' '.$langs->trans("Currency".$conf->currency).'
".$langs->trans("RemainderToPay")." :".price($staytopay)." ".$langs->trans("Currency".$conf->currency)."
'.$langs->trans("RemainderToPay").' :'.price($staytopay).' '.$langs->trans("Currency".$conf->currency).'
"; $db->free($resql); @@ -444,7 +452,7 @@ if ($id > 0) */ if ($action != 'edit') { - print "
\n"; + print '
'; // Edit if ($user->rights->loan->write) diff --git a/htdocs/compta/loan/class/loan.class.php b/htdocs/compta/loan/class/loan.class.php index 07b842b708e..b8fcf04728f 100644 --- a/htdocs/compta/loan/class/loan.class.php +++ b/htdocs/compta/loan/class/loan.class.php @@ -263,8 +263,8 @@ class Loan extends CommonObject /** * Update loan * - * @param User $user Utilisateur qui modifie - * @return int <0 si erreur, >0 si ok + * @param User $user User who modified + * @return int <0 if error, >0 if ok */ function update($user) { @@ -273,7 +273,8 @@ class Loan extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."loan"; $sql.= " SET label='".$this->db->escape($this->label)."',"; $sql.= " datestart='".$this->db->idate($this->datestart)."',"; - $sql.= " dateend='".$this->db->idate($this->dateend)."'"; + $sql.= " dateend='".$this->db->idate($this->dateend)."',"; + $sql.= " fk_user_modif = ".$user->id; $sql.= " WHERE rowid=".$this->id; dol_syslog(get_class($this)."::update", LOG_DEBUG); @@ -379,7 +380,7 @@ class Loan extends CommonObject * @param int $maxlen Label max length * @return string Chaine with URL */ - function getNameUrl($withpicto=0,$maxlen=0) + function getLinkUrl($withpicto=0,$maxlen=0) { global $langs; @@ -432,40 +433,43 @@ class Loan extends CommonObject * @param int $id Id of record * @return void */ - function info($id) - { - $sql = "SELECT l.rowid, l.tms as datem, l.fk_user_author as user_author, l.datec as datec"; - $sql.= " FROM ".MAIN_DB_PREFIX."loan as l"; - $sql.= " WHERE l.rowid = ".$id; + function info($id) + { + $sql = 'SELECT l.rowid, l.datec, l.fk_user_author, l.fk_user_modif,'; + $sql.= ' l.tms'; + $sql.= ' FROM '.MAIN_DB_PREFIX.'loan as l'; + $sql.= ' WHERE l.rowid = '.$id; - dol_syslog(get_class($this)."::info", LOG_DEBUG); - $result=$this->db->query($sql); - if ($result) - { - if ($this->db->num_rows($result)) - { - $obj = $this->db->fetch_object($result); - - $this->id = $obj->rowid; - - if ($obj->user_author) { - $cuser = new User($this->db); - $cuser->fetch($obj->user_author); - $this->user_creation = $cuser; - } - - $this->date_creation = $this->db->jdate($obj->datec); - $this->date_modification = $this->db->jdate($obj->datem); - - } - - $this->db->free($result); - - } - else - { - dol_print_error($this->db); - } - } -} + dol_syslog(get_class($this).'::info', LOG_DEBUG); + $result = $this->db->query($sql); + if ($result) + { + if ($this->db->num_rows($result)) + { + $obj = $this->db->fetch_object($result); + $this->id = $obj->rowid; + if ($obj->fk_user_author) + { + $cuser = new User($this->db); + $cuser->fetch($obj->fk_user_author); + $this->user_creation = $cuser; + } + if ($obj->fk_user_modif) + { + $muser = new User($this->db); + $muser->fetch($obj->fk_user_modif); + $this->user_modification = $muser; + } + $this->date_creation = $this->db->jdate($obj->datec); + if (empty($obj->fk_user_modif)) $obj->tms = ""; + $this->date_modification = $this->db->jdate($obj->tms); + } + $this->db->free($result); + } + else + { + dol_print_error($this->db); + } + } +} \ No newline at end of file diff --git a/htdocs/compta/loan/class/paymentloan.class.php b/htdocs/compta/loan/class/paymentloan.class.php index 0a558fc9bf4..944cfe4ce2f 100644 --- a/htdocs/compta/loan/class/paymentloan.class.php +++ b/htdocs/compta/loan/class/paymentloan.class.php @@ -39,8 +39,10 @@ class PaymentLoan extends CommonObject var $datec=''; var $tms=''; var $datep=''; - var $amount; // Total amount of payment var $amounts=array(); // Array of amounts + var $amount_capital; // Total amount of payment + var $amount_insurance; + var $amount_interest; var $fk_typepayment; var $num_payment; var $note; @@ -82,7 +84,9 @@ class PaymentLoan extends CommonObject // Clean parameters if (isset($this->fk_loan)) $this->fk_loan = trim($this->fk_loan); - if (isset($this->amount)) $this->amount = trim($this->amount); + if (isset($this->amount_capital)) $this->amount_capital = trim($this->amount_capital); + if (isset($this->amount_insurance)) $this->amount_insurance = trim($this->amount_insurance); + if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest); if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment); if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment); if (isset($this->note)) $this->note = trim($this->note); @@ -107,7 +111,7 @@ class PaymentLoan extends CommonObject if ($totalamount != 0) { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_loan (fk_loan, datec, datep, amount,"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_loan (fk_loan, datec, datep, amount_capital, amount_insurance, amount_interest,"; $sql.= " fk_typepayment, num_payment, note, fk_user_creat, fk_bank)"; $sql.= " VALUES ($this->chid, '".$this->db->idate($now)."',"; $sql.= " '".$this->db->idate($this->datepaid)."',"; @@ -130,7 +134,7 @@ class PaymentLoan extends CommonObject if ($totalamount != 0 && ! $error) { - $this->amount=$totalamount; + $this->amount_capital=$totalamount; $this->total=$totalamount; // deprecated $this->db->commit(); return $this->id; @@ -158,7 +162,9 @@ class PaymentLoan extends CommonObject $sql.= " t.datec,"; $sql.= " t.tms,"; $sql.= " t.datep,"; - $sql.= " t.amount,"; + $sql.= " t.amount_capital,"; + $sql.= " t.amount_insurance,"; + $sql.= " t.amount_interest,"; $sql.= " t.fk_typepayment,"; $sql.= " t.num_payment,"; $sql.= " t.note,"; @@ -186,7 +192,9 @@ class PaymentLoan extends CommonObject $this->datec = $this->db->jdate($obj->datec); $this->tms = $this->db->jdate($obj->tms); $this->datep = $this->db->jdate($obj->datep); - $this->amount = $obj->amount; + $this->amount_capital = $obj->amount_capital; + $this->amount_insurance = $obj->amount_insurance; + $this->amount_interest = $obj->amount_interest; $this->fk_typepayment = $obj->fk_typepayment; $this->num_payment = $obj->num_payment; $this->note = $obj->note; @@ -225,9 +233,10 @@ class PaymentLoan extends CommonObject $error=0; // Clean parameters - if (isset($this->fk_loan)) $this->fk_loan=trim($this->fk_loan); - if (isset($this->amount)) $this->amount=trim($this->amount); + if (isset($this->amount_capital)) $this->amount_capital=trim($this->amount_capital); + if (isset($this->amount_insurance)) $this->amount_insurance=trim($this->amount_insurance); + if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest); if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment); if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); if (isset($this->note)) $this->note=trim($this->note); @@ -245,7 +254,9 @@ class PaymentLoan extends CommonObject $sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').","; $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').","; $sql.= " datep=".(dol_strlen($this->datep)!=0 ? "'".$this->db->idate($this->datep)."'" : 'null').","; - $sql.= " amount=".(isset($this->amount)?$this->amount:"null").","; + $sql.= " amount_capital=".(isset($this->amount_capital)?$this->amount_capital:"null").","; + $sql.= " amount_insurance=".(isset($this->amount_insurance)?$this->amount_insurance:"null").","; + $sql.= " amount_interest=".(isset($this->amount_interest)?$this->amount_interest:"null").","; $sql.= " fk_typepayment=".(isset($this->fk_typepayment)?$this->fk_typepayment:"null").","; $sql.= " num_payment=".(isset($this->num_payment)?"'".$this->db->escape($this->num_payment)."'":"null").","; $sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").","; diff --git a/htdocs/compta/loan/index.php b/htdocs/compta/loan/index.php index 2834ce2069f..720b52de0a1 100644 --- a/htdocs/compta/loan/index.php +++ b/htdocs/compta/loan/index.php @@ -47,6 +47,7 @@ $limit = $conf->liste_limit; $search_ref=GETPOST('search_ref','int'); $search_label=GETPOST('search_label','alpha'); +$search_amount=GETPOST('search_amount','alpha'); $filtre=GETPOST("filtre"); if (GETPOST("button_removefilter")) @@ -60,36 +61,37 @@ if (GETPOST("button_removefilter")) * View */ -$loan = new Loan($db); +$loan_static = new Loan($db); llxHeader(); $sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend,"; -$sql.= " SUM(pl.amount) as alreadypayed"; -$sql.= " FROM ".MAIN_DB_PREFIX."loan as l,"; -$sql.= " ".MAIN_DB_PREFIX."payment_loan as pl"; -$sql.= " WHERE pl.fk_loan = l.rowid"; -$sql.= " AND l.entity = ".$conf->entity; -if (GETPOST("search_ref")) $sql.=" AND (l.rowid = ".$db->escape($search_ref).")"; -if (GETPOST("search_label")) $sql.=" AND l.label LIKE '%".$db->escape($search_label)."%'"; - +$sql.= " SUM(pl.amount_capital) as alreadypayed"; +$sql.= " FROM ".MAIN_DB_PREFIX."loan as l LEFT JOIN ".MAIN_DB_PREFIX."payment_loan AS pl"; +$sql.= " ON l.rowid = pl.fk_loan"; +$sql.= " WHERE l.entity = ".$conf->entity; +if ($search_amount) $sql.=" AND l.capital='".$db->escape(price2num(trim($search_amount)))."'"; +if ($search_ref) $sql.=" AND l.rowid = ".$db->escape($search_ref); +if ($search_label) $sql.=" AND l.label LIKE '%".$db->escape($search_label)."%'"; if ($filtre) { $filtre=str_replace(":","=",$filtre); $sql .= " AND ".$filtre; } +$sql.= " GROUP BY l.rowid, l.label, l.capital, l.datestart, l.dateend"; $sql.= $db->order($sortfield,$sortorder); -$sql.= $db->plimit($limit + 1, $offset); +$sql.= $db->plimit($limit+1, $offset); //print $sql; $resql=$db->query($sql); if ($resql) { $num = $db->num_rows($resql); + $i = 0; + $var=true; print_fiche_titre($langs->trans("Loans")); - $i = 0; - print ''."\n"; + print ''."\n"; print ''; print ''; print_liste_field_titre($langs->trans("Ref"),$_SERVER["PHP_SELF"],"l.rowid","",$param,"",$sortfield,$sortorder); @@ -101,9 +103,9 @@ if ($resql) // Filters lines print ''; - print ''; - print ''; - print ''; + print ''; + print ''; + print ''; print ''; print ''; print ''; - $var=true; while ($i < min($num,$limit)) { $obj = $db->fetch_object($resql); - + $var = !$var; print ""; // Ref - print ''; + print ''; // Label print ''; @@ -134,7 +132,7 @@ if ($resql) // Date start print ''; - print ''; + print ''; print "\n"; diff --git a/htdocs/compta/loan/payment/card.php b/htdocs/compta/loan/payment/card.php index d08c5f8ce0f..4dc1407e8ad 100644 --- a/htdocs/compta/loan/payment/card.php +++ b/htdocs/compta/loan/payment/card.php @@ -118,7 +118,6 @@ if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->loan->wri llxHeader(); $loan = new Loan($db); - $form = new Form($db); $h=0; @@ -168,7 +167,9 @@ print ''; // Amount -print ''; +print ''; +print ''; +print ''; // Note print ''; @@ -198,7 +199,7 @@ print '
   '; print ''; @@ -111,19 +113,15 @@ if ($resql) print '
'; - $loan->id = $obj->id; - print $loan->getNameUrl(1,'20'); - print ''.img_object($langs->trans("ShowLoan"),"label").' '.$obj->rowid.''.dol_trunc($obj->label,42).''.dol_print_date($db->jdate($obj->datestart), 'day').''.$loan->LibStatut($obj->paid,5,$obj->alreadypayed).''.$loan_static->LibStatut($obj->paid,5,$obj->alreadypayed).'
'.$langs->trans('Mode').''.$lan print '
'.$langs->trans('Number').''.$payment->num_payment.'
'.$langs->trans('Amount').''.price($payment->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'
'.$langs->trans('Capital').''.price($payment->amount_capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'
'.$langs->trans('Insurance').''.price($payment->amount_insurance, 0, $outputlangs, 1, -1, -1, $conf->currency).'
'.$langs->trans('Interest').''.price($payment->amount_interest, 0, $outputlangs, 1, -1, -1, $conf->currency).'
'.$langs->trans('Note').''.nl2br($payment->note).'
'; */ $disable_delete = 0; -$sql = 'SELECT l.rowid as id, l.label, l.paid, l.capital as capital, pl.amount'; +$sql = 'SELECT l.rowid as id, l.label, l.paid, l.capital as capital, pl.amount_capital, pl.amount_insurance, pl.amount_interest'; $sql.= ' FROM '.MAIN_DB_PREFIX.'payment_loan as pl,'.MAIN_DB_PREFIX.'loan as l'; $sql.= ' WHERE pl.fk_loan = l.rowid'; $sql.= ' AND l.entity = '.$conf->entity; @@ -234,22 +235,22 @@ if ($resql) // Ref print ''; $loan->fetch($objp->id); - print $loan->getNameUrl(1); + print $loan->getLinkUrl(1); print "\n"; // Label print ''.$objp->label.''; // Expected to pay print ''.price($objp->capital).''; // Status - print ''.$loan->getLibStatut(4,$objp->amount).''; + print ''.$loan->getLibStatut(4,$objp->amount_capital).''; // Amount payed - print ''.price($objp->amount).''; + print ''.price($objp->amount_capital).''; print "\n"; - if ($objp->paye == 1) // If at least one invoice is paid, disable delete + if ($objp->paid == 1) // If at least one invoice is paid, disable delete { $disable_delete = 1; } - $total = $total + $objp->amount; + $total = $total + $objp->amount_capital; $i++; } } @@ -267,7 +268,7 @@ print '
'; /* - * Boutons Actions + * Actions buttons */ print '
'; diff --git a/htdocs/compta/loan/payment/payment.php b/htdocs/compta/loan/payment/payment.php index ed249d8f246..678ca1b8429 100644 --- a/htdocs/compta/loan/payment/payment.php +++ b/htdocs/compta/loan/payment/payment.php @@ -29,9 +29,10 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("bills"); $langs->load("loan"); -$chid=GETPOST("id"); +$chid=GETPOST('id','int'); $action=GETPOST('action'); $amounts = array(); +$cancel=GETPOST('cancel','alpha'); // Security check $socid=0; @@ -47,7 +48,7 @@ if ($action == 'add_payment') { $error=0; - if ($_POST["cancel"]) + if ($cancel) { $loc = DOL_URL_ROOT.'/compta/loan/card.php?id='.$chid; header("Location: ".$loc); @@ -98,12 +99,15 @@ if ($action == 'add_payment') // Create a line of payments $payment = new PaymentLoan($db); - $payment->chid = $chid; - $payment->datepaid = $datepaid; - $payment->amounts = $amounts; // Tableau de montant - $payment->paymenttype = $_POST["paymenttype"]; - $payment->num_payment = $_POST["num_payment"]; - $payment->note = $_POST["note"]; + $payment->chid = $chid; + $payment->datepaid = $datepaid; + $payment->amounts = $amounts; // Tableau de montant + $payment->amount_capital = $_POST["amount_capital"]; + $payment->amount_insurance = $_POST["amount_insurance"]; + $payment->amount_interest = $_POST["amount_interest"]; + $payment->paymenttype = $_POST["paymenttype"]; + $payment->num_payment = $_POST["num_payment"]; + $payment->note = $_POST["note"]; if (! $error) { @@ -177,12 +181,12 @@ if ($_GET["action"] == 'create') print ''; - print ""; + print ''; print ''; - print '\n"; + print '\n"; print '\n"; - print ''; + print ''; $sql = "SELECT sum(p.amount) as total"; $sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p"; @@ -204,7 +208,7 @@ if ($_GET["action"] == 'create') print '
".$langs->trans("Loan")."
'.$langs->trans("Loan").'
'.$langs->trans("Ref").''.$chid.'
'.$langs->trans("DateStart")."".dol_print_date($loan->datestart,'day')."
'.$langs->trans("DateStart").''.dol_print_date($loan->datestart,'day')."
'.$langs->trans("Label").''.$loan->label."
'.$langs->trans("Amount")."".price($loan->capital,0,$outputlangs,1,-1,-1,$conf->currency).'
'.$langs->trans("Amount").''.price($loan->capital,0,$outputlangs,1,-1,-1,$conf->currency).'
'; print ''; - print "'; + print ''; print ''; print '"; print ''; @@ -187,7 +187,7 @@ print ''; print '"; print ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 6a6474c8306..edb27913432 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4446,7 +4446,7 @@ class Form $ret.='
".$langs->trans("Payment").''.$langs->trans("Payment").'
'.$langs->trans("Date").''; @@ -249,10 +253,10 @@ if ($_GET["action"] == 'create') print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; - print ''; + print ''; print "\n"; $var=True; @@ -269,24 +273,44 @@ if ($_GET["action"] == 'create') if ($objp->datestart > 0) { - print "\n"; + print ''; } else { - print "\n"; + print ''; } - print '"; + print '"; - print '"; + print '"; - print '"; + print '"; - print '"; print ''; - print ""; - print ""; - print ""; + print ''; + print ''; + print ''; print ''; print "\n"; } diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 95158c60a4f..0cbede46864 100755 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1099,48 +1099,6 @@ CREATE TABLE llx_usergroup_extrafields ( ALTER TABLE llx_usergroup_extrafields ADD INDEX idx_usergroup_extrafields (fk_object); --- Loan -create table llx_loan -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - entity integer DEFAULT 1 NOT NULL, - datec datetime, - tms timestamp, - label varchar(80) NOT NULL, - fk_bank integer, - capital real default 0 NOT NULL, - datestart date, - dateend date, - nbterm real, - rate double NOT NULL, - note text, - capital_position real default 0, - date_position date, - paid smallint default 0 NOT NULL, - accountancy_account_capital varchar(32), - accountancy_account_insurance varchar(32), - accountancy_account_interest varchar(32), - fk_user_author integer DEFAULT NULL, - fk_user_modif integer DEFAULT NULL, - active tinyint DEFAULT 1 NOT NULL -)ENGINE=innodb; - -create table llx_payment_loan -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - fk_loan integer, - datec datetime, - tms timestamp, - datep datetime, - amount real DEFAULT 0, - fk_typepayment integer NOT NULL, - num_payment varchar(50), - note text, - fk_bank integer NOT NULL, - fk_user_creat integer, - fk_user_modif integer -)ENGINE=innodb; - ALTER TABLE llx_contrat ADD COLUMN model_pdf varchar(255) DEFAULT NULL AFTER note_public; ALTER TABLE llx_c_country ADD COLUMN favorite tinyint DEFAULT 0 AFTER active; diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql new file mode 100644 index 00000000000..93f2197de12 --- /dev/null +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -0,0 +1,63 @@ +-- +-- Be carefull to requests order. +-- This file must be loaded by calling /install/index.php page +-- when current version is 3.8.0 or higher. +-- +-- To rename a table: ALTER TABLE llx_table RENAME TO llx_table_new; +-- To add a column: ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol; +-- To rename a column: ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60); +-- To drop a column: ALTER TABLE llx_table DROP COLUMN oldname; +-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60); +-- To drop a foreign key: ALTER TABLE llx_table DROP FOREIGN KEY fk_name; +-- To restrict request to Mysql version x.y use -- VMYSQLx.y +-- To restrict request to Pgsql version x.y use -- VPGSQLx.y +-- To make pk to be auto increment (mysql): VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT; +-- To make pk to be auto increment (postgres): VPGSQL8.2 NOT POSSIBLE. MUST DELETE/CREATE TABLE +-- To set a field as NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name DROP NOT NULL; +-- To set a field as default NULL: VPGSQL8.2 ALTER TABLE llx_table ALTER COLUMN name SET DEFAULT NULL; +-- -- VPGSQL8.2 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user); +-- -- VMYSQL4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); + +-- Loan +create table llx_loan +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + entity integer DEFAULT 1 NOT NULL, + datec datetime, + tms timestamp, + label varchar(80) NOT NULL, + fk_bank integer, + capital real default 0 NOT NULL, + datestart date, + dateend date, + nbterm real, + rate double NOT NULL, + note text, + capital_position real default 0, + date_position date, + paid smallint default 0 NOT NULL, + accountancy_account_capital varchar(32), + accountancy_account_insurance varchar(32), + accountancy_account_interest varchar(32), + fk_user_author integer DEFAULT NULL, + fk_user_modif integer DEFAULT NULL, + active tinyint DEFAULT 1 NOT NULL +)ENGINE=innodb; + +create table llx_payment_loan +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_loan integer, + datec datetime, + tms timestamp, + datep datetime, + amount_capital real DEFAULT 0, + amount_insurance real DEFAULT 0, + amount_interest real DEFAULT 0, + fk_typepayment integer NOT NULL, + num_payment varchar(50), + note text, + fk_bank integer NOT NULL, + fk_user_creat integer, + fk_user_modif integer +)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql index 83bb3ac2548..0fb6b566ca5 100644 --- a/htdocs/install/mysql/tables/llx_payment_loan.sql +++ b/htdocs/install/mysql/tables/llx_payment_loan.sql @@ -23,7 +23,9 @@ create table llx_payment_loan datec datetime, -- creation date tms timestamp, datep datetime, -- payment date - amount real DEFAULT 0, + amount_capital real DEFAULT 0, + amount_insurance real DEFAULT 0, + amount_interest real DEFAULT 0, fk_typepayment integer NOT NULL, num_payment varchar(50), note text, diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 10fb0249f6d..9ccff4eecf4 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -5,10 +5,13 @@ NewLoan=New Loan ShowLoan=Show Loan PaymentLoan=Loan payment Capital=Capital +Insurance=Insurance +Interest=Interest Nbterms=Number of terms LoanAccountancyCapitalCode=Accountancy code capital LoanAccountancyInsuranceCode=Accountancy code insurance LoanAccountancyInterestCode=Accountancy code interest +LoanPayment=Loan payment ConfirmDeleteLoan=Confirm deleting this loan ConfirmPayLoan=Confirm classify paid this loan ErrorLoanCapital=Loan amount has to be numeric and greater than zero. diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang index 1e54f90e2be..0a5c6320d5b 100644 --- a/htdocs/langs/fr_FR/loan.lang +++ b/htdocs/langs/fr_FR/loan.lang @@ -5,10 +5,13 @@ NewLoan=Nouvel emprunt ShowLoan=Voir emprunt PaymentLoan=Règlement d'emprunt Capital=Capital +Insurance=Assurance +Interest=Intérêt Nbterms=Nombre d'échéances LoanAccountancyCapitalCode=Compte comptable capital LoanAccountancyInsuranceCode=Compte comptable assurance LoanAccountancyInterestCode=Compte comptable intérêts +LoanPayment=Règlement emprunt ConfirmDeleteLoan=Confirmation de supression de cet emprunt ConfirmPayLoan=Confirmation que cet emprunt est classé comme payé ErrorLoanCapital=Le capital de l'emprunt doit être au format numérique et supérieur à zéro. From 15e44b6e28bc873e20a45133df22679167e02346 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 10 Nov 2014 06:39:37 +0100 Subject: [PATCH 015/412] Correct Auguria menu --- htdocs/core/menus/init_menu_auguria.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index a4833551f5b..bf35ac2806e 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -179,8 +179,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2211__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/card.php?leftmenu=tax_salary&action=create', 'NewPayment', 2, 'companies', '$user->rights->salaries->write', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2212__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary', 'Payments', 2, 'companies', '$user->rights->salaries->read', '', 0, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled', __HANDLER__, 'left', 2220__+MAX_llx_menu__, 'accountancy', 'tax_loan', 2200__+MAX_llx_menu__, '/compta/loan/index.php?leftmenu=tax_loan&mainmenu=accountancy', 'Loans', 1, 'loan', '$user->rights->loan->read', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2221__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/loan/card.php?leftmenu=tax_loan&action=create', 'NewLoan', 2, 'loan', '$user->rights->loan->write', '', 0, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2222__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/loan/index.php?leftmenu=tax_loan', 'Payments', 2, 'companies', '$user->rights->loan->read', '', 0, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2221__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/compta/loan/card.php?leftmenu=tax_loan&action=create', 'NewLoan', 2, 'loan', '$user->rights->loan->write', '', 0, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2222__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/compta/loan/index.php?leftmenu=tax_loan', 'Payments', 2, 'companies', '$user->rights->loan->read', '', 0, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled', __HANDLER__, 'left', 2250__+MAX_llx_menu__, 'accountancy', 'tax_social', 2200__+MAX_llx_menu__, '/compta/sociales/index.php?leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2251__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/sociales/charges.php?leftmenu=tax_social&action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__); From c70539b3b220755594ffd4432f433fbdd7cd3c15 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 12 Nov 2014 07:33:03 +0100 Subject: [PATCH 016/412] Bug & merge --- htdocs/compta/bank/account.php | 2 +- htdocs/fichinter/card.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 858df658158..875fb4a7ab2 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -727,7 +727,7 @@ if ($id > 0 || ! empty($ref)) $loanstatic->label=$links[$key]['label']; } $loanstatic->ref=$loanstatic->label; - print $loanstatic->getNameUrl(1,16); + print $loanstatic->getLinkUrl(1,16); } else if ($links[$key]['type']=='member') { diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 77c7e17ffb5..4ffc31c9cab 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -748,10 +748,10 @@ if ($action == 'send' && ! GETPOST('cancel','alpha') && (empty($conf->global->MA $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; if ($message) { - if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); - $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); - $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); - $actionmsg = dol_concatdesc($actionmsg, $message); + if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc') . ": " . $sendtocc); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic') . ": " . $subject); + $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody') . ":"); + $actionmsg = dol_concatdesc($actionmsg, $message); } $actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref); } From d15ef855da78952f3258c788ead2ba82aff75744 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 12 Nov 2014 07:37:59 +0100 Subject: [PATCH 017/412] Correct travis --- htdocs/langs/tr_TR/main.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang index 87b19cf7d91..63a4c3904c9 100644 --- a/htdocs/langs/tr_TR/main.lang +++ b/htdocs/langs/tr_TR/main.lang @@ -7,7 +7,7 @@ DIRECTION=ltr FONTFORPDF=DejaVuSans FONTSIZEFORPDF=8 SeparatorDecimal=, -SeparatorThousand=, +SeparatorThousand=Space FormatDateShort=%d/%m/%Y FormatDateShortInput=%d/%m/%Y FormatDateShortJava=dd/MM/yyyy From 31b90cf3834b48f4fda5ab2f5b41a56326935943 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 17 Nov 2014 06:38:06 +0100 Subject: [PATCH 018/412] Add 1st version of calculator but need work --- htdocs/compta/loan/calc.php | 385 ++++++++++++++++++++++++ htdocs/core/menus/init_menu_auguria.sql | 1 + htdocs/core/menus/standard/eldy.lib.php | 1 + htdocs/core/modules/modLoan.class.php | 8 + htdocs/langs/en_US/admin.lang | 1 + htdocs/langs/en_US/loan.lang | 2 + 6 files changed, 398 insertions(+) create mode 100644 htdocs/compta/loan/calc.php diff --git a/htdocs/compta/loan/calc.php b/htdocs/compta/loan/calc.php new file mode 100644 index 00000000000..5cc2c830094 --- /dev/null +++ b/htdocs/compta/loan/calc.php @@ -0,0 +1,385 @@ + + * Copyright (C) 2014 Alexandre Spangaro + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +require '../../main.inc.php'; + +$langs->load("loan"); + +/* --------------------------------------------------- * + * Set Form DEFAULT values + * --------------------------------------------------- */ +$default_sale_price = "150000"; +$default_annual_interest_percent = 7.0; +$default_year_term = 30; +$default_down_percent = 10; +$default_show_progress = TRUE; + +/* --------------------------------------------------- * + * Initialize Variables + * --------------------------------------------------- */ +$sale_price = 0; +$annual_interest_percent = 0; +$year_term = 0; +$down_percent = 0; +$this_year_interest_paid = 0; +$this_year_principal_paid = 0; +$form_complete = false; +$show_progress = false; +$monthly_payment = false; +$show_progress = false; +$error = false; + +/* --------------------------------------------------- * + * Set the USER INPUT values + * --------------------------------------------------- */ +if (isset($_REQUEST['form_complete'])) { + $sale_price = $_REQUEST['sale_price']; + $annual_interest_percent = $_REQUEST['annual_interest_percent']; + $year_term = $_REQUEST['year_term']; + $down_percent = $_REQUEST['down_percent']; + $show_progress = (isset($_REQUEST['show_progress'])) ? $_REQUEST['show_progress'] : false; + $form_complete = $_REQUEST['form_complete']; +} + +// This function does the actual mortgage calculations +// by plotting a PVIFA (Present Value Interest Factor of Annuity) +// table... +function get_interest_factor($year_term, $monthly_interest_rate) { + global $base_rate; + + $factor = 0; + $base_rate = 1 + $monthly_interest_rate; + $denominator = $base_rate; + for ($i=0; $i < ($year_term * 12); $i++) { + $factor += (1 / $denominator); + $denominator *= $base_rate; + } + return $factor; +} + +// If the form is complete, we'll start the math +if ($form_complete) { + // We'll set all the numeric values to JUST + // numbers - this will delete any dollars signs, + // commas, spaces, and letters, without invalidating + // the value of the number + $sale_price = preg_replace( "[^0-9.]", "", $sale_price); + $annual_interest_percent = preg_replace( "[^0-9.]", "", $annual_interest_percent); + $year_term = preg_replace( "[^0-9.]", "", $year_term); + $down_percent = preg_replace( "[^0-9.]", "", $down_percent); + + if (((float) $year_term <= 0) || ((float) $sale_price <= 0) || ((float) $annual_interest_percent <= 0)) { + $error = "You must enter a Sale Price of Home, Length of Motgage and Annual Interest Rate"; + } + + if (!$error) { + $month_term = $year_term * 12; + $down_payment = $sale_price * ($down_percent / 100); + $annual_interest_rate = $annual_interest_percent / 100; + $monthly_interest_rate = $annual_interest_rate / 12; + $financing_price = $sale_price - $down_payment; + $monthly_factor = get_interest_factor($year_term, $monthly_interest_rate); + $monthly_payment = $financing_price / $monthly_factor; + } +} else { + if (!$sale_price) { $sale_price = $default_sale_price; } + if (!$annual_interest_percent) { $annual_interest_percent = $default_annual_interest_percent; } + if (!$year_term) { $year_term = $default_year_term; } + if (!$down_percent) { $down_percent = $default_down_percent; } + if (!$show_progress) { $show_progress = $default_show_progress; } +} + +if ($error) { + print("" . $error . "

\n"); + $form_complete = false; +} + +/* + * View + */ + +llxHeader(); + +echo "This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, + based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate. + This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken + into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
"; + +print ''; +print ''; +print '
'.$langs->trans("DateDue").''.$langs->trans("Amount").''.$langs->trans("Capital").''.$langs->trans("AlreadyPaid").''.$langs->trans("RemainderToPay").''.$langs->trans("Amount").''.$langs->trans("Amount").'
".dol_print_date($objp->datestart,'day')."'.dol_print_date($objp->datestart,'day').'!!!!!!'.price($objp->capital)."'.price($objp->capital)."'.price($sumpaid)."'.price($sumpaid)."'.price($objp->capital - $sumpaid)."'.price($objp->capital - $sumpaid)."'; + print ''; if ($sumpaid < $objp->capital) { - $namef = "amount_".$objp->id; - print ''; + $namec = "amount_capital_".$objp->id; + print $langs->trans("Capital") .': '; + } + else + { + print '-'; + } + print '
'; + if ($sumpaid < $objp->capital) + { + $namea = "amount_insurance_".$objp->id; + print $langs->trans("Insurance") .': '; + } + else + { + print '-'; + } + print '
'; + if ($sumpaid < $objp->capital) + { + $namei = "amount_interest_".$objp->id; + print $langs->trans("Interest") .': '; } else { @@ -305,9 +329,9 @@ if ($_GET["action"] == 'create') // Print total print "
'.$langs->trans("Total").':".price($total_ttc)."".price($totalrecu)."".price($total_ttc - $totalrecu).""'.price($total_ttc).'""'.price($totalrecu).'""'.price($total_ttc - $totalrecu).'" 
'; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; + +if (! empty($show_progress)) +{ + print ''; +} +else +{ + print ''; +} + +print ''; +print '
Purchase & Financing Information
Sale Price of Home: '.$langs->trans("Currency".$conf->currency).'
Percentage Down:%
Length of Mortgage:years
Annual Interest Rate:%
Explain Calculations:Show me the calculations and amortizationShow me the calculations and amortization
'; + +print '
    '; +print '
'; + +// If the form has already been calculated, the $down_payment +// and $monthly_payment variables will be figured out, so we can show them in this table +if ($form_complete && $monthly_payment) +{ + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + if ($down_percent < 20) + { + $pmi_per_month = 55 * ($financing_price / 100000); + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; +} + +print '
Mortgage Payment Information
Down Payment:' . number_format($down_payment, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '
Amount Financed:' . number_format($financing_price, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '
Monthly Payment:' . number_format($monthly_payment, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '
(Principal & Interest ONLY)
 '; + print '
'; + echo 'Since you are putting LESS than 20% down, you will need to pay PMI + (Private Mortgage Insurance), which tends + to be about $55 per month for every $100,000 financed (until you have paid off 20% of your loan). This could add + '."\$" . number_format($pmi_per_month, "2", ".", ",").' to your monthly payment.'; + print '
Monthly Payment:' . number_format(($monthly_payment + $pmi_per_month), "2", ".", ",") . $langs->trans("Currency".$conf->currency) . '
'; + print '(Principal & Interest, and PMI)
 '; + print '
'; + + $assessed_price = ($sale_price * .85); + $residential_yearly_tax = ($assessed_price / 1000) * 14; + $residential_monthly_tax = $residential_yearly_tax / 12; + + if ($pmi_per_month) + { + $pmi_text = "PMI and "; + } + + echo "Residential (or Property) Taxes are a little harder to figure out... In Massachusetts, the average resedential tax rate seems + to be around $14 per year for every $1,000 of your property's assessed value."; + + print '

'; + print "Let's say that your property's assessed value is 85% of what you actually paid for it - "; + print number_format($assessed_price, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . 'This would mean that your yearly residential taxes will be around'; + print number_format($residential_yearly_tax, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency); + print 'This could add ' . number_format($residential_monthly_tax, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . 'to your monthly payment'; + print '
TOTAL Monthly Payment:' . number_format(($monthly_payment + $pmi_per_month + $residential_monthly_tax), "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '
'; + print '(including '.$pmi_text.' residential tax)
'; +print ''; + +// This prints the calculation progress and +// the instructions of HOW everything is figured +// out +if ($form_complete && $show_progress) { + $step = 1; + + print '

'; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print '
'. $step++ .''; + echo 'The down payment + = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)

+ ' . number_format($down_payment,"2",".",",") . ' ' . $langs->trans("Currency".$conf->currency) . ' = '.number_format($sale_price,"2",".",",") . ' ' . $langs->trans("Currency".$conf->currency) . ' X + ('.$down_percent.' / 100)'; + print '
' . $step++ . ''; + print 'The interest rate = The annual interest percentage divided by 100

'; + print $annual_interest_rate . ' = ' . $annual_interest_percent . '% / 100'; + print '
'; + print 'The monthly factor = The result of the following formula:'; + print '
' . $step++ . ''; + print 'The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)

'; + print $monthly_interest_rate . ' = ' . $annual_interest_rate . ' / 12'; + print '
' . $step++ . ''; + print 'The month term of the loan in months = The number of years you\'ve taken the loan out for times 12

'; + print $month_term . ' Months = ' . $year_term . ' Years X 12'; + print '
' . $step++ . ''; + print 'The montly payment is figured out using the following formula:
'; + print 'Monthly Payment = ' . number_format($financing_price, "2", "", "") . ' * '; + print number_format($monthly_interest_rate, "4", "", "") . ' / '; + print '(1 - ((1 + ' . number_format($monthly_interest_rate, "4", "", "") . ')'; + print '-(' . $month_term . '))))'; + print '

'; + print 'The amortization breaks down how much of your monthly payment goes towards the bank\'s interest,'; + print 'and how much goes into paying off the principal of your loan.'; + print '
'; + print '
'; + + + // Set some base variables + $principal = $financing_price; + $current_month = 1; + $current_year = 1; + + // This basically, re-figures out the monthly payment, again. + $power = -($month_term); + $denom = pow((1 + $monthly_interest_rate), $power); + $monthly_payment = $principal * ($monthly_interest_rate / (1 - $denom)); + + print("

Amortization For Monthly Payment: \$" . number_format($monthly_payment, "2", ".", ",") . " over " . $year_term . " years
\n"); + + print ''; + + // This LEGEND will get reprinted every 12 months + $legend = ''; + $legend.= ''; + $legend.= ''; + $legend.= ''; + $legend.= ''; + $legend.= ''; + + echo $legend; + + // Loop through and get the current month's payments for + // the length of the loan + while ($current_month <= $month_term) + { + $interest_paid = $principal * $monthly_interest_rate; + $principal_paid = $monthly_payment - $interest_paid; + $remaining_balance = $principal - $principal_paid; + + $this_year_interest_paid = $this_year_interest_paid + $interest_paid; + $this_year_principal_paid = $this_year_principal_paid + $principal_paid; + + $var = !$var; + print ""; + print ''; + print ''; + print ''; + print ''; + print ''; + + ($current_month % 12) ? $show_legend = FALSE : $show_legend = TRUE; + + if ($show_legend) { + print ''; + print ''; + print ''; + + $total_spent_this_year = $this_year_interest_paid + $this_year_principal_paid; + print ''; + print ''; + print ''; + print ''; + + print ''; + print ''; + print ''; + + $current_year++; + $this_year_interest_paid = 0; + $this_year_principal_paid = 0; + + if (($current_month + 6) < $month_term) + { + echo $legend; + } + } + $principal = $remaining_balance; + $current_month++; + } + print("
' . $langs->trans("Month") . '' . $langs->trans("Interest") . '' . $langs->trans("Capital") . '' . $langs->trans("Position") . '
' . $current_month . '' . number_format($interest_paid, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '' . number_format($principal_paid, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '' . number_format($remaining_balance, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '
' . $langs->trans("Totalsforyear") . ' ' . $current_year . '
 '; + print 'You will spend ' . number_format($total_spent_this_year, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . ' on your house in year ' . $current_year . '
'; + print number_format($this_year_interest_paid, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . ' will go towards INTEREST
'; + print number_format($this_year_principal_paid, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . ' will go towards PRINCIPAL
'; + print '
 
\n"); +} + +llxFooter(); + +$db->close(); diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index bf35ac2806e..a0a91cab781 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -181,6 +181,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled', __HANDLER__, 'left', 2220__+MAX_llx_menu__, 'accountancy', 'tax_loan', 2200__+MAX_llx_menu__, '/compta/loan/index.php?leftmenu=tax_loan&mainmenu=accountancy', 'Loans', 1, 'loan', '$user->rights->loan->read', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2221__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/compta/loan/card.php?leftmenu=tax_loan&action=create', 'NewLoan', 2, 'loan', '$user->rights->loan->write', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2222__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/compta/loan/index.php?leftmenu=tax_loan', 'Payments', 2, 'companies', '$user->rights->loan->read', '', 0, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2223__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/compta/loan/calc.php?leftmenu=tax_loan', 'Calculator', 2, 'companies', '$user->rights->loan->calc', '', 0, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled', __HANDLER__, 'left', 2250__+MAX_llx_menu__, 'accountancy', 'tax_social', 2200__+MAX_llx_menu__, '/compta/sociales/index.php?leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2251__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/sociales/charges.php?leftmenu=tax_social&action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 87c88ac028c..61ad1a4163f 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -817,6 +817,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/compta/loan/index.php?leftmenu=tax_loan&mainmenu=accountancy",$langs->trans("Loans"),1,$user->rights->loan->read, '', $mainmenu, 'tax_loan'); if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/card.php?leftmenu=tax_loan&action=create",$langs->trans("NewLoan"),2,$user->rights->loan->write); if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/index.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read); + if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/calc.php?leftmenu=tax_loan",$langs->trans("Calculator"),2,$user->rights->loan->calc); } // Social contributions diff --git a/htdocs/core/modules/modLoan.class.php b/htdocs/core/modules/modLoan.class.php index fb2de1e3a02..21ae96eba26 100644 --- a/htdocs/core/modules/modLoan.class.php +++ b/htdocs/core/modules/modLoan.class.php @@ -118,6 +118,14 @@ class modLoan extends DolibarrModules $this->rights[$r][3] = 0; $this->rights[$r][4] = 'delete'; $this->rights[$r][5] = ''; + + $r++; + $this->rights[$r][0] = 525; + $this->rights[$r][1] = 'Access loan calculator'; + $this->rights[$r][2] = 'r'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'calc'; + $this->rights[$r][5] = ''; $r++; $this->rights[$r][0] = 527; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index a56a68f3b66..b1d69ae015d 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -698,6 +698,7 @@ Permission517=Export salaries Permission520=Read Loans Permission522=Create/modify loans Permission524=Delete loans +Permission525=Access loan calculator Permission527=Export loans Permission531=Read services Permission532=Create/modify services diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 9ccff4eecf4..e59fc7898b8 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -17,6 +17,8 @@ ConfirmPayLoan=Confirm classify paid this loan ErrorLoanCapital=Loan amount has to be numeric and greater than zero. ErrorLoanLength=Loan length has to be numeric and greater than zero. ErrorLoanInterest=Annual interest has to be numeric and greater than zero. +# Calc +Totalsforyear=Totals for year # Admin ConfigLoan=Configuration of the module loan LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default From 872fe157433f3efca2ccc35865c9c1be914be410 Mon Sep 17 00:00:00 2001 From: Drosis Nikos Date: Mon, 26 Jan 2015 17:05:47 +0200 Subject: [PATCH 019/412] Check live last version from sourceforge.net --- htdocs/admin/tools/update.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index 40683bdc747..cdf93a221e7 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -105,7 +105,30 @@ llxHeader('',$langs->trans("Upgrade"),$wikihelp); print_fiche_titre($langs->trans("Upgrade"),'','setup'); print $langs->trans("CurrentVersion").' : '.DOL_VERSION.'
'; -print $langs->trans("LastStableVersion").' : '.$langs->trans("FeatureNotYetAvailable").'
'; +if ($sfurl = simplexml_load_file('http://sourceforge.net/projects/dolibarr/rss')) { + $title=$sfurl->channel[0]->item[0]->title; +function word_limiter( $text, $limit = 30, $chars = '0123456789.' ) { + if( strlen( $text ) > $limit ) { + $words = str_word_count( $text, 2, $chars ); + $words = array_reverse( $words, TRUE ); + foreach( $words as $length => $word ) { + if( $length + strlen( $word ) >= $limit ) { + array_shift( $words ); + } else { + break; + } + } + $words = array_reverse( $words ); + $text = implode( " ", $words ) . ''; + } + return $text; +} + +$str = $title; +print $langs->trans("LastStableVersion").' : '. word_limiter( $str ).'
'; +} else { + print $langs->trans("LastStableVersion").' : ' .('Update Server Off-Line').'
'; +} print '
'; print $langs->trans("Upgrade").'
'; From fc7f2f2303fecd350ad2590efedb11379a53a375 Mon Sep 17 00:00:00 2001 From: Drosis Nikos Date: Wed, 28 Jan 2015 23:12:46 +0200 Subject: [PATCH 020/412] translate UpdateServerOffline --- htdocs/admin/tools/update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index cdf93a221e7..e12ef58cebf 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -127,7 +127,7 @@ function word_limiter( $text, $limit = 30, $chars = '0123456789.' ) { $str = $title; print $langs->trans("LastStableVersion").' : '. word_limiter( $str ).'
'; } else { - print $langs->trans("LastStableVersion").' : ' .('Update Server Off-Line').'
'; + print $langs->trans("LastStableVersion").' : ' .$langs->trans("UpdateServerOffline").'
'; } print '
'; From 7dea799a9e158bbf5bf739b3d565c763158c2bdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Tue, 3 Feb 2015 15:24:15 +0100 Subject: [PATCH 021/412] FIXED Allowed 0 to be used as an account mask 0 is used by some accounting systems and software. --- htdocs/core/modules/societe/mod_codecompta_aquarium.php | 4 ++-- htdocs/societe/admin/societe.php | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index 1cc70aa009e..65a1f6192b5 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -44,8 +44,8 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode function __construct() { global $conf; - if (empty($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411'; - if (empty($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER)) $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401'; + if (is_null($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411'; + if (is_null($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER)) $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401'; $this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER; $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER; } diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 9834959273c..65728435910 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -114,7 +114,11 @@ if ($action == 'setModuleOptions') { $param=GETPOST("param".$i,'alpha'); $value=GETPOST("value".$i,'alpha'); - if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity); + // Use the default values if the field is not set + if ($param == '') { + $param = null; + } + $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; } } From 3aa6c8c855969737450dff601a2b2609b78301d9 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sat, 21 Feb 2015 15:19:18 +0100 Subject: [PATCH 022/412] Correct auguria menu --- htdocs/core/menus/init_menu_auguria.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 85e4ab3e8f1..b0a001a4818 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -12,7 +12,7 @@ insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, left insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('societe|fournisseur', '( ! empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ! empty($conf->fournisseur->enabled)', 2__+MAX_llx_menu__, __HANDLER__, 'top', 'companies', '', 0, '/societe/index.php?mainmenu=companies&leftmenu=', 'ThirdParties', -1, 'companies', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 20, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('product|service', '$conf->product->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, __HANDLER__, 'top', 'products', '', 0, '/product/index.php?mainmenu=products&leftmenu=', 'Products/Services', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 30, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('propal|commande|fournisseur|contrat|ficheinter', '$conf->propal->enabled || $conf->commande->enabled || $conf->fournisseur->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial', '', 0, '/comm/index.php?mainmenu=commercial&leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 40, __ENTITY__); -insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|facture|deplacement|don|tax|salaries', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled || $conf->salaries->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read', '', 2, 50, __ENTITY__); +insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|facture|deplacement|don|tax|salaries|loan', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->facture->enabled || $conf->deplacement->enabled || $conf->don->enabled || $conf->tax->enabled || $conf->salaries->enabled || $conf->loan->enabled', 6__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&leftmenu=', 'MenuFinancial', -1, 'compta', '$user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire || $user->rights->facture->lire|| $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire || $user->rights->salaries->read || $user->rights->loan->read', '', 2, 50, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/index.php?mainmenu=bank&leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 60, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 70, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('mailing|export|import|opensurvey', '$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools', '', 0, '/core/tools.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read', '', 2, 90, __ENTITY__); From e3853a648f8fd3a475b5d49b8cb69c6e11402d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 25 Feb 2015 19:44:12 +0100 Subject: [PATCH 023/412] Redundant code --- htdocs/margin/admin/margin.php | 3 --- htdocs/projet/admin/project.php | 7 +------ htdocs/societe/admin/societe.php | 5 +---- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php index f8beb7cd1ca..b031a190f44 100644 --- a/htdocs/margin/admin/margin.php +++ b/htdocs/margin/admin/margin.php @@ -72,7 +72,6 @@ if ($action == 'remises') { if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', $_POST['MARGIN_METHODE_FOR_DISCOUNT'], 'chaine', 0, '', $conf->entity) > 0) { - $conf->global->MARGIN_METHODE_FOR_DISCOUNT = $_POST['MARGIN_METHODE_FOR_DISCOUNT']; setEventMessage($langs->trans("RecordModifiedSuccessfully")); } else @@ -85,7 +84,6 @@ if ($action == 'typemarges') { if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0) { - $conf->global->MARGIN_METHODE_FOR_DISCOUNT = $_POST['MARGIN_TYPE']; setEventMessage($langs->trans("RecordModifiedSuccessfully")); } else @@ -98,7 +96,6 @@ if ($action == 'contact') { if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0) { - $conf->global->AGENT_CONTACT_TYPE = $_POST['AGENT_CONTACT_TYPE']; setEventMessage($langs->trans("RecordModifiedSuccessfully")); } else diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 915d4ef69ef..a29bb9a2d63 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -237,12 +237,7 @@ if ($action == 'deltask') // Set default model else if ($action == 'setdoc') { - if (dolibarr_set_const($db, "PROJECT_ADDON_PDF",$value,'chaine',0,'',$conf->entity)) - { - // La constante qui a ete lue en avant du nouveau set - // on passe donc par une variable pour avoir un affichage coherent - $conf->global->PROJECT_ADDON_PDF = $value; - } + dolibarr_set_const($db, "PROJECT_ADDON_PDF",$value,'chaine',0,'',$conf->entity); // On active le modele $ret = delDocumentModel($value, $type); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 8fec81c686c..881946cb1cd 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -165,10 +165,7 @@ if ($action == 'setdoc') $db->begin(); - if (dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity)) - { - $conf->global->COMPANY_ADDON_PDF = $value; - } + dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity); // On active le modele $type='company'; From f2fededd2c8c6e9d44946d543b086cc3f6763559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 25 Feb 2015 22:48:45 +0100 Subject: [PATCH 024/412] Drop usage of deprecated dol_htmlentities function --- htdocs/admin/security_file.php | 4 ++-- htdocs/core/class/html.form.class.php | 2 +- htdocs/core/lib/admin.lib.php | 2 +- htdocs/core/lib/functions.lib.php | 10 +++++----- htdocs/main.inc.php | 6 +++--- htdocs/opensurvey/card.php | 12 ++++++------ htdocs/opensurvey/list.php | 4 ++-- htdocs/opensurvey/public/studs.php | 10 +++++----- htdocs/opensurvey/results.php | 14 +++++++------- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php index 4c0dd435634..e70c6116f90 100644 --- a/htdocs/admin/security_file.php +++ b/htdocs/admin/security_file.php @@ -176,7 +176,7 @@ if (ini_get('safe_mode') && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING); } } -print ''; +print ''; print "
'.$langs->trans("AntiVirusParam").'
'; print $langs->trans("AntiVirusParamExample"); print '		'; -print ''; +print ''; print "
\n"; + if (! $silent) print '\n"; dol_syslog('Admin.lib::run_sql Request '.($i+1), LOG_DEBUG); $sqlmodified=0; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index cf3b026ed90..5b57c212150 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -517,7 +517,7 @@ function dol_escape_htmltag($stringtoescape,$keepb=0) $tmp=dol_html_entity_decode($stringtoescape,ENT_COMPAT,'UTF-8'); if ($keepb) $tmp=strtr($tmp, array("\r"=>'\\r',"\n"=>'\\n')); else $tmp=strtr($tmp, array("\r"=>'\\r',"\n"=>'\\n',""=>'',''=>'')); - return dol_htmlentities($tmp,ENT_COMPAT,'UTF-8'); + return htmlentities($tmp,ENT_COMPAT,'UTF-8'); } @@ -2473,8 +2473,8 @@ function dol_print_error($db='',$error='') } $out.="".$langs->trans("UserAgent").": ".$_SERVER["HTTP_USER_AGENT"]."
\n"; $out.="
\n"; - $out.="".$langs->trans("RequestedUrl").": ".dol_htmlentities($_SERVER["REQUEST_URI"],ENT_COMPAT,'UTF-8')."
\n"; - $out.="".$langs->trans("Referer").": ".(isset($_SERVER["HTTP_REFERER"])?dol_htmlentities($_SERVER["HTTP_REFERER"],ENT_COMPAT,'UTF-8'):'')."
\n"; + $out.="".$langs->trans("RequestedUrl").": ".htmlentities($_SERVER["REQUEST_URI"],ENT_COMPAT,'UTF-8')."
\n"; + $out.="".$langs->trans("Referer").": ".(isset($_SERVER["HTTP_REFERER"])?htmlentities($_SERVER["HTTP_REFERER"],ENT_COMPAT,'UTF-8'):'')."
\n"; $out.="".$langs->trans("MenuManager").": ".(isset($conf->standard_menu)?$conf->standard_menu:'')."
\n"; $out.="
\n"; $syslog.="url=".$_SERVER["REQUEST_URI"]; @@ -3859,13 +3859,13 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8',$ $newstring=preg_replace('//i','
',$newstring); // Replace "
" by "
". It's same and avoid pb with FPDF. if ($removelasteolbr) $newstring=preg_replace('/
$/i','',$newstring); // Remove last
(remove only last one) $newstring=strtr($newstring,array('&'=>'__and__','<'=>'__lt__','>'=>'__gt__','"'=>'__dquot__')); - $newstring=dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom); // Make entity encoding + $newstring=htmlentities($newstring,ENT_COMPAT,$pagecodefrom); // Make entity encoding $newstring=strtr($newstring,array('__and__'=>'&','__lt__'=>'<','__gt__'=>'>','__dquot__'=>'"')); } else { if ($removelasteolbr) $newstring=preg_replace('/(\r\n|\r|\n)$/i','',$newstring); // Remove last \n (may remove several) - $newstring=dol_nl2br(dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom),$nl2brmode); + $newstring=dol_nl2br(htmlentities($newstring,ENT_COMPAT,$pagecodefrom),$nl2brmode); } // Other substitutions that htmlentities does not do //$newstring=str_replace(chr(128),'€',$newstring); // 128 = 0x80. Not in html entity table. // Seems useles with TCPDF. Make bug with UTF8 languages diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 7be99f5e278..ca32a823d58 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -988,9 +988,9 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs $appli='Dolibarr'; if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE; - if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print ''.dol_htmlentities($title).''; - if ($title) print ''.dol_htmlentities($appli.' - '.$title).''; - else print "".dol_htmlentities($appli).""; + if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print ''.htmlentities($title).''; + if ($title) print ''.htmlentities($appli.' - '.$title).''; + else print "".htmlentities($appli).""; print "\n"; $ext=''; diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index 5d32db24d5c..019f739f5fd 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -212,16 +212,16 @@ $adresseadmin=$object->mail_admin; print $langs->trans("Title") .''; // Description print ''; @@ -359,7 +359,7 @@ if ($comments) { print ' '.img_picto('', 'delete.png').' '; } - print dol_htmlentities($comment->usercomment).': '.dol_nl2br(dol_htmlentities($comment->comment))."
"; + print htmlentities($comment->usercomment).': '.dol_nl2br(htmlentities($comment->comment))."
"; } } else diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index d13c9884e89..ea17965fa9c 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -153,7 +153,7 @@ while ($i < min($num,$limit)) print ''; print ''; diff --git a/htdocs/opensurvey/public/studs.php b/htdocs/opensurvey/public/studs.php index 1b39391b67c..3050bf0ed08 100644 --- a/htdocs/opensurvey/public/studs.php +++ b/htdocs/opensurvey/public/studs.php @@ -258,7 +258,7 @@ print '
'."\n"; //affichage du titre du sondage $titre=str_replace("\\","",$object->titre); -print ''.dol_htmlentities($titre).'

'."\n"; +print ''.htmlentities($titre).'

'."\n"; //affichage des commentaires du sondage if ($object->commentaires) @@ -362,7 +362,7 @@ if ($object->format=="D") for ($i=0; isset($toutsujet[$i]); $i++) { $heures=explode('@',$toutsujet[$i]); if (isset($heures[1])) { - print '
'."\n"; + print ''."\n"; } else { print ''."\n"; } @@ -418,7 +418,7 @@ while ($compteur < $num) print ''."\n"; // Name - print ''."\n"; + print ''."\n"; // si la ligne n'est pas a changer, on affiche les données if (! $testligneamodifier) @@ -677,7 +677,7 @@ if ($object->allow_spy) { else { $tmps=explode('@',$toutsujet[$i]); - $meilleursujet .= dol_htmlentities($tmps[0]); + $meilleursujet .= htmlentities($tmps[0]); } $compteursujet++; @@ -717,7 +717,7 @@ if ($comments) foreach ($comments as $obj) { print '
'; if (in_array($obj->usercomment, $listofvoters)) print ' '.img_picto('', 'delete.png').' '; - print dol_htmlentities($obj->usercomment).': '.dol_nl2br(dol_htmlentities($obj->comment))."
"; + print htmlentities($obj->usercomment).':'.dol_nl2br(htmlentities($obj->comment)).""; } } diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php index 226bc0c0465..a543447ffbc 100644 --- a/htdocs/opensurvey/results.php +++ b/htdocs/opensurvey/results.php @@ -451,9 +451,9 @@ $adresseadmin=$object->mail_admin; print $langs->trans("Title") .''; // Expire date @@ -468,7 +468,7 @@ print $langs->trans("Author") .''; @@ -721,7 +721,7 @@ if ($object->format=="D") for ($i = 0; isset($toutsujet[$i]); $i++) { $heures=explode('@', $toutsujet[$i]); if (isset($heures[1])) { - print ''."\n"; + print ''."\n"; } else { print ''."\n"; } @@ -744,7 +744,7 @@ else for ($i = 0; isset($toutsujet[$i]); $i++) { $tmp=explode('@',$toutsujet[$i]); - print ''."\n"; + print ''."\n"; } print ''."\n"; @@ -780,7 +780,7 @@ while ($compteur < $num) } // Name - print ''."\n"; + print ''."\n"; // si la ligne n'est pas a changer, on affiche les données if (! $testligneamodifier) @@ -1047,7 +1047,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) { else { $tmps=explode('@',$toutsujet[$i]); - $meilleursujet .= dol_htmlentities($tmps[0]); + $meilleursujet .= htmlentities($tmps[0]); } $compteursujet++; From f117b65a1773c652fe824182f7534981617f9834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 25 Feb 2015 23:00:43 +0100 Subject: [PATCH 025/412] Removed silent operator for PHP 4 in function dol_html_entity_decode --- htdocs/core/lib/functions.lib.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 5b57c212150..6f21e9d2202 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3911,9 +3911,7 @@ function dol_htmlcleanlastbr($stringtodecode) */ function dol_html_entity_decode($a,$b,$c='UTF-8') { - // We use @ to avoid warning on PHP4 that does not support entity decoding to UTF8; - $ret=@html_entity_decode($a,$b,$c); - return $ret; + return html_entity_decode($a,$b,$c); } /** From e6c8cac3815a89c6731195f9a5fe52ad59e5d270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 2 Mar 2015 01:16:35 +0100 Subject: [PATCH 026/412] Removed TODO and deprecated tag of dol_htmlentities and revert substitution commit --- htdocs/admin/security_file.php | 4 ++-- htdocs/core/class/html.form.class.php | 2 +- htdocs/core/lib/admin.lib.php | 2 +- htdocs/core/lib/functions.lib.php | 12 +++++------- htdocs/main.inc.php | 6 +++--- htdocs/opensurvey/card.php | 12 ++++++------ htdocs/opensurvey/list.php | 4 ++-- htdocs/opensurvey/public/studs.php | 10 +++++----- htdocs/opensurvey/results.php | 14 +++++++------- 9 files changed, 32 insertions(+), 34 deletions(-) diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php index e70c6116f90..4c0dd435634 100644 --- a/htdocs/admin/security_file.php +++ b/htdocs/admin/security_file.php @@ -176,7 +176,7 @@ if (ini_get('safe_mode') && ! empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING); } } -print ''; +print ''; print ""; print ''; @@ -187,7 +187,7 @@ print ''; print '"; print ''; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index edb27913432..6a6474c8306 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4446,7 +4446,7 @@ class Form $ret.='
'; } - $ret.=dol_htmlentities($object->$fieldref); + $ret.=htmlentities($object->$fieldref); if ($morehtmlref) { $ret.=' '.$morehtmlref; diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index a54cb5fcc79..54f2748cfd1 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -249,7 +249,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker $newsql=preg_replace('/__ENTITY__/i',(!empty($entity)?$entity:$conf->entity),$sql); // Ajout trace sur requete (eventuellement a commenter si beaucoup de requetes) - if (! $silent) print '
'.$langs->trans("Request").' '.($i+1)." sql='".dol_htmlentities($newsql,ENT_NOQUOTES)."'
'.$langs->trans("Request").' '.($i+1)." sql='".htmlentities($newsql,ENT_NOQUOTES)."'
'; if ($action == 'edit') { - print ''; + print ''; } -else print dol_htmlentities($object->titre); +else print htmlentities($object->titre); print '
'.$langs->trans("Description") .''; if ($action == 'edit') { - $doleditor=new DolEditor('nouveauxcommentaires', dol_htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120); + $doleditor=new DolEditor('nouveauxcommentaires', htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120); $doleditor->Create(0,''); } else @@ -229,7 +229,7 @@ else if (empty($conf->fckeditor->enabled)) print dol_htmlentitiesbr($object->commentaires); else { - $doleditor=new DolEditor('nouveauxcommentaires', dol_htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120,1); + $doleditor=new DolEditor('nouveauxcommentaires', htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120,1); $doleditor->Create(0,''); } } @@ -295,7 +295,7 @@ print $langs->trans("Author") .''; if ($object->fk_user_creat) { print $userstatic->getLoginUrl(1); } else { - print dol_htmlentities($object->nom_admin); + print htmlentities($object->nom_admin); } print '
'; print ''.img_picto('','object_opensurvey').' '.$obj->id_sondage.''; - print ''.dol_htmlentities($obj->titre).''; + print ''.htmlentities($obj->titre).''; $type=($obj->format=='A')?'classic':'date'; print img_picto('',dol_buildpath('/opensurvey/img/'.($type == 'classic'?'chart-32.png':'calendar-32.png'),1),'width="16"',1); print ' '.$langs->trans($type=='classic'?"TypeClassic":"TypeDate"); @@ -169,7 +169,7 @@ while ($i < min($num,$limit)) print $userstatic->getLoginUrl(1); } else { - print dol_htmlentities($obj->nom_admin); + print htmlentities($obj->nom_admin); } print ''.dol_htmlentities($heures[1]).''.htmlentities($heures[1]).'
'.dol_htmlentities($obj->name).''.htmlentities($obj->name).' '; if ($action == 'edit') { - print ''; + print ''; } -else print dol_htmlentities($object->titre); +else print htmlentities($object->titre); print '
'; if ($object->fk_user_creat) { print $userstatic->getLoginUrl(1); } else { - print dol_htmlentities($object->nom_admin); + print htmlentities($object->nom_admin); } print '
'.dol_htmlentities($heures[1]).''.htmlentities($heures[1]).''.dol_htmlentities($tmp[0]).''.htmlentities($tmp[0]).''.img_picto('',dol_buildpath('/opensurvey/img/add-16.png',1),'',1).''.dol_htmlentities($obj->name).''.htmlentities($obj->name).'
'.$langs->trans("AntiVirusParam").'
'; print $langs->trans("AntiVirusParamExample"); print '		'; -print ''; +print ''; print "
\n"; + if (! $silent) print '\n"; dol_syslog('Admin.lib::run_sql Request '.($i+1), LOG_DEBUG); $sqlmodified=0; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 6f21e9d2202..fdfb20dd558 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -517,7 +517,7 @@ function dol_escape_htmltag($stringtoescape,$keepb=0) $tmp=dol_html_entity_decode($stringtoescape,ENT_COMPAT,'UTF-8'); if ($keepb) $tmp=strtr($tmp, array("\r"=>'\\r',"\n"=>'\\n')); else $tmp=strtr($tmp, array("\r"=>'\\r',"\n"=>'\\n',""=>'',''=>'')); - return htmlentities($tmp,ENT_COMPAT,'UTF-8'); + return dol_htmlentities($tmp,ENT_COMPAT,'UTF-8'); } @@ -2473,8 +2473,8 @@ function dol_print_error($db='',$error='') } $out.="".$langs->trans("UserAgent").": ".$_SERVER["HTTP_USER_AGENT"]."
\n"; $out.="
\n"; - $out.="".$langs->trans("RequestedUrl").": ".htmlentities($_SERVER["REQUEST_URI"],ENT_COMPAT,'UTF-8')."
\n"; - $out.="".$langs->trans("Referer").": ".(isset($_SERVER["HTTP_REFERER"])?htmlentities($_SERVER["HTTP_REFERER"],ENT_COMPAT,'UTF-8'):'')."
\n"; + $out.="".$langs->trans("RequestedUrl").": ".dol_htmlentities($_SERVER["REQUEST_URI"],ENT_COMPAT,'UTF-8')."
\n"; + $out.="".$langs->trans("Referer").": ".(isset($_SERVER["HTTP_REFERER"])?dol_htmlentities($_SERVER["HTTP_REFERER"],ENT_COMPAT,'UTF-8'):'')."
\n"; $out.="".$langs->trans("MenuManager").": ".(isset($conf->standard_menu)?$conf->standard_menu:'')."
\n"; $out.="
\n"; $syslog.="url=".$_SERVER["REQUEST_URI"]; @@ -3859,13 +3859,13 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8',$ $newstring=preg_replace('//i','
',$newstring); // Replace "
" by "
". It's same and avoid pb with FPDF. if ($removelasteolbr) $newstring=preg_replace('/
$/i','',$newstring); // Remove last
(remove only last one) $newstring=strtr($newstring,array('&'=>'__and__','<'=>'__lt__','>'=>'__gt__','"'=>'__dquot__')); - $newstring=htmlentities($newstring,ENT_COMPAT,$pagecodefrom); // Make entity encoding + $newstring=dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom); // Make entity encoding $newstring=strtr($newstring,array('__and__'=>'&','__lt__'=>'<','__gt__'=>'>','__dquot__'=>'"')); } else { if ($removelasteolbr) $newstring=preg_replace('/(\r\n|\r|\n)$/i','',$newstring); // Remove last \n (may remove several) - $newstring=dol_nl2br(htmlentities($newstring,ENT_COMPAT,$pagecodefrom),$nl2brmode); + $newstring=dol_nl2br(dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom),$nl2brmode); } // Other substitutions that htmlentities does not do //$newstring=str_replace(chr(128),'€',$newstring); // 128 = 0x80. Not in html entity table. // Seems useles with TCPDF. Make bug with UTF8 languages @@ -3917,14 +3917,12 @@ function dol_html_entity_decode($a,$b,$c='UTF-8') /** * Replace htmlentities functions to manage errors * http://php.net/manual/en/function.htmlentities.php - * TODO Remove this function to replace it with direct htmlentities. * * @param string $string The input string. * @param int $flags Flags(see PHP doc above) * @param string $encoding Encoding * @param bool $double_encode When double_encode is turned off PHP will not encode existing html entities * @return string $ret Encoded string - * @deprecated Since PHP4 support is no longer available, this function does not make sense. */ function dol_htmlentities($string, $flags=null, $encoding='UTF-8', $double_encode=false) { diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index ca32a823d58..7be99f5e278 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -988,9 +988,9 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs $appli='Dolibarr'; if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE; - if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print ''.htmlentities($title).''; - if ($title) print ''.htmlentities($appli.' - '.$title).''; - else print "".htmlentities($appli).""; + if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print ''.dol_htmlentities($title).''; + if ($title) print ''.dol_htmlentities($appli.' - '.$title).''; + else print "".dol_htmlentities($appli).""; print "\n"; $ext=''; diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index 019f739f5fd..5d32db24d5c 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -212,16 +212,16 @@ $adresseadmin=$object->mail_admin; print $langs->trans("Title") .''; // Description print ''; @@ -359,7 +359,7 @@ if ($comments) { print ' '.img_picto('', 'delete.png').' '; } - print htmlentities($comment->usercomment).': '.dol_nl2br(htmlentities($comment->comment))."
"; + print dol_htmlentities($comment->usercomment).': '.dol_nl2br(dol_htmlentities($comment->comment))."
"; } } else diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php index ea17965fa9c..d13c9884e89 100644 --- a/htdocs/opensurvey/list.php +++ b/htdocs/opensurvey/list.php @@ -153,7 +153,7 @@ while ($i < min($num,$limit)) print ''; print ''; diff --git a/htdocs/opensurvey/public/studs.php b/htdocs/opensurvey/public/studs.php index 3050bf0ed08..1b39391b67c 100644 --- a/htdocs/opensurvey/public/studs.php +++ b/htdocs/opensurvey/public/studs.php @@ -258,7 +258,7 @@ print '
'."\n"; //affichage du titre du sondage $titre=str_replace("\\","",$object->titre); -print ''.htmlentities($titre).'

'."\n"; +print ''.dol_htmlentities($titre).'

'."\n"; //affichage des commentaires du sondage if ($object->commentaires) @@ -362,7 +362,7 @@ if ($object->format=="D") for ($i=0; isset($toutsujet[$i]); $i++) { $heures=explode('@',$toutsujet[$i]); if (isset($heures[1])) { - print '
'."\n"; + print ''."\n"; } else { print ''."\n"; } @@ -418,7 +418,7 @@ while ($compteur < $num) print ''."\n"; // Name - print ''."\n"; + print ''."\n"; // si la ligne n'est pas a changer, on affiche les données if (! $testligneamodifier) @@ -677,7 +677,7 @@ if ($object->allow_spy) { else { $tmps=explode('@',$toutsujet[$i]); - $meilleursujet .= htmlentities($tmps[0]); + $meilleursujet .= dol_htmlentities($tmps[0]); } $compteursujet++; @@ -717,7 +717,7 @@ if ($comments) foreach ($comments as $obj) { print '
'; if (in_array($obj->usercomment, $listofvoters)) print ' '.img_picto('', 'delete.png').' '; - print htmlentities($obj->usercomment).': '.dol_nl2br(htmlentities($obj->comment))."
"; + print dol_htmlentities($obj->usercomment).':'.dol_nl2br(dol_htmlentities($obj->comment)).""; } } diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php index a543447ffbc..226bc0c0465 100644 --- a/htdocs/opensurvey/results.php +++ b/htdocs/opensurvey/results.php @@ -451,9 +451,9 @@ $adresseadmin=$object->mail_admin; print $langs->trans("Title") .''; // Expire date @@ -468,7 +468,7 @@ print $langs->trans("Author") .''; @@ -721,7 +721,7 @@ if ($object->format=="D") for ($i = 0; isset($toutsujet[$i]); $i++) { $heures=explode('@', $toutsujet[$i]); if (isset($heures[1])) { - print ''."\n"; + print ''."\n"; } else { print ''."\n"; } @@ -744,7 +744,7 @@ else for ($i = 0; isset($toutsujet[$i]); $i++) { $tmp=explode('@',$toutsujet[$i]); - print ''."\n"; + print ''."\n"; } print ''."\n"; @@ -780,7 +780,7 @@ while ($compteur < $num) } // Name - print ''."\n"; + print ''."\n"; // si la ligne n'est pas a changer, on affiche les données if (! $testligneamodifier) @@ -1047,7 +1047,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) { else { $tmps=explode('@',$toutsujet[$i]); - $meilleursujet .= htmlentities($tmps[0]); + $meilleursujet .= dol_htmlentities($tmps[0]); } $compteursujet++; From ad7242529111062f5873b234cba7354555c03863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 2 Mar 2015 03:27:29 +0100 Subject: [PATCH 027/412] Moved some variables from FactureLigne to CommonInvoiceLine --- htdocs/compta/facture/class/facture.class.php | 35 ------- htdocs/core/class/commoninvoice.class.php | 95 +++++++++++++++++++ 2 files changed, 95 insertions(+), 35 deletions(-) diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 4fbdddd5703..d9254df2374 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3586,16 +3586,12 @@ class Facture extends CommonInvoice */ class FactureLigne extends CommonInvoiceLine { - var $db; - var $error; - public $element='facturedet'; public $table_element='facturedet'; var $oldline; //! From llx_facturedet - var $rowid; //! Id facture var $fk_facture; //! Id parent line @@ -3603,17 +3599,9 @@ class FactureLigne extends CommonInvoiceLine var $label; // deprecated //! Description ligne var $desc; - var $fk_product; // Id of predefined product - var $product_type = 0; // Type 0 = product, 1 = Service - var $qty; // Quantity (example 2) - var $tva_tx; // Taux tva produit/service (example 19.6) - var $localtax1_tx; // Local tax 1 - var $localtax2_tx; // Local tax 2 var $localtax1_type; // Local tax 1 type var $localtax2_type; // Local tax 2 type - var $subprice; // P.U. HT (example 100) - var $remise_percent; // % de la remise ligne (example 20%) var $fk_remise_except; // Link to line into llx_remise_except var $rang = 0; @@ -3622,10 +3610,6 @@ class FactureLigne extends CommonInvoiceLine var $marge_tx; var $marque_tx; - var $info_bits = 0; // Liste d'options cumulables: - // Bit 0: 0 si TVA normal - 1 si TVA NPR - // Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) - var $special_code; // Liste d'options non cumulabels: // 1: frais de port // 2: ecotaxe @@ -3634,15 +3618,6 @@ class FactureLigne extends CommonInvoiceLine var $origin; var $origin_id; - //! Total HT de la ligne toute quantite et incluant la remise ligne - var $total_ht; - //! Total TVA de la ligne toute quantite et incluant la remise ligne - var $total_tva; - var $total_localtax1; //Total Local tax 1 de la ligne - var $total_localtax2; //Total Local tax 2 de la ligne - //! Total TTC de la ligne toute quantite et incluant la remise ligne - var $total_ttc; - var $fk_code_ventilation = 0; var $date_start; @@ -3671,16 +3646,6 @@ class FactureLigne extends CommonInvoiceLine */ public $fk_prev_id; - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - } - /** * Load invoice line from database * diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index 6087a5a0adb..1a7ebfc34c8 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -400,5 +400,100 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php'; */ abstract class CommonInvoiceLine extends CommonObjectLine { + /** + * Quantity + * @var int + */ + public $qty; + + /** + * Unit price before taxes + * @var float + */ + public $subprice; + + /** + * Type of the product. 0 for product 1 for service + * @var int + */ + public $product_type = 0; + + /** + * Id of corresponding product + * @var int + */ + public $fk_product; + + /** + * VAT % + * @var float + */ + public $tva_tx; + + /** + * Local tax 1 % + * @var float + */ + public $localtax1_tx; + + /** + * Local tax 2 % + * @var float + */ + public $localtax2_tx; + + /** + * Percent of discount + * @var float + */ + public $remise_percent; + + /** + * Total amount before taxes + * @var float + */ + public $total_ht; + + /** + * Total VAT amount + * @var float + */ + public $total_tva; + + /** + * Total local tax 1 amount + * @var float + */ + public $total_localtax1; + + /** + * Total local tax 2 amount + * @var float + */ + public $total_localtax2; + + /** + * Total amount with taxes + * @var float + */ + public $total_ttc; + + /** + * Liste d'options cumulables: + * Bit 0: 0 si TVA normal - 1 si TVA NPR + * Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) + * @var int + */ + public $info_bits = 0; + + /** + * Constructor + * + * @param DoliDB $db Database handler + */ + public function __construct(DoliDB $db) + { + $this->db = $db; + } } From c7919a8d08bded53a302c4635ee55de5e4c31c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 2 Mar 2015 03:27:48 +0100 Subject: [PATCH 028/412] Removed duplicated code --- .../fourn/class/fournisseur.facture.class.php | 33 +++---------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 8283f1cb957..a152b1a2b2c 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -89,37 +89,15 @@ class FactureFournisseur extends CommonInvoice var $mode_reglement_id; var $mode_reglement_code; - var $lines; + /** + * Invoice lines + * @var SupplierInvoiceLine[] + */ + public $lines = array(); var $fournisseur; // deprecated - var $thirdparty; // To store thirdparty var $extraparams=array(); - /** - * Standard invoice - */ - const TYPE_STANDARD = 0; - - /** - * Replacement invoice - */ - const TYPE_REPLACEMENT = 1; - - /** - * Credit note invoice - */ - const TYPE_CREDIT_NOTE = 2; - - /** - * Deposit invoice - */ - const TYPE_DEPOSIT = 3; - - /** - * Proforma invoice - */ - const TYPE_PROFORMA = 4; - /** * Constructor * @@ -140,7 +118,6 @@ class FactureFournisseur extends CommonInvoice $this->propalid = 0; $this->products = array(); - $this->lines = array(); } /** From b0e728251a1ffa5b35b747d929ca4e76be74e40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 2 Mar 2015 03:28:08 +0100 Subject: [PATCH 029/412] Every line has a $rowid property --- htdocs/core/class/commonobjectline.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index c3c8d823a34..7f81c85fa23 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -28,6 +28,12 @@ */ abstract class CommonObjectLine extends CommonObject { + /** + * Id of the line + * @var int + */ + public $rowid; + // TODO // Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code. From b69ce21e3e271e6691bc17d163b1295f99744e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 2 Mar 2015 03:52:59 +0100 Subject: [PATCH 030/412] Removed duplicated code --- htdocs/comm/propal/class/propal.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 189c6101594..4918e331d63 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -107,6 +107,9 @@ class Propal extends CommonObject var $products=array(); var $extraparams=array(); + /** + * @var PropaleLigne[] + */ var $lines = array(); var $line; @@ -2782,9 +2785,6 @@ class Propal extends CommonObject */ class PropaleLigne extends CommonObject { - var $db; - var $error; - public $element='propaldet'; public $table_element='propaldet'; From 4c08d34bb5332d42678a37d482007faa436569d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 2 Mar 2015 03:53:12 +0100 Subject: [PATCH 031/412] Standardized $rowid as property --- htdocs/commande/class/commande.class.php | 1 + htdocs/compta/facture/class/facture.class.php | 1 + htdocs/core/class/commonobject.class.php | 6 +++--- htdocs/core/class/commonobjectline.class.php | 7 +++++++ htdocs/core/tpl/objectline_edit.tpl.php | 4 ++-- htdocs/core/tpl/objectline_view.tpl.php | 12 ++++++------ htdocs/fichinter/class/fichinter.class.php | 1 - 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index c1c0fa9ec4e..01de7890f9b 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3141,6 +3141,7 @@ class Commande extends CommonOrder $this->lines[$i] = new OrderLine($this->db); $this->lines[$i]->id = $obj->rowid; + $this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->label = $obj->custom_label; $this->lines[$i]->description = $obj->description; $this->lines[$i]->fk_product = $obj->fk_product; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index d9254df2374..72801b121ff 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3388,6 +3388,7 @@ class Facture extends CommonInvoice $this->lines[$i] = new FactureLigne($this->db); $this->lines[$i]->id = $obj->rowid; + $this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->label = $obj->custom_label; // deprecated $this->lines[$i]->description = $obj->description; $this->lines[$i]->fk_product = $obj->fk_product; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index c4b2902113a..c08a2b449d7 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2671,7 +2671,7 @@ abstract class CommonObject * TODO Move this into an output class file (htmlline.class.php) * * @param string $action GET/POST action - * @param array $line Selected object line to output + * @param CommonObjectLine $line Selected object line to output * @param string $var Is it a an odd line (true) * @param int $num Number of line (0) * @param int $i I @@ -2699,7 +2699,7 @@ abstract class CommonObject if (! empty($line->date_end)) $type=1; // deprecated // Ligne en mode visu - if ($action != 'editline' || $selected != $line->id) + if ($action != 'editline' || $selected != $line->rowid) { // Product if ($line->fk_product > 0) @@ -2762,7 +2762,7 @@ abstract class CommonObject } // Ligne en mode update - if ($this->statut == 0 && $action == 'editline' && $selected == $line->id) + if ($this->statut == 0 && $action == 'editline' && $selected == $line->rowid) { $label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : '')); if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("Label").'"'; diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index 7f81c85fa23..b88dfabe83d 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -28,6 +28,13 @@ */ abstract class CommonObjectLine extends CommonObject { + /** + * Id of the line + * @var int + * @deprecated Use $rowid + */ + public $id; + /** * Id of the line * @var int diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 98f1b842f1a..6148d50f6fc 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -53,9 +53,9 @@ $coldisplay=-1; // We remove first td ?> > global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>global->MAIN_VIEW_LINE_NUMBER))?2:1; ?> -
+
- + diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 0664d471dec..3ae8a8bcaa4 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -44,11 +44,11 @@ if (empty($usemargins)) $usemargins=0; ?> -> +> global->MAIN_VIEW_LINE_NUMBER)) { ?> - - + @@ -173,7 +173,7 @@ if (empty($usemargins)) $usemargins=0; - statut == 0 && ($user->rights->$element->creer || $permtoedit)) { ?> + statut == 0 && ($object_rights->creer)) { ?> '; print ''; print '
'; } - $ret.=htmlentities($object->$fieldref); + $ret.=dol_htmlentities($object->$fieldref); if ($morehtmlref) { $ret.=' '.$morehtmlref; diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index 54f2748cfd1..a54cb5fcc79 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -249,7 +249,7 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='',$oker $newsql=preg_replace('/__ENTITY__/i',(!empty($entity)?$entity:$conf->entity),$sql); // Ajout trace sur requete (eventuellement a commenter si beaucoup de requetes) - if (! $silent) print '
'.$langs->trans("Request").' '.($i+1)." sql='".htmlentities($newsql,ENT_NOQUOTES)."'
'.$langs->trans("Request").' '.($i+1)." sql='".dol_htmlentities($newsql,ENT_NOQUOTES)."'
'; if ($action == 'edit') { - print ''; + print ''; } -else print htmlentities($object->titre); +else print dol_htmlentities($object->titre); print '
'.$langs->trans("Description") .''; if ($action == 'edit') { - $doleditor=new DolEditor('nouveauxcommentaires', htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120); + $doleditor=new DolEditor('nouveauxcommentaires', dol_htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120); $doleditor->Create(0,''); } else @@ -229,7 +229,7 @@ else if (empty($conf->fckeditor->enabled)) print dol_htmlentitiesbr($object->commentaires); else { - $doleditor=new DolEditor('nouveauxcommentaires', htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120,1); + $doleditor=new DolEditor('nouveauxcommentaires', dol_htmlentities($object->commentaires),'',120,'dolibarr_notes','In',1,1,1,ROWS_7,120,1); $doleditor->Create(0,''); } } @@ -295,7 +295,7 @@ print $langs->trans("Author") .''; if ($object->fk_user_creat) { print $userstatic->getLoginUrl(1); } else { - print htmlentities($object->nom_admin); + print dol_htmlentities($object->nom_admin); } print '
'; print ''.img_picto('','object_opensurvey').' '.$obj->id_sondage.''; - print ''.htmlentities($obj->titre).''; + print ''.dol_htmlentities($obj->titre).''; $type=($obj->format=='A')?'classic':'date'; print img_picto('',dol_buildpath('/opensurvey/img/'.($type == 'classic'?'chart-32.png':'calendar-32.png'),1),'width="16"',1); print ' '.$langs->trans($type=='classic'?"TypeClassic":"TypeDate"); @@ -169,7 +169,7 @@ while ($i < min($num,$limit)) print $userstatic->getLoginUrl(1); } else { - print htmlentities($obj->nom_admin); + print dol_htmlentities($obj->nom_admin); } print ''.htmlentities($heures[1]).''.dol_htmlentities($heures[1]).'
'.htmlentities($obj->name).''.dol_htmlentities($obj->name).' '; if ($action == 'edit') { - print ''; + print ''; } -else print htmlentities($object->titre); +else print dol_htmlentities($object->titre); print '
'; if ($object->fk_user_creat) { print $userstatic->getLoginUrl(1); } else { - print htmlentities($object->nom_admin); + print dol_htmlentities($object->nom_admin); } print '
'.htmlentities($heures[1]).''.dol_htmlentities($heures[1]).''.htmlentities($tmp[0]).''.dol_htmlentities($tmp[0]).''.img_picto('',dol_buildpath('/opensurvey/img/add-16.png',1),'',1).''.htmlentities($obj->name).''.dol_htmlentities($obj->name).'
+
info_bits & 2) == 2) { ?> info_bits & 2) == 2) { ?> - id.'#'.$line->id; ?>"> + rowid.'#'.$line->rowid; ?>"> @@ -186,7 +186,7 @@ if (empty($usemargins)) $usemargins=0; 		situation_counter == 1 || !$this->situation_cycle_ref) { - print 'id . '">'; + print 'rowid . '">'; print img_delete(); print ''; } @@ -196,12 +196,12 @@ if (empty($usemargins)) $usemargins=0; 1 && empty($conf->browser->phone) && ($this->situation_counter == 1 || !$this->situation_cycle_ref)) { ?> 0) { ?> - id; ?>"> + rowid; ?>"> - id; ?>"> + rowid; ?>"> diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 7be3b0bf3bd..e98852685ad 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -1022,7 +1022,6 @@ class FichinterLigne extends CommonObjectLine var $error; // From llx_fichinterdet - var $rowid; var $fk_fichinter; var $desc; // Description ligne var $datei; // Date intervention From b84cf4afac89ab6c5112c5edf94c3a4f85bcbfcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 4 Mar 2015 10:21:20 +0100 Subject: [PATCH 032/412] Renamed FactureFournisseurLine to SupplierInvoiceLine --- htdocs/core/tpl/objectline_create.tpl.php | 2 +- htdocs/fourn/class/fournisseur.facture.class.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 8a98ac2f613..6481a5961ca 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -281,7 +281,7 @@ else { $newline = new CommandeFournisseurLigne($this->db); } elseif ($this->table_element_line=='facture_fourn_det') { - $newline = new FactureFournisseurLigne($this->db); + $newline = new SupplierInvoiceLine($this->db); } if (is_object($newline)) { print $newline->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay+8)); diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index a152b1a2b2c..c6e5cb9d5e6 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -478,7 +478,7 @@ class FactureFournisseur extends CommonInvoice { $obj = $this->db->fetch_object($resql_rows); - $this->lines[$i] = new FactureFournisseurLigne($this->db); + $this->lines[$i] = new SupplierInvoiceLine($this->db); $this->lines[$i]->id = $obj->rowid; $this->lines[$i]->rowid = $obj->rowid; @@ -1274,7 +1274,7 @@ class FactureFournisseur extends CommonInvoice if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used { - $linetmp = new FactureFournisseurLigne($this->db); + $linetmp = new SupplierInvoiceLine($this->db); $linetmp->id=$this->rowid; $linetmp->array_options = $array_options; $result=$linetmp->insertExtraFields(); @@ -1826,7 +1826,7 @@ class FactureFournisseur extends CommonInvoice /** * Class to manage line invoices */ -class FactureFournisseurLigne extends CommonInvoice +class SupplierInvoiceLine extends CommonInvoice { var $db; var $error; From 47a151f1572509362b556772520648aa2253e4b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 4 Mar 2015 10:23:18 +0100 Subject: [PATCH 033/412] Created supplier invoice line --- .../fourn/class/fournisseur.facture.class.php | 85 ++++++++++++++++--- 1 file changed, 74 insertions(+), 11 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index c6e5cb9d5e6..22f3c02a5a1 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -457,7 +457,7 @@ class FactureFournisseur extends CommonInvoice */ function fetch_lines() { - $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx, f.tva'; + $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx'; $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 '; $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line'; $sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc'; @@ -488,6 +488,7 @@ class FactureFournisseur extends CommonInvoice $this->lines[$i]->ref_supplier = $obj->ref_supplier; // Reference product supplier TODO Rename field ref to ref_supplier into table llx_facture_fourn_det and llx_commande_fournisseurdet and update fields it into updateline $this->lines[$i]->libelle = $obj->label; // This field may contains label of product (when invoice create from order) $this->lines[$i]->product_desc = $obj->product_desc; // Description du produit + $this->lines[$i]->subprice = $obj->pu_ht; $this->lines[$i]->pu_ht = $obj->pu_ht; $this->lines[$i]->pu_ttc = $obj->pu_ttc; $this->lines[$i]->tva_tx = $obj->tva_tx; @@ -495,7 +496,7 @@ class FactureFournisseur extends CommonInvoice $this->lines[$i]->localtax2_tx = $obj->localtax2_tx; $this->lines[$i]->qty = $obj->qty; $this->lines[$i]->remise_percent = $obj->remise_percent; - $this->lines[$i]->tva = $obj->tva; + $this->lines[$i]->tva = $obj->total_tva; $this->lines[$i]->total_ht = $obj->total_ht; $this->lines[$i]->total_tva = $obj->total_tva; $this->lines[$i]->total_localtax1 = $obj->total_localtax1; @@ -1819,6 +1820,18 @@ class FactureFournisseur extends CommonInvoice return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } + /** + * Returns the rights used for this class + * @return stdClass + */ + public function getRights() + { + global $user; + + return $user->rights->fournisseur->facture; + } + + } @@ -1828,18 +1841,68 @@ class FactureFournisseur extends CommonInvoice */ class SupplierInvoiceLine extends CommonInvoice { - var $db; - var $error; - - var $pu_ht; - var $pu_ttc; - - public $element='facture_fourn_det'; + public $element='fournisseur->facture'; public $table_element='facture_fourn_det'; - var $oldline; + var $oldline; - /** + public $ref; + public $product_ref; + public $ref_supplier; + public $libelle; + public $product_desc; + + /** + * Unit price before taxes + * @var float + * @deprecated Use $subprice + */ + public $pu_ht; + + /** + * Unit price included taxes + * @var float + */ + public $pu_ttc; + + /** + * Total VAT amount + * @var float + * @deprecated Use $total_tva instead + */ + public $tva; + + /** + * Id of the corresponding supplier invoice + * @var int + */ + var $fk_facture_fourn; + + /** + * Product label + * @var string + */ + var $label; // deprecated + + /** + * Description of the line + * @var string + */ + var $description; + + var $skip_update_total; // Skip update price total for special lines + + /** + * @var int Situation advance percentage + */ + public $situation_percent; + + /** + * @var int Previous situation line id reference + */ + public $fk_prev_id; + + /** * Constructor * * @param DoliDB $db Database handler From 174f1cb5f7607407ff60a8d52898d1ff0b369efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 4 Mar 2015 10:28:37 +0100 Subject: [PATCH 034/412] Refactored supplier invoice line view to fit commonobjectline view --- htdocs/core/class/commonobject.class.php | 16 +++++++++++++++- htdocs/core/tpl/objectline_view.tpl.php | 4 ++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index c08a2b449d7..523716a8c84 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2686,7 +2686,9 @@ abstract class CommonObject function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0,$permtoedit=0) { global $conf,$langs,$user,$object,$hookmanager; - global $form,$bc,$bcdd; + global $form,$bc,$bcdd, $object_rights; + + $object_rights = $this->getRights(); $element=$this->element; @@ -3727,4 +3729,16 @@ abstract class CommonObject return $out; } + /** + * Returns the rights used for this class + * @return stdClass + */ + public function getRights() + { + global $user; + + return $user->rights->{$this->element}; + } + + } diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 3ae8a8bcaa4..2203642f0dc 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -122,7 +122,7 @@ if (empty($usemargins)) $usemargins=0; tva_tx,'%',$line->info_bits); ?>pu_ht)?price($line->pu_ht):price($line->subprice)); ?>pu_ht); ?> pu_ttc)?price($line->pu_ttc):price($line->subprice)); ?>total_ht); ?> info_bits & 2) == 2) { ?> From f82df1e634e67db455dd21ea722739a6eabd9825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 4 Mar 2015 10:32:09 +0100 Subject: [PATCH 035/412] Refactorred supplier order to match with objectline templates --- htdocs/core/class/commonorder.class.php | 3 +- .../class/fournisseur.commande.class.php | 128 +++++++++++++++--- 2 files changed, 108 insertions(+), 23 deletions(-) diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php index 469e1676a53..3e30b0a9ca6 100644 --- a/htdocs/core/class/commonorder.class.php +++ b/htdocs/core/class/commonorder.class.php @@ -22,6 +22,7 @@ */ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php'; /** * \class CommonOrder @@ -36,7 +37,7 @@ abstract class CommonOrder extends CommonObject * \class CommonOrderLine * \brief Superclass for orders classes */ -abstract class CommonOrderLine extends CommonObject +abstract class CommonOrderLine extends CommonObjectLine { } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index e626760f83e..3d4bfd7fb90 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -88,8 +88,12 @@ class CommandeFournisseur extends CommonOrder var $extraparams=array(); + /** + * @var CommandeFournisseurLigne[] + */ + public $lines = array(); - /** + /** * Constructor * * @param DoliDB $db Database handler @@ -98,7 +102,6 @@ class CommandeFournisseur extends CommonOrder { $this->db = $db; $this->products = array(); - $this->lines = array(); // List of language codes for status $this->statuts[0] = 'StatusOrderDraft'; @@ -237,6 +240,7 @@ class CommandeFournisseur extends CommonOrder $line = new CommandeFournisseurLigne($this->db); $line->id = $objp->rowid; + $line->rowid = $objp->rowid; $line->desc = $objp->description; // Description ligne $line->description = $objp->description; // Description ligne $line->qty = $objp->qty; @@ -2206,6 +2210,18 @@ class CommandeFournisseur extends CommonOrder if ($nb === 0) return $langs->trans('Undefined'); else return $nb.' '.$langs->trans('Days'); } + + /** + * Returns the rights used for this class + * @return stdClass + */ + public function getRights() + { + global $user; + + return $user->rights->fournisseur->commande; + } + } @@ -2221,27 +2237,95 @@ class CommandeFournisseurLigne extends CommonOrderLine public $element='commande_fournisseurdet'; public $table_element='commande_fournisseurdet'; - var $oldline; + /** + * Quantity + * @var int + */ - // From llx_commandedet - var $qty; - var $tva_tx; - var $localtax1_tx; - var $localtax2_tx; - var $localtax1_type; - var $localtax2_type; - var $subprice; - var $remise_percent; - var $desc; // Description ligne - var $fk_product; // Id of predefined product - var $product_type = 0; // Type 0 = product, 1 = Service - var $total_ht; - var $total_tva; - var $total_localtax1; - var $total_localtax2; - var $total_ttc; - var $info_bits; - var $special_code; + /** + * Unit price before taxes + * @var float + */ + public $subprice; + + /** + * Type of the product. 0 for product 1 for service + * @var int + */ + public $product_type = 0; + + /** + * Description of the line + * @var string + */ + var $desc; + + /** + * Id of corresponding product + * @var int + */ + public $fk_product; + + /** + * VAT % + * @var float + */ + public $tva_tx; + + /** + * Local tax 1 % + * @var float + */ + public $localtax1_tx; + + /** + * Local tax 2 % + * @var float + */ + public $localtax2_tx; + + var $localtax1_type; + var $localtax2_type; + + /** + * Total amount before taxes + * @var float + */ + public $total_ht; + + /** + * Total VAT amount + * @var float + */ + public $total_tva; + + /** + * Total local tax 1 amount + * @var float + */ + public $total_localtax1; + + /** + * Total local tax 2 amount + * @var float + */ + public $total_localtax2; + + /** + * Total amount with taxes + * @var float + */ + public $total_ttc; + + /** + * Liste d'options cumulables: + * Bit 0: 0 si TVA normal - 1 si TVA NPR + * Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) + * @var int + */ + public $info_bits = 0; + + var $special_code; var $date_start; var $date_end; From e1982c54d9cf64b7458717757f4453b4f6b0ec59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 4 Mar 2015 10:34:19 +0100 Subject: [PATCH 036/412] Moved duplicated code to common class --- htdocs/commande/class/commande.class.php | 60 ++++++------ htdocs/core/class/commonorder.class.php | 96 +++++++++++++++++++ .../class/fournisseur.commande.class.php | 92 ------------------ 3 files changed, 125 insertions(+), 123 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 01de7890f9b..cdf73d58c7e 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -104,7 +104,10 @@ class Commande extends CommonOrder var $user_author_id; - var $lines = array(); + /** + * @var OrderLine[] + */ + var $lines = array(); /** @@ -3228,54 +3231,49 @@ class Commande extends CommonOrder */ class OrderLine extends CommonOrderLine { - var $db; - var $error; - public $element='commandedet'; public $table_element='commandedet'; var $oldline; // From llx_commandedet - var $rowid; var $fk_parent_line; var $fk_facture; var $label; - var $desc; // Description ligne - var $fk_product; // Id produit predefini - var $product_type = 0; // Type 0 = product, 1 = Service - - var $qty; // Quantity (example 2) - var $tva_tx; // VAT Rate for product/service (example 19.6) - var $localtax1_tx; // Local tax 1 - var $localtax2_tx; // Local tax 2 - var $localtax1_type; // Local tax 1 type - var $localtax2_type; // Local tax 2 type - var $subprice; // U.P. HT (example 100) - var $remise_percent; // % for line discount (example 20%) var $fk_remise_except; var $rang = 0; var $fk_fournprice; + + /** + * Buy price without taxes + * @var float + */ var $pa_ht; var $marge_tx; var $marque_tx; - var $info_bits = 0; // Bit 0: 0 si TVA normal - 1 si TVA NPR - // Bit 1: 0 ligne normale - 1 si ligne de remise fixe - var $special_code = 0; - var $total_ht; // Total HT de la ligne toute quantite et incluant la remise ligne - var $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne - var $total_localtax1; // Total local tax 1 for the line - var $total_localtax2; // Total local tax 2 for the line - var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne - // Ne plus utiliser - var $remise; - var $price; + /** + * @deprecated + */ + var $remise; + + /** + * @deprecated + */ + var $price; // From llx_product - var $ref; // deprecated - var $libelle; // deprecated - var $product_ref; + /** + * @deprecated Use product_ref + */ + var $ref; + + /** + * @deprecated Use product_label + */ + var $libelle; + + var $product_ref; var $product_label; // Label produit var $product_desc; // Description produit diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php index 3e30b0a9ca6..eadf34d5583 100644 --- a/htdocs/core/class/commonorder.class.php +++ b/htdocs/core/class/commonorder.class.php @@ -39,6 +39,102 @@ abstract class CommonOrder extends CommonObject */ abstract class CommonOrderLine extends CommonObjectLine { + /** + * Quantity + * @var int + */ + public $qty; + + /** + * Unit price before taxes + * @var float + */ + public $subprice; + + /** + * Type of the product. 0 for product 1 for service + * @var int + */ + public $product_type = 0; + + /** + * Description of the line + * @var string + */ + public $desc; + + /** + * Id of corresponding product + * @var int + */ + public $fk_product; + + /** + * Percent line discount + * @var float + */ + public $remise_percent; + + /** + * VAT % + * @var float + */ + public $tva_tx; + + /** + * Local tax 1 % + * @var float + */ + public $localtax1_tx; + + /** + * Local tax 2 % + * @var float + */ + public $localtax2_tx; + + public $localtax1_type; + public $localtax2_type; + + /** + * Total amount before taxes + * @var float + */ + public $total_ht; + + /** + * Total VAT amount + * @var float + */ + public $total_tva; + + /** + * Total local tax 1 amount + * @var float + */ + public $total_localtax1; + + /** + * Total local tax 2 amount + * @var float + */ + public $total_localtax2; + + /** + * Total amount with taxes + * @var float + */ + public $total_ttc; + + /** + * Liste d'options cumulables: + * Bit 0: 0 si TVA normal - 1 si TVA NPR + * Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) + * @var int + */ + public $info_bits = 0; + + public $special_code = 0; } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 3d4bfd7fb90..bc2e1e564b2 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -2231,101 +2231,9 @@ class CommandeFournisseur extends CommonOrder */ class CommandeFournisseurLigne extends CommonOrderLine { - var $db; - var $error; - public $element='commande_fournisseurdet'; public $table_element='commande_fournisseurdet'; - /** - * Quantity - * @var int - */ - - /** - * Unit price before taxes - * @var float - */ - public $subprice; - - /** - * Type of the product. 0 for product 1 for service - * @var int - */ - public $product_type = 0; - - /** - * Description of the line - * @var string - */ - var $desc; - - /** - * Id of corresponding product - * @var int - */ - public $fk_product; - - /** - * VAT % - * @var float - */ - public $tva_tx; - - /** - * Local tax 1 % - * @var float - */ - public $localtax1_tx; - - /** - * Local tax 2 % - * @var float - */ - public $localtax2_tx; - - var $localtax1_type; - var $localtax2_type; - - /** - * Total amount before taxes - * @var float - */ - public $total_ht; - - /** - * Total VAT amount - * @var float - */ - public $total_tva; - - /** - * Total local tax 1 amount - * @var float - */ - public $total_localtax1; - - /** - * Total local tax 2 amount - * @var float - */ - public $total_localtax2; - - /** - * Total amount with taxes - * @var float - */ - public $total_ttc; - - /** - * Liste d'options cumulables: - * Bit 0: 0 si TVA normal - 1 si TVA NPR - * Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) - * @var int - */ - public $info_bits = 0; - - var $special_code; var $date_start; var $date_end; From 54b6b199c729bdf61211182e5e8962d12655b3e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 4 Mar 2015 10:03:40 +0100 Subject: [PATCH 037/412] Documented missing properties and removed redundant documentation (cherry picked from commit 6124f6a) --- htdocs/commande/class/commande.class.php | 25 ++++++-- htdocs/core/class/commonorder.class.php | 37 ++++++++++++ .../class/fournisseur.commande.class.php | 58 +++++++++++++------ 3 files changed, 96 insertions(+), 24 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index cdf73d58c7e..a79483bd979 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -1604,12 +1604,12 @@ class Commande extends CommonOrder $line = new OrderLine($this->db); - $line->rowid = $objp->rowid; // \deprecated + $line->rowid = $objp->rowid; $line->id = $objp->rowid; $line->fk_commande = $objp->fk_commande; - $line->commande_id = $objp->fk_commande; // \deprecated + $line->commande_id = $objp->fk_commande; $line->label = $objp->custom_label; - $line->desc = $objp->description; // Description ligne + $line->desc = $objp->description; $line->product_type = $objp->product_type; $line->qty = $objp->qty; $line->tva_tx = $objp->tva_tx; @@ -1635,11 +1635,11 @@ class Commande extends CommonOrder $line->special_code = $objp->special_code; $line->fk_parent_line = $objp->fk_parent_line; - $line->ref = $objp->product_ref; // TODO deprecated + $line->ref = $objp->product_ref; $line->product_ref = $objp->product_ref; - $line->libelle = $objp->product_label; // TODO deprecated + $line->libelle = $objp->product_label; $line->product_label = $objp->product_label; - $line->product_desc = $objp->product_desc; // Description produit + $line->product_desc = $objp->product_desc; $line->fk_product_type = $objp->fk_product_type; // Produit ou service $line->date_start = $this->db->jdate($objp->date_start); @@ -3236,6 +3236,19 @@ class OrderLine extends CommonOrderLine var $oldline; + /** + * Id of parent order + * @var int + */ + public $fk_commande; + + /** + * Id of parent order + * @var int + * @deprecated Use fk_commande + */ + public $commande_id; + // From llx_commandedet var $fk_parent_line; var $fk_facture; diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php index eadf34d5583..b4882af8a58 100644 --- a/htdocs/core/class/commonorder.class.php +++ b/htdocs/core/class/commonorder.class.php @@ -39,12 +39,49 @@ abstract class CommonOrder extends CommonObject */ abstract class CommonOrderLine extends CommonObjectLine { + /** + * Product ref + * @var string + * @deprecated Use product_ref + */ + public $ref; + + /** + * Product ref + * @var string + */ + public $product_ref; + + /** + * Product label + * @var string + * @deprecated Use product_label + */ + public $libelle; + + /** + * Product label + * @var string + */ + public $product_label; + + /** + * Product description + * @var string + */ + public $product_desc; + /** * Quantity * @var int */ public $qty; + /** + * @deprecated + */ + var $price; + /** * Unit price before taxes * @var float diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index bc2e1e564b2..f3738fca2b4 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -241,14 +241,14 @@ class CommandeFournisseur extends CommonOrder $line->id = $objp->rowid; $line->rowid = $objp->rowid; - $line->desc = $objp->description; // Description ligne - $line->description = $objp->description; // Description ligne + $line->desc = $objp->description; + $line->description = $objp->description; $line->qty = $objp->qty; $line->tva_tx = $objp->tva_tx; $line->localtax1_tx = $objp->localtax1_tx; $line->localtax2_tx = $objp->localtax2_tx; - $line->subprice = $objp->subprice; // deprecated - $line->pu_ht = $objp->subprice; // Unit price HT + $line->subprice = $objp->subprice; + $line->pu_ht = $objp->subprice; $line->remise_percent = $objp->remise_percent; $line->total_ht = $objp->total_ht; $line->total_tva = $objp->total_tva; @@ -257,16 +257,16 @@ class CommandeFournisseur extends CommonOrder $line->total_ttc = $objp->total_ttc; $line->product_type = $objp->product_type; - $line->fk_product = $objp->fk_product; // Id du produit + $line->fk_product = $objp->fk_product; - $line->libelle = $objp->product_label; // TODO deprecated - $line->product_label = $objp->product_label; // Label produit - $line->product_desc = $objp->product_desc; // Description produit + $line->libelle = $objp->product_label; + $line->product_label = $objp->product_label; + $line->product_desc = $objp->product_desc; - $line->ref = $objp->product_ref; // TODO deprecated - $line->product_ref = $objp->product_ref; // Internal reference - $line->ref_fourn = $objp->ref_supplier; // TODO deprecated - $line->ref_supplier = $objp->ref_supplier; // Reference supplier + $line->ref = $objp->product_ref; + $line->product_ref = $objp->product_ref; + $line->ref_fourn = $objp->ref_supplier; + $line->ref_supplier = $objp->ref_supplier; $line->date_start = $this->db->jdate($objp->date_start); $line->date_end = $this->db->jdate($objp->date_end); @@ -2233,16 +2233,38 @@ class CommandeFournisseurLigne extends CommonOrderLine { public $element='commande_fournisseurdet'; public $table_element='commande_fournisseurdet'; + + /** + * Unit price without taxes + * @var float + */ + public $pu_ht; - var $date_start; + /** + * Unit price without taxes + * @var float + * @deprecated Use pu_ht + */ + public $subprice; + + + var $date_start; var $date_end; - // From llx_product - var $libelle; // Label produit - var $product_desc; // Description produit - // From llx_product_fournisseur_price - var $ref_fourn; // Ref supplier + + /** + * Supplier ref + * @var string + * @deprecated Use ref_supplier + */ + public $ref_fourn; + + /** + * Supplier reference + * @var string + */ + public $ref_supplier; /** From a7741350fe7940b2574adff02d5966569042a794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 4 Mar 2015 10:41:40 +0100 Subject: [PATCH 038/412] Revert unwanted change --- htdocs/fourn/class/fournisseur.facture.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 22f3c02a5a1..3ea6675cc8f 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1841,7 +1841,7 @@ class FactureFournisseur extends CommonInvoice */ class SupplierInvoiceLine extends CommonInvoice { - public $element='fournisseur->facture'; + public $element='facture_fourn_det'; public $table_element='facture_fourn_det'; var $oldline; From 7a2e60bb65c97acaf487669ef85348bcf070373b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 4 Mar 2015 10:45:30 +0100 Subject: [PATCH 039/412] No need to PHP < 5.3.0 compatibility --- htdocs/filefunc.inc.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 7343e65c854..15bee891775 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -83,7 +83,6 @@ if (! empty($dolibarr_strict_mode)) } else { - if (! defined('E_DEPRECATED')) define('E_DEPRECATED',0); // For PHP < 5.3.0 compatibility error_reporting(E_ALL & ~(E_STRICT|E_NOTICE|E_DEPRECATED)); } From 6ec8a38e4a8221677dd08f21dc08323db6cbb689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 4 Mar 2015 10:46:26 +0100 Subject: [PATCH 040/412] Removed duplicated code --- htdocs/commande/class/commande.class.php | 20 ------------------- .../class/fournisseur.commande.class.php | 8 -------- 2 files changed, 28 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index a79483bd979..9c0d4c44aae 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3270,26 +3270,6 @@ class OrderLine extends CommonOrderLine */ var $remise; - /** - * @deprecated - */ - var $price; - - // From llx_product - /** - * @deprecated Use product_ref - */ - var $ref; - - /** - * @deprecated Use product_label - */ - var $libelle; - - var $product_ref; - var $product_label; // Label produit - var $product_desc; // Description produit - // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) // Start and end date of the line var $date_start; diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index f3738fca2b4..41b9458e006 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -2240,14 +2240,6 @@ class CommandeFournisseurLigne extends CommonOrderLine */ public $pu_ht; - /** - * Unit price without taxes - * @var float - * @deprecated Use pu_ht - */ - public $subprice; - - var $date_start; var $date_end; From f94f9d1e577efe74de767441fd3af62465d7feb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Wed, 4 Mar 2015 11:19:45 +0100 Subject: [PATCH 041/412] Removed $permtoedit variable --- htdocs/core/class/commonobject.class.php | 7 +++---- htdocs/fourn/commande/card.php | 2 +- htdocs/fourn/facture/card.php | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 523716a8c84..586d5af0171 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2571,7 +2571,7 @@ abstract class CommonObject * @param int $permtoedit Permission to edit line * @return void */ - function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0, $permtoedit=0) + function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0) { global $conf, $hookmanager, $inputalsopricewithtax, $usemargins, $langs, $user; @@ -2659,7 +2659,7 @@ abstract class CommonObject } else { - $this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline,$permtoedit); + $this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline); } $i++; @@ -2680,10 +2680,9 @@ abstract class CommonObject * @param string $buyer Object of buyer third party * @param string $selected Object line selected * @param object $extrafieldsline Object of extrafield line attribute - * @param int $permtoedit Permission to edit * @return void */ - function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0,$permtoedit=0) + function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0) { global $conf,$langs,$user,$object,$hookmanager; global $form,$bc,$bcdd, $object_rights; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 68724345411..689ac41d2ef 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1748,7 +1748,7 @@ elseif (! empty($object->id)) // Show object lines $inputalsopricewithtax=0; if (! empty($object->lines)) - $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1, $user->rights->fournisseur->commande->creer); + $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1); $num = count($object->lines); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 01be69f1590..cd1e60a37ed 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2054,7 +2054,7 @@ else // Show object lines if (! empty($object->lines)) - $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1, $user->rights->fournisseur->facture->creer); + $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1); $num=count($object->lines); From 8c6a50554ee02e41fee21b81109fa8aa74f6faa1 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 5 Mar 2015 20:37:36 +0100 Subject: [PATCH 042/412] Debug of Frederic34. Thanks ! --- htdocs/compta/loan/calc.php | 43 ++++++++++++++++++++---------------- htdocs/langs/en_US/loan.lang | 1 + 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/htdocs/compta/loan/calc.php b/htdocs/compta/loan/calc.php index 5cc2c830094..009c61095c9 100644 --- a/htdocs/compta/loan/calc.php +++ b/htdocs/compta/loan/calc.php @@ -1,6 +1,7 @@ * Copyright (C) 2014 Alexandre Spangaro + * Copyright (C) 2015 Frederic France * * 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 @@ -19,7 +20,7 @@ require '../../main.inc.php'; $langs->load("loan"); - + /* --------------------------------------------------- * * Set Form DEFAULT values * --------------------------------------------------- */ @@ -82,12 +83,17 @@ if ($form_complete) { $annual_interest_percent = preg_replace( "[^0-9.]", "", $annual_interest_percent); $year_term = preg_replace( "[^0-9.]", "", $year_term); $down_percent = preg_replace( "[^0-9.]", "", $down_percent); - - if (((float) $year_term <= 0) || ((float) $sale_price <= 0) || ((float) $annual_interest_percent <= 0)) { - $error = "You must enter a Sale Price of Home, Length of Motgage and Annual Interest Rate"; - } - if (!$error) { + if ((float) $year_term <= 0) { + $errors[] = "You must enter a Sale Price of Home"; + } + if ((float) $sale_price <= 0) { + $errors[] = "You must enter a Length of Mortgage"; + } + if ((float) $annual_interest_percent <= 0) { + $errors[] = "You must enter an Annual Interest Rate"; + } + if (!$errors) { $month_term = $year_term * 12; $down_payment = $sale_price * ($down_percent / 100); $annual_interest_rate = $annual_interest_percent / 100; @@ -104,8 +110,8 @@ if ($form_complete) { if (!$show_progress) { $show_progress = $default_show_progress; } } -if ($error) { - print("" . $error . "

\n"); +if (! empty($errors)) { + setEventMessages('', $errors, 'errors'); $form_complete = false; } @@ -123,17 +129,16 @@ echo "This mortgage calculator can be use print '
'; print ''; print ''; -print ''; -print ''; -print ''; -print ''; +//print ''; +//print ''; +//print ''; +//print ''; print ''; print ''; print ''; print ''; print ''; -print ''; -print ''; +print '';print ''; print ''; print ''; print ''; @@ -289,7 +294,7 @@ if ($form_complete && $show_progress) { print '
Purchase & Financing Information
Sale Price of Home: '.$langs->trans("Currency".$conf->currency).'
'.$langs->trans("Currency".$conf->currency).'
Percentage Down:%'; print 'The montly payment is figured out using the following formula:
'; print 'Monthly Payment = ' . number_format($financing_price, "2", "", "") . ' * '; - print number_format($monthly_interest_rate, "4", "", "") . ' / '; + print $langs->trans('MonthlyPayment').' = ' . number_format($financing_price, "2", "", "") . ' * '; print '(1 - ((1 + ' . number_format($monthly_interest_rate, "4", "", "") . ')'; print '-(' . $month_term . '))))'; print '

'; @@ -311,7 +316,7 @@ if ($form_complete && $show_progress) { $denom = pow((1 + $monthly_interest_rate), $power); $monthly_payment = $principal * ($monthly_interest_rate / (1 - $denom)); - print("

Amortization For Monthly Payment: \$" . number_format($monthly_payment, "2", ".", ",") . " over " . $year_term . " years
\n"); + print "

Amortization For Monthly Payment: " . number_format($monthly_payment, "2", ".", ",") . " over " . $year_term . " years
\n"); print ''; @@ -323,8 +328,8 @@ if ($form_complete && $show_progress) { $legend.= ''; $legend.= ''; - echo $legend; - + print $legend; + // Loop through and get the current month's payments for // the length of the loan while ($current_month <= $month_term) @@ -377,7 +382,7 @@ if ($form_complete && $show_progress) { $principal = $remaining_balance; $current_month++; } - print("
' . $langs->trans("Position") . '
\n"); + print "
\n"; } llxFooter(); diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index e59fc7898b8..a035c8cf68c 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -19,6 +19,7 @@ ErrorLoanLength=Loan length has to be numeric and greater ErrorLoanInterest=Annual interest has to be numeric and greater than zero. # Calc Totalsforyear=Totals for year +MonthlyPayment=Monthly Payment # Admin ConfigLoan=Configuration of the module loan LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default From 0b74ddf5c32d4582ec3cf5f143e040c335966bf2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 10 Mar 2015 14:23:40 +0100 Subject: [PATCH 043/412] Doxygen --- htdocs/expedition/class/expeditionbatch.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php index 38fe5078d9e..fd424fc4990 100644 --- a/htdocs/expedition/class/expeditionbatch.class.php +++ b/htdocs/expedition/class/expeditionbatch.class.php @@ -32,9 +32,9 @@ class ExpeditionLineBatch extends CommonObject private static $_table_element='expeditiondet_batch'; //!< Name of table without prefix where object is stored var $id; - var $sellby=''; - var $eatby=''; - var $batch=''; + var $sellby; + var $eatby; + var $batch; var $dluo_qty; var $entrepot_id; var $fk_origin_stock; From ea0964d1ebaba35685c215afe0cc11cdf8a52390 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Tue, 10 Mar 2015 17:17:02 +0100 Subject: [PATCH 044/412] Update export.class.php add specific choice of prefix for export (usefull with many dolibarr exporting data) --- htdocs/exports/class/export.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index d332592da6d..9ff540a92f2 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -524,7 +524,10 @@ class Export if ($resql) { //$this->array_export_label[$indice] - $filename="export_".$datatoexport; + if ($conf->global->EXPORT_PREFIX) + $filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport; + else + $filename="export_".$datatoexport; $filename.='.'.$objmodel->getDriverExtension(); $dirname=$conf->export->dir_temp.'/'.$user->id; From bf86693dcb05f0e41c819c67df6399c71ec7f3f0 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Tue, 10 Mar 2015 21:47:39 +0100 Subject: [PATCH 045/412] Update sellsjournal.php --- htdocs/accountancy/journal/sellsjournal.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index b3ca7ceae98..c0251291964 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -271,7 +271,11 @@ if ($action == 'export_csv') $sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL; header('Content-Type: text/csv'); - header('Content-Disposition: attachment;filename=journal_ventes.csv'); + if ($conf->global->EXPORT_PREFIX) + $filename=$conf->global->EXPORT_PREFIX_SPEC."_"."journal_ventes.csv"; + else + $filename="journal_ventes.csv"; + header('Content-Disposition: attachment;filename='.$filename); $companystatic = new Client($db); From f91127c92a335b9b281f86b8ed2753239ec616fc Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Tue, 10 Mar 2015 21:48:47 +0100 Subject: [PATCH 046/412] Update purchasesjournal.php --- htdocs/accountancy/journal/purchasesjournal.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 905296358f0..521a1c6a74c 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -249,7 +249,11 @@ if ($action == 'export_csv') $purchase_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL; header('Content-Type: text/csv'); - header('Content-Disposition: attachment;filename=journal_achats.csv'); + if ($conf->global->EXPORT_PREFIX) + $filename=$conf->global->EXPORT_PREFIX_SPEC."_"."journal_achats.csv"; + else + $filename="journal_achats.csv"; + header('Content-Disposition: attachment;filename='.$filename); if ($conf->global->ACCOUNTING_EXPORT_MODELCSV == 2) // Model Cegid Expert Export { From f88646d954664e48a2c2a59b9be3451286268384 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Wed, 11 Mar 2015 10:22:37 +0100 Subject: [PATCH 047/412] Update export.class.php --- htdocs/exports/class/export.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 9ff540a92f2..707b38e1ef7 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -524,7 +524,7 @@ class Export if ($resql) { //$this->array_export_label[$indice] - if ($conf->global->EXPORT_PREFIX) + if ($conf->global->EXPORT_PREFIX_SPEC) $filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport; else $filename="export_".$datatoexport; From 9fc83ca011c47be0540989bc6c7160d116d532bc Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Wed, 11 Mar 2015 10:23:13 +0100 Subject: [PATCH 048/412] Update sellsjournal.php --- htdocs/accountancy/journal/sellsjournal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php index c0251291964..7605d54825c 100644 --- a/htdocs/accountancy/journal/sellsjournal.php +++ b/htdocs/accountancy/journal/sellsjournal.php @@ -271,7 +271,7 @@ if ($action == 'export_csv') $sell_journal = $conf->global->ACCOUNTING_SELL_JOURNAL; header('Content-Type: text/csv'); - if ($conf->global->EXPORT_PREFIX) + if ($conf->global->EXPORT_PREFIX_SPEC) $filename=$conf->global->EXPORT_PREFIX_SPEC."_"."journal_ventes.csv"; else $filename="journal_ventes.csv"; From e7ed8ce95b6d1754e1c04eaeae2b3499fe801022 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Wed, 11 Mar 2015 10:23:33 +0100 Subject: [PATCH 049/412] Update purchasesjournal.php --- htdocs/accountancy/journal/purchasesjournal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php index 521a1c6a74c..6d89e8f17a2 100644 --- a/htdocs/accountancy/journal/purchasesjournal.php +++ b/htdocs/accountancy/journal/purchasesjournal.php @@ -249,7 +249,7 @@ if ($action == 'export_csv') $purchase_journal = $conf->global->ACCOUNTING_PURCHASE_JOURNAL; header('Content-Type: text/csv'); - if ($conf->global->EXPORT_PREFIX) + if ($conf->global->EXPORT_PREFIX_SPEC) $filename=$conf->global->EXPORT_PREFIX_SPEC."_"."journal_achats.csv"; else $filename="journal_achats.csv"; From 59cbde042c8f919614c61a9863b304519eac58ba Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 12 Mar 2015 17:29:52 +0100 Subject: [PATCH 050/412] Generalize option MAIN_HTML_TITLE for all tabs of thirdparty. --- htdocs/categories/categorie.php | 4 +++- htdocs/societe/agenda.php | 5 ++++- htdocs/societe/consumption.php | 6 ++++-- htdocs/societe/document.php | 4 +++- htdocs/societe/info.php | 12 ++++++------ htdocs/societe/notify/card.php | 8 ++++++-- 6 files changed, 26 insertions(+), 13 deletions(-) diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 0746475ecec..e116ac668ab 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -235,7 +235,9 @@ if ($socid) $soc = new Societe($db); $result = $soc->fetch($socid); - llxHeader("","",$langs->trans("Category")); + $title=$langs->trans("Category"); + if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$soc->name." - ".$title; + llxHeader("",$title); // Show tabs $head = societe_prepare_head($soc); diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php index 19d943798ce..e3b273796fa 100644 --- a/htdocs/societe/agenda.php +++ b/htdocs/societe/agenda.php @@ -69,7 +69,10 @@ if ($socid) $object = new Societe($db); $result = $object->fetch($socid); - llxHeader("",$langs->trans("Agenda"),''); + + $title=$langs->trans("Agenda"); + if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title; + llxHeader('',$title); if (! empty($conf->notification->enabled)) $langs->load("mails"); $head = societe_prepare_head($object); diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index d8aad10d054..e581b6b8c29 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -98,8 +98,10 @@ $form = new Form($db); $formother = new FormOther($db); $productstatic=new Product($db); -$titre = $langs->trans("Referer",$object->name); -llxHeader('',$titre,''); +$title = $langs->trans("Referer",$object->name); +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title; +$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; +llxHeader('',$title,$help_url); if (empty($socid)) { diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php index c2ad751f196..f3c217d0a54 100644 --- a/htdocs/societe/document.php +++ b/htdocs/societe/document.php @@ -82,8 +82,10 @@ include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php $form = new Form($db); +$title=$langs->trans("ThirdParty").' - '.$langs->trans("Files"); +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Files"); $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; -llxHeader('',$langs->trans("ThirdParty").' - '.$langs->trans("Files"),$help_url); +llxHeader('',$title,$help_url); if ($object->id) { diff --git a/htdocs/societe/info.php b/htdocs/societe/info.php index 9d06d203d9c..b3586c4f327 100644 --- a/htdocs/societe/info.php +++ b/htdocs/societe/info.php @@ -56,16 +56,16 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e * View */ -$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; -llxHeader('',$langs->trans("ThirdParty"),$help_url); - $object = new Societe($db); $object->fetch($socid); $object->info($socid); -/* - * Affichage onglets - */ +$title=$langs->trans("ThirdParty"); +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Info"); +$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; +llxHeader('',$title,$help_url); + + $head = societe_prepare_head($object); dol_fiche_head($head, 'info', $langs->trans("ThirdParty"),0,'company'); diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 1845669dcfc..e5de6a89d92 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -123,11 +123,15 @@ if ($action == 'delete') $form = new Form($db); -llxHeader(); - $object = new Societe($db); $result=$object->fetch($socid); +$title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification"); +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification"); +$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; +llxHeader('',$title,$help_url); + + if ($result > 0) { $langs->load("other"); From 9b4f65587f4a0b6fa76a4e21fc10a4362fff7247 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 13:27:24 +0100 Subject: [PATCH 051/412] Fix option MAIN_HTML_TITLE --- htdocs/fourn/card.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index df2f09cc3e3..f94664531dd 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -111,8 +111,8 @@ if ($id > 0 && empty($object->id)) if ($object->id > 0) { - $title=$langs->trans("SupplierCard"); - if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name; + $title=$langs->trans("ThirdParty")." - ".$langs->trans('SupplierCard'); + if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$langs->trans('SupplierCard'); $help_url=''; llxHeader('',$title, $help_url); From 622d8ad9b04764e91aa6f7fe4281600bc4385514 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 13:51:35 +0100 Subject: [PATCH 052/412] Remove duplicate entry --- htdocs/langs/en_US/suppliers.lang | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang index fb7dbd26032..53b0618c7b1 100644 --- a/htdocs/langs/en_US/suppliers.lang +++ b/htdocs/langs/en_US/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -Supplier=Supplier AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice From dfe1ee7e7d26dbb5d73a8fff685d5d8223309a95 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 14:11:59 +0100 Subject: [PATCH 053/412] Fix: count of notification emails was wrong --- htdocs/langs/en_US/other.lang | 2 +- htdocs/societe/notify/card.php | 32 +++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index f5b39b3f704..1e3a7f038ff 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -54,7 +54,7 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 1845669dcfc..388a271cd8c 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -169,6 +169,8 @@ if ($result > 0) print '
'.$langs->trans("NbOfActiveNotifications").''; + $nb=0; + // List of per contact notifications $sql = "SELECT COUNT(n.rowid) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n"; $sql.= " WHERE fk_soc = ".$object->id; @@ -187,6 +189,13 @@ if ($result > 0) else { dol_print_error($db); } + // List of notifications enabled for fixed email + foreach($conf->global as $key => $val) + { + if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue; + $listtmp=explode(',',$val); + $nb+=count($listtmp); + } print $nb; print '
'; @@ -273,16 +282,21 @@ if ($result > 0) foreach($conf->global as $key => $val) { if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue; - //print $key.' - '.$val.' - '.$reg[1].'
'; - print ''.$val; - if (isValidEmail($val)) + print ''; + $listtmp=explode(',',$val); + foreach($listtmp as $keyemail => $valemail) { - print ' <'.$val.'>'; - } - else - { - $langs->load("errors"); - print '   '.img_warning().' '.$langs->trans("ErrorBadEMail",$val); + $valemail=trim($valemail); + //print $keyemail.' - '.$valemail.' - '.$reg[1].'
'; + if (isValidEmail($valemail)) + { + print ' <'.$valemail.'>'; + } + else + { + $langs->load("errors"); + print '   '.img_warning().' '.$langs->trans("ErrorBadEMail",$valemail); + } } print ''; print ''; From 279e16a8112cafabc29e911828bdc2eeebddd5ed Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 14:24:32 +0100 Subject: [PATCH 054/412] grey disabled --- htdocs/theme/eldy/style.css.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 206b1df019e..e6dbf78d6a0 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -363,7 +363,7 @@ fieldset { border: 1px solid #AAAAAA !important; box-shadow: 2px 2px 3px #DDD; } } .buttonRefused { pointer-events: none; - cursor: default; + cursor: default; opacity: 0.4; filter: alpha(opacity=40); /* For IE8 and earlier */ box-shadow: none; @@ -2949,7 +2949,10 @@ div.dolEventError h1, div.dolEventError h2 { { border: 1px solid #aaa; } - +.select2-disabled +{ + color: #888; +} .select2-drop-active { border: 1px solid #aaa; From 895b2c6e9c79dec5377c335b0843f974992a6392 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 14:37:27 +0100 Subject: [PATCH 055/412] Fix bad merge --- htdocs/comm/action/peruser.php | 2 +- htdocs/core/lib/agenda.lib.php | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 0f281a91af4..15915b758e0 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -614,7 +614,7 @@ else if ($usergroup > 0) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user"; $sql.= " WHERE u.entity IN (".getEntity('user',1).")"; if ($usergroup > 0) $sql.= " AND ug.fk_usergroup = ".$usergroup; - if (GETPOST("usertodo","int",3) > 0) $sql.=" AND u.rowid = ".GETPOST("usertodo","int",3); + //if (GETPOST("usertodo","int",3) > 0) $sql.=" AND u.rowid = ".GETPOST("usertodo","int",3); //print $sql; $resql=$db->query($sql); if ($resql) diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index d277511785c..174b1c79092 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -140,10 +140,6 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh if (empty($conf->dol_use_jmobile)) print ' - '; print ''; print ''; - - print ''.$langs->trans("AgendaShowBirthdayEvents").' '; - print ''; - print ''; } // Hooks From a452823e1ed420c94091351390e340a558dd5476 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 15:20:08 +0100 Subject: [PATCH 056/412] Include option FCKEDITOR_ENABLE_DETAILS_FULL to restore compatibility with 3.6 --- htdocs/core/tpl/objectline_create.tpl.php | 4 +++- htdocs/core/tpl/objectline_edit.tpl.php | 4 +++- htdocs/theme/eldy/ckeditor/config.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index e3f2431783f..7cb2cc7cdf3 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -186,7 +186,9 @@ else { $nbrows=ROWS_2; $enabled=(! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0); if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; - $doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,'dolibarr_details','',false,true,$enabled,$nbrows,'98%'); + $toolbarname='dolibarr_details'; + if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes'; + $doleditor=new DolEditor('dp_desc',GETPOST('dp_desc'),'',100,$toolbarname,'',false,true,$enabled,$nbrows,'98%'); $doleditor->Create(); ?> diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 69550d546d5..c43b8be9e20 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -88,7 +88,9 @@ $coldisplay=-1; // We remove first td $nbrows=ROWS_2; if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT; $enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0); - $doleditor=new DolEditor('product_desc',$line->description,'',164,'dolibarr_details','',false,true,$enable,$nbrows,'98%'); + $toolbarname='dolibarr_details'; + if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes'; + $doleditor=new DolEditor('product_desc',$line->description,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%'); $doleditor->Create(); ?> diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js index 97f1c0a0b62..cffaadfba6e 100644 --- a/htdocs/theme/eldy/ckeditor/config.js +++ b/htdocs/theme/eldy/ckeditor/config.js @@ -76,7 +76,7 @@ CKEDITOR.editorConfig = function( config ) [ ['Source','Maximize'], ['Cut','Copy','Paste','-','SpellChecker'], - ['Font','FontSize'], + ['Format','Font','FontSize'], ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], ['NumberedList','BulletedList','Outdent','Indent'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], From b47e16fbe9ce92c7bc406791b20c8c93b0a36188 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 16:02:40 +0100 Subject: [PATCH 057/412] Update changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index ae63471c9af..64cd43f7030 100644 --- a/ChangeLog +++ b/ChangeLog @@ -130,6 +130,7 @@ For translators: - New: When a translation is not available we always jump to en_US and only en_US. For developers: +- New: Syslog module can be set to use ChromePHP plugin to output log server into browser console. - New: Add a css style "cursorpointer". - New: Select list of users can return user into hierarchy. - New: getBrowserInfo can return type of layout of browser (classic/phone/tablet) From 5cc48c7c78b3d3cee1d84d1fc19de49d242824c5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 16:20:42 +0100 Subject: [PATCH 058/412] Prepare cleaning tools for release. --- dev/fixdosfiles.sh | 1 + dev/fixduplicatelangkey.sh | 1 + ...atefilelinesrecursively.sh => fixduplicatelines.sh} | 10 ++++++---- dev/fixperms.sh | 1 + dev/fixutf8bomfiles.sh | 1 + 5 files changed, 10 insertions(+), 4 deletions(-) rename dev/{deduplicatefilelinesrecursively.sh => fixduplicatelines.sh} (59%) diff --git a/dev/fixdosfiles.sh b/dev/fixdosfiles.sh index 30d47e7b0c4..e38e3d49d82 100755 --- a/dev/fixdosfiles.sh +++ b/dev/fixdosfiles.sh @@ -10,6 +10,7 @@ # Syntax if [ "x$1" != "xlist" -a "x$1" != "xfix" ] then + echo "Detect and fix files ending with bad ending chars (must be LF)" echo "Usage: fixdosfiles.sh [list|fix]" fi diff --git a/dev/fixduplicatelangkey.sh b/dev/fixduplicatelangkey.sh index 2d9cb7f7a85..ae0be750646 100755 --- a/dev/fixduplicatelangkey.sh +++ b/dev/fixduplicatelangkey.sh @@ -7,6 +7,7 @@ # Syntax if [ "x$1" != "xlist" -a "x$1" != "xfix" ] then + echo "Detect duplicate translation keys inside a file (there is no cross file check)." echo "Usage: detectduplicatelangkey.sh (list|fix)" fi diff --git a/dev/deduplicatefilelinesrecursively.sh b/dev/fixduplicatelines.sh similarity index 59% rename from dev/deduplicatefilelinesrecursively.sh rename to dev/fixduplicatelines.sh index a0eb14974f0..18f9707169e 100755 --- a/dev/deduplicatefilelinesrecursively.sh +++ b/dev/fixduplicatelines.sh @@ -9,17 +9,19 @@ # Syntax if [ "x$1" != "xlist" -a "x$1" != "xfix" ] then + echo "Find exact duplicated lines into file (not cross file checking)" echo "Usage: deduplicatefilelinesrecursively.sh [list|fix]" fi # To detect if [ "x$1" = "xlist" ] then - for file in `find . -type f -name *.lang` + for file in `find htdocs/langs/en_US -type f -name *.lang` do - if [ `sort "$file" | uniq -d | wc -l` -gt 0 ] + if [ `sort "$file" | grep -v '^$' | uniq -d | wc -l` -gt 0 ] then - echo "$file" + echo "***** $file" + sort "$file" | grep -v '^$' | uniq -d fi done fi @@ -27,7 +29,7 @@ fi # To fix if [ "x$1" = "xfix" ] then - for file in `find . -type f -name *.lang` + for file in `find htdocs/langs/en_US -type f -name *.lang` do awk -i inplace ' !x[$0]++' "$file" done; diff --git a/dev/fixperms.sh b/dev/fixperms.sh index 5844e8b2916..5b027ad1580 100755 --- a/dev/fixperms.sh +++ b/dev/fixperms.sh @@ -10,6 +10,7 @@ # Syntax if [ "x$1" != "xlist" -a "x$1" != "xfix" ] then + echo "Fix permissions of files" echo "Usage: fixperms.sh (list|fix)" fi diff --git a/dev/fixutf8bomfiles.sh b/dev/fixutf8bomfiles.sh index db34cdcdc1d..bda503d28ec 100755 --- a/dev/fixutf8bomfiles.sh +++ b/dev/fixutf8bomfiles.sh @@ -12,6 +12,7 @@ # Syntax if [ "x$1" != "xlist" -a "x$1" != "xfix" ] then + echo "Detect and fix bad UTF8 encoded files (UTF8 must not use BOM char)" echo "Usage: fixutf8bomfiles.sh (list|fix) [addincludes]" fi From 927925f4fdb50898d9bbef98f25aee229e98b61a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 17:42:50 +0100 Subject: [PATCH 059/412] Can also sync alternatives languages from transifex now. --- dev/fixaltlanguages.sh | 54 +++++++++++++++++++++++++ dev/translation/strip_language_file.php | 14 +++---- 2 files changed, 61 insertions(+), 7 deletions(-) create mode 100755 dev/fixaltlanguages.sh diff --git a/dev/fixaltlanguages.sh b/dev/fixaltlanguages.sh new file mode 100755 index 00000000000..d6d1946b7d1 --- /dev/null +++ b/dev/fixaltlanguages.sh @@ -0,0 +1,54 @@ +#!/bin/sh +# Recursively deduplicate file lines on a per file basis +# Useful to deduplicate language files +# +# Needs awk 4.0 for the inplace fixing command +# +# Raphaël Doursenaud - rdoursenaud@gpcsolutions.fr + +# Syntax +if [ "x$1" != "xlist" -a "x$1" != "xfix" ] +then + echo "Scan alternate language files and remove entries found into parent file" + echo "Usage: fixaltlanguages.sh (list|fix) (all|file.lang) [xx_XX]" + exit +fi +if [ "x$2" = "x" ] +then + echo "Scan alternate language files and remove entries found into parent file" + echo "Usage: fixaltlanguages.sh (list|fix) (all|file.lang) [xx_XX]" + exit +fi + +# To detect +if [ "x$1" = "xlist" ] +then + echo Feature not available +fi + +# To fix +if [ "x$1" = "xfix" ] +then + for dir in `find htdocs/langs/$3* -type d` + do + dirshort=`basename $dir` + #echo $dirshort + + export aa=`echo $dirshort | nawk -F"_" '{ print $1 }'` + export bb=`echo $dirshort | nawk -F"_" '{ print $2 }'` + aaupper=`echo $dirshort | nawk -F"_" '{ print toupper($1) }'` + bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'` + if [ "$aa" != "$bblower" ] + then + reflang="htdocs/langs/"$aa"_"$aaupper + if [ -d $reflang ] + then + echo "***** Process language "$aa"_"$bb" - Search original into "$reflang + echo $dirshort est une langue alternative de $reflang + echo ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2 + ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2 + for fic in `ls htdocs/langs/${aa}_${bb}/*.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done + fi + fi + done; +fi diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php index 42a70c8c1a6..e3c31b89b58 100755 --- a/dev/translation/strip_language_file.php +++ b/dev/translation/strip_language_file.php @@ -25,7 +25,7 @@ * * Usage: * cd htdocs/langs - * ../../dev/translation/strip_language_file.php [file.lang|all] + * ./dev/translation/strip_language_file.php [file.lang|all] * * To rename all .delta files, you can do * for fic in `ls *.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done @@ -66,7 +66,7 @@ if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess)) { $rc = 1; $msg = '***** Script to clean language files *****'."\n"; - $msg.= 'Usage: ../../dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n"; + $msg.= 'Usage: ./dev/translation/strip_language_file.php xx_XX xx_YY [file.lang|all]'."\n"; print $msg . "(rc=$rc).\n"; exit($rc); } @@ -77,7 +77,7 @@ $aSecondary = array(); // Define array $filesToProcess if ($filesToProcess == 'all') { - $dir = new DirectoryIterator($lPrimary); + $dir = new DirectoryIterator('htdocs/langs/'.$lPrimary); while($dir->valid()) { if(!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./',$dir->getFilename())) { $files[] = $dir->getFilename(); @@ -94,8 +94,8 @@ else $filesToProcess=explode(',',$filesToProcess); // Loop on each file foreach($filesToProcess as $fileToProcess) { - $lPrimaryFile = $lPrimary.'/'.$fileToProcess; - $lSecondaryFile = $lSecondary.'/'.$fileToProcess; + $lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess; + $lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess; $output = $lSecondaryFile . '.delta'; print "---- Process language file ".$lSecondaryFile."\n"; @@ -270,8 +270,8 @@ foreach($filesToProcess as $fileToProcess) print "Output can be found at $output.\n"; - print "To rename all .delta files, you can do\n"; - print 'for fic in `ls *.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n"; + print "To rename all .delta files, you can do:\n"; + print '> for fic in `ls htdocs/langs/'.$lSecondary.'/*.delta`; do f=`echo $fic | sed -e \'s/\.delta//\'`; echo $f; mv $f.delta $f; done'."\n"; } From f75749cc2b3232ab586d73e1cf04abe0f2fce4ed Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 17:43:04 +0100 Subject: [PATCH 060/412] Sync transifex --- htdocs/langs/de_AT/admin.lang | 2 -- htdocs/langs/es_AR/admin.lang | 2 +- htdocs/langs/es_CL/admin.lang | 6 ++---- htdocs/langs/es_DO/admin.lang | 4 +--- htdocs/langs/es_HN/admin.lang | 2 +- htdocs/langs/es_MX/admin.lang | 2 +- htdocs/langs/es_PE/admin.lang | 2 +- htdocs/langs/es_PR/admin.lang | 2 +- htdocs/langs/pt_BR/accountancy.lang | 9 ++++----- htdocs/langs/pt_BR/admin.lang | 4 ---- htdocs/langs/pt_BR/agenda.lang | 1 - htdocs/langs/pt_BR/banks.lang | 3 --- htdocs/langs/pt_BR/boxes.lang | 1 - htdocs/langs/pt_BR/categories.lang | 3 --- htdocs/langs/pt_BR/commercial.lang | 1 - htdocs/langs/pt_BR/companies.lang | 3 --- htdocs/langs/pt_BR/compta.lang | 4 ---- htdocs/langs/pt_BR/contracts.lang | 3 --- htdocs/langs/pt_BR/install.lang | 5 ----- htdocs/langs/pt_BR/languages.lang | 3 --- htdocs/langs/pt_BR/mails.lang | 2 -- htdocs/langs/pt_BR/main.lang | 16 +--------------- htdocs/langs/pt_BR/other.lang | 1 - htdocs/langs/pt_BR/products.lang | 1 - htdocs/langs/pt_BR/projects.lang | 8 -------- htdocs/langs/pt_BR/resource.lang | 9 --------- htdocs/langs/pt_BR/users.lang | 6 ------ 27 files changed, 13 insertions(+), 92 deletions(-) diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang index 3e63292c41f..72053d81e4b 100644 --- a/htdocs/langs/de_AT/admin.lang +++ b/htdocs/langs/de_AT/admin.lang @@ -70,9 +70,7 @@ Permission2413=Maßnahmen (Termine oder Aufgaben) Anderer löschen Permission2501=Dokumente hochladen oder löschen DictionaryCompanyType=Art des Unternehmens DictionaryCompanyJuridicalType=Rechtsform -DictionaryProspectLevel=Geschäftsaussicht DictionaryCanton=Bundesland -DictionaryActions=Maßnahmen VATReceivedOnly=Nur Mehtwertsteuererhalt VATIsNotUsedDesc=Die vorgeschlagene MwSt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen- VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang index 6aa9664cdfb..39a4dac9a4e 100644 --- a/htdocs/langs/es_AR/admin.lang +++ b/htdocs/langs/es_AR/admin.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - es_AR - admin +# Dolibarr language file - Source file is en_US - admin Module30Name=Facturas y notas de crédito Module30Desc=Gestión de facturas y notas de crédito a clientes. Gestión facturas de proveedores BillsNumberingModule=Módulo de numeración de facturas y notas de crédito diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang index 20f6fdfea33..a1849146e7f 100644 --- a/htdocs/langs/es_CL/admin.lang +++ b/htdocs/langs/es_CL/admin.lang @@ -1,3 +1,4 @@ +# Dolibarr language file - Source file is en_US - admin Module20Name=Cotizaciones Module20Desc=Gestión de cotizaciones/propuestas comerciales Permission21=Consultar cotizaciones @@ -7,10 +8,7 @@ Permission25=Enviar las cotizaciones Permission26=Cerrar cotizaciones Permission27=Eliminar cotizaciones Permission28=Exportar las cotizaciones -DictionnarySource=Orígenes de cotizaciones/pedidos VATIsUsedDesc=El tipo de IVA propuesto por defecto en las creaciones de cotizaciones, facturas, pedidos, etc. Responde a la siguiente regla:
Si el vendedor no está sujeto a IVA, IVA por defecto=0. Final de regla.
Si el país del vendedor= país del comprador entonces IVA por defecto=IVA del producto vendido. Final de regla.
Si vendedor y comprador residen en la Comunidad Europea y el bien vendido= nuevo medio de transportes (auto, barco, avión), IVA por defecto=0 (el IVA debe ser pagado por comprador a la hacienda pública de su país y no al vendedor). Final de regla
Si vendedor y comprador residen en la Comunidad Europea y comprador= particular o empresa sin NIF intracomunitario entonces IVA por defecto=IVA del producto vendido. Final de regla.
Si vendedor y comprador residen en la Comunidad Europea y comprador= empresa con NIF intracomunitario entonces IVA por defecto=0. Final de regla.
Si no, IVA propuesto por defecto=0. Final de regla.
-VATIsNotUsedDesc=El tipo de IVA propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades. -VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que eligen un régimen fiscal general (General simplificado o General normal), régimen en el cual se declara el IVA. Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones a cerrar Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones no facturadas WebCalAddEventOnStatusPropal=Añadir evento en el calendario en el cambio de estado de las cotizaciones @@ -20,4 +18,4 @@ ProposalsPDFModules=Modelos de documentos de cotizaciones HideTreadedPropal=Ocultar las cotizaciones procesados del listado FreeLegalTextOnProposal=Texto libre en cotizaciones WatermarkOnDraftProposal=Marca de agua en cotizaciones borrador (en caso de estar vacío) -FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (en pedidos, cotizaciones, facturas, etc.) \ No newline at end of file +FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (en pedidos, cotizaciones, facturas, etc.) diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang index 8fcc2394a87..f4213f15cbc 100644 --- a/htdocs/langs/es_DO/admin.lang +++ b/htdocs/langs/es_DO/admin.lang @@ -13,12 +13,10 @@ VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que elige VATIsNotUsedExampleFR=En Francia, se trata de asociaciones exentas de ITBIS o sociedades, organismos o profesiones liberales que han elegido el régimen fiscal de módulos (ITBIS en franquicia), pagando un ITBIS en franquicia sin hacer declaración de IVA. Esta elección hace aparecer la anotación "IVA no aplicable - art-293B del CGI" en las facturas. LocalTax1IsUsedDesc=Uso de un 2º tipo de impuesto (Distinto del ITBIS) LocalTax1IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del ITBIS) -LocalTax2IsUsedDesc=Uso de un 3er. tipo de impuesto (Distinto del IVA) -LocalTax2IsNotUsedDesc=No usar un 3er. tipo de impuesto (Distinto del IVA) UnitPriceOfProduct=Precio unitario sin ITBIS de un producto ShowVATIntaInAddress=Ocultar el identificador ITBIS en las direcciones de los documentos OptionVatMode=Opción de carga de ITBIS OptionVatDefaultDesc=La carga del ITBIS es:
-en el envío de los bienes (en la práctica se usa la fecha de la factura)
-sobre el pago por los servicios OptionVatDebitOptionDesc=La carga del ITBIS es:
-en el envío de los bienes (en la práctica se usa la fecha de la factura)
-sobre la facturación de los servicios SummaryOfVatExigibilityUsedByDefault=Tiempo de exigibilidad de ITBIS por defecto según la opción eligida -YourCompanyDoesNotUseVAT=Su empresa está configurada como no sujeta al ITBIS (Inicio - Configuración - Empresa/Institución), por lo que no hay opción para la paremetrización del ITBIS. \ No newline at end of file +YourCompanyDoesNotUseVAT=Su empresa está configurada como no sujeta al ITBIS (Inicio - Configuración - Empresa/Institución), por lo que no hay opción para la paremetrización del ITBIS. diff --git a/htdocs/langs/es_HN/admin.lang b/htdocs/langs/es_HN/admin.lang index a823583bd50..1008ca5171d 100644 --- a/htdocs/langs/es_HN/admin.lang +++ b/htdocs/langs/es_HN/admin.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - es_HN - admin +# Dolibarr language file - Source file is en_US - admin Permission91=Consultar impuestos e ISV Permission92=Crear/modificar impuestos e ISV Permission93=Eliminar impuestos e ISV diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang index b8c2794cf3c..39a4dac9a4e 100644 --- a/htdocs/langs/es_MX/admin.lang +++ b/htdocs/langs/es_MX/admin.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - es_MX - admin +# Dolibarr language file - Source file is en_US - admin Module30Name=Facturas y notas de crédito Module30Desc=Gestión de facturas y notas de crédito a clientes. Gestión facturas de proveedores BillsNumberingModule=Módulo de numeración de facturas y notas de crédito diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang index 877beecd423..4e81dca9011 100644 --- a/htdocs/langs/es_PE/admin.lang +++ b/htdocs/langs/es_PE/admin.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - es_PU - admin +# Dolibarr language file - Source file is en_US - admin Permission91=Consultar impuestos e IGV Permission92=Crear/modificar impuestos e IGV Permission93=Eliminar impuestos e IGV diff --git a/htdocs/langs/es_PR/admin.lang b/htdocs/langs/es_PR/admin.lang index f5906e9e162..ac75565a66b 100644 --- a/htdocs/langs/es_PR/admin.lang +++ b/htdocs/langs/es_PR/admin.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - es_PR - admin +# Dolibarr language file - Source file is en_US - admin Permission91=Consultar impuestos e IVU Permission92=Crear/modificar impuestos e IVU Permission93=Eliminar impuestos e IVU diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang index 26dd25027a2..c64e3933a2b 100644 --- a/htdocs/langs/pt_BR/accountancy.lang +++ b/htdocs/langs/pt_BR/accountancy.lang @@ -1,14 +1,11 @@ # Dolibarr language file - Source file is en_US - accountancy Accounting=Contabilidade Globalparameters=Parametros globais -Fiscalyear=Ano fiscal Menuaccount=Contas contábeis ConfigAccountingExpert=Configuração do módulo especialista em contabilidade Journaux=Jornais JournalFinancial=Jornais financeiros -Exports=Exportações Selectmodelcsv=Escolha um modelo de exportação -Modelcsv_normal=Exportação classica Modelcsv_CEGID=Export towards CEGID Expert BackToChartofaccounts=Return chart of accounts Back=Return @@ -58,6 +55,10 @@ ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal ACCOUNTING_SOCIAL_JOURNAL=Social journal ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Codigo contavel padrao para compra de produtos +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Codigo contavel padrao para venda de produtos +ACCOUNTING_SERVICE_BUY_ACCOUNT=Codigo contavel padrao para compra de servicos +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Codigo contavel padrao para venda de serviços Docref=Referência Code_tiers=Cliente/Fornecedor Labelcompte=Label account @@ -80,8 +81,6 @@ ListAccounts=List of the accounting accounts Pcgversion=Version of the plan Pcgtype=Class of account Pcgsubtype=Under class of account -Active=Statement -NewFiscalYear=New fiscal year DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers TotalVente=Total turnover HT TotalMarge=Total sales margin diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 1211cf13d32..82d5c26f1bd 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -94,7 +94,6 @@ YouCanEditPHPTZ=Para definir um fuso horário diferente PHP (não obrigatório), OSEnv=OS Ambiente MaxNbOfLinesForBoxes=Numero de linhas máximo para as caixas PositionByDefault=Posição por padrao -Position=Posição MenusDesc=Os configuradores do menu definem o conteúdo das 2 barras de menus (a barra horizontal e a barra vertical). É possível atribuir configuradores diferentes segundo o usuário seja interno ou externo. MenusEditorDesc=O editor de menus permite definir entradas personalizadas nos menus. Deve utilizar com prudência sobe pena de colocar o ERP numa situação instável sendo necessário uma reinstalação para encontrar um menu coerente. MenuForUsers=menu para os usuarios @@ -103,7 +102,6 @@ SystemInfo=Informações de Sistema SystemTools=Ferramentas do Sistema SystemToolsArea=Área de ferramentas do sistema SystemToolsAreaDesc=Esta área oferece diferentes funções da administração. Use o menu para escolher a Funcionalidade que procura. -Purge=Limpar PurgeAreaDesc=Esta página permite eliminar todos os arquivos criados ou guardados pelo ERP (Arquivos temporários ou todos os arquivos da pasta %s). O uso desta função não é necessária. Proporciona-se para os Usuários que albergam o ERP não servidor que oferece as permissões de eliminação de arquivos salvaguardados pela servidor Web. PurgeDeleteLogFile=Excluir arquivo de log % s definido para o módulo Syslog (sem risco de perder dados) PurgeDeleteTemporaryFiles=Eliminar todos os arquivos temporários (sem perigo de perca de dados) @@ -487,7 +485,6 @@ Permission1237=Pedidos a fornecedores Export e seus detalhes Permission1251=Execute as importações em massa de dados externos para o banco de dados (carga de dados) Permission1321=Exportar faturas a clientes, atributos e cobranças Permission1421=Exportar faturas de clientes e atributos -Permission23001 =Ler tarefa agendada Permission23002 =Criar/atualizar tarefa agendada Permission23003 =Apagar tarefa agendada Permission2401=Ler ações (eventos ou tarefas) vinculadas na sua conta @@ -541,7 +538,6 @@ LocalTax1IsUsed=Utilize segundo imposto LocalTax1IsNotUsed=Não use o segundo imposto LocalTax1IsUsedDesc=Use um segundo tipo de impostos (excepto o IVA) LocalTax1IsNotUsedDesc=Não use outro tipo de impostos (excepto o IVA) -LocalTax1Management=Segundo tipo de imposto LocalTax2IsUsed=Use terceiro imposto LocalTax2IsNotUsed=Não use terceiro imposto LocalTax2IsUsedDesc=Use um terceiro tipo de impostos (excepto o VAT) diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang index e6bf3c55b2a..07a485a30f7 100644 --- a/htdocs/langs/pt_BR/agenda.lang +++ b/htdocs/langs/pt_BR/agenda.lang @@ -2,7 +2,6 @@ IdAgenda=ID evento Actions=Eventos ActionsArea=Área de eventos (Atividades e Tarefas) -LocalAgenda=Calendário interno ActionsOwnedBy=Evento de propriedade do DoneBy=Concluído por Event=Evento diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang index 90bb4e1584c..c111878d3d6 100644 --- a/htdocs/langs/pt_BR/banks.lang +++ b/htdocs/langs/pt_BR/banks.lang @@ -20,8 +20,6 @@ CurrentBalance=Saldo atual ShowAllTimeBalance=Mostrar Balanço Desde do Inicio AllTime=Do inicio RIB=Conta Bancaria -StandingOrders=Débitos Diretos -StandingOrder=Domicilio AccountStatement=Extrato da Conta AccountStatementShort=Extrato AccountStatements=Extratos das Contas @@ -112,7 +110,6 @@ ThenCheckLinesAndConciliate=Verificar as linhas presentes no relatorio do banco BankDashboard=Somario de contas bancarias DefaultRIB=BAN padrao AllRIB=Todos BAN -LabelRIB=Etiqueta BAN NoBANRecord=Nao tem registro BAN DeleteARib=Apagar registro BAN ConfirmDeleteRib=Voce tem certeza que quer apagar este registro BAN ? diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang index c1e1dde6f55..1dfd31bd357 100644 --- a/htdocs/langs/pt_BR/boxes.lang +++ b/htdocs/langs/pt_BR/boxes.lang @@ -7,7 +7,6 @@ BoxOldestUnpaidSupplierBills=Primeira fatura pendentes do fornecedor BoxLastActions=Últimas ações BoxLastContracts=Últimos contratos BoxLastContacts=Últimos contatos/endereços -BoxFicheInter=Últimas intervenções BoxCurrentAccounts=Abrir saldo das contas BoxTotalUnpaidCustomerBills=Total de faturas pendentes de clientes BoxTotalUnpaidSuppliersBills=Total de faturas pendentes de fornecedores diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang index 9ea64949849..539954acb35 100644 --- a/htdocs/langs/pt_BR/categories.lang +++ b/htdocs/langs/pt_BR/categories.lang @@ -43,11 +43,8 @@ CatCusLinks=Linkes entre clientes/prospetivas e categorias CatProdLinks=Linkes entre produtos/servicos e categorias CatMemberLinks=Linkes entre membros e categorias DeleteFromCat=Excluir da categoria -DeletePicture=Apagar foto -ConfirmDeletePicture=Confirmar eliminação de fotografias ExtraFieldsCategories=atributos complementares CategoriesSetup=Configuração de categorias CategorieRecursiv=Ligação com a categoria automaticamente CategorieRecursivHelp=Se ativado, o produto também será ligada a categoria original quando adicionando em uma subcategoria AddProductServiceIntoCategory=Adicione o seguinte produto / serviço -ShowCategory=Mostrar categoria diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang index 68b7321fe1b..e714cacf5f4 100644 --- a/htdocs/langs/pt_BR/commercial.lang +++ b/htdocs/langs/pt_BR/commercial.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - commercial CommercialArea=Área Comercial -CommercialCard=Ficha Comercial DeleteAction=Eliminar um evento/tarefa NewAction=Novo evento/tarefa AddAction=Criar evento/tarefa diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang index 7d3adf0d865..c730091cccb 100644 --- a/htdocs/langs/pt_BR/companies.lang +++ b/htdocs/langs/pt_BR/companies.lang @@ -22,7 +22,6 @@ Contacts=Contatos ThirdPartyContacts=Contatos de clientes/fornecedores ThirdPartyContact=Contato/Endereço de cliente/fornecedor StatusContactValidated=Estado do Contato -CompanyName=Razão Social CountryIsInEEC=País da Comunidadeee Económica Europeia ThirdPartyName=Nome do cliente/fornecedor ThirdParty=Cliente/Fornecedor @@ -56,7 +55,6 @@ LocalTax2IsUsedES=Sujeito a IRPF LocalTax2IsNotUsedES=Não sujeito a IRPF TypeLocaltax1ES=RE Tipo TypeLocaltax2ES=IRPF Tipo -TypeES=Tipo WrongCustomerCode=Código cliente incorreto WrongSupplierCode=Código do fornecedor incorreto ProfId5Short=Prof. id 5 @@ -108,7 +106,6 @@ ContactsAddresses=Contatos/Enderecos NoContactDefinedForThirdParty=Nenhum contato definido para este cliente/fornecedor NoContactDefined=Nenhum contato definido DefaultContact=Contato por Padrao -AddCompany=Criar empresa AddThirdParty=Criar cliente/fornecedor SupplierCode=Código do fornecedor SupplierAccount=Conta do fornecedor diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang index c50fcd7173d..d59bdbfeb77 100644 --- a/htdocs/langs/pt_BR/compta.lang +++ b/htdocs/langs/pt_BR/compta.lang @@ -133,10 +133,6 @@ CalculationRuleDesc=Para calcular o total do VAT, há dois métodos:
Métod CalculationRuleDescSupplier=De acordo com o fornecedor, escolher o método adequado aplicar mesma regra de cálculo e obter mesmo resultado esperado pelo seu fornecedor. TurnoverPerProductInCommitmentAccountingNotRelevant=Relatório Volume de negócios por produto, quando se usa um modo de contabilidade de caixa não é relevante. Este relatório está disponível somente quando utilizar o modo de contabilidade engajamento (ver configuração do módulo de contabilidade). AccountancyJournal=Codigo do jornal fiscal -ACCOUNTING_PRODUCT_BUY_ACCOUNT=Codigo contavel padrao para compra de produtos -ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Codigo contavel padrao para venda de produtos -ACCOUNTING_SERVICE_BUY_ACCOUNT=Codigo contavel padrao para compra de servicos -ACCOUNTING_SERVICE_SOLD_ACCOUNT=Codigo contavel padrao para venda de serviços ACCOUNTING_VAT_ACCOUNT=Codigo contavel padrao para credito VAT ACCOUNTING_VAT_BUY_ACCOUNT=Codigo contavel padrao para pagamento do VAT ACCOUNTING_ACCOUNT_CUSTOMER=Codigo contavel padrao para clientes diff --git a/htdocs/langs/pt_BR/contracts.lang b/htdocs/langs/pt_BR/contracts.lang index 33c7bf3054f..1ef7f2f6dc0 100644 --- a/htdocs/langs/pt_BR/contracts.lang +++ b/htdocs/langs/pt_BR/contracts.lang @@ -3,10 +3,7 @@ ContractsArea=Área Contratos ListOfContracts=Lista de Contratos AllContracts=Todos os Contratos ContractCard=Ficha Contrato -ContractStatus=Estado do Contrato ContractStatusNotRunning=Fora de Serviço -ContractStatusRunning=Em Serviço -ContractStatusClosed=Encerrado ServiceStatusInitial=Inativo ServiceStatusRunning=Em Serviço ServiceStatusNotLate=Rodando, nao vencido diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang index 0f356aad94d..c312f8dc18d 100644 --- a/htdocs/langs/pt_BR/install.lang +++ b/htdocs/langs/pt_BR/install.lang @@ -26,7 +26,6 @@ ErrorDatabaseAlreadyExists=Base de dados' %s' já existe. IfDatabaseNotExistsGoBackAndUncheckCreate=Se não existe base de dados, volte e verifique a opção "Criar uma base de dados". IfDatabaseExistsGoBackAndCheckCreate=Caso dados já existe, volte e desmarque "Criar uma base de dados" opção. WarningBrowserTooOld=Navegador antigo. Faça a atualizaçao do seu navegador para uma versao mais recente de Firefox, Chrome ou Opera, e altamente recomendado. -YouCanContinue=Pode continuar... License=A usar licença ConfigurationFile=Arquivo de configuração WebPagesDirectory=Directoria onde armazenar as páginas web @@ -34,13 +33,11 @@ DocumentsDirectory=Directoria onde armazenar documentos enviados e/ou gerados ForceHttps=Forcar conexoes seguras (https) CheckToForceHttps=Escolha esta opcao para forcar conexoes seguras (https).
Isto requere que o servidor web esta configurado para uso com certificado SSL. DolibarrDatabase=Base de dados Dolibarr -Server=Servidor DatabasePrefix=Prefixo tabela banco de dados AdminLogin=Login para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo PasswordAgain=Introduza a password uma segunda vez AdminPassword=Password para o administrador da base de dados Dolibarr. Deixar em branco se a conexão é feita com anônimo CreateDatabase=Criar uma base de dados -CreateUser=Criar usuário DatabaseSuperUserAccess=Base de dados - Acesso Superuser Experimental=(experimental, não operacional) KeepEmptyIfNoPassword=Deixar em branco se o usuário não tiver password @@ -69,7 +66,6 @@ WarningRemoveInstallDir=Atenção, por razões de segurança, uma vez que a inst ThisPHPDoesNotSupportTypeBase=PHP Este sistema não suporta qualquer tipo de interface para acesso de dados %s DatabaseMigration=Estrutura migração de dados FreshInstall=Fresh instalar -Upgrade=Upgrade UpgradeDesc=Use este modo se você tiver substituído Dolibarr antigos arquivos com arquivos de uma versão mais recente. Isto irá atualizar o seu banco de dados e dados. InstallNotAllowed=Instalação não permitidas pela conf.php permissões YouMustCreateWithPermission=Você deve criar o arquivo %s e definir permissões escrever sobre ele para instalar o servidor web durante o processo. @@ -92,7 +88,6 @@ NextStepMightLastALongTime=O passo seguinte pode demorar alguns minutos. Por fav MigrationCustomerOrderShipping=Migrar espedicao para pedidos de cliente de armazenamento MigrationShippingDelivery=Atualizar armazenamento de espediçoes MigrationShippingDelivery2=Atualizar armazenamento de espediçao 2 -MigrationFinished=Migração terminada LastStepDesc=Ultimo passo: Defina aqui o usuario e a senha que voce planeja usar para conectar-se ao software. Nao perca estas credenciais, pois sao da conta que administra todas as outras contas. ActivateModule=Ativar modulo %s ShowEditTechnicalParameters=Clique aqui para mostrar/editar parametros avançados (modo avançado) diff --git a/htdocs/langs/pt_BR/languages.lang b/htdocs/langs/pt_BR/languages.lang index b6de66e3bb3..c922daac4f7 100644 --- a/htdocs/langs/pt_BR/languages.lang +++ b/htdocs/langs/pt_BR/languages.lang @@ -15,8 +15,6 @@ Language_en_IN=Ingles (India) Language_en_NZ=Ingles (Nova Zelandia) Language_en_SA=Ingles (Arabia Saudita) Language_en_US=Ingles (Estados Unidos) -Language_es_DO=Espanhol (República Dominicana) -Language_es_CL=Espanhol (Chile) Language_es_MX=Espanhol (Mexico) Language_et_EE=Estone Language_fa_IR=Persio @@ -27,7 +25,6 @@ Language_fr_CH=Françes (Suiça) Language_fr_FR=Françes Language_he_IL=Ebreo Language_hu_HU=Ungeres -Language_id_ID=Indonésio Language_is_IS=Islandes Language_ja_JP=Japones Language_nb_NO=Norveges (Bokmal) diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang index 71482c658bd..5dddd399559 100644 --- a/htdocs/langs/pt_BR/mails.lang +++ b/htdocs/langs/pt_BR/mails.lang @@ -12,8 +12,6 @@ Unsuscribe=Desenscrever MailingStatusNotContact=Nao contactar mais ErrorMailRecipientIsEmpty=A endereço do destinatário está vazia WarningNoEMailsAdded=nenhum Novo e-mail a Adicionar à lista destinatários. -ConfirmResetMailing=Confirma a limpeza do mailing? -NbOfRecipients=Número de destinatários NbOfUniqueEMails=N� de e-mails únicos NbOfEMails=N� de E-mails TotalNbOfDistinctRecipients=Número de destinatários únicos diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang index be5e7c3b146..06cea34b38c 100644 --- a/htdocs/langs/pt_BR/main.lang +++ b/htdocs/langs/pt_BR/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y @@ -18,7 +19,6 @@ FormatDateHourShort=%d/%m/%Y %I:%M %p FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p FormatDateHourTextShort=%d %b, %Y, %I:%M %p FormatDateHourText=%d %B, %Y, %I:%M %p -DatabaseConnection=Login à Base de Dados NoRecordFound=Registro nao encontrado NoError=Sem erro ErrorFieldFormat=O campo '%s' tem um valor incorreto @@ -41,8 +41,6 @@ ErrorFailedToSaveFile=Erro, o registo do arquivo falhou. SelectDate=Selecionar uma data SeeAlso=Ver tambem %s BackgroundColorByDefault=Cor do fundo padrão -FileNotUploaded=O arquivo nao foi carregado -FileUploaded=O arquivo foi carregado com sucesso FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique no "Anexar arquivo" para proceder. NbOfEntries=Nr. de entradas GoToWikiHelpPage=Ler ajuda online ( necesita de acosso a internet) @@ -69,10 +67,8 @@ PageWiki=Pagina wiki PeriodEndDate=Data final periodo Activate=Ativar Activated=Ativado -Closed=Encerrado Closed2=Encerrado Enabled=Ativado -Deprecated=Obsoleto Disable=Desativar Disabled=Desativado AddActionToDo=Adicionar ação a realizar @@ -81,18 +77,14 @@ TestConnection=Teste a login ConfirmClone=Selecciones dados que deseja Cópiar. Go=Ir Run=Attivo -SearchOf=Procurar Upload=Enviar Arquivo -Select=Selecionar Resize=Modificar tamanho Recenter=Recolocar no centro User=Usuário Users=Usuário -Password=Senha PasswordRetype=Repetir Senha NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo CurrentValue=Valor atual -CurrentNote=Nota atual DefaultModel=Modelo Padrão Action=Ação NumberByMonth=Numero por mes @@ -113,7 +105,6 @@ days=Dias Morning=Manha Quadri=Trimistre UseLocalTax=Incluindo taxa -Tb=Tb Copy=Cópiar Default=Padrao DefaultValue=Valor por default @@ -149,7 +140,6 @@ HT=Sem ICMS TTC=ICMS Incluido VAT=ICMS VATRate=Taxa ICMS -FullList=Lista Completa OtherStatistics=Outras estatisticas Favorite=Favorito ShortInfo=Info. @@ -173,12 +163,10 @@ RequestAlreadyDone=Pedido ja registrado GeneratedOn=Gerado a %s Available=Disponivel NotYetAvailable=Ainda não disponível -NotAvailable=Não disponível to=para Drafts=Drafts ByUsers=Por usuário Preview=Preview -Login=Login CurrentLogin=Login atual JanuaryMin=Jan FebruaryMin=Fev @@ -249,7 +237,6 @@ CloneMainAttributes=Clonar o objeto com estes atributos PDFMerge=Fusão de PDF Merge=Fusão PrintContentArea=Mostrar pagina a se imprimir na area principal -MenuManager=Administração do menu NoMenu=Sem sub-menu WarningYouAreInMaintenanceMode=Atenção, voce esta no modo de manutenção, somente o login %s tem permissões para uso da aplicação no momento. CoreErrorMessage=Occoreu erro. Verifique os arquivos de log ou contate seu administrador de sistema. @@ -268,7 +255,6 @@ IM=Mensagems instantaneas AttributeCode=Codigo do atributo OptionalFieldsSetup=Configuração dos atributos extra URLPhoto=URL da photo/logo -SetLinkToThirdParty=Atalho para outro terceiro CreateDraft=Criar RascunhoCriar rascunho SetToDraft=Voltar para modo rascunho ObjectDeleted=Objeto %s apagado diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang index dbbed148c06..3f9ba3156d5 100644 --- a/htdocs/langs/pt_BR/other.lang +++ b/htdocs/langs/pt_BR/other.lang @@ -116,7 +116,6 @@ ImageEditor=Editor de imagems YouReceiveMailBecauseOfNotification=Voce recebeu esta mensagem porque o seu endereco de e-mail foi adicionado a lista de alvos a ser informados de algums eventos no %s software de %s. YouReceiveMailBecauseOfNotification2=Este evento e o seguinte: ThisIsListOfModules=Esta e a lista de modulos pre-seleçionados pelo profilo demo escolhido (somente os modulos mais comums são visiveis nesta demo). Para uma demo mais pesoalizada editar aqui e presionar "Inicio". -ClickHere=Clickque aqui UseAdvancedPerms=Use as permissões avançadas de algums modulos FileFormat=Arquivo formato SelectAColor=Escolha a cor diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang index a44226c4a38..d30c9cbbf8b 100644 --- a/htdocs/langs/pt_BR/products.lang +++ b/htdocs/langs/pt_BR/products.lang @@ -88,7 +88,6 @@ SuppliersPricesOfProductsOrServices=Preços (de produtos ou serviços) Fornecedo CustomCode=Codigo NCM CountryOrigin=Pais de origem HiddenIntoCombo=Escondido nas listas de seleções -Nature=Tipo de produto ProductCodeModel=Modelo de ref. de produto ServiceCodeModel=Modelo de ref. de serviço AddThisProductCard=Criar ficha produto diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang index 9c4a65dbfba..8b8a231b494 100644 --- a/htdocs/langs/pt_BR/projects.lang +++ b/htdocs/langs/pt_BR/projects.lang @@ -8,7 +8,6 @@ ProjectsDesc=Exibi todos os projetos (sua permissão de usuário lhe permite ver MyTasksDesc=Esta exibição é limitado a projetos ou tarefas que você é um contato (seja qual for o tipo). TasksPublicDesc=Essa exibição apresenta todos os projetos e tarefas que você tem permissão para ler. TasksDesc=Essa exibição apresenta todos os projetos e tarefas (suas permissões de usuário concede-lhe ver tudo). -Myprojects=Os Meus Projetos AddProject=Criar projeto ConfirmDeleteAProject=Tem certeza que quer eliminar este projeto? ConfirmDeleteATask=Tem certeza que quer eliminar esta tarefa? @@ -25,13 +24,10 @@ TaskTimeUser=Usuário NewTimeSpent=Novo Tempo Dedicado MyTimeSpent=O Meu Tempo Dedicado MyTasks=As minhas Tarefas -TaskDateStart=Data de início da tarefa TaskDateEnd=Data final da tarefa AddTask=Criar tarefa AddDuration=Indicar Duração -MyActivity=A Minha Atividade MyActivities=Minhas Tarefas/Atividades -MyProjects=Os Meus Projetos ProgressDeclared=o progresso declarado ProgressCalculated=calculado do progresso ListOrdersAssociatedProject=Lista de Pedidos Associados ao Projeto @@ -74,12 +70,8 @@ TaskModifiedInDolibarr=Tarefa %s alterada TaskDeletedInDolibarr=Tarefa %s excluída TypeContact_project_internal_PROJECTLEADER=Chefe de projeto TypeContact_project_external_PROJECTLEADER=Chefe de projeto -TypeContact_project_internal_PROJECTCONTRIBUTOR=Colaborador -TypeContact_project_external_PROJECTCONTRIBUTOR=Colaborador TypeContact_project_task_internal_TASKEXECUTIVE=Tarefa executada TypeContact_project_task_external_TASKEXECUTIVE=Tarefa executada -TypeContact_project_task_internal_TASKCONTRIBUTOR=Colaborador -TypeContact_project_task_external_TASKCONTRIBUTOR=Colaborador SelectElement=Selecionar componente AddElement=Link para componente UnlinkElement=Desligar elemento diff --git a/htdocs/langs/pt_BR/resource.lang b/htdocs/langs/pt_BR/resource.lang index ac5195cbe84..c3d6ec512c5 100644 --- a/htdocs/langs/pt_BR/resource.lang +++ b/htdocs/langs/pt_BR/resource.lang @@ -1,18 +1,10 @@ # Dolibarr language file - Source file is en_US - resource -MenuResourceIndex=Recursos -MenuResourceAdd=Novo recurso MenuResourcePlanning=Planejamento de recurso DeleteResource=Remover recurso ConfirmDeleteResourceElement=Confirmar remoção do recurso para este elemento -NoResourceInDatabase=Nenhum recurso na base de dados NoResourceLinked=Nenhum recurso vinculado -ResourcePageIndex=Lista de recursos -ResourceSingular=Recurso ResourceCard=Cartao recursos AddResource=Criar recurso -ResourceFormLabel_ref=Nome do recurso -ResourceType=Tipo de recurso -ResourceFormLabel_description=Descrição do recurso ResourcesLinkedToElement=Recursos vinculados ao elemento ShowResourcePlanning=Mostrar planejamento do recurso GotoDate=Ir para data @@ -23,5 +15,4 @@ TitleResourceCard=Cartao recurso ConfirmDeleteResource=Confirme para remover este recurso RessourceSuccessfullyDeleted=Recurso removido com sucesso DictionaryResourceType=Tipo de recurso -DictionaryEMailTemplates=Modelos de Emails SelectResource=Selecionar recurso diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang index 71a6fdf9790..d5ed0fe9de1 100644 --- a/htdocs/langs/pt_BR/users.lang +++ b/htdocs/langs/pt_BR/users.lang @@ -13,12 +13,9 @@ OwnedRights=As minhas permissões GroupRights=Permissões do grupo UserRights=Permissões do usuário UserGUISetup=Interface do usuário -DisableUser=Desativar DisableAUser=Desativar um usuário DeleteUser=Excluir DeleteAUser=Excluir um usuário -DisableGroup=Desativar -DisableAGroup=Desativar um Grupo EnableAUser=Reativar um Usuário EnableAGroup=Reativar um Grupo DeleteGroup=Excluir @@ -42,7 +39,6 @@ AdministratorDesc=Entidade do administrador DefaultRights=Permissões por Padrao DefaultRightsDesc=Defina aqui padrão permissões que são concedidas automaticamente para um novo usuário criado (Vá em fichas de usuário para alterar as permissões de um usuário existente). DolibarrUsers=Usuário Dolibarr -LastName=Sobrenome FirstName=Primeiro nome ListOfGroups=Lista de grupos NewGroup=Novo grupo @@ -74,7 +70,6 @@ LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr LoginAccountDisableInLdap=A conta está desativada ao domínio ExportDataset_user_1=Usuários e Atributos DomainUser=Usuário de Domínio -Reactivate=Reativar CreateInternalUserDesc=Este formulario permite criar um usuario interno a sua compania/fundação. Para criar um usuario externo (cliente, fornecedor, ...), use o botão 'Criar usuario Dolibarr' da ficha de contatos dos terceiro.. InternalExternalDesc=Um usuário interno é um usuário que pertence à sua Empresa/Instituição.
Um usuário externo é um usuário cliente, fornecedor ou outro.

Nos 2 casos, as permissões de Usuários definem os direitos de acesso, mas o usuário externo pode além disso ter um gerente de menus diferente do usuário interno (ver Inicio - configuração - visualização) PermissionInheritedFromAGroup=A permissão dá-se já que o herda de um grupo ao qual pertence o usuário. @@ -100,5 +95,4 @@ HierarchicView=Visão hierárquica UseTypeFieldToChange=Use campo Tipo para mudar OpenIDURL=URL do OpenID LoginUsingOpenID=Usar o OpenID para efetuar o login -WeeklyHours=Horas semanais ColorUser=Cor do usuario From f09089380719f325f007fc7bf92c1890c0737cd6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 18:02:54 +0100 Subject: [PATCH 061/412] Hide a feature that is really not stable. So i move it as a "develop" feature. --- htdocs/admin/menus/other.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php index 36733add335..9da251ccb66 100644 --- a/htdocs/admin/menus/other.php +++ b/htdocs/admin/menus/other.php @@ -120,7 +120,7 @@ print ""; print ''; // Use a flip-hide menu -if (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 0) +if (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 1) { $var=!$var; print ""; From 51c877e32c40d955a3a6e53fd723c1a0cdb79dc6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 18:02:54 +0100 Subject: [PATCH 062/412] Hide a feature that is really not stable. So i move it as a "develop" feature. --- htdocs/admin/menus/other.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/menus/other.php b/htdocs/admin/menus/other.php index 36733add335..9da251ccb66 100644 --- a/htdocs/admin/menus/other.php +++ b/htdocs/admin/menus/other.php @@ -120,7 +120,7 @@ print ""; print ''; // Use a flip-hide menu -if (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 0) +if (isset($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 1) { $var=!$var; print ""; From bc3f9bf8006f6da06be41f27f50d72bb74ca9d91 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 18:11:31 +0100 Subject: [PATCH 063/412] Fix: the visible version was not enough to know version of dolibarr. We also need the MAIN_FEATURES_LEVEL. --- htdocs/core/lib/functions.lib.php | 2 +- htdocs/main.inc.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 5ecafde1a03..e1cd860b516 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2411,7 +2411,7 @@ function dol_print_error($db='',$error='') if ($_SERVER['DOCUMENT_ROOT']) // Mode web { $out.=$langs->trans("DolibarrHasDetectedError").".
\n"; - if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $out.="You use an experimental level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.
\n"; + if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $out.="You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.
\n"; $out.=$langs->trans("InformationToHelpDiagnose").":
\n"; $out.="".$langs->trans("Date").": ".dol_print_date(time(),'dayhourlog')."
\n"; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 043fcfcc77e..bf272ee0374 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1444,6 +1444,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a else $appli.=" ".DOL_VERSION; } else $appli.=" ".DOL_VERSION; + if (! empty($conf->global->MAIN_FEATURES_LEVEL)) $appli.="
".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL; $logouttext=''; $logouthtmltext=$appli.'
'; From ba2c0a2651ead307ab9c779a16e6b4dbdb424bea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 20:27:54 +0100 Subject: [PATCH 064/412] Clean code of hooks. Extrafield index on fk_object must be unique. --- htdocs/core/class/extrafields.class.php | 2 +- htdocs/core/class/hookmanager.class.php | 17 ++++++++++------- htdocs/fourn/card.php | 2 ++ htdocs/fourn/list.php | 18 +++++++++++++++++- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 4 ++++ .../tables/llx_societe_extrafields.key.sql | 2 +- 6 files changed, 35 insertions(+), 10 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 24d8c40f5b3..7bebeb0b660 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -596,7 +596,7 @@ class ExtraFields $this->attribute_pos[$tab->name]=$tab->pos; $this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable; $this->attribute_perms[$tab->name]=$tab->perms; - $this->attribute_perms[$tab->name]=$tab->list; + $this->attribute_list[$tab->name]=$tab->list; } } } diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 3ad0ec897f9..5cb0ca81faf 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -128,10 +128,8 @@ class HookManager $parameters['context']=join(':',$this->contextarray); dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']); - // Define type of hook ('output', 'returnvalue' or 'addreplace'). 'addreplace' should be type for all hooks. 'output' and 'returnvalue' are deprecated. + // Define type of hook ('output' or 'addreplace'. 'returnvalue' is deprecated). $hooktype='output'; - if (preg_match('/^pdf_/',$method)) $hooktype='returnvalue'; // pdf_xxx except pdf_writelinedesc are returnvalue hooks. When there is 2 hooks of this type, only last one win. - if ($method =='insertExtraFields') $hooktype='returnvalue'; if (in_array( $method, array( @@ -149,6 +147,13 @@ class HookManager 'formatEvent' ) )) $hooktype='addreplace'; + // Deprecated hook types + if (preg_match('/^pdf_/',$method) && $method != 'pdf_writelinedesc') $hooktype='returnvalue'; // pdf_xxx except pdf_writelinedesc are 'returnvalue' hooks. When there is 2 hooks of this type, only last one win. TODO Move them into 'output' or 'addreplace' hooks. + if ($method == 'insertExtraFields') + { + $hooktype='returnvalue'; // deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available. + dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING); + } // Loop on each hook to qualify modules that have declared context $modulealreadyexecuted=array(); @@ -201,8 +206,6 @@ class HookManager if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results); if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints; - // TODO dead code to remove (do not enable this, but fix hook instead) - //if (is_array($result)) $this->resArray = array_merge($this->resArray, $result); // TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string. we must use $actionclassinstance->resprints to return a string if (! is_array($result) && ! is_numeric($result)) { @@ -221,8 +224,8 @@ class HookManager } // TODO remove this. When there is something to print for an output hook, ->resPrint is filled. - if ($hooktype == 'output') return $this->resPrint; - if ($hooktype == 'returnvalue') return $result; + //if ($hooktype == 'output') return $this->resPrint; + //if ($hooktype == 'returnvalue') return $result; return ($error?-1:$resaction); } diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index f94664531dd..1d4c144a098 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; $langs->load('suppliers'); @@ -49,6 +50,7 @@ if ($user->societe_id) $id=$user->societe_id; $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe'); $object = new Fournisseur($db); +$extrafields = new ExtraFields($db); // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('suppliercard','globalcard')); diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php index b0d7caf8695..4c16f3a1d61 100644 --- a/htdocs/fourn/list.php +++ b/htdocs/fourn/list.php @@ -27,6 +27,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->load("suppliers"); $langs->load("orders"); @@ -59,6 +60,7 @@ if (! $sortfield) $sortfield="nom"; // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('supplierlist')); +$extrafields = new ExtraFields($db); if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { @@ -73,6 +75,9 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both $catid=""; } +$extrafields->fetch_name_optionals_label('thirdparty'); + + /* * Actions */ @@ -95,7 +100,14 @@ llxHeader('',$langs->trans("ThirdParty"),$help_url); $sql = "SELECT s.rowid as socid, s.nom as name, s.zip, s.town, s.datec, st.libelle as stcomm, s.prefix_comm, s.status as status, "; $sql.= "code_fournisseur, code_compta_fournisseur"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; +// Add fields for extrafields +foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key; +// Add fields from hooks +$parameters=array(); +$hookmanager->executeHooks('printFieldListSelect',$parameters); // Note that $action and $object may have been modified by hook +$sql.=$hookmanager->resPrint; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef ON ef.fk_object = s.rowid"; if (! empty($search_categ) || ! empty($catid)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cf ON s.rowid = cf.fk_societe"; // We need this table joined to the select in order to filter by categ $sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -122,6 +134,9 @@ if ($catid > 0) $sql.= " AND cf.fk_categorie = ".$catid; if ($catid == -2) $sql.= " AND cf.fk_categorie IS NULL"; if ($search_categ > 0) $sql.= " AND cf.fk_categorie = ".$search_categ; if ($search_categ == -2) $sql.= " AND cf.fk_categorie IS NULL"; +// Add where from hooks +$parameters=array(); +$sql.=$hookmanager->executeHooks('printFieldListWhere',$parameters); // Note that $action and $object may have been modified by hook // Count total nb of records $nbtotalofrecords = 0; if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) @@ -131,6 +146,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) } $sql.= $db->order($sortfield,$sortorder); $sql.= $db->plimit($conf->liste_limit+1, $offset); +//print $sql; dol_syslog('fourn/list.php:', LOG_DEBUG); $resql = $db->query($sql); @@ -200,7 +216,7 @@ if ($resql) print ''; print ''; print "\n"; - + $parameters=array(); $formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 65273632998..73ace187708 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -366,3 +366,7 @@ INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('CIP', 'Carriage and INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAT', 'Delivered At Terminal, marchandises (déchargées) livrées sur quai, dans un terminal maritime, fluvial, aérien, routier ou ferroviaire désigné (dédouanement import, et post-acheminement payés par l''acheteur)', 1); INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAP', 'Delivered At Place, marchandises (non déchargées) mises à disposition de l''acheteur dans le pays d''importation au lieu précisé dans le contrat (déchargement, dédouanement import payé par l''acheteur)', 1); INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DDP', 'Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l''acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)', 1); + +-- Extrafields fk_object must be unique (1-1 relation) +ALTER TABLE llx_societe_extrafields DROP INDEX idx_societe_extrafields +ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_object); diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql index 44ce4dda753..9d89beebd37 100644 --- a/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql +++ b/htdocs/install/mysql/tables/llx_societe_extrafields.key.sql @@ -17,4 +17,4 @@ -- =================================================================== -ALTER TABLE llx_societe_extrafields ADD INDEX idx_societe_extrafields (fk_object); +ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_object); From 50b09fa8a97ba85725c5aaeb509a32a19f51f04c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 21:39:39 +0100 Subject: [PATCH 065/412] Doxygen --- htdocs/product/class/product.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 910f5b316cd..02686a94f03 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2650,10 +2650,11 @@ class Product extends CommonObject * Fonction recursive uniquement utilisee par get_arbo_each_prod, recompose l'arborescence des sousproduits * Define value of this->res * - * @param array $prod Products array - * @param string $compl_path Directory path of parents to add before - * @param int $multiply Because each sublevel must be multiplicated by parent nb - * @param int $level Init level + * @param array $prod Products array + * @param string $compl_path Directory path of parents to add before + * @param int $multiply Because each sublevel must be multiplicated by parent nb + * @param int $level Init level + * @param int $id_parent Id parent * @return void */ function fetch_prod_arbo($prod, $compl_path="", $multiply=1, $level=1, $id_parent=0) From d056abc4e1264abf61840d2720382365a5624bda Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 21:45:52 +0100 Subject: [PATCH 066/412] No need to have this protected. Property can be read with method show() and this method can be override. --- htdocs/core/class/dolgraph.class.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index 5451d7457ce..0dca02cbc2d 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -65,7 +65,7 @@ class DolGraph var $bgcolorgrid=array(255,255,255); // array(R,G,B) var $datacolor; // array(array(R,G,B),...) - protected $_stringtoshow; // To store string to output graph into HTML page + private $_stringtoshow; // To store string to output graph into HTML page /** @@ -935,16 +935,16 @@ class DolGraph opacity: 0.80 }).appendTo("body").fadeIn(20); } - + var previousPoint = null; $("#placeholder_'.$tag.'").bind("plothover", function (event, pos, item) { $("#x").text(pos.x.toFixed(2)); $("#y").text(pos.y.toFixed(2)); - + if (item) { if (previousPoint != item.dataIndex) { previousPoint = item.dataIndex; - + $("#tooltip").remove(); /* console.log(item); */ var x = item.datapoint[0].toFixed(2); @@ -1022,7 +1022,7 @@ class DolGraph return $this->_stringtoshow; } - + /** * getDefaultGraphSizeForStats * @@ -1033,18 +1033,18 @@ class DolGraph static function getDefaultGraphSizeForStats($direction,$defaultsize='') { global $conf; - + if ($direction == 'width') { if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500'); else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width']-40)); } - if ($direction == 'height') + if ($direction == 'height') { return (empty($conf->dol_optimize_smallscreen)?($defaultsize?$defaultsize:'200'):'160'); } return 0; } - + } From a8e7d90ea3a22718bc1e32b5cea8ca46e9e18ff4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 13 Mar 2015 22:02:53 +0100 Subject: [PATCH 067/412] Sync transifex --- dev/fixaltlanguages.sh | 6 +- htdocs/langs/ar_SA/admin.lang | 38 +- htdocs/langs/ar_SA/banks.lang | 6 +- htdocs/langs/ar_SA/commercial.lang | 12 +- htdocs/langs/ar_SA/contracts.lang | 1 + htdocs/langs/ar_SA/cron.lang | 1 + htdocs/langs/ar_SA/errors.lang | 5 +- htdocs/langs/ar_SA/install.lang | 1 + htdocs/langs/ar_SA/main.lang | 6 + htdocs/langs/ar_SA/orders.lang | 2 + htdocs/langs/ar_SA/other.lang | 3 +- htdocs/langs/ar_SA/productbatch.lang | 2 +- htdocs/langs/ar_SA/products.lang | 4 + htdocs/langs/ar_SA/projects.lang | 9 +- htdocs/langs/ar_SA/salaries.lang | 5 + htdocs/langs/ar_SA/sendings.lang | 2 +- htdocs/langs/ar_SA/stocks.lang | 4 +- htdocs/langs/ar_SA/suppliers.lang | 3 +- htdocs/langs/ar_SA/trips.lang | 136 +++++- htdocs/langs/bg_BG/admin.lang | 80 ++-- htdocs/langs/bg_BG/banks.lang | 6 +- htdocs/langs/bg_BG/boxes.lang | 47 +- htdocs/langs/bg_BG/cashdesk.lang | 6 +- htdocs/langs/bg_BG/categories.lang | 26 +- htdocs/langs/bg_BG/commercial.lang | 12 +- htdocs/langs/bg_BG/contracts.lang | 1 + htdocs/langs/bg_BG/cron.lang | 1 + htdocs/langs/bg_BG/errors.lang | 5 +- htdocs/langs/bg_BG/install.lang | 1 + htdocs/langs/bg_BG/main.lang | 6 + htdocs/langs/bg_BG/orders.lang | 2 + htdocs/langs/bg_BG/other.lang | 3 +- htdocs/langs/bg_BG/productbatch.lang | 2 +- htdocs/langs/bg_BG/products.lang | 4 + htdocs/langs/bg_BG/projects.lang | 9 +- htdocs/langs/bg_BG/salaries.lang | 5 + htdocs/langs/bg_BG/sendings.lang | 2 +- htdocs/langs/bg_BG/stocks.lang | 4 +- htdocs/langs/bg_BG/suppliers.lang | 3 +- htdocs/langs/bg_BG/trips.lang | 136 +++++- htdocs/langs/bs_BA/admin.lang | 38 +- htdocs/langs/bs_BA/banks.lang | 6 +- htdocs/langs/bs_BA/commercial.lang | 10 +- htdocs/langs/bs_BA/contracts.lang | 1 + htdocs/langs/bs_BA/cron.lang | 1 + htdocs/langs/bs_BA/errors.lang | 5 +- htdocs/langs/bs_BA/install.lang | 1 + htdocs/langs/bs_BA/main.lang | 6 + htdocs/langs/bs_BA/orders.lang | 2 + htdocs/langs/bs_BA/other.lang | 3 +- htdocs/langs/bs_BA/productbatch.lang | 2 +- htdocs/langs/bs_BA/products.lang | 4 + htdocs/langs/bs_BA/projects.lang | 9 +- htdocs/langs/bs_BA/salaries.lang | 5 + htdocs/langs/bs_BA/sendings.lang | 2 +- htdocs/langs/bs_BA/stocks.lang | 4 +- htdocs/langs/bs_BA/suppliers.lang | 3 +- htdocs/langs/bs_BA/trips.lang | 136 +++++- htdocs/langs/ca_ES/admin.lang | 38 +- htdocs/langs/ca_ES/banks.lang | 6 +- htdocs/langs/ca_ES/commercial.lang | 12 +- htdocs/langs/ca_ES/contracts.lang | 1 + htdocs/langs/ca_ES/cron.lang | 1 + htdocs/langs/ca_ES/errors.lang | 5 +- htdocs/langs/ca_ES/install.lang | 1 + htdocs/langs/ca_ES/main.lang | 6 + htdocs/langs/ca_ES/orders.lang | 2 + htdocs/langs/ca_ES/other.lang | 3 +- htdocs/langs/ca_ES/productbatch.lang | 2 +- htdocs/langs/ca_ES/products.lang | 4 + htdocs/langs/ca_ES/projects.lang | 9 +- htdocs/langs/ca_ES/salaries.lang | 19 +- htdocs/langs/ca_ES/sendings.lang | 2 +- htdocs/langs/ca_ES/stocks.lang | 4 +- htdocs/langs/ca_ES/suppliers.lang | 3 +- htdocs/langs/ca_ES/trips.lang | 136 +++++- htdocs/langs/cs_CZ/admin.lang | 38 +- htdocs/langs/cs_CZ/banks.lang | 6 +- htdocs/langs/cs_CZ/commercial.lang | 12 +- htdocs/langs/cs_CZ/contracts.lang | 1 + htdocs/langs/cs_CZ/cron.lang | 1 + htdocs/langs/cs_CZ/errors.lang | 5 +- htdocs/langs/cs_CZ/install.lang | 1 + htdocs/langs/cs_CZ/main.lang | 6 + htdocs/langs/cs_CZ/orders.lang | 2 + htdocs/langs/cs_CZ/other.lang | 3 +- htdocs/langs/cs_CZ/productbatch.lang | 2 +- htdocs/langs/cs_CZ/products.lang | 4 + htdocs/langs/cs_CZ/projects.lang | 9 +- htdocs/langs/cs_CZ/salaries.lang | 19 +- htdocs/langs/cs_CZ/sendings.lang | 2 +- htdocs/langs/cs_CZ/stocks.lang | 4 +- htdocs/langs/cs_CZ/suppliers.lang | 3 +- htdocs/langs/cs_CZ/trips.lang | 136 +++++- htdocs/langs/da_DK/admin.lang | 38 +- htdocs/langs/da_DK/banks.lang | 6 +- htdocs/langs/da_DK/commercial.lang | 12 +- htdocs/langs/da_DK/contracts.lang | 1 + htdocs/langs/da_DK/cron.lang | 1 + htdocs/langs/da_DK/errors.lang | 5 +- htdocs/langs/da_DK/install.lang | 1 + htdocs/langs/da_DK/main.lang | 6 + htdocs/langs/da_DK/orders.lang | 2 + htdocs/langs/da_DK/other.lang | 3 +- htdocs/langs/da_DK/productbatch.lang | 2 +- htdocs/langs/da_DK/products.lang | 4 + htdocs/langs/da_DK/projects.lang | 9 +- htdocs/langs/da_DK/salaries.lang | 5 + htdocs/langs/da_DK/sendings.lang | 2 +- htdocs/langs/da_DK/stocks.lang | 4 +- htdocs/langs/da_DK/suppliers.lang | 3 +- htdocs/langs/da_DK/trips.lang | 136 +++++- htdocs/langs/de_AT/agenda.lang | 1 - htdocs/langs/de_AT/main.lang | 3 +- htdocs/langs/de_AT/projects.lang | 1 - htdocs/langs/de_AT/withdrawals.lang | 2 +- htdocs/langs/de_CH/companies.lang | 10 - htdocs/langs/de_CH/main.lang | 3 +- htdocs/langs/de_DE/admin.lang | 38 +- htdocs/langs/de_DE/banks.lang | 6 +- htdocs/langs/de_DE/commercial.lang | 6 +- htdocs/langs/de_DE/contracts.lang | 1 + htdocs/langs/de_DE/cron.lang | 1 + htdocs/langs/de_DE/errors.lang | 5 +- htdocs/langs/de_DE/install.lang | 1 + htdocs/langs/de_DE/main.lang | 6 + htdocs/langs/de_DE/orders.lang | 2 + htdocs/langs/de_DE/other.lang | 3 +- htdocs/langs/de_DE/productbatch.lang | 2 +- htdocs/langs/de_DE/products.lang | 4 + htdocs/langs/de_DE/projects.lang | 9 +- htdocs/langs/de_DE/salaries.lang | 1 + htdocs/langs/de_DE/sendings.lang | 2 +- htdocs/langs/de_DE/stocks.lang | 4 +- htdocs/langs/de_DE/suppliers.lang | 3 +- htdocs/langs/de_DE/trips.lang | 134 +++++- htdocs/langs/el_GR/admin.lang | 392 +++++++++-------- htdocs/langs/el_GR/banks.lang | 6 +- htdocs/langs/el_GR/commercial.lang | 2 +- htdocs/langs/el_GR/contracts.lang | 1 + htdocs/langs/el_GR/cron.lang | 1 + htdocs/langs/el_GR/errors.lang | 5 +- htdocs/langs/el_GR/install.lang | 1 + htdocs/langs/el_GR/main.lang | 6 + htdocs/langs/el_GR/orders.lang | 2 + htdocs/langs/el_GR/other.lang | 3 +- htdocs/langs/el_GR/productbatch.lang | 2 +- htdocs/langs/el_GR/products.lang | 4 + htdocs/langs/el_GR/projects.lang | 9 +- htdocs/langs/el_GR/salaries.lang | 9 +- htdocs/langs/el_GR/sendings.lang | 10 +- htdocs/langs/el_GR/stocks.lang | 4 +- htdocs/langs/el_GR/suppliers.lang | 3 +- htdocs/langs/el_GR/trips.lang | 136 +++++- htdocs/langs/en_AU/bills.lang | 4 +- htdocs/langs/en_AU/companies.lang | 5 +- htdocs/langs/en_AU/compta.lang | 6 +- htdocs/langs/en_AU/main.lang | 17 +- htdocs/langs/en_AU/withdrawals.lang | 4 +- htdocs/langs/en_GB/admin.lang | 2 +- htdocs/langs/en_GB/banks.lang | 4 +- htdocs/langs/en_GB/bills.lang | 36 +- htdocs/langs/en_GB/compta.lang | 4 +- htdocs/langs/en_GB/exports.lang | 3 +- htdocs/langs/en_GB/main.lang | 10 +- htdocs/langs/en_GB/other.lang | 5 +- htdocs/langs/en_IN/admin.lang | 5 +- htdocs/langs/en_IN/bills.lang | 6 +- htdocs/langs/en_IN/boxes.lang | 4 +- htdocs/langs/en_IN/companies.lang | 4 +- htdocs/langs/en_IN/compta.lang | 2 +- htdocs/langs/en_IN/main.lang | 11 +- htdocs/langs/en_IN/other.lang | 2 +- htdocs/langs/en_IN/projects.lang | 4 +- htdocs/langs/en_IN/propal.lang | 5 +- htdocs/langs/en_NZ/companies.lang | 5 +- htdocs/langs/en_NZ/compta.lang | 6 +- htdocs/langs/en_NZ/main.lang | 17 +- htdocs/langs/en_SA/main.lang | 5 +- htdocs/langs/en_SA/propal.lang | 4 +- htdocs/langs/en_ZA/companies.lang | 10 +- htdocs/langs/en_ZA/compta.lang | 16 +- htdocs/langs/en_ZA/main.lang | 32 +- htdocs/langs/es_AR/admin.lang | 2 - htdocs/langs/es_AR/bills.lang | 5 +- htdocs/langs/es_AR/companies.lang | 6 +- htdocs/langs/es_AR/stocks.lang | 2 +- htdocs/langs/es_CL/agenda.lang | 3 +- htdocs/langs/es_CL/bills.lang | 3 +- htdocs/langs/es_CL/boxes.lang | 3 +- htdocs/langs/es_CL/commercial.lang | 3 +- htdocs/langs/es_CL/companies.lang | 3 +- htdocs/langs/es_CL/compta.lang | 3 +- htdocs/langs/es_CL/ecm.lang | 3 +- htdocs/langs/es_CL/install.lang | 3 +- htdocs/langs/es_CL/main.lang | 23 +- htdocs/langs/es_CL/members.lang | 3 +- htdocs/langs/es_CL/orders.lang | 3 +- htdocs/langs/es_CL/other.lang | 2 +- htdocs/langs/es_CL/products.lang | 3 +- htdocs/langs/es_CL/projects.lang | 3 +- htdocs/langs/es_CL/propal.lang | 8 +- htdocs/langs/es_CL/workflow.lang | 3 +- htdocs/langs/es_DO/companies.lang | 2 +- htdocs/langs/es_DO/compta.lang | 2 +- htdocs/langs/es_DO/main.lang | 7 +- htdocs/langs/es_ES/admin.lang | 38 +- htdocs/langs/es_ES/banks.lang | 6 +- htdocs/langs/es_ES/commercial.lang | 2 +- htdocs/langs/es_ES/contracts.lang | 1 + htdocs/langs/es_ES/cron.lang | 1 + htdocs/langs/es_ES/errors.lang | 5 +- htdocs/langs/es_ES/install.lang | 1 + htdocs/langs/es_ES/main.lang | 6 + htdocs/langs/es_ES/orders.lang | 2 + htdocs/langs/es_ES/other.lang | 3 +- htdocs/langs/es_ES/productbatch.lang | 2 +- htdocs/langs/es_ES/products.lang | 4 + htdocs/langs/es_ES/projects.lang | 9 +- htdocs/langs/es_ES/salaries.lang | 1 + htdocs/langs/es_ES/sendings.lang | 2 +- htdocs/langs/es_ES/stocks.lang | 4 +- htdocs/langs/es_ES/suppliers.lang | 3 +- htdocs/langs/es_ES/trips.lang | 136 +++++- htdocs/langs/es_HN/bills.lang | 4 +- htdocs/langs/es_HN/companies.lang | 4 +- htdocs/langs/es_HN/compta.lang | 5 +- htdocs/langs/es_HN/main.lang | 21 +- htdocs/langs/es_HN/propal.lang | 4 +- htdocs/langs/es_MX/admin.lang | 2 - htdocs/langs/es_MX/banks.lang | 4 +- htdocs/langs/es_MX/bills.lang | 11 +- htdocs/langs/es_MX/categories.lang | 4 +- htdocs/langs/es_MX/companies.lang | 6 +- htdocs/langs/es_MX/main.lang | 22 +- htdocs/langs/es_MX/stocks.lang | 2 +- htdocs/langs/es_PE/bills.lang | 4 +- htdocs/langs/es_PE/companies.lang | 4 +- htdocs/langs/es_PE/compta.lang | 5 +- htdocs/langs/es_PE/main.lang | 21 +- htdocs/langs/es_PE/propal.lang | 4 +- htdocs/langs/es_PR/bills.lang | 4 +- htdocs/langs/es_PR/companies.lang | 4 +- htdocs/langs/es_PR/compta.lang | 5 +- htdocs/langs/es_PR/main.lang | 21 +- htdocs/langs/es_PR/propal.lang | 4 +- htdocs/langs/es_PY/main.lang | 21 +- htdocs/langs/et_EE/admin.lang | 38 +- htdocs/langs/et_EE/banks.lang | 6 +- htdocs/langs/et_EE/commercial.lang | 12 +- htdocs/langs/et_EE/contracts.lang | 1 + htdocs/langs/et_EE/cron.lang | 1 + htdocs/langs/et_EE/errors.lang | 5 +- htdocs/langs/et_EE/install.lang | 1 + htdocs/langs/et_EE/main.lang | 6 + htdocs/langs/et_EE/orders.lang | 2 + htdocs/langs/et_EE/other.lang | 3 +- htdocs/langs/et_EE/productbatch.lang | 2 +- htdocs/langs/et_EE/products.lang | 4 + htdocs/langs/et_EE/projects.lang | 9 +- htdocs/langs/et_EE/salaries.lang | 5 + htdocs/langs/et_EE/sendings.lang | 2 +- htdocs/langs/et_EE/stocks.lang | 4 +- htdocs/langs/et_EE/suppliers.lang | 3 +- htdocs/langs/et_EE/trips.lang | 136 +++++- htdocs/langs/eu_ES/admin.lang | 38 +- htdocs/langs/eu_ES/banks.lang | 6 +- htdocs/langs/eu_ES/commercial.lang | 2 +- htdocs/langs/eu_ES/contracts.lang | 1 + htdocs/langs/eu_ES/cron.lang | 1 + htdocs/langs/eu_ES/errors.lang | 5 +- htdocs/langs/eu_ES/install.lang | 1 + htdocs/langs/eu_ES/main.lang | 6 + htdocs/langs/eu_ES/orders.lang | 2 + htdocs/langs/eu_ES/other.lang | 3 +- htdocs/langs/eu_ES/productbatch.lang | 2 +- htdocs/langs/eu_ES/products.lang | 4 + htdocs/langs/eu_ES/projects.lang | 9 +- htdocs/langs/eu_ES/salaries.lang | 1 + htdocs/langs/eu_ES/sendings.lang | 2 +- htdocs/langs/eu_ES/stocks.lang | 4 +- htdocs/langs/eu_ES/suppliers.lang | 3 +- htdocs/langs/eu_ES/trips.lang | 136 +++++- htdocs/langs/fa_IR/admin.lang | 38 +- htdocs/langs/fa_IR/banks.lang | 6 +- htdocs/langs/fa_IR/commercial.lang | 12 +- htdocs/langs/fa_IR/contracts.lang | 1 + htdocs/langs/fa_IR/cron.lang | 1 + htdocs/langs/fa_IR/errors.lang | 5 +- htdocs/langs/fa_IR/install.lang | 1 + htdocs/langs/fa_IR/main.lang | 6 + htdocs/langs/fa_IR/orders.lang | 2 + htdocs/langs/fa_IR/other.lang | 3 +- htdocs/langs/fa_IR/productbatch.lang | 2 +- htdocs/langs/fa_IR/products.lang | 4 + htdocs/langs/fa_IR/projects.lang | 9 +- htdocs/langs/fa_IR/salaries.lang | 5 + htdocs/langs/fa_IR/sendings.lang | 2 +- htdocs/langs/fa_IR/stocks.lang | 4 +- htdocs/langs/fa_IR/suppliers.lang | 3 +- htdocs/langs/fa_IR/trips.lang | 136 +++++- htdocs/langs/fi_FI/admin.lang | 38 +- htdocs/langs/fi_FI/banks.lang | 6 +- htdocs/langs/fi_FI/commercial.lang | 12 +- htdocs/langs/fi_FI/contracts.lang | 1 + htdocs/langs/fi_FI/cron.lang | 1 + htdocs/langs/fi_FI/errors.lang | 5 +- htdocs/langs/fi_FI/install.lang | 1 + htdocs/langs/fi_FI/main.lang | 6 + htdocs/langs/fi_FI/orders.lang | 2 + htdocs/langs/fi_FI/other.lang | 3 +- htdocs/langs/fi_FI/productbatch.lang | 2 +- htdocs/langs/fi_FI/products.lang | 4 + htdocs/langs/fi_FI/projects.lang | 9 +- htdocs/langs/fi_FI/salaries.lang | 5 + htdocs/langs/fi_FI/sendings.lang | 2 +- htdocs/langs/fi_FI/stocks.lang | 4 +- htdocs/langs/fi_FI/suppliers.lang | 3 +- htdocs/langs/fi_FI/trips.lang | 136 +++++- htdocs/langs/fr_BE/main.lang | 1 + htdocs/langs/fr_CA/main.lang | 1 + htdocs/langs/fr_CH/main.lang | 1 + htdocs/langs/fr_FR/accountancy.lang | 6 +- htdocs/langs/fr_FR/admin.lang | 38 +- htdocs/langs/fr_FR/banks.lang | 6 +- htdocs/langs/fr_FR/bills.lang | 8 +- htdocs/langs/fr_FR/commercial.lang | 2 +- htdocs/langs/fr_FR/compta.lang | 2 +- htdocs/langs/fr_FR/contracts.lang | 1 + htdocs/langs/fr_FR/cron.lang | 1 + htdocs/langs/fr_FR/errors.lang | 5 +- htdocs/langs/fr_FR/install.lang | 3 +- htdocs/langs/fr_FR/main.lang | 6 + htdocs/langs/fr_FR/orders.lang | 2 + htdocs/langs/fr_FR/other.lang | 3 +- htdocs/langs/fr_FR/productbatch.lang | 2 +- htdocs/langs/fr_FR/products.lang | 4 + htdocs/langs/fr_FR/projects.lang | 9 +- htdocs/langs/fr_FR/salaries.lang | 1 + htdocs/langs/fr_FR/sendings.lang | 2 +- htdocs/langs/fr_FR/stocks.lang | 4 +- htdocs/langs/fr_FR/suppliers.lang | 3 +- htdocs/langs/fr_FR/trips.lang | 136 +++++- htdocs/langs/fr_NC/main.lang | 1 + htdocs/langs/he_IL/admin.lang | 38 +- htdocs/langs/he_IL/banks.lang | 6 +- htdocs/langs/he_IL/commercial.lang | 10 +- htdocs/langs/he_IL/contracts.lang | 1 + htdocs/langs/he_IL/cron.lang | 1 + htdocs/langs/he_IL/errors.lang | 5 +- htdocs/langs/he_IL/install.lang | 1 + htdocs/langs/he_IL/main.lang | 6 + htdocs/langs/he_IL/orders.lang | 2 + htdocs/langs/he_IL/other.lang | 3 +- htdocs/langs/he_IL/productbatch.lang | 2 +- htdocs/langs/he_IL/products.lang | 4 + htdocs/langs/he_IL/projects.lang | 9 +- htdocs/langs/he_IL/salaries.lang | 5 + htdocs/langs/he_IL/sendings.lang | 2 +- htdocs/langs/he_IL/stocks.lang | 4 +- htdocs/langs/he_IL/suppliers.lang | 3 +- htdocs/langs/he_IL/trips.lang | 136 +++++- htdocs/langs/hr_HR/admin.lang | 38 +- htdocs/langs/hr_HR/banks.lang | 6 +- htdocs/langs/hr_HR/commercial.lang | 10 +- htdocs/langs/hr_HR/contracts.lang | 1 + htdocs/langs/hr_HR/cron.lang | 1 + htdocs/langs/hr_HR/errors.lang | 5 +- htdocs/langs/hr_HR/install.lang | 1 + htdocs/langs/hr_HR/main.lang | 6 + htdocs/langs/hr_HR/orders.lang | 2 + htdocs/langs/hr_HR/other.lang | 3 +- htdocs/langs/hr_HR/productbatch.lang | 2 +- htdocs/langs/hr_HR/products.lang | 4 + htdocs/langs/hr_HR/projects.lang | 9 +- htdocs/langs/hr_HR/salaries.lang | 5 + htdocs/langs/hr_HR/sendings.lang | 2 +- htdocs/langs/hr_HR/stocks.lang | 4 +- htdocs/langs/hr_HR/suppliers.lang | 3 +- htdocs/langs/hr_HR/trips.lang | 136 +++++- htdocs/langs/hu_HU/admin.lang | 38 +- htdocs/langs/hu_HU/banks.lang | 6 +- htdocs/langs/hu_HU/commercial.lang | 12 +- htdocs/langs/hu_HU/contracts.lang | 1 + htdocs/langs/hu_HU/cron.lang | 1 + htdocs/langs/hu_HU/errors.lang | 5 +- htdocs/langs/hu_HU/install.lang | 1 + htdocs/langs/hu_HU/main.lang | 6 + htdocs/langs/hu_HU/orders.lang | 2 + htdocs/langs/hu_HU/other.lang | 3 +- htdocs/langs/hu_HU/productbatch.lang | 2 +- htdocs/langs/hu_HU/products.lang | 4 + htdocs/langs/hu_HU/projects.lang | 9 +- htdocs/langs/hu_HU/salaries.lang | 5 + htdocs/langs/hu_HU/sendings.lang | 2 +- htdocs/langs/hu_HU/stocks.lang | 4 +- htdocs/langs/hu_HU/suppliers.lang | 3 +- htdocs/langs/hu_HU/trips.lang | 136 +++++- htdocs/langs/id_ID/admin.lang | 38 +- htdocs/langs/id_ID/banks.lang | 6 +- htdocs/langs/id_ID/commercial.lang | 10 +- htdocs/langs/id_ID/contracts.lang | 1 + htdocs/langs/id_ID/cron.lang | 1 + htdocs/langs/id_ID/errors.lang | 5 +- htdocs/langs/id_ID/install.lang | 1 + htdocs/langs/id_ID/main.lang | 6 + htdocs/langs/id_ID/orders.lang | 2 + htdocs/langs/id_ID/other.lang | 3 +- htdocs/langs/id_ID/productbatch.lang | 2 +- htdocs/langs/id_ID/products.lang | 4 + htdocs/langs/id_ID/projects.lang | 9 +- htdocs/langs/id_ID/salaries.lang | 1 + htdocs/langs/id_ID/sendings.lang | 2 +- htdocs/langs/id_ID/stocks.lang | 4 +- htdocs/langs/id_ID/suppliers.lang | 3 +- htdocs/langs/id_ID/trips.lang | 136 +++++- htdocs/langs/is_IS/admin.lang | 38 +- htdocs/langs/is_IS/banks.lang | 6 +- htdocs/langs/is_IS/commercial.lang | 12 +- htdocs/langs/is_IS/contracts.lang | 1 + htdocs/langs/is_IS/cron.lang | 1 + htdocs/langs/is_IS/errors.lang | 5 +- htdocs/langs/is_IS/install.lang | 1 + htdocs/langs/is_IS/main.lang | 6 + htdocs/langs/is_IS/orders.lang | 2 + htdocs/langs/is_IS/other.lang | 3 +- htdocs/langs/is_IS/productbatch.lang | 2 +- htdocs/langs/is_IS/products.lang | 4 + htdocs/langs/is_IS/projects.lang | 9 +- htdocs/langs/is_IS/salaries.lang | 5 + htdocs/langs/is_IS/sendings.lang | 2 +- htdocs/langs/is_IS/stocks.lang | 4 +- htdocs/langs/is_IS/suppliers.lang | 3 +- htdocs/langs/is_IS/trips.lang | 136 +++++- htdocs/langs/it_IT/admin.lang | 38 +- htdocs/langs/it_IT/banks.lang | 6 +- htdocs/langs/it_IT/commercial.lang | 12 +- htdocs/langs/it_IT/contracts.lang | 1 + htdocs/langs/it_IT/cron.lang | 1 + htdocs/langs/it_IT/errors.lang | 5 +- htdocs/langs/it_IT/install.lang | 1 + htdocs/langs/it_IT/main.lang | 6 + htdocs/langs/it_IT/orders.lang | 2 + htdocs/langs/it_IT/other.lang | 3 +- htdocs/langs/it_IT/productbatch.lang | 2 +- htdocs/langs/it_IT/products.lang | 4 + htdocs/langs/it_IT/projects.lang | 9 +- htdocs/langs/it_IT/salaries.lang | 5 + htdocs/langs/it_IT/sendings.lang | 2 +- htdocs/langs/it_IT/stocks.lang | 4 +- htdocs/langs/it_IT/suppliers.lang | 3 +- htdocs/langs/it_IT/trips.lang | 134 +++++- htdocs/langs/ja_JP/admin.lang | 38 +- htdocs/langs/ja_JP/banks.lang | 6 +- htdocs/langs/ja_JP/commercial.lang | 12 +- htdocs/langs/ja_JP/contracts.lang | 1 + htdocs/langs/ja_JP/cron.lang | 1 + htdocs/langs/ja_JP/errors.lang | 5 +- htdocs/langs/ja_JP/install.lang | 1 + htdocs/langs/ja_JP/main.lang | 6 + htdocs/langs/ja_JP/orders.lang | 2 + htdocs/langs/ja_JP/other.lang | 3 +- htdocs/langs/ja_JP/productbatch.lang | 2 +- htdocs/langs/ja_JP/products.lang | 4 + htdocs/langs/ja_JP/projects.lang | 9 +- htdocs/langs/ja_JP/salaries.lang | 5 + htdocs/langs/ja_JP/sendings.lang | 2 +- htdocs/langs/ja_JP/stocks.lang | 4 +- htdocs/langs/ja_JP/suppliers.lang | 3 +- htdocs/langs/ja_JP/trips.lang | 136 +++++- htdocs/langs/ka_GE/admin.lang | 38 +- htdocs/langs/ka_GE/banks.lang | 6 +- htdocs/langs/ka_GE/commercial.lang | 2 +- htdocs/langs/ka_GE/contracts.lang | 1 + htdocs/langs/ka_GE/cron.lang | 1 + htdocs/langs/ka_GE/errors.lang | 5 +- htdocs/langs/ka_GE/install.lang | 1 + htdocs/langs/ka_GE/main.lang | 6 + htdocs/langs/ka_GE/orders.lang | 2 + htdocs/langs/ka_GE/other.lang | 3 +- htdocs/langs/ka_GE/productbatch.lang | 2 +- htdocs/langs/ka_GE/products.lang | 4 + htdocs/langs/ka_GE/projects.lang | 9 +- htdocs/langs/ka_GE/salaries.lang | 1 + htdocs/langs/ka_GE/sendings.lang | 2 +- htdocs/langs/ka_GE/stocks.lang | 4 +- htdocs/langs/ka_GE/suppliers.lang | 3 +- htdocs/langs/ka_GE/trips.lang | 136 +++++- htdocs/langs/ko_KR/admin.lang | 38 +- htdocs/langs/ko_KR/banks.lang | 6 +- htdocs/langs/ko_KR/commercial.lang | 10 +- htdocs/langs/ko_KR/contracts.lang | 1 + htdocs/langs/ko_KR/cron.lang | 1 + htdocs/langs/ko_KR/errors.lang | 5 +- htdocs/langs/ko_KR/install.lang | 1 + htdocs/langs/ko_KR/main.lang | 6 + htdocs/langs/ko_KR/orders.lang | 2 + htdocs/langs/ko_KR/other.lang | 3 +- htdocs/langs/ko_KR/productbatch.lang | 2 +- htdocs/langs/ko_KR/products.lang | 4 + htdocs/langs/ko_KR/projects.lang | 9 +- htdocs/langs/ko_KR/salaries.lang | 5 + htdocs/langs/ko_KR/sendings.lang | 2 +- htdocs/langs/ko_KR/stocks.lang | 4 +- htdocs/langs/ko_KR/suppliers.lang | 3 +- htdocs/langs/ko_KR/trips.lang | 136 +++++- htdocs/langs/lt_LT/admin.lang | 38 +- htdocs/langs/lt_LT/banks.lang | 6 +- htdocs/langs/lt_LT/commercial.lang | 12 +- htdocs/langs/lt_LT/contracts.lang | 1 + htdocs/langs/lt_LT/cron.lang | 1 + htdocs/langs/lt_LT/errors.lang | 5 +- htdocs/langs/lt_LT/install.lang | 1 + htdocs/langs/lt_LT/main.lang | 6 + htdocs/langs/lt_LT/orders.lang | 2 + htdocs/langs/lt_LT/other.lang | 3 +- htdocs/langs/lt_LT/productbatch.lang | 2 +- htdocs/langs/lt_LT/products.lang | 4 + htdocs/langs/lt_LT/projects.lang | 9 +- htdocs/langs/lt_LT/salaries.lang | 19 +- htdocs/langs/lt_LT/sendings.lang | 2 +- htdocs/langs/lt_LT/stocks.lang | 4 +- htdocs/langs/lt_LT/suppliers.lang | 3 +- htdocs/langs/lt_LT/trips.lang | 136 +++++- htdocs/langs/lv_LV/accountancy.lang | 4 +- htdocs/langs/lv_LV/admin.lang | 44 +- htdocs/langs/lv_LV/agenda.lang | 2 +- htdocs/langs/lv_LV/banks.lang | 8 +- htdocs/langs/lv_LV/bills.lang | 16 +- htdocs/langs/lv_LV/commercial.lang | 18 +- htdocs/langs/lv_LV/contracts.lang | 1 + htdocs/langs/lv_LV/cron.lang | 1 + htdocs/langs/lv_LV/errors.lang | 5 +- htdocs/langs/lv_LV/install.lang | 3 +- htdocs/langs/lv_LV/main.lang | 6 + htdocs/langs/lv_LV/orders.lang | 6 +- htdocs/langs/lv_LV/other.lang | 3 +- htdocs/langs/lv_LV/productbatch.lang | 6 +- htdocs/langs/lv_LV/products.lang | 4 + htdocs/langs/lv_LV/projects.lang | 9 +- htdocs/langs/lv_LV/salaries.lang | 5 + htdocs/langs/lv_LV/sendings.lang | 2 +- htdocs/langs/lv_LV/stocks.lang | 6 +- htdocs/langs/lv_LV/suppliers.lang | 5 +- htdocs/langs/lv_LV/trips.lang | 136 +++++- htdocs/langs/mk_MK/admin.lang | 38 +- htdocs/langs/mk_MK/banks.lang | 6 +- htdocs/langs/mk_MK/commercial.lang | 10 +- htdocs/langs/mk_MK/contracts.lang | 1 + htdocs/langs/mk_MK/cron.lang | 1 + htdocs/langs/mk_MK/errors.lang | 5 +- htdocs/langs/mk_MK/install.lang | 1 + htdocs/langs/mk_MK/main.lang | 6 + htdocs/langs/mk_MK/orders.lang | 2 + htdocs/langs/mk_MK/other.lang | 3 +- htdocs/langs/mk_MK/productbatch.lang | 2 +- htdocs/langs/mk_MK/products.lang | 4 + htdocs/langs/mk_MK/projects.lang | 9 +- htdocs/langs/mk_MK/salaries.lang | 5 + htdocs/langs/mk_MK/sendings.lang | 2 +- htdocs/langs/mk_MK/stocks.lang | 4 +- htdocs/langs/mk_MK/suppliers.lang | 3 +- htdocs/langs/mk_MK/trips.lang | 136 +++++- htdocs/langs/nb_NO/admin.lang | 50 ++- htdocs/langs/nb_NO/agenda.lang | 6 +- htdocs/langs/nb_NO/banks.lang | 8 +- htdocs/langs/nb_NO/bills.lang | 24 +- htdocs/langs/nb_NO/boxes.lang | 89 ++-- htdocs/langs/nb_NO/cashdesk.lang | 38 +- htdocs/langs/nb_NO/categories.lang | 38 +- htdocs/langs/nb_NO/commercial.lang | 12 +- htdocs/langs/nb_NO/companies.lang | 110 ++--- htdocs/langs/nb_NO/contracts.lang | 1 + htdocs/langs/nb_NO/cron.lang | 1 + htdocs/langs/nb_NO/errors.lang | 5 +- htdocs/langs/nb_NO/install.lang | 5 +- htdocs/langs/nb_NO/main.lang | 6 + htdocs/langs/nb_NO/opensurvey.lang | 128 +++--- htdocs/langs/nb_NO/orders.lang | 2 + htdocs/langs/nb_NO/other.lang | 3 +- htdocs/langs/nb_NO/productbatch.lang | 2 +- htdocs/langs/nb_NO/products.lang | 4 + htdocs/langs/nb_NO/projects.lang | 9 +- htdocs/langs/nb_NO/salaries.lang | 5 + htdocs/langs/nb_NO/sendings.lang | 2 +- htdocs/langs/nb_NO/stocks.lang | 4 +- htdocs/langs/nb_NO/suppliers.lang | 3 +- htdocs/langs/nb_NO/trips.lang | 136 +++++- htdocs/langs/nl_BE/main.lang | 2 +- htdocs/langs/nl_BE/trips.lang | 1 - htdocs/langs/nl_NL/admin.lang | 38 +- htdocs/langs/nl_NL/banks.lang | 6 +- htdocs/langs/nl_NL/commercial.lang | 2 +- htdocs/langs/nl_NL/contracts.lang | 1 + htdocs/langs/nl_NL/cron.lang | 1 + htdocs/langs/nl_NL/errors.lang | 5 +- htdocs/langs/nl_NL/install.lang | 1 + htdocs/langs/nl_NL/main.lang | 6 + htdocs/langs/nl_NL/orders.lang | 2 + htdocs/langs/nl_NL/other.lang | 3 +- htdocs/langs/nl_NL/productbatch.lang | 2 +- htdocs/langs/nl_NL/products.lang | 4 + htdocs/langs/nl_NL/projects.lang | 9 +- htdocs/langs/nl_NL/salaries.lang | 5 + htdocs/langs/nl_NL/sendings.lang | 2 +- htdocs/langs/nl_NL/stocks.lang | 4 +- htdocs/langs/nl_NL/suppliers.lang | 3 +- htdocs/langs/nl_NL/trips.lang | 136 +++++- htdocs/langs/pl_PL/admin.lang | 94 ++-- htdocs/langs/pl_PL/banks.lang | 6 +- htdocs/langs/pl_PL/bills.lang | 8 +- htdocs/langs/pl_PL/bookmarks.lang | 4 +- htdocs/langs/pl_PL/commercial.lang | 12 +- htdocs/langs/pl_PL/companies.lang | 24 +- htdocs/langs/pl_PL/contracts.lang | 1 + htdocs/langs/pl_PL/cron.lang | 1 + htdocs/langs/pl_PL/errors.lang | 5 +- htdocs/langs/pl_PL/install.lang | 113 ++--- htdocs/langs/pl_PL/ldap.lang | 10 +- htdocs/langs/pl_PL/link.lang | 16 +- htdocs/langs/pl_PL/main.lang | 622 ++++++++++++++------------- htdocs/langs/pl_PL/orders.lang | 2 + htdocs/langs/pl_PL/other.lang | 3 +- htdocs/langs/pl_PL/paybox.lang | 54 +-- htdocs/langs/pl_PL/productbatch.lang | 40 +- htdocs/langs/pl_PL/products.lang | 4 + htdocs/langs/pl_PL/projects.lang | 9 +- htdocs/langs/pl_PL/propal.lang | 14 +- htdocs/langs/pl_PL/resource.lang | 54 +-- htdocs/langs/pl_PL/salaries.lang | 19 +- htdocs/langs/pl_PL/sendings.lang | 2 +- htdocs/langs/pl_PL/stocks.lang | 4 +- htdocs/langs/pl_PL/suppliers.lang | 3 +- htdocs/langs/pl_PL/trips.lang | 142 +++++- htdocs/langs/pt_BR/admin.lang | 11 - htdocs/langs/pt_BR/bills.lang | 3 - htdocs/langs/pt_BR/compta.lang | 2 - htdocs/langs/pt_BR/donations.lang | 1 - htdocs/langs/pt_BR/projects.lang | 2 - htdocs/langs/pt_PT/admin.lang | 174 +++++--- htdocs/langs/pt_PT/banks.lang | 6 +- htdocs/langs/pt_PT/bills.lang | 52 +-- htdocs/langs/pt_PT/boxes.lang | 6 +- htdocs/langs/pt_PT/commercial.lang | 12 +- htdocs/langs/pt_PT/compta.lang | 26 +- htdocs/langs/pt_PT/contracts.lang | 1 + htdocs/langs/pt_PT/cron.lang | 1 + htdocs/langs/pt_PT/donations.lang | 38 +- htdocs/langs/pt_PT/errors.lang | 5 +- htdocs/langs/pt_PT/holiday.lang | 38 +- htdocs/langs/pt_PT/install.lang | 1 + htdocs/langs/pt_PT/languages.lang | 2 +- htdocs/langs/pt_PT/main.lang | 6 + htdocs/langs/pt_PT/orders.lang | 2 + htdocs/langs/pt_PT/other.lang | 3 +- htdocs/langs/pt_PT/productbatch.lang | 2 +- htdocs/langs/pt_PT/products.lang | 4 + htdocs/langs/pt_PT/projects.lang | 19 +- htdocs/langs/pt_PT/salaries.lang | 1 + htdocs/langs/pt_PT/sendings.lang | 2 +- htdocs/langs/pt_PT/stocks.lang | 4 +- htdocs/langs/pt_PT/suppliers.lang | 3 +- htdocs/langs/pt_PT/trips.lang | 136 +++++- htdocs/langs/ro_RO/admin.lang | 68 ++- htdocs/langs/ro_RO/agenda.lang | 2 +- htdocs/langs/ro_RO/banks.lang | 8 +- htdocs/langs/ro_RO/bills.lang | 16 +- htdocs/langs/ro_RO/commercial.lang | 2 +- htdocs/langs/ro_RO/compta.lang | 2 +- htdocs/langs/ro_RO/contracts.lang | 1 + htdocs/langs/ro_RO/cron.lang | 5 +- htdocs/langs/ro_RO/errors.lang | 7 +- htdocs/langs/ro_RO/install.lang | 5 +- htdocs/langs/ro_RO/languages.lang | 2 +- htdocs/langs/ro_RO/main.lang | 6 + htdocs/langs/ro_RO/orders.lang | 2 + htdocs/langs/ro_RO/other.lang | 3 +- htdocs/langs/ro_RO/productbatch.lang | 2 +- htdocs/langs/ro_RO/products.lang | 32 +- htdocs/langs/ro_RO/projects.lang | 13 +- htdocs/langs/ro_RO/salaries.lang | 1 + htdocs/langs/ro_RO/sendings.lang | 14 +- htdocs/langs/ro_RO/stocks.lang | 4 +- htdocs/langs/ro_RO/suppliers.lang | 7 +- htdocs/langs/ro_RO/trips.lang | 136 +++++- htdocs/langs/ro_RO/withdrawals.lang | 2 +- htdocs/langs/ro_RO/workflow.lang | 2 +- htdocs/langs/ru_RU/admin.lang | 38 +- htdocs/langs/ru_RU/banks.lang | 6 +- htdocs/langs/ru_RU/commercial.lang | 12 +- htdocs/langs/ru_RU/contracts.lang | 1 + htdocs/langs/ru_RU/cron.lang | 1 + htdocs/langs/ru_RU/errors.lang | 5 +- htdocs/langs/ru_RU/install.lang | 1 + htdocs/langs/ru_RU/main.lang | 6 + htdocs/langs/ru_RU/orders.lang | 2 + htdocs/langs/ru_RU/other.lang | 3 +- htdocs/langs/ru_RU/productbatch.lang | 2 +- htdocs/langs/ru_RU/products.lang | 4 + htdocs/langs/ru_RU/projects.lang | 9 +- htdocs/langs/ru_RU/salaries.lang | 5 + htdocs/langs/ru_RU/sendings.lang | 2 +- htdocs/langs/ru_RU/stocks.lang | 4 +- htdocs/langs/ru_RU/suppliers.lang | 3 +- htdocs/langs/ru_RU/trips.lang | 136 +++++- htdocs/langs/ru_UA/contracts.lang | 2 +- htdocs/langs/ru_UA/install.lang | 2 - htdocs/langs/ru_UA/main.lang | 1 + htdocs/langs/sk_SK/admin.lang | 38 +- htdocs/langs/sk_SK/banks.lang | 6 +- htdocs/langs/sk_SK/commercial.lang | 12 +- htdocs/langs/sk_SK/contracts.lang | 1 + htdocs/langs/sk_SK/cron.lang | 1 + htdocs/langs/sk_SK/errors.lang | 5 +- htdocs/langs/sk_SK/install.lang | 1 + htdocs/langs/sk_SK/main.lang | 6 + htdocs/langs/sk_SK/orders.lang | 2 + htdocs/langs/sk_SK/other.lang | 3 +- htdocs/langs/sk_SK/productbatch.lang | 2 +- htdocs/langs/sk_SK/products.lang | 4 + htdocs/langs/sk_SK/projects.lang | 9 +- htdocs/langs/sk_SK/salaries.lang | 5 + htdocs/langs/sk_SK/sendings.lang | 2 +- htdocs/langs/sk_SK/stocks.lang | 4 +- htdocs/langs/sk_SK/suppliers.lang | 3 +- htdocs/langs/sk_SK/trips.lang | 136 +++++- htdocs/langs/sl_SI/admin.lang | 38 +- htdocs/langs/sl_SI/banks.lang | 6 +- htdocs/langs/sl_SI/commercial.lang | 12 +- htdocs/langs/sl_SI/contracts.lang | 1 + htdocs/langs/sl_SI/cron.lang | 1 + htdocs/langs/sl_SI/errors.lang | 5 +- htdocs/langs/sl_SI/install.lang | 1 + htdocs/langs/sl_SI/main.lang | 6 + htdocs/langs/sl_SI/orders.lang | 2 + htdocs/langs/sl_SI/other.lang | 3 +- htdocs/langs/sl_SI/productbatch.lang | 2 +- htdocs/langs/sl_SI/products.lang | 4 + htdocs/langs/sl_SI/projects.lang | 9 +- htdocs/langs/sl_SI/salaries.lang | 5 + htdocs/langs/sl_SI/sendings.lang | 2 +- htdocs/langs/sl_SI/stocks.lang | 4 +- htdocs/langs/sl_SI/suppliers.lang | 3 +- htdocs/langs/sl_SI/trips.lang | 134 +++++- htdocs/langs/sq_AL/admin.lang | 38 +- htdocs/langs/sq_AL/banks.lang | 6 +- htdocs/langs/sq_AL/commercial.lang | 10 +- htdocs/langs/sq_AL/contracts.lang | 1 + htdocs/langs/sq_AL/cron.lang | 1 + htdocs/langs/sq_AL/errors.lang | 5 +- htdocs/langs/sq_AL/install.lang | 1 + htdocs/langs/sq_AL/main.lang | 6 + htdocs/langs/sq_AL/orders.lang | 2 + htdocs/langs/sq_AL/other.lang | 3 +- htdocs/langs/sq_AL/productbatch.lang | 2 +- htdocs/langs/sq_AL/products.lang | 4 + htdocs/langs/sq_AL/projects.lang | 9 +- htdocs/langs/sq_AL/salaries.lang | 5 + htdocs/langs/sq_AL/sendings.lang | 2 +- htdocs/langs/sq_AL/stocks.lang | 4 +- htdocs/langs/sq_AL/suppliers.lang | 3 +- htdocs/langs/sq_AL/trips.lang | 136 +++++- htdocs/langs/sv_SE/accountancy.lang | 4 +- htdocs/langs/sv_SE/admin.lang | 70 ++- htdocs/langs/sv_SE/agenda.lang | 8 +- htdocs/langs/sv_SE/banks.lang | 8 +- htdocs/langs/sv_SE/bills.lang | 46 +- htdocs/langs/sv_SE/commercial.lang | 2 +- htdocs/langs/sv_SE/compta.lang | 2 +- htdocs/langs/sv_SE/contracts.lang | 1 + htdocs/langs/sv_SE/cron.lang | 5 +- htdocs/langs/sv_SE/ecm.lang | 4 +- htdocs/langs/sv_SE/errors.lang | 5 +- htdocs/langs/sv_SE/install.lang | 5 +- htdocs/langs/sv_SE/languages.lang | 2 +- htdocs/langs/sv_SE/main.lang | 16 +- htdocs/langs/sv_SE/orders.lang | 20 +- htdocs/langs/sv_SE/other.lang | 3 +- htdocs/langs/sv_SE/productbatch.lang | 14 +- htdocs/langs/sv_SE/products.lang | 34 +- htdocs/langs/sv_SE/projects.lang | 13 +- htdocs/langs/sv_SE/salaries.lang | 1 + htdocs/langs/sv_SE/sendings.lang | 24 +- htdocs/langs/sv_SE/stocks.lang | 24 +- htdocs/langs/sv_SE/suppliers.lang | 7 +- htdocs/langs/sv_SE/trips.lang | 136 +++++- htdocs/langs/sv_SE/withdrawals.lang | 2 +- htdocs/langs/sv_SE/workflow.lang | 2 +- htdocs/langs/th_TH/admin.lang | 38 +- htdocs/langs/th_TH/banks.lang | 6 +- htdocs/langs/th_TH/commercial.lang | 10 +- htdocs/langs/th_TH/contracts.lang | 1 + htdocs/langs/th_TH/cron.lang | 1 + htdocs/langs/th_TH/errors.lang | 5 +- htdocs/langs/th_TH/install.lang | 1 + htdocs/langs/th_TH/main.lang | 6 + htdocs/langs/th_TH/orders.lang | 2 + htdocs/langs/th_TH/other.lang | 3 +- htdocs/langs/th_TH/productbatch.lang | 2 +- htdocs/langs/th_TH/products.lang | 4 + htdocs/langs/th_TH/projects.lang | 9 +- htdocs/langs/th_TH/salaries.lang | 5 + htdocs/langs/th_TH/sendings.lang | 2 +- htdocs/langs/th_TH/stocks.lang | 4 +- htdocs/langs/th_TH/suppliers.lang | 3 +- htdocs/langs/th_TH/trips.lang | 136 +++++- htdocs/langs/tr_TR/admin.lang | 38 +- htdocs/langs/tr_TR/banks.lang | 6 +- htdocs/langs/tr_TR/commercial.lang | 10 +- htdocs/langs/tr_TR/contracts.lang | 1 + htdocs/langs/tr_TR/cron.lang | 1 + htdocs/langs/tr_TR/errors.lang | 5 +- htdocs/langs/tr_TR/install.lang | 1 + htdocs/langs/tr_TR/main.lang | 6 + htdocs/langs/tr_TR/orders.lang | 2 + htdocs/langs/tr_TR/other.lang | 3 +- htdocs/langs/tr_TR/productbatch.lang | 2 +- htdocs/langs/tr_TR/products.lang | 4 + htdocs/langs/tr_TR/projects.lang | 9 +- htdocs/langs/tr_TR/salaries.lang | 1 + htdocs/langs/tr_TR/sendings.lang | 2 +- htdocs/langs/tr_TR/stocks.lang | 4 +- htdocs/langs/tr_TR/suppliers.lang | 3 +- htdocs/langs/tr_TR/trips.lang | 136 +++++- htdocs/langs/uk_UA/admin.lang | 38 +- htdocs/langs/uk_UA/banks.lang | 6 +- htdocs/langs/uk_UA/commercial.lang | 10 +- htdocs/langs/uk_UA/contracts.lang | 1 + htdocs/langs/uk_UA/cron.lang | 1 + htdocs/langs/uk_UA/errors.lang | 5 +- htdocs/langs/uk_UA/install.lang | 1 + htdocs/langs/uk_UA/main.lang | 6 + htdocs/langs/uk_UA/orders.lang | 2 + htdocs/langs/uk_UA/other.lang | 3 +- htdocs/langs/uk_UA/productbatch.lang | 2 +- htdocs/langs/uk_UA/products.lang | 4 + htdocs/langs/uk_UA/projects.lang | 9 +- htdocs/langs/uk_UA/salaries.lang | 5 + htdocs/langs/uk_UA/sendings.lang | 2 +- htdocs/langs/uk_UA/stocks.lang | 4 +- htdocs/langs/uk_UA/suppliers.lang | 3 +- htdocs/langs/uk_UA/trips.lang | 136 +++++- htdocs/langs/uz_UZ/admin.lang | 38 +- htdocs/langs/uz_UZ/banks.lang | 6 +- htdocs/langs/uz_UZ/commercial.lang | 10 +- htdocs/langs/uz_UZ/contracts.lang | 1 + htdocs/langs/uz_UZ/cron.lang | 1 + htdocs/langs/uz_UZ/errors.lang | 5 +- htdocs/langs/uz_UZ/install.lang | 1 + htdocs/langs/uz_UZ/main.lang | 6 + htdocs/langs/uz_UZ/orders.lang | 2 + htdocs/langs/uz_UZ/other.lang | 3 +- htdocs/langs/uz_UZ/products.lang | 4 + htdocs/langs/uz_UZ/projects.lang | 9 +- htdocs/langs/uz_UZ/sendings.lang | 2 +- htdocs/langs/uz_UZ/stocks.lang | 4 +- htdocs/langs/uz_UZ/suppliers.lang | 3 +- htdocs/langs/uz_UZ/trips.lang | 136 +++++- htdocs/langs/vi_VN/admin.lang | 38 +- htdocs/langs/vi_VN/banks.lang | 6 +- htdocs/langs/vi_VN/commercial.lang | 2 +- htdocs/langs/vi_VN/contracts.lang | 1 + htdocs/langs/vi_VN/cron.lang | 1 + htdocs/langs/vi_VN/errors.lang | 5 +- htdocs/langs/vi_VN/install.lang | 1 + htdocs/langs/vi_VN/main.lang | 6 + htdocs/langs/vi_VN/orders.lang | 2 + htdocs/langs/vi_VN/other.lang | 3 +- htdocs/langs/vi_VN/productbatch.lang | 2 +- htdocs/langs/vi_VN/products.lang | 4 + htdocs/langs/vi_VN/projects.lang | 9 +- htdocs/langs/vi_VN/salaries.lang | 1 + htdocs/langs/vi_VN/sendings.lang | 2 +- htdocs/langs/vi_VN/stocks.lang | 4 +- htdocs/langs/vi_VN/suppliers.lang | 3 +- htdocs/langs/vi_VN/trips.lang | 136 +++++- htdocs/langs/zh_CN/admin.lang | 38 +- htdocs/langs/zh_CN/banks.lang | 6 +- htdocs/langs/zh_CN/commercial.lang | 12 +- htdocs/langs/zh_CN/contracts.lang | 1 + htdocs/langs/zh_CN/cron.lang | 1 + htdocs/langs/zh_CN/errors.lang | 5 +- htdocs/langs/zh_CN/install.lang | 1 + htdocs/langs/zh_CN/main.lang | 6 + htdocs/langs/zh_CN/orders.lang | 2 + htdocs/langs/zh_CN/other.lang | 3 +- htdocs/langs/zh_CN/productbatch.lang | 2 +- htdocs/langs/zh_CN/products.lang | 4 + htdocs/langs/zh_CN/projects.lang | 9 +- htdocs/langs/zh_CN/salaries.lang | 5 + htdocs/langs/zh_CN/sendings.lang | 2 +- htdocs/langs/zh_CN/stocks.lang | 4 +- htdocs/langs/zh_CN/suppliers.lang | 3 +- htdocs/langs/zh_CN/trips.lang | 136 +++++- htdocs/langs/zh_TW/admin.lang | 38 +- htdocs/langs/zh_TW/banks.lang | 6 +- htdocs/langs/zh_TW/commercial.lang | 12 +- htdocs/langs/zh_TW/contracts.lang | 1 + htdocs/langs/zh_TW/cron.lang | 1 + htdocs/langs/zh_TW/errors.lang | 5 +- htdocs/langs/zh_TW/install.lang | 1 + htdocs/langs/zh_TW/main.lang | 6 + htdocs/langs/zh_TW/orders.lang | 2 + htdocs/langs/zh_TW/other.lang | 3 +- htdocs/langs/zh_TW/productbatch.lang | 2 +- htdocs/langs/zh_TW/products.lang | 4 + htdocs/langs/zh_TW/projects.lang | 9 +- htdocs/langs/zh_TW/salaries.lang | 5 + htdocs/langs/zh_TW/sendings.lang | 2 +- htdocs/langs/zh_TW/stocks.lang | 4 +- htdocs/langs/zh_TW/suppliers.lang | 3 +- htdocs/langs/zh_TW/trips.lang | 136 +++++- 912 files changed, 10360 insertions(+), 3094 deletions(-) diff --git a/dev/fixaltlanguages.sh b/dev/fixaltlanguages.sh index d6d1946b7d1..eec9df4b88f 100755 --- a/dev/fixaltlanguages.sh +++ b/dev/fixaltlanguages.sh @@ -37,8 +37,12 @@ then export aa=`echo $dirshort | nawk -F"_" '{ print $1 }'` export bb=`echo $dirshort | nawk -F"_" '{ print $2 }'` aaupper=`echo $dirshort | nawk -F"_" '{ print toupper($1) }'` + if [ $aaupper = "EN" ] + then + aaupper="US" + fi bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'` - if [ "$aa" != "$bblower" ] + if [ "$aa" != "$bblower" -a "$bblower" != "us" ] then reflang="htdocs/langs/"$aa"_"$aaupper if [ -d $reflang ] diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang index 290a5eb67b5..2777d5fac6a 100644 --- a/htdocs/langs/ar_SA/admin.lang +++ b/htdocs/langs/ar_SA/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=تجريبية VersionDevelopment=تطويرية VersionUnknown=غير معروفة VersionRecommanded=موصى بها +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=رمز المرحلة SessionSaveHandler=معالج لحفظ المراحل SessionSavePath=مرحلة التخزين المحلية @@ -493,10 +498,16 @@ Module600Name=الإخطارات Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=التبرعات Module700Desc=التبرعات إدارة +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=فرس النبي Module1200Desc=فرس النبي التكامل Module1400Name=المحاسبة Module1400Desc=المحاسبة الإدارية (ضعف الأحزاب) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=الفئات Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن) Module2000Name=Fckeditor @@ -631,7 +642,7 @@ Permission181=قراءة مورد أوامر Permission182=إنشاء / تغيير المورد أوامر Permission183=صحة أوامر المورد Permission184=الموافقة على أوامر المورد -Permission185=من أجل المورد أوامر +Permission185=Order or cancel supplier orders Permission186=تلقي أوامر المورد Permission187=وثيقة أوامر المورد Permission188=المورد إلغاء أوامر @@ -711,6 +722,13 @@ Permission538=تصدير الخدمات Permission701=قراءة التبرعات Permission702=إنشاء / تعديل والهبات Permission703=حذف التبرعات +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=قراءة مخزونات Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=كلمة مرور لاستخدام الملقم الوكيل DefineHereComplementaryAttributes=هنا تعريف جميع atributes، لا تتوفر بالفعل افتراضيا، والتي تريد أن تدعم ل%s. ExtraFields=تكميلية سمات ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=خط من المنتجات / الخدمات ذات ا FreeLegalTextOnProposal=نص تجارية حرة على مقترحات WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=أوامر إدارة الإعداد OrdersNumberingModules=أوامر الترقيم نمائط @@ -1383,7 +1410,7 @@ BarcodeDescUPC=الباركود نوع من اتحاد الوطنيين الكو BarcodeDescISBN=الباركود من نوع ردمك BarcodeDescC39=الباركود من نوع C39 BarcodeDescC128=الباركود من نوع C128 -GenbarcodeLocation=باركود الجيل سطر أداة تستخدمها phpbarcode المحرك لبعض أنواع باركود) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=الحساب النقدي لاستخدامها لتبيع CashDeskBankAccountForCheque= حساب لاستخدام لتلقي المدفوعات عن طريق الشيكات CashDeskBankAccountForCB= حساب لاستخدام لاستلام المبالغ النقدية عن طريق بطاقات الائتمان -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=إعداد وحدة المرجعية @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang index 4a6dabe894e..3f25d223c75 100644 --- a/htdocs/langs/ar_SA/banks.lang +++ b/htdocs/langs/ar_SA/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=المصالحة RIB=رقم الحساب المصرفي IBAN=عدد إيبان +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=بيك / سويفت عدد +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=أوامر دائمة StandingOrder=من أجل الوقوف Withdrawals=انسحابات @@ -148,7 +152,7 @@ BackToAccount=إلى حساب ShowAllAccounts=وتبين للجميع الحسابات FutureTransaction=الصفقة في أجل المستقبل. أي وسيلة للتوفيق. SelectChequeTransactionAndGenerate=حدد / تصفية الشيكات لتشمل في الاختيار استلام الودائع وانقر على "إنشاء". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/ar_SA/commercial.lang b/htdocs/langs/ar_SA/commercial.lang index 2ddffcb0a05..9f0e152a7dc 100644 --- a/htdocs/langs/ar_SA/commercial.lang +++ b/htdocs/langs/ar_SA/commercial.lang @@ -9,9 +9,9 @@ Prospect=احتمال Prospects=آفاق DeleteAction=حذف عمل / المهمة NewAction=عمل جديدة / المهمة -AddAction=أضف العمل / المهمة -AddAnAction=إضافة عمل / المهمة -AddActionRendezVous=إضافة مهمة رانديفو +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=الموعد ConfirmDeleteAction=هل أنت متأكد من أنك تريد حذف هذه المهمة؟ CardAction=بطاقة العمل @@ -44,8 +44,8 @@ DoneActions=إجراءات عمله DoneActionsFor=إجراءات لعمله ق ٪ ToDoActions=عدم اكتمال الإجراءات ToDoActionsFor=لعدم اكتمال الإجراءات ق ٪ -SendPropalRef=اقتراح ارسال التجارية ق ٪ -SendOrderRef=من أجل إرسال المستندات ٪ +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=لا ينطبق StatusActionToDo=القيام StatusActionDone=فعل @@ -62,7 +62,7 @@ LastProspectContactDone=الاتصال به DateActionPlanned=تاريخ العمل المزمع DateActionDone=تاريخ العمل به ActionAskedBy=طلبت العمل -ActionAffectedTo=العمل على المتضررين +ActionAffectedTo=Event assigned to ActionDoneBy=العمل الذي قام به ActionUserAsk=التي سجلتها ErrorStatusCantBeZeroIfStarted=إذا كان المجال 'تاريخ عمله هو شغلها ، وبدأ العمل (أو انتهت) ، وذلك الميدان' الحالة 'لا يمكن أن يكون 0 ٪ ٪. diff --git a/htdocs/langs/ar_SA/contracts.lang b/htdocs/langs/ar_SA/contracts.lang index 133036960c0..8c181b2fba4 100644 --- a/htdocs/langs/ar_SA/contracts.lang +++ b/htdocs/langs/ar_SA/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=انتهى ServiceStatusClosed=مغلقة ServicesLegend=خدمات أسطورة Contracts=عقود +ContractsAndLine=Contracts and line of contracts Contract=العقد NoContracts=أي عقود MenuServices=الخدمات diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang index 46751a39fdb..c3c9b446364 100644 --- a/htdocs/langs/ar_SA/cron.lang +++ b/htdocs/langs/ar_SA/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang index 87a2b76ac3d..4635ed9b4be 100644 --- a/htdocs/langs/ar_SA/errors.lang +++ b/htdocs/langs/ar_SA/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=المصدر والأهداف يجب أن تكو ErrorBadThirdPartyName=سوء قيمة اسم طرف ثالث ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=سوء تركيب الزبون مدونة -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=رمز العميل المطلوبة ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=الشفرة المستخدمة بالفعل العملاء @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=يجب عدم تعطيل جافا سكريبت لج ErrorPasswordsMustMatch=ويجب على كلا كلمات المرور المكتوبة تطابق بعضها البعض ErrorContactEMail=وقع خطأ فني. من فضلك، اتصل بمسؤول إلى البريد الإلكتروني بعد %s EN توفير %s رمز الخطأ في رسالتك، أو حتى أفضل من خلال إضافة نسخة شاشة من هذه الصفحة. ErrorWrongValueForField=قيمة خاطئة لعدد %s الحقل (قيمة '%s' لا يتطابق %s حكم [رجإكس]) -ErrorFieldValueNotIn=قيمة خاطئة ل%s عدد حقل ('%s "قيمة ليست قيمة المتاحة في مجال %s %s الجدول) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=قيمة خاطئة ل%s عدد حقل ('%s "قيمة ليست المرجع %s موجود) ErrorsOnXLines=الأخطاء على خطوط مصدر %s ErrorFileIsInfectedWithAVirus=وكان برنامج مكافحة الفيروسات غير قادرة على التحقق من صحة الملف (ملف قد يكون مصابا بواسطة فيروس) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang index 589343ad052..b805743f44f 100644 --- a/htdocs/langs/ar_SA/install.lang +++ b/htdocs/langs/ar_SA/install.lang @@ -156,6 +156,7 @@ LastStepDesc=الخطوة الأخيرة : تعريف المس ActivateModule=تفعيل وحدة %s ShowEditTechnicalParameters=انقر هنا لعرض/تحرير المعلمات المتقدمة (وضع الخبراء) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang index 64e8da49c42..45649f61d53 100644 --- a/htdocs/langs/ar_SA/main.lang +++ b/htdocs/langs/ar_SA/main.lang @@ -141,6 +141,7 @@ Cancel=الغاء Modify=تعديل Edit=تحرير Validate=صحة +ValidateAndApprove=Validate and Approve ToValidate=للمصادقة Save=حفظ SaveAs=حفظ باسم @@ -158,6 +159,7 @@ Search=بحث SearchOf=البحث Valid=صحيح Approve=الموافقة +Disapprove=Disapprove ReOpen=إعادة فتح Upload=ارسال الملف ToLink=Link @@ -219,6 +221,7 @@ Cards=بطاقات Card=بطاقة Now=الآن Date=تاريخ +DateAndHour=Date and hour DateStart=تاريخ البدء DateEnd=نهاية التاريخ DateCreation=تاريخ الإنشاء @@ -295,6 +298,7 @@ UnitPriceHT=سعر الوحدة (صافي) UnitPriceTTC=سعر الوحدة PriceU=ارتفاع PriceUHT=ارتفاع (صافي) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=ارتفاع Amount=مبلغ AmountInvoice=مبلغ الفاتورة @@ -521,6 +525,7 @@ DateFromTo=ل٪ من ق ق ٪ DateFrom=من ق ٪ DateUntil=حتى ق ٪ Check=فحص +Uncheck=Uncheck Internal=الداخلية External=الخارجية Internals=الداخلية @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=يوم الاثنين Tuesday=الثلاثاء diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang index c3188102774..24a7db59d86 100644 --- a/htdocs/langs/ar_SA/orders.lang +++ b/htdocs/langs/ar_SA/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=ألغى StatusOrderDraft=مشروع (لا بد من التحقق من صحة) StatusOrderValidated=صادق StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=تجهيز StatusOrderToBill=على مشروع قانون StatusOrderToBill2=على مشروع قانون @@ -58,6 +59,7 @@ MenuOrdersToBill=أوامر لمشروع قانون MenuOrdersToBill2=Billable orders SearchOrder=من أجل البحث SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=سفينة المنتج Discount=الخصم CreateOrder=خلق أمر diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang index 4500fbcdd8b..8154a44c9ea 100644 --- a/htdocs/langs/ar_SA/other.lang +++ b/htdocs/langs/ar_SA/other.lang @@ -54,12 +54,13 @@ MaxSize=الحجم الأقصى AttachANewFile=إرفاق ملف جديد / وثيقة LinkedObject=ربط وجوه Miscellaneous=متفرقات -NbOfActiveNotifications=عدد الإخطارات +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=هذا هو الاختبار الإلكتروني. تكون مفصولة \\ nThe سطرين من قبل حرف إرجاع. PredefinedMailTestHtml=هذا هو البريد الاختبار (الاختبار يجب أن تكون في كلمة جريئة).
وتفصل بين الخطين من قبل حرف إرجاع. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/ar_SA/productbatch.lang +++ b/htdocs/langs/ar_SA/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang index dce6ac36fea..e79c928e86b 100644 --- a/htdocs/langs/ar_SA/products.lang +++ b/htdocs/langs/ar_SA/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang index 8e9925f168a..b1625a43fdf 100644 --- a/htdocs/langs/ar_SA/projects.lang +++ b/htdocs/langs/ar_SA/projects.lang @@ -8,8 +8,10 @@ SharedProject=مشاريع مشتركة PrivateProject=اتصالات من المشروع MyProjectsDesc=ويقتصر هذا الرأي على المشاريع التي تقوم على الاتصال (كل ما هو نوع). ProjectsPublicDesc=هذا الرأي يعرض جميع المشاريع ويسمح لك قراءة. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=ويعرض هذا الرأي جميع المشاريع (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء). MyTasksDesc=ويقتصر هذا الرأي على المشروعات أو المهام التي هي الاتصال للحصول على (ما هو نوع). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=هذا الرأي يعرض جميع المشاريع والمهام ويسمح لك قراءة. TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء). ProjectsArea=مشاريع المنطقة @@ -29,6 +31,8 @@ NoProject=لا يعرف أو المملوكة للمشروع NbOpenTasks=ملاحظة : من مهام فتح NbOfProjects=ملاحظة : للمشاريع TimeSpent=الوقت الذي تستغرقه +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=قضى وقتا RefTask=المرجع. مهمة LabelTask=علامة مهمة @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=قائمة الموردين الأوامر ListSupplierInvoicesAssociatedProject=قائمة الموردين المرتبطة بالمشروع. ListContractAssociatedProject=قائمة العقود المرتبطة بالمشروع. ListFichinterAssociatedProject=قائمة التدخلات المرتبطة بالمشروع -ListTripAssociatedProject=قائمة من الرحلات والنفقات المرتبطة بالمشروع +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=قائمة الإجراءات المرتبطة بالمشروع ActivityOnProjectThisWeek=نشاط المشروع هذا الاسبوع ActivityOnProjectThisMonth=نشاط المشروع هذا الشهر @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ar_SA/salaries.lang b/htdocs/langs/ar_SA/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/ar_SA/salaries.lang +++ b/htdocs/langs/ar_SA/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang index ef76283c5de..ba8a8febbad 100644 --- a/htdocs/langs/ar_SA/sendings.lang +++ b/htdocs/langs/ar_SA/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=الكمية أمرت QtyShipped=الكمية المشحونة QtyToShip=لشحن الكمية QtyReceived=الكمية الواردة -KeepToShip=إبقاء لشحن +KeepToShip=Remain to ship OtherSendingsForSameOrder=الإرسال الأخرى لهذا النظام DateSending=وحتى الآن من أجل إرسال DateSendingShort=وحتى الآن من أجل إرسال diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang index 9e6ab293234..965feeea1bc 100644 --- a/htdocs/langs/ar_SA/stocks.lang +++ b/htdocs/langs/ar_SA/stocks.lang @@ -47,6 +47,7 @@ PMPValue=المتوسط المرجح لسعر PMPValueShort=الواب EnhancedValueOfWarehouses=قيمة المستودعات UserWarehouseAutoCreate=خلق مخزون تلقائيا عند إنشاء مستخدم +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=ارسال كمية QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang index 405d15954ba..622c3c5575d 100644 --- a/htdocs/langs/ar_SA/suppliers.lang +++ b/htdocs/langs/ar_SA/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=الموردين -Supplier=المورد AddSupplier=Create a supplier SupplierRemoved=إزالة المورد SuppliersInvoice=فاتورة الموردين @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=فواتير الموردين والمدفوعات ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=الموافقة على هذا النظام ConfirmApproveThisOrder=هل أنت متأكد من أن يوافق على هذا الأمر؟ -DenyingThisOrder=ونفى هذا الأمر +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=هل أنت متأكد من إنكار هذا الأمر؟ ConfirmCancelThisOrder=هل أنت متأكد من أنك تريد إلغاء هذا النظام؟ AddCustomerOrder=العملاء من أجل خلق diff --git a/htdocs/langs/ar_SA/trips.lang b/htdocs/langs/ar_SA/trips.lang index a0e4ca8661a..fadc1044001 100644 --- a/htdocs/langs/ar_SA/trips.lang +++ b/htdocs/langs/ar_SA/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=رحلة -Trips=رحلات -TripsAndExpenses=ونفقات الرحلات -TripsAndExpensesStatistics=رحلات ونفقات إحصاءات -TripCard=بطاقة زيارة -AddTrip=إضافة رحلة -ListOfTrips=قائمة الرحلات +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=قائمة الرسوم -NewTrip=رحلة جديدة +NewTrip=New expense report CompanyVisited=الشركة / المؤسسة زارت Kilometers=كم FeesKilometersOrAmout=كم المبلغ أو -DeleteTrip=رحلة حذف -ConfirmDeleteTrip=هل أنت متأكد من أنك تريد حذف هذه الرحلة؟ -TF_OTHER=أخرى -TF_LUNCH=غداء -TF_TRIP=رحلة -ListTripsAndExpenses=قائمة الرحلات والمصاريف -ExpensesArea=رحلات ومنطقة النفقات -SearchATripAndExpense=بحث عن رحلة والنفقات +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=أخرى +TF_TRANSPORTATION=Transportation +TF_LUNCH=غداء +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang index 6b3cc24a468..e1d603d5a23 100644 --- a/htdocs/langs/bg_BG/admin.lang +++ b/htdocs/langs/bg_BG/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Експериментален VersionDevelopment=Разработка VersionUnknown=Неизвестен VersionRecommanded=Препоръчва се +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID на сесията SessionSaveHandler=Handler за да запазите сесията SessionSavePath=Място за съхранение на сесията @@ -294,7 +299,7 @@ DoNotUseInProduction=Не използвайте на продукшън пла ThisIsProcessToFollow=Това е настройка на процеса: StepNb=Стъпка %s FindPackageFromWebSite=Намери пакет, който осигурява функция искате (например относно официалния уеб сайт %s). -DownloadPackageFromWebSite=Download package %s. +DownloadPackageFromWebSite=Изтегляне на пакет %s. UnpackPackageInDolibarrRoot=Разопаковайте пакет файл в главната директория %s Dolibarr SetupIsReadyForUse=Install е завършен и Dolibarr е готов за използване с този нов компонент. NotExistsDirect=Алтернатива главната директория не е дефинирано.
@@ -311,7 +316,7 @@ GenericMaskCodes3=Всички други символи на маската щ GenericMaskCodes4a=Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:
GenericMaskCodes4b=Пример за трета страна е създаден на 2007-03-01:
GenericMaskCodes4c=Пример за продукт, създаден на 2007-03-01:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX +GenericMaskCodes5=ABC{yy}{mm}-{000000} ще даде ABC0701-000099
{0000+100@1}-ZZZ/{dd} / XXX ще даде 0199-ZZZ/31/XXX GenericNumRefModelDesc=Върнете адаптивни номер според определен маска. ServerAvailableOnIPOrPort=Сървър е достъпна на адрес %s на порт %s ServerNotAvailableOnIPOrPort=Сървърът не е достъпен на адрес %s на порт %s @@ -335,7 +340,7 @@ LanguageFilesCachedIntoShmopSharedMemory=Файлове. Lang заредени ExamplesWithCurrentSetup=Примери с текущата настройка ListOfDirectories=Списък на OpenDocument директории шаблони ListOfDirectoriesForModelGenODT=Списък на директории, съдържащи шаблони файлове с OpenDocument формат.

Тук можете да въведете пълния път на директории.
Добави за връщане между указател ие.
За да добавите директория на GED модул, добавете тук на DOL_DATA_ROOT / ECM / yourdirectoryname.

Файлове в тези директории, трябва да завършва с. ODT. -NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories +NumberOfModelFilesFound=Брой на ODT файлове шаблони, намерени в тези директории ExampleOfDirectoriesForModelGen=Примери на синтаксиса:
C: \\ mydir
/ Начало / mydir
DOL_DATA_ROOT / ECM / ecmdir FollowingSubstitutionKeysCanBeUsed=
За да разберете как да създадете свои ODT шаблони на документи, преди да ги съхранявате в тези указатели, прочетете уики документация: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template @@ -369,19 +374,19 @@ NewVATRates=Нов ставка на ДДС PriceBaseTypeToChange=Промяна на цените с база референтна стойност, определена на MassConvert=Стартиране маса конвертирате String=Низ -TextLong=Long text -Int=Integer -Float=Float +TextLong=Дълъг текст +Int=Цяло число +Float=Десетично число DateAndTime=Дата и час -Unique=Unique -Boolean=Boolean (Checkbox) +Unique=Уникално +Boolean=Логическо (Отметка) ExtrafieldPhone = Телефон ExtrafieldPrice = Цена ExtrafieldMail = Имейл -ExtrafieldSelect = Select list -ExtrafieldSelectList = Select from table -ExtrafieldSeparator=Separator -ExtrafieldCheckBox=Checkbox +ExtrafieldSelect = Избор лист +ExtrafieldSelectList = Избор от таблица +ExtrafieldSeparator=Разделител +ExtrafieldCheckBox=Отметка ExtrafieldRadio=Радио бутон ExtrafieldCheckBoxFromList= Checkbox from table ExtrafieldParamHelpselect=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key @@ -389,16 +394,16 @@ ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

fo ExtrafieldParamHelpradio=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter -LibraryToBuildPDF=Library used to build PDF +LibraryToBuildPDF=Библиотека използвана за направа на PDF WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s -RefreshPhoneLink=Refresh link -LinkToTest=Clickable link generated for user %s (click phone number to test) -KeepEmptyToUseDefault=Keep empty to use default value -DefaultLink=Default link -ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) +RefreshPhoneLink=Обнови връзка +LinkToTest=Генерирана е връзка за потребител %s (натиснете телефонния номер за тест) +KeepEmptyToUseDefault=Оставете празно за стойност по подразбиране +DefaultLink=Връзка по подразбиране +ValueOverwrittenByUserSetup=Внимание, тази стойност може да бъде презаписана от потребителски настройки (всеки потребител може да зададе собствен натисни-набери адрес) ExternalModule=Външен модул - инсталиран в директория %s BarcodeInitForThirdparties=Mass barcode init for thirdparties BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services @@ -443,8 +448,8 @@ Module52Name=Запаси Module52Desc=Управление на склад (продукти) Module53Name=Услуги Module53Desc=Управление на услуги -Module54Name=Contracts/Subscriptions -Module54Desc=Management of contracts (services or reccuring subscriptions) +Module54Name=Договори/Абонаменти +Module54Desc=Управление на договори (услуги или абонаменти) Module55Name=Баркодове Module55Desc=Управление на баркод Module56Name=Телефония @@ -481,7 +486,7 @@ Module320Name=RSS емисия Module320Desc=Добавяне на RSS емисия в страниците на Dolibarr Module330Name=Отметки Module330Desc=Управление на отметки -Module400Name=Projects/Opportunities/Leads +Module400Name=Проекти/Възможности Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Webcalendar интеграция @@ -493,10 +498,16 @@ Module600Name=Известия Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Дарения Module700Desc=Управление на дарения +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Богомолка Module1200Desc=Mantis интеграция Module1400Name=Счетоводство Module1400Desc=Управление на счетоводство (двойни страни) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Категории Module1780Desc=Управление на категории (продукти, доставчици и клиенти) Module2000Name=WYSIWYG редактор @@ -631,7 +642,7 @@ Permission181=Доставчика поръчки Permission182=Създаване / промяна на доставчика поръчки Permission183=Проверка на доставчика поръчки Permission184=Одобряване на доставчика поръчки -Permission185=Поръчка доставчика поръчки +Permission185=Order or cancel supplier orders Permission186=Получаване на доставчика поръчки Permission187=Близки поръчки доставчици Permission188=Отказ доставчика поръчки @@ -711,6 +722,13 @@ Permission538=Износ услуги Permission701=Прочети дарения Permission702=Създаване / промяна на дарения Permission703=Изтриване на дарения +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Прочети запаси Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Парола, за да използвате прокси сър DefineHereComplementaryAttributes=Определете тук всички atributes, не е налична по подразбиране, и че искате да се поддържа за %s. ExtraFields=Допълнителни атрибути ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Линия на продукт / услуга с ну FreeLegalTextOnProposal=Свободен текст на търговски предложения WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Настройки за управление на поръчки OrdersNumberingModules=Поръчки номериране модули @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Баркод от тип UPC BarcodeDescISBN=Баркод от тип ISBN BarcodeDescC39=Баркод от типа С39 BarcodeDescC128=Баркод от тип C128 -GenbarcodeLocation=Бар код поколение инструмент за командния ред (използва се от двигател с вътрешно за някои видове баркод) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Акаунт по подразбиране да се използва за получаване на парични плащания CashDeskBankAccountForCheque= Акаунт по подразбиране да се използва за получаване на плащания с чек CashDeskBankAccountForCB= Акаунт по подразбиране да се използва за получаване на парични плащания с кредитни карти -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark настройка модул @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang index ffd304d841c..e609966ddf7 100644 --- a/htdocs/langs/bg_BG/banks.lang +++ b/htdocs/langs/bg_BG/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Помирение RIB=Номер на банкова сметка IBAN=IBAN номер +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT номер +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Постоянни поръчки StandingOrder=Постоянна поръчка Withdrawals=Тегления @@ -148,7 +152,7 @@ BackToAccount=Обратно към сметка ShowAllAccounts=Покажи за всички сметки FutureTransaction=Транзакция в FUTUR. Няма начин за помирение. SelectChequeTransactionAndGenerate=Изберете / филтрирате проверки, за да се включи в проверка за получаването на депозит и кликнете върху "Създаване". -InputReceiptNumber=Изберете банково извлечение, свързани с процедурата по съгласуване. Използвайте подреждане числова стойност (като YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=В крайна сметка, да посочите категорията, в която да се класифицират записи ToConciliate=За помирение? ThenCheckLinesAndConciliate=След това проверете линии в отчета на банката и кликнете diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang index 8695bdf4edd..77d4e23521f 100644 --- a/htdocs/langs/bg_BG/boxes.lang +++ b/htdocs/langs/bg_BG/boxes.lang @@ -12,13 +12,14 @@ BoxLastProspects=Последно променени prospects BoxLastCustomers=Последно променени клиенти BoxLastSuppliers=Последно променени доставчици BoxLastCustomerOrders=Последни поръчки на клиентите +BoxLastValidatedCustomerOrders=Последни проверени клиентски поръчки BoxLastBooks=Последни книги BoxLastActions=Последни действия BoxLastContracts=Последните договори BoxLastContacts=Последните контакти/адреси BoxLastMembers=Последните членове BoxFicheInter=Последните намеси -BoxCurrentAccounts=Opened accounts balance +BoxCurrentAccounts=Открити сметки баланс BoxSalesTurnover=Оборот от продажби BoxTotalUnpaidCustomerBills=Общо неплатени фактури на клиента BoxTotalUnpaidSuppliersBills=Общо неплатени фактури на доставчика @@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Брой клиенти BoxTitleLastRssInfos=Последните %s новини от %s BoxTitleLastProducts=Последните %s променени продукти/услуги BoxTitleProductsAlertStock=Предупреждение за наличност на продукти -BoxTitleLastCustomerOrders=Последните %s променени поръчки от клиенти +BoxTitleLastCustomerOrders=Последни %s поръчки на клиенти +BoxTitleLastModifiedCustomerOrders=Последни %s променени клиентски поръчки BoxTitleLastSuppliers=Последните %s записани доставчици BoxTitleLastCustomers=Последните %s записани клиенти BoxTitleLastModifiedSuppliers=Последните %s променени доставчици BoxTitleLastModifiedCustomers=Последните %s променени клиенти -BoxTitleLastCustomersOrProspects=Последните %s променени клиенти или prospects -BoxTitleLastPropals=Последните %s записани предложения +BoxTitleLastCustomersOrProspects=Последни %s клиенти или потенциални +BoxTitleLastPropals=Последни %s предложения +BoxTitleLastModifiedPropals=Последни %s променени предложения BoxTitleLastCustomerBills=Последните %s фактури на клиента +BoxTitleLastModifiedCustomerBills=Последни %s променени клиентски фактури BoxTitleLastSupplierBills=Последните %s фактури на доставчика -BoxTitleLastProspects=Последните %s записани prospects +BoxTitleLastModifiedSupplierBills=Последни %s променени фактури от доставчик BoxTitleLastModifiedProspects=Последните %s променени prospects BoxTitleLastProductsInContract=Последните %s продукти / услуги в договора -BoxTitleLastModifiedMembers=Последните %s променени членове +BoxTitleLastModifiedMembers=Последни %s членове BoxTitleLastFicheInter=Последните %s променени intervention -BoxTitleOldestUnpaidCustomerBills=Старите %s неплатени фактури на клиента -BoxTitleOldestUnpaidSupplierBills=Старите %s неплатени фактури на доставчика -BoxTitleCurrentAccounts=Opened account's balances +BoxTitleOldestUnpaidCustomerBills=Най-стари %s неплатени клиентски фактури +BoxTitleOldestUnpaidSupplierBills=Най-стари %s неплатени фактури доставчик +BoxTitleCurrentAccounts=Открити сметки баланси BoxTitleSalesTurnover=Оборот от продажби -BoxTitleTotalUnpaidCustomerBills=Неплатени фактури на клиента -BoxTitleTotalUnpaidSuppliersBills=Неплатени фактури на доставчика +BoxTitleTotalUnpaidCustomerBills=Неплатени клиентски фактури +BoxTitleTotalUnpaidSuppliersBills=Неплатени доставни фактури BoxTitleLastModifiedContacts=Последните %s променени контакти/адреси BoxMyLastBookmarks=Последните ми %s отметки BoxOldestExpiredServices=Най-старите действащи изтекли услуги @@ -74,18 +78,19 @@ NoRecordedProducts=Няма регистрирани продукти / услу NoRecordedProspects=Няма регистрирани перспективи NoContractedProducts=Няма договорени продукти / услуги NoRecordedContracts=Няма регистрирани договори -NoRecordedInterventions=No recorded interventions +NoRecordedInterventions=Няма записани намеси BoxLatestSupplierOrders=Последни поръчки доставчика -BoxTitleLatestSupplierOrders=%s новите поръчки доставчика +BoxTitleLatestSupplierOrders=Последни %s поръчки за доставка +BoxTitleLatestModifiedSupplierOrders=Последни %s променени поръчки от доставчик NoSupplierOrder=Не са познати доставчик за -BoxCustomersInvoicesPerMonth=Customer invoices per month -BoxSuppliersInvoicesPerMonth=Supplier invoices per month -BoxCustomersOrdersPerMonth=Customer orders per month -BoxSuppliersOrdersPerMonth=Supplier orders per month -BoxProposalsPerMonth=Proposals per month +BoxCustomersInvoicesPerMonth=Клиентски фактури за месец +BoxSuppliersInvoicesPerMonth=Доставчик фактури за месец +BoxCustomersOrdersPerMonth=Клиентски заявки за месец +BoxSuppliersOrdersPerMonth=Доставчик поръчки за месец +BoxProposalsPerMonth=Предложения за месец NoTooLowStockProducts=Няма продукт в наличност под минималната -BoxProductDistribution=Products/Services distribution -BoxProductDistributionFor=Distribution of %s for %s +BoxProductDistribution=Продукти/Услуги разпределение +BoxProductDistributionFor=Разпределение на %s за %s ForCustomersInvoices=Клиента фактури -ForCustomersOrders=Customers orders +ForCustomersOrders=Клиентски поръчки ForProposals=Предложения diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang index 4328519b645..81c14e6e6ff 100644 --- a/htdocs/langs/bg_BG/cashdesk.lang +++ b/htdocs/langs/bg_BG/cashdesk.lang @@ -12,7 +12,7 @@ CashDeskProducts=Продукти CashDeskStock=Наличност CashDeskOn=на CashDeskThirdParty=Трета страна -CashdeskDashboard=Point of sale access +CashdeskDashboard=Достъп до точка на продажбите ShoppingCart=Количка за пазаруване NewSell=Нов продажба BackOffice=Обратно офис @@ -36,5 +36,5 @@ BankToPay=Банкова сметка ShowCompany=Покажи фирмата ShowStock=Покажи склад DeleteArticle=Кликнете, за да се премахне тази статия -FilterRefOrLabelOrBC=Search (Ref/Label) -UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock. +FilterRefOrLabelOrBC=Търсене (Номер/Заглавие) +UserNeedPermissionToEditStockToUsePos=Запитвате за намаляване на стоки при създаване на фактура, така че потребителя използващ ТП трябва да е с привилегии да редактира стоки. diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang index a6142468ddf..9e969cad703 100644 --- a/htdocs/langs/bg_BG/categories.lang +++ b/htdocs/langs/bg_BG/categories.lang @@ -50,7 +50,7 @@ SupplierIsInCategories=Третото лице е в следните катег CompanyIsInCustomersCategories=Това трето лице е в следните категории клиенти/prospects CompanyIsInSuppliersCategories=Това трето лице е в следните категории доставчици MemberIsInCategories=Този член е в следните категории членове -ContactIsInCategories=This contact owns to following contacts categories +ContactIsInCategories=Този контакт принадлежи на следните категории контакти ProductHasNoCategory=Този продукт/услуга не е в никакви категории SupplierHasNoCategory=Този доставчик не е в никакви категории CompanyHasNoCategory=Тази фирма не е в никакви категории @@ -66,7 +66,7 @@ ReturnInCompany=Обратно към картата на клиента/prospe ContentsVisibleByAll=Съдържанието ще се вижда от всички ContentsVisibleByAllShort=Съдържанието е видимо от всички ContentsNotVisibleByAllShort=Съдържанието не е видимо от всички -CategoriesTree=Categories tree +CategoriesTree=Категории дърво DeleteCategory=Изтриване на категория ConfirmDeleteCategory=Сигурни ли сте, че желаете да изтриете тази категория? RemoveFromCategory=Премахване на връзката с категория @@ -96,17 +96,17 @@ CatSupList=Списък на доставчика категории CatCusList=Списък на потребителите / перспективата категории CatProdList=Списък на продуктите категории CatMemberList=Списък на членовете категории -CatContactList=List of contact categories and contact -CatSupLinks=Links between suppliers and categories -CatCusLinks=Links between customers/prospects and categories -CatProdLinks=Links between products/services and categories -CatMemberLinks=Links between members and categories +CatContactList=Лист на контактни категории и контакти +CatSupLinks=Връзки между доставчици и категории +CatCusLinks=Връзки между потребител/перспектива и категории +CatProdLinks=Връзки между продукти/услуги и категории +CatMemberLinks=Връзки между членове и категории DeleteFromCat=Премахване от категорията -DeletePicture=Picture delete -ConfirmDeletePicture=Confirm picture deletion? -ExtraFieldsCategories=Complementary attributes -CategoriesSetup=Categories setup -CategorieRecursiv=Link with parent category automatically -CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +DeletePicture=Изтрий снимка +ConfirmDeletePicture=Потвърди изтриване на снимка? +ExtraFieldsCategories=Допълнителни атрибути +CategoriesSetup=Категории настройка +CategorieRecursiv=Автоматично свързване с родителска категория +CategorieRecursivHelp=Ако е активирано, продукта ще бъде свързан също и с родителската категория при добавяне в под-категория AddProductServiceIntoCategory=Add the following product/service ShowCategory=Show category diff --git a/htdocs/langs/bg_BG/commercial.lang b/htdocs/langs/bg_BG/commercial.lang index dfcb852b7d6..b194f60814c 100644 --- a/htdocs/langs/bg_BG/commercial.lang +++ b/htdocs/langs/bg_BG/commercial.lang @@ -9,9 +9,9 @@ Prospect=Перспектива Prospects=Перспективи DeleteAction=Изтриване на събитие / задача NewAction=Ново събитие/задача -AddAction=Добавяне на събитие/задача -AddAnAction=Добавяне на събитие/задача -AddActionRendezVous=Добави събитие - среща +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Среща ConfirmDeleteAction=Сигурни ли сте, че желаете да изтриете това събитие/задача? CardAction=Карта на/за събитие @@ -44,8 +44,8 @@ DoneActions=Завършени събития DoneActionsFor=Завършени събития за %s ToDoActions=Непълни събития ToDoActionsFor=Непълни събития за %s -SendPropalRef=Изпратете търговски %s предложение -SendOrderRef=Изпрати ред %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Не е приложимо StatusActionToDo=За да направите StatusActionDone=Пълен @@ -62,7 +62,7 @@ LastProspectContactDone=Свържи се направи DateActionPlanned=Дата на събитието, планирано за DateActionDone=Дата на събитието направи ActionAskedBy=Събитие докладвани от -ActionAffectedTo=Събитие засегнати в +ActionAffectedTo=Event assigned to ActionDoneBy=Събитие, извършена от ActionUserAsk=Съобщените от ErrorStatusCantBeZeroIfStarted=Ако се попълва поле "Дата", действието се стартира (или завършен), така че "Статус" Полето не може да бъде 0%. diff --git a/htdocs/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang index 1aa00c03e0e..dc09a470545 100644 --- a/htdocs/langs/bg_BG/contracts.lang +++ b/htdocs/langs/bg_BG/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Изтекла ServiceStatusClosed=Затворен ServicesLegend=Услуги легенда Contracts=Договори +ContractsAndLine=Contracts and line of contracts Contract=Договор NoContracts=Не договори MenuServices=Услуги diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang index 47c14375e46..9bd0fcaa449 100644 --- a/htdocs/langs/bg_BG/cron.lang +++ b/htdocs/langs/bg_BG/cron.lang @@ -84,3 +84,4 @@ CronType_command=Терминална команда CronMenu=Крон (софтуер за изпънение на автоматични задачи) CronCannotLoadClass=Неможе да се зареди класа %s или обекта %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang index 0db0a31c373..6231717fdd5 100644 --- a/htdocs/langs/bg_BG/errors.lang +++ b/htdocs/langs/bg_BG/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Източника и целите на банк ErrorBadThirdPartyName=Неправилна стойност за името на трета страна ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad синтаксис за код на клиента -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Клиентите изисква код ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Клиентът код вече се използва @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript не трябва да бъдат хор ErrorPasswordsMustMatch=Двете машинописни пароли трябва да съвпадат помежду си ErrorContactEMail=Техническа грешка. Моля, свържете се с администратора след имейл %s EN предоставят на %s код на грешка в съобщението си, или още по-добре чрез добавяне на екран копие на тази страница. ErrorWrongValueForField=Грешна стойност за номер на полето %s ("%s" стойността не съответства на регулярни изрази върховенството %s) -ErrorFieldValueNotIn=Грешна стойност за %s номер на полето (стойност "%s" не е стойност в полеви %s трапезни %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Грешна стойност за номер на полето %s ("%s стойност не е %s съществуващия код) ErrorsOnXLines=Грешки на %s изходни линии ErrorFileIsInfectedWithAVirus=Антивирусна програма не е в състояние да валидира файла (файл може да бъде заразен с вирус) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang index 51f011d6708..8f31aacacc0 100644 --- a/htdocs/langs/bg_BG/install.lang +++ b/htdocs/langs/bg_BG/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Последна стъпка: Определет ActivateModule=Активиране на модул %s ShowEditTechnicalParameters=Натиснете тук за да покажете/редактирате параметрите за напреднали (експертен режим) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang index 57cc10d1008..579a2d355a3 100644 --- a/htdocs/langs/bg_BG/main.lang +++ b/htdocs/langs/bg_BG/main.lang @@ -141,6 +141,7 @@ Cancel=Отказ Modify=Промяна Edit=Редактиране Validate=Потвърждение +ValidateAndApprove=Validate and Approve ToValidate=За потвърждение Save=Запис SaveAs=Запис като @@ -158,6 +159,7 @@ Search=Търсене SearchOf=Търсене Valid=Потвърден Approve=Одобряване +Disapprove=Disapprove ReOpen=Re-Open Upload=Изпращане на файл ToLink=Връзка @@ -219,6 +221,7 @@ Cards=Карти Card=Карта Now=Сега Date=Дата +DateAndHour=Date and hour DateStart=Начална дата DateEnd=Крайна дата DateCreation=Дата на създаване @@ -295,6 +298,7 @@ UnitPriceHT=Единична цена (нето) UnitPriceTTC=Единична цена PriceU=U.P. PriceUHT=U.P. (нето) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Размер AmountInvoice=Фактурирана стойност @@ -521,6 +525,7 @@ DateFromTo=От %s до %s DateFrom=От %s DateUntil=До %s Check=Проверка +Uncheck=Uncheck Internal=Вътрешен External=Външен Internals=Вътрешен @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Изберете елемент и натиснете Презареждане PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Понеделник Tuesday=Вторник diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang index 0446c663f6c..b68ed897256 100644 --- a/htdocs/langs/bg_BG/orders.lang +++ b/htdocs/langs/bg_BG/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Отменен StatusOrderDraft=Проект (трябва да бъдат валидирани) StatusOrderValidated=Утвърден StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Обработен StatusOrderToBill=Доставени StatusOrderToBill2=На Бил @@ -58,6 +59,7 @@ MenuOrdersToBill=Доставени поръчки MenuOrdersToBill2=Billable orders SearchOrder=Търсене за SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Кораб продукт Discount=Отстъпка CreateOrder=Създаване на поръчка diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang index 0e650cb6d81..4e636a028f0 100644 --- a/htdocs/langs/bg_BG/other.lang +++ b/htdocs/langs/bg_BG/other.lang @@ -54,12 +54,13 @@ MaxSize=Максимален размер AttachANewFile=Прикачване на нов файл/документ LinkedObject=Свързан обект Miscellaneous=Разни -NbOfActiveNotifications=Брой на уведомленията +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Това е тестов имейл.\nДвата реда са разделени с нов ред.\n\n__SIGNATURE__ PredefinedMailTestHtml=Това е тестов имейл (думата тестов трябва да бъде с удебелен шрифт).
Двата реда са разделени с нов ред.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/bg_BG/productbatch.lang +++ b/htdocs/langs/bg_BG/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang index 63a9c3ea81a..b742caded2a 100644 --- a/htdocs/langs/bg_BG/products.lang +++ b/htdocs/langs/bg_BG/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang index c384cf449f2..76dc1909c2d 100644 --- a/htdocs/langs/bg_BG/projects.lang +++ b/htdocs/langs/bg_BG/projects.lang @@ -8,8 +8,10 @@ SharedProject=Всички PrivateProject=Контакти на проекта MyProjectsDesc=Тази гледна точка е ограничена до проекти, които са за контакт (какъвто и да е тип). ProjectsPublicDesc=Този възглед представя всички проекти, по които могат да се четат. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Този възглед представя всички проекти (потребителски разрешения ви даде разрешение да видите всичко). MyTasksDesc=Тази гледна точка е ограничена до проекти или задачи, които са контакт (какъвто и да е тип). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Този възглед представя всички проекти и задачи, които може да чете. TasksDesc=Този възглед представя всички проекти и задачи (потребителски разрешения ви даде разрешение да видите всичко). ProjectsArea=Проекти област @@ -29,6 +31,8 @@ NoProject=Нито един проект няма определени или с NbOpenTasks=Nb отворени задачи NbOfProjects=Nb на проекти TimeSpent=Времето, прекарано +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Времето, прекарано RefTask=Реф. задача LabelTask=Label задача @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Списък на поръчките на д ListSupplierInvoicesAssociatedProject=Списък на фактурите на доставчика, свързана с проекта ListContractAssociatedProject=Списък на договори, свързани с проекта ListFichinterAssociatedProject=Списък на интервенциите, свързани с проекта -ListTripAssociatedProject=Списък на пътувания и разходи, свързани с проекта +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Списък на събития, свързани с проекта ActivityOnProjectThisWeek=Дейности в проекта тази седмица ActivityOnProjectThisMonth=Дейност по проект, този месец @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Свържете със средство за да определите времето +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/bg_BG/salaries.lang b/htdocs/langs/bg_BG/salaries.lang index 64fcb3c80f5..b5b74bc1035 100644 --- a/htdocs/langs/bg_BG/salaries.lang +++ b/htdocs/langs/bg_BG/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Заплата Salaries=Заплати Employee=Служител @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang index 67c5fe8d52d..5b7e942d65e 100644 --- a/htdocs/langs/bg_BG/sendings.lang +++ b/htdocs/langs/bg_BG/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Количество нареди QtyShipped=Количество изпратени QtyToShip=Количество за кораба QtyReceived=Количество получи -KeepToShip=Придържайте се към кораб +KeepToShip=Remain to ship OtherSendingsForSameOrder=Други пратки за изпълнение на поръчката DateSending=Дата на изпращане ред DateSendingShort=Дата на изпращане ред diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang index 2c23d4ca0d2..2188c85aae5 100644 --- a/htdocs/langs/bg_BG/stocks.lang +++ b/htdocs/langs/bg_BG/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Средна цена PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Създаване на склада автоматично при създаването на потребителя +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Брой изпратени QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=За този склад ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Попълване NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang index 1dcc4088caf..b98cea1ccfe 100644 --- a/htdocs/langs/bg_BG/suppliers.lang +++ b/htdocs/langs/bg_BG/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Доставчици -Supplier=Снабдител AddSupplier=Create a supplier SupplierRemoved=Изтрити доставчик SuppliersInvoice=Фактура @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Фактури и наредби ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Одобряване на поръчката ConfirmApproveThisOrder=Сигурен ли сте, че искате да одобри %s Поръчката? -DenyingThisOrder=Да откаже поръчката +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Сигурен ли сте, че искате да откаже доставчик %s за? ConfirmCancelThisOrder=Сигурен ли сте, че искате да отмените доставчика на %s за? AddCustomerOrder=Създаване на заявка на клиента diff --git a/htdocs/langs/bg_BG/trips.lang b/htdocs/langs/bg_BG/trips.lang index cde887226a8..4e70dd8d132 100644 --- a/htdocs/langs/bg_BG/trips.lang +++ b/htdocs/langs/bg_BG/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Екскурзия -Trips=Екскурзии -TripsAndExpenses=Екскурзии и разноски -TripsAndExpensesStatistics=Екскурзии и разходи статистика -TripCard=Екскурзия карта -AddTrip=Добави пътуване -ListOfTrips=Списък на пътуванията +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Списък на такси -NewTrip=Нов пътуване +NewTrip=New expense report CompanyVisited=Фирмата/организацията е посетена Kilometers=Км FeesKilometersOrAmout=Сума или км -DeleteTrip=Изтриване на пътуване -ConfirmDeleteTrip=Сигурен ли сте, че искате да изтриете това пътуване? -TF_OTHER=Друг -TF_LUNCH=Обяд -TF_TRIP=Екскурзия -ListTripsAndExpenses=Списък на пътувания и разходи -ExpensesArea=Екскурзии и разходи площ -SearchATripAndExpense=Търсене на пътуване и разходи +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Друг +TF_TRANSPORTATION=Transportation +TF_LUNCH=Обяд +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang index 9045eeb2c2e..d882817a90b 100644 --- a/htdocs/langs/bs_BA/admin.lang +++ b/htdocs/langs/bs_BA/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Eksperimentalno VersionDevelopment=Razvoj VersionUnknown=Nepoznato VersionRecommanded=Preporučeno +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID sesije SessionSaveHandler=Rukovatelj snimanje sesija SessionSavePath=Lokalizacija snimanja sesije @@ -493,10 +498,16 @@ Module600Name=Notifications Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. ExtraFields=Dopunski atributi ExtraFieldsLines=Dopunski atributi (tekstovi) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Dopunski atributi (treća stranka) ExtraFieldsContacts=Dopunski atributi (kontakt/adresa) ExtraFieldsMember=Dopunski atributi (član) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Menadžer za automatsko određivanje barkod brojeva ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang index 9082a5092d2..cc94be9e783 100644 --- a/htdocs/langs/bs_BA/banks.lang +++ b/htdocs/langs/bs_BA/banks.lang @@ -33,7 +33,11 @@ AllTime=Od početka Reconciliation=Izmirenje RIB=Broj bankovnog računa IBAN=IBAN broj +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT broj +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Trajni nalozi StandingOrder=Trajni nalog Withdrawals=Podizanja @@ -148,7 +152,7 @@ BackToAccount=Nazad na račun ShowAllAccounts=Pokaži za sve račune FutureTransaction=Transakcije u budućnosti. Nema šanse da se izmiri. SelectChequeTransactionAndGenerate=Izaberite/filtrirajte čekove za uključivanje u priznanicu za depozit i kliknite na "Kreiraj". -InputReceiptNumber=Odaberite izvod banke u vezi s izmirenjima. Koristite numeričke vrijednosti (kao što je, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Na kraju, navesti kategoriju u koju će se svrstati zapisi ToConciliate=Izmiriti? ThenCheckLinesAndConciliate=Zatim, provjerite tekst prisutan u izvodu banke i kliknite diff --git a/htdocs/langs/bs_BA/commercial.lang b/htdocs/langs/bs_BA/commercial.lang index 242758543f0..62bbf25f7a1 100644 --- a/htdocs/langs/bs_BA/commercial.lang +++ b/htdocs/langs/bs_BA/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Prospects DeleteAction=Delete an event/task NewAction=New event/task -AddAction=Add event/task -AddAnAction=Add an event/task -AddActionRendezVous=Add a Rendez-vous event +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event/task ? CardAction=Event card @@ -44,8 +44,8 @@ DoneActions=Completed events DoneActionsFor=Completed events for %s ToDoActions=Incomplete events ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete diff --git a/htdocs/langs/bs_BA/contracts.lang b/htdocs/langs/bs_BA/contracts.lang index 4952376c86c..99ee4c3bfb7 100644 --- a/htdocs/langs/bs_BA/contracts.lang +++ b/htdocs/langs/bs_BA/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Istekao ServiceStatusClosed=Zatvoren ServicesLegend=Legenda usluga Contracts=Ugovori +ContractsAndLine=Contracts and line of contracts Contract=Ugovor NoContracts=Nema ugovora MenuServices=Usluge diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang index 6a16b5fb366..db866d27f75 100644 --- a/htdocs/langs/bs_BA/cron.lang +++ b/htdocs/langs/bs_BA/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell komanda CronMenu=Cron CronCannotLoadClass=Ne može se otvoriti klada %s ili objekat %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang index 497ddd814e4..700e6344d7d 100644 --- a/htdocs/langs/bs_BA/errors.lang +++ b/htdocs/langs/bs_BA/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang index 5a494156672..dcd8df6e7db 100644 --- a/htdocs/langs/bs_BA/install.lang +++ b/htdocs/langs/bs_BA/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang index 540e45e2946..8ccf22d049a 100644 --- a/htdocs/langs/bs_BA/main.lang +++ b/htdocs/langs/bs_BA/main.lang @@ -141,6 +141,7 @@ Cancel=Cancel Modify=Modify Edit=Edit Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Save SaveAs=Save As @@ -158,6 +159,7 @@ Search=Search SearchOf=Search Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Now Date=Date +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=From %s to %s DateFrom=From %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang index 34792ae1eb2..8efafa5e94e 100644 --- a/htdocs/langs/bs_BA/orders.lang +++ b/htdocs/langs/bs_BA/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Validated StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderToBill2=To bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang index 88991888183..08747ea884b 100644 --- a/htdocs/langs/bs_BA/other.lang +++ b/htdocs/langs/bs_BA/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/bs_BA/productbatch.lang +++ b/htdocs/langs/bs_BA/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang index 6aa77416467..b0ee1036827 100644 --- a/htdocs/langs/bs_BA/products.lang +++ b/htdocs/langs/bs_BA/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang index a6b5764ef40..7f9d2c4415e 100644 --- a/htdocs/langs/bs_BA/projects.lang +++ b/htdocs/langs/bs_BA/projects.lang @@ -8,8 +8,10 @@ SharedProject=Zajednički projekti PrivateProject=Kontakti za projekte MyProjectsDesc=Ovaj pregled je limitiran na projekte u kojima ste stavljeni kao kontakt (bilo koji tip). ProjectsPublicDesc=Ovaj pregled predstavlja sve projekte koje možete čitati. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Ovaj pregled predstavlja sve projekte (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve). MyTasksDesc=Ovaj pregled predstavlja sve projekte ili zadatke za koje ste kontakt (bilo koji tip). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete čitati. TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve). ProjectsArea=Područje za projekte @@ -29,6 +31,8 @@ NoProject=Nema definisanog ili vlastitog projekta NbOpenTasks=Broj otvorenih zadataka NbOfProjects=Broj projekata TimeSpent=Vrijeme provedeno +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Vrijeme provedeno RefTask=Ref. zadatka LabelTask=Oznaka zadatka @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista narudžbi dobavljača u vezi s projekt ListSupplierInvoicesAssociatedProject=Lista faktura dobavljača u vezi s projektom ListContractAssociatedProject=Lista ugovora u vezi s projektom ListFichinterAssociatedProject=Lista intervencija u vezi s projektom -ListTripAssociatedProject=Lista putovanja i troškove u vezi s projektom +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Lista događaja u vezi s projektom ActivityOnProjectThisWeek=Aktivnost na projektu ove sedmice ActivityOnProjectThisMonth=Aktivnost na projektu ovog mjeseca @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/bs_BA/salaries.lang b/htdocs/langs/bs_BA/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/bs_BA/salaries.lang +++ b/htdocs/langs/bs_BA/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang index b8deefe7ae6..0324d02b664 100644 --- a/htdocs/langs/bs_BA/sendings.lang +++ b/htdocs/langs/bs_BA/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Naručena količina QtyShipped=Poslana količina QtyToShip=Količina za slanje QtyReceived=Primljena količina -KeepToShip=Zadržati za slanje +KeepToShip=Remain to ship OtherSendingsForSameOrder=Druge pošiljke za ovu narudžbu DateSending=Datum slanja narudžbe DateSendingShort=Datum slanja narudžbe diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang index 40a7deebee2..14059aefcc0 100644 --- a/htdocs/langs/bs_BA/stocks.lang +++ b/htdocs/langs/bs_BA/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Ponderirana/vagana aritmetička sredina - PAS PMPValueShort=PAS EnhancedValueOfWarehouses=Skladišna vrijednost UserWarehouseAutoCreate=Kreiraj skladište automatski prilikom kreiranja korisnika +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Otpremljena količina QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Skladište %s će biti korišteno za smanjenje WarehouseForStockIncrease=Skladište %s će biti korišteno za povećanje zalihe ForThisWarehouse=Za ovo skladište ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=Ovo je lista svih otvorenih narudžbi dobavljača +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Nadopune NbOfProductBeforePeriod=Količina proizvoda %s u zalihi prije odabranog perioda (%s) NbOfProductAfterPeriod=Količina proizvoda %s u zalihi poslije odabranog perioda (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang index ecab4e95a06..2a329c91d10 100644 --- a/htdocs/langs/bs_BA/suppliers.lang +++ b/htdocs/langs/bs_BA/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Dobavljači -Supplier=Dobavljač AddSupplier=Create a supplier SupplierRemoved=Dobavljač uklonjen SuppliersInvoice=Faktura dobavljača @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Fakture i plačanja dobavljača ExportDataset_fournisseur_3=Narudžbe za dobavljača i tekst narudžbe ApproveThisOrder=Odobri ovu narudžbu ConfirmApproveThisOrder=Jeste li sigurni da želite da odobriti narudžbu %s ? -DenyingThisOrder=Odbijanje ove narudžbe +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Jeste li sigurni da želite odbiti narudžbu %s ? ConfirmCancelThisOrder=Jeste li sigurni da želite poništiti narudžbu %s ? AddCustomerOrder=Kreiraj narudžbu za kupca diff --git a/htdocs/langs/bs_BA/trips.lang b/htdocs/langs/bs_BA/trips.lang index 3129380dd57..282500cf778 100644 --- a/htdocs/langs/bs_BA/trips.lang +++ b/htdocs/langs/bs_BA/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Putovanje -Trips=Putovanja -TripsAndExpenses=Putovanja i troškovi -TripsAndExpensesStatistics=Statistika putovanja i troškova -TripCard=Kartica putovanja -AddTrip=Dodaj putovanje -ListOfTrips=Lista putovanja +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Lista naknada -NewTrip=Novo putovanje +NewTrip=New expense report CompanyVisited=Posjeta kompaniji/fondaciji Kilometers=Kilometri FeesKilometersOrAmout=Iznos ili kilometri -DeleteTrip=Obriši putovanje -ConfirmDeleteTrip=Jeste li sigurni da želite obrisati ovo putovanje? -TF_OTHER=Ostalo -TF_LUNCH=Ručak -TF_TRIP=Putovanje -ListTripsAndExpenses=Lista putovanja i troškova -ExpensesArea=Područje za putovanja i troškove -SearchATripAndExpense=Traži putovanja i troškove +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Ostalo +TF_TRANSPORTATION=Transportation +TF_LUNCH=Ručak +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang index 6f9c00f04a3..239694fc251 100644 --- a/htdocs/langs/ca_ES/admin.lang +++ b/htdocs/langs/ca_ES/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=Desenvolupament VersionUnknown=Desconeguda VersionRecommanded=Recomanada +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Sesió ID SessionSaveHandler=Modalitat de salvaguardat de sessions SessionSavePath=Localització salvaguardat de sessions @@ -493,10 +498,16 @@ Module600Name=Notificacions Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donacions Module700Desc=Gestió de donacions +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Interface amb el sistema de seguiment d'incidències Mantis Module1400Name=Comptabilitat experta Module1400Desc=Gestió experta de la comptabilitat (doble partida) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categories Module1780Desc=Gestió de categories (productes, proveïdors i clients) Module2000Name=Editor WYSIWYG @@ -631,7 +642,7 @@ Permission181=Consultar comandes a proveïdors Permission182=Crear/modificar comandes a proveïdors Permission183=Validar comandes a proveïdors Permission184=Aprovar comandes a proveïdors -Permission185=Enviar comandes a proveïdors +Permission185=Order or cancel supplier orders Permission186=Rebre comandes de proveïdors Permission187=Tancar comandes a proveïdors Permission188=Anul·lar comandes a proveïdors @@ -711,6 +722,13 @@ Permission538=Exportar serveis Permission701=Consultar donacions Permission702=Crear/modificar donacions Permission703=Eliminar donacions +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Consultar stocks Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Contrasenya del servidor proxy DefineHereComplementaryAttributes=Definiu aquí la llista d'atributs addicionals, no disponibles a estàndard, i que vol gestionar per %s. ExtraFields=Atributs addicionals ExtraFieldsLines=atributs complementaris (línies) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Atributs adicionals (tercers) ExtraFieldsContacts=Atributs adicionals (contactes/adreçes) ExtraFieldsMember=Atributs complementaris (membres) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Una línia de producte/servei que té una quantitat nu FreeLegalTextOnProposal=Text lliure en pressupostos WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Configuració del mòdul comandes OrdersNumberingModules=Mòduls de numeració de les comandes @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Codis de barra tipus UPC BarcodeDescISBN=Codis de barra tipus ISBN BarcodeDescC39=Codis de barra tipus C39 BarcodeDescC128=Codis de barra tipus C128 -GenbarcodeLocation=Eina generació codi de barra en línia de comanda (utilitzat pel motor phpbar per a determinats tipus de codis barra) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Motor intern BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa) CashDeskBankAccountForCheque= Compte per defecte a utilitzar per als cobraments amb xecs CashDeskBankAccountForCB= Compte per defecte a utilitzar per als cobraments amb targeta de crèdit -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Configuració del mòdul Bookmark @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang index 16057026a04..c329a4a3eb4 100644 --- a/htdocs/langs/ca_ES/banks.lang +++ b/htdocs/langs/ca_ES/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Conciliació RIB=Compte bancari IBAN=Identificador IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=Identificador BIC/SWIFT +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Domiciliacions StandingOrder=Domiciliació Withdrawals=Reintegraments @@ -148,7 +152,7 @@ BackToAccount=Tornar al compte ShowAllAccounts=Mostra per a tots els comptes FutureTransaction=Transacció futura. No és possible conciliar. SelectChequeTransactionAndGenerate=Seleccioneu/filtreu els xecs a incloure a la remesa i feu clic a "Crear". -InputReceiptNumber=Indiqui l'extracte bancari relacionat amb la conciliació. Utilitzeu un valor numèric ordenable (per exemple, AAAAMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventualment, indiqui una categoria en la qual classificar els registres ToConciliate=A conciliar? ThenCheckLinesAndConciliate=A continuació, comproveu les línies presents en l'extracte bancari i feu clic diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang index 6ffbd0077e7..92ceb20f492 100644 --- a/htdocs/langs/ca_ES/commercial.lang +++ b/htdocs/langs/ca_ES/commercial.lang @@ -9,9 +9,9 @@ Prospect=Client potencial Prospects=Clients potencials DeleteAction=Eliminar un esdeveniment NewAction=Nou esdeveniment -AddAction=Crear esdeveniment -AddAnAction=Crear un esdeveniment -AddActionRendezVous=Crear una cita +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Cita ConfirmDeleteAction=Esteu segur de voler eliminar aquest esdeveniment? CardAction=Fitxa esdeveniment @@ -44,8 +44,8 @@ DoneActions=Llista d'esdeveniments realitzats DoneActionsFor=Llista d'esdeveniments realitzats per %s ToDoActions=Llista d'esdevenimentss incomplets ToDoActionsFor=Llista d'esdeveniments incomplets %s -SendPropalRef=Enviament del pressupost %s -SendOrderRef=Enviament de la comanda %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=No aplicable StatusActionToDo=A realitzar StatusActionDone=Realitzat @@ -62,7 +62,7 @@ LastProspectContactDone=Clients potencials contactats DateActionPlanned=Data planificació DateActionDone=Data realització ActionAskedBy=Acció registrada per -ActionAffectedTo=Acció assignada a +ActionAffectedTo=Event assigned to ActionDoneBy=Acció realitzada per ActionUserAsk=Registrada per ErrorStatusCantBeZeroIfStarted=Si el camp 'Data de realització' conté dades l'acció està en curs, per la qual cosa el camp 'Estat' no pot ser 0%%. diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang index be202d8b593..8859f44f388 100644 --- a/htdocs/langs/ca_ES/contracts.lang +++ b/htdocs/langs/ca_ES/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expirat ServiceStatusClosed=Tancat ServicesLegend=Llegenda per als serveis Contracts=Contractes +ContractsAndLine=Contracts and line of contracts Contract=Contracte NoContracts=Sense contractes MenuServices=Serveis diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang index 87e0a50c732..eb350eaaaa9 100644 --- a/htdocs/langs/ca_ES/cron.lang +++ b/htdocs/langs/ca_ES/cron.lang @@ -84,3 +84,4 @@ CronType_command=Comando Shell CronMenu=Cron CronCannotLoadClass=impossible carregar la classe %s de l'objecte %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang index 05e776b9cc9..927b9a3af1e 100644 --- a/htdocs/langs/ca_ES/errors.lang +++ b/htdocs/langs/ca_ES/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=El compte origen i destinació han de ser diferen ErrorBadThirdPartyName=Nom de tercer incorrecte ErrorProdIdIsMandatory=El %s es obligatori ErrorBadCustomerCodeSyntax=La sintaxi del codi client és incorrecta -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Codi client obligatori ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Codi de client ja utilitzat @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript ha d'estar activat per a que aquesta opc ErrorPasswordsMustMatch=Les 2 contrasenyes indicades s'han de correspondre ErrorContactEMail=S'ha produït un error tècnic. Contacti amb l'administrador al e-mail %s, indicant el codi d'error %s en el seu missatge, o pot també adjuntar una còpia de pantalla d'aquesta pàgina. ErrorWrongValueForField=Valor incorrecte per al camp número %s (el valor '%s' no compleix amb la regla %s) -ErrorFieldValueNotIn=Valor incorrecte per al camp nombre %s (el valor '%s' no es un valor en el camp %s de la taula %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Valor incorrecte per al camp nombre %s (el valor '%s' no és una referència existent en %s) ErrorsOnXLines=Errors a %s línies font ErrorFileIsInfectedWithAVirus=L'antivirus no ha pogut validar aquest arxiu (és probable que estigui infectat per un virus)! @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang index 125805b6194..4b0bf7265e7 100644 --- a/htdocs/langs/ca_ES/install.lang +++ b/htdocs/langs/ca_ES/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Últim pas: Indiqueu aquí el compte i la contrase ActivateModule=Activació del mòdul %s ShowEditTechnicalParameters=Premi aquí per veure/editar els paràmetres tècnics (mode expert) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index 6ea2c963f3f..80bf6b6e547 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -141,6 +141,7 @@ Cancel=Anul·lar Modify=Modificar Edit=Editar Validate=Validar +ValidateAndApprove=Validate and Approve ToValidate=A validar Save=Gravar SaveAs=Gravar com @@ -158,6 +159,7 @@ Search=Cercar SearchOf=Cerca de Valid=Validar Approve=Aprovar +Disapprove=Disapprove ReOpen=Reobrir Upload=Enviar arxiu ToLink=Link @@ -219,6 +221,7 @@ Cards=Fitxes Card=Fitxa Now=Ara Date=Data +DateAndHour=Date and hour DateStart=Data inici DateEnd=Data fi DateCreation=Data de creació @@ -295,6 +298,7 @@ UnitPriceHT=Preu base UnitPriceTTC=Preu unitari total PriceU=P.U. PriceUHT=P.U. +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=P.U. Total Amount=Import AmountInvoice=Import factura @@ -521,6 +525,7 @@ DateFromTo=De %s a %s DateFrom=A partir de %s DateUntil=Fins %s Check=Verificar +Uncheck=Uncheck Internal=Intern External=Extern Internals=Interns @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Dilluns Tuesday=Dimarts diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang index 7cfa908d372..2749007c0ce 100644 --- a/htdocs/langs/ca_ES/orders.lang +++ b/htdocs/langs/ca_ES/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Anul-lada StatusOrderDraft=Esborrany (a validar) StatusOrderValidated=Validada StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processada StatusOrderToBill=Emès StatusOrderToBill2=A facturar @@ -58,6 +59,7 @@ MenuOrdersToBill=Comandes a facturar MenuOrdersToBill2=Billable orders SearchOrder=Cercar una comanda SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Enviar producte Discount=Descompte CreateOrder=Crear comanda diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang index ae25227403d..316704111fa 100644 --- a/htdocs/langs/ca_ES/other.lang +++ b/htdocs/langs/ca_ES/other.lang @@ -54,12 +54,13 @@ MaxSize=Tamany màxim AttachANewFile=Adjuntar nou arxiu/document LinkedObject=Objecte adjuntat Miscellaneous=Diversos -NbOfActiveNotifications=Número notificacions +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Això és un correu de prova.\nLes 2 línies estan separades per un retorn de carro a la línia. PredefinedMailTestHtml=Això és un e-mail de prova (la paraula prova ha d'estar en negreta).
Les 2 línies estan separades per un retorn de carro en la línia PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/ca_ES/productbatch.lang +++ b/htdocs/langs/ca_ES/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang index a99396d34ba..5c3a7e7b2d1 100644 --- a/htdocs/langs/ca_ES/products.lang +++ b/htdocs/langs/ca_ES/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang index dbdb9564f25..694c1c3a732 100644 --- a/htdocs/langs/ca_ES/projects.lang +++ b/htdocs/langs/ca_ES/projects.lang @@ -8,8 +8,10 @@ SharedProject=Projecte compartit PrivateProject=Contactes del projecte MyProjectsDesc=Aquesta vista projecte es limita als projectes en què vostè és un contacte afectat (qualsevol tipus). ProjectsPublicDesc=Aquesta vista mostra tots els projectes en els que vostè té dret a tenir visibilitat. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Aquesta vista mostra tots els projectes (les seves autoritzacions li ofereixen una visió completa). MyTasksDesc=Aquesta vista es limita als projectes i tasques en què vostè és un contacte afectat en almenys una tasca (qualsevol tipus). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat. TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritzacions li ofereixen una visió completa). ProjectsArea=Àrea projectes @@ -29,6 +31,8 @@ NoProject=Cap projecte definit NbOpenTasks=Nº Tasques obertes NbOfProjects=Nº de projectes TimeSpent=Temps dedicat +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Temps dedicats RefTask=Ref. tasca LabelTask=Etiqueta tasca @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Llistat de comandes a proveïdors associades ListSupplierInvoicesAssociatedProject=Llistat de factures de proveïdor associades al projecte ListContractAssociatedProject=Llistatde contractes associats al projecte ListFichinterAssociatedProject=Llistat d'intervencions associades al projecte -ListTripAssociatedProject=Llistat notes d'honoraris associades al projecte +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Llista d'esdeveniments associats al projecte ActivityOnProjectThisWeek=Activitat en el projecte aquesta setmana ActivityOnProjectThisMonth=Activitat en el projecte aquest mes @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang index edca71a1829..6c4a42fa77f 100644 --- a/htdocs/langs/ca_ES/salaries.lang +++ b/htdocs/langs/ca_ES/salaries.lang @@ -1,8 +1,13 @@ # Dolibarr language file - Source file is en_US - users -Salary=Salary -Salaries=Salaries -Employee=Employee -NewSalaryPayment=New salary payment -SalaryPayment=Salary payment -SalariesPayments=Salaries payments -ShowSalaryPayment=Show salary payment +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge +Salary=Sou +Salaries=Sous +Employee=Empleat +NewSalaryPayment=Nou pagament de sous +SalaryPayment=Pagament de sous +SalariesPayments=Pagaments de sous +ShowSalaryPayment=Veure pagament de sous +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang index 81357c77fa4..21562f914cc 100644 --- a/htdocs/langs/ca_ES/sendings.lang +++ b/htdocs/langs/ca_ES/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qt. demanada QtyShipped=Qt. enviada QtyToShip=Qt. a enviar QtyReceived=Qt. rebuda -KeepToShip=Quede per enviar +KeepToShip=Remain to ship OtherSendingsForSameOrder=Altres enviaments d'aquesta comanda DateSending=Data d'expedició DateSendingShort=Data d'expedició diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang index 0c918bae6d8..4b3f823d589 100644 --- a/htdocs/langs/ca_ES/stocks.lang +++ b/htdocs/langs/ca_ES/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Valor (PMP) PMPValueShort=PMP EnhancedValueOfWarehouses=Valor d'estocs UserWarehouseAutoCreate=Crea automàticament existències/magatzem propi de l'usuari en la creació de l'usuari +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantitat desglossada QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang index df79e34d4e4..d0b6422c8e8 100644 --- a/htdocs/langs/ca_ES/suppliers.lang +++ b/htdocs/langs/ca_ES/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Proveïdors -Supplier=Proveïdor AddSupplier=Create a supplier SupplierRemoved=Proveïdor eliminat SuppliersInvoice=Factura proveïdor @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Factures proveïdors i pagaments ExportDataset_fournisseur_3=Comandes de proveïdors i línies de comanda ApproveThisOrder=Aprovar aquesta comanda ConfirmApproveThisOrder=Esteu segur de voler aprovar la comanda a proveïdor %s? -DenyingThisOrder=Denegar aquesta comanda +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Esteu segur de voler denegar la comanda a proveïdor %s? ConfirmCancelThisOrder=Esteu segur de voler cancel·lar la comanda a proveïdor %s? AddCustomerOrder=Crear comanda de client diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang index 74f7e7cdb55..7999889e678 100644 --- a/htdocs/langs/ca_ES/trips.lang +++ b/htdocs/langs/ca_ES/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Desplaçament -Trips=Desplaçaments -TripsAndExpenses=Honoraris -TripsAndExpensesStatistics=Estadístiques honoraris -TripCard=Fitxa honorari -AddTrip=Crear honorari -ListOfTrips=Llistat de honorari +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Llistat notes de honoraris -NewTrip=Nou honorari +NewTrip=New expense report CompanyVisited=Empresa/institució visitada Kilometers=Quilòmetres FeesKilometersOrAmout=Import o quilòmetres -DeleteTrip=Eliminar honorari -ConfirmDeleteTrip=Esteu segur de voler eliminar aquest honorari? -TF_OTHER=Altre -TF_LUNCH=Dieta -TF_TRIP=Viatge -ListTripsAndExpenses=Llistat notes de honoraris -ExpensesArea=Àrea Notes d'honoraris -SearchATripAndExpense=Cercar un honorari +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Altre +TF_TRANSPORTATION=Transportation +TF_LUNCH=Dieta +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang index cb3fb8c8ca3..e857b9ee394 100644 --- a/htdocs/langs/cs_CZ/admin.lang +++ b/htdocs/langs/cs_CZ/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimentální VersionDevelopment=Vývoj VersionUnknown=Neznámý VersionRecommanded=Doporučené +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID relace SessionSaveHandler=Manipulátor uložených relací SessionSavePath=Místo uložení relace @@ -493,10 +498,16 @@ Module600Name=Upozornění Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Dary Module700Desc=Darování řízení +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integrace Module1400Name=Účetnictví Module1400Desc=Vedení účetnictví (dvojité strany) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategorie Module1780Desc=Category management (produkty, dodavatelé a odběratelé) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Přečtěte si dodavatelských objednávek Permission182=Vytvořit / upravit dodavatelské objednávky Permission183=Ověřit dodavatelských objednávek Permission184=Schválit dodavatelských objednávek -Permission185=Objednávky Objednat dodavatel +Permission185=Order or cancel supplier orders Permission186=Příjem objednávek s dodavately Permission187=Zavřít dodavatelské objednávky Permission188=Zrušit dodavatelských objednávek @@ -711,6 +722,13 @@ Permission538=Export služeb Permission701=Přečtěte si dary Permission702=Vytvořit / upravit dary Permission703=Odstranit dary +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Přečtěte si zásoby Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Heslo používat proxy server DefineHereComplementaryAttributes=Definujte zde všechny atributy, které ještě nejsou k dispozici ve výchozím nastavení, a že chcete být podporovány %s. ExtraFields=Doplňkové atributy ExtraFieldsLines=Doplňkové atributy (linky) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Doplňkové atributy (thirdparty) ExtraFieldsContacts=Doplňkové atributy (kontakt / adresa) ExtraFieldsMember=Doplňkové atributy (člen) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Řada výrobků / služeb s nulové hodnoty je považo FreeLegalTextOnProposal=Volný text o obchodních návrhů WatermarkOnDraftProposal=Vodoznak na předloh návrhů komerčních (none-li prázdný) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Objednat řízení nastavení OrdersNumberingModules=Objednávky číslování modelů @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Čárových kódů typu UPC BarcodeDescISBN=Čárový kód typu ISBN BarcodeDescC39=Čárový kód typu C39 BarcodeDescC128=Čárový kód typu C128 -GenbarcodeLocation=Bar generování kódu nástroj pro příkazovou řádku (používaný motorem s vnitřním u některých typů čárových kódů) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Vnitřní motor BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Výchozí účet použít pro příjem plateb v hotovosti CashDeskBankAccountForCheque= Výchozí účet použít pro příjem plateb šekem CashDeskBankAccountForCB= Výchozí účet použít pro příjem plateb prostřednictvím kreditní karty -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Záložka Nastavení modulu @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang index 8c43ba341c4..67ff3cf6011 100644 --- a/htdocs/langs/cs_CZ/banks.lang +++ b/htdocs/langs/cs_CZ/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Smíření RIB=Číslo bankovního účtu IBAN=IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT číslo +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Trvalé příkazy StandingOrder=Trvalý příkaz Withdrawals=Výběry @@ -148,7 +152,7 @@ BackToAccount=Zpět na účtu ShowAllAccounts=Zobrazit pro všechny účty FutureTransaction=Transakce v Futur. Žádný způsob, jak se smířit. SelectChequeTransactionAndGenerate=Výběr / filtr, aby kontroly zahrnovaly do obdržení šeku vkladů a klikněte na "Vytvořit". -InputReceiptNumber=Vyberte si výpis z účtu související s dohodovacím řízení. Použijte Sortable číselnou hodnotu (například RRRRMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Nakonec určit kategorii, ve které chcete klasifikovat záznamy ToConciliate=Smířit? ThenCheckLinesAndConciliate=Poté zkontrolujte, zda řádky, které jsou ve výpisu z účtu a klepněte na tlačítko diff --git a/htdocs/langs/cs_CZ/commercial.lang b/htdocs/langs/cs_CZ/commercial.lang index ab71b01387d..7886122e124 100644 --- a/htdocs/langs/cs_CZ/commercial.lang +++ b/htdocs/langs/cs_CZ/commercial.lang @@ -9,9 +9,9 @@ Prospect=Vyhlídka Prospects=Vyhlídky DeleteAction=Odstranit událost / úkol NewAction=Nová událost / úkol -AddAction=Přidat událost / úkol -AddAnAction=Přidat událost / úkol -AddActionRendezVous=Přidat Rendez-vous události +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Schůzka ConfirmDeleteAction=Jste si jisti, že chcete smazat tuto událost / úkol? CardAction=Událost karty @@ -44,8 +44,8 @@ DoneActions=Dokončené akce DoneActionsFor=Dokončené akce pro %s ToDoActions=Neúplné události ToDoActionsFor=Neúplné akce pro %s -SendPropalRef=Poslat komerční návrhu %s -SendOrderRef=Pošli objednávku %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Nevztahuje se StatusActionToDo=Chcete-li StatusActionDone=Dokončit @@ -62,7 +62,7 @@ LastProspectContactDone=Spojit se provádí DateActionPlanned=Datum Akce plánované na DateActionDone=Datum Akce provedeno ActionAskedBy=Akce hlášeny -ActionAffectedTo=Událost přiřazena +ActionAffectedTo=Event assigned to ActionDoneBy=Událost provádí ActionUserAsk=Zpracoval ErrorStatusCantBeZeroIfStarted=Pokud pole 'Datum udělat "je naplněn, je akce zahájena (nebo dokončený), tak pole" Stav "nemůže být 0%%. diff --git a/htdocs/langs/cs_CZ/contracts.lang b/htdocs/langs/cs_CZ/contracts.lang index 792ed511937..40188328aae 100644 --- a/htdocs/langs/cs_CZ/contracts.lang +++ b/htdocs/langs/cs_CZ/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Vypršela ServiceStatusClosed=Zavřeno ServicesLegend=Služby legenda Contracts=Smlouvy +ContractsAndLine=Contracts and line of contracts Contract=Smlouva NoContracts=Žádné smlouvy MenuServices=Služby diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang index 05ed1384123..83947327da5 100644 --- a/htdocs/langs/cs_CZ/cron.lang +++ b/htdocs/langs/cs_CZ/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell příkaz CronMenu=Cron CronCannotLoadClass=Nelze načíst třídu nebo objekt %s %s UseMenuModuleToolsToAddCronJobs=Jděte do menu "Home - Moduly nářadí - Seznam úloh" vidět a upravovat naplánované úlohy. +TaskDisabled=Task disabled diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang index 6a09500f020..d2570c905ce 100644 --- a/htdocs/langs/cs_CZ/errors.lang +++ b/htdocs/langs/cs_CZ/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Zdrojové a cílové bankovní účty musí být ErrorBadThirdPartyName=Nesprávná hodnota pro třetí strany jménem ErrorProdIdIsMandatory=%s je povinné ErrorBadCustomerCodeSyntax=Bad syntaxe pro zákazníka kódu -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Zákazník požadoval kód ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Zákaznický kód již používán @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript musí být vypnuta, že tato funkce prac ErrorPasswordsMustMatch=Oba napsaný hesla se musí shodovat se navzájem ErrorContactEMail=Technické chybě. Prosím, obraťte se na správce, aby e-mailovou %s en poskytovat %s kód chyby ve zprávě, nebo ještě lépe přidáním obrazovky kopii této stránky. ErrorWrongValueForField=Chybná hodnota %s číslo pole (hodnota "%s 'neodpovídá regex pravidel %s) -ErrorFieldValueNotIn=Chybná hodnota %s číslo pole (hodnota "%s 'není dostupná hodnota do pole %s stolních %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Chybná hodnota %s číslo pole (hodnota "%s" není %s stávající ref) ErrorsOnXLines=Chyby na %s zdrojovém záznamu (s) ErrorFileIsInfectedWithAVirus=Antivirový program nebyl schopen ověřit soubor (soubor může být napaden virem) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny diff --git a/htdocs/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang index 4855a8f234c..7967e44f0b2 100644 --- a/htdocs/langs/cs_CZ/install.lang +++ b/htdocs/langs/cs_CZ/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Poslední krok: Definujte zde přihlašovací jmé ActivateModule=Aktivace modulu %s ShowEditTechnicalParameters=Klikněte zde pro zobrazení / editaci pokročilých parametrů (pro experty) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang index b3c285cdbae..17e4c56569f 100644 --- a/htdocs/langs/cs_CZ/main.lang +++ b/htdocs/langs/cs_CZ/main.lang @@ -141,6 +141,7 @@ Cancel=Zrušit Modify=Upravit Edit=Upravit Validate=Potvrdit +ValidateAndApprove=Validate and Approve ToValidate=Chcete-li ověřit Save=Uložit SaveAs=Uložit jako @@ -158,6 +159,7 @@ Search=Vyhledávání SearchOf=Vyhledávání Valid=Platný Approve=Schvalovat +Disapprove=Disapprove ReOpen=Znovu otevřít Upload=Odeslat soubor ToLink=Link @@ -219,6 +221,7 @@ Cards=Karty Card=Karta Now=Nyní Date=Datum +DateAndHour=Date and hour DateStart=Datum začátku DateEnd=Datum ukončení DateCreation=Datum vytvoření @@ -295,6 +298,7 @@ UnitPriceHT=Jednotková cena (bez DPH) UnitPriceTTC=Jednotková cena PriceU=UP PriceUHT=UP (bez DPH) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=UP Amount=Množství AmountInvoice=Fakturovaná částka @@ -521,6 +525,7 @@ DateFromTo=Od %s na %s DateFrom=Od %s DateUntil=Do %s Check=Kontrola +Uncheck=Uncheck Internal=Vnitřní External=Externí Internals=Vnitřní @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Pondělí Tuesday=Úterý diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang index 67d948e78b3..6aa596baa1b 100644 --- a/htdocs/langs/cs_CZ/orders.lang +++ b/htdocs/langs/cs_CZ/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Zrušený StatusOrderDraft=Návrh (musí být ověřena) StatusOrderValidated=Ověřené StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Zpracované StatusOrderToBill=Dodává se StatusOrderToBill2=K účtu @@ -58,6 +59,7 @@ MenuOrdersToBill=Objednávky dodáno MenuOrdersToBill2=Billable orders SearchOrder=Hledat účelem SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Loď produkt Discount=Sleva CreateOrder=Vytvořit objednávku diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang index d2b3363bde1..f0e4b814a04 100644 --- a/htdocs/langs/cs_CZ/other.lang +++ b/htdocs/langs/cs_CZ/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximální rozměr AttachANewFile=Připojte nový soubor / dokument LinkedObject=Propojený objekt Miscellaneous=Smíšený -NbOfActiveNotifications=Počet oznámení +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Toto je test e-mailem. \\ NPokud dva řádky jsou odděleny znakem konce řádku. \n\n __ SIGNATURE__ PredefinedMailTestHtml=Toto je test-mail (slovo test musí být tučně).
Dva řádky jsou odděleny znakem konce řádku.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/cs_CZ/productbatch.lang +++ b/htdocs/langs/cs_CZ/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang index aa3dbd4fda9..7fc24c7a1a3 100644 --- a/htdocs/langs/cs_CZ/products.lang +++ b/htdocs/langs/cs_CZ/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang index b98531acef5..3e8b7a046b0 100644 --- a/htdocs/langs/cs_CZ/projects.lang +++ b/htdocs/langs/cs_CZ/projects.lang @@ -8,8 +8,10 @@ SharedProject=Všichni PrivateProject=Kontakty na projektu MyProjectsDesc=Tento pohled je omezen na projekty u kterých jste uveden jako kontakt (jakéhokoliv typu) ProjectsPublicDesc=Tento pohled zobrazuje všechny projekty které máte oprávnění číst. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Tento pohled zobrazuje všechny projekty (vaše uživatelské oprávnění vám umožňuje vidět vše). MyTasksDesc=Tento pohled je omezen na projekty či úkoly u kterých jste uveden jako kontakt (jakéhokoliv typu) +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Tento pohled zobrazuje všechny projekty a úkoly které máte oprávnění číst. TasksDesc=Tento pohled zobrazuje všechny projekty a úkoly (vaše uživatelské oprávnění vám umožňuje vidět vše). ProjectsArea=Projekty @@ -29,6 +31,8 @@ NoProject=Žádný projekt nedefinován či vlastněn NbOpenTasks=Počet otevřených úloh NbOfProjects=Počet projektů TimeSpent=Strávený čas +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Strávený čas RefTask=Číslo. úkolu LabelTask=Název úkolu @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Seznam dodavatelských objednávek souvisej ListSupplierInvoicesAssociatedProject=Seznam dodavatelských faktur související s projektem ListContractAssociatedProject=Seznam zakázek souvisejících s projektem ListFichinterAssociatedProject=Seznam zákroků spojených s projektem -ListTripAssociatedProject=Seznam cest a nákladů spojených s projektem +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Seznam událostí spojených s projektem ActivityOnProjectThisWeek=Týdenní projektová aktivita ActivityOnProjectThisMonth=Měsíční projektová aktivita @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/cs_CZ/salaries.lang b/htdocs/langs/cs_CZ/salaries.lang index edca71a1829..f9dbdb94b20 100644 --- a/htdocs/langs/cs_CZ/salaries.lang +++ b/htdocs/langs/cs_CZ/salaries.lang @@ -1,8 +1,13 @@ # Dolibarr language file - Source file is en_US - users -Salary=Salary -Salaries=Salaries -Employee=Employee -NewSalaryPayment=New salary payment -SalaryPayment=Salary payment -SalariesPayments=Salaries payments -ShowSalaryPayment=Show salary payment +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge +Salary=Mzda +Salaries=Mzdy +Employee=Zaměstnanec +NewSalaryPayment=Nová platba mzdy +SalaryPayment=Platba mzdy +SalariesPayments=Platby mezd +ShowSalaryPayment=Ukázat platbu mzdy +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang index 73b172c200e..f794bceaa84 100644 --- a/htdocs/langs/cs_CZ/sendings.lang +++ b/htdocs/langs/cs_CZ/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Množství objednat QtyShipped=Množství odesláno QtyToShip=Množství na loď QtyReceived=Množství přijaté -KeepToShip=Mějte na loď +KeepToShip=Remain to ship OtherSendingsForSameOrder=Další zásilky pro tuto objednávku DateSending=Datum odeslání, aby DateSendingShort=Datum odeslání, aby diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang index 57d76a0cdf7..451126fb054 100644 --- a/htdocs/langs/cs_CZ/stocks.lang +++ b/htdocs/langs/cs_CZ/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Vážená průměrná cena PMPValueShort=WAP EnhancedValueOfWarehouses=Sklady hodnota UserWarehouseAutoCreate=Vytvořte sklad automaticky při vytváření uživatele +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Množství odesláno QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Skladová %s budou použity pro snížení skla WarehouseForStockIncrease=Skladová %s budou použity pro zvýšení stavu zásob ForThisWarehouse=Z tohoto skladu ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=Toto je seznam všech otevřených dodavatelských objednávek +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Splátky NbOfProductBeforePeriod=Množství produktů %s na skladě, než zvolené období (<%s) NbOfProductAfterPeriod=Množství produktů %s na skladě po zvolené období (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang index 57bd9b70754..99a629ba847 100644 --- a/htdocs/langs/cs_CZ/suppliers.lang +++ b/htdocs/langs/cs_CZ/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Dodavatelé -Supplier=Dodavatel AddSupplier=Create a supplier SupplierRemoved=Dodavatel odstraní SuppliersInvoice=Dodavatelé faktura @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Dodavatel faktury a platby ExportDataset_fournisseur_3=Dodavatel objednávky a objednávka linky ApproveThisOrder=Schválit tuto objednávku ConfirmApproveThisOrder=Jste si jisti, že chcete schválit pořadí %s? -DenyingThisOrder=Popírat tuto objednávku +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Jste si jisti, že chcete popírat objednávky %s? ConfirmCancelThisOrder=Jste si jisti, že chcete zrušit tuto objednávku %s? AddCustomerOrder=Vytvoření objednávky zákazníka diff --git a/htdocs/langs/cs_CZ/trips.lang b/htdocs/langs/cs_CZ/trips.lang index 9de98944f52..faeac138096 100644 --- a/htdocs/langs/cs_CZ/trips.lang +++ b/htdocs/langs/cs_CZ/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Výlet -Trips=Výlety -TripsAndExpenses=Výlety a výdaje -TripsAndExpensesStatistics=Výlety a výdaje statistiky -TripCard=Výlet karty -AddTrip=Přidat výlet -ListOfTrips=Seznam cest +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Sazebník poplatků -NewTrip=Nová cesta +NewTrip=New expense report CompanyVisited=Firma / nadace navštívil Kilometers=Kilometry FeesKilometersOrAmout=Množství nebo kilometrů -DeleteTrip=Odstranit výlet -ConfirmDeleteTrip=Jste si jisti, že chcete smazat tuto cestu? -TF_OTHER=Ostatní -TF_LUNCH=Oběd -TF_TRIP=Výlet -ListTripsAndExpenses=Seznam cest a nákladů -ExpensesArea=Výlety a náklady oblast -SearchATripAndExpense=Hledat na výlet a náklady +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Ostatní +TF_TRANSPORTATION=Transportation +TF_LUNCH=Oběd +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang index 93e6a224b77..8cbc1e17779 100644 --- a/htdocs/langs/da_DK/admin.lang +++ b/htdocs/langs/da_DK/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Eksperimentel VersionDevelopment=Udvikling VersionUnknown=Ukendt VersionRecommanded=Anbefalet +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Session ID SessionSaveHandler=Handler for at gemme sessioner SessionSavePath=Storage session localization @@ -493,10 +498,16 @@ Module600Name=Adviséringer Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donationer Module700Desc=Gaver 'ledelse +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Regnskabsmæssig ekspert Module1400Desc=Regnskabsmæssig forvaltning for eksperter (dobbelt parterne) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategorier Module1780Desc=Kategorier 'forvaltning (produkter, leverandører og kunder) Module2000Name=FCKeditor @@ -631,7 +642,7 @@ Permission181=Læs leverandør ordrer Permission182=Opret / ændre leverandør ordrer Permission183=Valider leverandør ordrer Permission184=Godkend leverandør ordrer -Permission185=Bestil leverandør ordrer +Permission185=Order or cancel supplier orders Permission186=Modtag leverandør ordrer Permission187=Luk leverandør ordrer Permission188=Annuller leverandør ordrer @@ -711,6 +722,13 @@ Permission538=Eksport af tjenesteydelser Permission701=Læs donationer Permission702=Opret / ændre donationer Permission703=Slet donationer +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Læs bestande Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Adgangskode for at bruge proxyserveren DefineHereComplementaryAttributes=Definer her alle atributes, der ikke allerede findes som standard, og at du ønsker at blive understøttet for %s. ExtraFields=Supplerende egenskaber ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=En linje af produkt / service med et nul beløb anses FreeLegalTextOnProposal=Fri tekst på kommercielle forslag WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Ordrer «forvaltning setup OrdersNumberingModules=Ordrer nummerressourcer moduler @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode typeidentifikationsmærker UPC BarcodeDescISBN=Barcode typeidentifikationsmærker ISBN BarcodeDescC39=Barcode af type C39 BarcodeDescC128=Barcode af type C128 -GenbarcodeLocation=Stregkode generation kommando linje værktøj (der benyttes af phpbarcode motor for nogle stregkode typer) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Cash konto til brug for sælger CashDeskBankAccountForCheque= Konto til at bruge til at modtage betalinger med check CashDeskBankAccountForCB= Konto til at bruge til at modtage kontant betaling ved kreditkort -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bogmærkemodulet setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang index 11dfcb6ab7c..d66fa525a7b 100644 --- a/htdocs/langs/da_DK/banks.lang +++ b/htdocs/langs/da_DK/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Forsoning RIB=Bankkontonummer IBAN=IBAN-nummer +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT-nummer +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Stående ordrer StandingOrder=Stående ordre Withdrawals=Tilbagekøb @@ -148,7 +152,7 @@ BackToAccount=Tilbage til regnskab ShowAllAccounts=Vis for alle konti FutureTransaction=Transaktion i futur. Ingen måde at forene. SelectChequeTransactionAndGenerate=Vælg / filter, at kontrollen skal omfatte ind checken depositum modtaget og klikke på "Opret". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/da_DK/commercial.lang b/htdocs/langs/da_DK/commercial.lang index 97c040cbf8b..8a226198cad 100644 --- a/htdocs/langs/da_DK/commercial.lang +++ b/htdocs/langs/da_DK/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Perspektiver DeleteAction=Slet en foranstaltning / opgave NewAction=Ny action / opgave -AddAction=Tilføj action / opgave -AddAnAction=Tilføj en foranstaltning / opgave -AddActionRendezVous=Tilføj en Rendezvous opgave +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Er du sikker på du vil slette denne opgave? CardAction=Action-kortet @@ -44,8 +44,8 @@ DoneActions=Udfærdiget aktioner DoneActionsFor=Gøres tiltag for %s ToDoActions=Ufuldstændig aktioner ToDoActionsFor=Ufuldstændig aktioner for %s -SendPropalRef=Send kommercielle forslag %s -SendOrderRef=Send for %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Ikke relevant StatusActionToDo=At gøre StatusActionDone=Gjort @@ -62,7 +62,7 @@ LastProspectContactDone=Kontakt gjort DateActionPlanned=Dato aktion er planlagt til DateActionDone=Dato indsats gøres ActionAskedBy=Aktion spurgt af -ActionAffectedTo=Aktion påvirkes i +ActionAffectedTo=Event assigned to ActionDoneBy=Aktion gøres ved ActionUserAsk=Registreres af ErrorStatusCantBeZeroIfStarted=Hvis feltet 'Dato gjort «er fyldt handling er startet (eller afsluttet), så felt' Status' kan ikke være 0%%. diff --git a/htdocs/langs/da_DK/contracts.lang b/htdocs/langs/da_DK/contracts.lang index 73a7e126d9e..7c4327088bc 100644 --- a/htdocs/langs/da_DK/contracts.lang +++ b/htdocs/langs/da_DK/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Udløbet ServiceStatusClosed=Lukket ServicesLegend=Services legend Contracts=Kontrakter +ContractsAndLine=Contracts and line of contracts Contract=Kontrakt NoContracts=Nr. kontrakter MenuServices=Services diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang index cb5e21f817a..8ea7f4353fa 100644 --- a/htdocs/langs/da_DK/cron.lang +++ b/htdocs/langs/da_DK/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang index 9ad36372483..f69f42d1a6f 100644 --- a/htdocs/langs/da_DK/errors.lang +++ b/htdocs/langs/da_DK/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Kilde og mål bankkonti skal være anderledes. ErrorBadThirdPartyName=Bad værdi for tredjeparts navn ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntaks for kunde-kode -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Kunden kode kræves ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Kunden koden allerede anvendes @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript skal ikke være deaktiveret for at have ErrorPasswordsMustMatch=Begge har skrevet passwords skal matche hinanden ErrorContactEMail=En teknisk fejl opstod. Kontakt venligst administrator til at følge e-mail %s da give fejlkoder %s i din besked, eller endnu bedre ved at tilføje en skærm kopi af denne side. ErrorWrongValueForField=Forkert værdi for felt nummer %s (værdi '%s' passer ikke regex regel %s) -ErrorFieldValueNotIn=Forkert værdi for feltnummer %s (value "%s" er ikke en værdi, der i felt %s af tabel %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Forkert værdi for feltnummer %s (værdien '%s' er ikke en %s eksisterende ref) ErrorsOnXLines=Fejl på %s kildelinjer ErrorFileIsInfectedWithAVirus=Det antivirusprogram var ikke i stand til at validere filen (filen kan være inficeret med en virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang index 443877735a9..d265352dc80 100644 --- a/htdocs/langs/da_DK/install.lang +++ b/htdocs/langs/da_DK/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Sidste trin: Definer her login og adgangskode, du ActivateModule=Aktiver modul %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang index 6ce6c3fe051..91070a4d2ce 100644 --- a/htdocs/langs/da_DK/main.lang +++ b/htdocs/langs/da_DK/main.lang @@ -141,6 +141,7 @@ Cancel=Annuller Modify=Modify Edit=Redigér Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=At validere Save=Gemme SaveAs=Gem som @@ -158,6 +159,7 @@ Search=Søgning SearchOf=Søg Valid=Gyldig Approve=Godkend +Disapprove=Disapprove ReOpen=Re-Open Upload=Send fil ToLink=Link @@ -219,6 +221,7 @@ Cards=Postkort Card=Kort Now=Nu Date=Dato +DateAndHour=Date and hour DateStart=Dato start DateEnd=Dato udgangen DateCreation=Lavet dato @@ -295,6 +298,7 @@ UnitPriceHT=Enhedspris (netto) UnitPriceTTC=Enhedspris PriceU=UP PriceUHT=UP (netto) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=UP Amount=Mængde AmountInvoice=Fakturabeløbet @@ -521,6 +525,7 @@ DateFromTo=Fra %s til %s DateFrom=Fra %s DateUntil=Indtil %s Check=Kontrollere +Uncheck=Uncheck Internal=Intern External=Eksterne Internals=Intern @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Mandag Tuesday=Tirsdag diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang index e85107b54f0..c5cb6c9dc56 100644 --- a/htdocs/langs/da_DK/orders.lang +++ b/htdocs/langs/da_DK/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Annulleret StatusOrderDraft=Udkast (skal valideres) StatusOrderValidated=Valideret StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Forarbejdede StatusOrderToBill=Til lovforslag StatusOrderToBill2=Til lovforslag @@ -58,6 +59,7 @@ MenuOrdersToBill=Ordrer til lovforslag MenuOrdersToBill2=Billable orders SearchOrder=Search for SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Skib produkt Discount=Discount CreateOrder=Opret Order diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang index 3195ac89360..ec7a5a1fc9f 100644 --- a/htdocs/langs/da_DK/other.lang +++ b/htdocs/langs/da_DK/other.lang @@ -54,12 +54,13 @@ MaxSize=Maksimumstørrelse AttachANewFile=Vedhæfte en ny fil / dokument LinkedObject=Forbundet objekt Miscellaneous=Miscellaneous -NbOfActiveNotifications=Antal anmeldelser +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Dette er en test mail. \\ NDen to linjer er adskilt af et linjeskift. PredefinedMailTestHtml=Dette er en test mail (ordet test skal være i fed).
De to linjer er adskilt af et linjeskift. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/da_DK/productbatch.lang +++ b/htdocs/langs/da_DK/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang index ecd03ef5957..e66913ef4fc 100644 --- a/htdocs/langs/da_DK/products.lang +++ b/htdocs/langs/da_DK/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang index 88c5210f23c..a72024e975f 100644 --- a/htdocs/langs/da_DK/projects.lang +++ b/htdocs/langs/da_DK/projects.lang @@ -8,8 +8,10 @@ SharedProject=Fælles projekt PrivateProject=Kontakter af projektet MyProjectsDesc=Dette synspunkt er begrænset til projekter, du er en kontaktperson for (hvad der er den type). ProjectsPublicDesc=Dette synspunkt præsenterer alle projekter du får lov til at læse. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Dette synspunkt præsenterer alle projekter (din brugertilladelser give dig tilladelse til at se alt). MyTasksDesc=Dette synspunkt er begrænset til projekter eller opgaver, du er en kontaktperson for (hvad der er den type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Dette synspunkt præsenterer alle projekter og opgaver, som du får lov til at læse. TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertilladelser give dig tilladelse til at se alt). ProjectsArea=Projekter område @@ -29,6 +31,8 @@ NoProject=Nr. projektet defineret NbOpenTasks=Nb af åbnet opgaver NbOfProjects=Nb af projekter TimeSpent=Tid brugt +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Tid brugt RefTask=Ref. opgave LabelTask=Label opgave @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Liste over leverandører ordrer forbundet me ListSupplierInvoicesAssociatedProject=Liste over leverandører fakturaer forbundet med projektet ListContractAssociatedProject=Liste over kontrakter i forbindelse med projektet ListFichinterAssociatedProject=Liste over interventioner i forbindelse med projektet -ListTripAssociatedProject=Liste over rejser og udgifter forbundet med projektet +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Liste over aktioner i forbindelse med projektet ActivityOnProjectThisWeek=Aktivitet på projektet i denne uge ActivityOnProjectThisMonth=Aktivitet på projektet i denne måned @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/da_DK/salaries.lang b/htdocs/langs/da_DK/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/da_DK/salaries.lang +++ b/htdocs/langs/da_DK/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang index a52622bda7c..0b1d722f494 100644 --- a/htdocs/langs/da_DK/sendings.lang +++ b/htdocs/langs/da_DK/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qty bestilt QtyShipped=Qty afsendt QtyToShip=Qty til skibet QtyReceived=Antal modtagne -KeepToShip=Hold til skib +KeepToShip=Remain to ship OtherSendingsForSameOrder=Andre sendings for denne ordre DateSending=Dato for afsendelse orden DateSendingShort=Dato for afsendelse orden diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang index acb10492f90..19b708156b7 100644 --- a/htdocs/langs/da_DK/stocks.lang +++ b/htdocs/langs/da_DK/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Værdi PMPValueShort=WAP EnhancedValueOfWarehouses=Lager værdi UserWarehouseAutoCreate=Opret en bestand automatisk, når du opretter en bruger +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Afsendte mængde QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang index 2d7dbf35ee6..aae6a4917a0 100644 --- a/htdocs/langs/da_DK/suppliers.lang +++ b/htdocs/langs/da_DK/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Leverandører -Supplier=Leverandør AddSupplier=Create a supplier SupplierRemoved=Leverandør fjernet SuppliersInvoice=Leverandører faktura @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Leverandør fakturaer og betalinger ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Godkende denne ordre ConfirmApproveThisOrder=Er du sikker på at du vil godkende denne ordre? -DenyingThisOrder=Benægte denne ordre +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Er du sikker på at du vil benægte denne ordre? ConfirmCancelThisOrder=Er du sikker på du vil annullere denne ordre? AddCustomerOrder=Opret kunde for diff --git a/htdocs/langs/da_DK/trips.lang b/htdocs/langs/da_DK/trips.lang index e4f3690f70d..561a88dfc8a 100644 --- a/htdocs/langs/da_DK/trips.lang +++ b/htdocs/langs/da_DK/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Tur -Trips=Trips -TripsAndExpenses=Udflugter og udgifter -TripsAndExpensesStatistics=Udflugter og udgifter statistik -TripCard=Trip kortet -AddTrip=Tilføj tur -ListOfTrips=Liste over ture +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Liste over gebyrer -NewTrip=Ny tur +NewTrip=New expense report CompanyVisited=Company / fundament besøgte Kilometers=Kilometer FeesKilometersOrAmout=Beløb eller kilometer -DeleteTrip=Slet tur -ConfirmDeleteTrip=Er du sikker på du vil slette denne tur? -TF_OTHER=Anden -TF_LUNCH=Frokost -TF_TRIP=Tur -ListTripsAndExpenses=Liste over ture og omkostninger -ExpensesArea=Udflugter og udgifter området -SearchATripAndExpense=Søg en tur og regning +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Anden +TF_TRANSPORTATION=Transportation +TF_LUNCH=Frokost +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/de_AT/agenda.lang b/htdocs/langs/de_AT/agenda.lang index e0268220e08..76a87c87644 100644 --- a/htdocs/langs/de_AT/agenda.lang +++ b/htdocs/langs/de_AT/agenda.lang @@ -2,4 +2,3 @@ ViewList=Liste anzeigen ViewCal=Kalender anzeigen OrderValidatedInDolibarr=Bestellung freigegeben -InterventionValidatedInDolibarr=Eingriff %s freigegeben diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang index be59b18d3a5..ebda6905a62 100644 --- a/htdocs/langs/de_AT/main.lang +++ b/htdocs/langs/de_AT/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/MM/yy FormatDateShortJQueryInput=dd/MM/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y @@ -25,7 +26,6 @@ ErrorFailedToSendMail=Fehler beim Senden des Mails (Absender=%s, Empfänger=%s) ErrorAttachedFilesDisabled=Die Dateianhangsfunktion ist auf diesem Server deaktiviert ErrorInternalErrorDetected=Interner Fehler entdeckt ErrorDuplicateField=Dieser Wert muß einzigartig sein -ErrorOnlyPngJpgSupported=Bitte wählen Sie eine Datei im .jpg- oder .png-Dateiformat. LevelOfFeature=Funktions-Level PreviousConnexion=Vorherige Verbindung RequestLastAccessInError=Anfrage des letzten Datenbankzugriffs mit Fehler @@ -63,7 +63,6 @@ Receive=Erhalte ThisLimitIsDefinedInSetup=Gesetzte System-Limits (Menü Home-Einstellungen-Sicherheit): %s Kb, PHP Limit: %s Kb UnHidePassword=Passwort-Zeichen anzeigen ListOfFiles=Dateiliste -FreeZone=Freier Text CloneMainAttributes=Duplikat mit den Haupteigenschaften AttributeCode=Attribut-Code OptionalFieldsSetup=Optionale Felder einrichten diff --git a/htdocs/langs/de_AT/projects.lang b/htdocs/langs/de_AT/projects.lang index 8b665ac1dd6..a480ec09913 100644 --- a/htdocs/langs/de_AT/projects.lang +++ b/htdocs/langs/de_AT/projects.lang @@ -11,7 +11,6 @@ NoProject=Kein Projekt definiert RefTask=Aufgaben Nr. MyActivities=Meine Tätigkeiten ListFichinterAssociatedProject=Liste der mit diesem Projekt verknüpften Eingriffe -ListTripAssociatedProject=Liste der mit diesem Projekt verknüpften Reise- und Fahrtspesen CloseAProject=Schließe Projekt ReOpenAProject=Öffne Projekt DoNotShowMyTasksOnly=Zeige auch die Aufgaben Anderer diff --git a/htdocs/langs/de_AT/withdrawals.lang b/htdocs/langs/de_AT/withdrawals.lang index c5ae4da1f5f..93ca575035d 100644 --- a/htdocs/langs/de_AT/withdrawals.lang +++ b/htdocs/langs/de_AT/withdrawals.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - withdrawals LastWithdrawalReceipt=%s neuste Abbuchungsbelege -InvoiceRefused=Ablehnung in Rechnung stellen WithdrawalRefused=Abbuchungen abgelehnt +InvoiceRefused=Ablehnung in Rechnung stellen StatusWaiting=Wartestellung StatusMotif2=Abbuchung angefochten StatusMotif4=Ablehnung durch Kontoinhaber diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang index 26cd766b83e..70564679d5f 100644 --- a/htdocs/langs/de_CH/companies.lang +++ b/htdocs/langs/de_CH/companies.lang @@ -1,11 +1 @@ # Dolibarr language file - Source file is en_US - companies -JuridicalStatus600=Einzelfirma -JuridicalStatus601=Einfache Gesellschaft -JuridicalStatus602=Kollektivgesellschaft -JuridicalStatus603=Kommanditgesellschaft -JuridicalStatus604=Aktiengesellschaft (AG) -JuridicalStatus605=Kommanditaktiengesellschaft -JuridicalStatus606=Gesellschaft mit beschränkter Haftung (GmbH) -JuridicalStatus607=Genossenschaft -JuridicalStatus608=Verein -JuridicalStatus609=Stiftung \ No newline at end of file diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang index adbf494c99e..6a5173b676f 100644 --- a/htdocs/langs/de_CH/main.lang +++ b/htdocs/langs/de_CH/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/MM/yy FormatDateShortJQueryInput=dd/MM/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y @@ -17,4 +18,4 @@ FormatDateText=%d %B %Y FormatDateHourShort=%d/%m/%Y %H:%M FormatDateHourSecShort=%d/%m/%Y %H:%M:%S FormatDateHourTextShort=%d %b %Y %H:%M -FormatDateHourText=%d %B %Y %H:%M \ No newline at end of file +FormatDateHourText=%d %B %Y %H:%M diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang index 68f2ac30cb8..45611a61a57 100644 --- a/htdocs/langs/de_DE/admin.lang +++ b/htdocs/langs/de_DE/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimentell VersionDevelopment=Entwicklung VersionUnknown=Unbekannt VersionRecommanded=Empfohlene +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Sitzungs ID SessionSaveHandler=Handler für Sitzungsspeicherung SessionSavePath=Pfad für Sitzungsdatenspeicherung @@ -493,10 +498,16 @@ Module600Name=Benachrichtigungen Module600Desc=Senden Sie Benachrichtigungen zu einigen Dolibarr-Events per E-Mail an Partner (wird pro Partner definiert) Module700Name=Spenden Module700Desc=Spendenverwaltung +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis-Integation Module1400Name=Buchhaltung Module1400Desc=Buchhaltung für Experten (doppelte Buchhaltung) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategorien Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden) Module2000Name=FCKeditor @@ -631,7 +642,7 @@ Permission181=Lieferantenbestellungen einsehen Permission182=Lieferantenbestellungen erstellen/bearbeiten Permission183=Lieferantenbestellungen freigeben Permission184=Lieferantenbestellungen bestätigen -Permission185=Lieferantenbestellungen übermitteln +Permission185=Order or cancel supplier orders Permission186=Lieferantenbestellungen empfangen Permission187=Lieferantenbestellungen schließen Permission188=Lieferantenbestellungen verwerfen @@ -711,6 +722,13 @@ Permission538=Leistungen exportieren Permission701=Spenden einsehen Permission702=Spenden erstellen/bearbeiten Permission703=Spenden löschen +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Warenbestände einsehen Permission1002=Warenlager erstellen/ändern Permission1003=Warenlager löschen @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Kennwort ein, um den Proxy-Server verwenden DefineHereComplementaryAttributes=Definieren Sie hier allen Attributen, nicht bereits standardmäßig vorhanden, und dass Sie für %s unterstützt werden. ExtraFields=Ergänzende Attribute ExtraFieldsLines=Ergänzende Attribute (Zeilen) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Ergänzende Attribute (Partner) ExtraFieldsContacts=Ergänzende Attribute (Kontakt) ExtraFieldsMember=Ergänzende Attribute (Mitglied) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Produkt-/Servicezeilen mit Nullmenge zulässig FreeLegalTextOnProposal=Freier Rechtstext für Angebote WatermarkOnDraftProposal=Wasserzeichen auf Angebotsentwürfen (keins, falls leer) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Bestellverwaltungseinstellungen OrdersNumberingModules=Bestellnumerierungs-Module @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode vom Typ UPC BarcodeDescISBN=Barcode vom Typ ISBN BarcodeDescC39=Barcode vom Typ C39 BarcodeDescC128=Barcode vom Typ C128 -GenbarcodeLocation=Kommandozeilen-Tool zur Barcode-Generierung (von phpbarcode-Engine verwendet) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=interne Engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Standardpartner für Kassenverkäufe CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich) CashDeskBankAccountForCheque= Finanzkonto für Scheckeinlösungen CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Lager für Entnahmen festlegen und und erzwingen StockDecreaseForPointOfSaleDisabled=Verringerung des Lagerbastandes durch Point of Sale deaktivert +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Lesezeichenmoduleinstellungen @@ -1569,3 +1597,7 @@ SortOrder=Sortierreihenfolge Format=Format TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kunden- als auch Lieferanten-Zahlungs-Typ IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang index 262f9f52281..b70c2cecc29 100644 --- a/htdocs/langs/de_DE/banks.lang +++ b/htdocs/langs/de_DE/banks.lang @@ -33,7 +33,11 @@ AllTime=Vom start Reconciliation=Zahlungsabgleich RIB=Kontonummer IBAN=IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT Code +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Daueraufträge StandingOrder=Dauerauftrag Withdrawals=Entnahmen @@ -148,7 +152,7 @@ BackToAccount=Zurück zum Konto ShowAllAccounts=Alle Finanzkonten FutureTransaction=Zukünftige Transaktionen. SelectChequeTransactionAndGenerate=Schecks auswählen/filtern um Sie in den Einzahlungsbeleg zu integrieren und auf "Erstellen" klicken. -InputReceiptNumber=Wählen Sie den zugehörigen Buchungssatz zum Konsolidieren. Verwenden Sie einen numerischen Ausdruck (z.B. YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Wenn möglich Kategorie angeben, worin die Daten eingeordnet werden ToConciliate=Konsolidieren? ThenCheckLinesAndConciliate=Dann die Zeilen im Bankauszug prüfen und Klicken diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang index 955f35f8118..5805c602b95 100644 --- a/htdocs/langs/de_DE/commercial.lang +++ b/htdocs/langs/de_DE/commercial.lang @@ -9,8 +9,8 @@ Prospect=Lead Prospects=Leads DeleteAction=Maßnahme / Aufgabe löschen NewAction=Neue Maßnahme / Aufgabe -AddAction=Maßnahme / Aufgabe hinzufügen -AddAnAction=Hinzufügen einer Maßnahme / Aufgabe +AddAction=Maßnahme/Aufgabe erstellen +AddAnAction=Maßnahme/Aufgabe erstellen AddActionRendezVous=Treffen anlegen Rendez-Vous=Treffen ConfirmDeleteAction=Möchten Sie diese Aufgabe wirklich löschen? @@ -62,7 +62,7 @@ LastProspectContactDone=Kontaktaufnahme erledigt DateActionPlanned=Geplantes Erledigungsdatum DateActionDone=Echtes Erledigungsdatum ActionAskedBy=Maßnahme erbeten von -ActionAffectedTo=Maßnahme gehört +ActionAffectedTo=Event assigned to ActionDoneBy=Maßnahme erledigt von ActionUserAsk=Aufgenommen durch ErrorStatusCantBeZeroIfStarted=Ist das Feld 'Echtes Erledigungsdatum' ausgefüllt, so wurde die Aktion bereits gestartet (oder beendet) und der 'Status' kann nicht 0%% sein. diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang index 0027d817391..9cb31dac046 100644 --- a/htdocs/langs/de_DE/contracts.lang +++ b/htdocs/langs/de_DE/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Abgelaufen ServiceStatusClosed=Geschlossen ServicesLegend=Services Legende Contracts=Verträge +ContractsAndLine=Contracts and line of contracts Contract=Vertrag NoContracts=Keine Verträge MenuServices=Services diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang index 2f20a1b93ad..77060539e1b 100644 --- a/htdocs/langs/de_DE/cron.lang +++ b/htdocs/langs/de_DE/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell-Befehl CronMenu=Cron CronCannotLoadClass=Kann Klasse %s oder Object %s nicht laden UseMenuModuleToolsToAddCronJobs=Rufe Menu "Home - Modules tools - Job Liste" auf um geplante Aufgaben zu sehen und zu verändern. +TaskDisabled=Task disabled diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang index 09a01fc63e9..a78fe0da64a 100644 --- a/htdocs/langs/de_DE/errors.lang +++ b/htdocs/langs/de_DE/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Quell- und Zielbankkonto müssen unterschiedlich ErrorBadThirdPartyName=Der für den Partner eingegebene Name ist ungültig. ErrorProdIdIsMandatory=Die %s ist zwingend notwendig ErrorBadCustomerCodeSyntax=Die eingegebene Kundennummer ist unzulässig. -ErrorBadBarCodeSyntax=Falsche Syntax für Barcode +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Kunden Nr. erforderlich ErrorBarCodeRequired=Barcode erforderlich ErrorCustomerCodeAlreadyUsed=Diese Kunden-Nr. ist bereits vergeben. @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Diese Funktion erfordert aktiviertes JavaScript. Ak ErrorPasswordsMustMatch=Die eingegebenen Passwörter müssen identisch sein. ErrorContactEMail=Ein technischer Fehler ist aufgetreten. Bitte kontaktieren Sie Ihren Administrator unter der folgenden E-Mail-Adresse %s und fügen Sie den Fehlercode %s in Ihrer Nachricht ein, oder (noch besser) fügen Sie einen Screenshot dieser Seite als Anhang bei. ErrorWrongValueForField=Falscher Wert für Feld Nr. %s (Wert '%s' passt nicht zur Regex-Regel %s) -ErrorFieldValueNotIn=Nicht korrekter Wert für das Feld-Nummer %s (Wert: '%s' ist kein verfügbarer Wert im Feld %s der Tabelle %s +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Falscher Wert für Feldnummer %s (für den Wert '%s' besteht keine %s Referenz) ErrorsOnXLines=Fehler in %s Quellzeilen ErrorFileIsInfectedWithAVirus=Der Virenschutz konnte diese Datei nicht freigeben (eventuell ist diese mit einem Virus infiziert) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Interner Fehler '%s' ErrorPriceExpressionUnknown=Unbekannter Fehler '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang index b1f421536af..323979fb31f 100644 --- a/htdocs/langs/de_DE/install.lang +++ b/htdocs/langs/de_DE/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Letzter Schritt: Legen Sie Ihr Logo und das Passwo ActivateModule=Aktivieren von Modul %s ShowEditTechnicalParameters=Hier klicken um erweiterte Funktionen zu zeigen/bearbeiten (Expertenmodus) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang index c8256ebde92..3f51e500253 100644 --- a/htdocs/langs/de_DE/main.lang +++ b/htdocs/langs/de_DE/main.lang @@ -141,6 +141,7 @@ Cancel=Abbrechen Modify=Ändern Edit=Bearbeiten Validate=Freigeben +ValidateAndApprove=Validate and Approve ToValidate=Freizugeben Save=Speichern SaveAs=Speichern unter @@ -158,6 +159,7 @@ Search=Suchen SearchOf=Suche nach Valid=Gültig Approve=Genehmigen +Disapprove=Disapprove ReOpen=Wiedereröffnen Upload=Datei laden ToLink=Link @@ -219,6 +221,7 @@ Cards=Karten Card=Karte Now=Jetzt Date=Datum +DateAndHour=Date and hour DateStart=Beginndatum DateEnd=Enddatum DateCreation=Erstellungsdatum @@ -295,6 +298,7 @@ UnitPriceHT=Stückpreis (netto) UnitPriceTTC=Stückpreis (brutto) PriceU=VP PriceUHT=VP (netto) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=VP (brutto) Amount=Betrag AmountInvoice=Rechnungsbetrag @@ -521,6 +525,7 @@ DateFromTo=Von %s bis %s DateFrom=Von %s DateUntil=Bis %s Check=Prüfen +Uncheck=Uncheck Internal=Intern External=Extern Internals=Interne @@ -688,6 +693,7 @@ PublicUrl=Öffentliche URL AddBox=Box zufügen SelectElementAndClickRefresh=Wählen Sie ein Element und clicken Sie Aktualisieren PrintFile=Drucke Datei %s +ShowTransaction=Show transaction # Week day Monday=Montag Tuesday=Dienstag diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang index 18c9300a562..afddbf7e1b7 100644 --- a/htdocs/langs/de_DE/orders.lang +++ b/htdocs/langs/de_DE/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Storniert StatusOrderDraft=Entwurf (freizugeben) StatusOrderValidated=Freigegeben StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Bearbeitet StatusOrderToBill=Zu verrechnen StatusOrderToBill2=Zu verrechnen @@ -58,6 +59,7 @@ MenuOrdersToBill=Bestellverrechnung MenuOrdersToBill2=Billable orders SearchOrder=Suche Bestellung SearchACustomerOrder=Kundenauftrag suchen +SearchASupplierOrder=Search a supplier order ShipProduct=Produkt versenden Discount=Rabatt CreateOrder=Erzeuge Bestellung diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang index 99ba2d2cf4c..4b2f4a52bea 100644 --- a/htdocs/langs/de_DE/other.lang +++ b/htdocs/langs/de_DE/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximalgröße AttachANewFile=Neue Datei/Dokument anhängen LinkedObject=Verknüpftes Objekt Miscellaneous=Verschiedenes -NbOfActiveNotifications=Anzahl aktiver Benachrichtigungen +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Dies ist ein Test-Mail.\n Die beiden Zeilen sind durch eine Zeilenschaltung getrennt. PredefinedMailTestHtml=Dies ist ein (HTML)-Test Mail (das Wort Test muss in Fettschrift erscheinen).
Die beiden Zeilen sollteb durch eine Zeilenschaltung getrennt sein. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Bedauerlicherweise scheint die Rechnung __FACREF__ bislang unbeglichen. Als Erinnerung übersenden wir Ihnen diese nochmals im Anhang.\n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang unser Angebot __PROPREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__ diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang index 3e196897569..4ec2f570e7c 100644 --- a/htdocs/langs/de_DE/productbatch.lang +++ b/htdocs/langs/de_DE/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Charge/Seriennr l_eatby=Verzehren-bis-Datum l_sellby=Verkaufen-bis-Datum DetailBatchNumber=Chargen-/Seriennummern-Details -DetailBatchFormat=Charge/Seriennr: %s - E: %s - S: %s (Menge: %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Charge: %s printEatby=Verzehren bis: %s printSellby=Verkaufen bis: %s diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang index 91044e017bb..8816eff2614 100644 --- a/htdocs/langs/de_DE/products.lang +++ b/htdocs/langs/de_DE/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Nummer +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang index b11cd6db0c4..fbbc111f0f7 100644 --- a/htdocs/langs/de_DE/projects.lang +++ b/htdocs/langs/de_DE/projects.lang @@ -8,8 +8,10 @@ SharedProject=Jeder PrivateProject=Kontakte zum Projekt MyProjectsDesc=Hier können Sie nur die Projekte einsehen, bei welchen Sie als Kontakt hinzugefügt sind. ProjectsPublicDesc=Ihnen werden alle Projekte angezeigt bei welchen Sie über Leserechte verfügen. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Es werden alle Projekte angezeigt (Ihre Benutzerberechtigungen berechtigt Sie alles zu sehen). MyTasksDesc=Diese Ansicht ist für Sie beschränkt auf Projekte oder Aufgaben bei welchen Sie als Ansprechpartner eingetragen sind. +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen. TasksDesc=Diese Ansicht zeigt alle Projekte und Aufgaben (Ihre Benutzerberechtigungen berechtigt Sie alles zu sehen). ProjectsArea=Projektübersicht @@ -29,6 +31,8 @@ NoProject=Kein Projekt definiert oder keine Rechte NbOpenTasks=Anzahl der offenen Aufgaben NbOfProjects=Anzahl der Projekte TimeSpent=Zeitaufwand +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Zeitaufwände RefTask=Aufgaben-Nr. LabelTask=Aufgabenbezeichnung @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Liste der mit diesem Projekt verbundenen Lie ListSupplierInvoicesAssociatedProject=Liste der mit diesem Projekt verbundenen Lieferantenrechnungen ListContractAssociatedProject=Liste der mit diesem Projekt verbundenen Verträge ListFichinterAssociatedProject=Liste der mit diesem Projekt verknüpften Services -ListTripAssociatedProject=Liste der mit diesem Projekt verknüpften Reisekosten +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Liste der mit diesem Projekt verknüpften Maßnahmen ActivityOnProjectThisWeek=Projektaktivitäten dieser Woche ActivityOnProjectThisMonth=Projektaktivitäten dieses Monats @@ -133,3 +137,6 @@ SearchAProject=Suchen Sie ein Projekt ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden ProjectDraft=Projekt-Entwürfe FirstAddRessourceToAllocateTime=Eine Ressource zuordnen, um Zeit festzulegen +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang index b1477807c4e..5e72aae4e86 100644 --- a/htdocs/langs/de_DE/salaries.lang +++ b/htdocs/langs/de_DE/salaries.lang @@ -10,3 +10,4 @@ SalariesPayments=Lohnzahlungen ShowSalaryPayment=Zeige Lohnzahlung THM=Durchschnittlicher Stundenpreis TJM=Durchschnittlicher Tagespreis +CurrentSalary=Current salary diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang index cfb2af7ca1a..93da292748d 100644 --- a/htdocs/langs/de_DE/sendings.lang +++ b/htdocs/langs/de_DE/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Bestellmenge QtyShipped=Liefermenge QtyToShip=Versandmenge QtyReceived=Erhaltene Menge -KeepToShip=Für Versand behalten +KeepToShip=Remain to ship OtherSendingsForSameOrder=Weitere Sendungen zu dieser Bestellung DateSending=Datum des Versands DateSendingShort=Versanddatum diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang index 69b59baded0..d560920f048 100644 --- a/htdocs/langs/de_DE/stocks.lang +++ b/htdocs/langs/de_DE/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Gewichteter Warenwert PMPValueShort=DSWP EnhancedValueOfWarehouses=Lagerwert UserWarehouseAutoCreate=Beim Anlegen eines Benutzers automatisch neues Warenlager erstellen +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Menge QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Das Lager %s wird für Entnahme verwendet WarehouseForStockIncrease=Das Lager %s wird für Wareneingang verwendet ForThisWarehouse=Für dieses Lager ReplenishmentStatusDesc=Dies ist eine Liste aller Produkte, deren Lagerbestand unter dem Sollbestand liegt (bzw. unter der Alarmschwelle, wenn die Auswahlbox "Nur Alarm" gewählt ist) , die Ihnen Vorschläge für Lieferantenbestellungen liefert, um die Differenzen auszugleichen. -ReplenishmentOrdersDesc=Dies ist die Liste aller offenen Lieferantenbestellungen +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Nachschub NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s) NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang index 4dcff3f39f8..58f83d6a3d5 100644 --- a/htdocs/langs/de_DE/suppliers.lang +++ b/htdocs/langs/de_DE/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Lieferanten -Supplier=Lieferant AddSupplier=Lieferant anlegen SupplierRemoved=Lieferant entfernt SuppliersInvoice=Lieferantenrechnung @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Lieferantenrechnungen und Zahlungen ExportDataset_fournisseur_3=Lieferantenbestellungen und Auftragszeilen ApproveThisOrder=Bestellung bestätigen ConfirmApproveThisOrder=Möchten Sie diese Bestellung wirklich bestätigen %s ? -DenyingThisOrder=Bestellung ablehnen +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Möchten Sie diese Bestellung wirklich ablehnen %s ? ConfirmCancelThisOrder=Möchten Sie diese Bestellung wirklich verwerfen %s ? AddCustomerOrder=Erzeuge Kundenbestellung diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang index a4dabc3ce01..2ea6735cd00 100644 --- a/htdocs/langs/de_DE/trips.lang +++ b/htdocs/langs/de_DE/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Reise -Trips=Reisen -TripsAndExpenses=Reise- und Fahrtspesen -TripsAndExpensesStatistics=Reise- und Spesenstatistiken -TripCard=Reise-Karte -AddTrip=Reise hinzufügen -ListOfTrips=Liste der Reisen +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Liste der Spesen -NewTrip=Neue Reise +NewTrip=New expense report CompanyVisited=Besuchter Partner Kilometers=Kilometerstand FeesKilometersOrAmout=Kilometergeld oder Spesenbetrag -DeleteTrip=Reise löschen -ConfirmDeleteTrip=Möchten Sie diese Reise wirklich löschen? +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report +ClassifyRefunded=Als 'rückerstattet' markieren +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line TF_OTHER=Andere +TF_TRANSPORTATION=Transportation TF_LUNCH=Essen -TF_TRIP=Reise -ListTripsAndExpenses=Liste der Reisen und Spesen -ExpensesArea=Spesenübersicht -SearchATripAndExpense=Suchen nach einer Reise oder Aufwänden -ClassifyRefunded=Classify 'Refunded' +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang index f706cfa457c..d8f7036b628 100644 --- a/htdocs/langs/el_GR/admin.lang +++ b/htdocs/langs/el_GR/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Πειραματική VersionDevelopment=Υπό ανάπτυξη VersionUnknown=Άγνωστη VersionRecommanded=Προτεινόμενη +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID Συνόδου SessionSaveHandler=Φορέας χειρισμού αποθήκευσης συνεδριών SessionSavePath=Αποθήκευση τοπικής προσαρμογής συνεδρίας @@ -128,8 +133,8 @@ PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds) ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds) DaylingSavingTime=Η θερινή ώρα (χρήστη) CurrentHour=PHP server hour -CompanyTZ=Time Zone company (main company) -CompanyHour=Hour company (main company) +CompanyTZ=Ζώνη ώρας εταιρείας (κύρια εταιρεία) +CompanyHour=Ώρα εταιρείας (κύρια εταιρεία) CurrentSessionTimeOut=Χρονικό όριο περιόδου λειτουργίας τρέχουσας συνοδού YouCanEditPHPTZ=Για να ορίσετε μια διαφορετική ζώνη ώρας της PHP (δεν απαιτείται), μπορείτε να δοκιμάσετε να προσθέσετε ένα αρχείο .htacces με μια γραμμή σαν αυτό "TZ setenv Europe / Paris" OSEnv=Περιβάλλον OS @@ -201,186 +206,186 @@ No=Όχι AutoDetectLang=Αυτόματη Ανίχνευση (γλώσσα φυλλομετρητή) FeatureDisabledInDemo=Δυνατότητα απενεργοποίησης στο demo Rights=Δικαιώματα -BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. -OnlyActiveElementsAreShown=Only elements from enabled modules are shown. -ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature. -ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services. -ModulesSpecialDesc=Special modules are very specific or seldom used modules. -ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for a particular business. -ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... +BoxesDesc=Τα κουτιά είναι κομμάτια της επιφάνειας εργασίας που δείχνουν πληροφορίες σε κάποιες σελίδες. Μπορείτε να επιλέξετε ανάμεσα στην εμφάνιση του κουτιού ή όχι, απλά επιλέγοντας την σελίδα στόχο και κάνοντας κλικ στο 'Ενεργοποίηση', ή κάνοντας κλικ στο εικονίδιο κάδου για να το απενεργοποιήσετε. +OnlyActiveElementsAreShown=Μόνο στοιχεία από ενεργοποιημένα modules προβάλλονται. +ModulesDesc=Τα modules του Dolibarr ελέγχουν ποιες λειτουργίες είναι ενεργοποιημένες στο λογισμικό. Κάποια modules απαιτούν δικαιώματα που πρέπει να παρέχετε στους χρήστες, μετά την ενεργοποίηση του module. Κάντε κλικ στο κουμπί on/off στην στήλη "Κατάσταση" για να ενεργοποίησετε ένα module ή μια λειτουργία. +ModulesInterfaceDesc=Η διεπαφή των modules του Dolibarr σας επιτρέπει να προσθέσετε λειτουργίες που στηρίζονται σε εξωτερικό λογισμικό, συστήματα ή υπηρεσίες. +ModulesSpecialDesc=Τα ειδικά modules είναι για πολύ συγκεκριμένες ή σπάνιες χρήσεις. +ModulesJobDesc=Τα Business modules παρέχουν απλές προρυθμισμένες εγκαταστάσεις του Dolibarr για συγκεκριμένους τύπους επιχειρήσεων. +ModulesMarketPlaceDesc=Μπορείτε να βρείτε περισσότερα modules για να κατεβάσετε σε εξωτερικά web sites στο Internet... ModulesMarketPlaces=Περισσότερα Αρθρώματα... -DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliStoreDesc=Το DoliStore, είναι η επίσημη περιοχή για να βρείτε εξωτερικά modules για το Dolibarr ERP/CRM DoliPartnersDesc=Λίστα με ορισμένες εταιρείες που μπορούν να προσφέρουν έρευνα/ανάπτυξη κατά παραγγελία modules ή χαρακτηριστικά (Σημείωση: κάθε εταιρεία Open Source που γνωρίζει γλώσσα PHP μπορεί να σας δώσει συγκεκριμένη ανάπτυξη) -WebSiteDesc=Web site providers you can search to find more modules... -URL=Ιστοσελίδα +WebSiteDesc=Ιστοσελίδες στις οποίες μπορείτε να βρείτε περισσότερα modules... +URL=Σύνδεσμος BoxesAvailable=Διαθέσιμα Πλαίσια BoxesActivated=Ενεργά Πλαίσια -ActivateOn=Activate on -ActiveOn=Activated on +ActivateOn=Ενεργοποιήστε στις +ActiveOn=Ενεργοποιήθηκε στις SourceFile=Πηγαίο αρχείο -AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled -AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled -AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled +AutomaticIfJavascriptDisabled=Αυτόματα αν είναι απενεργοποιημένο το Javascript +AvailableOnlyIfJavascriptNotDisabled=Διαθέσιμο μόνο αν το JavaScript δεν είναι απενεργοποιημένο +AvailableOnlyIfJavascriptAndAjaxNotDisabled=Διαθέσιμο μόνο αν το JavaScript δεν είναι απενεργοποιημένο Required=Υποχρεωτικό UsedOnlyWithTypeOption=Χρησιμοποιείται μόνο από κάποια επιλογή της ατζέντας Security=Ασφάλεια Passwords=Συνθηματικά -DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) -MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended) -InstrucToEncodePass=To have password encoded into the conf.php file, replace the line
$dolibarr_main_db_pass="..."
by
$dolibarr_main_db_pass="crypted:%s" -InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line
$dolibarr_main_db_pass="crypted:..."
by
$dolibarr_main_db_pass="%s" -ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation) -ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices). +DoNotStoreClearPassword=Μην αποθηκεύετε αποκρυπτογραφημένους κωδικούς στην βάση δεδομένων, αλλά να αποθηκεύετε μόνο η κρυπτογραφημένη τιμή (προτείνεται να είναι ενεργό) +MainDbPasswordFileConfEncrypted=Ο κωδικός της βάσης δεδομένων να είναι κρυπτογραφημένος στο conf.php (προτείνεται να είναι ενεργό) +InstrucToEncodePass=Για να κρυπτογραφήσετε τον κωδικό στο αρχείο conf.php, αντικαταστήστε την γραμμή
$dolibarr_main_db_pass="..."
με το
$dolibarr_main_db_pass="crypted:%s" +InstrucToClearPass=Για να αφήσετε τον κωδικό χωρίς κρυπτογράφηση στο αρχείο conf.php , αντικαταστήστε τη γραμμή
$dolibarr_main_db_pass="crypted:..."
με το
$dolibarr_main_db_pass="%s" +ProtectAndEncryptPdfFiles=Προστασία παραγόμενων αρχείων pdf (Η ενεργοποίηση ΔΕΝ προτείνεται, χαλάει την μαζική δημιουργία pdf) +ProtectAndEncryptPdfFilesDesc=Η ασφάλεια ενός αρχείου PDF επιτρέπει τα προγράμματα ανάγνωσης PDF να το ανοίξουν και να το εκτυπώσουν. Παρ' ΄όλα αυτά, η τροποποίηση και η αντιγραφή δεν θα είναι πλέον δυνατά. Σημειώστε πως αν χρησιμοποιήσετε αυτή την λειτουργία δεν θα μπορούν να δουλέψουν ομαδικά pdf (όπως απλήρωτα τιμολόγια). Feature=Δυνατότητα DolibarrLicense=Άδεια χρήσης DolibarrProjectLeader=Αρχηγός Έργου -Developpers=Developers/contributors -OtherDeveloppers=Other developers/contributors -OfficialWebSite=Dolibarr international official web site -OfficialWebSiteFr=French official web site -OfficialWiki=Dolibarr documentation on Wiki -OfficialDemo=Dolibarr online demo -OfficialMarketPlace=Official market place for external modules/addons +Developpers=Προγραμματιστές/συνεργάτες +OtherDeveloppers=Άλλοι προγραμματιστές/συνεργάτες +OfficialWebSite=Επίσημη ιστοσελίδα Dolibarr international +OfficialWebSiteFr=Επίσημη Γαλλική ιστοσελίδα +OfficialWiki=Τεκμηρίωση Dolibarr στο Wiki +OfficialDemo=Δοκιμαστική έκδοση Dolibarr +OfficialMarketPlace=Επίσημη ιστοσελίδα για εξωτερικά modules/πρόσθετα OfficialWebHostingService=Υπηρεσίες που αναφέρονται για web hosting (Cloud hosting) ReferencedPreferredPartners=Preferred Partners OtherResources=Άλλοι πόροι -ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),
take a look at the Dolibarr Wiki:
%s -ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:
%s -HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr. -HelpCenterDesc2=Some part of this service are available in english only. -CurrentTopMenuHandler=Current top menu handler -CurrentLeftMenuHandler=Current left menu handler -CurrentMenuHandler=Current menu handler -CurrentSmartphoneMenuHandler=Current smartphone menu handler +ForDocumentationSeeWiki=Για την τεκμηρίωση χρήστη ή προγραμματιστή (Doc, FAQs...),
ρίξτε μια ματιά στο Dolibarr Wiki:
%s +ForAnswersSeeForum=Για οποιαδήποτε άλλη ερώτηση/βοήθεια, μπορείτε να χρησιμοποιήσετε το forum του Dolibarr:
%s +HelpCenterDesc1=Αυτή η περιοχή μπορεί να σας βοηθήσει να αποκτήσετε υπηρεσίες βοήθειας στο Dolibarr. +HelpCenterDesc2=Κάποια κομμάτια αυτής της υπηρεσίας είναι διαθέσιμα μόνο στα αγγλικά. +CurrentTopMenuHandler=Τωρινός διαμορφωτής πάνω μενού +CurrentLeftMenuHandler=Τωρινός διαμορφωτής αριστερού μενού +CurrentMenuHandler=Τωρινός διαμορφωτής μενού +CurrentSmartphoneMenuHandler=Τωρινός διαμορφωτής μενού για κινητές συσκευές MeasuringUnit=Μονάδα μέτρησης Emails=E-mails EMailsSetup=Διαχείριση E-mails -EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. -MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: %s) -MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s) -MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems) -MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems) -MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: %s) -MAIN_MAIL_ERRORS_TO=E-mail αποστολέα που χρησιμοποιούνται για την επιστροφή λάθος μηνύματα που στέλνονται -MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to +EMailsDesc=Αυτή η σελίδα σας επιτρέπει να αλλάξετε τις παραμέτρους PHP για την αποστολή email. Στις περισσότερες περιπτώσεις σε λειτουργικά συστήματα Unix/Linux, η διαμόρφωση της PHP σας είναι σωστή και αυτές οι παράμετροι είναι άχρηστες. +MAIN_MAIL_SMTP_PORT=Θύρα SMTP/SMTPS (Προεπιλογή στο php.ini: %s) +MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (Προεπιλογή στο php.ini: %s) +MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Θύρα SMTP/SMTPS (Δεν καθορίζεταιστην PHP σε συστήματα Unix) +MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Δεν καθορίζεταιστην PHP σε συστήματα Unix) +MAIN_MAIL_EMAIL_FROM=E-mail αποστολέα για αυτόματα e-mails (Προεπιλογή στο php.ini: %s) +MAIN_MAIL_ERRORS_TO=E-mail αποστολέα που χρησιμοποιούνται για την επιστροφή λάθος μηνυμάτων που στέλνονται +MAIN_MAIL_AUTOCOPY_TO= Να αποστέλονται κρυφά αντίγραφα των απεσταλμένων emails στο MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου των προσφορών που αποστέλλονται μέσω email στο MAIN_MAIL_AUTOCOPY_ORDER_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου των παραγγελιών που αποστέλλονται μέσω email στο MAIN_MAIL_AUTOCOPY_INVOICE_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου τιμολογίου που αποστέλλεται μέσω email στο -MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos) +MAIN_DISABLE_ALL_MAILS=Απενεργοποίηση όλων των αποστολών email (για δοκιμές και δοκιμαστικές εκδόσεις) MAIN_MAIL_SENDMODE=Μέθοδος που χρησιμοποιείτε για αποστολή EMails -MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required -MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required -MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt -MAIN_DISABLE_ALL_SMS=Απενεργοποίηση όλων σας αποστολές SMS (για λόγους δοκιμής ή demos) -MAIN_SMS_SENDMODE=Μέθοδος να χρησιμοποιήσετε για την αποστολή SMS -MAIN_MAIL_SMS_FROM=Προεπιλογή αριθμού τηλεφώνου αποστολέα για την αποστολή SMS -FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally. -SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on www.dolibarr.org forum. +MAIN_MAIL_SMTPS_ID=SMTP ID αν απαιτείται πιστοποίηση +MAIN_MAIL_SMTPS_PW=Κωδικός SMTP αν απαιτείται πιστοποίηση +MAIN_MAIL_EMAIL_TLS= Χρησιμοποιήστε TLS (SSL) κωδικοποίηση +MAIN_DISABLE_ALL_SMS=Απενεργοποίηση όλων των αποστολών SMS (για λόγους δοκιμής ή demos) +MAIN_SMS_SENDMODE=Μέθοδος που θέλετε να χρησιμοποιηθεί για την αποστολή SMS +MAIN_MAIL_SMS_FROM=Προεπιλεγμένος αριθμός τηλεφώνου αποστολέα για την αποστολή SMS +FeatureNotAvailableOnLinux=Αυτή η λειτουργία δεν είναι διαθέσιμη σε συστήματα Unix like. Δοκιμάστε το πρόγραμμα sendmail τοπικά. +SubmitTranslation=Αν η μετάφραση για αυτή την γλώσσα δεν είναι ολοκληρωμένη λη βρίσκετε λάθη, μπορείτε να τα διορθώσετε με επεξεργασία των αρχείων στο φάκελο langs/%s και να στείλετε τα επεξεργασμένα αρχεία στο forum www.dolibarr.org. ModuleSetup=Διαχείριση Αρθρώματος ModulesSetup=Διαχείριση Αρθρωμάτων ModuleFamilyBase=Σύστημα ModuleFamilyCrm=Customer Relation Management (CRM) ModuleFamilyProducts=Διαχείριση Προϊόντων ModuleFamilyHr=Διαχείριση Ανθρώπινου Δυναμικού -ModuleFamilyProjects=Projects/Collaborative work -ModuleFamilyOther=Other -ModuleFamilyTechnic=Multi-modules tools -ModuleFamilyExperimental=Experimental modules -ModuleFamilyFinancial=Financial Modules (Accounting/Treasury) -ModuleFamilyECM=Electronic Content Management (ECM) -MenuHandlers=Menu handlers +ModuleFamilyProjects=Projects/Συμμετοχικές εργασίες +ModuleFamilyOther=Άλλο +ModuleFamilyTechnic=Εργαλεία πολλαπλών αρθρωμάτων +ModuleFamilyExperimental=Πειραματικά αρθρώματα +ModuleFamilyFinancial=Χρηματοοικονομικά αρθρώματα (Λογιστική/Χρηματοοικονομικά) +ModuleFamilyECM=Διαχείριση Ηλεκτρονικού Περιεχομένου (ECM) +MenuHandlers=Διαχειριστές μενού MenuAdmin=Επεξεργαστής μενού -DoNotUseInProduction=Do not use in production -ThisIsProcessToFollow=This is setup to process: +DoNotUseInProduction=Να μην χρησιμοποιείται για παραγωγή +ThisIsProcessToFollow=Αυτό έχει ρυθμιστεί για να κατεργαστεί: StepNb=Βήμα %s -FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s). +FindPackageFromWebSite=Βρείτε ένα πακέτο που να παρέχει την λειτουργία που επιθυμείτε (για παράδειγμα στο επίσημο %s). DownloadPackageFromWebSite=Μεταφόρτωση πακέτου %s. UnpackPackageInDolibarrRoot=Αποσυμπίεσε το αρχείο εκεί που βρίσκεται η εγκατάσταση του Dolibarr %s -SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component. -NotExistsDirect=The alternative root directory is not defined.
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).
-InfDirExample=
Then declare it in the file conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*These lines are commented with "#", to uncomment only remove the character. -YouCanSubmitFile=Select module: -CurrentVersion=Dolibarr current version -CallUpdatePage=Go to the page that updates the database structure and datas: %s. +SetupIsReadyForUse=Η εγκατάσταση τελείωσε και το Dolibarr είναι έτοιμο να χρησιμοποιηθεί με αυτό το νέο μέρος. +NotExistsDirect=Ο εναλλακτικός ριζικός φάκελος δεν έχει ρυθμιστεί.
+InfDirAlt=Από την έκδοση 3 είναι δυνατός ο ορισμός ενός εναλλακτικού ριζικού φακέλου. Αυτό σας επιτρέπει να αποθηκεύσετε στο ίδιο μέρος πρόσθετες εφαρμογές και μη τυπικά templates.
Απλά δημιουργήστε ένα φάκελο στο ριζικό φάκελο του Dolibarr (π.χ.: custom).
+InfDirExample=
Κατόπιν δηλώστε το στο αρχείο conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*Αυτές οι γραμμές είναι απενεργοποιημένες με χρήση του χαρακτήρα "#", για να της ενεργοποιήσετε απλά αφαιρέστε το χαρακτήρα. +YouCanSubmitFile=Επιλογή αρθρώματος: +CurrentVersion=Έκδοση Dolibarr +CallUpdatePage=Πηγαίνετε στην σελίδα που ενημερώνει την δομή της βάσης δεδομένων και τα δεδομένα: %s. LastStableVersion=Τελευταία σταθερή έκδοση UpdateServerOffline=Ο διακομιστής ενημερώσεων είναι εκτός σύνδεσης -GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask.
{000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s.
{000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required.
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
+GenericMaskCodes=Μπορείτε να χρησιμοποιήσετε οποιαδήποτε μάσκα αρίθμησης. Σε αυτή τη μάσκα μπορούν να χρησιμοποιηθούν τις παρακάτω ετικέτες:
Το {000000} αντιστοιχεί σε έναν αριθμό που θα αυξάνεται σε κάθε %s. Εισάγετε όσα μηδεν επιθυμείτε ως το επιθυμητό μέγεθος για τον μετρητή. Ο μετρητής θα συμπληρωθεί με μηδενικά από τα αριστερά για να έχει όσα μηδενικά υπάρχουν στην μάσκα.
Η μάσκα {000000+000} είναι η ίδια όπως προηγουμένως αλλά ένα αντιστάθμισμα που αντιστοιχεί στον αριθμό στα δεξιά του + θα προστεθεί αρχίζοντας από το πρώτο %s.
Η μάσκα {000000@x} είναι η ίδια όπως προηγουμένως αλλά ο μετρητής επανέρχεται στο μηδέν όταν έρθει ο μήνας x (το x είναι μεταξύ του 1 και του 12). Αν αυτή η επιλογή χρησιμοποιηθεί και το x είναι 2 ή μεγαλύτερο, τότε η ακολουθία {yy}{mm} ή {yyyy}{mm} είναι επίσης απαιραίτητη.
Η μάσκα {dd} ημέρα (01 έως 31).
{mm} μήνας (01 έως 12).
{yy}, {yyyy} ή {y} έτος με χρήση 2, 4 ή 1 αριθμού.
GenericMaskCodes2={cccc} ο κωδικός πελάτη σε n χαρακτήρες
{cccc000} ο κωδικός πελάτη σε n χαρακτήρες ακολουθείται από ένα μετρητή αφιερωμένο για τον πελάτη. Αυτός ο μετρητής ειναι αφιερωμένος στον πελάτη μηδενίζεται ταυτόχρονα από την γενικό μετρητή.
{tttt} Ο κωδικός των Πελ./Προμ. σε n χαρακτήρες (βλέπε λεξικό-thirdparty types).
-GenericMaskCodes3=All other characters in the mask will remain intact.
Spaces are not allowed.
+GenericMaskCodes3=Όλοι οι άλλοι χαρακτήρες στην μάσκα θα παραμείνουν ίδιοι.
Κενά διαστήματα δεν επιτρέπονται.
GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany done 2007-01-31:
-GenericMaskCodes4b=Example on third party created on 2007-03-01:
-GenericMaskCodes4c=Example on product created on 2007-03-01:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX -GenericNumRefModelDesc=Return a customizable number according to a defined mask. -ServerAvailableOnIPOrPort=Server is available at address %s on port %s -ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s +GenericMaskCodes4b=Το παράδειγμα του τρίτου μέρους δημιουργήθηκε στις 2007-03-01:
+GenericMaskCodes4c=Το παράδειγμα προϊόντος δημιουργήθηκε στις 2007-03-01:
+GenericMaskCodes5=Η μάσκα ABC{yy}{mm}-{000000} θα δώσει ABC0701-000099
Η μάσκα{0000+100}-ZZZ/{dd}/XXX θα δώσει 0199-ZZZ/31/XXX +GenericNumRefModelDesc=Επιστρέφει έναν παραμετροποιήσημο αριθμό σύμφωνα με μία ορισμένη μάσκα. +ServerAvailableOnIPOrPort=Ο διακομιστής είναι διαθέσιμο στην διεύθυνση %s στην θύρα %s +ServerNotAvailableOnIPOrPort=Ο διακομιστής δεν είναι διαθέσιμος στην διεύθυνση %s στην θύρα %s DoTestServerAvailability=Έλεγχος διασύνδεσης server DoTestSend=Δοκιμή Αποστολής DoTestSendHTML=Δοκιμή αποστολής HTML ErrorCantUseRazIfNoYearInMask=Σφάλμα, δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ για να μηδενίσετε το μετρητή για κάθε έτος, εάν η ακολουθία {yy} ή {yyyy} δεν είναι μάσκα. -ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask. -UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system. -UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).
It must be the octal value (for example, 0666 means read and write for everyone).
This parameter is useless on a Windows server. -SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation -UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache) -DisableLinkToHelpCenter=Hide link "Need help or support" on login page -DisableLinkToHelp=Hide link "%s Online help" on left menu -AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea. +ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ αν η ακολουθία {yy}{mm} ή {yyyy}{mm} δεν είναι στην μάσκα. +UMask=Παράμετρος UMask για νέα αρχεία σε συστήματα αρχείων συστημάτων Unix/Linux/BSD/Mac. +UMaskExplanation=Αυτή η παράμετρος σας επιτρέπει να ορίσετε προεπιλεγμένα δικαιώματα αρχείων για αρχεία που δημιουργεί το Dolibarr στον διακομιστή (κατά την διάρκεια μεταφόρτωσης π.χ.).
Πρέπει να είναι οκταδικής μορφής (για παράδειγμα, 0666 σημαίνει εγγραφή και ανάγνωση για όλους).
Αυτή η παράμετρος είναι άχρηστη σε διακομιστές Windows. +SeeWikiForAllTeam=Ρίξτε μια ματία στην σελίδα wiki για μια πλήρη λίστα όλων των actors και της οργάνωσής τους +UseACacheDelay= Καθυστέρηση για την τοποθέτηση απόκρισης εξαγωγής στην προσωρινή μνήμη σε δευτερόλεπτα (0 ή άδεια για μη χρήση προσωρινής μνήμης) +DisableLinkToHelpCenter=Αποκρύψτε τον σύνδεσμο "Αναζητήστε βοήθεια ή υποστήριξη" στην σελίδα σύνδεσης +DisableLinkToHelp=Αποκρύψτε το σύνδεσμο "%s Online βοήθεια" στο αριστερό μενού +AddCRIfTooLong=Δεν υπάρχει αυτόματη αναδίπλωση κειμένου. Αν η γραμμή σας σας δεν χωράει στην σελίδα των εγγράφων επειδή είναι πολύ μεγάλη, θα πρέπει να προσθέσετε μόνοι σας χαρακτήρες αλλαγής γραμμής (carriage return) στην περιοχή κειμένου. ModuleDisabled=Απενεργοποιημένο Άρθρωμα -ModuleDisabledSoNoEvent=Module disabled so event never created -ConfirmPurge=Are you sure you want to execute this purge ?
This will delete definitely all your data files with no way to restore them (ECM files, attached files...). +ModuleDisabledSoNoEvent=Το άρθρωμα είναι απενεργοποιημένο και έτσι δεν έχει δημιουργηθεί τέτοιο γεγονός +ConfirmPurge=Είστε σίγουροι πως θέλετε να εκτελέσετε αυτή τη διαγραφή;
Αυτό θα διαγράψει όλα σας τα δεδομένα με καμία δυνατότητα ανάκτησης (αρχεία ECM, συνημμένα αρχεία...). MinLength=Ελάχιστο μήκος -LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory -ExamplesWithCurrentSetup=Examples with current running setup -ListOfDirectories=List of OpenDocument templates directories -ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. -NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories -ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir -FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: +LanguageFilesCachedIntoShmopSharedMemory=Τα αρχεία τύπου .lang έχουν φορτωθεί στην κοινόχρηστη μνήμη +ExamplesWithCurrentSetup=Παραδείγματα με την τωρινή διαμόρφωση +ListOfDirectories=Λίστα φακέλων προτύπων OpenDocument +ListOfDirectoriesForModelGenODT=Λίστα φακέλων που περιέχουν αρχεία προτύπων τύπου OpenDocument.

Τοποθετείστε εδώ ολόκληρη την διαδρομή των φακέλων.
Εισάγετε ένα χαρακτήρα αλλαγής γραμμής ανάμεσα σε κάθε φάκελο.
Για να προσθέσετε ένα φάκελο του αρθρώματος GED, προσθέστε εδώ DOL_DATA_ROOT/ecm/yourdirectoryname.

Τα αρχεία σε αυτούς τους φακέλους πρέπει να έχουν την επέκταση .odt. +NumberOfModelFilesFound=Αριθμός αρχείων προτύπων ODT/ODS που βρέθηκαν σε αυτούς τους φακέλους +ExampleOfDirectoriesForModelGen=Παραδείγματα σύνταξης:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +FollowingSubstitutionKeysCanBeUsed=
Για να μάθετε πως να δημιουργήσετε τα δικά σας αρχεία προτύπων, πριν τα αποθηκεύσετε σε αυτούς τους φακέλους, διαβάστε την τεκμηρίωση στο wiki: FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template FirstnameNamePosition=Θέση ονόματος/επιθέτου -DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values: +DescWeather=Οι παρακάτω εικόνες θα εμφανιστούν στο ταμπλό όταν ο αριθμός των τελευταίων ενεργειών φτάσει τις παρακάτω τιμές: KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices) -TestSubmitForm=Είσοδος μορφή δοκιμή -ThisForceAlsoTheme=Χρησιμοποιώντας αυτό το μενού διευθυντής θα χρησιμοποιήσει επίσης το δικό της θέμα ό, τι είναι επιλογή του χρήστη. Επίσης, αυτό το μενού διευθυντής εξειδικεύεται για τα smartphones δεν λειτουργεί σε όλα τα smartphone. Χρησιμοποιήσετε κάποιον άλλο διαχειριστή μενού αν αντιμετωπίζετε προβλήματα στο δικό σας. -ThemeDir=Δέρματα κατάλογο -ConnectionTimeout=Connexion timeout -ResponseTimeout=Response timeout +TestSubmitForm=Φόρμα δοκιμής εισαγωγής δεδομένων +ThisForceAlsoTheme=Αυτός ο τροποποιητής μενού χρησιμοποιεί το δικό του θέμα όποιο θέμα και να έχει επιλέξει ο χρήστης. Επίσης, αυτό το πρόγραμμα διαχείρισης μενου που ειδικεύετεαι στις κινητές συσκευές δεν δουλεύει σε όλα τα smartphone. Χρησιμοποιήσετε κάποιον άλλο διαχειριστή μενού αν αντιμετωπίζετε προβλήματα στο δικό σας. +ThemeDir=Φάκελος skins +ConnectionTimeout=Λήξη σύνδεσης +ResponseTimeout=Λήξη χρόνου αναμονής απάντησης SmsTestMessage=Δοκιμαστικό μήνυμα από __PHONEFROM__ να __PHONETO__ ModuleMustBeEnabledFirst=%s Ενότητα πρέπει να είναι ενεργοποιημένα πρώτη φορά πριν τη χρήση αυτής της δυνατότητας. SecurityToken=Security Token -NoSmsEngine=Δεν διευθυντής αποστολέα SMS διαθέσιμα. Αποστολέα SMS διευθυντής δεν έχουν εγκατασταθεί με τη διανομή προεπιλογή (διότι εξαρτάται από εξωτερικούς προμηθευτές), αλλά μπορείτε να βρείτε κάποια σχετικά http://www.dolistore.com +NoSmsEngine=Δεν υπάρχει πρόγραμμα αποστολής SMS διαθέσιμο. Τα προγράμματα αποστολής SMS δεν εγκαθίστανται με την διανομή από προεπιλογή (επειδή εξαρτόνται από εξωτερικούς προμηθευτές) αλλά μπορείτε να βρείτε κάποια διαθέσιμα προγράμματα στο %s PDF=PDF -PDFDesc=Μπορείτε να ρυθμίσετε κάθε συνολική επιλογές που σχετίζονται με τη δημιουργία PDF -PDFAddressForging=Κανόνες για να δημιουργήσουν θέσεις διεύθυνση -HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με τον ΦΠΑ επί δημιουργούνται μορφή PDF -HideDescOnPDF=Hide products description on generated PDF -HideRefOnPDF=Hide products ref. on generated PDF -HideDetailsOnPDF=Hide products lines details on generated PDF -Library=Library -UrlGenerationParameters=Παράμετροι για την εξασφάλιση διευθύνσεις URL +PDFDesc=Μπορείτε να ρυθμίσετε κάθε κεντρική επιλογή που σχετίζεται με τη δημιουργία PDF +PDFAddressForging=Κανόνες για να δημιουργηθούν διευθύνσεις +HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με τον ΦΠΑ στα δημιουργηθέντα PDF +HideDescOnPDF=Απόκρυψη περιγραφών προϊόντων στα δημιουργηθέντα PDF +HideRefOnPDF=Απόκρυψη αναφοράς προϊόντος στα δημιουργηθέντα PDF +HideDetailsOnPDF=Απόκρυψη λεπτομεριών προϊόντων στα δημιουργηθέντα PDF +Library=Βιβλιοθήκη +UrlGenerationParameters=Παράμετροι για δημιουργία ασφαλών URL SecurityTokenIsUnique=Χρησιμοποιήστε μια μοναδική παράμετρο securekey για κάθε διεύθυνση URL EnterRefToBuildUrl=Εισάγετε αναφοράς για %s αντικείμενο -GetSecuredUrl=Πάρτε υπολογίζεται URL -ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons -OldVATRates=Old VAT rate -NewVATRates=New VAT rate -PriceBaseTypeToChange=Modify on prices with base reference value defined on -MassConvert=Launch mass convert +GetSecuredUrl=Πάρτε υπολογιζόμενο URL +ButtonHideUnauthorized=Απόκρυψη κουμπιών για μη επιτρεπτές ενέργειες αντί να φαίνονται απενεργοποιημένα κουμπιά +OldVATRates=Παλιός συντελεστής ΦΠΑ +NewVATRates=Νέος συντελεστής ΦΠΑ +PriceBaseTypeToChange=Τροποποίηση τιμών με βάση την τιμή αναφοράς όπως ρυθμίστηκε στο +MassConvert=Έναρξη μαζικής μεταβολής String=String TextLong=Long text Int=Integer Float=Float -DateAndTime=Date and hour -Unique=Unique +DateAndTime=Ημερομηνία και ώρα +Unique=Μοναδικό Boolean=Boolean (Checkbox) -ExtrafieldPhone = Phone -ExtrafieldPrice = Price +ExtrafieldPhone = Τηλέφωνο +ExtrafieldPrice = Τιμή ExtrafieldMail = Email -ExtrafieldSelect = Select list -ExtrafieldSelectList = Select from table -ExtrafieldSeparator=Separator +ExtrafieldSelect = Επιλογή από λίστα +ExtrafieldSelectList = Επιλογή από πίνακα +ExtrafieldSeparator=Διαχωριστικό ExtrafieldCheckBox=Checkbox ExtrafieldRadio=Radio button ExtrafieldCheckBoxFromList= Πλαίσιο ελέγχου από τον πίνακα @@ -389,16 +394,16 @@ ExtrafieldParamHelpcheckbox=Η λίστα παραμέτρων θα πρέπει ExtrafieldParamHelpradio=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value

για παράδειγμα :
1,value1
2,value2
3,value3
... ExtrafieldParamHelpsellist=Λίστα Παραμέτρων που προέρχεται από έναν πίνακα
σύνταξη : table_name:label_field:id_field::filter
παράδειγμα: c_typent:libelle:id::filter

φίλτρο μπορεί να είναι μια απλή δοκιμή (eg active=1) για να εμφανίσετε μόνο μία ενεργό τιμή
αν θέλετε να φιλτράρετε extrafields χρησιμοποιήστε τη σύνταξη extra.fieldcode=... (όπου κωδικός πεδίου είναι ο κωδικός του extrafield)

Προκειμένου να έχει τον κατάλογο ανάλογα με ένα άλλο :
c_typent:libelle:id:parent_list_code|parent_column:filter ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter -LibraryToBuildPDF=Library used to build PDF -WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' -LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax) +LibraryToBuildPDF=Βιβλιοθήκη για την δημιουργία PDF +WarningUsingFPDF=Προειδοποίηση: Το αρχείο conf.php περιλαμβάνει την επιλογή dolibarr_pdf_force_fpdf=1. Αυτό σημαίνει πως χρησιμοποιείτε η βιβλιοθήκη FPDF για να δημιουργούνται τα αρχεία PDF. Αυτή η βιβλιοθήκη είναι παλιά και δεν υποστηρίζει πολλές λειτουργίες (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), οπότε μπορεί να παρουσιαστούν λάθη κατά την δημιουργία των PDF.
Για να λυθεί αυτό και να μπορέσετε να έχετε πλήρη υποστήριξη δημιουργίας αρχείων PDF, παρακαλώ κατεβάστε την βιβλιοθήκη TCPDF, και μετά απενεργοποιήστε ή διαγράψτε την γραμμή $dolibarr_pdf_force_fpdf=1, και εισάγετε αντί αυτής την $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' +LocalTaxDesc=Σε κάποιες χώρες επιβάλλονται 2 ή 3 φόροι σε κάθε γραμμή τιμολογίου. Αν ισχύει αυτό στην περίπτωσή σας, επιλέξτε τύπο για τον δεύτερο και τον τρίτο φόρο όπως επίσης και το ποσοστό του. Πιθανοί τύποι είναι:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax) SMS=SMS -LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s -RefreshPhoneLink=Refresh link -LinkToTest=Clickable link generated for user %s (click phone number to test) -KeepEmptyToUseDefault=Keep empty to use default value -DefaultLink=Default link -ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) +LinkToTestClickToDial=Εισάγετε έναν τηλεφωνικό αριθμό για να δημιουργηθεί ένας σύνδεσμος που θα σας επιτρέπει να κάνετε κλήση με το ClickToDial για τον χρήστη %s +RefreshPhoneLink=Ανανέωση συνδέσμου +LinkToTest=Σημιουργήθηκε σύνδεσμος για τον χρήστη %s (κάντε κλικ στον αριθμό τηλεφώνου για να τον δοκιμάσετε) +KeepEmptyToUseDefault=Αφήστε κενό για να χρησιμοποιήσετε την προεπιλεγμένη τιμή +DefaultLink=Προεπιλεγμένος σύνδεσμος +ValueOverwrittenByUserSetup=Προσοχή, αυτή η τιμή μπορεί να αντικατασταθεί από επιλογή του χρήστη (ο κάθε χρήστης μπορεί να κάνει τον δικό του σύνδεσμο clicktodial) ExternalModule=Εξωτερικό module - Εγκατεστημένο στον φάκελο %s BarcodeInitForThirdparties=Όγκος barcode init για Πέλ./Πρόμ. BarcodeInitForProductsOrServices=Όγκος barcode init ή επαναφορά για προϊόντα ή υπηρεσίες @@ -414,77 +419,77 @@ NoRecordWithoutBarcodeDefined=Δεν υπάρχει εγγραφή χωρίς ο Module0Name=Χρήστες & Ομάδες Module0Desc=Διαχείριση χρηστών και ομάδων Module1Name=Στοιχεία -Module1Desc=Companies and contact management (customers, prospects...) -Module2Name=Commercial -Module2Desc=Commercial management -Module10Name=Accounting -Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching. +Module1Desc=Διαχείριση εταιρειών και επαφών (πελάτες, πιθανοί πελάτες...) +Module2Name=Εμπορικό +Module2Desc=Εμπορική διαχείριση +Module10Name=Λογιστική +Module10Desc=Απλές αναφορές λογιστικής (journals, turnover) βασισμένα στα περιοχόμενα της βάσης δεδομένων. Χωρίς αποστολές. Module20Name=Προτάσεις -Module20Desc=Commercial proposal management -Module22Name=Mass E-mailings -Module22Desc=Mass E-mailing management -Module23Name= Energy -Module23Desc= Monitoring the consumption of energies +Module20Desc=Διαχείριση εμπορικών προτάσεων +Module22Name=Μαζική αποστολή e-mail +Module22Desc=Διαχείριση μαζικής αποστολής e-mail +Module23Name= Ενέργεια +Module23Desc= Παρακολούθηση κατανάλωσης ενέργειας Module25Name=Παραγγελίες πελάτη -Module25Desc=Customer order management +Module25Desc=Διαχείριση παραγγελιών πελατών Module30Name=Τιμολόγια Module30Desc=Τιμολόγιο και πιστωτικό τιμολόγιο διαχείρισης για τους πελάτες. Τιμολόγιο διαχείρισης για τους προμηθευτές Module40Name=Προμηθευτές -Module40Desc=Supplier management and buying (orders and invoices) +Module40Desc=Διαχείριση προμηθευτών και παραστατικά αγοράς (παραγγελίες και τιμολόγια) Module42Name=Logs Module42Desc=Logging facilities (file, syslog, ...) -Module49Name=Επεξεργαστές -Module49Desc=Editor management +Module49Name=Επεξεργαστές κειμένου +Module49Desc=Διαχείριση επεξεργαστών κειμένου Module50Name=Προϊόντα -Module50Desc=Product management -Module51Name=Mass mailings -Module51Desc=Mass paper mailing management -Module52Name=Αποθήκες -Module52Desc=Stock's management of products +Module50Desc=Διαχείριση προϊόντων +Module51Name=Μαζικές αποστολές επιστολών +Module51Desc=Διαχείριση μαζικών αποστολών επιστολών +Module52Name=Αποθέματα +Module52Desc=Διαχείριση αποθεμάτων (προϊόντων) Module53Name=Υπηρεσίες -Module53Desc=Service management +Module53Desc=Διαχείριση υπηρεσιών Module54Name=Συμβάσεις/Συνδρομές Module54Desc=Διαχείριση συμβολαίων (υπηρεσιών ή ανανεώσιμων συνδρομών) Module55Name=Barcodes -Module55Desc=Barcode management +Module55Desc=Διαχείριση barcode Module56Name=Τηλεφωνία Module56Desc=Telephony integration -Module57Name=Standing orders +Module57Name=Πάγιες εντολές Module57Desc=Πάγιες εντολές και διαχείριση απόσυρσης. Επίσης, περιλαμβάνει την παραγωγή του αρχείου SEPA για τις ευρωπαϊκές χώρες. Module58Name=ClickToDial -Module58Desc=Integration of a ClickToDial system (Asterisk, ...) +Module58Desc=Ενοποίηση ενός συστήματος ClickToDial (Asterisk, ...) Module59Name=Bookmark4u -Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account +Module59Desc=Προσθήκη λειτουργίας για την δημιουργία λογαριασμού Bookmark4u από ένα λογαριασμό Dolibarr Module70Name=Interventions Module70Desc=Intervention management -Module75Name=Expense and trip notes -Module75Desc=Expense and trip notes management -Module80Name=Shipments -Module80Desc=Shipments and delivery order management -Module85Name=Banks and cash -Module85Desc=Management of bank or cash accounts -Module100Name=External site -Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame +Module75Name=Σημειώσεις εξόδων και ταξιδιών +Module75Desc=Διαχείριση σημειώσεων εξόδων και ταξιδιών +Module80Name=Αποστολές +Module80Desc=Διαχείριση αποστολών και εντολών παράδοσης +Module85Name=Τράπεζες και μετρητά +Module85Desc=Διαχείριση τραπεζικών και λογαριασμών μετρητών +Module100Name=Εξωτερική ιστοσελίδα +Module100Desc=Αυτό το άρθρωμα περιέχει μία εξωτερική ιστοσελίδα ή site μέσα από το μενού του Dolibarr για να προβληθεί μέσω ενός παραθύρου Dolibarr Module105Name=Mailman και SIP Module105Desc=Mailman ή SPIP διεπαφή για ενότητα μέλος Module200Name=LDAP -Module200Desc=LDAP directory synchronisation +Module200Desc=Συγχρονισμός LDAP directory Module210Name=PostNuke -Module210Desc=PostNuke integration -Module240Name=Data exports -Module240Desc=Tool to export Dolibarr datas (with assistants) -Module250Name=Data imports -Module250Desc=Tool to import datas in Dolibarr (with assistants) +Module210Desc=Διεπαφή PostNuke +Module240Name=Εξαγωγές δεδομένων +Module240Desc=Εργαλείο για την εξαγωγή δεδομέων του Dolibarr (με βοηθούς) +Module250Name=Εισαγωγές δεδομένων +Module250Desc=Εργαλείο για την εισαγωγή δεδομένω στο Dolibarr (με βοηθούς) Module310Name=Μέλη -Module310Desc=Foundation members management +Module310Desc=Διαχείριση μελών οργανισμού Module320Name=RSS Feed -Module320Desc=Add RSS feed inside Dolibarr screen pages +Module320Desc=Εισαγωγή RSS feed εντός των σελίδων του Dolibarr Module330Name=Σελιδοδείκτες -Module330Desc=Bookmark management +Module330Desc=Διαχείριση σελιδοδεικτών Module400Name=Έργα/Ευκαιρίες/Leads Module400Desc=Διαχείριση έργων, ευκαιρίες ή leads. Στη συνέχεια μπορείτε να ορίσετε οποιοδήποτε στοιχείο (τιμολόγιο, παραγγελία, προσφορά, παρέμβαση, ...) σε ένα έργο και να πάρετε μια εγκάρσια όψη από την προβολή του έργου. -Module410Name=Webcalendar -Module410Desc=Webcalendar integration +Module410Name=Ημερολόγιο ιστού +Module410Desc=Διεπαφή ημερολογίου ιστού Module500Name=Ειδικά έξοδα (φόροι, εισφορές κοινωνικής ασφάλισης, μερίσματα) Module500Desc=Διαχείριση των ειδικών δαπανών, όπως οι φόροι, κοινωνικές εισφορές, μερίσματα και μισθούς Module510Name=Μισθοί @@ -493,10 +498,16 @@ Module600Name=Notifications Module600Desc=Αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου σχετικά με ορισμένες Dolibarr επαγγελματικές συναντήσεις σε Πελ./Προμ. (η ρύθμιση ορίζεται από κάθε Πελ./Προμ.) Module700Name=Δωρεές Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Κατηγορίες Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Read donations Permission702=Δημιουργία / τροποποίηση δωρεές Permission703=Διαγραφή δωρεές +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Διαβάστε τα αποθέματα Permission1002=Δημιουργία/τροποποίηση αποθηκών Permission1003=Διαγραφή αποθηκών @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Κωδικός πρόσβασης για να χρησιμοπο DefineHereComplementaryAttributes=Ορίστε εδώ όλα τα χαρακτηριστικά, δεν είναι ήδη διαθέσιμη από προεπιλογή, και ότι θέλετε να υποστηριχθούν για %s. ExtraFields=Συμπληρωματικά χαρακτηριστικά ExtraFieldsLines=Συμπληρωματικά χαρακτηριστικά (σειρές) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ρωτήστε για τον τραπεζικό λογαριασμό προορισμού της προσφοράς +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Διαχειριστής για την αυτόματη αρίθμηση του barcode ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Προεπιλογή γενικός Πελ./Προμ. CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Απενεργοποίηση μείωση των αποθεμάτων όταν η πώληση γίνεται από Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Αναγκαστικός περιορισμός αποθήκης για μείωση των αποθεμάτων StockDecreaseForPointOfSaleDisabled=Μείωση αποθέματος από Point Of Sale απενεργοποιημένο +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=Δεν έχετε απενεργοποιήσει μείωση των αποθεμάτων κατά την πραγματοποίηση μιας πώλησης από το σημείο πώλησης "POS". Μια αποθήκη είναι απαραίτητη. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Σειρά ταξινόμησης Format=Μορφή TypePaymentDesc=0:Τύπος πληρωμής πελάτη, 1:Τύπος πληρωμής προμηθευτή, 2:Τύπος πληρωμής τόσο για τους πελάτες όσο και για τους προμηθευτές IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang index c6960fe94cd..7c143b155f1 100644 --- a/htdocs/langs/el_GR/banks.lang +++ b/htdocs/langs/el_GR/banks.lang @@ -33,7 +33,11 @@ AllTime=Από την αρχή Reconciliation=Πραγματοποίηση Συναλλαγών RIB=Αριθμός Τραπ. Λογαριασμού IBAN=IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=Αριθμός BIC/SWIFT +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Πάγιες εντολές StandingOrder=Πάγια εντολή Withdrawals=Αναλήψεις @@ -148,7 +152,7 @@ BackToAccount=Επιστροφή στον λογαριασμό ShowAllAccounts=Εμφάνιση Όλων των Λογαριασμών FutureTransaction=Συναλλαγή στο μέλλον. Δεν υπάρχει τρόπος συμβιβασμού. SelectChequeTransactionAndGenerate=Επιλέξτε/φίλτρο ελέγχου για να συμπεριληφθεί στην απόδειξη κατάθεσης και κάντε κλικ στο "Δημιουργία". -InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή (όπως, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές ToConciliate=Να συμβιβάσει; ThenCheckLinesAndConciliate=Στη συνέχεια, ελέγξτε τις γραμμές που υπάρχουν στο αντίγραφο κίνησης του τραπεζικού λογαριασμού και κάντε κλικ diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang index 605097a3a19..114c0169055 100644 --- a/htdocs/langs/el_GR/commercial.lang +++ b/htdocs/langs/el_GR/commercial.lang @@ -62,7 +62,7 @@ LastProspectContactDone=Η επικοινωνία έγινε DateActionPlanned=Ημερ. προγραμματισμού DateActionDone=Ημερ. ολοκλήρωσης ActionAskedBy=Η ενέργεια ζητήθηκε από -ActionAffectedTo=Εκδήλωση που ανήκει +ActionAffectedTo=Event assigned to ActionDoneBy=Η ενέργεια έγινε από τον/την ActionUserAsk=Καταγράφηκε από τον/την ErrorStatusCantBeZeroIfStarted=Εάν το πεδίο 'Date done' είναι γεμάτο, η ενέργεια έχει αρχίσει (ή έχει τελειώσει), οπότε το πεδίο 'Status' δεν μπορεί να είναι 0%%. diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang index ff824ce3a85..c8e4c7b1cb5 100644 --- a/htdocs/langs/el_GR/contracts.lang +++ b/htdocs/langs/el_GR/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Έληξε ServiceStatusClosed=Τερματισμένη ServicesLegend=Services legend Contracts=Συμβόλαια +ContractsAndLine=Contracts and line of contracts Contract=Συμβόλαιο NoContracts=Κανένα Συμβόλαιο MenuServices=Υπηρεσίες diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang index 756f6c9ea35..9f94c994725 100644 --- a/htdocs/langs/el_GR/cron.lang +++ b/htdocs/langs/el_GR/cron.lang @@ -84,3 +84,4 @@ CronType_command=Εντολή Shell CronMenu=Μενού CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Πηγαίνετε στο μενού "Home - Modules εργαλεία - Λίστα εργασιών" για να δείτε και να επεξεργαστείτε τις προγραμματισμένες εργασίες. +TaskDisabled=Task disabled diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang index eaacea01c42..1361707a862 100644 --- a/htdocs/langs/el_GR/errors.lang +++ b/htdocs/langs/el_GR/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Πηγή και τους στόχους των τ ErrorBadThirdPartyName=Bad αξία για τους υπηκόους τρίτων όνομα κόμματος ErrorProdIdIsMandatory=Το %s είναι υποχρεωτικό ErrorBadCustomerCodeSyntax=Λάθος σύνταξη για τον κωδικό πελάτη -ErrorBadBarCodeSyntax=Κακή σύνταξη για bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Κωδικός πελάτη απαιτείτε ErrorBarCodeRequired=Απαιτείται Bar code ErrorCustomerCodeAlreadyUsed=Ο κωδικός πελάτη που έχει ήδη χρησιμοποιηθεί @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Η Javascript πρέπει να είναι άτομ ErrorPasswordsMustMatch=Και οι δύο πληκτρολογήσει τους κωδικούς πρόσβασης πρέπει να ταιριάζουν μεταξύ τους ErrorContactEMail=Ένα τεχνικό σφάλμα. Παρακαλούμε, επικοινωνήστε με τον διαχειριστή για μετά %s email en παρέχουν την %s κωδικό σφάλματος στο μήνυμά σας, ή ακόμα καλύτερα με την προσθήκη ενός αντιγράφου της οθόνης αυτής της σελίδας. ErrorWrongValueForField=Λάθος τιμή για %s αριθμό τομέα («%s» τιμή δεν ταιριάζει regex %s κανόνα) -ErrorFieldValueNotIn=Λάθος τιμή για %s αριθμό τομέα («%s» τιμή δεν είναι μια τιμή διαθέσιμη σε %s τομέα της %s πίνακα) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Λάθος τιμή για τον αριθμό %s τομέα («%s» τιμή δεν είναι %s υφιστάμενων ref) ErrorsOnXLines=Λάθη σε %s γραμμές πηγή ErrorFileIsInfectedWithAVirus=Το πρόγραμμα προστασίας από ιούς δεν ήταν σε θέση να επικυρώσει το αρχείο (αρχείο μπορεί να μολυνθεί από έναν ιό) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Εσωτερικό σφάλμα '%s' ErrorPriceExpressionUnknown=Άγνωστο σφάλμα '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang index d2cc1ae3cd8..939e7a72d52 100644 --- a/htdocs/langs/el_GR/install.lang +++ b/htdocs/langs/el_GR/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Τελευταίο βήμα: Καθορίστε ε ActivateModule=Ενεργοποίηση %s ενότητα ShowEditTechnicalParameters=Κάντε κλικ εδώ για να δείτε/επεξεργαστείτε προηγμένες παραμέτρους (κατάσταση έμπειρου χρήστη) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang index 187c9becc66..50211a1e084 100644 --- a/htdocs/langs/el_GR/main.lang +++ b/htdocs/langs/el_GR/main.lang @@ -141,6 +141,7 @@ Cancel=Άκυρο Modify=Τροποποίηση Edit=Επεξεργασία Validate=Επικύρωση +ValidateAndApprove=Validate and Approve ToValidate=Προς Επικύρωση Save=Αποθήκευση SaveAs=Αποθήκευση Ως @@ -158,6 +159,7 @@ Search=Αναζήτηση SearchOf=Αναζήτηση Valid=Έγκυρο Approve=Έγκριση +Disapprove=Disapprove ReOpen=Εκ νέου άνοιγμα Upload=Αποστολή Αρχείου ToLink=Σύνδεσμος @@ -219,6 +221,7 @@ Cards=Καρτέλες Card=Καρτέλα Now=Τώρα Date=Ημερομηνία +DateAndHour=Date and hour DateStart=Ημερομηνία Έναρξης DateEnd=Ημερομηνία Τέλους DateCreation=Ημερομηνία Δημιουργίας @@ -295,6 +298,7 @@ UnitPriceHT=Τιμή Μονάδος (χ. Φ.Π.Α) UnitPriceTTC=Τιμή Μονάδος PriceU=Τιμή μον. PriceUHT=Τιμή μον. +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=Τιμή μον. Amount=Ποσό AmountInvoice=Ποσό Τιμολογίου @@ -521,6 +525,7 @@ DateFromTo=Από %s μέχρι %s DateFrom=Από %s DateUntil=Μέχρι %s Check=Έλεγχος +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Δημόσια URL AddBox=Προσθήκη πεδίου SelectElementAndClickRefresh=Επιλέξτε ένα στοιχείο και κάντε κλικ στο κουμπί Ανανέωση PrintFile=Εκτύπωση του αρχείου %s +ShowTransaction=Show transaction # Week day Monday=Δευτέρα Tuesday=Τρίτη diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang index 4987091d539..e6cedcee375 100644 --- a/htdocs/langs/el_GR/orders.lang +++ b/htdocs/langs/el_GR/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Ακυρωμένη StatusOrderDraft=Προσχέδιο (χρειάζεται επικύρωση) StatusOrderValidated=Επικυρωμένη StatusOrderOnProcess=Παραγγέλθηκε - Αναμονή παραλαβής +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Ολοκληρωμένη StatusOrderToBill=Προς πληρωμή StatusOrderToBill2=Προς τιμολόγηση @@ -58,6 +59,7 @@ MenuOrdersToBill=Παραγγελίες προς χρέωση MenuOrdersToBill2=Χρεώσιμες παραγγελίες SearchOrder=Εύρεση παραγγελίας SearchACustomerOrder=Αναζητήστε μία παραγγελία πελάτη +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Έκπτωση CreateOrder=Δημιουργία παραγγελίας diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang index e15f9952453..449d5bc6fac 100644 --- a/htdocs/langs/el_GR/other.lang +++ b/htdocs/langs/el_GR/other.lang @@ -54,12 +54,13 @@ MaxSize=Μέγιστο μέγεθος AttachANewFile=Επισύναψη νέου αρχείου/εγγράφου LinkedObject=Συνδεδεμένα αντικείμενα Miscellaneous=Διάφορα -NbOfActiveNotifications=Πλήθος ειδοποιήσεων +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Δοκιμαστικο mail.\nΟι δύο γραμμές είναι χωρισμένες με carriage return. PredefinedMailTestHtml=Αυτό είναι ένα μήνυμα δοκιμής (η δοκιμή λέξη πρέπει να είναι με έντονα γράμματα).
Οι δύο γραμμές που χωρίζονται με ένα χαρακτήρα επαναφοράς. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nΘα ήθελα να σας προειδοποιήσω ότι το τιμολόγιο __FACREF__ φαίνεται να μην έχει πληρωθεί. Στο συνημμένο βρίσκεται το τιμολόγιο που φαίνεται να μην έχει πληρωθεί.\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την προσφορά __PROPREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε τη παραγγελία __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την παραγγελία μας __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__ diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang index afe3a362d63..cc6e312db0e 100644 --- a/htdocs/langs/el_GR/productbatch.lang +++ b/htdocs/langs/el_GR/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Παρτίδα/Σειριακός αριθμός l_eatby=Φάτε ημερομηνία λήξης l_sellby=Ημερομηνία πώλησης DetailBatchNumber=Παρτίδα/Λεπτομέρειες σειριακού -DetailBatchFormat=Παρτίδα/Κωδικός: %s - E:%s - s:%s (Ποσότητα: %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Παρτίδα: %s printEatby=Eat-by: %s printSellby=Πώληση ανά: %s diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang index 25229b931ae..eebb6c5060b 100644 --- a/htdocs/langs/el_GR/products.lang +++ b/htdocs/langs/el_GR/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=Στο προϊόν/υπηρεσία και στις PriceExpressionEditorHelp4=Μόνο σε τιμές προϊόντων/υπηρεσιών: #supplier_min_price#
Μόνο τιμές Προμηθευτών: #supplier_quantity# and #supplier_tva_tx# PriceMode=Λειτουργία Τιμής PriceNumeric=Αριθμός +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang index c4ce60ce368..3e20c208dc9 100644 --- a/htdocs/langs/el_GR/projects.lang +++ b/htdocs/langs/el_GR/projects.lang @@ -8,8 +8,10 @@ SharedProject=Όλοι PrivateProject=Αντιπρόσωποι του έργου MyProjectsDesc=Η άποψη αυτή περιορίζονται σε έργα που είναι σε μια επαφή για την (όποια είναι ο τύπος). ProjectsPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα σας επιτρέπεται να διαβάσετε. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα). MyTasksDesc=Η άποψη αυτή περιορίζονται σε έργα ή εργασίες που έχουν μια επαφή για την (όποια είναι ο τύπος). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να διαβάζουν. TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα). ProjectsArea=Περιοχή Έργων @@ -29,6 +31,8 @@ NoProject=No project defined or owned NbOpenTasks=Αριθμός ανοιχτών εργασιών NbOfProjects=Αριθμός έργων TimeSpent=Χρόνος που δαπανήθηκε +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Ο χρόνος που δαπανάται RefTask=Αναφ. εργασίας LabelTask=Ετικέτα εργασίας @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Κατάλογος των ενταλμάτω ListSupplierInvoicesAssociatedProject=Κατάλογος των τιμολογίων του προμηθευτή που συνδέονται με το έργο ListContractAssociatedProject=Κατάλογος των συμβάσεων που συνδέονται με το έργο ListFichinterAssociatedProject=Κατάλογος των παρεμβάσεων που σχετίζονται με το έργο -ListTripAssociatedProject=Κατάλογος των ταξιδιών και των δαπανών που συνδέονται με το έργο +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Κατάλογος των εκδηλώσεων που σχετίζονται με το έργο ActivityOnProjectThisWeek=Δραστηριότητα στο έργο αυτή την εβδομάδα ActivityOnProjectThisMonth=Δραστηριότητα στο έργο αυτό το μήνα @@ -133,3 +137,6 @@ SearchAProject=Αναζήτηση ένα έργο ProjectMustBeValidatedFirst=Το έργο πρέπει να επικυρωθεί πρώτα ProjectDraft=Πρόχειρα έργα FirstAddRessourceToAllocateTime=Συσχετίστε έναν πόρο για την κατανομή του χρόνου +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang index 7001bfb2fe0..58f0b819a6e 100644 --- a/htdocs/langs/el_GR/salaries.lang +++ b/htdocs/langs/el_GR/salaries.lang @@ -1,8 +1,13 @@ # Dolibarr language file - Source file is en_US - users -Salary=Salary -Salaries=Salaries +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Κωδικός Λογιστικής για τις πληρωμές των μισθών +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Κωδικός Λογιστικής για οικονομική επιβάρυνση +Salary=Mισθός +Salaries=Μισθοί Employee=Υπάλληλος NewSalaryPayment=Νέα μισθοδοσία SalaryPayment=Μισθός SalariesPayments=Πληρωμές μισθών ShowSalaryPayment=Εμφάνιση μισθοδοσίας +THM=Η μέση ωριαία τιμή +TJM=Η μέση ημερήσια τιμή +CurrentSalary=Current salary diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang index d2774a6577f..8a0733e2515 100644 --- a/htdocs/langs/el_GR/sendings.lang +++ b/htdocs/langs/el_GR/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Ποσότητα παραγγελιών QtyShipped=Ποσότητα που αποστέλλεται QtyToShip=Ποσότητα προς αποστολή QtyReceived=Ποσότητα παραλαβής -KeepToShip=Κρατήστε την αποστολή +KeepToShip=Remain to ship OtherSendingsForSameOrder=Άλλες αποστολές για αυτό το σκοπό DateSending=Ημερομηνία αποστολή της παραγγελίας DateSendingShort=Ημερομηνία αποστολή της παραγγελίας @@ -64,10 +64,10 @@ ShipmentLine=Σειρά αποστολής CarrierList=Κατάλογος των μεταφορέων SendingRunning=Προϊόν από εντολή παραγγελιών σε πελάτες SuppliersReceiptRunning=Προϊόν από εντολή παραγγελιών σε προμηθευτές -ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders -ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders -ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent -ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received +ProductQtyInCustomersOrdersRunning=Ποσότητα προϊόντων σε ανοιχτές παραγγελίες πελατών +ProductQtyInSuppliersOrdersRunning=Ποσότητα προϊόντων σε ανοιχτές παραγγελίες προμηθευτών +ProductQtyInShipmentAlreadySent=Ποσότητα προϊόντων από ανοιγμένες παραγγελίες του πελάτη που έχουν ήδη αποσταλεί +ProductQtyInSuppliersShipmentAlreadyRecevied=Ποσότητα προϊόντων από ανοιγμένες παραγγελίες του προμηθευτή που έχουν ήδη ληφθεί # Sending methods SendingMethodCATCH=Πιάσε τον πελάτη diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang index 26a0e5802bc..438a99de606 100644 --- a/htdocs/langs/el_GR/stocks.lang +++ b/htdocs/langs/el_GR/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Μέση σταθμική τιμή PMPValueShort=WAP EnhancedValueOfWarehouses=Αποθήκες αξία UserWarehouseAutoCreate=Δημιουργήστε μια αποθήκη αυτόματα κατά τη δημιουργία ενός χρήστη +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Ποσότητα αποστέλλονται QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Η αποθήκη %s να να χρησιμοπ WarehouseForStockIncrease=Η αποθήκη %s θα χρησιμοποιηθεί για την αύξηση των αποθεμάτων ForThisWarehouse=Για αυτή την αποθήκη ReplenishmentStatusDesc=Αυτή είναι η λίστα όλων των προϊόντων με απόθεμα κάτω από το επιθυμητό απόθεμα (ή χαμηλότερες από την αξία συναγερμού, εφόσον κουτάκι "ειδοποίηση μόνο" είναι επιλεγμένο), και προτείνουμε να δημιουργήσετε παραγγελίες σε προμηθευτές για να αναπληρώσει τη διαφορά. -ReplenishmentOrdersDesc=Αυτή είναι η λίστα όλων των ανοικτών παραγγελιών σε προμηθευτές +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Αναπληρώσεις NbOfProductBeforePeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (< %s) NbOfProductAfterPeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang index 8a37a970d19..34b5a692b6f 100644 --- a/htdocs/langs/el_GR/suppliers.lang +++ b/htdocs/langs/el_GR/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Προμηθευτές -Supplier=Προμηθευτής AddSupplier=Δημιουργία προμηθευτή SupplierRemoved=Ο προμηθευτής αφαιρέθηκε SuppliersInvoice=Τιμολόγιο προμηθευτή @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Τιμολόγια και πληρωμές προμ ExportDataset_fournisseur_3=Παραγγελίες σε προμηθευτές και σειρά γραμμών ApproveThisOrder=Έγκριση της παραγγελίας ConfirmApproveThisOrder=Είστε σίγουροι ότι θέλετε να εγκρίνετε την παραγγελία %s ; -DenyingThisOrder=Άρνηση της παραγγελίας +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Είστε σίγουροι ότι θέλετε να αρνηθείτε την παραγγελία %s ; ConfirmCancelThisOrder=Είστε σίγουροι ότι θέλετε να ακυρώσετε την παραγγελία %s ; AddCustomerOrder=Δημιουργία παραγγελίας πελάτη diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang index 4de061f4c84..fff849b2bf4 100644 --- a/htdocs/langs/el_GR/trips.lang +++ b/htdocs/langs/el_GR/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Ταξίδι -Trips=Ταξίδια -TripsAndExpenses=Ταξίδια και έξοδα -TripsAndExpensesStatistics=Στατιστικά ταξιδιών και εξόδων -TripCard=Καρτέλα ταξιδιού -AddTrip=Δημιουργία ταξιδιού -ListOfTrips=Λίστα ταξιδιών +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Λίστα φόρων -NewTrip=Νέο ταξίδι +NewTrip=New expense report CompanyVisited=Έγινε επίσκεψη σε εταιρία/οργανισμό Kilometers=Χιλιόμετρα FeesKilometersOrAmout=Σύνολο χλμ -DeleteTrip=Διαγραφή ταξιδιού -ConfirmDeleteTrip=Είστε σίγουροι ότι θέλετε να διαγράψετε το ταξίδι; -TF_OTHER=Άλλο -TF_LUNCH=Γεύμα -TF_TRIP=Ταξίδι -ListTripsAndExpenses=Λίστα ταξιδιών και εξόδων -ExpensesArea=Ταξίδια και έξοδα περιοχή -SearchATripAndExpense=Αναζήτηση ένα ταξίδι και τα έξοδα +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Ταξινομήστε «επιστραφεί» +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Άλλο +TF_TRANSPORTATION=Transportation +TF_LUNCH=Γεύμα +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/en_AU/bills.lang b/htdocs/langs/en_AU/bills.lang index 737f979cf47..8d5dc2add1a 100644 --- a/htdocs/langs/en_AU/bills.lang +++ b/htdocs/langs/en_AU/bills.lang @@ -1,2 +1,2 @@ -# Dolibarr language file - en_AU - bills -BankCode=Bank code or BSB \ No newline at end of file +# Dolibarr language file - Source file is en_US - bills +BankCode=Bank code or BSB diff --git a/htdocs/langs/en_AU/companies.lang b/htdocs/langs/en_AU/companies.lang index 93ff6ae4990..42069924aee 100644 --- a/htdocs/langs/en_AU/companies.lang +++ b/htdocs/langs/en_AU/companies.lang @@ -1,9 +1,6 @@ -# Dolibarr language file - en_AU - companies -# This file contains only line that must differs from en_US +# Dolibarr language file - Source file is en_US - companies VATIsUsed=GST is used VATIsNotUsed=GST is not used VATIntra=GST number VATIntraShort=GST number VATIntraVeryShort=GST -VATIntraSyntaxIsValid=Syntax is valid -VATIntraValueIsValid=Value is valid \ No newline at end of file diff --git a/htdocs/langs/en_AU/compta.lang b/htdocs/langs/en_AU/compta.lang index a49ba11a816..d655e71ddf6 100644 --- a/htdocs/langs/en_AU/compta.lang +++ b/htdocs/langs/en_AU/compta.lang @@ -1,5 +1,4 @@ -# Dolibarr language file - en_AU - compta -# This file contains only line that must differs from en_US +# Dolibarr language file - Source file is en_US - compta AmountHTVATRealReceived=Amount excl GST collected AmountHTVATRealPaid=Amount excl GST paid VATToPay=GST to pay @@ -11,5 +10,4 @@ VATCollected=GST collected NewVATPayment=New GST payment VATPayment=GST Payment VATPayments=GST Payments -TotalToPay=Total to pay -TotalVATReceived=Total GST received \ No newline at end of file +TotalVATReceived=Total GST received diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang index a2be380b7c2..27e0c30c352 100644 --- a/htdocs/langs/en_AU/main.lang +++ b/htdocs/langs/en_AU/main.lang @@ -1,5 +1,7 @@ -# Dolibarr language file - en_AU - main -# This file contains only lines that must differs from en_US file +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 SeparatorDecimal=, SeparatorThousand=Space FormatDateShort=%d/%m/%Y @@ -9,19 +11,14 @@ FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourTextShort=%d %b %Y %H:%M FormatDateHourText=%d %B %Y %H:%M -UnitPrice=Unit price UnitPriceHT=Unit price (excl GST) -UnitPriceTTC=Unit price -PriceU=U.P. -PriceUHT=U.P. (net) -PriceUTTC=U.P. -PriceUHTShort=P.U. HT -PriceUTTCShort=P.U. TTC AmountHT=Amount (excl GST) AmountTTC=Amount (incl GST) AmountVAT=Amount GST @@ -37,4 +34,4 @@ IncludedVAT=Included GST HT=excl GST TTC=Incl GST VAT=GST -VATRate=GST Rate \ No newline at end of file +VATRate=GST Rate diff --git a/htdocs/langs/en_AU/withdrawals.lang b/htdocs/langs/en_AU/withdrawals.lang index 59a88bb9fe0..503597bc8ec 100644 --- a/htdocs/langs/en_AU/withdrawals.lang +++ b/htdocs/langs/en_AU/withdrawals.lang @@ -1,2 +1,2 @@ -# Dolibarr language file - en_AU - withdrawals -ThirdPartyBankCode=Third party bank code or BSB \ No newline at end of file +# Dolibarr language file - Source file is en_US - withdrawals +ThirdPartyBankCode=Third party bank code or BSB diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang index 28a42a2d38e..d2ceaa175f8 100644 --- a/htdocs/langs/en_GB/admin.lang +++ b/htdocs/langs/en_GB/admin.lang @@ -1,2 +1,2 @@ -# Dolibarr language file - en_GB - admin +# Dolibarr language file - Source file is en_US - admin DictionaryVAT=VAT Rates diff --git a/htdocs/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang index 9c0e42f034e..289acc55386 100644 --- a/htdocs/langs/en_GB/banks.lang +++ b/htdocs/langs/en_GB/banks.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - en_GB - main +# Dolibarr language file - Source file is en_US - banks ValidateCheckReceipt=Validate this cheque receipt ? ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt, no change will be possible once this is done ? DeleteCheckReceipt=Delete this cheque receipt ? @@ -7,4 +7,4 @@ BankChecks=Bank cheques BankChecksToReceipt=Cheques waiting for deposit ShowCheckReceipt=Show cheque deposit receipt NumberOfCheques=Nb of cheque -SelectChequeTransactionAndGenerate=Select/filter cheques to include into the cheque deposit receipt and click on "Create". \ No newline at end of file +SelectChequeTransactionAndGenerate=Select/filter cheques to include into the cheque deposit receipt and click on "Create". diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang index 7f57d6e2fb8..025fcbe0f18 100644 --- a/htdocs/langs/en_GB/bills.lang +++ b/htdocs/langs/en_GB/bills.lang @@ -1,9 +1,18 @@ -# Dolibarr language file - en_GB - main -PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration. +# Dolibarr language file - Source file is en_US - bills +PaymentConditionShortRECEP=Due on Receipt +PaymentConditionRECEP=Due on Receipt +PaymentTypeVIR=Bank transfer +PaymentTypeShortVIR=Bank transfer +PaymentTypePRE=Direct debit +PaymentTypeShortPRE=Direct debit +PaymentTypeCHQ=Cheque +PaymentTypeShortCHQ=Cheque +BankCode=Sort code ChequeNumber=Cheque N° ChequeOrTransferNumber=Cheque/Transfer N° ChequeMaker=Cheque transmitter ChequeBank=Bank of Cheque +PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration. PaymentByChequeOrderedTo=Cheque payment (including tax) are payable to %s send to PaymentByChequeOrderedToShort=Cheque payment (including tax) are payable to MenuChequeDeposits=Cheques deposits @@ -13,26 +22,3 @@ ChequesReceipts=Cheques receipts ChequesArea=Cheques deposits area ChequeDeposits=Cheques deposits Cheques=Cheques -BankCode=Sort code - -# PaymentConditions -PaymentConditionShortRECEP=Due on Receipt -PaymentConditionRECEP=Due on Receipt - -# PaymentType -PaymentTypeVIR=Bank transfer -PaymentTypeShortVIR=Bank transfer -PaymentTypePRE=Direct debit -PaymentTypeShortPRE=Direct debit -PaymentTypeLIQ=Cash -PaymentTypeShortLIQ=Cash -PaymentTypeCB=Credit card -PaymentTypeShortCB=Credit card -PaymentTypeCHQ=Cheque -PaymentTypeShortCHQ=Cheque -PaymentTypeTIP=TIP -PaymentTypeShortTIP=TIP -PaymentTypeVAD=On line payment -PaymentTypeShortVAD=On line payment -PaymentTypeTRA=Bill payment -PaymentTypeShortTRA=Bill \ No newline at end of file diff --git a/htdocs/langs/en_GB/compta.lang b/htdocs/langs/en_GB/compta.lang index fdc28352121..8bd70a68704 100644 --- a/htdocs/langs/en_GB/compta.lang +++ b/htdocs/langs/en_GB/compta.lang @@ -1,7 +1,7 @@ -# Dolibarr language file - en_GB - main +# Dolibarr language file - Source file is en_US - compta CheckReceipt=Cheque deposit CheckReceiptShort=Cheque deposit NewCheckDeposit=New cheque deposit NoWaitingChecks=No cheques waiting for deposit. DateChequeReceived=Cheque reception date -NbOfCheques=Nb of cheques \ No newline at end of file +NbOfCheques=Nb of cheques diff --git a/htdocs/langs/en_GB/exports.lang b/htdocs/langs/en_GB/exports.lang index 4f035a9aea4..982dcc4bca9 100644 --- a/htdocs/langs/en_GB/exports.lang +++ b/htdocs/langs/en_GB/exports.lang @@ -1,2 +1 @@ -# Dolibarr language file - en_GB - exports -BankCode=Sort code \ No newline at end of file +# Dolibarr language file - Source file is en_US - exports diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang index 556febcaaaf..ced56a38a13 100644 --- a/htdocs/langs/en_GB/main.lang +++ b/htdocs/langs/en_GB/main.lang @@ -1,4 +1,7 @@ -# Dolibarr language file - en_GB - main +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y @@ -8,15 +11,16 @@ FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourTextShort=%d %b %Y %H:%M FormatDateHourText=%d %B %Y %H:%M +AmountVAT=Amount VAT TotalVAT=Total VAT IncludedVAT=Included VAT -HT=Net of tax TTC=Inc. VAT VAT=VAT VATRate=VAT Rate -AmountVAT=Amount VAT diff --git a/htdocs/langs/en_GB/other.lang b/htdocs/langs/en_GB/other.lang index 74c8e72f4c6..5c827f1c4ed 100644 --- a/htdocs/langs/en_GB/other.lang +++ b/htdocs/langs/en_GB/other.lang @@ -1,5 +1,4 @@ -# Dolibarr language file - en_US - other -VolumeUnitm3=m3 +# Dolibarr language file - Source file is en_US - other VolumeUnitdm3=dm3 (l) VolumeUnitcm3=cm3 (ml) -VolumeUnitmm3=mm3 (µl) \ No newline at end of file +VolumeUnitmm3=mm3 (µl) diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang index 31a47e78634..4e6f0c06015 100644 --- a/htdocs/langs/en_IN/admin.lang +++ b/htdocs/langs/en_IN/admin.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - en_IN - admin +# Dolibarr language file - Source file is en_US - admin Module20Name=Quotations Module20Desc=Quotation's management Permission21=Read quotations @@ -9,10 +9,9 @@ Permission26=Close quotations Permission27=Delete quotations Permission28=Export quotations WebCalAddEventOnStatusPropal=Add calendar event on quotations status change -##### Proposals ##### PropalSetup=Quotations module setup ProposalsNumberingModules=Quotations numbering modules ProposalsPDFModules=Quotations documents models HideTreadedPropal=Hide the treated quotations in the list FreeLegalTextOnProposal=Free text on quotations -WatermarkOnDraftProposal=Watermark on draft quotations (none if empty) \ No newline at end of file +WatermarkOnDraftProposal=Watermark on draft quotations (none if empty) diff --git a/htdocs/langs/en_IN/bills.lang b/htdocs/langs/en_IN/bills.lang index 24e1b4e307d..e7f2dd11cfc 100644 --- a/htdocs/langs/en_IN/bills.lang +++ b/htdocs/langs/en_IN/bills.lang @@ -1,10 +1,11 @@ -# Dolibarr language file - en_IN - bills +# Dolibarr language file - Source file is en_US - bills RelatedCommercialProposals=Related quotations +PaymentTypeShortCHQ=Cheque ChequeNumber=Cheque N° ChequeOrTransferNumber=Cheque/Transfer N° ChequeMaker=Cheque transmitter ChequeBank=Bank of Cheque -PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration. +PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration. PaymentByChequeOrderedTo=Cheque payment (including tax) are payable to %s send to PaymentByChequeOrderedToShort=Cheque payment (including tax) are payable to MenuChequeDeposits=Cheques deposits @@ -14,4 +15,3 @@ ChequesReceipts=Cheques receipts ChequesArea=Cheques deposits area ChequeDeposits=Cheques deposits Cheques=Cheques -PaymentTypeShortCHQ=Cheque diff --git a/htdocs/langs/en_IN/boxes.lang b/htdocs/langs/en_IN/boxes.lang index 73827f379f9..921fc0285aa 100644 --- a/htdocs/langs/en_IN/boxes.lang +++ b/htdocs/langs/en_IN/boxes.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - en_IN - boxes +# Dolibarr language file - Source file is en_US - boxes BoxLastProposals=Last quotations BoxTitleLastPropals=Last %s recorded quotations -NoRecordedProposals=No recorded quotations \ No newline at end of file +NoRecordedProposals=No recorded quotations diff --git a/htdocs/langs/en_IN/companies.lang b/htdocs/langs/en_IN/companies.lang index 2aade00195f..6c3e1637652 100644 --- a/htdocs/langs/en_IN/companies.lang +++ b/htdocs/langs/en_IN/companies.lang @@ -1,2 +1,2 @@ -# Dolibarr language file - en_IN - companies -Zip=Pin Code \ No newline at end of file +# Dolibarr language file - Source file is en_US - companies +Zip=Pin Code diff --git a/htdocs/langs/en_IN/compta.lang b/htdocs/langs/en_IN/compta.lang index a4baaf37679..ffd8565c10c 100644 --- a/htdocs/langs/en_IN/compta.lang +++ b/htdocs/langs/en_IN/compta.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - en_IN - compta +# Dolibarr language file - Source file is en_US - compta CheckReceipt=Cheque deposit CheckReceiptShort=Cheque deposit NewCheckDeposit=New cheque deposit diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang index 44f3c729259..7fbca74ca3d 100644 --- a/htdocs/langs/en_IN/main.lang +++ b/htdocs/langs/en_IN/main.lang @@ -1,5 +1,7 @@ -# Dolibarr language file - en_US - main +# Dolibarr language file - Source file is en_US - main DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y @@ -9,16 +11,17 @@ FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%I:%M %p +FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y FormatDateText=%B %d, %Y FormatDateHourShort=%d/%m/%Y %I:%M %p +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourTextShort=%d %b %Y, %I:%M %p FormatDateHourText=%d %B %Y, %I:%M %p -CommercialProposalsShort=Quotations +AmountVAT=Amount VAT TotalVAT=Total VAT IncludedVAT=Included VAT -HT=Net of tax TTC=Inc. VAT VAT=VAT VATRate=VAT Rate -AmountVAT=Amount VAT +CommercialProposalsShort=Quotations diff --git a/htdocs/langs/en_IN/other.lang b/htdocs/langs/en_IN/other.lang index 9f02c19eee2..67a6767b663 100644 --- a/htdocs/langs/en_IN/other.lang +++ b/htdocs/langs/en_IN/other.lang @@ -1,2 +1,2 @@ -# Dolibarr language file - en_US - other +# Dolibarr language file - Source file is en_US - other PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \n\n You will find here the quotation __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/en_IN/projects.lang b/htdocs/langs/en_IN/projects.lang index 5c24ec1c76f..72a5a5089ce 100644 --- a/htdocs/langs/en_IN/projects.lang +++ b/htdocs/langs/en_IN/projects.lang @@ -1,2 +1,2 @@ -# Dolibarr language file - en_IN - projects -ListProposalsAssociatedProject=List of the quotations associated with the project \ No newline at end of file +# Dolibarr language file - Source file is en_US - projects +ListProposalsAssociatedProject=List of the quotations associated with the project diff --git a/htdocs/langs/en_IN/propal.lang b/htdocs/langs/en_IN/propal.lang index 7559a0af6ee..04f74459023 100644 --- a/htdocs/langs/en_IN/propal.lang +++ b/htdocs/langs/en_IN/propal.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - en_US - propal +# Dolibarr language file - Source file is en_US - propal Proposals=Quotations Proposal=Quotation ProposalShort=Quotation @@ -40,12 +40,9 @@ OtherPropals=Other quotations CopyPropalFrom=Create quotation by copying existing quotation CreateEmptyPropal=Create empty quotation or from list of products/services DefaultProposalDurationValidity=Default quotation validity duration (in days) -UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address ClonePropal=Clone quotation ConfirmClonePropal=Are you sure you want to clone this quotation %s ? ProposalsAndProposalsLines=Quotation and lines ProposalLine=Quotation line -# Document models DocModelAzurDescription=A complete quotation (logo...) DocModelJauneDescription=Jaune quotation model -DocModelRoigDescription=A complete quotation model with Spanish tax RE and IRPF diff --git a/htdocs/langs/en_NZ/companies.lang b/htdocs/langs/en_NZ/companies.lang index 461f74aef64..42069924aee 100644 --- a/htdocs/langs/en_NZ/companies.lang +++ b/htdocs/langs/en_NZ/companies.lang @@ -1,9 +1,6 @@ -# Dolibarr language file - en_NZ - companies -# This file contains only line that must differs from en_US +# Dolibarr language file - Source file is en_US - companies VATIsUsed=GST is used VATIsNotUsed=GST is not used VATIntra=GST number VATIntraShort=GST number VATIntraVeryShort=GST -VATIntraSyntaxIsValid=Syntax is valid -VATIntraValueIsValid=Value is valid \ No newline at end of file diff --git a/htdocs/langs/en_NZ/compta.lang b/htdocs/langs/en_NZ/compta.lang index 238053d97a7..d655e71ddf6 100644 --- a/htdocs/langs/en_NZ/compta.lang +++ b/htdocs/langs/en_NZ/compta.lang @@ -1,5 +1,4 @@ -# Dolibarr language file - en_NZ - compta -# This file contains only line that must differs from en_US +# Dolibarr language file - Source file is en_US - compta AmountHTVATRealReceived=Amount excl GST collected AmountHTVATRealPaid=Amount excl GST paid VATToPay=GST to pay @@ -11,5 +10,4 @@ VATCollected=GST collected NewVATPayment=New GST payment VATPayment=GST Payment VATPayments=GST Payments -TotalToPay=Total to pay -TotalVATReceived=Total GST received \ No newline at end of file +TotalVATReceived=Total GST received diff --git a/htdocs/langs/en_NZ/main.lang b/htdocs/langs/en_NZ/main.lang index d07603dfbd8..93e9771e575 100644 --- a/htdocs/langs/en_NZ/main.lang +++ b/htdocs/langs/en_NZ/main.lang @@ -1,5 +1,7 @@ -# Dolibarr language file - en_NZ - main -# This file contains only line that must differs from en_US file +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y @@ -9,19 +11,14 @@ FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourTextShort=%d %b %Y %H:%M FormatDateHourText=%d %B %Y %H:%M -UnitPrice=Unit price UnitPriceHT=Unit price (excl GST) -UnitPriceTTC=Unit price -PriceU=U.P. -PriceUHT=U.P. (net) -PriceUTTC=U.P. -PriceUHTShort=P.U. HT -PriceUTTCShort=P.U. TTC AmountHT=Amount (excl GST) AmountTTC=Amount (incl GST) AmountVAT=Amount GST @@ -37,4 +34,4 @@ IncludedVAT=Included GST HT=excl GST TTC=Incl GST VAT=GST -VATRate=GST Rate \ No newline at end of file +VATRate=GST Rate diff --git a/htdocs/langs/en_SA/main.lang b/htdocs/langs/en_SA/main.lang index 8712c2081e1..f8402963091 100644 --- a/htdocs/langs/en_SA/main.lang +++ b/htdocs/langs/en_SA/main.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - en_SA - main +# Dolibarr language file - Source file is en_US - main DIRECTION=ltr FONTFORPDF=DejaVuSans FONTSIZEFORPDF=9 @@ -15,5 +15,6 @@ FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y FormatDateHourShort=%d/%m/%Y %I:%M %p +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourTextShort=%d %b %Y, %I:%M %p -FormatDateHourText=%d %B %Y, %I:%M %p \ No newline at end of file +FormatDateHourText=%d %B %Y, %I:%M %p diff --git a/htdocs/langs/en_SA/propal.lang b/htdocs/langs/en_SA/propal.lang index 6f5ff0a090c..459cdde70f6 100644 --- a/htdocs/langs/en_SA/propal.lang +++ b/htdocs/langs/en_SA/propal.lang @@ -1,7 +1,7 @@ -# Dolibarr language file - en_SA - propal +# Dolibarr language file - Source file is en_US - propal Proposals=Commercial Proposals Proposal=Commercial Proposal Prop=Commercial Proposals CommercialProposal=Commercial Proposal CommercialProposals=Commercial Proposals -DateEndPropal=Validity Ending Date \ No newline at end of file +DateEndPropal=Validity Ending Date diff --git a/htdocs/langs/en_ZA/companies.lang b/htdocs/langs/en_ZA/companies.lang index f41855b944d..70564679d5f 100644 --- a/htdocs/langs/en_ZA/companies.lang +++ b/htdocs/langs/en_ZA/companies.lang @@ -1,9 +1 @@ -# Dolibarr language file - en_ZA - companies -# This file contains only line that must differs from en_US -VATIsUsed=VAT is used -VATIsNotUsed=VAT is not used -VATIntra=VAT number -VATIntraShort=VAT number -VATIntraVeryShort=VAT -VATIntraSyntaxIsValid=Syntax is valid -VATIntraValueIsValid=Value is valid \ No newline at end of file +# Dolibarr language file - Source file is en_US - companies diff --git a/htdocs/langs/en_ZA/compta.lang b/htdocs/langs/en_ZA/compta.lang index 1767142a837..1738634c769 100644 --- a/htdocs/langs/en_ZA/compta.lang +++ b/htdocs/langs/en_ZA/compta.lang @@ -1,15 +1 @@ -# Dolibarr language file - en_ZA - compta -# This file contains only line that must differs from en_US -AmountHTVATRealReceived=Amount excl VAT collected -AmountHTVATRealPaid=Amount excl VAT paid -VATToPay=VAT to pay -VATReceived=VAT received -VATToCollect=VAT to collect -VATSummary=VAT Summary -VATPaid=VAT paid -VATCollected=VAT collected -NewVATPayment=New VAT payment -VATPayment=VAT Payment -VATPayments=VAT Payments -TotalToPay=Total to pay -TotalVATReceived=Total VAT received \ No newline at end of file +# Dolibarr language file - Source file is en_US - compta diff --git a/htdocs/langs/en_ZA/main.lang b/htdocs/langs/en_ZA/main.lang index d1aad81392a..a696d3c77d8 100644 --- a/htdocs/langs/en_ZA/main.lang +++ b/htdocs/langs/en_ZA/main.lang @@ -1,5 +1,7 @@ -# Dolibarr language file - en_ZA - main -# This file contains only line that must differs from en_US file +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%Y/%m/%d @@ -9,32 +11,10 @@ FormatDateShortJavaInput=yyyy/MM/yy FormatDateShortJQuery=yy/mm/yy FormatDateShortJQueryInput=yy/mm/dd FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p FormatDateHourTextShort=%d %b %Y %H:%M FormatDateHourText=%d %B %Y %H:%M -UnitPrice=Unit price -UnitPriceHT=Unit price (without VAT) -UnitPriceTTC=Unit price -PriceU=U.P. -PriceUHT=U.P. (net) -PriceUTTC=U.P. -PriceUHTShort=P.U. excl VAT -PriceUTTCShort=P.U. incl VAT -AmountHT=Amount (excl VAT) -AmountTTC=Amount (incl VAT) -AmountVAT=Amount VAT -PriceQtyHT=Price for this quantity excl VAT -PriceQtyMinHT=Price quantity min. excl VAT -PriceQtyTTC=Price for this quantity incl VAT -PriceQtyMinTTC=Price quantity min. incl VAT -TotalHT=Total (excl VAT) -TotalTTC=Total (incl VAT) -TotalTTCToYourCredit=Total (incl VAT) to your credit -TotalVAT=Total VAT -IncludedVAT=Included VAT -HT=excl VAT -TTC=Incl VAT -VAT=VAT -VATRate=VAT Rate \ No newline at end of file diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang index 39a4dac9a4e..8161a7a8e7c 100644 --- a/htdocs/langs/es_AR/admin.lang +++ b/htdocs/langs/es_AR/admin.lang @@ -4,5 +4,3 @@ Module30Desc=Gestión de facturas y notas de crédito a clientes. Gestión factu BillsNumberingModule=Módulo de numeración de facturas y notas de crédito CreditNoteSetup=Configuración del módulo notas de crédito CreditNotePDFModules=Modelo de documento de notas de crédito -CreditNote=Nota de crédito -CreditNotes=Notas de crédito diff --git a/htdocs/langs/es_AR/bills.lang b/htdocs/langs/es_AR/bills.lang index 8bd4d0b82d8..75496f66e43 100644 --- a/htdocs/langs/es_AR/bills.lang +++ b/htdocs/langs/es_AR/bills.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - es_AR - bills +# Dolibarr language file - Source file is en_US - bills InvoiceAvoir=Nota de crédito InvoiceAvoirAsk=Nota de crédito para corregir la factura InvoiceAvoirDesc=La nota de crédito es una factura negativa destinada a compensar un importe de factura que difiere del importe realmente pagado (por haber pagado de más o por devolución de productos, por ejemplo). @@ -11,12 +11,11 @@ ConfirmClassifyPaidPartiallyReasonAvoir=El resto a pagar (%s %s) se ha re ConfirmClassifyPaidPartiallyReasonOtherDesc=Esta elección será posible, por ejemplo, en los casos siguiente:
-pago parcial ya que una partida de productos se ha devuleto.
- reclamado por no entregar productos de la factura
En todos los casos, la reclamación debe regularizarse mediante una nota de crédito ShowInvoiceAvoir=Ver nota de crédito AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (excluidos las notas de crédito y anticipos) +AddCreditNote=Crear nota de crédito ShowDiscount=Ver la nota de crédito CreditNote=Nota de crédito CreditNotes=Notas de crédito DiscountFromCreditNote=Descuento resultante de la nota de crédito %s AbsoluteDiscountUse=Este tipo de crédito no puede ser utilizado en una factura antes de su validación -CreditNoteDepositUse=La factura debe de estar validada para poder utilizar este tipo de créditos CreditNoteConvertedIntoDiscount=Esta nota de crédito se convirtió en %s TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas y %syymm-nnnn para las notas de crédito donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0 -AddCreditNote=Crear nota de crédito \ No newline at end of file diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang index 458044a34c1..36f5cbcff4d 100644 --- a/htdocs/langs/es_AR/companies.lang +++ b/htdocs/langs/es_AR/companies.lang @@ -1,5 +1,5 @@ -# Dolibarr language file - es_AR - companies -CompanyHasCreditNote=Este cliente tiene %s %s notas de crédito/anticipos disponibles +# Dolibarr language file - Source file is en_US - companies VATIntra=CUIT VATIntraShort=CUIT -VATIntraVeryShort=CUIT \ No newline at end of file +VATIntraVeryShort=CUIT +CompanyHasCreditNote=Este cliente tiene %s %s notas de crédito/anticipos disponibles diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang index 6d24900d446..295151fbd08 100644 --- a/htdocs/langs/es_AR/stocks.lang +++ b/htdocs/langs/es_AR/stocks.lang @@ -1,3 +1,3 @@ -# Dolibarr language file - es_AR - stocks +# Dolibarr language file - Source file is en_US - stocks DeStockOnBill=Decrementar los stocks físicos sobre las facturas/notas de crédito a clientes ReStockOnBill=Incrementar los stocks físicos sobre las facturas/notas de crédito de proveedores diff --git a/htdocs/langs/es_CL/agenda.lang b/htdocs/langs/es_CL/agenda.lang index deefdc2275c..2418f69ed4c 100644 --- a/htdocs/langs/es_CL/agenda.lang +++ b/htdocs/langs/es_CL/agenda.lang @@ -1,2 +1,3 @@ +# Dolibarr language file - Source file is en_US - agenda PropalValidatedInDolibarr=Cotización %s validada -ProposalSentByEMail=Cotización %s enviada por e-mail \ No newline at end of file +ProposalSentByEMail=Cotización %s enviada por e-mail diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang index 63a78444437..2199e215bd6 100644 --- a/htdocs/langs/es_CL/bills.lang +++ b/htdocs/langs/es_CL/bills.lang @@ -1 +1,2 @@ -RelatedCommercialProposals=Cotizaciones asociadas \ No newline at end of file +# Dolibarr language file - Source file is en_US - bills +RelatedCommercialProposals=Cotizaciones asociadas diff --git a/htdocs/langs/es_CL/boxes.lang b/htdocs/langs/es_CL/boxes.lang index 970c91a8fe5..8c9a36c30fd 100644 --- a/htdocs/langs/es_CL/boxes.lang +++ b/htdocs/langs/es_CL/boxes.lang @@ -1,5 +1,6 @@ +# Dolibarr language file - Source file is en_US - boxes BoxLastProposals=Últimas cotizaciones BoxTitleLastPropals=Las %s últimas cotizaciones registradas NoRecordedProposals=Sin cotizaciones registradas BoxProposalsPerMonth=Cotizaciones por mes -ForProposals=Cotizaciones \ No newline at end of file +ForProposals=Cotizaciones diff --git a/htdocs/langs/es_CL/commercial.lang b/htdocs/langs/es_CL/commercial.lang index d468d7d5f19..78806e09307 100644 --- a/htdocs/langs/es_CL/commercial.lang +++ b/htdocs/langs/es_CL/commercial.lang @@ -1,4 +1,5 @@ +# Dolibarr language file - Source file is en_US - commercial SendPropalRef=Envío de la cotización %s ActionAC_PROP=Envío cotización por correo DraftPropals=Cotizaciones borrador -SearchPropal=Buscar una cotización \ No newline at end of file +SearchPropal=Buscar una cotización diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang index daef89c75cf..66d1f1d9dc1 100644 --- a/htdocs/langs/es_CL/companies.lang +++ b/htdocs/langs/es_CL/companies.lang @@ -1,2 +1,3 @@ +# Dolibarr language file - Source file is en_US - companies ContactForProposals=Contacto de cotizaciones -NoContactForAnyProposal=Este contacto no es contacto de ninguna cotización \ No newline at end of file +NoContactForAnyProposal=Este contacto no es contacto de ninguna cotización diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang index bf18ae78c5f..efe0bb1627b 100644 --- a/htdocs/langs/es_CL/compta.lang +++ b/htdocs/langs/es_CL/compta.lang @@ -1 +1,2 @@ -ProposalStats=Estadísticas de cotizaciones \ No newline at end of file +# Dolibarr language file - Source file is en_US - compta +ProposalStats=Estadísticas de cotizaciones diff --git a/htdocs/langs/es_CL/ecm.lang b/htdocs/langs/es_CL/ecm.lang index 3e20b3e6628..693bda9e4a2 100644 --- a/htdocs/langs/es_CL/ecm.lang +++ b/htdocs/langs/es_CL/ecm.lang @@ -1,2 +1,3 @@ +# Dolibarr language file - Source file is en_US - ecm DocsProposals=Documentos cotizaciones -ECMDocsByProposals=Documentos asociados a cotizaciones \ No newline at end of file +ECMDocsByProposals=Documentos asociados a cotizaciones diff --git a/htdocs/langs/es_CL/install.lang b/htdocs/langs/es_CL/install.lang index 40d447b8653..2e02f3816ab 100644 --- a/htdocs/langs/es_CL/install.lang +++ b/htdocs/langs/es_CL/install.lang @@ -1 +1,2 @@ -MigrationProposal=Migración de datos de cotizaciones \ No newline at end of file +# Dolibarr language file - Source file is en_US - install +MigrationProposal=Migración de datos de cotizaciones diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang index 90e98cca31d..dc549dfb838 100644 --- a/htdocs/langs/es_CL/main.lang +++ b/htdocs/langs/es_CL/main.lang @@ -1 +1,22 @@ -CommercialProposalsShort=Cotizaciones \ No newline at end of file +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 +SeparatorDecimal=, +SeparatorThousand=. +FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y +FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M +FormatDateTextShort=%d %b %Y +FormatDateText=%d %B %Y +FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourSecShort=%d/%m/%Y %H:%M:%S +FormatDateHourTextShort=%d %b %Y %H:%M +FormatDateHourText=%d %B %Y %H:%M +CommercialProposalsShort=Cotizaciones diff --git a/htdocs/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang index 59fd53dd993..4e770babbba 100644 --- a/htdocs/langs/es_CL/members.lang +++ b/htdocs/langs/es_CL/members.lang @@ -1 +1,2 @@ -TurnoverOrBudget=Volumen de ventas (empresa) o Cotización (asociación o colectivo) \ No newline at end of file +# Dolibarr language file - Source file is en_US - members +TurnoverOrBudget=Volumen de ventas (empresa) o Cotización (asociación o colectivo) diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang index 8810a19bcf8..d40140bd326 100644 --- a/htdocs/langs/es_CL/orders.lang +++ b/htdocs/langs/es_CL/orders.lang @@ -1 +1,2 @@ -OrderSource0=Cotización \ No newline at end of file +# Dolibarr language file - Source file is en_US - orders +OrderSource0=Cotización diff --git a/htdocs/langs/es_CL/other.lang b/htdocs/langs/es_CL/other.lang index f2b10a1a2d2..056e70bee9a 100644 --- a/htdocs/langs/es_CL/other.lang +++ b/htdocs/langs/es_CL/other.lang @@ -1,3 +1,4 @@ +# Dolibarr language file - Source file is en_US - other Notify_PROPAL_VALIDATE=Validación cotización cliente Notify_PROPAL_SENTBYMAIL=Envío cotización por e-mail PredefinedMailContentSendProposal=Buenos días, __CONTACTCIVNAME__ \n\n Nos ponemos en contacto con usted para facilitarle la cotización __PROPREF__\n\n Ante cualquier duda, consúltenos y será atendido a la mayor brevedad posible.\n\n __PERSONALIZED__Cordialmente\n\n__SIGNATURE__ @@ -6,4 +7,3 @@ NumberOfUnitsProposals=Número de unidades en las cotizaciones en los últimos 1 EMailTextProposalValidated=La cotización %s que le concierne ha sido validado. PropalClosedSignedInDolibarr=Cotización %s firmada en Dolibarr PropalClosedRefusedInDolibarr=Cotización %s rechazada en Dolibarr -PropalValidatedInDolibarr=Cotización %s validada en Dolibarr \ No newline at end of file diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang index cf82ea19c2b..9c1f2378871 100644 --- a/htdocs/langs/es_CL/products.lang +++ b/htdocs/langs/es_CL/products.lang @@ -1,3 +1,4 @@ +# Dolibarr language file - Source file is en_US - products AddToMyProposals=Añadir a mis cotizaciones AddToOtherProposals=Añadir a otras cotizaciones -NoteNotVisibleOnBill=Nota (no visible en las facturas, cotizaciones, etc.) \ No newline at end of file +NoteNotVisibleOnBill=Nota (no visible en las facturas, cotizaciones, etc.) diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang index a5ee33a39a4..d483e1e5659 100644 --- a/htdocs/langs/es_CL/projects.lang +++ b/htdocs/langs/es_CL/projects.lang @@ -1 +1,2 @@ -ListProposalsAssociatedProject=Listado de cotizaciones asociadas al proyecto \ No newline at end of file +# Dolibarr language file - Source file is en_US - projects +ListProposalsAssociatedProject=Listado de cotizaciones asociadas al proyecto diff --git a/htdocs/langs/es_CL/propal.lang b/htdocs/langs/es_CL/propal.lang index 8242c7d90a4..3099628ae7d 100644 --- a/htdocs/langs/es_CL/propal.lang +++ b/htdocs/langs/es_CL/propal.lang @@ -1,3 +1,4 @@ +# Dolibarr language file - Source file is en_US - propal Proposals=Cotizaciones Proposal=Cotización ProposalShort=Cotización @@ -11,7 +12,6 @@ ProposalCard=Ficha cotización NewProp=Nueva cotización NewProposal=Nueva cotización NewPropal=Nueva cotización -DeletePop=Eliminar cotización ValidateProp=Validar cotización AddProp=Crear cotización ConfirmDeleteProp=¿Está seguro de querer eliminar esta cotización? @@ -22,7 +22,6 @@ AllPropals=Todas las cotizacioness LastProposals=Últimas cotizaciones SearchAProposal=Buscar una cotización ProposalsStatistics=Estadísticas de cotizaciones -NumberOfUnitsProposals=Número de unidades en las cotizaciones en los últimos 12 meses NbOfProposals=Número cotizaciones ShowPropal=Ver cotización PropalStatusValidated=Validado (cotización abierta) @@ -37,7 +36,6 @@ RefProposal=Ref. cotización SendPropalByMail=Enviar cotización por e-mail AssociatedDocuments=Documentos asociados a la cotizacion DatePropal=Fecha cotización -ErrorPropalNotFound=Presupuesto %s inexistente Estimate=Cotización: EstimateShort=Cotización OtherPropals=Otras cotizaciones @@ -51,12 +49,10 @@ ConfirmClonePropal=¿Está seguro de querer clonar la cotización %s? ConfirmReOpenProp=¿Está seguro de querer reabrir la cotización %s ? ProposalsAndProposalsLines=Cotizaciones a clientes y líneas de cotizaciones ProposalLine=Línea de cotización -##### Types de contacts ##### TypeContact_propal_internal_SALESREPFOLL=Comercial seguimiento cotización TypeContact_propal_external_BILLING=Contacto cliente de facturación cotización TypeContact_propal_external_CUSTOMER=Contacto cliente seguimiento cotización -# Document models DocModelAzurDescription=Modelo de cotización completa (logo...) DocModelJauneDescription=Modelo de cotización Jaune DefaultModelPropalToBill=Modelo por defecto al cerrar una cotización (a facturar) -DefaultModelPropalClosed=Modelo por defecto al cerrar una cotización (no facturado) \ No newline at end of file +DefaultModelPropalClosed=Modelo por defecto al cerrar una cotización (no facturado) diff --git a/htdocs/langs/es_CL/workflow.lang b/htdocs/langs/es_CL/workflow.lang index 17b2915fc39..6f07885c897 100644 --- a/htdocs/langs/es_CL/workflow.lang +++ b/htdocs/langs/es_CL/workflow.lang @@ -1,3 +1,4 @@ +# Dolibarr language file - Source file is en_US - workflow descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear un pedido de cliente automáticamente a la firma de una cotización descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear una factura a cliente automáticamente a la firma de una cotización -descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar como facturada la cotización cuando el pedido de cliente relacionado se clasifique como pagado \ No newline at end of file +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar como facturada la cotización cuando el pedido de cliente relacionado se clasifique como pagado diff --git a/htdocs/langs/es_DO/companies.lang b/htdocs/langs/es_DO/companies.lang index 149e6ab15d4..564a9951b97 100644 --- a/htdocs/langs/es_DO/companies.lang +++ b/htdocs/langs/es_DO/companies.lang @@ -1,4 +1,4 @@ # Dolibarr language file - Source file is en_US - companies VATIsUsed=Sujeto a ITBIS VATIsNotUsed=No sujeto a ITBIS -VATIntraCheckDesc=El link %s permite consultar al servicio europeo de control de números de ITBIS intracomunitario. Se requiere acceso a internet para que el servicio funcione \ No newline at end of file +VATIntraCheckDesc=El link %s permite consultar al servicio europeo de control de números de ITBIS intracomunitario. Se requiere acceso a internet para que el servicio funcione diff --git a/htdocs/langs/es_DO/compta.lang b/htdocs/langs/es_DO/compta.lang index 4474b523ba5..9713057f7e2 100644 --- a/htdocs/langs/es_DO/compta.lang +++ b/htdocs/langs/es_DO/compta.lang @@ -25,4 +25,4 @@ RulesVATInProducts=- Para los bienes materiales, incluye el ITBIS de las factura RulesVATDueServices=- Para los servicios, el informe incluye el ITBIS de las facturas debidas, pagadas o no basándose en la fecha de estas facturas. RulesVATDueProducts=- Para los bienes materiales, incluye el ITBIS de las facturas basándose en la fecha de la factura. ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ITBIS repercutido -ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el ITBIS soportado \ No newline at end of file +ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el ITBIS soportado diff --git a/htdocs/langs/es_DO/main.lang b/htdocs/langs/es_DO/main.lang index 7076727abdd..21cb2cca37c 100644 --- a/htdocs/langs/es_DO/main.lang +++ b/htdocs/langs/es_DO/main.lang @@ -1,9 +1,5 @@ # Dolibarr language file - Source file is en_US - main DIRECTION=ltr -# Note for Chinese: -# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader) -# stsongstdlight or cid0cs are for simplified Chinese -# To read Chinese pdf with Linux: sudo apt-get install poppler-data FONTFORPDF=helvetica FONTSIZEFORPDF=10 SeparatorDecimal=, @@ -14,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y @@ -29,4 +26,4 @@ IncludedVAT=ITBIS incluido HT=Sin ITBIS TTC=ITBIS incluido VAT=ITBIS -VATRate=Tasa ITBIS \ No newline at end of file +VATRate=Tasa ITBIS diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 78ce8878190..45dc1e4858b 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=Desarrollo VersionUnknown=Desconocida VersionRecommanded=Recomendada +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID sesión SessionSaveHandler=Modalidad de salvaguardado de sesiones SessionSavePath=Localización salvaguardado de sesiones @@ -493,10 +498,16 @@ Module600Name=Notificaciones Module600Desc=Envío de notificaciones por e-mail en algunos eventos de negocio de Dolibarr a contactos de terceros (configurado en cada tercero) Module700Name=Donaciones Module700Desc=Gestión de donaciones +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Interfaz con el sistema de seguimiento de incidencias Mantis Module1400Name=Contabilidad experta Module1400Desc=Gestión experta de la contabilidad (doble partida) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categorías Module1780Desc=Gestión de categorías (productos, proveedores y clientes) Module2000Name=Editor WYSIWYG @@ -631,7 +642,7 @@ Permission181=Consultar pedidos a proveedores Permission182=Crear/modificar pedidos a proveedores Permission183=Validar pedidos a proveedores Permission184=Aprobar pedidos a proveedores -Permission185=Enviar pedidos a proveedores +Permission185=Order or cancel supplier orders Permission186=Recibir pedidos de proveedores Permission187=Cerrar pedidos a proveedores Permission188=Anular pedidos a proveedores @@ -711,6 +722,13 @@ Permission538=Exportar servicios Permission701=Consultar donaciones Permission702=Crear/modificar donaciones Permission703=Eliminar donaciones +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Consultar stocks Permission1002=Crear/modificar almacenes Permission1003=Eliminar almacenes @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Contraseña del servidor proxy DefineHereComplementaryAttributes=Defina aquí la lista de atributos adicionales, no disponibles por defecto, y que desea gestionar para %s. ExtraFields=Atributos adicionales ExtraFieldsLines=Atributos adicionales (líneas) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Atributos adicionales (terceros) ExtraFieldsContacts=Atributos adicionales (contactos/direcciones) ExtraFieldsMember=Atributos adicionales (miembros) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Una línea de producto/servicio que tiene una cantidad FreeLegalTextOnProposal=Texto libre en presupuestos WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Configuración del módulo pedidos OrdersNumberingModules=Módulos de numeración de los pedidos @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Códigos de barras tipo UPC BarcodeDescISBN=Códigos de barras tipo ISBN BarcodeDescC39=Códigos de barras tipo C39 BarcodeDescC128=Códigos de barras tipo C128 -GenbarcodeLocation=Herramienta de generación de códigos de barras en líneas de pedidos (utilizado por el motor phpbar para determinados tipos de códigos de barras) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Motor interno BarCodeNumberManager=Gestor para auto definir números de código de barras ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Tercero genérico a usar para las ventas CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja) CashDeskBankAccountForCheque= Cuenta por defecto a utilizar para los cobros con cheques CashDeskBankAccountForCB= Cuenta por defecto a utilizar para los cobros con tarjeta de crédito -CashDeskDoNotDecreaseStock=Desactivar decrementos de stock si una venta se realiza desde TPV +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Forzar y restringir almacén a usar para decremento de stock StockDecreaseForPointOfSaleDisabled=Decremento de stock desde TPV desactivado +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=Usted no ha desactivado el decremento de stock al hacer una venta desde TPV. Así que se requiere un almacén. ##### Bookmark ##### BookmarkSetup=Configuración del módulo Marcadores @@ -1569,3 +1597,7 @@ SortOrder=Ordenación Format=Formatear TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor IncludePath=Include path (definida en la variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang index 647e7987293..3117ecc1f15 100644 --- a/htdocs/langs/es_ES/banks.lang +++ b/htdocs/langs/es_ES/banks.lang @@ -33,7 +33,11 @@ AllTime=Mostrar saldo desde el inicio Reconciliation=Conciliación RIB=Cuenta bancaria IBAN=Identificador IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=Identificador BIC/SWIFT +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Domiciliaciones StandingOrder=Domiciliación Withdrawals=Reintregros @@ -148,7 +152,7 @@ BackToAccount=Volver a la cuenta ShowAllAccounts=Mostrar para todas las cuentas FutureTransaction=Transacción futura. No es posible conciliar. SelectChequeTransactionAndGenerate=Seleccione/filtre los cheques a incluir en la remesa y haga clic en "Crear". -InputReceiptNumber=Indique el extracto bancario relacionado con la conciliación. Utilice un valor numérico ordenable (por ejemplo, AAAAMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventualmente, indique una categoría en la que clasificar los registros ToConciliate=¿A conciliar? ThenCheckLinesAndConciliate=A continuación, compruebe las líneas presentes en el extracto bancario y haga clic diff --git a/htdocs/langs/es_ES/commercial.lang b/htdocs/langs/es_ES/commercial.lang index 99219ff6c2f..51de60229c8 100644 --- a/htdocs/langs/es_ES/commercial.lang +++ b/htdocs/langs/es_ES/commercial.lang @@ -62,7 +62,7 @@ LastProspectContactDone=Clientes potenciales contactados DateActionPlanned=Fecha planificación DateActionDone=Fecha realización ActionAskedBy=Acción preguntada por -ActionAffectedTo=Evento para +ActionAffectedTo=Event assigned to ActionDoneBy=Acción realizada por ActionUserAsk=Registrada por ErrorStatusCantBeZeroIfStarted=Si el campo 'Fecha de realización' contiene datos la acción está en curso , por lo que el campo ' Estado ' no puede ser 0%. diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang index 76dd3e925de..654a55badde 100644 --- a/htdocs/langs/es_ES/contracts.lang +++ b/htdocs/langs/es_ES/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expirado ServiceStatusClosed=Cerrado ServicesLegend=Leyenda para los servicios Contracts=Contratos +ContractsAndLine=Contracts and line of contracts Contract=Contrato NoContracts=Sin contratos MenuServices=Servicios diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang index d8d9065c901..d436847a411 100644 --- a/htdocs/langs/es_ES/cron.lang +++ b/htdocs/langs/es_ES/cron.lang @@ -84,3 +84,4 @@ CronType_command=Comando Shell CronMenu=Programador CronCannotLoadClass=No se puede cargar la clase %s u objeto %s UseMenuModuleToolsToAddCronJobs=Ir a "Inicio - Utilidades módulos - Lista de tareas Cron" para ver y editar tareas programadas. +TaskDisabled=Task disabled diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang index 18ee8a8a9ee..f8506d6e27b 100644 --- a/htdocs/langs/es_ES/errors.lang +++ b/htdocs/langs/es_ES/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=La cuenta origen y destino deben ser diferentes. ErrorBadThirdPartyName=Nombre de tercero incorrecto ErrorProdIdIsMandatory=El %s es obligatorio ErrorBadCustomerCodeSyntax=La sintaxis del código cliente es incorrecta -ErrorBadBarCodeSyntax=El código de barras no posee un formato válido +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Código cliente obligatorio ErrorBarCodeRequired=Código de barras requerido ErrorCustomerCodeAlreadyUsed=Código de cliente ya utilizado @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript no debe estar desactivado para que esta ErrorPasswordsMustMatch=Las 2 contraseñas indicadas deben corresponderse ErrorContactEMail=Se ha producido un error técnico. Contacte con el administrador al e-mail %s, indicando el código de error %s en su mensaje, o puede también adjuntar una copia de pantalla de esta página. ErrorWrongValueForField=Valor incorrecto para el campo número %s (el valor '%s' no cumple con la regla %s) -ErrorFieldValueNotIn=Valor incorrecto para el campo número %s (el valor '%s' no es un valor en el campo %s de la tabla %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Valor incorrecto para el campo número %s (el valor '%s' no es una referencia existente en %s) ErrorsOnXLines=Errores en %s líneas fuente ErrorFileIsInfectedWithAVirus=¡El antivirus no ha podido validar este archivo (es probable que esté infectado por un virus)! @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Error interno '%s' ErrorPriceExpressionUnknown=Error desconocido '%s' ErrorSrcAndTargetWarehouseMustDiffers=Los almacenes de origen y destino deben de ser diferentes ErrorTryToMakeMoveOnProductRequiringBatchData=Error, intenta hacer un movimiento de stock sin indicar lote/serie, en un producto que requiere de lote/serie +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang index a93ded0ce8e..9a567b19ed5 100644 --- a/htdocs/langs/es_ES/install.lang +++ b/htdocs/langs/es_ES/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Último paso: Indique aquí la cuenta y la contras ActivateModule=Activación del módulo %s ShowEditTechnicalParameters=Pulse aquí para ver/editar los parámetros técnicos (modo experto) WarningUpgrade=Atención:\nHa pensado en hacer una copia de seguridad de la base de datos?\nEs muy recomendable: por ejemplo, debido a algunos fallos en los sistemas de bases de datos (por ejemplo MySQL versión 5.5.40), algunos datos o tablas se pueden perder durante este proceso, por lo que es muy recomendable tener una copia completa de su base de datos antes de iniciar la migración.\n\nHaga clic en OK para iniciar el proceso de migración... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 80c77d8c09e..300e17729fe 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -141,6 +141,7 @@ Cancel=Anular Modify=Modificar Edit=Editar Validate=Validar +ValidateAndApprove=Validate and Approve ToValidate=A validar Save=Grabar SaveAs=Grabar como @@ -158,6 +159,7 @@ Search=Buscar SearchOf=Búsqueda de Valid=Validar Approve=Aprobar +Disapprove=Disapprove ReOpen=Reabrir Upload=Enviar archivo ToLink=Enlace @@ -219,6 +221,7 @@ Cards=Fichas Card=Ficha Now=Ahora Date=Fecha +DateAndHour=Date and hour DateStart=Fecha inicio DateEnd=Fecha fin DateCreation=Fecha de creación @@ -295,6 +298,7 @@ UnitPriceHT=Precio base UnitPriceTTC=Precio unitario total PriceU=P.U. PriceUHT=P.U. +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=P.U. Total Amount=Importe AmountInvoice=Importe factura @@ -521,6 +525,7 @@ DateFromTo=De %s a %s DateFrom=A partir de %s DateUntil=Hasta %s Check=Verificar +Uncheck=Uncheck Internal=Interno External=Externo Internals=Internos @@ -688,6 +693,7 @@ PublicUrl=URL pública AddBox=Añadir caja SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Refrescar PrintFile=Imprimir Archivo %s +ShowTransaction=Show transaction # Week day Monday=Lunes Tuesday=Martes diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang index 895a5c32915..46e87bd4dc7 100644 --- a/htdocs/langs/es_ES/orders.lang +++ b/htdocs/langs/es_ES/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Anulado StatusOrderDraft=Borrador (a validar) StatusOrderValidated=Validado StatusOrderOnProcess=Pedido - En espera de recibir +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Procesado StatusOrderToBill=Emitido StatusOrderToBill2=A facturar @@ -58,6 +59,7 @@ MenuOrdersToBill=Pedidos a facturar MenuOrdersToBill2=Pedidos facturables SearchOrder=Buscar un pedido SearchACustomerOrder=Buscar un pedido de cliente +SearchASupplierOrder=Search a supplier order ShipProduct=Enviar producto Discount=Descuento CreateOrder=Crear pedido diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang index fe430c2878c..01d97afcc34 100644 --- a/htdocs/langs/es_ES/other.lang +++ b/htdocs/langs/es_ES/other.lang @@ -54,12 +54,13 @@ MaxSize=Tamaño máximo AttachANewFile=Adjuntar nuevo archivo/documento LinkedObject=Objeto adjuntado Miscellaneous=Miscelánea -NbOfActiveNotifications=Número notificaciones +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Esto es un correo de prueba.\nLas 2 líneas están separadas por un retorno de carro a la línea. PredefinedMailTestHtml=Esto es un e-mail de prueba(la palabra prueba debe de estar en negrita).
Las 2 líneas están separadas por un retorno de carro en la línea PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nQueremos recordarle que su factura __FACREF__ parece estar pendiente de pago. Le adjuntamos la factura en cuestión, como recordatorio.\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nLe adjuntamos el presupuesto __PROPREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nLe adjuntamos el pedido __ORDERREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLe adjuntamos nuestro pedido __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__ diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang index 6fa46be9db5..8540dfd80c9 100644 --- a/htdocs/langs/es_ES/productbatch.lang +++ b/htdocs/langs/es_ES/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Número Lote/Serie l_eatby=Fecha de caducidad l_sellby=Fecha límite de venta DetailBatchNumber=Detalles del lote/serie -DetailBatchFormat=Lote/Serie: %s - Caducidad: %s - Límite venta: %s (Stock: %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Lote: %s printEatby=Caducidad: %s printSellby=Límite venta: %s diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang index e07e882a1ee..ab2875577b0 100644 --- a/htdocs/langs/es_ES/products.lang +++ b/htdocs/langs/es_ES/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=En productos y servicios, y precios de proveedor est PriceExpressionEditorHelp4=Solamente en los precios de productos y servicios: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Modo precio PriceNumeric=Número +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index b17e8892198..b5c4081e1ba 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -8,8 +8,10 @@ SharedProject=Proyecto compartido PrivateProject=Contactos del proyecto MyProjectsDesc=Esta vista muestra aquellos proyectos en los que usted es un contacto afectado (cualquier tipo). ProjectsPublicDesc=Esta vista muestra todos los proyectos a los que usted tiene derecho a visualizar. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Esta vista muestra todos los proyectos (sus permisos de usuario le permiten tener una visión completa). MyTasksDesc=Esta vista se limita a los proyectos y tareas en los que usted es un contacto afectado en al menos una tarea (cualquier tipo). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Esta vista muestra todos los proyectos y tareas en los que usted tiene derecho a tener visibilidad. TasksDesc=Esta vista muestra todos los proyectos y tareas (sus permisos de usuario le permiten tener una visión completa). ProjectsArea=Área proyectos @@ -29,6 +31,8 @@ NoProject=Ningún proyecto definido NbOpenTasks=Nº tareas abiertas NbOfProjects=Nº de proyectos TimeSpent=Tiempo dedicado +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Tiempos dedicados RefTask=Ref. tarea LabelTask=Etiqueta tarea @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Listado de pedidos a proveedores asociados a ListSupplierInvoicesAssociatedProject=Listado de facturas de proveedor asociados al proyecto ListContractAssociatedProject=Listado de contratos asociados al proyecto ListFichinterAssociatedProject=Listado de intervenciones asociadas al proyecto -ListTripAssociatedProject=Listado notas de honorarios asociadas al proyecto +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Lista de eventos asociados al proyecto ActivityOnProjectThisWeek=Actividad en el proyecto esta semana ActivityOnProjectThisMonth=Actividad en el proyecto este mes @@ -133,3 +137,6 @@ SearchAProject=Buscar un proyecto ProjectMustBeValidatedFirst=El proyecto debe validarse primero ProjectDraft=Proyectos borrador FirstAddRessourceToAllocateTime=Asociar un recurso para asignar tiempo consumido +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang index c8e3707d5df..6995284079c 100644 --- a/htdocs/langs/es_ES/salaries.lang +++ b/htdocs/langs/es_ES/salaries.lang @@ -10,3 +10,4 @@ SalariesPayments=Pagos de salarios ShowSalaryPayment=Ver pago THM=Precio medio por hora TJM=Precio medio por día +CurrentSalary=Current salary diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang index cf377a641db..c119cd363d2 100644 --- a/htdocs/langs/es_ES/sendings.lang +++ b/htdocs/langs/es_ES/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Cant. pedida QtyShipped=Cant. enviada QtyToShip=Cant. a enviar QtyReceived=Cant. recibida -KeepToShip=Queda por enviar +KeepToShip=Remain to ship OtherSendingsForSameOrder=Otros envíos de este pedido DateSending=Fecha de expedición DateSendingShort=Fecha de expedición diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang index c45945ede6e..bb9f7423361 100644 --- a/htdocs/langs/es_ES/stocks.lang +++ b/htdocs/langs/es_ES/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Valor (PMP) PMPValueShort=PMP EnhancedValueOfWarehouses=Valor de stocks UserWarehouseAutoCreate=Crear automáticamente existencias/almacén propio del usuario en la creación del usuario +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Cantidad recibida QtyDispatchedShort=Cant. recibida QtyToDispatchShort=Cant. a enviar @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Para el decremento de stock se usará el almacén % WarehouseForStockIncrease=Para el incremento de stock se usará el almacén %s ForThisWarehouse=Para este almacén ReplenishmentStatusDesc=Esta es la lista de todos los productos con un stock menor que el stock deseado (o menor que el valor de alerta si el checkbox "sólo alertas" está marcado) y que sugiere crear pedidos de proveedor para rellenar la diferencia. -ReplenishmentOrdersDesc=Este es el listado de pedidos a proveedores en curso +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Reaprovisionamiento NbOfProductBeforePeriod=Cantidad del producto %s en stock antes del periodo seleccionado (< %s) NbOfProductAfterPeriod=Cantidad del producto %s en stock después del periodo seleccionado (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contenido en el paquete ShowWarehouse=Mostrar almacén MovementCorrectStock=Corrección de stock del producto %s MovementTransferStock=Transferencia de stock del producto %s a otro almacén +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang index a7d37289ca7..7e0f2718572 100644 --- a/htdocs/langs/es_ES/suppliers.lang +++ b/htdocs/langs/es_ES/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Proveedores -Supplier=Proveedor AddSupplier=Crear un proveedor SupplierRemoved=Proveedor eliminado SuppliersInvoice=Factura proveedor @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Facturas proveedores y pagos ExportDataset_fournisseur_3=Pedidos de proveedores y líneas de pedido ApproveThisOrder=Aprobar este pedido ConfirmApproveThisOrder=¿Está seguro de querer aprobar el pedido a proveedor %s? -DenyingThisOrder=Denegar este pedido +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=¿Está seguro de querer denegar el pedido a proveedor %s? ConfirmCancelThisOrder=¿Está seguro de querer cancelar el pedido a proveedor %s? AddCustomerOrder=Crear pedido de cliente diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang index ff2cdf724bd..b75dbfd2bad 100644 --- a/htdocs/langs/es_ES/trips.lang +++ b/htdocs/langs/es_ES/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Desplazamiento -Trips=Desplazamientos -TripsAndExpenses=Honorarios -TripsAndExpensesStatistics=Estadísticas de honorarios -TripCard=Ficha honorario -AddTrip=Crear honorario -ListOfTrips=Listado de honorarios +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Listado notas de honorarios -NewTrip=Nuevo honorario +NewTrip=New expense report CompanyVisited=Empresa/institución visitada Kilometers=Kilometros FeesKilometersOrAmout=Importe o kilómetros -DeleteTrip=Eliminar honorario -ConfirmDeleteTrip=¿Está seguro de querer eliminar este honorario? -TF_OTHER=Otro -TF_LUNCH=Dieta -TF_TRIP=Viaje -ListTripsAndExpenses=Listado notas de honorarios -ExpensesArea=Área de Notas de honorarios -SearchATripAndExpense=Buscar un honorario +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Clasificar 'Reembolsado' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Otro +TF_TRANSPORTATION=Transportation +TF_LUNCH=Dieta +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/es_HN/bills.lang b/htdocs/langs/es_HN/bills.lang index f7136eb8fdf..62504667750 100644 --- a/htdocs/langs/es_HN/bills.lang +++ b/htdocs/langs/es_HN/bills.lang @@ -1,9 +1,7 @@ -# Dolibarr language file - es_HN - bills +# Dolibarr language file - Source file is en_US - bills ErrorVATIntraNotConfigured=Número de ISV intracomunitario aún no configurado ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar (%s %s) es un descuento acordado después de la factura. Acepto perder el ISV de este descuento AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin ISV) IntracommunityVATNumber=Número de ISV intracomunitario VATIsNotUsedForInvoice=* ISV no aplicable art-293B del CGI -PDFBerniqueDescription=Modelo para las facturas con varios tipos de ISV, incluido también el número de ISV Intracomunitario PDFCrabeDescription=Modelo de factura completo (ISV, método de pago a mostrar, logotipo...) -PDFOursinDescription=Modelo de factura completo (ISV, métodos de pago, entregas, nombre del proyecto, referencias de presupuesto, logotipo...) diff --git a/htdocs/langs/es_HN/companies.lang b/htdocs/langs/es_HN/companies.lang index 3ffed8aac17..25fd5487290 100644 --- a/htdocs/langs/es_HN/companies.lang +++ b/htdocs/langs/es_HN/companies.lang @@ -1,6 +1,6 @@ -# Dolibarr language file - es_HN - companies +# Dolibarr language file - Source file is en_US - companies VATIsUsed=Sujeto a ISV VATIsNotUsed=No sujeto a ISV VATIntra=RTN VATIntraShort=RTN -VATIntraVeryShort=RTN \ No newline at end of file +VATIntraVeryShort=RTN diff --git a/htdocs/langs/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang index 396d234b2df..9fede56fc29 100644 --- a/htdocs/langs/es_HN/compta.lang +++ b/htdocs/langs/es_HN/compta.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - es_HN - compta +# Dolibarr language file - Source file is en_US - compta VATToPay=ISV ventas VATReceived=ISV repercutido VATToCollect=ISV compras @@ -9,7 +9,6 @@ PaymentVat=Pago ISV NewVATPayment=Nuevo pago de ISV VATPayment=Pago ISV VATPayments=Pagos ISV -SocialContributionsPayments=Pagos cargas sociales ShowVatPayment=Ver pagos ISV TotalVATReceived=Total ISV percibido RulesResultDue=- Los importes mostrados son importes totales
- Incluye las facturas, cargas e ISV debidos, que estén pagadas o no.
- Se basa en la fecha de validación para las facturas y el ISV y en la fecha de vencimiento para las cargas.
@@ -20,6 +19,4 @@ VATReportByQuartersInInputOutputMode=Informe por tasa del ISV repercutido y paga VATReportByQuartersInDueDebtMode=Informe por tasa del ISV repercutido y pagado (ISV debido) SeeVATReportInInputOutputMode=Ver el informe %sISV pagado%s para un modo de cálculo estandard SeeVATReportInDueDebtMode=Ver el informe %sISV debido%s para un modo de cálculo con la opción sobre lo debido -RulesVATIn=- Para los servicios, el informe incluye el ISV de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el ISV de las facturas basándose en la fecha de la factura. -RulesVATDue=- Para los servicios, el informe incluye el ISV de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el ISV de las facturas basándose en la fecha de la factura. ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ISV (si no está definido en el diccionario "Tasas de ISV") diff --git a/htdocs/langs/es_HN/main.lang b/htdocs/langs/es_HN/main.lang index 371cb541453..5c9e6ffe29a 100644 --- a/htdocs/langs/es_HN/main.lang +++ b/htdocs/langs/es_HN/main.lang @@ -1,11 +1,28 @@ -Dolibarr language file - es_HN - main +# Dolibarr language file - Source file is en_US - main DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 SeparatorDecimal=, SeparatorThousand=None +FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y +FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M +FormatDateTextShort=%d %b %Y +FormatDateText=%d %B %Y +FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourSecShort=%d/%m/%Y %H:%M:%S +FormatDateHourTextShort=%d %b %Y %H:%M +FormatDateHourText=%d %B %Y %H:%M AmountVAT=Importe ISV TotalVAT=Total ISV IncludedVAT=ISV incluido HT=Sin ISV TTC=ISV incluido VAT=ISV -VATRate=Tasa ISV \ No newline at end of file +VATRate=Tasa ISV diff --git a/htdocs/langs/es_HN/propal.lang b/htdocs/langs/es_HN/propal.lang index 5b7ea08179a..a3356570a4b 100644 --- a/htdocs/langs/es_HN/propal.lang +++ b/htdocs/langs/es_HN/propal.lang @@ -1,2 +1,2 @@ -# Dolibarr language file - es_HN - propal -AmountOfProposalsByMonthHT=Importe por mes (Sin ISV) \ No newline at end of file +# Dolibarr language file - Source file is en_US - propal +AmountOfProposalsByMonthHT=Importe por mes (Sin ISV) diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang index 39a4dac9a4e..8161a7a8e7c 100644 --- a/htdocs/langs/es_MX/admin.lang +++ b/htdocs/langs/es_MX/admin.lang @@ -4,5 +4,3 @@ Module30Desc=Gestión de facturas y notas de crédito a clientes. Gestión factu BillsNumberingModule=Módulo de numeración de facturas y notas de crédito CreditNoteSetup=Configuración del módulo notas de crédito CreditNotePDFModules=Modelo de documento de notas de crédito -CreditNote=Nota de crédito -CreditNotes=Notas de crédito diff --git a/htdocs/langs/es_MX/banks.lang b/htdocs/langs/es_MX/banks.lang index 98313c7cbed..a5411981c4b 100644 --- a/htdocs/langs/es_MX/banks.lang +++ b/htdocs/langs/es_MX/banks.lang @@ -1,2 +1,2 @@ -# Dolibarr language file - es_MX - banks -BankAccountDomiciliation=Tarjeta \ No newline at end of file +# Dolibarr language file - Source file is en_US - banks +BankAccountDomiciliation=Tarjeta diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang index 50dfc1f71c3..e62583d9e73 100644 --- a/htdocs/langs/es_MX/bills.lang +++ b/htdocs/langs/es_MX/bills.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - es_MX - bills +# Dolibarr language file - Source file is en_US - bills InvoiceAvoir=Nota de crédito InvoiceAvoirAsk=Nota de crédito para corregir la factura InvoiceAvoirDesc=La nota de crédito es una factura negativa destinada a compensar un importe de factura que difiere del importe realmente pagado (por haber pagado de más o por devolución de productos, por ejemplo). @@ -7,19 +7,18 @@ ConfirmConvertToReduc=¿Quiere convertir esta nota de crédito en una reducción AddBill=Crear factura o nota de crédito EnterPaymentDueToCustomer=Realizar pago de notas de crédito al cliente ErrorInvoiceAvoirMustBeNegative=Error, una factura de tipo nota de crédito debe tener un importe negativo +BillTo=Receptor ConfirmClassifyPaidPartiallyReasonAvoir=El resto a pagar (%s %s) se ha regularizado (ya que artículo se ha devuelto, olvidado entregar, descuento no definido...) mediante una nota de crédito ConfirmClassifyPaidPartiallyReasonOtherDesc=Esta elección será posible, por ejemplo, en los casos siguiente:
-pago parcial ya que una partida de productos se ha devuleto.
- reclamado por no entregar productos de la factura
En todos los casos, la reclamación debe regularizarse mediante una nota de crédito ShowInvoiceAvoir=Ver nota de crédito AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (excluidos las notas de crédito y anticipos) +AddCreditNote=Crear nota de crédito ShowDiscount=Ver la nota de crédito CreditNote=Nota de crédito CreditNotes=Notas de crédito DiscountFromCreditNote=Descuento resultante de la nota de crédito %s AbsoluteDiscountUse=Este tipo de crédito no puede ser utilizado en una factura antes de su validación -CreditNoteDepositUse=La factura debe de estar validada para poder utilizar este tipo de créditos +Residence=Tarjeta +PaymentByTransferOnThisBankAccount=Cuenta para depositos y transferencias CreditNoteConvertedIntoDiscount=Esta nota de crédito se convirtió en %s TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas y %syymm-nnnn para las notas de crédito donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0 -AddCreditNote=Crear nota de crédito -BillTo=Receptor -Residence=Tarjeta -PaymentByTransferOnThisBankAccount=Cuenta para depositos y transferencias \ No newline at end of file diff --git a/htdocs/langs/es_MX/categories.lang b/htdocs/langs/es_MX/categories.lang index 62392ec33f5..7e6b383c287 100644 --- a/htdocs/langs/es_MX/categories.lang +++ b/htdocs/langs/es_MX/categories.lang @@ -1,2 +1,2 @@ -# Dolibarr language file - es_MX - categories -NotCategorized=Sin Categoría \ No newline at end of file +# Dolibarr language file - Source file is en_US - categories +NotCategorized=Sin Categoría diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang index 4bbfff9bf2c..3727bea2735 100644 --- a/htdocs/langs/es_MX/companies.lang +++ b/htdocs/langs/es_MX/companies.lang @@ -1,7 +1,7 @@ -# Dolibarr language file - es_MX - companies +# Dolibarr language file - Source file is en_US - companies State=Estado Town=Municipio -CompanyHasCreditNote=Este cliente tiene %s %s notas de crédito/anticipos disponibles VATIntra=RFC VATIntraShort=RFC -VATIntraVeryShort=RFC \ No newline at end of file +VATIntraVeryShort=RFC +CompanyHasCreditNote=Este cliente tiene %s %s notas de crédito/anticipos disponibles diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang index 4b26f3b3e23..cf154fa6429 100644 --- a/htdocs/langs/es_MX/main.lang +++ b/htdocs/langs/es_MX/main.lang @@ -1,6 +1,24 @@ -# Dolibarr language file - es_MX - main +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 SeparatorDecimal=. SeparatorThousand=, +FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y +FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M +FormatDateTextShort=%d %b %Y +FormatDateText=%d %B %Y +FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourSecShort=%d/%m/%Y %H:%M:%S +FormatDateHourTextShort=%d %b %Y %H:%M +FormatDateHourText=%d %B %Y %H:%M AmountHT=Subtotal TotalHT=Subtotal -TotalVAT=IVA \ No newline at end of file +TotalVAT=IVA diff --git a/htdocs/langs/es_MX/stocks.lang b/htdocs/langs/es_MX/stocks.lang index 84fbd98945f..295151fbd08 100644 --- a/htdocs/langs/es_MX/stocks.lang +++ b/htdocs/langs/es_MX/stocks.lang @@ -1,3 +1,3 @@ -# Dolibarr language file - es_MX - stocks +# Dolibarr language file - Source file is en_US - stocks DeStockOnBill=Decrementar los stocks físicos sobre las facturas/notas de crédito a clientes ReStockOnBill=Incrementar los stocks físicos sobre las facturas/notas de crédito de proveedores diff --git a/htdocs/langs/es_PE/bills.lang b/htdocs/langs/es_PE/bills.lang index 6ba6bb049a6..adca33be66b 100644 --- a/htdocs/langs/es_PE/bills.lang +++ b/htdocs/langs/es_PE/bills.lang @@ -1,9 +1,7 @@ -# Dolibarr language file - es_PU - bills +# Dolibarr language file - Source file is en_US - bills ErrorVATIntraNotConfigured=Número de IGV intracomunitario aún no configurado ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar (%s %s) es un descuento acordado después de la factura. Acepto perder el IGV de este descuento AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin IGV) IntracommunityVATNumber=Número de IGV intracomunitario VATIsNotUsedForInvoice=* IGV no aplicable art-293B del CGI -PDFBerniqueDescription=Modelo para las facturas con varios tipos de IGV, incluido también el número de IGV Intracomunitario PDFCrabeDescription=Modelo de factura completo (IGV, método de pago a mostrar, logotipo...) -PDFOursinDescription=Modelo de factura completo (IGV, métodos de pago, entregas, nombre del proyecto, referencias de presupuesto, logotipo...) diff --git a/htdocs/langs/es_PE/companies.lang b/htdocs/langs/es_PE/companies.lang index 7b0dbfe2c6c..70edcf69a8f 100644 --- a/htdocs/langs/es_PE/companies.lang +++ b/htdocs/langs/es_PE/companies.lang @@ -1,6 +1,6 @@ -# Dolibarr language file - es_PU - companies +# Dolibarr language file - Source file is en_US - companies VATIsUsed=Sujeto a IGV VATIsNotUsed=No sujeto a IGV VATIntra=RUC VATIntraShort=RUC -VATIntraVeryShort=RUC \ No newline at end of file +VATIntraVeryShort=RUC diff --git a/htdocs/langs/es_PE/compta.lang b/htdocs/langs/es_PE/compta.lang index 2dbc3cc49b9..00857e477f6 100644 --- a/htdocs/langs/es_PE/compta.lang +++ b/htdocs/langs/es_PE/compta.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - es_PU - compta +# Dolibarr language file - Source file is en_US - compta VATToPay=IGV ventas VATReceived=IGV repercutido VATToCollect=IGV compras @@ -9,7 +9,6 @@ PaymentVat=Pago IGV NewVATPayment=Nuevo pago de IGV VATPayment=Pago IGV VATPayments=Pagos IGV -SocialContributionsPayments=Pagos cargas sociales ShowVatPayment=Ver pagos IGV TotalVATReceived=Total IGV percibido RulesResultDue=- Los importes mostrados son importes totales
- Incluye las facturas, cargas e IGV debidos, que estén pagadas o no.
- Se basa en la fecha de validación para las facturas y el IGV y en la fecha de vencimiento para las cargas.
@@ -20,6 +19,4 @@ VATReportByQuartersInInputOutputMode=Informe por tasa del IGV repercutido y paga VATReportByQuartersInDueDebtMode=Informe por tasa del IGV repercutido y pagado (IGV debido) SeeVATReportInInputOutputMode=Ver el informe %sIGV pagado%s para un modo de cálculo estandard SeeVATReportInDueDebtMode=Ver el informe %sIGV debido%s para un modo de cálculo con la opción sobre lo debido -RulesVATIn=- Para los servicios, el informe incluye el IGV de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el IGV de las facturas basándose en la fecha de la factura. -RulesVATDue=- Para los servicios, el informe incluye el IGV de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el IGV de las facturas basándose en la fecha de la factura. ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IGV (si no está definido en el diccionario "Tasas de IGV") diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang index d49d7a3445f..4b1f525d2bd 100644 --- a/htdocs/langs/es_PE/main.lang +++ b/htdocs/langs/es_PE/main.lang @@ -1,11 +1,28 @@ -Dolibarr language file - es_PU - main +# Dolibarr language file - Source file is en_US - main DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 SeparatorDecimal=, SeparatorThousand=None +FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y +FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M +FormatDateTextShort=%d %b %Y +FormatDateText=%d %B %Y +FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourSecShort=%d/%m/%Y %H:%M:%S +FormatDateHourTextShort=%d %b %Y %H:%M +FormatDateHourText=%d %B %Y %H:%M AmountVAT=Importe IGV TotalVAT=Total IGV IncludedVAT=IGV incluido HT=Sin IGV TTC=IGV incluido VAT=IGV -VATRate=Tasa IGV \ No newline at end of file +VATRate=Tasa IGV diff --git a/htdocs/langs/es_PE/propal.lang b/htdocs/langs/es_PE/propal.lang index 6ee464d0e36..919d94b3e91 100644 --- a/htdocs/langs/es_PE/propal.lang +++ b/htdocs/langs/es_PE/propal.lang @@ -1,2 +1,2 @@ -# Dolibarr language file - es_PU - propal -AmountOfProposalsByMonthHT=Importe por mes (Sin IGV) \ No newline at end of file +# Dolibarr language file - Source file is en_US - propal +AmountOfProposalsByMonthHT=Importe por mes (Sin IGV) diff --git a/htdocs/langs/es_PR/bills.lang b/htdocs/langs/es_PR/bills.lang index 658b997e3ae..fc033b8169c 100644 --- a/htdocs/langs/es_PR/bills.lang +++ b/htdocs/langs/es_PR/bills.lang @@ -1,9 +1,7 @@ -# Dolibarr language file - es_PR - bills +# Dolibarr language file - Source file is en_US - bills ErrorVATIntraNotConfigured=Número de IVU intracomunitario aún no configurado ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar (%s %s) es un descuento acordado después de la factura. Acepto perder el IVU de este descuento AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin IVU) IntracommunityVATNumber=Número de IVU intracomunitario VATIsNotUsedForInvoice=* IVU no aplicable art-293B del CGI -PDFBerniqueDescription=Modelo para las facturas con varios tipos de IVU, incluido también el número de IVU Intracomunitario PDFCrabeDescription=Modelo de factura completo (IVU, método de pago a mostrar, logotipo...) -PDFOursinDescription=Modelo de factura completo (IVU, métodos de pago, entregas, nombre del proyecto, referencias de presupuesto, logotipo...) diff --git a/htdocs/langs/es_PR/companies.lang b/htdocs/langs/es_PR/companies.lang index 288e42f3027..080bedf4987 100644 --- a/htdocs/langs/es_PR/companies.lang +++ b/htdocs/langs/es_PR/companies.lang @@ -1,3 +1,3 @@ -# Dolibarr language file - es_PR - companies +# Dolibarr language file - Source file is en_US - companies VATIsUsed=Sujeto a IVU -VATIsNotUsed=No sujeto a IVU \ No newline at end of file +VATIsNotUsed=No sujeto a IVU diff --git a/htdocs/langs/es_PR/compta.lang b/htdocs/langs/es_PR/compta.lang index c9226abe8f1..f5e1dc17fce 100644 --- a/htdocs/langs/es_PR/compta.lang +++ b/htdocs/langs/es_PR/compta.lang @@ -1,4 +1,4 @@ -# Dolibarr language file - es_PR - compta +# Dolibarr language file - Source file is en_US - compta VATToPay=IVU ventas VATReceived=IVU repercutido VATToCollect=IVU compras @@ -9,7 +9,6 @@ PaymentVat=Pago IVU NewVATPayment=Nuevo pago de IVU VATPayment=Pago IVU VATPayments=Pagos IVU -SocialContributionsPayments=Pagos cargas sociales ShowVatPayment=Ver pagos IVU TotalVATReceived=Total IVU percibido RulesResultDue=- Los importes mostrados son importes totales
- Incluye las facturas, cargas e IVU debidos, que estén pagadas o no.
- Se basa en la fecha de validación para las facturas y el IVU y en la fecha de vencimiento para las cargas.
@@ -20,6 +19,4 @@ VATReportByQuartersInInputOutputMode=Informe por tasa del IVU repercutido y paga VATReportByQuartersInDueDebtMode=Informe por tasa del IVU repercutido y pagado (IVU debido) SeeVATReportInInputOutputMode=Ver el informe %sIVU pagado%s para un modo de cálculo estandard SeeVATReportInDueDebtMode=Ver el informe %sIVU debido%s para un modo de cálculo con la opción sobre lo debido -RulesVATIn=- Para los servicios, el informe incluye el IVU de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el IVU de las facturas basándose en la fecha de la factura. -RulesVATDue=- Para los servicios, el informe incluye el IVU de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el IVU de las facturas basándose en la fecha de la factura. ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVU (si no está definido en el diccionario "Tasas de IVU") diff --git a/htdocs/langs/es_PR/main.lang b/htdocs/langs/es_PR/main.lang index ea38a2bc1f5..5388286d4c9 100644 --- a/htdocs/langs/es_PR/main.lang +++ b/htdocs/langs/es_PR/main.lang @@ -1,11 +1,28 @@ -Dolibarr language file - es_PR - main +# Dolibarr language file - Source file is en_US - main DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 SeparatorDecimal=, SeparatorThousand=None +FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y +FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M +FormatDateTextShort=%d %b %Y +FormatDateText=%d %B %Y +FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourSecShort=%d/%m/%Y %H:%M:%S +FormatDateHourTextShort=%d %b %Y %H:%M +FormatDateHourText=%d %B %Y %H:%M AmountVAT=Importe IVU TotalVAT=Total IVU IncludedVAT=IVU incluido HT=Sin IVU TTC=IVU incluido VAT=IVU -VATRate=Tasa IVU \ No newline at end of file +VATRate=Tasa IVU diff --git a/htdocs/langs/es_PR/propal.lang b/htdocs/langs/es_PR/propal.lang index 06af96213cb..0d94e5671f2 100644 --- a/htdocs/langs/es_PR/propal.lang +++ b/htdocs/langs/es_PR/propal.lang @@ -1,2 +1,2 @@ -# Dolibarr language file - es_PR - propal -AmountOfProposalsByMonthHT=Importe por mes (Sin IVU) \ No newline at end of file +# Dolibarr language file - Source file is en_US - propal +AmountOfProposalsByMonthHT=Importe por mes (Sin IVU) diff --git a/htdocs/langs/es_PY/main.lang b/htdocs/langs/es_PY/main.lang index 0342d2da7c0..1602d6a7ffa 100644 --- a/htdocs/langs/es_PY/main.lang +++ b/htdocs/langs/es_PY/main.lang @@ -1,4 +1,21 @@ -Dolibarr language file - es_PY - main +# Dolibarr language file - Source file is en_US - main DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 SeparatorDecimal=, -SeparatorThousand=None \ No newline at end of file +SeparatorThousand=None +FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y +FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%H:%M +FormatHourShortDuration=%H:%M +FormatDateTextShort=%d %b %Y +FormatDateText=%d %B %Y +FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourSecShort=%d/%m/%Y %H:%M:%S +FormatDateHourTextShort=%d %b %Y %H:%M +FormatDateHourText=%d %B %Y %H:%M diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang index cc2f8c9915d..0ab2363364b 100644 --- a/htdocs/langs/et_EE/admin.lang +++ b/htdocs/langs/et_EE/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Eksperimentaalne VersionDevelopment=Arendusversioon VersionUnknown=Teadmata VersionRecommanded=Soovitatav +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Sessiooni ID SessionSaveHandler=Sessioonide töötleja SessionSavePath=Salvestuse sessiooni lokaliseerimine @@ -493,10 +498,16 @@ Module600Name=Teated Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Annetused Module700Desc=Annetuste haldamine +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantise integratsioon Module1400Name=Raamatupidamine Module1400Desc=Raamatupidamise haldamine (topelt isikud) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategooriad Module1780Desc=Kategooriate haldamine (tooted, hankijad ja kliendid) Module2000Name=WYSIWYG toimeti @@ -631,7 +642,7 @@ Permission181=Ostutellimuste vaatamine Permission182=Ostutellimuste loomine/muutmine Permission183=Ostutellimuste kinnitamine Permission184=Ostutellimuste heaks kiitmine -Permission185=Ostutellimuste tellimine +Permission185=Order or cancel supplier orders Permission186=Ostutellimuste vastu võtmine Permission187=Ostutellimuste sulgemine Permission188=Ostutellimuste tühistamine @@ -711,6 +722,13 @@ Permission538=Teenuste eksport Permission701=Annetuste vaatamine Permission702=Annetuste loomine/muutmine Permission703=Annetuste kustutamine +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Laojääkide vaatamine Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Puhverserveri salasõna DefineHereComplementaryAttributes=Määratle siin kõik %s toetamiseks vajalikud atribuudid, mis ei ole vaikimisi saadaval. ExtraFields=Täiendavad atribuudid ExtraFieldsLines=Lisaatribuudid (read) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Täiendavad atribuudid (thirdparty e kolmas isik) ExtraFieldsContacts=Täiendavad atribuudid (contact/address e kontakt/aadress) ExtraFieldsMember=Täiendavad atribuudid (member e liige) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Toote/teenuse rida, mille koguseks on märgitud 0, pee FreeLegalTextOnProposal=Vaba tekst pakkumistel WatermarkOnDraftProposal=Vesimärk pakkumiste mustanditel (puudub, kui tühi) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Tellimuste haldamise seadistamine OrdersNumberingModules=Tellimuste numeratsiooni mudelid @@ -1383,7 +1410,7 @@ BarcodeDescUPC=UPC tüüpi vöötkood BarcodeDescISBN=ISBN tüüpi vöötkood BarcodeDescC39=C39 tüüpi vöötkood BarcodeDescC128=C128 tüüpi vöötkood -GenbarcodeLocation=Käsurea tööriist vöötkoodi genereerimiseks (sisemine mootor kasutab seda mõnda tüüpi vöötkoodide loomiseks) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Sisemine mootor BarCodeNumberManager=Automaatselt määratletud vöötkoodide haldamine ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Sularahamaksete vastu võtmiseks kasutatav konto CashDeskBankAccountForCheque= Tšekimaksete vastu võtmiseks kasutatav konto CashDeskBankAccountForCB= Krediitkaardimaksete vastu võtmiseks kasutatav konto -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Järjehoidjate mooduli seadistamine @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Formaat TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang index ab73f169a23..1003b8caa8e 100644 --- a/htdocs/langs/et_EE/banks.lang +++ b/htdocs/langs/et_EE/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Vastavusse viimine RIB=Arvelduskonto number IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Püsikorraldused StandingOrder=Püsikorraldus Withdrawals=Väljamaksed @@ -148,7 +152,7 @@ BackToAccount=Tagasi konto juurde ShowAllAccounts=Näita kõigil kontodel FutureTransaction=Tehing toimub tulevikus, ajaline ühitamine pole võimalik. SelectChequeTransactionAndGenerate=Vali välja tšekid, mida lisada tšeki deponeerimise kinnitusse ning klõpsa "Loo" nupul. -InputReceiptNumber=Vali vastavusse viimisega seotud panga väljavõte. Kasuta sorteeritavat numbrilist väärtust (näiteks YYYYMM). +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Lõpuks vali kategooria, mille alla kanded klassifitseerida ToConciliate=Vii vastavusse? ThenCheckLinesAndConciliate=Siis märgista konto väljavõttel asuvad read ja klõpsa diff --git a/htdocs/langs/et_EE/commercial.lang b/htdocs/langs/et_EE/commercial.lang index d58174550dc..59657233c22 100644 --- a/htdocs/langs/et_EE/commercial.lang +++ b/htdocs/langs/et_EE/commercial.lang @@ -9,9 +9,9 @@ Prospect=Huviline Prospects=Huvilised DeleteAction=Kustuta tegevus/ülesanne NewAction=Uus tegevus/ülesanne -AddAction=Lisa tegevus/ülesanne -AddAnAction=Lisa tegevus/ülesanne -AddActionRendezVous=Lisa kohtumine +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Kohtumine ConfirmDeleteAction=Kas tahad kindlasti selle tegevuse/ülesande kustutada? CardAction=Tegevuse kaart @@ -44,8 +44,8 @@ DoneActions=Lõpetatud tegevused DoneActionsFor=Teostaja %s lõpetatud tegevused ToDoActions=Lõpetamata tegevused ToDoActionsFor=Teostaja %s lõpetamata tegevused -SendPropalRef=Saada pakkumine %s -SendOrderRef=Saada tellimus %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Ei ole kohaldatav StatusActionToDo=Teha StatusActionDone=Tehtud @@ -62,7 +62,7 @@ LastProspectContactDone=Võeti ühendust DateActionPlanned=Tegevuse toimumiseks plaanitud kuupäev DateActionDone=Tegevuse toimumise kuupäev ActionAskedBy=Tegevuse pani kirja -ActionAffectedTo=Tegevuse eest vastutav +ActionAffectedTo=Event assigned to ActionDoneBy=Tegevuse viis läbi ActionUserAsk=Pani kirja ErrorStatusCantBeZeroIfStarted=Kui väli "Toimumise kuupäev" on täidetud, siis on tegevus alustatud (või lõpetatud), seega ei saa välja "Status" väärtuseks olla 0%. diff --git a/htdocs/langs/et_EE/contracts.lang b/htdocs/langs/et_EE/contracts.lang index cdf9a5c2b82..1d6c23dd8cf 100644 --- a/htdocs/langs/et_EE/contracts.lang +++ b/htdocs/langs/et_EE/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Aegunud ServiceStatusClosed=Suletud ServicesLegend=Teenuste legend Contracts=Lepingud +ContractsAndLine=Contracts and line of contracts Contract=Leping NoContracts=Lepinguid pole MenuServices=Teenused diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang index 419f0202b60..a8b2473acb2 100644 --- a/htdocs/langs/et_EE/cron.lang +++ b/htdocs/langs/et_EE/cron.lang @@ -84,3 +84,4 @@ CronType_command=Käsurea käsk CronMenu=Cro CronCannotLoadClass=Klassi %s või objekti %s laadimine ebaõnnestus UseMenuModuleToolsToAddCronJobs=Mine menüüsse "Kodu - Moodulite tööriistad - Tegevuste nimekiri" planeeritud tegevuste vaatamiseks ja muutmiseks. +TaskDisabled=Task disabled diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang index 4dec9c707e8..92f2ead7679 100644 --- a/htdocs/langs/et_EE/errors.lang +++ b/htdocs/langs/et_EE/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Lähtekonto ja sihtkonto pevad olema erinevad. ErrorBadThirdPartyName=Halb väärtus kolmanda isiku nimeks ErrorProdIdIsMandatory=%s on kohustuslik ErrorBadCustomerCodeSyntax=Halb kliendi koodi süntaks -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Kliendi kood on nõutud ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Kliendi kood on juba kasutuses @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Selle võimaluse töötamiseks peab JavaScript olem ErrorPasswordsMustMatch=Sisestatud paroolid peavad klappima ErrorContactEMail=Tekkis tehniline viga. Palun võta ühendust oma administraatoriga e-posti aadressil %s ning lisa sõnumisse vea kood %s või veel parem oleks lisada sõnumisse antud lehe kuvatõmmis. ErrorWrongValueForField=Väli number %s sisaldab vale väärtust (väärtus'%s' ei sobi regulaaravaldisega %s) -ErrorFieldValueNotIn=Väli number %s sisaldab vale väärtust (väärtus '%s' ei sobi välja %s tüübiga tabelis %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Väli number %s sisaldab vale väärtust (väärtus '%s' ei ole üksuse %s olemasolev viide) ErrorsOnXLines=%s lähtekirje(t) on vigane/vigased ErrorFileIsInfectedWithAVirus=Antiviiruse programm ei suutnud faili valideerida (fail võib olla viiruse poolt nakatatud) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Kohustuslikud seadistusparameetrid on määratlemata diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang index 4ab6289f4f2..2c61df2288a 100644 --- a/htdocs/langs/et_EE/install.lang +++ b/htdocs/langs/et_EE/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Viimane samm: Määra siin tarkvaraga ühendumisek ActivateModule=Aktiveeri moodul %s ShowEditTechnicalParameters=Klõpsa siia lisaparameetrite näitamiseks/muutmiseks (spetsialisti režiim) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang index 52b69c9f148..98632e2e74e 100644 --- a/htdocs/langs/et_EE/main.lang +++ b/htdocs/langs/et_EE/main.lang @@ -141,6 +141,7 @@ Cancel=Tühista Modify=Muuda Edit=Toimeta Validate=Kinnita +ValidateAndApprove=Validate and Approve ToValidate=Kinnitada Save=Salvesta SaveAs=Salvesta kui @@ -158,6 +159,7 @@ Search=Otsi SearchOf=Otsi Valid=Kehtiv Approve=Kiida heaks +Disapprove=Disapprove ReOpen=Ava uuesti Upload=Saada fail ToLink=Seosta @@ -219,6 +221,7 @@ Cards=Kaardid Card=Kaart Now=Nüüd Date=Kuupäev +DateAndHour=Date and hour DateStart=Alguskuupäev DateEnd=Lõppkuupäev DateCreation=Loomise kuupäev @@ -295,6 +298,7 @@ UnitPriceHT=Ühiku hind (neto) UnitPriceTTC=Ühiku hind PriceU=ÜH PriceUHT=ÜH (neto) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=ÜH Amount=Summa AmountInvoice=Arve summa @@ -521,6 +525,7 @@ DateFromTo=Alates %s kuni %s DateFrom=Alates %s DateUntil=Kuni %s Check=Kontrolli +Uncheck=Uncheck Internal=Sisene External=Väline Internals=Sisene @@ -688,6 +693,7 @@ PublicUrl=Avalik link AddBox=Lisa kast SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Esmaspäev Tuesday=Teisipäev diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang index 060a7ae2cfb..7c4e9a9b1d8 100644 --- a/htdocs/langs/et_EE/orders.lang +++ b/htdocs/langs/et_EE/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Tühistatud StatusOrderDraft=Mustand (vajab kinnitamist) StatusOrderValidated=Kinnitatud StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Töödeldud StatusOrderToBill=Saadetud StatusOrderToBill2=Arve esitada @@ -58,6 +59,7 @@ MenuOrdersToBill=Saadetud tellimused MenuOrdersToBill2=Billable orders SearchOrder=Otsi tellimust SearchACustomerOrder=Otsi müügitellimust +SearchASupplierOrder=Search a supplier order ShipProduct=Saada toode Discount=Allahindlus CreateOrder=Loo tellimus diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang index 6a0f355dfa7..1670ba75c7a 100644 --- a/htdocs/langs/et_EE/other.lang +++ b/htdocs/langs/et_EE/other.lang @@ -54,12 +54,13 @@ MaxSize=Maksimaalne suurus AttachANewFile=Manusta uus fail/dokument LinkedObject=Seostatud objekt Miscellaneous=Muu -NbOfActiveNotifications=Teadete arv +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=See on testkiri.\nNeed kaks rida on eraldatud reavahetusega.\n\n__SIGNATURE__ PredefinedMailTestHtml=See on test kiri (sõna test peab olema rasvases kirjas).
Need kaks rida peavad olema eraldatud reavahetusega.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/et_EE/productbatch.lang +++ b/htdocs/langs/et_EE/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang index b90084c9ced..2d64e8c5345 100644 --- a/htdocs/langs/et_EE/products.lang +++ b/htdocs/langs/et_EE/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang index 7333f9ac138..af73d9b93c7 100644 --- a/htdocs/langs/et_EE/projects.lang +++ b/htdocs/langs/et_EE/projects.lang @@ -8,8 +8,10 @@ SharedProject=Kõik PrivateProject=Projekti kontaktid MyProjectsDesc=Selles vaates näidatakse vaid neid projekte, mille kontaktiks oled märgitud (hoolimata liigist) ProjectsPublicDesc=See vaade esitab kõik projektid, mida sul on lubatud vaadata. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=See vaade näitab kõiki projekte (sinu kasutajaõigused annavad ligipääsu kõigele) MyTasksDesc=Selles vaates näidatakse vaid neid projekte või ülesandeid, mille kontaktiks oled märgitud (hoolimata liigist) +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=See vaade esitab kõik projektid ja ülesanded, mida sul on lubatud vaadata. TasksDesc=See vaade näitab kõiki projekte ja ülesandeid (sinu kasutajaõigused annavad ligipääsu kõigele) ProjectsArea=Projektide ala @@ -29,6 +31,8 @@ NoProject=Ühtki projekti pole määratletud või ei oma ühtki projekt NbOpenTasks=Avatud ülesandeid NbOfProjects=Projekte TimeSpent=Aega kulutatud +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Aega kulutatud RefTask=Ülesande viide LabelTask=Ülesande nimi @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Antud projektiga seotud ostutellimuste nimek ListSupplierInvoicesAssociatedProject=Antud projektiga seotud ostuarvete nimekiri ListContractAssociatedProject=Antud projektiga seotud lepingute nimekiri ListFichinterAssociatedProject=Antud projektiga seotud sekkumiste nimekiri -ListTripAssociatedProject=Antud projektiga seotud lähetuste ja kulude nimekiri +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Antud projektiga seotud tegevuste nimekiri ActivityOnProjectThisWeek=Projekti aktiivsus sellel nädalal ActivityOnProjectThisMonth=Projekti aktiivsus sellel kuul @@ -133,3 +137,6 @@ SearchAProject=Otsi projekti ProjectMustBeValidatedFirst=Esmalt peab projekti kinnitama ProjectDraft=Projektide mustandid FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/et_EE/salaries.lang b/htdocs/langs/et_EE/salaries.lang index 963209a58e8..a694b60850e 100644 --- a/htdocs/langs/et_EE/salaries.lang +++ b/htdocs/langs/et_EE/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Palk Salaries=Palgad Employee=Töötaja @@ -6,3 +8,6 @@ NewSalaryPayment=Uus palga makse SalaryPayment=Palga makse SalariesPayments=Palkade maksed ShowSalaryPayment=Näita palga makset +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang index 515ab2ca303..e343a62f82d 100644 --- a/htdocs/langs/et_EE/sendings.lang +++ b/htdocs/langs/et_EE/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Tellitud kogus QtyShipped=Saadetud kogus QtyToShip=Kogus saata QtyReceived=Saabunud kogus -KeepToShip=Jätkuvalt saata +KeepToShip=Remain to ship OtherSendingsForSameOrder=Tellimusega seotud teised saadetised DateSending=Tellimuse saatmise kuupäev DateSendingShort=Tellimuse saatmise kuupäev diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang index 9e250e14562..026f5f6aefe 100644 --- a/htdocs/langs/et_EE/stocks.lang +++ b/htdocs/langs/et_EE/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Kaalutud keskmine hind PMPValueShort=KKH EnhancedValueOfWarehouses=Ladude väärtus UserWarehouseAutoCreate=Loo kasutaja loomisel automaatselt ladu +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Saadetud kogus QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Laojäägi vähendamiseks kasutatakse ladu %s WarehouseForStockIncrease=Laojäägi suurendamiseks kasutatakse ladu %s ForThisWarehouse=Antud lao tarbeks ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=See on kõigi avatud ostutellimuste nimekiri +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Värskendamised NbOfProductBeforePeriod=Toote %s laojääk enne valitud perioodi (< %s) NbOfProductAfterPeriod=Toote %s laojääk pärast valitud perioodi (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang index 894a1dfcad6..be8bd178d54 100644 --- a/htdocs/langs/et_EE/suppliers.lang +++ b/htdocs/langs/et_EE/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Hankijad -Supplier=Hankija AddSupplier=Create a supplier SupplierRemoved=Hankija kustutatud SuppliersInvoice=Ostuarved @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Ostuarved ja maksed ExportDataset_fournisseur_3=Ostutellimused ja tellimuste read ApproveThisOrder=KIida see tellimuse heaks ConfirmApproveThisOrder=Kas oled täiesti kindel, et soovid heaks kiita tellimuse %s ? -DenyingThisOrder=Lükka tellimus tagasi +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Kas oled täiesti kindel, et soovid tagasi lükata tellimuse %s ? ConfirmCancelThisOrder=Kas oled täiesti kindel, et soovid tühistada telllimuse %s ? AddCustomerOrder=Loo müügitellimus diff --git a/htdocs/langs/et_EE/trips.lang b/htdocs/langs/et_EE/trips.lang index c9ec60bb29b..12661480a8e 100644 --- a/htdocs/langs/et_EE/trips.lang +++ b/htdocs/langs/et_EE/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Reis -Trips=Trips -TripsAndExpenses=Matkad ja kulud -TripsAndExpensesStatistics=Reiside ja kulude statistika -TripCard=Reisi kaart -AddTrip=Lisa trip -ListOfTrips=List of väljasõidud +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List tasude -NewTrip=New trip +NewTrip=New expense report CompanyVisited=Äriühingu/ühenduse külastas Kilometers=Kilomeetrid FeesKilometersOrAmout=Summa või kilomeetrites -DeleteTrip=Kustuta trip -ConfirmDeleteTrip=Oled sa kindel, et soovite kustutada selle reisi? -TF_OTHER=Muu -TF_LUNCH=Lõuna -TF_TRIP=Reis -ListTripsAndExpenses=List reiside ja kulude -ExpensesArea=Matkad ja kulud ala -SearchATripAndExpense=Otsi reisi ja kulu +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Muu +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lõuna +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang index 15b5248bbbd..283b7d567cf 100644 --- a/htdocs/langs/eu_ES/admin.lang +++ b/htdocs/langs/eu_ES/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Esperimentala VersionDevelopment=Garapena VersionUnknown=Ezezaguna VersionRecommanded=Gomendatua +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Sesioaren ID SessionSaveHandler=Kudeatzailea sesioak gordetzeko SessionSavePath=Sesio biltegiaren kokapena @@ -493,10 +498,16 @@ Module600Name=Jakinarazpenak Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Diru-emateak Module700Desc=Diru-emateak kudeatzea +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Kontabilitatea Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategoriak Module1780Desc=Kategoriak kudeatzea (produktuak, hornitzaileak eta bezeroak) Module2000Name=WYSIWYG editorea @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. ExtraFields=Complementary attributes ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=UPC motako barra-kodea BarcodeDescISBN=ISBN motako barra-kodea BarcodeDescC39=C39 motako barra-kodea BarcodeDescC128=C128 motako barra-kodea -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Barne-eragilea BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang index 10a5f5b3c14..a2306950fb4 100644 --- a/htdocs/langs/eu_ES/banks.lang +++ b/htdocs/langs/eu_ES/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Standing orders StandingOrder=Standing order Withdrawals=Withdrawals @@ -148,7 +152,7 @@ BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/eu_ES/commercial.lang b/htdocs/langs/eu_ES/commercial.lang index b83fe1d4671..5e6f75fc30c 100644 --- a/htdocs/langs/eu_ES/commercial.lang +++ b/htdocs/langs/eu_ES/commercial.lang @@ -62,7 +62,7 @@ LastProspectContactDone=Contact done DateActionPlanned=Date event planned for DateActionDone=Date event done ActionAskedBy=Event reported by -ActionAffectedTo=Event owned by +ActionAffectedTo=Event assigned to ActionDoneBy=Event done by ActionUserAsk=Reported by ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%. diff --git a/htdocs/langs/eu_ES/contracts.lang b/htdocs/langs/eu_ES/contracts.lang index 57ba3bb15d8..d1be0e6513f 100644 --- a/htdocs/langs/eu_ES/contracts.lang +++ b/htdocs/langs/eu_ES/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired ServiceStatusClosed=Closed ServicesLegend=Services legend Contracts=Contracts +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=No contracts MenuServices=Services diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang index 36270d08f1b..c55f6c923ce 100644 --- a/htdocs/langs/eu_ES/cron.lang +++ b/htdocs/langs/eu_ES/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang index 497ddd814e4..700e6344d7d 100644 --- a/htdocs/langs/eu_ES/errors.lang +++ b/htdocs/langs/eu_ES/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/eu_ES/install.lang b/htdocs/langs/eu_ES/install.lang index 5a494156672..dcd8df6e7db 100644 --- a/htdocs/langs/eu_ES/install.lang +++ b/htdocs/langs/eu_ES/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang index 6045b98edb1..5913029999d 100644 --- a/htdocs/langs/eu_ES/main.lang +++ b/htdocs/langs/eu_ES/main.lang @@ -141,6 +141,7 @@ Cancel=Utzi Modify=Eraldatu Edit=Editatu Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Gorde SaveAs=Gorde honela @@ -158,6 +159,7 @@ Search=Bilatu SearchOf=Bilatu Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Orain Date=Data +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=From %s to %s DateFrom=From %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang index 34792ae1eb2..8efafa5e94e 100644 --- a/htdocs/langs/eu_ES/orders.lang +++ b/htdocs/langs/eu_ES/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Validated StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderToBill2=To bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang index 88991888183..08747ea884b 100644 --- a/htdocs/langs/eu_ES/other.lang +++ b/htdocs/langs/eu_ES/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/eu_ES/productbatch.lang +++ b/htdocs/langs/eu_ES/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang index 3a29639b12b..3a18cda69e7 100644 --- a/htdocs/langs/eu_ES/products.lang +++ b/htdocs/langs/eu_ES/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang index b3c150d1687..0a12f4c64b7 100644 --- a/htdocs/langs/eu_ES/projects.lang +++ b/htdocs/langs/eu_ES/projects.lang @@ -8,8 +8,10 @@ SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). ProjectsArea=Projects area @@ -29,6 +31,8 @@ NoProject=No project defined or owned NbOpenTasks=Nb of opened tasks NbOfProjects=Nb of projects TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project -ListTripAssociatedProject=List of trips and expenses associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang index 31629a4ee99..98551e32117 100644 --- a/htdocs/langs/eu_ES/salaries.lang +++ b/htdocs/langs/eu_ES/salaries.lang @@ -10,3 +10,4 @@ SalariesPayments=Soldaten ordainketak ShowSalaryPayment=Soldataren ordainketa erakutsi THM=Batezbesteko orduko prezioa TJM=Batezbesteko eguneko prezioa +CurrentSalary=Current salary diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang index 794c9019c86..b1ff55f71c1 100644 --- a/htdocs/langs/eu_ES/sendings.lang +++ b/htdocs/langs/eu_ES/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qty ordered QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order DateSending=Date sending order DateSendingShort=Date sending order diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang index 9de2e5a4dbe..29706d17615 100644 --- a/htdocs/langs/eu_ES/stocks.lang +++ b/htdocs/langs/eu_ES/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang index 7b4d4acb244..baf573c66ac 100644 --- a/htdocs/langs/eu_ES/suppliers.lang +++ b/htdocs/langs/eu_ES/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -Supplier=Supplier AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Approve this order ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Denying this order +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? AddCustomerOrder=Create customer order diff --git a/htdocs/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang index e9d7c242e07..35f4d8f1cad 100644 --- a/htdocs/langs/eu_ES/trips.lang +++ b/htdocs/langs/eu_ES/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Bidaia -Trips=Bidaiak -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Bidaia sortu -ListOfTrips=Bidaien zerrenda +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List of fees -NewTrip=Bidai berria +NewTrip=New expense report CompanyVisited=Bisitatutako konpania/erakundea Kilometers=Kilometroak FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Bidaia ezabatu -ConfirmDeleteTrip=Ziur zaude bidai hau ezabatu nahi duzuna? -TF_OTHER=Other -TF_LUNCH=Bazkaria -TF_TRIP=Bidaia -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Bazkaria +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang index a943825df33..c9304d083b0 100644 --- a/htdocs/langs/fa_IR/admin.lang +++ b/htdocs/langs/fa_IR/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=تجربی VersionDevelopment=توسعه VersionUnknown=ناشناخته VersionRecommanded=توصیه شده +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=جلسه ID SessionSaveHandler=هندلر برای صرفه جویی در جلسات SessionSavePath=محلی سازی را وارد نمایید و ذخیره سازی @@ -493,10 +498,16 @@ Module600Name=اطلاعیه ها Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=کمک های مالی Module700Desc=مدیریت کمک مالی +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=اخوندک Module1200Desc=ادغام آخوندک Module1400Name=حسابداری Module1400Desc=مدیریت حسابداری (احزاب دو) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=دسته بندی ها Module1780Desc=مدیریت گروه (محصولات، تامین کنندگان و مشتریان) Module2000Name=ویرایشگر WYSIWYG @@ -631,7 +642,7 @@ Permission181=خوانده شده سفارشات کالا Permission182=ایجاد / تغییر سفارشات کالا Permission183=اعتبارسنجی سفارشات کالا Permission184=تصویب سفارشات کالا -Permission185=سفارشات تامین کننده نظم +Permission185=Order or cancel supplier orders Permission186=دریافت سفارشات کالا Permission187=نزدیک سفارشات کالا Permission188=لغو سفارشات کالا @@ -711,6 +722,13 @@ Permission538=خدمات صادرات Permission701=خوانده شده Permission702=ایجاد / تغییر کمک های مالی Permission703=حذف کمک های مالی +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=خوانده شده سهام Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=رمز عبور به استفاده از پروکسی سرور DefineHereComplementaryAttributes=تعریف در اینجا تمام صفات، در حال حاضر به طور پیش فرض در دسترس نیست، و این که شما می خواهید برای٪ s پشتیبانی می شود. ExtraFields=ویژگی های مکمل ExtraFieldsLines=ویژگی های مکمل (خط) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=ویژگی های مکمل (thirdparty) ExtraFieldsContacts=ویژگی های مکمل (تماس / آدرس) ExtraFieldsMember=ویژگی های مکمل (عضو) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=یک خط از محصول / خدمات با مقدار FreeLegalTextOnProposal=متن رایگان در طرح های تجاری WatermarkOnDraftProposal=تعیین میزان مد آب در پیش نویس طرح تجاری (هیچ اگر خالی) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=راه اندازی مدیریت سفارش OrdersNumberingModules=سفارشات شماره مدل @@ -1383,7 +1410,7 @@ BarcodeDescUPC=بارکد از نوع UPC BarcodeDescISBN=بارکد از نوع ISBN BarcodeDescC39=بارکد از نوع C39 BarcodeDescC128=بارکد از نوع C128 -GenbarcodeLocation=تولید کد نوار ابزار خط فرمان (استفاده شده توسط موتور داخلی برای برخی از انواع بارکد) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=موتور داخلی BarCodeNumberManager=مدیر به صورت خودکار تعریف اعداد بارکد ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=پیش فرض حساب استفاده برای دریافت پرداخت های نقدی CashDeskBankAccountForCheque= پیش فرض حساب استفاده برای دریافت پرداخت توسط چک CashDeskBankAccountForCB= پیش فرض حساب استفاده برای دریافت پرداخت توسط کارت های اعتباری -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=راه اندازی ماژول چوب الف @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=قالب TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang index b94e76dd3c6..30e1877cfe8 100644 --- a/htdocs/langs/fa_IR/banks.lang +++ b/htdocs/langs/fa_IR/banks.lang @@ -33,7 +33,11 @@ AllTime=از شروع Reconciliation=مصالحه RIB=شماره حساب بانکی IBAN=شماره IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / تعداد SWIFT +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=سفارشات ایستاده StandingOrder=نظام نامه Withdrawals=برداشت ها @@ -148,7 +152,7 @@ BackToAccount=برگشت به حساب ShowAllAccounts=نمایش برای همه حساب ها FutureTransaction=معامله در futur. هیچ راهی برای مصالحه. SelectChequeTransactionAndGenerate=انتخاب چک / فیلتر به چک دریافت سپرده شامل و کلیک بر روی "ایجاد". -InputReceiptNumber=بیانیه بانک مرتبط با مصالحه را انتخاب کنید. استفاده از یک مقدار عددی قابل مرتب شدن است (مانند، YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=در نهایت، تعیین یک دسته بندی است که در آن برای طبقه بندی پرونده ToConciliate=به مصالحه؟ ThenCheckLinesAndConciliate=سپس، بررسی خطوط موجود در صورت حساب بانکی و کلیک کنید diff --git a/htdocs/langs/fa_IR/commercial.lang b/htdocs/langs/fa_IR/commercial.lang index 46d83514095..58154b70276 100644 --- a/htdocs/langs/fa_IR/commercial.lang +++ b/htdocs/langs/fa_IR/commercial.lang @@ -9,9 +9,9 @@ Prospect=چشم انداز Prospects=چشم انداز DeleteAction=حذف یک رویداد / کار NewAction=رویداد جدید / کار -AddAction=اضافه کردن رویداد / کار -AddAnAction=اضافه کردن یک رویداد / کار -AddActionRendezVous=اضافه کردن یک رویداد Rendez-vous +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=قرار ملاقات گذاشتن ConfirmDeleteAction=آیا مطمئن هستید که می خواهید این رویداد / وظیفه را حذف کنید؟ CardAction=کارت رویداد @@ -44,8 +44,8 @@ DoneActions=رویدادهای انجام شده DoneActionsFor=رویدادهای انجام شده برای٪ s ToDoActions=رویدادهای ناقص ToDoActionsFor=رویدادهای ناقص برای٪ s -SendPropalRef=ارسال پیشنهاد تجاری از٪ s -SendOrderRef=ارسال منظور از٪ s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=قابل اجرا نیست StatusActionToDo=برای انجام این کار StatusActionDone=کامل @@ -62,7 +62,7 @@ LastProspectContactDone=تماس با انجام DateActionPlanned=تاریخ رویداد برنامه ریزی شده برای DateActionDone=تاریخ رویداد انجام می شود ActionAskedBy=رویداد گزارش شده توسط -ActionAffectedTo=رویداد اختصاص یافته به +ActionAffectedTo=Event assigned to ActionDoneBy=رویداد های انجام شده توسط ActionUserAsk=به گزارش ErrorStatusCantBeZeroIfStarted=اگر زمینه 'تاریخ انجام می شود' پر شده است، اقدام آغاز شده است (و یا به پایان رسید)، پس درست است 'وضعیت' می تواند 0٪٪ نیست. diff --git a/htdocs/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang index 66101dfbec6..399617a86aa 100644 --- a/htdocs/langs/fa_IR/contracts.lang +++ b/htdocs/langs/fa_IR/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=منقضی شده ServiceStatusClosed=بسته ServicesLegend=خدمات افسانه Contracts=قراردادها +ContractsAndLine=Contracts and line of contracts Contract=قرارداد NoContracts=بدون قرارداد MenuServices=خدمات diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang index c7464dd88b9..feca42ac429 100644 --- a/htdocs/langs/fa_IR/cron.lang +++ b/htdocs/langs/fa_IR/cron.lang @@ -84,3 +84,4 @@ CronType_command=فرمان شل CronMenu=cron را CronCannotLoadClass=آیا می توانم کلاس٪ s ​​را بار نیست و یا شی از٪ s UseMenuModuleToolsToAddCronJobs=برو به منوی "صفحه اصلی - ماژول ابزار - فهرست فرصت های شغلی" برای دیدن و ویرایش کار برنامه ریزی شده. +TaskDisabled=Task disabled diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang index 2b562f769ad..feea5472afb 100644 --- a/htdocs/langs/fa_IR/errors.lang +++ b/htdocs/langs/fa_IR/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=منبع و اهداف حساب های بانکی ErrorBadThirdPartyName=ارزش بد برای نام شخص ثالث ErrorProdIdIsMandatory=٪ بازدید کنندگان الزامی است ErrorBadCustomerCodeSyntax=نحو بد برای کد مشتری -ErrorBadBarCodeSyntax=نحو بد بارکد +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=کد مشتریان مورد نیاز ErrorBarCodeRequired=کد نوار مورد نیاز ErrorCustomerCodeAlreadyUsed=کد مشتری در حال حاضر استفاده می شود @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=جاوا اسکریپت نمی باید غیر فع ErrorPasswordsMustMatch=هر دو کلمه عبور تایپ شده باید با یکدیگر مطابقت ErrorContactEMail=یک خطای فنی رخ داد. لطفا، با مدیر سایت تماس به زیر ایمیل از٪ s EN ارائه کد خطا٪ s در پیام خود، و یا حتی بهتر با اضافه کردن یک کپی روی صفحه نمایش از این صفحه. ErrorWrongValueForField=ارزش اشتباه برای تعداد فیلد٪ s (مقدار «٪ s» به عبارت منظم حکومت از٪ s مطابقت ندارد) -ErrorFieldValueNotIn=ارزش اشتباه برای تعداد فیلد٪ s (مقدار «٪ s» است مقدار موجود در فیلد٪ s را از جدول٪ نیست) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=ارزش اشتباه برای تعداد فیلد٪ s (مقدار «٪ s» است از٪ s کد عکس موجود نیست) ErrorsOnXLines=خطا در٪ s را ثبت منبع (ها) ErrorFileIsInfectedWithAVirus=برنامه آنتی ویروس قادر به اعتبار فایل (فایل ممکن است توسط یک ویروس آلوده) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=پارامترهای راه اندازی اجباری هنوز تعریف نشده diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang index ac1ba6dc068..0b4f81b7903 100644 --- a/htdocs/langs/fa_IR/install.lang +++ b/htdocs/langs/fa_IR/install.lang @@ -156,6 +156,7 @@ LastStepDesc=آخرین مرحله: تعریف اینجا کا ActivateModule=فعال بخش٪ s ShowEditTechnicalParameters=برای نشان دادن پارامترهای پیشرفته / ویرایش اینجا را کلیک کنید (حالت کارشناسی) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang index f75a9926e70..8e9afbf39b0 100644 --- a/htdocs/langs/fa_IR/main.lang +++ b/htdocs/langs/fa_IR/main.lang @@ -141,6 +141,7 @@ Cancel=لغو کردن Modify=تغییر دادن Edit=ویرایش Validate=معتبر ساختن +ValidateAndApprove=Validate and Approve ToValidate=به اعتبار Save=جویی در هزینه SaveAs=ذخیره به عنوان @@ -158,6 +159,7 @@ Search=جستجو SearchOf=جستجو Valid=معتبر Approve=تصویب +Disapprove=Disapprove ReOpen=دوباره باز Upload=ارسال فایل ToLink=پیوند @@ -219,6 +221,7 @@ Cards=کارت Card=کارت Now=اکنون Date=تاریخ +DateAndHour=Date and hour DateStart=تاریخ شروع DateEnd=تاریخ پایان DateCreation=تاریخ ایجاد @@ -295,6 +298,7 @@ UnitPriceHT=قیمت واحد (خالص) UnitPriceTTC=قیمت واحد PriceU=UP PriceUHT=UP (خالص) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=UP Amount=مقدار AmountInvoice=مقدار فاکتور @@ -521,6 +525,7 @@ DateFromTo=از٪ s به٪ s DateFrom=از٪ s DateUntil=تا از٪ s Check=بررسی +Uncheck=Uncheck Internal=داخلی External=خارجی Internals=داخلی @@ -688,6 +693,7 @@ PublicUrl=URL عمومی AddBox=اضافه کردن جعبه SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=دوشنبه Tuesday=سهشنبه diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang index 43f430681cb..c680e0c4e84 100644 --- a/htdocs/langs/fa_IR/orders.lang +++ b/htdocs/langs/fa_IR/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=لغو شد StatusOrderDraft=پیش نویس (نیاز به تایید می شود) StatusOrderValidated=اعتبار StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=پردازش StatusOrderToBill=تحویل StatusOrderToBill2=به بیل @@ -58,6 +59,7 @@ MenuOrdersToBill=سفارشات تحویل MenuOrdersToBill2=Billable orders SearchOrder=نتایج جستجو SearchACustomerOrder=جستجوی یک سفارش مشتری +SearchASupplierOrder=Search a supplier order ShipProduct=محصول کشتی Discount=تخفیف CreateOrder=ایجاد نظم diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang index a510a002ae4..0276748a4da 100644 --- a/htdocs/langs/fa_IR/other.lang +++ b/htdocs/langs/fa_IR/other.lang @@ -54,12 +54,13 @@ MaxSize=حداکثر اندازه AttachANewFile=ضمیمه کردن فایل جدید / سند LinkedObject=شی مرتبط Miscellaneous=متفرقه -NbOfActiveNotifications=تعداد اطلاعیه ها +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=این یک پست تست است. دو خط با بازگشت نورد جدا شده است. __SIGNATURE__ PredefinedMailTestHtml=این ایمیل آزمون (آزمون کلمه باید در پررنگ باشد) است.
دو خط با بازگشت نورد جدا شده است.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ شما در اینجا خواهید دید فاکتور __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ ما می خواهیم به شما هشدار می دهند که فاکتور __ FACREF__ به نظر می رسد که غیر انتفایی نیست. پس این فاکتور در پیوست است دوباره، به عنوان یک یادآوری. __PERSONALIZED__Sincerely __ SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__ شما در اینجا خواهید دید پیشنهاد تجاری __ PROPREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__ شما در اینجا خواهید دید که منظور __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ شما در اینجا خواهید دید منظور ما __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ شما در اینجا خواهید دید فاکتور __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__ diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/fa_IR/productbatch.lang +++ b/htdocs/langs/fa_IR/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang index 2fcdf5eed69..f7f332d68a0 100644 --- a/htdocs/langs/fa_IR/products.lang +++ b/htdocs/langs/fa_IR/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang index 2606f870f39..0e685cffc26 100644 --- a/htdocs/langs/fa_IR/projects.lang +++ b/htdocs/langs/fa_IR/projects.lang @@ -8,8 +8,10 @@ SharedProject=هر کسی PrivateProject=اطلاعات تماس پروژه MyProjectsDesc=این دیدگاه محدود به پروژه شما یک تماس برای (هر چه باشد نوع) می باشد. ProjectsPublicDesc=این دیدگاه ارائه تمام پروژه ها به شما این اجازه را بخوانید. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=این دیدگاه ارائه تمام پروژه (مجوز دسترسی خود را به شما عطا اجازه دسترسی به همه چیز). MyTasksDesc=این دیدگاه به پروژه ها و یا کارهای شما تماس برای (هر چه باشد نوع) می باشد محدود است. +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=این دیدگاه ارائه تمام پروژه ها و کارهای شما مجاز به خواندن. TasksDesc=این دیدگاه ارائه تمام پروژه ها و وظایف (مجوز دسترسی خود را به شما عطا اجازه دسترسی به همه چیز). ProjectsArea=منطقه پروژه ها @@ -29,6 +31,8 @@ NoProject=هیچ پروژه تعریف شده و یا متعلق به NbOpenTasks=NB از وظایف باز NbOfProjects=Nb در پروژه TimeSpent=زمان صرف شده +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=زمان صرف شده RefTask=کد عکس. کار LabelTask=کار برچسب @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=فهرست سفارشات منبع در ار ListSupplierInvoicesAssociatedProject=فهرست فاکتورها منبع در ارتباط با پروژه ListContractAssociatedProject=فهرست قرارداد در ارتباط با پروژه ListFichinterAssociatedProject=فهرست مداخلات مرتبط با پروژه -ListTripAssociatedProject=فهرست از سفر و هزینه های مرتبط با پروژه +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=فهرست رویدادی به این پروژه ActivityOnProjectThisWeek=فعالیت در پروژه این هفته ActivityOnProjectThisMonth=فعالیت در پروژه این ماه @@ -133,3 +137,6 @@ SearchAProject=جستجوی یک پروژه ProjectMustBeValidatedFirst=پروژه ابتدا باید معتبر باشد ProjectDraft=پروژه های پیش نویس FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/fa_IR/salaries.lang b/htdocs/langs/fa_IR/salaries.lang index 2cb6f372f7e..63b2ea6e372 100644 --- a/htdocs/langs/fa_IR/salaries.lang +++ b/htdocs/langs/fa_IR/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=حقوق Salaries=حقوق Employee=کارمند @@ -6,3 +8,6 @@ NewSalaryPayment=پرداخت حقوق و دستمزد جدید SalaryPayment=پرداخت حقوق و دستمزد SalariesPayments=حقوق پرداخت ShowSalaryPayment=نمایش پرداخت حقوق و دستمزد +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang index de9d8feaa46..f456863b564 100644 --- a/htdocs/langs/fa_IR/sendings.lang +++ b/htdocs/langs/fa_IR/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=تعداد سفارش داده شده QtyShipped=تعداد حمل QtyToShip=تعداد به کشتی QtyReceived=تعداد دریافت -KeepToShip=نگه دارید به کشتی +KeepToShip=Remain to ship OtherSendingsForSameOrder=دیگر محموله برای این منظور DateSending=عضویت جهت ارسال DateSendingShort=عضویت جهت ارسال diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang index 0d849cdaf73..1e27de088b8 100644 --- a/htdocs/langs/fa_IR/stocks.lang +++ b/htdocs/langs/fa_IR/stocks.lang @@ -47,6 +47,7 @@ PMPValue=قیمت به طور متوسط ​​وزنی PMPValueShort=WAP EnhancedValueOfWarehouses=ارزش ساختمان و ذخیره سازی UserWarehouseAutoCreate=ایجاد یک انبار به طور خودکار در هنگام ایجاد یک کاربر +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=تعداد اعزام QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=انبار٪ خواهد شد برای سهام WarehouseForStockIncrease=انبار٪ خواهد شد برای افزایش سهام استفاده ForThisWarehouse=برای این انبار ReplenishmentStatusDesc=این لیست از همه محصول با سهام پایین تر از سهام مورد نظر (یا کمتر از ارزش هشدار اگر گزینه "هشدار تنها" بررسی می شود)، و نشان می دهد به شما برای ایجاد سفارشات منبع برای پر کردن تفاوت است. -ReplenishmentOrdersDesc=این لیست از تمام سفارشات منبع باز است +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=پر کردن NbOfProductBeforePeriod=تعداد محصول٪ s را در انبار قبل از دوره (<٪) انتخاب NbOfProductAfterPeriod=تعداد محصول٪ s را در سهام بعد از دوره زمانی انتخاب شده (>٪ بازدید کنندگان) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang index 62cfdfdd084..917a56b1758 100644 --- a/htdocs/langs/fa_IR/suppliers.lang +++ b/htdocs/langs/fa_IR/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=تولید کنندگان -Supplier=تهیه کننده AddSupplier=Create a supplier SupplierRemoved=تامین کننده حذف SuppliersInvoice=تولید کنندگان صورتحساب @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=فاکتورها تامین کننده و پرداخ ExportDataset_fournisseur_3=سفارشات تامین کننده و خطوط جهت ApproveThisOrder=تصویب این منظور ConfirmApproveThisOrder=آیا مطمئن هستید که می خواهید برای تایید از٪ s؟ -DenyingThisOrder=انکار این منظور +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=آیا مطمئن هستید که می خواهید برای انکار این منظور از٪ s؟ ConfirmCancelThisOrder=آیا مطمئن هستید که می خواهید به لغو این منظور از٪ s؟ AddCustomerOrder=ایجاد سفارش مشتری diff --git a/htdocs/langs/fa_IR/trips.lang b/htdocs/langs/fa_IR/trips.lang index 5cefadd2e55..3b596baa3e7 100644 --- a/htdocs/langs/fa_IR/trips.lang +++ b/htdocs/langs/fa_IR/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=سفر -Trips=سفر -TripsAndExpenses=سفر و هزینه های عملیاتی -TripsAndExpensesStatistics=سفر و هزینه های آمار -TripCard=کارت سفر -AddTrip=اضافه کردن سفر -ListOfTrips=فهرست از سفر +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=فهرست هزینه ها -NewTrip=سفر جدید +NewTrip=New expense report CompanyVisited=شرکت / بنیاد بازدید کردند Kilometers=کیلومتر FeesKilometersOrAmout=مقدار و یا کیلومتر -DeleteTrip=حذف سفر -ConfirmDeleteTrip=آیا مطمئن هستید که می خواهید این سفر را حذف کنید؟ -TF_OTHER=دیگر -TF_LUNCH=ناهار -TF_TRIP=سفر -ListTripsAndExpenses=فهرست سفر و هزینه های عملیاتی -ExpensesArea=سفر و هزینه های عملیاتی منطقه -SearchATripAndExpense=جستجوی یک سفر و هزینه +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=دیگر +TF_TRANSPORTATION=Transportation +TF_LUNCH=ناهار +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang index 5096161d388..9ead36d476c 100644 --- a/htdocs/langs/fi_FI/admin.lang +++ b/htdocs/langs/fi_FI/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Kokeellinen VersionDevelopment=Kehitys VersionUnknown=Tuntematon VersionRecommanded=Suositeltava +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Istunnon tunnus SessionSaveHandler=Handler tallentaa istuntojen SessionSavePath=Varasto istuntojakson localization @@ -493,10 +498,16 @@ Module600Name=Ilmoitukset Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Lahjoitukset Module700Desc=Lahjoitukset hallinto +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis yhdentyminen Module1400Name=Kirjanpidon asiantuntija Module1400Desc=Kirjanpidon hallinta asiantuntijoille (double osapuolet) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategoriat Module1780Desc=Kategoriat hallintaa (tuotteet, tavarantoimittajat ja asiakkaat) Module2000Name=FCKeditor @@ -631,7 +642,7 @@ Permission181=Lue toimittaja tilaukset Permission182=Luoda / muuttaa toimittajan tilaukset Permission183=Validate toimittaja tilaukset Permission184=Hyväksy toimittaja tilaukset -Permission185=Tilaa toimittaja tilaukset +Permission185=Order or cancel supplier orders Permission186=Vastaanota toimittaja tilaukset Permission187=Sulje toimittaja tilaukset Permission188=Peruuta toimittaja tilaukset @@ -711,6 +722,13 @@ Permission538=Vienti palvelut Permission701=Lue lahjoitukset Permission702=Luoda / muuttaa lahjoitusten Permission703=Poista lahjoitukset +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Lue varastot Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Salasana käyttää välityspalvelinta DefineHereComplementaryAttributes=Määritä tässä kaikki atributes, jo ole oletuksena, ja että haluat tuettava %s. ExtraFields=Täydentävät ominaisuudet ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Rivi tuotteen / palvelun nolla määrä pidetään vai FreeLegalTextOnProposal=Vapaa tekstihaku kaupallisiin ehdotuksia WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Tilaukset hallinto-setup OrdersNumberingModules=Tilaukset numerointiin modules @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Viivakoodi tyypin UPC BarcodeDescISBN=Viivakoodi tyypin ISBN BarcodeDescC39=Viivakoodi tyypin C39 BarcodeDescC128=Viivakoodi tyypin C128 -GenbarcodeLocation=Viivakoodi sukupolven komentoriviksi työkalu (käyttää phpbarcode moottorin joidenkin viivakoodi tyypit) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Rahat tilille käyttää myy CashDeskBankAccountForCheque= Tilin käyttö vastaanottaa maksuja sekillä CashDeskBankAccountForCB= Tilin käyttö voidaan saada käteismaksujen luottokorttia -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Kirjanmerkin moduulin asetukset @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang index 56fd08fead5..3a30c33e0f4 100644 --- a/htdocs/langs/fi_FI/banks.lang +++ b/htdocs/langs/fi_FI/banks.lang @@ -33,7 +33,11 @@ AllTime=Alkaen Reconciliation=Yhteensovittaminen RIB=Pankkitilin numero IBAN=IBAN-numero +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT-koodi +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Kestotilaus StandingOrder=Kestotilaus Withdrawals=Nostot @@ -148,7 +152,7 @@ BackToAccount=Takaisin tiliin ShowAllAccounts=Näytä kaikki tilit FutureTransaction=Tapahtuma on tulevaisuudessa. Ei soviteltavissa. SelectChequeTransactionAndGenerate=Valitse / suodattaa tarkastuksiin sisällyttää osaksi tarkastus talletuksen vastaanottamisesta ja klikkaa "Luo". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/fi_FI/commercial.lang b/htdocs/langs/fi_FI/commercial.lang index 5c737e339a1..a3dc28186cc 100644 --- a/htdocs/langs/fi_FI/commercial.lang +++ b/htdocs/langs/fi_FI/commercial.lang @@ -9,9 +9,9 @@ Prospect=Mahdollisuus Prospects=Mahdollisuudet DeleteAction=Poista toiminto / tehtävä NewAction=Uusi toimi / tehtävä -AddAction=Lisää toiminta / tehtävä -AddAnAction=Lisää toiminta / tehtävä -AddActionRendezVous=Lisää Rendezvous tehtävä +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Oletko varma, että haluat poistaa tämän tehtävän? CardAction=Tapahtumakortti @@ -44,8 +44,8 @@ DoneActions=Tehty toimia DoneActionsFor=Tehty toimia %s ToDoActions=Puutteellinen toimet ToDoActionsFor=Puutteellinen toimia %s -SendPropalRef=Lähetä kaupallinen ehdotus %s -SendOrderRef=Lähetä jotta %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Ei sovelleta StatusActionToDo=Voit tehdä StatusActionDone=Tehty @@ -62,7 +62,7 @@ LastProspectContactDone=Yhteystiedot tehnyt DateActionPlanned=Päiväys toimia varten DateActionDone=Päiväys toiminta tapahtuu ActionAskedBy=Toimi pyytänyt -ActionAffectedTo=Toiminta vaikuttaa +ActionAffectedTo=Event assigned to ActionDoneBy=Toiminta tapahtuu ActionUserAsk=Tallennettu ErrorStatusCantBeZeroIfStarted=Jos kenttä "Päiväys tehtävä on täytetty, toiminta on alkanut (tai valmis), joten alalla" Tila "ei voi olla 0%%. diff --git a/htdocs/langs/fi_FI/contracts.lang b/htdocs/langs/fi_FI/contracts.lang index 8d44a9b256e..fb36e753d96 100644 --- a/htdocs/langs/fi_FI/contracts.lang +++ b/htdocs/langs/fi_FI/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Lakkaa ServiceStatusClosed=Suljettu ServicesLegend=Palvelut legenda Contracts=Sopimukset +ContractsAndLine=Contracts and line of contracts Contract=Sopimus NoContracts=Sopimuksia ei MenuServices=Palvelut diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang index 305bf312025..bba69fbb33f 100644 --- a/htdocs/langs/fi_FI/cron.lang +++ b/htdocs/langs/fi_FI/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang index edbe3fa5f22..3a31847c78b 100644 --- a/htdocs/langs/fi_FI/errors.lang +++ b/htdocs/langs/fi_FI/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Lähde ja tavoitteet pankkitilit on erilainen. ErrorBadThirdPartyName=Bad arvo kolmannen osapuolen nimi ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntaksi asiakas-koodi -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Asiakas-koodi tarvitaan ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Asiakas-koodi on jo käytetty @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript ei saa keskeytyä, on tämä ominaisuus ErrorPasswordsMustMatch=Molemmat kirjoittaa salasanat on vastattava toisiaan ErrorContactEMail=Tekninen virhe. Ota yhteys järjestelmänvalvojaan jälkeen sähköpostin %s en antaa virhekoodi %s viesti, tai jopa paremmin lisäämällä näytön kopion tästä sivusta. ErrorWrongValueForField=Väärä arvo kentän numero %s (arvo "%s" ei vastaa regex sääntö %s) -ErrorFieldValueNotIn=Väärä arvo kentän numero %s (arvo "%s" ei ole arvoa käytettävissä tulee kenttään %s taulukon %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Väärä arvo kentän numero %s (arvo "%s" ei %s olemassa ref) ErrorsOnXLines=Virheet %s lähde linjat ErrorFileIsInfectedWithAVirus=Virustentorjuntaohjelma ei voinut tarkistaa tiedoston (tiedosto saattaa olla tartunnan virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang index d1528d62722..80b688dca44 100644 --- a/htdocs/langs/fi_FI/install.lang +++ b/htdocs/langs/fi_FI/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Viimeinen askel: Määritä tässä käyttäjätun ActivateModule=Aktivoi moduuli %s ShowEditTechnicalParameters=Klikkaa tästä näyttääksesi/muuttaaksesi edistyneemmät parametrit (asiantuntija tila) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang index 9df855ba004..4e6098fd766 100644 --- a/htdocs/langs/fi_FI/main.lang +++ b/htdocs/langs/fi_FI/main.lang @@ -141,6 +141,7 @@ Cancel=Peruuta Modify=Muokkaa Edit=Muokkaa Validate=Vahvista +ValidateAndApprove=Validate and Approve ToValidate=Validoida Save=Tallenna SaveAs=Tallenna nimellä @@ -158,6 +159,7 @@ Search=Haku SearchOf=Haku Valid=Voimassa Approve=Hyväksy +Disapprove=Disapprove ReOpen=Avaa uudelleen Upload=Lähetä tiedosto ToLink=Linkki @@ -219,6 +221,7 @@ Cards=Kortit Card=Kortti Now=Nyt Date=Päivä +DateAndHour=Date and hour DateStart=Alkaen DateEnd=Päättyen DateCreation=Luotu @@ -295,6 +298,7 @@ UnitPriceHT=Yksikköhinta (netto) UnitPriceTTC=Yksikköhinta PriceU=UP PriceUHT=UP (netto) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=UP Amount=Määrä AmountInvoice=Laskun summa @@ -521,6 +525,7 @@ DateFromTo=Kohteesta %s %s DateFrom=Kohteesta %s DateUntil=Vasta %s Check=Shekki +Uncheck=Uncheck Internal=Sisäinen External=Ulkoinen Internals=Sisäinen @@ -688,6 +693,7 @@ PublicUrl=Julkinen URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Maanantai Tuesday=Tiistai diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang index dade4367732..408212eb534 100644 --- a/htdocs/langs/fi_FI/orders.lang +++ b/htdocs/langs/fi_FI/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Peruutettu StatusOrderDraft=Luonnos (on vahvistettu) StatusOrderValidated=Validoidut StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Jalostettu StatusOrderToBill=Bill StatusOrderToBill2=Bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Tilaukset laskuttaa MenuOrdersToBill2=Billable orders SearchOrder=Haku jotta SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Laiva tuote Discount=Discount CreateOrder=Luo Tilaa diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang index 155ef697744..66aea85c008 100644 --- a/htdocs/langs/fi_FI/other.lang +++ b/htdocs/langs/fi_FI/other.lang @@ -54,12 +54,13 @@ MaxSize=Enimmäiskoko AttachANewFile=Liitä uusi tiedosto / asiakirjan LinkedObject=Linkitettyä objektia Miscellaneous=Miscellaneous -NbOfActiveNotifications=Ilmoitusten lukumäärä +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Tämä on testi postitse. \\ NOsoitteen kaksi riviä välissä rivinvaihto. PredefinedMailTestHtml=Tämä on testi postitse (sana testi on lihavoitu).
Kaksi riviä välissä rivinvaihto. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/fi_FI/productbatch.lang +++ b/htdocs/langs/fi_FI/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang index 0839abf00df..6b6c461876d 100644 --- a/htdocs/langs/fi_FI/products.lang +++ b/htdocs/langs/fi_FI/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang index 17674103313..3772988a48c 100644 --- a/htdocs/langs/fi_FI/projects.lang +++ b/htdocs/langs/fi_FI/projects.lang @@ -8,8 +8,10 @@ SharedProject=Yhteiset hanke PrivateProject=Yhteystiedot Hankkeen MyProjectsDesc=Tämä näkemys on vain hankkeisiin olet yhteyshenkilö (mikä on tyyppi). ProjectsPublicDesc=Tämä näkemys esitetään kaikki hankkeet sinulla voi lukea. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Tämä näkemys esitetään kaikki hankkeet (käyttäjäoikeuksien antaa sinulle luvan katsella kaikkea). MyTasksDesc=Tämä näkemys on vain hankkeisiin tai tehtäviä olet yhteyshenkilö (mikä on tyyppi). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät sinulla voi lukea. TasksDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät (käyttäjäoikeuksien antaa sinulle luvan katsella kaikkea). ProjectsArea=Projektit alueella @@ -29,6 +31,8 @@ NoProject=Ei hanke määritellään NbOpenTasks=Nb on avattu tehtävät NbOfProjects=Nb hankkeiden TimeSpent=Käytetty aika +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Käytetty aika RefTask=Ref. tehtävä LabelTask=Label tehtävä @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Luettelo toimittajien tilaukset hankkeeseen ListSupplierInvoicesAssociatedProject=Luettelo tavarantoimittajien laskut liittyvät hankkeen ListContractAssociatedProject=Luettelo sopimukset hankkeeseen liittyvät ListFichinterAssociatedProject=Luettelo toimien hankkeeseen liittyvän -ListTripAssociatedProject=Luettelo matkat ja kulut hankkeeseen liittyvät +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Luettelo toimia, jotka liittyvät hankkeen ActivityOnProjectThisWeek=Toiminta hanke tällä viikolla ActivityOnProjectThisMonth=Toiminta hankkeen tässä kuussa @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/fi_FI/salaries.lang b/htdocs/langs/fi_FI/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/fi_FI/salaries.lang +++ b/htdocs/langs/fi_FI/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang index b1eaea2a4db..27c8093e232 100644 --- a/htdocs/langs/fi_FI/sendings.lang +++ b/htdocs/langs/fi_FI/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Kpl velvoitti QtyShipped=Kpl lähetysvuotta QtyToShip=Kpl alusten QtyReceived=Kpl saanut -KeepToShip=Pidä alusten +KeepToShip=Remain to ship OtherSendingsForSameOrder=Muut sendings tässä tilauksessa DateSending=Päiväys lähettämistä, jotta DateSendingShort=Päiväys lähettämistä, jotta diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang index f41c19262d0..797bda3896d 100644 --- a/htdocs/langs/fi_FI/stocks.lang +++ b/htdocs/langs/fi_FI/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Value PMPValueShort=WAP EnhancedValueOfWarehouses=Varastot arvo UserWarehouseAutoCreate=Luo varastossa automaattisesti luoda käyttäjä +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Määrä lähetysolosuhteita QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang index cdb12ae7d8b..aca987a8016 100644 --- a/htdocs/langs/fi_FI/suppliers.lang +++ b/htdocs/langs/fi_FI/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Tavarantoimittajat -Supplier=Toimittaja AddSupplier=Create a supplier SupplierRemoved=Toimittaja poistettu SuppliersInvoice=Tavarantoimittajan lasku @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Toimittajan laskut ja maksut ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Hyväksy tämä tilaus ConfirmApproveThisOrder=Oletko varma, että haluat hyväksyä tämän tilauksen? -DenyingThisOrder=Kiellä tätä järjestystä +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Oletko varma, että haluat kieltää tämän tilauksen? ConfirmCancelThisOrder=Oletko varma, että haluat peruuttaa tämän tilauksen? AddCustomerOrder=Luo asiakas jotta diff --git a/htdocs/langs/fi_FI/trips.lang b/htdocs/langs/fi_FI/trips.lang index c8c22dcbe9e..2012c28cf44 100644 --- a/htdocs/langs/fi_FI/trips.lang +++ b/htdocs/langs/fi_FI/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Matka -Trips=Retket -TripsAndExpenses=Matkat ja kulut -TripsAndExpensesStatistics=Retket ja kulut tilastot -TripCard=Trip-kortti -AddTrip=Lisää matka -ListOfTrips=Luettelo matkat +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Luettelo palkkiot -NewTrip=Uusi matka +NewTrip=New expense report CompanyVisited=Yritys / säätiö vieraili Kilometers=Kilometers FeesKilometersOrAmout=Määrä tai kilometreinä -DeleteTrip=Poista matka -ConfirmDeleteTrip=Oletko varma, että haluat poistaa tämän matkan? -TF_OTHER=Muu -TF_LUNCH=Lounas -TF_TRIP=Matka -ListTripsAndExpenses=Luettelo matkat ja kulut -ExpensesArea=Retket ja kulut alue -SearchATripAndExpense=Etsi matka-ja kulut +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Muu +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lounas +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang index 0b48f915961..a3a5442d2cd 100644 --- a/htdocs/langs/fr_BE/main.lang +++ b/htdocs/langs/fr_BE/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang index 712f481720d..376a1f72966 100644 --- a/htdocs/langs/fr_CA/main.lang +++ b/htdocs/langs/fr_CA/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd.MM.yyyy FormatDateShortJavaInput=dd.MM.yyyy FormatDateShortJQuery=dd.mm.yy FormatDateShortJQueryInput=dd.mm.yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang index d3624332bec..6b54a4fde3e 100644 --- a/htdocs/langs/fr_CH/main.lang +++ b/htdocs/langs/fr_CH/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd-MM-yyyy FormatDateShortJavaInput=dd-MM-yyyy FormatDateShortJQuery=dd-mm-yy FormatDateShortJQueryInput=dd-mm-yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang index 8cf990b17a4..c931ab45d5b 100644 --- a/htdocs/langs/fr_FR/accountancy.lang +++ b/htdocs/langs/fr_FR/accountancy.lang @@ -13,9 +13,9 @@ ConfigAccountingExpert=Configuration du module comptabilité expert Journaux=Journaux JournalFinancial=Journaux financiers Exports=Exports -Export=Export +Export=Exporter Modelcsv=Modèle d'export -OptionsDeactivatedForThisExportModel=For this export model, options are deactivated +OptionsDeactivatedForThisExportModel=Pour ce modèle d'export, les options sont désactivées Selectmodelcsv=Sélectionner un modèle d'export Modelcsv_normal=Export standard Modelcsv_CEGID=Export vers CEGID Expert @@ -68,7 +68,7 @@ Lineofinvoice=Ligne de la facture VentilatedinAccount=Ventilé avec succès dans le compte comptable NotVentilatedinAccount=Non ventilé dans le compte comptable -ACCOUNTING_SEPARATORCSV=Column separator in export file +ACCOUNTING_SEPARATORCSV=Séparateur de colonne dans le fichier export ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à ventiler affichés par page (maximum conseillé : 50) ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencer le tri des pages de ventilation "A ventiler" par les éléments les plus récents diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 9b6dec0e2d1..512b2f3133d 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Expérimental VersionDevelopment=Développement VersionUnknown=Inconnue VersionRecommanded=Recommandé +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID Session SessionSaveHandler=Modalité de sauvegarde des sessions SessionSavePath=Emplacement de sauvegarde sessions @@ -493,10 +498,16 @@ Module600Name=Notifications Module600Desc=Envoi de notifications Email sur certains événements métiers Dolibarr, aux contacts de tiers (configuration réalisé sur chaque tiers) Module700Name=Dons Module700Desc=Gestion des dons +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Interface avec le bug tracker Mantis Module1400Name=Comptabilité Module1400Desc=Gestion de la comptabilité (partie double) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Catégories Module1780Desc=Gestion des catégories (produits, fournisseurs, clients et adhérents) Module2000Name=Éditeur WYSIWYG @@ -631,7 +642,7 @@ Permission181=Consulter les commandes fournisseurs Permission182=Créer/modifier les commandes fournisseurs Permission183=Valider les commandes fournisseurs Permission184=Approuver les commandes fournisseurs -Permission185=Passer les commandes fournisseurs +Permission185=Order or cancel supplier orders Permission186=Accuser réception des commandes fournisseurs Permission187=Clôturer les commandes fournisseurs Permission188=Annuler les commandes fournisseurs @@ -711,6 +722,13 @@ Permission538=Exporter les services Permission701=Consulter les dons Permission702=Créer/modifier les dons Permission703=Supprimer les dons +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Consulter les stocks Permission1002=Créer/modifier entrepôts Permission1003=Supprimer entrepôts @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Mot de passe pour passer le serveur proxy mandataire DefineHereComplementaryAttributes=Définissez ici la liste des attributs supplémentaires, non disponibles en standard, et que vous voulez voir gérer sur les %s. ExtraFields=Attributs supplémentaires ExtraFieldsLines=Attributs supplémentaires (lignes) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Attributs supplémentaires (tiers) ExtraFieldsContacts=Attributs supplémentaires (contacts/adresses) ExtraFieldsMember=Attributs supplémentaires (adhérents) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Une ligne de produit/service ayant une quantité nulle FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Configuration du module Commandes OrdersNumberingModules=Modèles de numérotation des commandes @@ -1383,7 +1410,7 @@ BarcodeDescUPC=code-barres de type UPC BarcodeDescISBN=code-barres de type ISBN BarcodeDescC39=code-barres de type C39 BarcodeDescC128=code-barres de type C128 -GenbarcodeLocation=Outil de génération de code-barres en ligne de commande (utilisé par le moteur interne pour certains types de codes-barres) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Moteur interne BarCodeNumberManager=Gestionnaire pour la génération automatique de numéro de code-barre ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Tiers générique à utiliser par défaut pour les ven CashDeskBankAccountForSell=Compte par défaut à utiliser pour l'encaissement en liquide CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement en carte de crédit -CashDeskDoNotDecreaseStock=Désactiver la réduction de stock quand une vente est faite depuis le Point de Vente. Si "non", la réduction du stock est faite d'office par le module Point de Vente, quelque soit le mode choisi dans la configuration du module stock. +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Forcer et restreindre l'emplacement/entrepôt à utiliser pour la réduction de stock StockDecreaseForPointOfSaleDisabled=Réduction de stock lors de l'utilisation du Point de Vente désactivée +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stocks lors de la réalisation d'une vente depuis le Point de Vente. Aussi, un entrepôt/emplacement est nécessaire. ##### Bookmark ##### BookmarkSetup=Configuration du module Marque-pages @@ -1569,3 +1597,7 @@ SortOrder=Ordre de tri Format=Format TypePaymentDesc=0:Type de paiement client, 1:Type de paiement fournisseur, 2:Paiement de type client et fournisseur IncludePath=Chemin Include (définir dans la variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang index 930487955e3..bd6c96ae3fd 100644 --- a/htdocs/langs/fr_FR/banks.lang +++ b/htdocs/langs/fr_FR/banks.lang @@ -33,7 +33,11 @@ AllTime=Depuis le début Reconciliation=Rapprochement RIB=Numéro de compte bancaire IBAN=Identifiant IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=Identifiant BIC/SWIFT +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Prélèvements StandingOrder=Prélèvement Withdrawals=Retraits @@ -148,7 +152,7 @@ BackToAccount=Retour au compte ShowAllAccounts=Afficher pour tous les comptes FutureTransaction=Transaction future. Pas moyen de concilier. SelectChequeTransactionAndGenerate=Sélectionner/filtrer les chèques à inclure dans le bordereau de remise et cliquer sur "Créer". -InputReceiptNumber=Saisissez le relevé bancaire concerné par le rapprochement. Utilisez une valeur numérique triable (par exemple YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventuellement, saisissez une catégorie dans laquelle classer les écritures ToConciliate=À rapprocher ? ThenCheckLinesAndConciliate=Ensuite, cochez les lignes présentes sur le relevé et cliquez sur diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index f6493015cc3..1956ca025be 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -422,9 +422,9 @@ SituationDeduction=Différence de situation Progress=Progression ModifyAllLines=Modifier toutes les lignes CreateNextSituationInvoice=Créer prochaine situation -NotLastInCycle=This invoice in not the last in cycle and must not be modified. -DisabledBecauseNotLastInCycle=The next situation already exists. +NotLastInCycle=Cette facture n'est pas la dernière dans le cycle et ne doit pas être modifiée +DisabledBecauseNotLastInCycle=Une facture de situation suivante existe DisabledBecauseFinal=Cette situation est la dernière -CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. -NoSituations=No opened situations +CantBeLessThanMinPercent=La progression ne peut être inférieure à la valeur de progression du point de situation précédent +NoSituations=Pas de point de situation ouvert InvoiceSituationLast=Dernière facture diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang index d3125a8edd6..f4961a1e1c5 100644 --- a/htdocs/langs/fr_FR/commercial.lang +++ b/htdocs/langs/fr_FR/commercial.lang @@ -62,7 +62,7 @@ LastProspectContactDone=Prospects contactés DateActionPlanned=Date réalisation prévue DateActionDone=Date réalisation effective ActionAskedBy=Action enregistrée par -ActionAffectedTo=Propriétaire de l'événement +ActionAffectedTo=Event assigned to ActionDoneBy=Action faite par ActionUserAsk=Enregistré par ErrorStatusCantBeZeroIfStarted=Si le champ 'Date début réalisation réelle' est renseigné alors l'action est commencée voire finie, aussi le champ 'État' ne peut être 0%%. diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang index 0be7345fe48..5a8f99a9308 100644 --- a/htdocs/langs/fr_FR/compta.lang +++ b/htdocs/langs/fr_FR/compta.lang @@ -29,7 +29,7 @@ ReportTurnover=Chiffre d'affaires PaymentsNotLinkedToInvoice=Paiements liés à aucune facture, donc aucun tiers PaymentsNotLinkedToUser=Paiements non liés à un utilisateur Profit=Bénéfice -AccountingResult=Accounting result +AccountingResult=Résultat comptable Balance=Solde Debit=Débit Credit=Crédit diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang index 895e3c95cad..e305789f82d 100644 --- a/htdocs/langs/fr_FR/contracts.lang +++ b/htdocs/langs/fr_FR/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expiré ServiceStatusClosed=Fermé ServicesLegend=Légende pour les services Contracts=Contrats +ContractsAndLine=Contracts and line of contracts Contract=Contrat NoContracts=Pas de contrats MenuServices=Services diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang index da6907c85db..a94a7bafe3f 100644 --- a/htdocs/langs/fr_FR/cron.lang +++ b/htdocs/langs/fr_FR/cron.lang @@ -84,3 +84,4 @@ CronType_command=Commande terminal CronMenu=Cron CronCannotLoadClass=Impossible de charger la classe %s ou l'objet %s UseMenuModuleToolsToAddCronJobs=Aller dans le menu "Accueil - Outils modules - Liste des travaux" pour voir et éditer les travaux planifiés. +TaskDisabled=Task disabled diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index b7042a8a33e..7bcae13433a 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Les comptes source et destination doivent être d ErrorBadThirdPartyName=Nom de tiers incorrect ErrorProdIdIsMandatory=Le %s est obligatoire ErrorBadCustomerCodeSyntax=La syntaxe du code client est incorrecte -ErrorBadBarCodeSyntax=Mauvaise syntaxe pour le code-barre +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Code client obligatoire ErrorBarCodeRequired=Code-barre requis ErrorCustomerCodeAlreadyUsed=Code client déjà utilisé @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Le javascript ne doit pas être désactivé pour qu ErrorPasswordsMustMatch=Les 2 mots de passe saisis doivent correspondre ErrorContactEMail=Une erreur technique est apparue. Merci de contacter l'administrateur à l'email suivant %s en lui indiquant le code erreur %s dans votre message ou mieux en fournissant une copie d'écran de cette page. ErrorWrongValueForField=Mauvaise valeur pour le champ numéro %s (la valeur '%s' ne respecte pas la règle %s) -ErrorFieldValueNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une valeure présente dans le champ %s de la table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une référence existante comme %s) ErrorsOnXLines=Erreurs sur %s enregistrement(s) source ErrorFileIsInfectedWithAVirus=L'antivirus n'a pas pu valider ce fichier (il est probablement infecté par un virus) ! @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Erreur interne '%s' ErrorPriceExpressionUnknown=Erreur inconnue '%s' ErrorSrcAndTargetWarehouseMustDiffers=Les entrepôts source et destination doivent être différents ErrorTryToMakeMoveOnProductRequiringBatchData=Erreur, vous essayez de faire un mouvement sans lot/numéro de série, sur un produit qui exige un lot/numéro de série. +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang index 4a0c5a9aafb..7b0a6256ede 100644 --- a/htdocs/langs/fr_FR/install.lang +++ b/htdocs/langs/fr_FR/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Dernière étape: Définissez ici l'identifiant et ActivateModule=Activation du module %s ShowEditTechnicalParameters=Cliquer ici pour afficher/éditer les paramètres techniques (mode expert) WarningUpgrade=Attention :\nAvez-vous fait une sauvegarde de la base de données en premier ?\nA cause de problèmes dans le système de base de données (Par exemple mysql version 5.5.40), beaucoup de données ou de tables peuvent être perdu pendant le processus de migration, il est donc très recommandé d'avoir une sauvegarde complète de votre base de données avant de commencer le processus de migration.\n\nCliquez OK pour commencer le processus de migration +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade @@ -207,7 +208,7 @@ MigrationProjectTaskTime=Mise à jour du temps consommé en secondes MigrationActioncommElement=Mise à jour des données des actions des éléments MigrationPaymentMode=Migration des modes de paiement MigrationCategorieAssociation=Migration des categories -MigrationEvents=Migration of events to add event owner into assignement table +MigrationEvents=Migration des évènements pour ajouter les propriétaires dans la table des utilisateurs assignés ShowNotAvailableOptions=Afficher les choix non disponibles HideNotAvailableOptions=Cacher les choix non disponibles diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index a8ab47c9c4d..173594ef593 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -141,6 +141,7 @@ Cancel=Annuler Modify=Modifier Edit=Éditer Validate=Valider +ValidateAndApprove=Validate and Approve ToValidate=À valider Save=Enregistrer SaveAs=Enregistrer sous @@ -158,6 +159,7 @@ Search=Rechercher SearchOf=Recherche de Valid=Valider Approve=Approuver +Disapprove=Disapprove ReOpen=Réouvrir Upload=Envoyer fichier ToLink=Lier @@ -219,6 +221,7 @@ Cards=Fiches Card=Fiche Now=Maintenant Date=Date +DateAndHour=Date and hour DateStart=Date début DateEnd=Date fin DateCreation=Date création @@ -295,6 +298,7 @@ UnitPriceHT=Prix unitaire HT UnitPriceTTC=Prix unitaire TTC PriceU=P.U. PriceUHT=P.U. HT +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=P.U. TTC Amount=Montant AmountInvoice=Montant facture @@ -521,6 +525,7 @@ DateFromTo=Du %s au %s DateFrom=A partir du %s DateUntil=Jusqu'au %s Check=Vérifier +Uncheck=Uncheck Internal=Interne External=Externe Internals=Internes @@ -688,6 +693,7 @@ PublicUrl=URL publique AddBox=Ajouter boite SelectElementAndClickRefresh=Sélectionnez un élément et cliquez sur Rafraichir PrintFile=Imprimer fichier %s +ShowTransaction=Show transaction # Week day Monday=Lundi Tuesday=Mardi diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index a920f58d399..78565d17a8a 100644 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Annulée StatusOrderDraft=Brouillon (à valider) StatusOrderValidated=Validée StatusOrderOnProcess=Commandé - en attente de réception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Traitée StatusOrderToBill=Délivrée StatusOrderToBill2=À facturer @@ -58,6 +59,7 @@ MenuOrdersToBill=Commandes délivrées MenuOrdersToBill2=Commandes facturables SearchOrder=Rechercher une commande SearchACustomerOrder=Rechercher une commande client +SearchASupplierOrder=Search a supplier order ShipProduct=Expédier produit Discount=Remise CreateOrder=Créer Commande diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index 1c23cce68cb..45ba7c01e89 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -54,12 +54,13 @@ MaxSize=Taille maximum AttachANewFile=Ajouter un nouveau fichier/document LinkedObject=Objet lié Miscellaneous=Divers -NbOfActiveNotifications=Nombre de notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Ceci est un message de test.\nLes 2 lignes sont séparées par un retour à la ligne.\n\n__SIGNATURE__ PredefinedMailTestHtml=Ceci est un message de test (le mot test doit être en gras).
Les 2 lignes sont séparées par un retour à la ligne.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\nNous voudrions porter à votre connaissance que la facture __FACREF__ ne semble pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la proposition commerciale __PROPREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__ diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang index 6cf152e6f80..d1c1edb2b8e 100644 --- a/htdocs/langs/fr_FR/productbatch.lang +++ b/htdocs/langs/fr_FR/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Lot/Numéro de série l_eatby=Date limite de consommation l_sellby=Date de péremption DetailBatchNumber=Détails Lot/Série -DetailBatchFormat=Lot/Série: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Lot/Série: %s printEatby=Limite de consommation : %s printSellby=Péremption : %s diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang index 5e27359209f..3443b2c7aac 100644 --- a/htdocs/langs/fr_FR/products.lang +++ b/htdocs/langs/fr_FR/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=Dans les produits commes les services et les prix fou PriceExpressionEditorHelp4=Dans les prix produits/services uniquement: #supplier_min_price#
Dans les prix fournisseurs uniquement: #supplier_quantity# et #supplier_tva_tx# PriceMode=Mode de tarification PriceNumeric=Nombre +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 302732b6e71..08d2436c16e 100644 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -8,8 +8,10 @@ SharedProject=Tout le monde PrivateProject=Contacts du projet MyProjectsDesc=Cette vue projet est restreinte aux projets pour lesquels vous êtes un contact affecté (quel qu'en soit le type). ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes habilité à avoir une visibilité. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Cette vue présente tous les projets (vos habilitations vous offrant une vue exhaustive). MyTasksDesc=Cette vue est restreinte aux projets et tâches pour lesquels vous êtes un contact affecté à au moins une tâche (quel qu'en soit le type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité. TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive). ProjectsArea=Espace projet @@ -29,6 +31,8 @@ NoProject=Aucun projet défini ou responsable NbOpenTasks=Nb Tâches Ouvertes NbOfProjects=Nombre de projets TimeSpent=Temps consommé +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Temps consommés RefTask=Ref. tâche LabelTask=Libellé tâche @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet ListContractAssociatedProject=Liste des contrats associés au projet ListFichinterAssociatedProject=Liste des interventions associées au projet -ListTripAssociatedProject=Liste des notes de frais associées au projet +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Liste des événements associés au projet ActivityOnProjectThisWeek=Activité sur les projets cette semaine ActivityOnProjectThisMonth=Activité sur les projets ce mois @@ -133,3 +137,6 @@ SearchAProject=Rechercher un projet ProjectMustBeValidatedFirst=Le projet doit être validé d'abord ProjectDraft=Projets brouillons FirstAddRessourceToAllocateTime=Ajouter une ressource pour pouvoir allouer tu temps +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang index c76f03c8d9f..4d6cee75748 100644 --- a/htdocs/langs/fr_FR/salaries.lang +++ b/htdocs/langs/fr_FR/salaries.lang @@ -10,3 +10,4 @@ SalariesPayments=Règlements des salaires ShowSalaryPayment=Afficher règlement de salaire THM=Tarif horaire moyen TJM=Tarif journalier moyen +CurrentSalary=Current salary diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang index 356fa55b946..e65707e186c 100644 --- a/htdocs/langs/fr_FR/sendings.lang +++ b/htdocs/langs/fr_FR/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qté. commandée QtyShipped=Qté. expédiée QtyToShip=Qté. à expédier QtyReceived=Qté. reçue -KeepToShip=Reste à expédier +KeepToShip=Remain to ship OtherSendingsForSameOrder=Autres expéditions pour cette commande DateSending=Date ordre d'expédition DateSendingShort=Date ordre exp. diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang index d7b32c8ff44..7a342f04a7d 100644 --- a/htdocs/langs/fr_FR/stocks.lang +++ b/htdocs/langs/fr_FR/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Valorisation (PMP) PMPValueShort=PMP EnhancedValueOfWarehouses=Valorisation des stocks UserWarehouseAutoCreate=Créer automatiquement un stock/entrepôt propre à l'utilisateur lors de sa création +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantité ventilée QtyDispatchedShort=Qté ventilée QtyToDispatchShort=Qté à ventiler @@ -110,7 +111,7 @@ WarehouseForStockDecrease=L'entrepôt %s sera utilisé pour la décrémen WarehouseForStockIncrease=L'entrepôt %s sera utilisé pour l'incrémentation du stock ForThisWarehouse=Pour cet entrepôt ReplenishmentStatusDesc=Cet écran permet de voir les produits avec un stock inférieur à la quantité minimale désirée (ou à la quantité du seuil d'alerte si la case "Alertes seulement" est cochée) et propose de créer des commandes fournisseurs pour compléter la différence -ReplenishmentOrdersDesc=Voici la liste des commandes fournisseurs en cours +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Réapprovisionnement NbOfProductBeforePeriod=Quantité du produit %s en stock avant la période sélectionnée (< %s) NbOfProductAfterPeriod=Quantité du produit %s en stock après la période sélectionnée (> %s) @@ -130,3 +131,4 @@ IsInPackage=Inclus dans un package ShowWarehouse=Afficher entrepôt MovementCorrectStock=Correction du contenu en stock pour le produit %s MovementTransferStock=Transfert de stock du produit %s dans un autre entrepôt +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang index ea0ecef8e39..07904930bf2 100644 --- a/htdocs/langs/fr_FR/suppliers.lang +++ b/htdocs/langs/fr_FR/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Fournisseurs -Supplier=Fournisseur AddSupplier=Créer un fournisseur SupplierRemoved=Fournisseur supprimé SuppliersInvoice=Facture fournisseur @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Factures fournisseurs et règlements ExportDataset_fournisseur_3=Commandes fournisseur et lignes de commande ApproveThisOrder=Approuver la commande ConfirmApproveThisOrder=Êtes-vous sûr de vouloir approuver la commande fournisseur %s ? -DenyingThisOrder=Refuser la commande +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Êtes-vous sûr de vouloir refuser la commande fournisseur %s ? ConfirmCancelThisOrder=Êtes-vous sûr de vouloir annuler la commande fournisseur %s ? AddCustomerOrder=Créer commande client diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang index 5cad7a4b4a0..1d9f41e09c9 100644 --- a/htdocs/langs/fr_FR/trips.lang +++ b/htdocs/langs/fr_FR/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Déplacement -Trips=Déplacements -TripsAndExpenses=Note de frais -TripsAndExpensesStatistics=Statistiques notes de frais -TripCard=Fiche frais -AddTrip=Créer note de frais -ListOfTrips=Liste des frais +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Liste des notes de frais -NewTrip=Nouvelle note de frais +NewTrip=New expense report CompanyVisited=Société/institution visitée Kilometers=Kilomètres FeesKilometersOrAmout=Montant ou kilomètres -DeleteTrip=Supprimer déplacement -ConfirmDeleteTrip=Êtes-vous sûr de vouloir supprimer cette note de frais ? -TF_OTHER=Autre -TF_LUNCH=Repas -TF_TRIP=Déplacement -ListTripsAndExpenses=Liste des notes de frais -ExpensesArea=Espace notes de frais -SearchATripAndExpense=Rechercher une note de frais +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classer 'Remboursé' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Autre +TF_TRANSPORTATION=Transportation +TF_LUNCH=Repas +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/fr_NC/main.lang b/htdocs/langs/fr_NC/main.lang index 80513df8eea..bd886d9e846 100644 --- a/htdocs/langs/fr_NC/main.lang +++ b/htdocs/langs/fr_NC/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang index 72578ac824d..40ebcc8f65d 100644 --- a/htdocs/langs/he_IL/admin.lang +++ b/htdocs/langs/he_IL/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=נסיוני VersionDevelopment=התפתחות VersionUnknown=לא ידוע VersionRecommanded=מומלץ +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=מושב מזהה SessionSaveHandler=הנדלר להציל הפעלות SessionSavePath=הפגישה אחסון לוקליזציה @@ -493,10 +498,16 @@ Module600Name=הודעות Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=תרומות Module700Desc=התרומה של ההנהלה +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=גמל שלמה Module1200Desc=גמל שלמה אינטגרציה Module1400Name=חשבונאות Module1400Desc=חשבונאות וניהול (צד כפולות) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=קטגוריות Module1780Desc=Categorie ההנהלה (מוצרים, ספקים ולקוחות) Module2000Name=עורך WYSIWYG @@ -631,7 +642,7 @@ Permission181=לקרוא הזמנות ספקים Permission182=ליצור / לשנות הספק הזמנות Permission183=תוקף צווי הספק Permission184=לאשר הזמנות ספקים -Permission185=הספק סדר הזמנות +Permission185=Order or cancel supplier orders Permission186=לקבל הזמנות ספקים Permission187=הספק הזמנות סגור Permission188=ביטול הזמנות ספקים @@ -711,6 +722,13 @@ Permission538=יצוא שירותים Permission701=לקרוא תרומות Permission702=צור / לשנות תרומות Permission703=מחק תרומות +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=לקרוא מניות Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=סיסמה כדי להשתמש בשרת proxy DefineHereComplementaryAttributes=להגדיר כאן את כל atributes, אינו זמין כבר כברירת מחדל, כי אתה רוצה להיות נתמך על %s. ExtraFields=משלימים תכונות ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=קו של המוצר / שירות עם כמות אפס FreeLegalTextOnProposal=טקסט חופשי על הצעות מסחריות WatermarkOnDraftProposal=סימן מים על הצעות טיוטה מסחריים (כל אם ריק) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=התקנה וניהול של סדר OrdersNumberingModules=הזמנות מספור מודולים @@ -1383,7 +1410,7 @@ BarcodeDescUPC=ברקוד מסוג UPC BarcodeDescISBN=ברקוד מסוג ISBN BarcodeDescC39=ברקוד מסוג C39 BarcodeDescC128=ברקוד מסוג C128 -GenbarcodeLocation=הברקוד הדור הפקודה כלי הקו (בשימוש על ידי מנוע phpbarcode עבור סוגים מסוימים ברקוד) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=חשבון ברירת מחדל להשתמש כדי לקבל תשלומים במזומן CashDeskBankAccountForCheque= חשבון ברירת מחדל להשתמש כדי לקבל תשלומים על ידי סימון CashDeskBankAccountForCB= חשבון ברירת מחדל להשתמש כדי לקבל תשלומים במזומן באמצעות כרטיסי אשראי -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=הפוך ההתקנה מודול @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang index 0041d4550f2..ccc6050c6f1 100644 --- a/htdocs/langs/he_IL/banks.lang +++ b/htdocs/langs/he_IL/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=הוראות קבע StandingOrder=Standing order Withdrawals=Withdrawals @@ -148,7 +152,7 @@ BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/he_IL/commercial.lang b/htdocs/langs/he_IL/commercial.lang index 2c1a8e5b82a..49d3d353137 100644 --- a/htdocs/langs/he_IL/commercial.lang +++ b/htdocs/langs/he_IL/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Prospects DeleteAction=Delete an event/task NewAction=New event/task -AddAction=Add event/task -AddAnAction=Add an event/task -AddActionRendezVous=Add a Rendez-vous event +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event/task ? CardAction=Event card @@ -44,8 +44,8 @@ DoneActions=Completed events DoneActionsFor=Completed events for %s ToDoActions=Incomplete events ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete diff --git a/htdocs/langs/he_IL/contracts.lang b/htdocs/langs/he_IL/contracts.lang index 52c05d495ad..3c4d235e884 100644 --- a/htdocs/langs/he_IL/contracts.lang +++ b/htdocs/langs/he_IL/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired ServiceStatusClosed=Closed ServicesLegend=Services legend Contracts=חוזים +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=No contracts MenuServices=שירותים diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang index 349d2275749..bb128746069 100644 --- a/htdocs/langs/he_IL/cron.lang +++ b/htdocs/langs/he_IL/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang index 497ddd814e4..700e6344d7d 100644 --- a/htdocs/langs/he_IL/errors.lang +++ b/htdocs/langs/he_IL/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang index d0d0973e729..c72668ff058 100644 --- a/htdocs/langs/he_IL/install.lang +++ b/htdocs/langs/he_IL/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang index 410198e13c9..510dc2d1443 100644 --- a/htdocs/langs/he_IL/main.lang +++ b/htdocs/langs/he_IL/main.lang @@ -141,6 +141,7 @@ Cancel=Cancel Modify=Modify Edit=Edit Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Save SaveAs=Save As @@ -158,6 +159,7 @@ Search=Search SearchOf=Search Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Now Date=Date +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=From %s to %s DateFrom=From %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang index 57c3dccde16..3e45ed9db31 100644 --- a/htdocs/langs/he_IL/orders.lang +++ b/htdocs/langs/he_IL/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Validated StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderToBill2=To bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang index b9e26e405c8..4c5e1b6346f 100644 --- a/htdocs/langs/he_IL/other.lang +++ b/htdocs/langs/he_IL/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=שונות -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/he_IL/productbatch.lang +++ b/htdocs/langs/he_IL/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang index 2d4bdafd5a4..9c98812f2a3 100644 --- a/htdocs/langs/he_IL/products.lang +++ b/htdocs/langs/he_IL/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang index 2d1abe5706f..31faca7c515 100644 --- a/htdocs/langs/he_IL/projects.lang +++ b/htdocs/langs/he_IL/projects.lang @@ -8,8 +8,10 @@ SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). ProjectsArea=Projects area @@ -29,6 +31,8 @@ NoProject=No project defined or owned NbOpenTasks=Nb of opened tasks NbOfProjects=Nb of projects TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project -ListTripAssociatedProject=List of trips and expenses associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/he_IL/salaries.lang b/htdocs/langs/he_IL/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/he_IL/salaries.lang +++ b/htdocs/langs/he_IL/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang index 5167582502a..51b04b2db35 100644 --- a/htdocs/langs/he_IL/sendings.lang +++ b/htdocs/langs/he_IL/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qty ordered QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order DateSending=Date sending order DateSendingShort=Date sending order diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang index 79d03a24da0..4cb004102f8 100644 --- a/htdocs/langs/he_IL/stocks.lang +++ b/htdocs/langs/he_IL/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang index b910d186708..591b1d13545 100644 --- a/htdocs/langs/he_IL/suppliers.lang +++ b/htdocs/langs/he_IL/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=ספקים -Supplier=Supplier AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Approve this order ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Denying this order +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? AddCustomerOrder=Create customer order diff --git a/htdocs/langs/he_IL/trips.lang b/htdocs/langs/he_IL/trips.lang index 2874de3a593..34b879b2751 100644 --- a/htdocs/langs/he_IL/trips.lang +++ b/htdocs/langs/he_IL/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Add trip -ListOfTrips=List of trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List of fees -NewTrip=New trip +NewTrip=New expense report CompanyVisited=Company/foundation visited Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? -TF_OTHER=אחר -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=אחר +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang index b7ca8542a9b..22a62f00d59 100644 --- a/htdocs/langs/hr_HR/admin.lang +++ b/htdocs/langs/hr_HR/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=Development VersionUnknown=Unknown VersionRecommanded=Recommended +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Session ID SessionSaveHandler=Handler to save sessions SessionSavePath=Storage session localization @@ -493,10 +498,16 @@ Module600Name=Notifications Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. ExtraFields=Complementary attributes ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang index 25f0ecbc3a0..da71da227fb 100644 --- a/htdocs/langs/hr_HR/banks.lang +++ b/htdocs/langs/hr_HR/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN broj +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Otvorene narudžbe StandingOrder=Otvorena narudžba Withdrawals=Withdrawals @@ -148,7 +152,7 @@ BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/hr_HR/commercial.lang b/htdocs/langs/hr_HR/commercial.lang index 90bf154d2f3..0be24ffda59 100644 --- a/htdocs/langs/hr_HR/commercial.lang +++ b/htdocs/langs/hr_HR/commercial.lang @@ -9,9 +9,9 @@ Prospect=Potencijalni kupac Prospects=Potencijalni kupci DeleteAction=Izbriši događaj/zadatak NewAction=Novi događaj/zadatak -AddAction=Dodaj događaj/zadatak -AddAnAction=Dodaj događaj/zadatak -AddActionRendezVous=Add a Rendez-vous event +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event/task ? CardAction=Event card @@ -44,8 +44,8 @@ DoneActions=Završeni događaji DoneActionsFor=Završeni događaji za %s ToDoActions=Nedovršeni događaji ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Pošalji narudžbu %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Završeno diff --git a/htdocs/langs/hr_HR/contracts.lang b/htdocs/langs/hr_HR/contracts.lang index 26ec3f1e5a4..59e6ca9670f 100644 --- a/htdocs/langs/hr_HR/contracts.lang +++ b/htdocs/langs/hr_HR/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Završen ServiceStatusClosed=Zatvoren ServicesLegend=Knjiga usluga Contracts=Ugovori +ContractsAndLine=Contracts and line of contracts Contract=Ugovor NoContracts=Nema ugovora MenuServices=Usluge diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang index 82f4574b223..28dfc7770b2 100644 --- a/htdocs/langs/hr_HR/cron.lang +++ b/htdocs/langs/hr_HR/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang index 497ddd814e4..700e6344d7d 100644 --- a/htdocs/langs/hr_HR/errors.lang +++ b/htdocs/langs/hr_HR/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang index 5a494156672..dcd8df6e7db 100644 --- a/htdocs/langs/hr_HR/install.lang +++ b/htdocs/langs/hr_HR/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang index 2729f374a7e..3e299f51788 100644 --- a/htdocs/langs/hr_HR/main.lang +++ b/htdocs/langs/hr_HR/main.lang @@ -141,6 +141,7 @@ Cancel=Cancel Modify=Modify Edit=Edit Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Save SaveAs=Save As @@ -158,6 +159,7 @@ Search=Search SearchOf=Search Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Now Date=Date +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=Od %s za %s DateFrom=Od %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang index cd0b42c8adf..f59089eee0f 100644 --- a/htdocs/langs/hr_HR/orders.lang +++ b/htdocs/langs/hr_HR/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Poništeno StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Ovjereno StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Obrađeno StatusOrderToBill=Dostavljeno StatusOrderToBill2=Za naplatu @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Pretraži narudžbe SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Pošalji proizvod Discount=Popust CreateOrder=Kreiraj narudžbu diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang index 88991888183..08747ea884b 100644 --- a/htdocs/langs/hr_HR/other.lang +++ b/htdocs/langs/hr_HR/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/hr_HR/productbatch.lang +++ b/htdocs/langs/hr_HR/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang index a42bd146177..0b8b37f2a97 100644 --- a/htdocs/langs/hr_HR/products.lang +++ b/htdocs/langs/hr_HR/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang index 4127fc0fb7e..58ef04b2e35 100644 --- a/htdocs/langs/hr_HR/projects.lang +++ b/htdocs/langs/hr_HR/projects.lang @@ -8,8 +8,10 @@ SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). ProjectsArea=Projects area @@ -29,6 +31,8 @@ NoProject=Nema definiranih ili vlastih projekata NbOpenTasks=Nb of opened tasks NbOfProjects=Nb of projects TimeSpent=Vrijeme utrošeno +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Vrijeme utrošeno RefTask=Ref. task LabelTask=Label task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project -ListTripAssociatedProject=List of trips and expenses associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/hr_HR/salaries.lang b/htdocs/langs/hr_HR/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/hr_HR/salaries.lang +++ b/htdocs/langs/hr_HR/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang index d5ec2daa761..b4f1e2b8e25 100644 --- a/htdocs/langs/hr_HR/sendings.lang +++ b/htdocs/langs/hr_HR/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Količina naručena QtyShipped=Količina poslana QtyToShip=Količina za poslat QtyReceived=Količina primljena -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order DateSending=Date sending order DateSendingShort=Date sending order diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang index 9de2e5a4dbe..29706d17615 100644 --- a/htdocs/langs/hr_HR/stocks.lang +++ b/htdocs/langs/hr_HR/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang index 7b4d4acb244..baf573c66ac 100644 --- a/htdocs/langs/hr_HR/suppliers.lang +++ b/htdocs/langs/hr_HR/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -Supplier=Supplier AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Approve this order ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Denying this order +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? AddCustomerOrder=Create customer order diff --git a/htdocs/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang index 4b0501a8346..ba36fc9b07b 100644 --- a/htdocs/langs/hr_HR/trips.lang +++ b/htdocs/langs/hr_HR/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Add trip -ListOfTrips=List of trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List of fees -NewTrip=New trip +NewTrip=New expense report CompanyVisited=Company/foundation visited Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? -TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang index ebe81e0bf63..6bf991e2634 100644 --- a/htdocs/langs/hu_HU/admin.lang +++ b/htdocs/langs/hu_HU/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Kísérleti VersionDevelopment=Fejlesztés VersionUnknown=Ismeretlen VersionRecommanded=Ajánlott +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Session ID SessionSaveHandler=Handler menteni ülések SessionSavePath=Tárolás munkamenet lokalizáció @@ -493,10 +498,16 @@ Module600Name=Értesítések Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Adományok Module700Desc=Adomány vezetése +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integráció Module1400Name=Számvitel Module1400Desc=Számviteli menedzsment (dupla felek) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategóriák Module1780Desc=Kategóriában vezetősége (termékek, szállítók és vevők) Module2000Name=WYSIWYG szerkesztő @@ -631,7 +642,7 @@ Permission181=Olvassa szállító megrendelések Permission182=Létrehozza / módosítja szállító megrendelések Permission183=Érvényesítés szállító megrendelések Permission184=Jóváhagyás beszállítói megrendelések -Permission185=Rendelés szállító megrendelések +Permission185=Order or cancel supplier orders Permission186=Vételi megbízás beszállító Permission187=Bezár szállító megrendelések Permission188=Mégsem beszállítói megrendelések @@ -711,6 +722,13 @@ Permission538=Export szolgáltatások Permission701=Olvassa el adományokat Permission702=Létrehozza / módosítja adományok Permission703=Törlés adományok +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Olvassa készletek Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Jelszó a proxy szerver használata DefineHereComplementaryAttributes=Adjuk meg itt minden atributes, még nem álltak rendelkezésre az alapból, hogy azt szeretné, hogy támogatja %s. ExtraFields=Kiegészítő tulajdonságok ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Egy sor termék / szolgáltatás nulla összeg szóba, FreeLegalTextOnProposal=Szabad szöveg a kereskedelmi javaslatok WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order Management Setup OrdersNumberingModules=Megrendelés számozási modulok @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Vonalkód típusú UPC BarcodeDescISBN=Vonalkód típusú ISBN BarcodeDescC39=Vonalkód típusú C39 BarcodeDescC128=Vonalkód típusú C128 -GenbarcodeLocation=Vonalkód generáló parancssori eszköz (phpbarcode motor használja egyes vonalkód típusokhoz) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Alapértelmezett fiók kezelhető készpénz kifizetések CashDeskBankAccountForCheque= Alapértelmezett fiók használata fizetések fogadására csekkel CashDeskBankAccountForCB= Alapértelmezett fiók kezelhető készpénz kifizetések hitelkártyák -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Könyvjelző beállítása modul @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang index 0056818fa07..7f12abcf832 100644 --- a/htdocs/langs/hu_HU/banks.lang +++ b/htdocs/langs/hu_HU/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Egyeztetés RIB=Bankszámla száma IBAN=IBAN szám +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT száma +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Állandó megbízás StandingOrder=Állandó érvényű parancs Withdrawals=Kivonás @@ -148,7 +152,7 @@ BackToAccount=Visszalép a számla ShowAllAccounts=Mutasd az összes fiók FutureTransaction=Ügylet Futur. Semmiképpen egyeztetni. SelectChequeTransactionAndGenerate=Válassza / filter ellenőrzéseket be kell vonni a csekket befizetés beérkezésének és kattintson a "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/hu_HU/commercial.lang b/htdocs/langs/hu_HU/commercial.lang index 882531d8908..e3bd1fedfda 100644 --- a/htdocs/langs/hu_HU/commercial.lang +++ b/htdocs/langs/hu_HU/commercial.lang @@ -9,9 +9,9 @@ Prospect=Kilátás Prospects=Kilátások DeleteAction=Cselekvés / feladat törlése NewAction=Új cselekvés / feladat -AddAction=Cselekvés / feladat hozzáadása -AddAnAction=Cselekvés / feladat hozzáadása -AddActionRendezVous=Találkozó hozzáadása +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Találkozó ConfirmDeleteAction=Biztos törölni akarja ezt a feladatot? CardAction=Cselekvés kártya @@ -44,8 +44,8 @@ DoneActions=Befejezett cselekvések DoneActionsFor=Befejezett cselekvések %s részére ToDoActions=Befejezetlen cselekvések ToDoActionsFor=Befejezetlen cselekvések %s részére -SendPropalRef=Ajánlat küldése %s -SendOrderRef=Megrendelés küldése %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Nem alkalmazható StatusActionToDo=Végrehajtani StatusActionDone=Kész @@ -62,7 +62,7 @@ LastProspectContactDone=Kapcsolatba lépés megtörtént DateActionPlanned=Cselekmény dátuma DateActionDone=Cselekvés befejezésésnek a dátuma ActionAskedBy=Cselekvést kérte -ActionAffectedTo=Cselekvés hatással van rá +ActionAffectedTo=Event assigned to ActionDoneBy=Cselekvést végrehatja ActionUserAsk=Jegyezte ErrorStatusCantBeZeroIfStarted=Ha a 'Cselekvés befejezésésnek a dátuma' mező rendelkezik tartalommal, a cselekvés elkezdődőtt (vagy befejeződtt), az 'Állapot' mező nem lehet 0%%. diff --git a/htdocs/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang index df24822ebb1..426c7a37859 100644 --- a/htdocs/langs/hu_HU/contracts.lang +++ b/htdocs/langs/hu_HU/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Lejárt ServiceStatusClosed=Lezárva ServicesLegend=Szolgáltatások magyarázat Contracts=Szerződések +ContractsAndLine=Contracts and line of contracts Contract=Szerződés NoContracts=Nincs szerződés MenuServices=Szolgáltatás diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang index 119ae6079d5..b186a698110 100644 --- a/htdocs/langs/hu_HU/cron.lang +++ b/htdocs/langs/hu_HU/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang index 75d66c5b78f..197f9806cca 100644 --- a/htdocs/langs/hu_HU/errors.lang +++ b/htdocs/langs/hu_HU/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Forrás és célok bankszámlák különbözőnek ErrorBadThirdPartyName=Rossz érték a harmadik fél nevében ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Rossz a szintaxisa az ügyfél kód -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Ügyfél kód szükséges ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Ügyfél kód már használatban @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript nem szabad tiltani, hogy ez a funkció m ErrorPasswordsMustMatch=Mindkét típusú jelszavakat kell egyeznie egymással ErrorContactEMail=Egy technikai hiba történt. Kérjük, lépjen kapcsolatba a következő e-mail rendszergazda %s en biztosítja a hibakódot %s be az üzenetet, vagy még jobb hozzáadásával képernyő ezen oldal másolatát. ErrorWrongValueForField=Rossz érték mezőszám %s (érték "%s" nem egyezik regex szabály %s) -ErrorFieldValueNotIn=Rossz érték mezőszám %s (érték "%s" nem érték áll rendelkezésre a területen %s %s táblázat) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Rossz érték mezőszám %s (érték "%s" nem létező %s ref) ErrorsOnXLines=%s hibák forrása vonalak ErrorFileIsInfectedWithAVirus=A víruskereső program nem tudta érvényesíteni a fájl (file lehet megfertőzte egy vírus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang index 1da3c2c7cbc..78d675524cd 100644 --- a/htdocs/langs/hu_HU/install.lang +++ b/htdocs/langs/hu_HU/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Utolsó lépés: Adjuk meg itt bejelentkezési né ActivateModule=Modul aktiválása %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang index 21c0caa72a0..47b61bbf942 100644 --- a/htdocs/langs/hu_HU/main.lang +++ b/htdocs/langs/hu_HU/main.lang @@ -141,6 +141,7 @@ Cancel=Megszakítás Modify=Módosítás Edit=Szerkesztés Validate=Hitelesítés +ValidateAndApprove=Validate and Approve ToValidate=Hitelesyteni Save=Mentés SaveAs=Mentés másként @@ -158,6 +159,7 @@ Search=Keresés SearchOf=Keresés Valid=Hiteles Approve=Jóváhagy +Disapprove=Disapprove ReOpen=Újra megnyit Upload=Fájl küldése ToLink=Link @@ -219,6 +221,7 @@ Cards=Kártáy Card=Kártya Now=Most Date=Dátum +DateAndHour=Date and hour DateStart=Kezdés DateEnd=Végzés DateCreation=Létrehozás dátuma @@ -295,6 +298,7 @@ UnitPriceHT=Egység ár (nettó) UnitPriceTTC=Egység ár PriceU=E.Á. PriceUHT=E.Á. (nettó) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=E.Á. Amount=Mennyiség AmountInvoice=Számla mennyiség @@ -521,6 +525,7 @@ DateFromTo=%s -től %s -ig DateFrom=%s -től DateUntil=%s -ig Check=Ellenőriz +Uncheck=Uncheck Internal=Belső External=Külső Internals=Belső @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Hétfő Tuesday=Kedd diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang index b1d273e4106..d146ad13e0b 100644 --- a/htdocs/langs/hu_HU/orders.lang +++ b/htdocs/langs/hu_HU/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Törölve StatusOrderDraft=Tervezet (kell érvényesíteni) StatusOrderValidated=Hitelesítette StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Feldolgozott StatusOrderToBill=Bill StatusOrderToBill2=Bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Megrendelés Bill MenuOrdersToBill2=Billable orders SearchOrder=Keresés érdekében SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Hajó termék Discount=Kedvezmény CreateOrder=Rendet diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang index e9ddc4edf81..5b4e01644cd 100644 --- a/htdocs/langs/hu_HU/other.lang +++ b/htdocs/langs/hu_HU/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximális méret AttachANewFile=Helyezzen fel egy új file / dokumentum LinkedObject=Csatolt objektum Miscellaneous=Vegyes -NbOfActiveNotifications=Bejelentések száma +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Ez egy teszt mailt. \\ NA két vonal választja el egymástól kocsivissza. PredefinedMailTestHtml=Ez egy teszt mail (a szó vizsgálatot kell vastagon).
A két vonal választja el egymástól kocsivissza. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/hu_HU/productbatch.lang +++ b/htdocs/langs/hu_HU/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang index ccba6ede02d..584d47aeb70 100644 --- a/htdocs/langs/hu_HU/products.lang +++ b/htdocs/langs/hu_HU/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang index 274c306e716..085c0f39bc5 100644 --- a/htdocs/langs/hu_HU/projects.lang +++ b/htdocs/langs/hu_HU/projects.lang @@ -8,8 +8,10 @@ SharedProject=Mindenki PrivateProject=A projekt kapcsolatai MyProjectsDesc=Ez a nézet azokra a projektekre van korlátozva amivel valamilyen összefüggésben áll. ProjectsPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Ez a nézet minden projektet tartalmaz. MyTasksDesc=Ez a nézet azokra a projektekre van korlátozva amivel valamilyen összefüggésben áll. +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva. TasksDesc=Ez a nézet minden projektet tartalmaz. ProjectsArea=Projektek terület @@ -29,6 +31,8 @@ NoProject=Nincs létrehozott vagy tulajdonolt projekt NbOpenTasks=Nyitott feladatok száma NbOfProjects=Projektek száma TimeSpent=Eltöltött idő +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Töltött idő RefTask=Feladat ref# LabelTask=Feladat cimkéje @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=A projekthez tartozó beszállítói rendel ListSupplierInvoicesAssociatedProject=A projekthez tartozó beszállítói számlák listája ListContractAssociatedProject=A projekthez tartozó szerződések listája ListFichinterAssociatedProject=A projekthez tartozó intervenciók listája -ListTripAssociatedProject=A projekthez tartozó utazási kiadások listája +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=A projekthez tartozó cselekvések listája ActivityOnProjectThisWeek=Heti projekt aktivitás ActivityOnProjectThisMonth=Havi projekt aktivitás @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/hu_HU/salaries.lang b/htdocs/langs/hu_HU/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/hu_HU/salaries.lang +++ b/htdocs/langs/hu_HU/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang index 82c7da53ef0..b2c42484995 100644 --- a/htdocs/langs/hu_HU/sendings.lang +++ b/htdocs/langs/hu_HU/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Rendelt mennyiség QtyShipped=Kiszállított mennyiség QtyToShip=Szállítandó mennyiség QtyReceived=Átvett mennyiség -KeepToShip=Szállításra félretenni +KeepToShip=Remain to ship OtherSendingsForSameOrder=Más szállítások ehhez a megrendeléshez DateSending=Date sending order DateSendingShort=Küldési dátum sorrend diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang index 2f5b54b3bfc..c3570f47006 100644 --- a/htdocs/langs/hu_HU/stocks.lang +++ b/htdocs/langs/hu_HU/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Súlyozott árlak érték PMPValueShort=SÁÉ EnhancedValueOfWarehouses=Raktárak értéke UserWarehouseAutoCreate=Raktár autómatikus létrehozása felhasználó létrehozásakor +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Mennyiség kiküldése QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang index e8faa8de1ae..bf6540154b1 100644 --- a/htdocs/langs/hu_HU/suppliers.lang +++ b/htdocs/langs/hu_HU/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Beszállítók -Supplier=Beszállító AddSupplier=Create a supplier SupplierRemoved=Beszállító eltávolítva SuppliersInvoice=Beszállító számla @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Beszállítói számlák és fizetések ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Megrendelés jóváhagyása ConfirmApproveThisOrder=Biztos jóvá akarja hagyni a megrendelést? -DenyingThisOrder=Megrendelés elutasítása +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Biztos el akarja utasítani a megrendelést? ConfirmCancelThisOrder=Biztos meg akarja szakítani a megrendelést? AddCustomerOrder=Ügyfél megrendelés létrehozása diff --git a/htdocs/langs/hu_HU/trips.lang b/htdocs/langs/hu_HU/trips.lang index 9daea3f2f0e..b1d1f636ca8 100644 --- a/htdocs/langs/hu_HU/trips.lang +++ b/htdocs/langs/hu_HU/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=utazás -Trips=Utak -TripsAndExpenses=Utazások és kiadások -TripsAndExpensesStatistics=Utazások és kiadások statisztikák -TripCard=Utazás kártya -AddTrip=Út hozzáadása -ListOfTrips=Utazások listája +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Költségek listája -NewTrip=Új út +NewTrip=New expense report CompanyVisited=Látogatott Cég/alapítvány Kilometers=Kilométerek FeesKilometersOrAmout=Kilóméterek száma -DeleteTrip=Utazás törlése -ConfirmDeleteTrip=Biztos törölni akarja ezt az utat? -TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=Utak és kiadások listája -ExpensesArea=Kirándulások és kiadások területén -SearchATripAndExpense=Keresés út és költségek +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang index 91b5e8d77f0..7c834ac36f8 100644 --- a/htdocs/langs/id_ID/admin.lang +++ b/htdocs/langs/id_ID/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Percobaan VersionDevelopment=Pengembangan VersionUnknown=Tidak diketahui VersionRecommanded=Direkomendasikan +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Sesi ID SessionSaveHandler=Handler untuk menyimpan sesi SessionSavePath=Peyimpanan untuk lokalisasi sesi @@ -493,10 +498,16 @@ Module600Name=Notifikasi Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Sumbangan Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Akunting Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategori Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Membaca Sumbangan Permission702=Membuat/Merubah Sumbangan Permission703=Menghapus Sumbangan +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Membaca Stok Permission1002=Membuat/Merubah Gudang Permission1003=Menghapus Gudang @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. ExtraFields=Complementary attributes ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang index 10a5f5b3c14..a2306950fb4 100644 --- a/htdocs/langs/id_ID/banks.lang +++ b/htdocs/langs/id_ID/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Standing orders StandingOrder=Standing order Withdrawals=Withdrawals @@ -148,7 +152,7 @@ BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/id_ID/commercial.lang b/htdocs/langs/id_ID/commercial.lang index e7d2de76503..7acdc7bd7e6 100644 --- a/htdocs/langs/id_ID/commercial.lang +++ b/htdocs/langs/id_ID/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Prospects DeleteAction=Delete an event/task NewAction=New event/task -AddAction=Add event/task -AddAnAction=Add an event/task -AddActionRendezVous=Add a Rendez-vous event +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event/task ? CardAction=Event card @@ -44,8 +44,8 @@ DoneActions=Completed events DoneActionsFor=Completed events for %s ToDoActions=Incomplete events ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete diff --git a/htdocs/langs/id_ID/contracts.lang b/htdocs/langs/id_ID/contracts.lang index 57ba3bb15d8..d1be0e6513f 100644 --- a/htdocs/langs/id_ID/contracts.lang +++ b/htdocs/langs/id_ID/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired ServiceStatusClosed=Closed ServicesLegend=Services legend Contracts=Contracts +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=No contracts MenuServices=Services diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang index 82f4574b223..28dfc7770b2 100644 --- a/htdocs/langs/id_ID/cron.lang +++ b/htdocs/langs/id_ID/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang index 497ddd814e4..700e6344d7d 100644 --- a/htdocs/langs/id_ID/errors.lang +++ b/htdocs/langs/id_ID/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang index 62986a9dfba..278965595b2 100644 --- a/htdocs/langs/id_ID/install.lang +++ b/htdocs/langs/id_ID/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang index 62adb884547..81deb7c28f0 100644 --- a/htdocs/langs/id_ID/main.lang +++ b/htdocs/langs/id_ID/main.lang @@ -141,6 +141,7 @@ Cancel=Cancel Modify=Modify Edit=Edit Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Save SaveAs=Save As @@ -158,6 +159,7 @@ Search=Search SearchOf=Search Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Now Date=Date +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=From %s to %s DateFrom=From %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang index 34792ae1eb2..8efafa5e94e 100644 --- a/htdocs/langs/id_ID/orders.lang +++ b/htdocs/langs/id_ID/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Validated StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderToBill2=To bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang index 25d3aa806d0..1f2b7c1b38d 100644 --- a/htdocs/langs/id_ID/other.lang +++ b/htdocs/langs/id_ID/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/id_ID/productbatch.lang +++ b/htdocs/langs/id_ID/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang index 3a29639b12b..3a18cda69e7 100644 --- a/htdocs/langs/id_ID/products.lang +++ b/htdocs/langs/id_ID/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang index b3c150d1687..0a12f4c64b7 100644 --- a/htdocs/langs/id_ID/projects.lang +++ b/htdocs/langs/id_ID/projects.lang @@ -8,8 +8,10 @@ SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). ProjectsArea=Projects area @@ -29,6 +31,8 @@ NoProject=No project defined or owned NbOpenTasks=Nb of opened tasks NbOfProjects=Nb of projects TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project -ListTripAssociatedProject=List of trips and expenses associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/id_ID/salaries.lang b/htdocs/langs/id_ID/salaries.lang index 666632bf28e..17b07d2a8b7 100644 --- a/htdocs/langs/id_ID/salaries.lang +++ b/htdocs/langs/id_ID/salaries.lang @@ -10,3 +10,4 @@ SalariesPayments=Pembayaran Gaji ShowSalaryPayment=Menampilkan Pembayaran Gaji THM=rata - rata per jam TJM=rata - rata per hari +CurrentSalary=Current salary diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang index 794c9019c86..b1ff55f71c1 100644 --- a/htdocs/langs/id_ID/sendings.lang +++ b/htdocs/langs/id_ID/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qty ordered QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order DateSending=Date sending order DateSendingShort=Date sending order diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang index 9de2e5a4dbe..29706d17615 100644 --- a/htdocs/langs/id_ID/stocks.lang +++ b/htdocs/langs/id_ID/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang index fe4a33edeae..1f90724539e 100644 --- a/htdocs/langs/id_ID/suppliers.lang +++ b/htdocs/langs/id_ID/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suplier langganan -Supplier=Suplier AddSupplier=Create a supplier SupplierRemoved=Suplier dihapus SuppliersInvoice=Invoice suplier @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Setujui pesanan ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Tolak pesanan +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? AddCustomerOrder=Buat pesanan pelanggan diff --git a/htdocs/langs/id_ID/trips.lang b/htdocs/langs/id_ID/trips.lang index 4b0501a8346..ba36fc9b07b 100644 --- a/htdocs/langs/id_ID/trips.lang +++ b/htdocs/langs/id_ID/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Add trip -ListOfTrips=List of trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List of fees -NewTrip=New trip +NewTrip=New expense report CompanyVisited=Company/foundation visited Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? -TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang index 6ab56c9cb5c..50ac8371a52 100644 --- a/htdocs/langs/is_IS/admin.lang +++ b/htdocs/langs/is_IS/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=Þróun VersionUnknown=Óþekkt VersionRecommanded=Mælt +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Session ID SessionSaveHandler=Handler að vista fundur SessionSavePath=Bílskúr fundur localization @@ -493,10 +498,16 @@ Module600Name=Tilkynningar Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Fjárframlög Module700Desc=Framlög í stjórnun +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis sameining Module1400Name=Bókhald Module1400Desc=Bókhald stjórnun (tvöfaldur aðila) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Flokkar Module1780Desc=Stjórn Flokkur's (vörur, birgja og viðskiptavina) Module2000Name=Fckeditor @@ -631,7 +642,7 @@ Permission181=Lesa birgir pantanir Permission182=Búa til / breyta birgi pantanir Permission183=Staðfesta birgir pantanir Permission184=Samþykkja birgir pantanir -Permission185=Panta birgir pantanir +Permission185=Order or cancel supplier orders Permission186=Fá pantanir birgir Permission187=Loka birgir pantanir Permission188=Hætta við birgi pantanir @@ -711,6 +722,13 @@ Permission538=Útflutningur þjónustu Permission701=Lesa Fjárframlög Permission702=Búa til / breyta framlög Permission703=Eyða Fjárframlög +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Lesa fiskistofna Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Lykilorð til að nota proxy-miðlara DefineHereComplementaryAttributes=Skilgreindu hér öll atributes, ekki þegar í boði sjálfgefið, og að þú viljir vera studd %s. ExtraFields=Fyllingar eiginleika ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A lína af vöru / þjónustu með núll upphæð er t FreeLegalTextOnProposal=Frjáls texti um viðskiptabanka tillögur WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Stjórn Order's skipulag OrdersNumberingModules=Pantanir tala mát @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Strikamerki af gerðinni UPC BarcodeDescISBN=Strikamerki af gerðinni ISBN BarcodeDescC39=Strikamerki á C39 tegund BarcodeDescC128=Strikamerki af gerðinni C128 -GenbarcodeLocation=Strikamerki kynslóð stjórn lína tól (notað af phpbarcode vél fyrir sumir merkjamál barnum tegund) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Reikning til að nota til að taka á móti peningum greiðslur CashDeskBankAccountForCheque= Reikning til að nota til að taka á móti greiðslum með því að stöðva CashDeskBankAccountForCB= Reikning til að nota til að taka á móti peningum greiðslur með kreditkortum -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bókamerki mát skipulag @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang index b6516a6fa11..3b8b3123521 100644 --- a/htdocs/langs/is_IS/banks.lang +++ b/htdocs/langs/is_IS/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Sættir RIB=Bankareikningur Fjöldi IBAN=IBAN númer +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT númer +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Standandi pantanir StandingOrder=Standandi pöntun Withdrawals=Útborganir @@ -148,7 +152,7 @@ BackToAccount=Til baka á reikning ShowAllAccounts=Sýna allra reikninga FutureTransaction=Færsla í futur. Engin leið til leitar sátta. SelectChequeTransactionAndGenerate=Select / sía ávísanir til fela í innborgun stöðva móttöku og smelltu á "Create." -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/is_IS/commercial.lang b/htdocs/langs/is_IS/commercial.lang index 80a7c534614..d80b68c1c53 100644 --- a/htdocs/langs/is_IS/commercial.lang +++ b/htdocs/langs/is_IS/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Horfur DeleteAction=Eyða aðgerð / verkefni NewAction=Ný aðgerð / verkefni -AddAction=Bæta við aðgerðir / verkefni -AddAnAction=Bæta við óákveðinn greinir í ensku aðgerð / verkefni -AddActionRendezVous=Bæta við stefnumót verkefni +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Stefnumót ConfirmDeleteAction=Ertu viss um að þú viljir eyða þessu verkefni? CardAction=Aðgerð kort @@ -44,8 +44,8 @@ DoneActions=Lauk aðgerðum DoneActionsFor=Lauk aðgerðum á %s ToDoActions=Ófullnægjandi aðgerðir ToDoActionsFor=Ófullnægjandi aðgerðir til %s -SendPropalRef=Senda auglýsing tillögu %s -SendOrderRef=Senda til %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Á ekki við StatusActionToDo=Til að gera StatusActionDone=Complete @@ -62,7 +62,7 @@ LastProspectContactDone=Hafðu gert DateActionPlanned=Date aðgerð skipuleggjandi fyrir DateActionDone=Date aðgerð lokið ActionAskedBy=Aðgerð bað -ActionAffectedTo=Aðgerð áhrif til +ActionAffectedTo=Event assigned to ActionDoneBy=Aðgerð lokið við ActionUserAsk=Skráð af ErrorStatusCantBeZeroIfStarted=Ef "Date sviði gert 'er fyllt, aðgerð er hafin (eða búin),' Staða 'svo sviði er ekki hægt að 0%%. diff --git a/htdocs/langs/is_IS/contracts.lang b/htdocs/langs/is_IS/contracts.lang index 8faf347b95c..6f81b9bfc44 100644 --- a/htdocs/langs/is_IS/contracts.lang +++ b/htdocs/langs/is_IS/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Útrunnið ServiceStatusClosed=Loka ServicesLegend=Þjónusta þjóðsaga Contracts=Samningar +ContractsAndLine=Contracts and line of contracts Contract=Samningur NoContracts=Engir samningar MenuServices=Þjónusta diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang index 34d66fdb353..746b799208a 100644 --- a/htdocs/langs/is_IS/cron.lang +++ b/htdocs/langs/is_IS/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang index 52ae8adce65..4676457743f 100644 --- a/htdocs/langs/is_IS/errors.lang +++ b/htdocs/langs/is_IS/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Heimild og markmið bankareikninga verður að ve ErrorBadThirdPartyName=Bad gildi fyrir þriðja aðila Nafn ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad setningafræði fyrir kóða viðskiptavina -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Viðskiptavinur númer sem þarf ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Viðskiptavinur sem notaður er þegar @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript þarf ekki að vera óvirkur til að haf ErrorPasswordsMustMatch=Bæði tegund lykilorð verður að samsvara hvor öðrum ErrorContactEMail=Tæknilegt villa kom upp. Vinsamlegast hafðu samband við kerfisstjóra til að fylgja email %s en veita merkjamál villa %s í skilaboðin, eða jafnvel enn betri með því að bæta skjár afrit af þessari síðu. ErrorWrongValueForField=Wrong gildi fyrir reitinn númer %s (gildi ' %s ' er ekki það sama ríkisstjóratíð reglu %s ) -ErrorFieldValueNotIn=Rangt gildi fyrir sviði númer %s ('%s "gildi er ekki gildi í boði í ​​%s svið %s borð) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Rangt gildi fyrir sviði númer %s ('á %s "gildi er ekki %s núverandi dómari) ErrorsOnXLines=Villur á %s uppspretta línur ErrorFileIsInfectedWithAVirus=The antivirus program was not 'fær til setja í gildi the skrá (skrá gæti verið sýkt af veiru) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang index 25b309f93ba..7aa233a456a 100644 --- a/htdocs/langs/is_IS/install.lang +++ b/htdocs/langs/is_IS/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Síðasta skref: Tilgreindu hér notandanafn og ly ActivateModule=Virkja mát %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang index 704097d023c..0e595e2d7be 100644 --- a/htdocs/langs/is_IS/main.lang +++ b/htdocs/langs/is_IS/main.lang @@ -141,6 +141,7 @@ Cancel=Hætta við Modify=Breyta Edit=Breyta Validate=Staðfesta +ValidateAndApprove=Validate and Approve ToValidate=Til að sannprófa Save=Vista SaveAs=Save As @@ -158,6 +159,7 @@ Search=Leita SearchOf=Leita Valid=Gildir Approve=Samþykkja +Disapprove=Disapprove ReOpen=Re-Open Upload=Senda skrá ToLink=Link @@ -219,6 +221,7 @@ Cards=Spil Card=Card Now=Nú Date=Dagsetning +DateAndHour=Date and hour DateStart=Upphafsdagsetning DateEnd=Lokadagsetning DateCreation=Creation dagsetning @@ -295,6 +298,7 @@ UnitPriceHT=Unit verð (nettó) UnitPriceTTC=Eining verðs PriceU=UPP PriceUHT=UP (nettó) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=UPP Amount=Upphæð AmountInvoice=Invoice upphæð @@ -521,6 +525,7 @@ DateFromTo=Úr %s í %s DateFrom=Frá %s DateUntil=Þangað til %s Check=Athuga +Uncheck=Uncheck Internal=Innri External=Ytri Internals=Innri @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Mánudagur Tuesday=Þriðjudagur diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang index 620cd8ca531..29a82746738 100644 --- a/htdocs/langs/is_IS/orders.lang +++ b/htdocs/langs/is_IS/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Hætt við StatusOrderDraft=Víxill (þarf að vera staðfest) StatusOrderValidated=Staðfestar StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Afgreitt StatusOrderToBill=Við reikning StatusOrderToBill2=Við reikning @@ -58,6 +59,7 @@ MenuOrdersToBill=Pantanir við reikning MenuOrdersToBill2=Billable orders SearchOrder=Leita röð SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Skip vöru Discount=Afsláttur CreateOrder=Búa Order diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang index b9f670340db..051c37066dc 100644 --- a/htdocs/langs/is_IS/other.lang +++ b/htdocs/langs/is_IS/other.lang @@ -54,12 +54,13 @@ MaxSize=Hámarks stærð AttachANewFile=Hengja nýja skrá / skjal LinkedObject=Tengd mótmæla Miscellaneous=Ýmislegt -NbOfActiveNotifications=Fjöldi tilkynninga +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Þetta er prófun póst. \\ NThe tvær línur eru aðskilin með vagn til baka. PredefinedMailTestHtml=Þetta er prófun póstur (orðið próf verður feitletruð).
Þessar tvær línur eru aðskilin með vagn til baka. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/is_IS/productbatch.lang +++ b/htdocs/langs/is_IS/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang index 2d9c72298ee..655a4801339 100644 --- a/htdocs/langs/is_IS/products.lang +++ b/htdocs/langs/is_IS/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang index c7785cf88a8..ee5af4c6a48 100644 --- a/htdocs/langs/is_IS/projects.lang +++ b/htdocs/langs/is_IS/projects.lang @@ -8,8 +8,10 @@ SharedProject=Allir PrivateProject=Tengiliðir verkefnisins MyProjectsDesc=Þessi skoðun er takmörkuð við verkefni sem þú ert að hafa samband við (hvað sem er gerð). ProjectsPublicDesc=Þetta sýnir öll verkefni sem þú ert að fá að lesa. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Þetta sýnir öll verkefni (notandi heimildir veita þér leyfi til að skoða allt). MyTasksDesc=Þessi skoðun er takmörkuð við verkefni eða verkefni sem þú ert að hafa samband við (hvað sem er gerð). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Þetta sýnir öll verkefni og verkefni sem þú ert að fá að lesa. TasksDesc=Þetta sýnir öll verkefni og verkefni (notandi heimildir veita þér leyfi til að skoða allt). ProjectsArea=Verkefni area @@ -29,6 +31,8 @@ NoProject=Engin verkefni skilgreind eða í eigu NbOpenTasks=ATH að opna verkefni NbOfProjects=ATH verkefna TimeSpent=Tíma sem fer +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Tími RefTask=Tilv. verkefni LabelTask=Merki verkefni @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Listi yfir pantanir birgis í tengslum við ListSupplierInvoicesAssociatedProject=Listi yfir reikninga birgis í tengslum við verkefnið ListContractAssociatedProject=Listi yfir samninga í tengslum við verkefnið ListFichinterAssociatedProject=Listi yfir inngrip í tengslum við verkefnið -ListTripAssociatedProject=Listi ferða og kostnaði í tengslum við verkefnið +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Listi yfir aðgerðir í tengslum við verkefnið ActivityOnProjectThisWeek=Afþreying á verkefni í þessari viku ActivityOnProjectThisMonth=Afþreying á verkefni í þessum mánuði @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/is_IS/salaries.lang b/htdocs/langs/is_IS/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/is_IS/salaries.lang +++ b/htdocs/langs/is_IS/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang index 97e0553dc1d..0e2e1d76be7 100644 --- a/htdocs/langs/is_IS/sendings.lang +++ b/htdocs/langs/is_IS/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Magn röð QtyShipped=Magn flutt QtyToShip=Magn til skip QtyReceived=Magn móttekin -KeepToShip=Halda til skip +KeepToShip=Remain to ship OtherSendingsForSameOrder=Aðrar sendingar fyrir þessari röð DateSending=Date senda til DateSendingShort=Date senda til diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang index 15dcb039c33..66d6b14f260 100644 --- a/htdocs/langs/is_IS/stocks.lang +++ b/htdocs/langs/is_IS/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Vegið meðalverð PMPValueShort=WAP EnhancedValueOfWarehouses=Vöruhús gildi UserWarehouseAutoCreate=Búa til birgðir sjálfkrafa þegar þú býrð til notanda +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Magn send QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang index a5d796e6e39..6635f860563 100644 --- a/htdocs/langs/is_IS/suppliers.lang +++ b/htdocs/langs/is_IS/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Birgjar -Supplier=Birgir AddSupplier=Create a supplier SupplierRemoved=Birgir fjarri SuppliersInvoice=Birgjar Reikningar @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Birgir reikninga og greiðslur ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Samþykkja þessari röð ConfirmApproveThisOrder=Ertu viss um að þú viljir samþykkja þessari röð? -DenyingThisOrder=Afneita þessari röð +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Ertu viss um að þú viljir afneita þessari röð? ConfirmCancelThisOrder=Ertu viss um að þú viljir hætta í þessari röð? AddCustomerOrder=Búa til viðskiptavina til diff --git a/htdocs/langs/is_IS/trips.lang b/htdocs/langs/is_IS/trips.lang index 39edbd5faa3..ca49d8ad9aa 100644 --- a/htdocs/langs/is_IS/trips.lang +++ b/htdocs/langs/is_IS/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Ferðalag -Trips=Ferðir -TripsAndExpenses=Ferðir og kostnaður -TripsAndExpensesStatistics=Ferðir og kostnaður tölfræði -TripCard=Trip kort -AddTrip=Bæta ferð -ListOfTrips=Listi ferða +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Listi yfir gjöld -NewTrip=New ferð +NewTrip=New expense report CompanyVisited=Fyrirtæki / stofnun heimsótt Kilometers=Kílómetrar FeesKilometersOrAmout=Magn eða kílómetrar -DeleteTrip=Eyða ferð -ConfirmDeleteTrip=Ertu viss um að þú viljir eyða þessari ferð? -TF_OTHER=Önnur -TF_LUNCH=Hádegisverður -TF_TRIP=Ferðalag -ListTripsAndExpenses=Listi yfir ferðir og gjöld -ExpensesArea=Ferðir og gjöld area -SearchATripAndExpense=Leita ferð og kostnað +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Önnur +TF_TRANSPORTATION=Transportation +TF_LUNCH=Hádegisverður +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang index a16d58e6b7c..9348b460f9a 100644 --- a/htdocs/langs/it_IT/admin.lang +++ b/htdocs/langs/it_IT/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Sperimentale VersionDevelopment=Sviluppo VersionUnknown=Sconosciuta VersionRecommanded=Raccomandata +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID di sessione SessionSaveHandler=Handler per il salvataggio dell sessioni SessionSavePath=Percorso per il salvataggio delle sessioni @@ -493,10 +498,16 @@ Module600Name=Notifiche Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donazioni Module700Desc=Gestione donazioni +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Integrazione Mantis Module1400Name=Contabilità avanzata Module1400Desc=Gestione contabilità per esperti (partita doppia) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categorie Module1780Desc=Gestione Categorie (prodotti, fornitori e clienti) Module2000Name=FCKeditor @@ -631,7 +642,7 @@ Permission181=Vedere ordini fornitore Permission182=Creare / modificare ordini fornitore Permission183=Validare ordini fornitore Permission184=Approvare ordini fornitore -Permission185=Ordinare ordini fornitore +Permission185=Order or cancel supplier orders Permission186=Ricevere ordini fornitore Permission187=Chiudere fornitore ordini Permission188=Annullare ordini fornitore @@ -711,6 +722,13 @@ Permission538=Esportare servizi Permission701=Vedere donazioni Permission702=Creare/modificare donazioni Permission703=Eliminare donazioni +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Vedere magazzino Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password per utilizzare il server proxy DefineHereComplementaryAttributes=Definire qui tutti gli attributi non predefiniti che vuoi supportati da %s. ExtraFields=Campi extra ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Attributi complementari (terze parti) ExtraFieldsContacts=Attributi Complementari (contatti/indirizzi) ExtraFieldsMember=Attributi Complementari (membri) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Una linea di prodotto/servizio con un importo pari a 0 FreeLegalTextOnProposal=Testo libero sulle proposte commerciali WatermarkOnDraftProposal=Bozze dei preventivi filigranate (nessuna filigrana se vuoto) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Configurazione della gestione ordini OrdersNumberingModules=Modelli di numerazione degli ordini @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Codice a barre di tipo UPC BarcodeDescISBN=Codice a barre di tipo ISBN BarcodeDescC39=Codice a barre di tipo C39 BarcodeDescC128=Codice a barre di tipo C128 -GenbarcodeLocation=Programma a riga di comando per generare i codici a barre (utilizzato dal modulo phpbarcode per alcuni tipi di codici a barre) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Motore interno BarCodeNumberManager=Manager per auto-definizione dei numeri barcode ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Conto bancario da utilizzare per pagamenti in contanti CashDeskBankAccountForCheque= Conto bancario da utilizzare per pagamenti con assegno CashDeskBankAccountForCB= Conto bancario da utilizzare per pagamenti con carta di credito -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Impostazioni modulo segnalibri @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Formato TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang index 43f61a91c1b..b83707e59df 100644 --- a/htdocs/langs/it_IT/banks.lang +++ b/htdocs/langs/it_IT/banks.lang @@ -33,7 +33,11 @@ AllTime=Dall'inizio Reconciliation=Riconciliazione RIB=Coordinate bancarie IBAN=Codice IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=Codice BIC (Swift) +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Mandati di incasso StandingOrder=Mandato di incasso Withdrawals=Prelievi @@ -148,7 +152,7 @@ BackToAccount=Torna al conto ShowAllAccounts=Mostra per tutti gli account FutureTransaction=Transazione futura. Non è possibile conciliare. SelectChequeTransactionAndGenerate=Seleziona gli assegni dar includere nella ricevuta di versamento e clicca su "Crea". -InputReceiptNumber=Scegli la transazione collegata alla conciliazione. Usa un valore numerico ordinabile (per esempio, AAAAMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Infine, specificare una categoria in cui classificare i record ToConciliate=Da conciliare? ThenCheckLinesAndConciliate=Controlla tutte le informazioni prima di cliccare diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang index a4d5cad6499..3478754d9dd 100644 --- a/htdocs/langs/it_IT/commercial.lang +++ b/htdocs/langs/it_IT/commercial.lang @@ -9,9 +9,9 @@ Prospect=Cliente potenziale Prospects=Clienti potenziali DeleteAction=Elimina un'azione/compito NewAction=Nuova azione/compito -AddAction=Aggiungi azione/compito -AddAnAction=Aggiungi un'azione/compito -AddActionRendezVous=Aggiungi un appuntamento +AddAction=Crea evento/attività +AddAnAction=Crea un evento/attività +AddActionRendezVous=Crea un appuntamento Rendez-Vous=Appuntantamenti ConfirmDeleteAction=Vuoi davvero eliminare questa azione? CardAction=Scheda Azione/compito @@ -44,8 +44,8 @@ DoneActions=Azioni fatte DoneActionsFor=Azioni fatte per %s ToDoActions=Azioni da fare ToDoActionsFor=Azioni da fare per %s -SendPropalRef=Invia preventivo %s -SendOrderRef=Invia per %s +SendPropalRef=Invio di proposta commerciale %s +SendOrderRef=Invio di ordine %s StatusNotApplicable=Non applicabile StatusActionToDo=Da fare StatusActionDone=Fatto @@ -62,7 +62,7 @@ LastProspectContactDone=Ultimo contatto effettuato DateActionPlanned=Data prevista per l'azione DateActionDone=Data compimento azione ActionAskedBy=Azione richiesta da -ActionAffectedTo=Azione riguardante +ActionAffectedTo=Event assigned to ActionDoneBy=Azione da fare ActionUserAsk=Riferita da ErrorStatusCantBeZeroIfStarted=Se il campo "fatto in Data" contiene qualcosa e l'azione è stata avviata (o finita), il campo "Stato" non può essere 0%%. diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang index 30637765163..64ae0e1cbea 100644 --- a/htdocs/langs/it_IT/contracts.lang +++ b/htdocs/langs/it_IT/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Scaduto ServiceStatusClosed=Chiuso ServicesLegend=Legenda servizi Contracts=Contratti +ContractsAndLine=Contracts and line of contracts Contract=Contratto NoContracts=Nessun contratto MenuServices=Servizi diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang index 073c9dabf7c..edb0ea5183b 100644 --- a/htdocs/langs/it_IT/cron.lang +++ b/htdocs/langs/it_IT/cron.lang @@ -84,3 +84,4 @@ CronType_command=Comando da shell CronMenu=Cron CronCannotLoadClass=Non posso caricare la classe %s o l'oggetto %s UseMenuModuleToolsToAddCronJobs=Andare nel menu "Home - Modules tools - Job list" per vedere e modificare le azioni pianificate. +TaskDisabled=Task disabled diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang index 9fac6970fe5..69de1916c4b 100644 --- a/htdocs/langs/it_IT/errors.lang +++ b/htdocs/langs/it_IT/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=I conti bancari di origine e destinazione devono ErrorBadThirdPartyName=Valore non valido per il nome del soggetto terzo ErrorProdIdIsMandatory=%s obbligatorio ErrorBadCustomerCodeSyntax=Sintassi del codice cliente errata -ErrorBadBarCodeSyntax=Sintassi del barcode errata +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Il codice cliente è obbligatorio ErrorBarCodeRequired=Barcode richiesto ErrorCustomerCodeAlreadyUsed=Codice cliente già utilizzato @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Per questa funzionalità Javascript deve essere att ErrorPasswordsMustMatch=Le due password digitate devono essere identiche ErrorContactEMail=Si è verificato un errore tecnico. Si prega di contattare l'amministratore all'indirizzo %s %s indicando il codice di errore nel messaggio, o, meglio ancora, allegando uno screenshot della schermata attuale. ErrorWrongValueForField=Valore errato nel campo numero %s (il valore '%s'non corrisponde alla regex %s) -ErrorFieldValueNotIn=Valore errato nel campo numero %s(il valore %s non è un valore disponibile nel campo%s campo della tabella %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Valore errato nel campo numero %s (il valore %snon è un riferimento %s esistente) ErrorsOnXLines=Errori in %s righe del sorgente ErrorFileIsInfectedWithAVirus=Il programma antivirus non è stato in grado di convalidare il file (il file potrebbe essere infetto) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=I parametri di configurazione obbligatori non sono ancora stati definiti diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang index 81b627f39fb..39341881654 100644 --- a/htdocs/langs/it_IT/install.lang +++ b/htdocs/langs/it_IT/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Ultimo passo: Indicare qui login e password che si ActivateModule=Attiva modulo %s ShowEditTechnicalParameters=Clicca qui per mostrare/modificare i parametri avanzati (modalità esperti) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index 12bcfd808db..a545e5a156d 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -141,6 +141,7 @@ Cancel=Annulla Modify=Modifica Edit=Modifica Validate=Convalida +ValidateAndApprove=Validate and Approve ToValidate=Convalidare Save=Salva SaveAs=Salva con nome @@ -158,6 +159,7 @@ Search=Ricerca SearchOf=Cerca Valid=Convalida Approve=Approva +Disapprove=Disapprove ReOpen=Riapri Upload=Invia file ToLink=Link @@ -219,6 +221,7 @@ Cards=Schede Card=Scheda Now=Adesso Date=Data +DateAndHour=Date and hour DateStart=Data inizio DateEnd=Data fine DateCreation=Data di creazione @@ -295,6 +298,7 @@ UnitPriceHT=Prezzo unitario (netto) UnitPriceTTC=Prezzo unitario (lordo) PriceU=P.U. PriceUHT=P.U.(netto) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=P.U.(lordo) Amount=Importo AmountInvoice=Importo della fattura @@ -521,6 +525,7 @@ DateFromTo=Da %s a %s DateFrom=Da %s DateUntil=Fino a %s Check=Controllo +Uncheck=Uncheck Internal=Interno External=Esterno Internals=Interni @@ -688,6 +693,7 @@ PublicUrl=URL pubblico AddBox=Aggiungi box SelectElementAndClickRefresh=Seleziona un elemento e clicca Aggiorna PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Lunedì Tuesday=Martedì diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang index a6992dd91b4..7206efd62c2 100644 --- a/htdocs/langs/it_IT/orders.lang +++ b/htdocs/langs/it_IT/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Annullato StatusOrderDraft=Bozza (deve essere convalidata) StatusOrderValidated=Convalidato StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Lavorato StatusOrderToBill=Spedito StatusOrderToBill2=Da fatturare @@ -58,6 +59,7 @@ MenuOrdersToBill=Ordini spediti MenuOrdersToBill2=Ordini fatturabili SearchOrder=Ricerca ordine SearchACustomerOrder=Cerca un ordine cliente +SearchASupplierOrder=Search a supplier order ShipProduct=Spedisci prodotto Discount=Sconto CreateOrder=Crea ordine diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang index 156441b3cd8..ef337e3c36c 100644 --- a/htdocs/langs/it_IT/other.lang +++ b/htdocs/langs/it_IT/other.lang @@ -54,12 +54,13 @@ MaxSize=La dimensione massima è AttachANewFile=Allega un nuovo file/documento LinkedObject=Oggetto collegato Miscellaneous=Varie -NbOfActiveNotifications=Numero di notifiche attive +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Questa è una mail di prova. \\NLe due linee sono separate da un a capo. PredefinedMailTestHtml=Questa è una mail di test (la parola test deve risultare in grassetto).
Le due linee sono separate da un a capo. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura numero __FACREF__\n\n__PERSONALIZED__Cordiali saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \nVorremmo portare alla Vostra attenzione che la fattura __FACREF__ sembra non essere stata saldata. La fattura è allegata alla presente, come promemoria.\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nAlleghiamo la proposta commerciale __PROPREF__ \n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nAlleghiamo l'ordine __ORDERREF__\n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nAlleghiamo il nostro ordine __ORDERREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura __FACREF__\n\n__PERSONALIZED__Cordiali Saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n__SIGNATURE__ diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang index a95f07e2f87..147b856f35d 100644 --- a/htdocs/langs/it_IT/productbatch.lang +++ b/htdocs/langs/it_IT/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang index 25ad81ab3b9..6bb5e68614e 100644 --- a/htdocs/langs/it_IT/products.lang +++ b/htdocs/langs/it_IT/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang index d387d08f9ca..ce4d893f0fd 100644 --- a/htdocs/langs/it_IT/projects.lang +++ b/htdocs/langs/it_IT/projects.lang @@ -8,8 +8,10 @@ SharedProject=Progetto condiviso PrivateProject=Contatti del progetto MyProjectsDesc=Questa visualizzazione mostra solo i progetti in cui sei indicato come contatto (di qualsiasi tipo). ProjectsPublicDesc=Questa visualizzazione mostra tutti i progetti che sei autorizzato a vedere. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Questa visualizzazione mostra tutti i progetti (hai i privilegi per vedere tutto). MyTasksDesc=Questa visualizzazione mostra solo i progetti o i compiti in cui sei indicati come contatto (di qualsiasi tipo). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Questa visualizzazione mostra tutti i progetti e i compiti che hai il permesso di vedere. TasksDesc=Questa visualizzazione mostra tutti i progetti e i compiti (hai i privilegi per vedere tutto). ProjectsArea=Area progetti @@ -29,6 +31,8 @@ NoProject=Nessun progetto definito o assegnato NbOpenTasks=Num. di compiti aperti NbOfProjects=Num. di progetti TimeSpent=Tempo lavorato +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Tempo lavorato RefTask=Rif. compito LabelTask=Etichetta compito @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Elenco degli ordini fornitori associati al p ListSupplierInvoicesAssociatedProject=Elenco delle fatture passive associate al progetto ListContractAssociatedProject=Elenco dei contratti associati al progetto ListFichinterAssociatedProject=Elenco degli interventi associati al progetto -ListTripAssociatedProject=Elenco dei viaggi e delle spese associate al progetto +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Elenco delle azioni associate al progetto ActivityOnProjectThisWeek=Operatività sul progetto questa settimana ActivityOnProjectThisMonth=Operatività sul progetto questo mese @@ -133,3 +137,6 @@ SearchAProject=Cerca un progetto ProjectMustBeValidatedFirst=I progetti devono prima essere validati ProjectDraft=Progetti bozza FirstAddRessourceToAllocateTime=Associa una risorsa per allocare il tempo +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/it_IT/salaries.lang b/htdocs/langs/it_IT/salaries.lang index 01e019c5a0b..fcd094e4682 100644 --- a/htdocs/langs/it_IT/salaries.lang +++ b/htdocs/langs/it_IT/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Codice di contabilità per i pagamenti dei salari +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Codice di contabilità per oneri finanziari Salary=Stipendio Salaries=Stipendi Employee=Dipendente @@ -6,3 +8,6 @@ NewSalaryPayment=Nuovo pagamento stipendio SalaryPayment=Pagamento stipendio SalariesPayments=Pagamento stipendi ShowSalaryPayment=Mostra i pagamenti stipendio +THM=Prezzo medio orario +TJM=Prezzo medio giornaliero +CurrentSalary=Current salary diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang index f309ede2aad..b4a29ef16c4 100644 --- a/htdocs/langs/it_IT/sendings.lang +++ b/htdocs/langs/it_IT/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Quantità ordinata QtyShipped=Quantità spedita QtyToShip=Quantità da spedire QtyReceived=Quantità ricevuta -KeepToShip=Ancora da spedire +KeepToShip=Remain to ship OtherSendingsForSameOrder=Altre Spedizioni per questo ordine DateSending=Data spedizione DateSendingShort=Data di invio diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang index 0766d101bee..51c52f31d8e 100644 --- a/htdocs/langs/it_IT/stocks.lang +++ b/htdocs/langs/it_IT/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Media ponderata prezzi PMPValueShort=MPP EnhancedValueOfWarehouses=Incremento valore dei magazzini UserWarehouseAutoCreate=Creare automaticamente un magazzino alla creazione di un utente +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantità spedita QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Il magazzino %s sarà usato per la diminuzione WarehouseForStockIncrease=Il magazzino %s sarà usato per l'aumento delle scorte ForThisWarehouse=Per questo magazzino ReplenishmentStatusDesc=Questa è una lista di tutti i prodotti con una giacenza inferiore a quella desiderata (o inferiore a quella del valore di allarme se la casella "solo allarmi" è spuntata) -ReplenishmentOrdersDesc=Questa è una lista di tutti gli ordini di acquisto aperti +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Rifornimento NbOfProductBeforePeriod=Quantità del prodotto %s in magazzino prima del periodo selezionato (< %s) NbOfProductAfterPeriod=Quantità del prodotto %s in magazzino dopo il periodo selezionato (< %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang index e9e64c3e9ab..9d21cef1c12 100644 --- a/htdocs/langs/it_IT/suppliers.lang +++ b/htdocs/langs/it_IT/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Fornitori -Supplier=Fornitore AddSupplier=Crea un fornitore SupplierRemoved=Fornitore rimosso SuppliersInvoice=Fattura Fornitore @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Fatture fornitore e pagamenti ExportDataset_fournisseur_3=Ordini fornitore e righe degli ordini ApproveThisOrder=Approva l'ordine ConfirmApproveThisOrder=Vuoi davvero approvare l'ordine? -DenyingThisOrder=Rifiuta l'ordine +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Vuoi davvero rifiutare l'ordine? ConfirmCancelThisOrder=Vuoi davvero annullare l'ordine? AddCustomerOrder=Crea ordine cliente diff --git a/htdocs/langs/it_IT/trips.lang b/htdocs/langs/it_IT/trips.lang index 413dcf89c4c..bc73c8119be 100644 --- a/htdocs/langs/it_IT/trips.lang +++ b/htdocs/langs/it_IT/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Viaggio -Trips=Viaggi -TripsAndExpenses=Viaggi e spese -TripsAndExpensesStatistics=Statistiche viaggi e spese -TripCard=Scheda viaggio -AddTrip=Aggiungi viaggio -ListOfTrips=Elenco dei viaggi +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Elenco delle tariffe -NewTrip=Nuovo viaggio +NewTrip=New expense report CompanyVisited=Società/Fondazione visitata Kilometers=Kilometri FeesKilometersOrAmout=Tariffa kilometrica o importo -DeleteTrip=Elimina viaggio -ConfirmDeleteTrip=Sei sicuro di voler eliminare questo viaggio? +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report +ClassifyRefunded=Classifica come "Rimborsata" +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line TF_OTHER=Altro +TF_TRANSPORTATION=Transportation TF_LUNCH=Pranzo -TF_TRIP=Viaggio -ListTripsAndExpenses=Elenco dei viaggi e delle spese -ExpensesArea=Area viaggi e spese -SearchATripAndExpense=Cerca viaggi e spese -ClassifyRefunded=Classify 'Refunded' +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang index 3785571b48b..bac8eb6dbcf 100644 --- a/htdocs/langs/ja_JP/admin.lang +++ b/htdocs/langs/ja_JP/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=実験的 VersionDevelopment=開発 VersionUnknown=未知の VersionRecommanded=推奨される +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=セッションID SessionSaveHandler=セッションを保存するためのハンドラ SessionSavePath=ストレージ·セッションのローカライズ @@ -493,10 +498,16 @@ Module600Name=通知 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=寄付 Module700Desc=寄付金の管理 +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=カマキリ Module1200Desc=カマキリの統合 Module1400Name=会計 Module1400Desc=会計管理（二者） +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=カテゴリー Module1780Desc=Categorieの管理（製品、サプライヤー、顧客） Module2000Name=WYSIWYGエディタ @@ -631,7 +642,7 @@ Permission181=サプライヤーの受注を読む Permission182=作成/変更サプライヤーの受注 Permission183=サプライヤーの受注を検証する Permission184=サプライヤの注文を承認する -Permission185=注文サプライヤーの受注 +Permission185=Order or cancel supplier orders Permission186=サプライヤの注文を受ける Permission187=閉じるサプライヤーの受注 Permission188=サプライヤの注文を取り消す @@ -711,6 +722,13 @@ Permission538=輸出サービス Permission701=寄付を読む Permission702=寄付を作成/変更 Permission703=寄付を削除します。 +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=株式を読む Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=プロキシサーバーを使用するためのパスワード DefineHereComplementaryAttributes=デフォルトでは既に利用できない、ここですべての属性を定義して、あなたは%sのためにサポートさせたい。 ExtraFields=補完的な属性 ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=ゼロ量と製品/サービスのラインは、オ FreeLegalTextOnProposal=商業的な提案でフリーテキスト WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=注文の管理セットアップ OrdersNumberingModules=モジュールの番号受注 @@ -1383,7 +1410,7 @@ BarcodeDescUPC=タイプUPCのバーコード BarcodeDescISBN=型商品のバーコード BarcodeDescC39=タイプC39のバーコード BarcodeDescC128=タイプC128のバーコード -GenbarcodeLocation=バーコードを生成するコマンドラインツール（一部のバーコードタイプのphpbarcodeエンジンで使用されます） +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=現金支払いを受け取るために使用するデフォルトのアカウント CashDeskBankAccountForCheque= 小切手による支払いを受け取るために使用するデフォルトのアカウント CashDeskBankAccountForCB= クレジットカードでの現金支払いを受け取るために使用するデフォルトのアカウント -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=モジュールのセットアップをブックマーク @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang index 23051984ea3..415d74642e7 100644 --- a/htdocs/langs/ja_JP/banks.lang +++ b/htdocs/langs/ja_JP/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=和解 RIB=銀行の口座番号 IBAN=IBAN番号 +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT番号 +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=立ち受注 StandingOrder=立ち順 Withdrawals=引出し @@ -148,7 +152,7 @@ BackToAccount=戻るアカウントへ ShowAllAccounts=すべてのアカウントに表示 FutureTransaction=フューチャーのトランザクション。調停する方法はありません。 SelectChequeTransactionAndGenerate=チェックの預金証書に含まれると、"作成"をクリックしてチェックをフィルタリング/選択してください。 -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang index babd7265f5f..6953d91769a 100644 --- a/htdocs/langs/ja_JP/commercial.lang +++ b/htdocs/langs/ja_JP/commercial.lang @@ -9,9 +9,9 @@ Prospect=見通し Prospects=見込み DeleteAction=イベント/タスクを削除します。 NewAction=新しいイベント/タスク -AddAction=イベント/タスクを追加する -AddAnAction=イベント/タスクを追加する -AddActionRendezVous=ランデヴーイベントを追加 +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=ランデブー ConfirmDeleteAction=このイベント/タスクを削除してもよろしいですか？ CardAction=イベントカード @@ -44,8 +44,8 @@ DoneActions=完了イベント DoneActionsFor=%sの完成イベント ToDoActions=不完全なイベント ToDoActionsFor=%s不完全なイベント -SendPropalRef=商業提案%sを送る -SendOrderRef=オーダーの%sを送る +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=適用されない StatusActionToDo=実行する StatusActionDone=完了する @@ -62,7 +62,7 @@ LastProspectContactDone=行わ連絡 DateActionPlanned=日付イベントがために計画 DateActionDone=日付イベントが行われ ActionAskedBy=によって報告されたイベント -ActionAffectedTo=イベントに影響を受けた +ActionAffectedTo=Event assigned to ActionDoneBy=することにより、イベントを行って ActionUserAsk=によって報告された ErrorStatusCantBeZeroIfStarted=フィールド" 日付が行わ ' が入力されている場合は、アクションが（または終了）が開始されているので、フィールドのステータスが " 0%%にすることはできません。 diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang index 3f44104d7fb..db028796696 100644 --- a/htdocs/langs/ja_JP/contracts.lang +++ b/htdocs/langs/ja_JP/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=期限切れの ServiceStatusClosed=閉じ ServicesLegend=サービス伝説 Contracts=契約 +ContractsAndLine=Contracts and line of contracts Contract=契約 NoContracts=いいえ契約なし MenuServices=サービス diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang index f2f35b1838c..d10cb4a8784 100644 --- a/htdocs/langs/ja_JP/cron.lang +++ b/htdocs/langs/ja_JP/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang index a7b905a2127..852bc364ace 100644 --- a/htdocs/langs/ja_JP/errors.lang +++ b/htdocs/langs/ja_JP/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=ソースとターゲットの銀行口座は異 ErrorBadThirdPartyName=サードパーティの名前の値が正しくありません ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=顧客コードの不正な構文 -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=顧客コードが必要です ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=顧客コードは既に使用され @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascriptがこの機能が動作しているた ErrorPasswordsMustMatch=両方入力したパスワードは、互いに一致している必要があります ErrorContactEMail=技術的なエラーが発生しました。 、次の電子メール%sに管理者に連絡してenはエラーコードメッセージで%s、またはこのページの画面コピーを追加することにより、さらに優れたを提供してください。 ErrorWrongValueForField=フィールド番号%sの間違った値（値'%s'は正規表現のルール%s一致しません） -ErrorFieldValueNotIn=フィールド番号%sの間違った値（値'%s'は、テーブルの%sのフィールド%sに使用可能な値ではありません） +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=フィールド番号%sのために間違った値（値"%s"は%s既存のREFではありません） ErrorsOnXLines=%sソース行のエラー ErrorFileIsInfectedWithAVirus=ウイルス対策プログラムがファイルを検証することができませんでした（ファイルがウイルスに感染されるかもしれません） @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang index 2038751025f..8a75022f2a5 100644 --- a/htdocs/langs/ja_JP/install.lang +++ b/htdocs/langs/ja_JP/install.lang @@ -156,6 +156,7 @@ LastStepDesc=最後のステップ ：ここにあなたがソ ActivateModule=モジュール%sをアクティブにする ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang index a5ce0161b53..66fd5efdecf 100644 --- a/htdocs/langs/ja_JP/main.lang +++ b/htdocs/langs/ja_JP/main.lang @@ -141,6 +141,7 @@ Cancel=キャンセル Modify=修正する Edit=編集 Validate=検証 +ValidateAndApprove=Validate and Approve ToValidate=検証するには Save=保存 SaveAs=名前を付けて保存 @@ -158,6 +159,7 @@ Search=検索 SearchOf=検索 Valid=有効な Approve=承認する +Disapprove=Disapprove ReOpen=再オープン Upload=ファイルを送信する ToLink=Link @@ -219,6 +221,7 @@ Cards=カード Card=カード Now=現在 Date=日付 +DateAndHour=Date and hour DateStart=開始日 DateEnd=日付の末尾 DateCreation=作成日 @@ -295,6 +298,7 @@ UnitPriceHT=単価（純額） UnitPriceTTC=単価 PriceU=UP PriceUHT=UP（純額） +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=UP Amount=量 AmountInvoice=請求額 @@ -521,6 +525,7 @@ DateFromTo=%sから%sへ DateFrom=%sから DateUntil=%sまで Check=チェック +Uncheck=Uncheck Internal=内部 External=外部 Internals=内部 @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=月曜日 Tuesday=火曜日 diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang index 786cc3c40cf..f0267668aed 100644 --- a/htdocs/langs/ja_JP/orders.lang +++ b/htdocs/langs/ja_JP/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=キャンセル StatusOrderDraft=ドラフト（検証する必要があります） StatusOrderValidated=検証 StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=処理 StatusOrderToBill=請求する StatusOrderToBill2=請求する @@ -58,6 +59,7 @@ MenuOrdersToBill=法案に注文 MenuOrdersToBill2=Billable orders SearchOrder=検索順序 SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=船積 Discount=割引 CreateOrder=順序を作成します。 diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang index 9461761ac71..fe4bdc9e962 100644 --- a/htdocs/langs/ja_JP/other.lang +++ b/htdocs/langs/ja_JP/other.lang @@ -54,12 +54,13 @@ MaxSize=最大サイズ AttachANewFile=新しいファイル/文書を添付する LinkedObject=リンクされたオブジェクト Miscellaneous=その他 -NbOfActiveNotifications=通知の数 +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=これはテストメールです。\\ nこの2行は、キャリッジリターンで区切られています。 PredefinedMailTestHtml=これはテストメール（ワードテストでは、太字でなければなりません）です。
の2行は、キャリッジリターンで区切られています。 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/ja_JP/productbatch.lang +++ b/htdocs/langs/ja_JP/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang index 84f960b8c86..cadaad87d96 100644 --- a/htdocs/langs/ja_JP/products.lang +++ b/htdocs/langs/ja_JP/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang index 42c4317dc59..0011d0ab801 100644 --- a/htdocs/langs/ja_JP/projects.lang +++ b/htdocs/langs/ja_JP/projects.lang @@ -8,8 +8,10 @@ SharedProject=皆 PrivateProject=プロジェクトの連絡先 MyProjectsDesc=このビューは、（型が何であれ）の連絡先であるプロジェクトに限定されています。 ProjectsPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトを紹介します。 +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=このビューはすべてのプロジェクトを（あなたのユーザー権限はあなたに全てを表示する権限を付与）を提示します。 MyTasksDesc=このビューは、連絡先の（種類は何でも）がプロジェクトやタスクに制限されています。 +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。 TasksDesc=このビューは、すべてのプロジェクトとタスク（あなたのユーザー権限はあなたに全てを表示する権限を付与）を提示します。 ProjectsArea=プロジェクトエリア @@ -29,6 +31,8 @@ NoProject=はプロジェクトが定義されていませんまたは所有し NbOpenTasks=開かれたタスクのNb NbOfProjects=プロジェクトのNb TimeSpent=に費や​​された時間は +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=に費や​​された時間は RefTask=REF。タスク LabelTask=ラベルタスク @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=プロジェクトに関連付けられて ListSupplierInvoicesAssociatedProject=プロジェクトに関連付けられている仕入先の請求書の一覧 ListContractAssociatedProject=プロジェクトに関連付けられている契約のリスト ListFichinterAssociatedProject=プロジェクトに関連付けられている介入のリスト -ListTripAssociatedProject=プロジェクトに関連付けられている旅行および費用のリスト +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=プロジェクトに関連付けられているイベントのリスト ActivityOnProjectThisWeek=プロジェクト今週のアクティビティ ActivityOnProjectThisMonth=プロジェクトの活動今月 @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/ja_JP/salaries.lang +++ b/htdocs/langs/ja_JP/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang index d73b5069169..43ca3aaec39 100644 --- a/htdocs/langs/ja_JP/sendings.lang +++ b/htdocs/langs/ja_JP/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=数量は、注文された QtyShipped=個数出荷 QtyToShip=出荷する数量 QtyReceived=個数は、受信した -KeepToShip=出荷できるようにしておく +KeepToShip=Remain to ship OtherSendingsForSameOrder=このため、他の出荷 DateSending=オーダーを送信した日付 DateSendingShort=オーダーを送信した日付 diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang index 3ae54c5c68b..45f66be1a15 100644 --- a/htdocs/langs/ja_JP/stocks.lang +++ b/htdocs/langs/ja_JP/stocks.lang @@ -47,6 +47,7 @@ PMPValue=加重平均価格 PMPValueShort=WAP EnhancedValueOfWarehouses=倉庫の値 UserWarehouseAutoCreate=ユーザーの作成時に自動的に倉庫を作成します。 +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=数量派遣 QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang index 7795c0f6ee7..0596adaa02c 100644 --- a/htdocs/langs/ja_JP/suppliers.lang +++ b/htdocs/langs/ja_JP/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=サプライヤー -Supplier=サプライヤー AddSupplier=Create a supplier SupplierRemoved=サプライヤーは、削除 SuppliersInvoice=仕入先の請求書 @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=サプライヤーの請求書と支払い ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=この注文を承認 ConfirmApproveThisOrder=あなたは、注文%sを承認してもよろしいですか？ -DenyingThisOrder=この順序を否定 +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=あなたは、この順序%sを拒否してもよろしいですか？ ConfirmCancelThisOrder=あなたは、この順序%sをキャンセルしてもよろしいですか？ AddCustomerOrder=顧客の注文を作成します。 diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang index e4999a7b1ec..273382c38a9 100644 --- a/htdocs/langs/ja_JP/trips.lang +++ b/htdocs/langs/ja_JP/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=旅行 -Trips=ツアー -TripsAndExpenses=旅行や経費 -TripsAndExpensesStatistics=旅行や経費の統計情報 -TripCard=旅行カード -AddTrip=旅行を追加します。 -ListOfTrips=ツアーのリスト +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=手数料のリスト -NewTrip=新しい旅行 +NewTrip=New expense report CompanyVisited=会社概要/基礎を訪問 Kilometers=キロ FeesKilometersOrAmout=量またはキロ -DeleteTrip=旅を削除します。 -ConfirmDeleteTrip=この旅を削除してもよろしいですか？ -TF_OTHER=その他 -TF_LUNCH=ランチ -TF_TRIP=旅行 -ListTripsAndExpenses=旅行や費用のリスト -ExpensesArea=旅行や経費エリア -SearchATripAndExpense=旅行と費用を検索 +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=その他 +TF_TRANSPORTATION=Transportation +TF_LUNCH=ランチ +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang index 38634cbd497..9782c2ea27f 100644 --- a/htdocs/langs/ka_GE/admin.lang +++ b/htdocs/langs/ka_GE/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=Development VersionUnknown=Unknown VersionRecommanded=Recommended +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Session ID SessionSaveHandler=Handler to save sessions SessionSavePath=Storage session localization @@ -493,10 +498,16 @@ Module600Name=Notifications Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. ExtraFields=Complementary attributes ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang index 10a5f5b3c14..a2306950fb4 100644 --- a/htdocs/langs/ka_GE/banks.lang +++ b/htdocs/langs/ka_GE/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Standing orders StandingOrder=Standing order Withdrawals=Withdrawals @@ -148,7 +152,7 @@ BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/ka_GE/commercial.lang b/htdocs/langs/ka_GE/commercial.lang index 390a7f837e8..7acdc7bd7e6 100644 --- a/htdocs/langs/ka_GE/commercial.lang +++ b/htdocs/langs/ka_GE/commercial.lang @@ -62,7 +62,7 @@ LastProspectContactDone=Contact done DateActionPlanned=Date event planned for DateActionDone=Date event done ActionAskedBy=Event reported by -ActionAffectedTo=Event owned by +ActionAffectedTo=Event assigned to ActionDoneBy=Event done by ActionUserAsk=Reported by ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%. diff --git a/htdocs/langs/ka_GE/contracts.lang b/htdocs/langs/ka_GE/contracts.lang index 57ba3bb15d8..d1be0e6513f 100644 --- a/htdocs/langs/ka_GE/contracts.lang +++ b/htdocs/langs/ka_GE/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired ServiceStatusClosed=Closed ServicesLegend=Services legend Contracts=Contracts +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=No contracts MenuServices=Services diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang index 82f4574b223..28dfc7770b2 100644 --- a/htdocs/langs/ka_GE/cron.lang +++ b/htdocs/langs/ka_GE/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang index 497ddd814e4..700e6344d7d 100644 --- a/htdocs/langs/ka_GE/errors.lang +++ b/htdocs/langs/ka_GE/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/ka_GE/install.lang b/htdocs/langs/ka_GE/install.lang index 5a494156672..dcd8df6e7db 100644 --- a/htdocs/langs/ka_GE/install.lang +++ b/htdocs/langs/ka_GE/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang index 8996c1f6d83..d40e28cb776 100644 --- a/htdocs/langs/ka_GE/main.lang +++ b/htdocs/langs/ka_GE/main.lang @@ -141,6 +141,7 @@ Cancel=Cancel Modify=Modify Edit=Edit Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Save SaveAs=Save As @@ -158,6 +159,7 @@ Search=Search SearchOf=Search Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Now Date=Date +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=From %s to %s DateFrom=From %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang index 34792ae1eb2..8efafa5e94e 100644 --- a/htdocs/langs/ka_GE/orders.lang +++ b/htdocs/langs/ka_GE/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Validated StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderToBill2=To bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang index 88991888183..08747ea884b 100644 --- a/htdocs/langs/ka_GE/other.lang +++ b/htdocs/langs/ka_GE/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/ka_GE/productbatch.lang +++ b/htdocs/langs/ka_GE/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang index 3a29639b12b..3a18cda69e7 100644 --- a/htdocs/langs/ka_GE/products.lang +++ b/htdocs/langs/ka_GE/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang index b3c150d1687..0a12f4c64b7 100644 --- a/htdocs/langs/ka_GE/projects.lang +++ b/htdocs/langs/ka_GE/projects.lang @@ -8,8 +8,10 @@ SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). ProjectsArea=Projects area @@ -29,6 +31,8 @@ NoProject=No project defined or owned NbOpenTasks=Nb of opened tasks NbOfProjects=Nb of projects TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project -ListTripAssociatedProject=List of trips and expenses associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ka_GE/salaries.lang b/htdocs/langs/ka_GE/salaries.lang index 0087cbe83e6..28c21adfad3 100644 --- a/htdocs/langs/ka_GE/salaries.lang +++ b/htdocs/langs/ka_GE/salaries.lang @@ -10,3 +10,4 @@ SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment THM=Average hourly price TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/ka_GE/sendings.lang b/htdocs/langs/ka_GE/sendings.lang index 794c9019c86..b1ff55f71c1 100644 --- a/htdocs/langs/ka_GE/sendings.lang +++ b/htdocs/langs/ka_GE/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qty ordered QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order DateSending=Date sending order DateSendingShort=Date sending order diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang index 9de2e5a4dbe..29706d17615 100644 --- a/htdocs/langs/ka_GE/stocks.lang +++ b/htdocs/langs/ka_GE/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang index 7b4d4acb244..baf573c66ac 100644 --- a/htdocs/langs/ka_GE/suppliers.lang +++ b/htdocs/langs/ka_GE/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -Supplier=Supplier AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Approve this order ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Denying this order +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? AddCustomerOrder=Create customer order diff --git a/htdocs/langs/ka_GE/trips.lang b/htdocs/langs/ka_GE/trips.lang index ab29ec23b5f..ba36fc9b07b 100644 --- a/htdocs/langs/ka_GE/trips.lang +++ b/htdocs/langs/ka_GE/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Create trip -ListOfTrips=List of trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List of fees -NewTrip=New trip +NewTrip=New expense report CompanyVisited=Company/foundation visited Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? -TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang index a2d1447071a..af647d9f52c 100644 --- a/htdocs/langs/ko_KR/admin.lang +++ b/htdocs/langs/ko_KR/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=Development VersionUnknown=Unknown VersionRecommanded=Recommended +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Session ID SessionSaveHandler=Handler to save sessions SessionSavePath=Storage session localization @@ -493,10 +498,16 @@ Module600Name=Notifications Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. ExtraFields=Complementary attributes ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang index 10a5f5b3c14..a2306950fb4 100644 --- a/htdocs/langs/ko_KR/banks.lang +++ b/htdocs/langs/ko_KR/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Standing orders StandingOrder=Standing order Withdrawals=Withdrawals @@ -148,7 +152,7 @@ BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/ko_KR/commercial.lang b/htdocs/langs/ko_KR/commercial.lang index e7d2de76503..7acdc7bd7e6 100644 --- a/htdocs/langs/ko_KR/commercial.lang +++ b/htdocs/langs/ko_KR/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Prospects DeleteAction=Delete an event/task NewAction=New event/task -AddAction=Add event/task -AddAnAction=Add an event/task -AddActionRendezVous=Add a Rendez-vous event +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event/task ? CardAction=Event card @@ -44,8 +44,8 @@ DoneActions=Completed events DoneActionsFor=Completed events for %s ToDoActions=Incomplete events ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete diff --git a/htdocs/langs/ko_KR/contracts.lang b/htdocs/langs/ko_KR/contracts.lang index 57ba3bb15d8..d1be0e6513f 100644 --- a/htdocs/langs/ko_KR/contracts.lang +++ b/htdocs/langs/ko_KR/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired ServiceStatusClosed=Closed ServicesLegend=Services legend Contracts=Contracts +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=No contracts MenuServices=Services diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang index 82f4574b223..28dfc7770b2 100644 --- a/htdocs/langs/ko_KR/cron.lang +++ b/htdocs/langs/ko_KR/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang index f374da9cf98..7c88ed9e005 100644 --- a/htdocs/langs/ko_KR/errors.lang +++ b/htdocs/langs/ko_KR/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/ko_KR/install.lang b/htdocs/langs/ko_KR/install.lang index b4ebd2a51a6..fc4daabf0e6 100644 --- a/htdocs/langs/ko_KR/install.lang +++ b/htdocs/langs/ko_KR/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang index 104a3f3ad11..de1eb65bf14 100644 --- a/htdocs/langs/ko_KR/main.lang +++ b/htdocs/langs/ko_KR/main.lang @@ -141,6 +141,7 @@ Cancel=Cancel Modify=Modify Edit=Edit Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Save SaveAs=Save As @@ -158,6 +159,7 @@ Search=Search SearchOf=Search Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Now Date=Date +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=From %s to %s DateFrom=From %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=월요일 Tuesday=화요일 diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang index 34792ae1eb2..8efafa5e94e 100644 --- a/htdocs/langs/ko_KR/orders.lang +++ b/htdocs/langs/ko_KR/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Validated StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderToBill2=To bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang index d20bb5f39b1..80399108329 100644 --- a/htdocs/langs/ko_KR/other.lang +++ b/htdocs/langs/ko_KR/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/ko_KR/productbatch.lang +++ b/htdocs/langs/ko_KR/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang index 3a29639b12b..3a18cda69e7 100644 --- a/htdocs/langs/ko_KR/products.lang +++ b/htdocs/langs/ko_KR/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang index b3c150d1687..0a12f4c64b7 100644 --- a/htdocs/langs/ko_KR/projects.lang +++ b/htdocs/langs/ko_KR/projects.lang @@ -8,8 +8,10 @@ SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). ProjectsArea=Projects area @@ -29,6 +31,8 @@ NoProject=No project defined or owned NbOpenTasks=Nb of opened tasks NbOfProjects=Nb of projects TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project -ListTripAssociatedProject=List of trips and expenses associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ko_KR/salaries.lang b/htdocs/langs/ko_KR/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/ko_KR/salaries.lang +++ b/htdocs/langs/ko_KR/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang index 794c9019c86..b1ff55f71c1 100644 --- a/htdocs/langs/ko_KR/sendings.lang +++ b/htdocs/langs/ko_KR/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qty ordered QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order DateSending=Date sending order DateSendingShort=Date sending order diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang index 8ab2a113cb9..d2762213627 100644 --- a/htdocs/langs/ko_KR/stocks.lang +++ b/htdocs/langs/ko_KR/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang index 7b4d4acb244..baf573c66ac 100644 --- a/htdocs/langs/ko_KR/suppliers.lang +++ b/htdocs/langs/ko_KR/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -Supplier=Supplier AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Approve this order ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Denying this order +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? AddCustomerOrder=Create customer order diff --git a/htdocs/langs/ko_KR/trips.lang b/htdocs/langs/ko_KR/trips.lang index 4b0501a8346..ba36fc9b07b 100644 --- a/htdocs/langs/ko_KR/trips.lang +++ b/htdocs/langs/ko_KR/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Add trip -ListOfTrips=List of trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List of fees -NewTrip=New trip +NewTrip=New expense report CompanyVisited=Company/foundation visited Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? -TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang index 219441ecd9c..0a9afd42fe8 100644 --- a/htdocs/langs/lt_LT/admin.lang +++ b/htdocs/langs/lt_LT/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Ekspermentinis VersionDevelopment=Plėtojimas VersionUnknown=Nežinomas VersionRecommanded=Rekomenduojamas +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Sesijos ID SessionSaveHandler=Vedlys, sesijai išsaugoti SessionSavePath=Talpinimo sesijos lokalizavimas @@ -493,10 +498,16 @@ Module600Name=Pranešimai Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Parama Module700Desc=Paramos valdymas +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mančio integracija Module1400Name=Apskaita Module1400Desc=Apskaitos valdymas (dvivietės šalys) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategorijos Module1780Desc=Kategorijų valdymas (produktai, tiekėjai ir klientai) Module2000Name=WYSIWYG redaktorius @@ -631,7 +642,7 @@ Permission181=Skaityti tiekėjo užsakymus Permission182=Sukurti/keisti tiekėjo užsakymus Permission183=Patvirtinti tiekėjo užsakymus Permission184=Patvirtinti tiekėjo užsakymus -Permission185=Rūšiuoti tiekėjo užsakymus +Permission185=Order or cancel supplier orders Permission186=Gauti tiekėjo užsakymus Permission187=Uždaryti tiekėjo užsakymus Permission188=Nutraukti tiekėjo užsakymus @@ -711,6 +722,13 @@ Permission538=Eksportuoti paslaugas Permission701=Skaityti aukas Permission702=Sukurti/keisti aukas Permission703=Ištrinti aukas +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Skaityti atsargas Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Proxy serverio slaptažodis DefineHereComplementaryAttributes=Čia nustatykite visus atributus, ne tik jau nustatytus pagal nutylėjimą, bet ir tuos, kuriuos Jūs norite, kad būtų palaikomi %s. ExtraFields=Papildomi požymiai ExtraFieldsLines=Papildomi atributai (linijos) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Papildomi požymiai (trečiosios šalys) ExtraFieldsContacts=Papildomi požymiai (kontaktas/adresas) ExtraFieldsMember=Papildomi požymiai (narys) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Produkto/paslaugos linija su nuline suma yra laikoma g FreeLegalTextOnProposal=Laisvas tekstas komerciniame pasiūlyme WatermarkOnDraftProposal=Vandens ženklas komercinių pasiūlymų projekte (nėra, jei lapas tuščias) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Užsakymų valdymo nuostatos OrdersNumberingModules=Užsakymų numeracijos modeliai @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Brūkšninio kodo tipas UPC BarcodeDescISBN=Brūkšninio kodo tipas ISBN BarcodeDescC39=Brūkšninio kodo tipas C39 BarcodeDescC128=Brūkšninio kodo tipas C128 -GenbarcodeLocation=Brūkšninio kodo generavimo komandinės eilutės įrankis (naudojamas vidinio variklio kai kurių brūkšninių kodų tipams) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Vidinis variklis BarCodeNumberManager=Automatinio brūkšninių kodų numerių nustatymo valdiklis ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Sąskaita grynųjų pinigų įmokoms pagal nutylėjimą CashDeskBankAccountForCheque= Sąskaita čekių įmokoms pagal nutylėjimą CashDeskBankAccountForCB= Sąskaita įmokoms kreditinėmis kortelėmis pagal nutylėjimą -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Žymeklių modulio nustatymas @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang index 27d83cc3325..d471ea6ac55 100644 --- a/htdocs/langs/lt_LT/banks.lang +++ b/htdocs/langs/lt_LT/banks.lang @@ -33,7 +33,11 @@ AllTime=Nuo pradžios Reconciliation=Suderinimas RIB=Banko sąskaitos numeris IBAN=IBAN numeris +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT numeris +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Pastovūs užsakymai StandingOrder=Pastovus užsakymas Withdrawals=Išėmimai @@ -148,7 +152,7 @@ BackToAccount=Atgal į sąskaitą ShowAllAccounts=Rodyti visas sąskaitas FutureTransaction=Operacija ateityje. Negalima taikyti SelectChequeTransactionAndGenerate=Pasirinkti/filtruoti čekius, kad įtraukti į čekio depozito kvitą ir paspausti mygtuką "Sukurti". -InputReceiptNumber=Pasirinkti banko suvestinę, susijusią su taikymu. Naudokite rūšiuojamą skaitinę vertę (pvz., YYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Nurodyti kategoriją, kurioje klasifikuoti įrašus ToConciliate=Taikyti ? ThenCheckLinesAndConciliate=Tada patikrinkite linijas, esančias banko suvestinėje ir paspauskite diff --git a/htdocs/langs/lt_LT/commercial.lang b/htdocs/langs/lt_LT/commercial.lang index aab16dcdd9b..1c66d76a7af 100644 --- a/htdocs/langs/lt_LT/commercial.lang +++ b/htdocs/langs/lt_LT/commercial.lang @@ -9,9 +9,9 @@ Prospect=Planas Prospects=Planai DeleteAction=Ištrinti įvykį/užduotį NewAction=Naujas įvykis/užduotis -AddAction=Pridėti įvykį/užduotį -AddAnAction=Pridėti įvykį/užduotį -AddActionRendezVous=Pridėti Rendez-vous įvykį +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Pasimatymas ConfirmDeleteAction=Ar tikrai norite ištrinti šį įvykį/užduotį ? CardAction=Įvykio kortelė @@ -44,8 +44,8 @@ DoneActions=Įvykdyti įvykiai DoneActionsFor=Įvykdyti įvykiai %s ToDoActions=Neįvykdyti įvykiai ToDoActionsFor=Neįvykdyti įvykiai %s -SendPropalRef=Siųsti komercinį pasiūlymą %s -SendOrderRef=Siųsti užsakymą %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Netaikoma StatusActionToDo=Atlikti StatusActionDone=Pilnas @@ -62,7 +62,7 @@ LastProspectContactDone=Susisiekmas įvyko DateActionPlanned=Įvykio suplanuota data DateActionDone=Įvykusio įvykio data ActionAskedBy=Įvykį pranešė -ActionAffectedTo=Įvykis priskiriamas +ActionAffectedTo=Event assigned to ActionDoneBy=Įvykį įvykdė ActionUserAsk=Pranešė ErrorStatusCantBeZeroIfStarted=Jei laukas 'Date done' yra užpildytas, veiksmas pradėtas (arba užbaigtas), todėl laukas 'Status' negali būti 0%%. diff --git a/htdocs/langs/lt_LT/contracts.lang b/htdocs/langs/lt_LT/contracts.lang index 669a370db74..cf070570ff6 100644 --- a/htdocs/langs/lt_LT/contracts.lang +++ b/htdocs/langs/lt_LT/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Pasibaigęs ServiceStatusClosed=Uždarytas ServicesLegend=Paslaugų legenda Contracts=Sutartys +ContractsAndLine=Contracts and line of contracts Contract=Sutartis NoContracts=Nėra sutarčių MenuServices=Paslaugos diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang index 77417db0902..55aee3fddce 100644 --- a/htdocs/langs/lt_LT/cron.lang +++ b/htdocs/langs/lt_LT/cron.lang @@ -84,3 +84,4 @@ CronType_command=Apvalkalo komanda CronMenu=Cron CronCannotLoadClass=Nepavyko įkelti klasės %s arba objekto %s UseMenuModuleToolsToAddCronJobs=Eikite į meniu "Pagrindinis - Modulių įrankiai - Darbo sąrašas" norėdami peržiūrėti ir redaguoti numatytus darbus. +TaskDisabled=Task disabled diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang index 515ddde0c6e..4f45a89c521 100644 --- a/htdocs/langs/lt_LT/errors.lang +++ b/htdocs/langs/lt_LT/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Šaltinis ir tikslinės banko sąskaitos turi bū ErrorBadThirdPartyName=Bloga trečiosios šalies pavadinimo reikšmė ErrorProdIdIsMandatory=%s yra privalomas ErrorBadCustomerCodeSyntax=Bloga kliento kodo sintaksė -ErrorBadBarCodeSyntax=Bloga brūkšninio kodo sintaksė +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Kliento kodas reikalingas ErrorBarCodeRequired=Reikalingas brūkšninis kodas ErrorCustomerCodeAlreadyUsed=Kliento kodas jau naudojamas @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=JavaScript turi būti neišjungtas, kad ši funkcij ErrorPasswordsMustMatch=Abu įvesti slaptažodžiai turi sutapti tarpusavyje ErrorContactEMail=Įvyko techninė klaida. Kreipkitės į administratorių e-paštu %s ir pateikite klaidos kodą %s savo laiške, arba dar geriau, pridėkite šio puslapio ekrano kopiją. ErrorWrongValueForField=Neteisinga laukelio numerio reikšmė %s (reikšmė '%s' neatitinka reguliarios išraiškos (regex) taisyklės %s) -ErrorFieldValueNotIn=Neteisinga reikšmė laukelio numeriui %s (reikšmė '%s' nėra reikšmė galima laukeliui %s lentelėje %s +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Neteisinga reikšmė laukelio numeriui %s (reikšmė '%s' yra ne %s egzistuojanti nuoroda) ErrorsOnXLines=Klaidos %s šaltinio įraše (-uose) ErrorFileIsInfectedWithAVirus=Antivirusinė programa negali patvirtinti failo (failas gali būti užkrėstas virusu) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Privalomi nustatymų parametrai dar nėra apibrėžti diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang index 8eb2ffae566..c674023e512 100644 --- a/htdocs/langs/lt_LT/install.lang +++ b/htdocs/langs/lt_LT/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Paskutinis žingsnis: Nustatykite čia prisijungim ActivateModule=Įjungti modulį %s ShowEditTechnicalParameters=Spauskite čia, kad galėtumete matyti/redaguoti išplėstinius parametrus (eksperto režime) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang index e40b7b58905..1ff97860263 100644 --- a/htdocs/langs/lt_LT/main.lang +++ b/htdocs/langs/lt_LT/main.lang @@ -141,6 +141,7 @@ Cancel=Atšaukti Modify=Pakeisti Edit=Redaguoti Validate=Patvirtinti +ValidateAndApprove=Validate and Approve ToValidate=Patvirtinti Save=Išsaugoti SaveAs=Įšsaugoti kaip @@ -158,6 +159,7 @@ Search=Ieškoti SearchOf=Ieškoti Valid=Galiojantis Approve=Patvirtinti +Disapprove=Disapprove ReOpen=Atidaryti iš naujo Upload=Siųsti failą ToLink=Nuoroda @@ -219,6 +221,7 @@ Cards=Kortelės Card=Kortelė Now=Dabar Date=Data +DateAndHour=Date and hour DateStart=Pradžios data DateEnd=Pabaigos data DateCreation=Sukūrimo data @@ -295,6 +298,7 @@ UnitPriceHT=Vieneto kaina (grynoji) UnitPriceTTC=Vieneto kaina PriceU=U.P. PriceUHT=U.P. (grynasis) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Suma AmountInvoice=Sąskaitos-faktūros suma @@ -521,6 +525,7 @@ DateFromTo=Nuo %s į %s DateFrom=Nuo %s DateUntil=Iki %s Check=Patikrinti +Uncheck=Uncheck Internal=Vidinis External=Išorinis Internals=Vidinis @@ -688,6 +693,7 @@ PublicUrl=Viešas URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Pirmadienis Tuesday=Antradienis diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang index ddaf28f61ab..9ddb927bb6f 100644 --- a/htdocs/langs/lt_LT/orders.lang +++ b/htdocs/langs/lt_LT/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Atšauktas StatusOrderDraft=Projektas (turi būti patvirtintas) StatusOrderValidated=Patvirtintas StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Apdorotas StatusOrderToBill=Pristatyta StatusOrderToBill2=Pateikti sąskaitą-faktūrą @@ -58,6 +59,7 @@ MenuOrdersToBill=Pristatyti užsakymai MenuOrdersToBill2=Billable orders SearchOrder=Ieškoti užsakymo SearchACustomerOrder=Ieškoti kliento užsakymo +SearchASupplierOrder=Search a supplier order ShipProduct=Gabenti produktą Discount=Nuolaida CreateOrder=Sukurti Užsakymą diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang index 36fb7dd69b7..1a21722f710 100644 --- a/htdocs/langs/lt_LT/other.lang +++ b/htdocs/langs/lt_LT/other.lang @@ -54,12 +54,13 @@ MaxSize=Maksimalus dydis AttachANewFile=Pridėti naują failą/dokumentą LinkedObject=Susietas objektas Miscellaneous=Įvairus -NbOfActiveNotifications=Pranešimų skaičius +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Tai yra pašto bandymas.\nDvi eilutės yra atskirtos eilutės perkėlimo ženklu.\n\n __SIGNATURE__ PredefinedMailTestHtml=Tai yra pašto bandymas (žodis bandymas turi būti paryškintas)
Dvi eilutės yra atskirtos eilutės perkėlimo ženklu.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nČia rasite sąskaitą-faktūrą __ FACREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nNorime jus perspėti, kad sąskaita-faktūra __ FACREF__ atrodo yra neapmokėta. Todėl tai yra pakartotinis priminimas apmokėti sąskaitą-faktūrą ir pakartotinai prikabinta sąskaita-faktūra.\n\n__PERSONALIZED__Sincerely\n\n__ SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nČia rasite komercinį pasiūlymą __ PROPREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nČia rasite užsakymą __ ORDERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nČia rasite mūsų užsakymą __ ORDERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nČia rasite sąskaitą-faktūrą __ FACREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__ diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/lt_LT/productbatch.lang +++ b/htdocs/langs/lt_LT/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang index 1b39c2adf11..119a17d71e2 100644 --- a/htdocs/langs/lt_LT/products.lang +++ b/htdocs/langs/lt_LT/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang index 9ee14f63ec0..ad5077bc7b4 100644 --- a/htdocs/langs/lt_LT/projects.lang +++ b/htdocs/langs/lt_LT/projects.lang @@ -8,8 +8,10 @@ SharedProject=Visi PrivateProject=Kontaktai projekte MyProjectsDesc=Šis vaizdas yra ribotas projektams, kuriems esate kontaktinis asmuo (koks bebūtų tipas). ProjectsPublicDesc=Šis vaizdas rodo visus projektus, kuriuos yra Jums leidžiama skaityti. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Šis vaizdas rodo visus projektus (Jūsų vartotojo teisės leidžia matyti viską). MyTasksDesc=Šis vaizdas yra ribotas projektams ar užduotims, kuriems Jūs esate kontaktinis asmuo (koks bebūtų tipas). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Šis vaizdas rodo visus projektus ir užduotis, kuriuos Jums leidžiama skaityti. TasksDesc=Šis vaizdas rodo visus projektus ir užduotis (Jūsų vartotojo teisės leidžia matyti viską). ProjectsArea=Projektų sritis @@ -29,6 +31,8 @@ NoProject=Nėra apibrėžto ar turimo projekto NbOpenTasks=Atidarytų užduočių skaičius NbOfProjects=Projektų skaičius TimeSpent=Praleistas laikas +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Praleistas laikas RefTask=Užduoties nuoroda LabelTask=Etiketės užduotis @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Tiekėjo užsakymų, susijusių su projektu, ListSupplierInvoicesAssociatedProject=Tiekėjo sąskaitų-faktūrų, susijusių su projektu, sąrašas ListContractAssociatedProject=Sudarytų sutarčių, susijusių su projektu, sąrašas ListFichinterAssociatedProject=Intervencijų, susijusių su projektu, sąrašas -ListTripAssociatedProject=Kelionių ir išlaidų, susijusių su projektų, sąrašas +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Įvykių, susijusių su projektu, sąrašas ActivityOnProjectThisWeek=Projekto aktyvumas šią savaitę ActivityOnProjectThisMonth=Projekto aktyvumas šį mėnesį @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/lt_LT/salaries.lang b/htdocs/langs/lt_LT/salaries.lang index edca71a1829..a36e72679b2 100644 --- a/htdocs/langs/lt_LT/salaries.lang +++ b/htdocs/langs/lt_LT/salaries.lang @@ -1,8 +1,13 @@ # Dolibarr language file - Source file is en_US - users -Salary=Salary -Salaries=Salaries -Employee=Employee -NewSalaryPayment=New salary payment -SalaryPayment=Salary payment -SalariesPayments=Salaries payments -ShowSalaryPayment=Show salary payment +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge +Salary=Atlyginimas +Salaries=Atlyginimai +Employee=Darbuotojas +NewSalaryPayment=Naujas atlyginimo mokėjimas +SalaryPayment=Atlyginimo mokėjimas +SalariesPayments=Atlyginimų mokėjimai +ShowSalaryPayment=Rodyti atlyginimo mokėjimą +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang index 9c22f2b507a..15cf1916fcf 100644 --- a/htdocs/langs/lt_LT/sendings.lang +++ b/htdocs/langs/lt_LT/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Užsakytas kiekis QtyShipped=Išsiųstas kiekis QtyToShip=Kiekis išsiuntimui QtyReceived=Gautas kiekis -KeepToShip=Laikyti siuntimui +KeepToShip=Remain to ship OtherSendingsForSameOrder=Kiti vežimai, skirti šiam užsakymui DateSending=Užsakymo išsiuntimo data DateSendingShort=Užsakymo išsiuntimo data diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang index 60c6bbe71e7..4f773f2b5b5 100644 --- a/htdocs/langs/lt_LT/stocks.lang +++ b/htdocs/langs/lt_LT/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Vidutinė svertinė kaina PMPValueShort=WAP EnhancedValueOfWarehouses=Sandėlių vertė UserWarehouseAutoCreate=Kuriant vartotoją, sandėlį sukurti automatiškai +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Kiekis išsiųstas QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Sandėlis %s bus naudojamos atsargų sumažėji WarehouseForStockIncrease=Sandėlis %s bus naudojamos atsargų padidėjimui ForThisWarehouse=Šiam sandėliui ReplenishmentStatusDesc=Tai sąrašas visų produktų, kurių atsargos mažesnės už pageidaujamą kiekį (arba mažesnės nei įspėjama kritinė riba, jei langelis "Tik įspėjimai" yra pažymėtas), ir siūlymas sukurti tiekėjo užsakymus skirtumo užpildymui. -ReplenishmentOrdersDesc=Tai sąrašas visų atidarytų tiekėjo užsakymų +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Papildymai NbOfProductBeforePeriod=Produkto %s kiekis atsargose iki pasirinkto periodo (< %s) NbOfProductAfterPeriod=Produkto %s kiekis sandėlyje po pasirinkto periodo (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang index f53d7984e4a..63a3de6a9e5 100644 --- a/htdocs/langs/lt_LT/suppliers.lang +++ b/htdocs/langs/lt_LT/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Tiekėjai -Supplier=Tiekėjas AddSupplier=Create a supplier SupplierRemoved=Tiekėjas pašalintas SuppliersInvoice=Tiekėjo sąskaita-faktūra @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Tiekėjo sąskaitos-faktūros ir mokėjimai ExportDataset_fournisseur_3=Tiekėjo užsakymai ir užsakymo eilutės ApproveThisOrder=Patvirtinti šį užsakymą ConfirmApproveThisOrder=Ar tikrai norite patvirtinti užsakymą %s ? -DenyingThisOrder=Neigiantis šį užsakymą +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Ar tikrai norite atsisakyti šio užsakymo s? ConfirmCancelThisOrder=Ar tikrai norite atšaukti šį užsakymą %s ? AddCustomerOrder=Sukurti kliento užsakymą diff --git a/htdocs/langs/lt_LT/trips.lang b/htdocs/langs/lt_LT/trips.lang index 42c60e6a183..640346bb6f6 100644 --- a/htdocs/langs/lt_LT/trips.lang +++ b/htdocs/langs/lt_LT/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Išjungimas -Trips=Išjungimai -TripsAndExpenses=Išjungimai ir išlaidos -TripsAndExpensesStatistics=Išjungimų ir išlaidų statistika -TripCard=Išjungimo kortelė -AddTrip=Pridėti išjungimą -ListOfTrips=Išjungimų sąrašas +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Įmokų sąrašas -NewTrip=Naujas išjungimas +NewTrip=New expense report CompanyVisited=aplankyta įmonė/organizacija Kilometers=Kilometrų FeesKilometersOrAmout=Kilometrų kiekis -DeleteTrip=Ištrinti išjungimą -ConfirmDeleteTrip=Ar tikrai norite ištrinti šį išjungimą ? -TF_OTHER=Kitas -TF_LUNCH=Pietūs -TF_TRIP=Išjungimas -ListTripsAndExpenses=Išjungimų ir išlaidų sąrašas -ExpensesArea=Išjungimų ir išlaidų sritis -SearchATripAndExpense=Ieškoti išjungimo ir išlaidų +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Kitas +TF_TRANSPORTATION=Transportation +TF_LUNCH=Pietūs +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang index 801ddcc484a..3f5828327f7 100644 --- a/htdocs/langs/lv_LV/accountancy.lang +++ b/htdocs/langs/lv_LV/accountancy.lang @@ -13,7 +13,7 @@ ConfigAccountingExpert=Configuration of the module accounting expert Journaux=Žurnāli JournalFinancial=Financial journals Exports=Eksports -Export=Export +Export=Eksportēt Modelcsv=Eksporta modulis OptionsDeactivatedForThisExportModel=For this export model, options are deactivated Selectmodelcsv=Select a model of export @@ -68,7 +68,7 @@ Lineofinvoice=Line of invoice VentilatedinAccount=Ventilated successfully in the accounting account NotVentilatedinAccount=Not ventilated in the accounting account -ACCOUNTING_SEPARATORCSV=Column separator in export file +ACCOUNTING_SEPARATORCSV=Kolonu atdalītājs eksportējamā failā ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index 44dd8ffd72a..b1e121979c8 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Eksperimentāls VersionDevelopment=Attīstība VersionUnknown=Nezināms VersionRecommanded=Ieteicams +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Sesijas ID SessionSaveHandler=Handler, lai saglabātu sesijas SessionSavePath=Atmiņas sesija lokalizācija @@ -294,7 +299,7 @@ DoNotUseInProduction=Neizmantot produkcijā ThisIsProcessToFollow=Tas ir setup, lai process: StepNb=Solis %s FindPackageFromWebSite=Atrast paketi, kas nodrošina iespēju, jūs vēlaties (piemēram, par oficiālo tīmekļa vietnes %s). -DownloadPackageFromWebSite=Download package %s. +DownloadPackageFromWebSite=Lejupielādēt paku %s UnpackPackageInDolibarrRoot=Izkravāt paketi failu Dolibarr saknes direktorijā %s SetupIsReadyForUse=Instalēšana ir pabeigta, un Dolibarr ir gatavs lietošanai ar šo jauno komponentu. NotExistsDirect=Alternatīva saknes direktorijs nav definēta.
@@ -388,7 +393,7 @@ ExtrafieldParamHelpselect=Parameters list have to be like key,value

for ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... ExtrafieldParamHelpradio=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter -ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter LibraryToBuildPDF=Bibliotēka, lai izveidotu PDF WarningUsingFPDF=Uzmanību: Jūsu conf.php satur direktīvu dolibarr_pdf_force_fpdf = 1. Tas nozīmē, ka jūs izmantojat FPDF bibliotēku, lai radītu PDF failus. Šī bibliotēka ir vecs un neatbalsta daudz funkcijām (Unicode, attēlu pārredzamība, kirilicas, arābu un Āzijas valodās, ...), tāpēc var rasties kļūdas laikā PDF paaudzes.
Lai atrisinātu šo problēmu, un ir pilnībā atbalsta PDF paaudzes, lūdzu, lejupielādējiet TCPDF bibliotēka , tad komentēt vai noņemt līnijas $ dolibarr_pdf_force_fpdf = 1, un pievienojiet vietā $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' LocalTaxDesc=Dažas valstis piemēro 2 vai 3 nodokļus par katru PVN rēķinu rindā. Ja tas ir gadījums, izvēlieties veidu otrajā un trešajā nodokli un tā likmi. Iespējamais veids ir:
1: vietējais nodoklis attiecas uz produktiem un pakalpojumiem, bez PVN (PVN netiek piemērots vietējiem nodokļiem)
2: vietējais nodoklis attiecas uz produktiem un pakalpojumiem, bez PVN (PVN aprēķina summas + localtax)
3: vietējais nodoklis attiecas uz produktiem, bez PVN (PVN netiek piemērots vietējiem nodokļiem)
4: vietējais nodoklis attiecas uz produktiem, bez PVN (PVN aprēķina summas + localtax)
5: vietējais nodoklis attiecas uz pakalpojumiem, bez PVN (PVN netiek piemērots vietējiem nodokļiem)
6: vietējais nodoklis attiecas uz pakalpojumiem, bez PVN (PVN aprēķina summas + localtax) @@ -493,10 +498,16 @@ Module600Name=Paziņojumi Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Ziedojumi Module700Desc=Ziedojumu pārvaldība +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Dievlūdzējs Module1200Desc=Mantis integrācija Module1400Name=Grāmatvedība Module1400Desc=Grāmatvedības vadība (dubultā partijas) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Sadaļas Module1780Desc=Kategoriju vadība (produktiem, piegādātājiem un klientiem) Module2000Name=WYSIWYG redaktors @@ -631,7 +642,7 @@ Permission181=Lasīt piegādātāju pasūtījumus Permission182=Izveidot/mainīt piegādātāju pasūtījumus Permission183=Apstiprināt piegādātāju pasūtījumus Permission184=Apstiprināt piegādātāja pasūtījumus -Permission185=Pasūtīt piegādātājs pasūtījumi +Permission185=Order or cancel supplier orders Permission186=Saņemt piegādātāju pasūtījumus Permission187=Aizvērt piegādātāja pasūtījumus Permission188=Atcelt piegādātāja pasūtījumus @@ -711,6 +722,13 @@ Permission538=Eksportēt pakalpojumus Permission701=Lasīt ziedojumus Permission702=Izveidot/mainīt ziedojumus Permission703=Dzēst ziedojumus +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Lasīt krājumus Permission1002=Assign service/subscription to contract Permission1003=Dzēst noliktavas @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Parole, lai izmantotu starpniekserveri DefineHereComplementaryAttributes=Definēt šeit visi atribūti, jau nav pieejama pēc noklusējuma, un, ka jūs vēlaties būt atbalstīta %s. ExtraFields=Papildbarība atribūti ExtraFieldsLines=Papildinošas atribūti (līnijas) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Papildinošas atribūti (thirdparty) ExtraFieldsContacts=Papildinošas atribūti (kontaktpersona / adrese) ExtraFieldsMember=Papildinošas atribūti (biedrs) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Produkta / pakalpojuma ar nulles summu līnija tiek uz FreeLegalTextOnProposal=Brīvais teksts komerciālajos priekšlikumos WatermarkOnDraftProposal=Ūdenszīme projektu komerciālo priekšlikumu (none ja tukšs) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Pasūtījumu vadības iestatīšana OrdersNumberingModules=Pasūtījumu numerācijas modeļi @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Svītrkoda veids UPC BarcodeDescISBN=Svītrkoda veids ISBN BarcodeDescC39=Svītrkoda veids C39 BarcodeDescC128=Svītrkoda veids C128 -GenbarcodeLocation=Svītru kodu ģenerēšanas komandrindas rīks (ko izmanto iekšējo dzinēju dažiem svītrkodu veidiem) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Iekšējais dzinējs BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1420,7 +1447,7 @@ AdvancedEditor=Uzlabotais redaktors ActivateFCKeditor=Aktivizēt uzlabotos redaktoru: FCKeditorForCompany=WYSIWYG izveidi / izdevums no elementiem apraksta un piezīmi (izņemot produktu / pakalpojumu) FCKeditorForProduct=WYSIWYG radīšana / izdevums produktu / pakalpojumu apraksts un atzīmēt -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files. +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.\n FCKeditorForMailing= WYSIWYG izveide/ izdevums masveida emailings (Tools-> e-pastu) FCKeditorForUserSignature=WYSIWYG izveide/labošana lietotāja paraksta FCKeditorForMail=WYSIWYG izveidi / izdevums visām vēstulēm (izņemot Outils-> e-pastu) @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Noklusējuma konts, lai izmantotu, lai saņemtu naudas maksājumus CashDeskBankAccountForCheque= Noklusējuma konts, lai izmantotu, lai saņemtu maksājumus ar čeku CashDeskBankAccountForCB= Noklusējuma konts, lai izmantotu, lai saņemtu maksājumus ar kredītkarti -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Grāmatzīme modulis iestatīšanu @@ -1569,3 +1597,7 @@ SortOrder=Kārtošanas secība Format=Formāts TypePaymentDesc=0:Klienta maksāšanas veids, 1:Piegādātāja maksāšanas veids, 2:Abi klientu un piegādātāju maksāšanas veids IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang index a301f51c95e..9cca7068840 100644 --- a/htdocs/langs/lv_LV/agenda.lang +++ b/htdocs/langs/lv_LV/agenda.lang @@ -59,7 +59,7 @@ InvoiceSentByEMail=Klienta rēķins %s nosūtīts pa e-pastu SupplierOrderSentByEMail=Piegādātāja pasūtījums %s nosūtīts pa e-pastu SupplierInvoiceSentByEMail=Piegādātāja rēķins %s nosūtīts pa e-pastu ShippingSentByEMail=Shipment %s sent by EMail -ShippingValidated= Shipment %s validated +ShippingValidated= Sūtījums %s apstiprināts InterventionSentByEMail=Intervention %s sent by EMail NewCompanyToDolibarr= Trešā puses izveidota DateActionPlannedStart= Plānotais sākuma datums diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang index 501b8adc1e0..3c7dfa65ec1 100644 --- a/htdocs/langs/lv_LV/banks.lang +++ b/htdocs/langs/lv_LV/banks.lang @@ -8,7 +8,7 @@ FinancialAccount=Konts FinancialAccounts=Konti BankAccount=Bankas konts BankAccounts=Banku konti -ShowAccount=Show Account +ShowAccount=Rādīt kontu AccountRef=Finanšu konta ref AccountLabel=Finanšu konts nosaukums CashAccount=Skaidras naudas konts @@ -33,7 +33,11 @@ AllTime=No sākuma Reconciliation=Samierināšanās RIB=Bankas konta numurs IBAN=IBAN numurs +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT numurs +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Regulārie maksājumi StandingOrder=Regulārais maksājums Withdrawals=Izņemts @@ -148,7 +152,7 @@ BackToAccount=Atpakaļ uz kontu ShowAllAccounts=Parādīt visiem kontiem FutureTransaction=Darījumi ar Futur. Nav veids, kā samierināt. SelectChequeTransactionAndGenerate=Izvēlieties / filtru pārbaudes, lai iekļautu uz pārbaudes depozīta saņemšanas un noklikšķiniet uz "Izveidot". -InputReceiptNumber=Izvēlieties konta izrakstu, kas saistīti ar izlīgumu. Izmantojiet sortable skaitlisku vērtību (piemēram, GGGGMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Galu galā, norādiet kategoriju, kurā klasificēt ierakstus ToConciliate=Samierināt? ThenCheckLinesAndConciliate=Tad pārbaudiet līnijas, kas atrodas bankas izrakstā, un noklikšķiniet diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang index 3813f4f5db7..4216d9f6a05 100644 --- a/htdocs/langs/lv_LV/bills.lang +++ b/htdocs/langs/lv_LV/bills.lang @@ -1,16 +1,16 @@ # Dolibarr language file - Source file is en_US - bills Bill=Pavadzīme Bills=Pavadzīmes -BillsCustomers=Customers invoices -BillsCustomer=Customers invoice -BillsSuppliers=Suppliers invoices -BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomers=Klientu rēķini +BillsCustomer=Klientu rēķins +BillsSuppliers=Piegādātāju rēķini +BillsCustomersUnpaid=Neapmaksātie klientu rēķini BillsCustomersUnpaidForCompany=Neapmaksātie klientu rēķini %s BillsSuppliersUnpaid=Neapmaksātie piegādātāja -u rēķini BillsSuppliersUnpaidForCompany=Neapmaksātie piegādātāja -u rēķini %s BillsLate=Kavētie maksājumi -BillsStatistics=Customers invoices statistics -BillsStatisticsSuppliers=Suppliers invoices statistics +BillsStatistics=Klientu rēķinu statistika +BillsStatisticsSuppliers=Piegādātāju rēķinu statistika DisabledBecauseNotErasable=Bloķēts, jo nedrīkst dzēst InvoiceStandard=Standarta rēķins InvoiceStandardAsk=Standarta rēķins @@ -420,8 +420,8 @@ InvoiceSituationDesc=Create a new situation following an already existing one SituationAmount=Situation invoice amount(net) SituationDeduction=Situation subtraction Progress=Progress -ModifyAllLines=Modify all lines -CreateNextSituationInvoice=Create next situation +ModifyAllLines=Labot visas līnijas +CreateNextSituationInvoice=Izveidot nākošo situāciju NotLastInCycle=This invoice in not the last in cycle and must not be modified. DisabledBecauseNotLastInCycle=The next situation already exists. DisabledBecauseFinal=This situation is final. diff --git a/htdocs/langs/lv_LV/commercial.lang b/htdocs/langs/lv_LV/commercial.lang index 9d5f0f83f94..cd11fb1be26 100644 --- a/htdocs/langs/lv_LV/commercial.lang +++ b/htdocs/langs/lv_LV/commercial.lang @@ -9,12 +9,12 @@ Prospect=Perspektīva Prospects=Perspektīvas DeleteAction=Dzēst notikumu/uzdevumu NewAction=Jauns notikums/uzdevums -AddAction=Pievienot notikumu/uzdevumu -AddAnAction=Pievienot notikumu/uzdevumu -AddActionRendezVous=Pievienot Rendez-vous notikumu +AddAction=Izveidot notikumu/uzdevumu +AddAnAction=Izveidot notikumu/uzdevumu +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Satikšanās ConfirmDeleteAction=Vai tiešām vēlaties dzēst šo notikumu / uzdevumu? -CardAction=Notikumu karte +CardAction=Notikumu kartiņa PercentDone=Procentuāli pabeigts ActionOnCompany=Uzdevums par uzņēmumu ActionOnContact=Uzdevums par kontaktu @@ -33,7 +33,7 @@ ErrorWrongCode=Nepareizs kods NoSalesRepresentativeAffected=Nav īpaši tirdzniecības piešķirts pārstāvis ShowCustomer=Rādīt klientu ShowProspect=Rādīt izredzes -ListOfProspects=Saraksts perspektīvas +ListOfProspects=Perspektīvu saraksts ListOfCustomers=Klientu saraksts LastDoneTasks=Pēdējie %s pabeigtie uzdevumi LastRecordedTasks=Pēdējās ierakstītie uzdevumi @@ -44,8 +44,8 @@ DoneActions=Īstenotie pasākumi DoneActionsFor=Pabeigtie notikumi %s ToDoActions=Nepabeigtie notikumi ToDoActionsFor=Nepilnīgi notikumi %s -SendPropalRef=Sūtīt komerciālu priekšlikumu, %s -SendOrderRef=Nosūtīt pasūtījumu %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Nav piemērojams StatusActionToDo=Jāizdara StatusActionDone=Pabeigts @@ -60,9 +60,9 @@ LastProspectToContact=Jāsazinās LastProspectContactInProcess=Sazināšanās procesā LastProspectContactDone=Sazinājāmies DateActionPlanned=Datums, kad pasākums plānots -DateActionDone=Datums notikums darīts +DateActionDone=Datums, kad notikums pabeigts ActionAskedBy=Par notikumu ziņoja -ActionAffectedTo=Notikums piešķirts +ActionAffectedTo=Event assigned to ActionDoneBy=Notikumu veic ActionUserAsk=Ziņoja ErrorStatusCantBeZeroIfStarted=Ja lauks "Datums darīts" tiek aizpildīta, darbība tiek uzsākts (vai pabeigts), lai lauka "Statuss" nevar būt 0%%. diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang index 811966b56c3..f72655e0e14 100644 --- a/htdocs/langs/lv_LV/contracts.lang +++ b/htdocs/langs/lv_LV/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Beidzies ServiceStatusClosed=Slēgts ServicesLegend=Pakalpojumu apraksts Contracts=Līgumi +ContractsAndLine=Contracts and line of contracts Contract=Līgums NoContracts=Nav līgumi MenuServices=Pakalpojumi diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang index bc571e1860a..d75495175ef 100644 --- a/htdocs/langs/lv_LV/cron.lang +++ b/htdocs/langs/lv_LV/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell komandu CronMenu=Cron CronCannotLoadClass=Nevar ielādēt klases %s vai objektu %s UseMenuModuleToolsToAddCronJobs=Iet uz izvēlni "Home - moduļi instrumenti - Darbs sarakstu", lai redzētu un rediģēt plānoto darbu. +TaskDisabled=Task disabled diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang index b34b89c418a..c3f12157435 100644 --- a/htdocs/langs/lv_LV/errors.lang +++ b/htdocs/langs/lv_LV/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Avots un mērķiem banku kontiem jābūt atšķir ErrorBadThirdPartyName=Nepareiza vērtība trešo personu nosaukumā ErrorProdIdIsMandatory=%s ir obligāti ErrorBadCustomerCodeSyntax=Nepareiza klienta koda sintakse -ErrorBadBarCodeSyntax=Nepareiza sintakse svītrukodam +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Klienta kods nepieciešams ErrorBarCodeRequired=Svītrkods nepieciešams ErrorCustomerCodeAlreadyUsed=Klienta kods jau tiek izmantots @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript nedrīkst tikt izslēgti, ka šī funkci ErrorPasswordsMustMatch=Abām ievadītām parolēm jāsakrīt ErrorContactEMail=Tehniska kļūda. Lūdzu, sazinieties ar administratoru pa sekojošu e-pastu %s, lai iesniegtu kļūdas kodu %s jūsu ziņojumā, vai labāk, pievienojot šīs lapas ekrāna. ErrorWrongValueForField=Nepareiza vērtība lauka numuru %s (vērtība '%s' nesakrīt regex noteikums %s) -ErrorFieldValueNotIn=Nepareiza vērtība lauka numura %s (vērtība "%s" nav vērtība, pieejams uz lauka %s galda %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Nepareiza vērtība lauka numuru %s (vērtība "%s" nav %s esošo ref) ErrorsOnXLines=Kļūdas %s avota ierakstu (-s) ErrorFileIsInfectedWithAVirus=Antivīrusu programma nevarēja apstiprināt failu (fails varētu būt inficēti ar vīrusu) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Iekšēja kļūda '%s' ErrorPriceExpressionUnknown=Nezināma kļūda '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Obligātie uzstādīšanas parametri vēl nav definētas diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang index e2881caf007..3936294e463 100644 --- a/htdocs/langs/lv_LV/install.lang +++ b/htdocs/langs/lv_LV/install.lang @@ -155,7 +155,8 @@ MigrationFinished=Migrācija pabeigta LastStepDesc=Pēdējais solis: Noteikt šeit pieteikumvārdu un paroli, jūs plānojat izmantot, lai izveidotu savienojumu ar programmatūru. Nepalaidiet garām šo, jo tas ir konts, lai administrētu visus pārējos. ActivateModule=Aktivizēt moduli %s ShowEditTechnicalParameters=Noklikšķiniet šeit, lai parādītu / rediģēt papildu parametrus (ekspertu režīmā) -WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang index 4dfbe5b3e41..edc3343f1be 100644 --- a/htdocs/langs/lv_LV/main.lang +++ b/htdocs/langs/lv_LV/main.lang @@ -141,6 +141,7 @@ Cancel=Atcelt Modify=Modificēt Edit=Rediģēt Validate=Pārbaudīt +ValidateAndApprove=Validate and Approve ToValidate=Jāpārbauda Save=Saglabāt SaveAs=Saglabāt kā @@ -158,6 +159,7 @@ Search=Meklēšana SearchOf=Meklēšana Valid=Derīgs Approve=Apstiprināt +Disapprove=Disapprove ReOpen=Atvērt par jaunu Upload=Augšupielādēt failu ToLink=Saite @@ -219,6 +221,7 @@ Cards=Kartes Card=Karte Now=Tagad Date=Datums +DateAndHour=Date and hour DateStart=Sākuma datums DateEnd=Beigu datums DateCreation=Izveidošanas datums @@ -295,6 +298,7 @@ UnitPriceHT=Vienības cena (neto) UnitPriceTTC=Vienības cena PriceU=UP PriceUHT=UP (neto) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=UP Amount=Summa AmountInvoice=Rēķina summa @@ -521,6 +525,7 @@ DateFromTo=No %s līdz %s DateFrom=No %s DateUntil=Līdz %s Check=Pārbaudīt +Uncheck=Uncheck Internal=Iekšējs External=Ārējs Internals=Iekšējs @@ -688,6 +693,7 @@ PublicUrl=Publiskā saite AddBox=Pievienot info logu SelectElementAndClickRefresh=Izvēlieties elementu un nospiediet atjaunot PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Pirmdiena Tuesday=Otrdiena diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang index 32f63671aa0..abed9fe2985 100644 --- a/htdocs/langs/lv_LV/orders.lang +++ b/htdocs/langs/lv_LV/orders.lang @@ -16,7 +16,7 @@ SupplierOrder=Piegādātājs rīkojums SuppliersOrders=Piegādātāji pasūtījumi SuppliersOrdersRunning=Pašreizējie piegādātāju pasūtījumi CustomerOrder=Klienta rīkojums -CustomersOrders=Customers orders +CustomersOrders=Klientu pasūtījumi CustomersOrdersRunning=Pašreizējie klienta/u pasūtījumi CustomersOrdersAndOrdersLines=Klientu pasūtījumus un ordeņa līnijas OrdersToValid=Customers orders to validate @@ -29,7 +29,7 @@ StatusOrderDraftShort=Projekts StatusOrderValidatedShort=Apstiprināts StatusOrderSentShort=Procesā StatusOrderSent=Sūtījuma procesā -StatusOrderOnProcessShort=Ordered +StatusOrderOnProcessShort=Pasūtīts StatusOrderProcessedShort=Apstrādāti StatusOrderToBillShort=Pasludināts StatusOrderToBill2Short=Lai likumprojektu @@ -42,6 +42,7 @@ StatusOrderCanceled=Atcelts StatusOrderDraft=Projekts (ir jāapstiprina) StatusOrderValidated=Apstiprināts StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Apstrādāts StatusOrderToBill=Piegādāts StatusOrderToBill2=Lai likumprojektu @@ -58,6 +59,7 @@ MenuOrdersToBill=Pasūtījumi piegādāti MenuOrdersToBill2=Billable orders SearchOrder=Meklēšanas kārtība SearchACustomerOrder=Meklēt klienta pasūtījumu +SearchASupplierOrder=Search a supplier order ShipProduct=Sūtīt produktu Discount=Atlaide CreateOrder=Izveidot pasūtījumu diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang index 875d92a9d5e..731b200e05d 100644 --- a/htdocs/langs/lv_LV/other.lang +++ b/htdocs/langs/lv_LV/other.lang @@ -54,12 +54,13 @@ MaxSize=Maksimālais izmērs AttachANewFile=Pievienot jaunu failu / dokumentu LinkedObject=Saistītais objekts Miscellaneous=Dažādi -NbOfActiveNotifications=Paziņojumu skaits +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Šis ir testa e-pasts \\ nthe divas līnijas ir atdalīti ar rakstatgriezi.. \n\n __ SIGNATURE__ PredefinedMailTestHtml=Tas ir tests pasts (vārds testam jābūt treknrakstā).
Abas līnijas ir atdalīti ar rakstatgriezi.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\n\nYou will find here the invoice __FACREF__\n\n\n__PERSONALIZED__Sincerely\n\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n\n__PERSONALIZED__Sincerely\n\n\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nJums tiek nosūtīts komerciālais piedāvājums __PROPREF__\n\n__PERSONALIZED__Ar cieņu\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang index ebb97632566..97e10b129ff 100644 --- a/htdocs/langs/lv_LV/productbatch.lang +++ b/htdocs/langs/lv_LV/productbatch.lang @@ -2,15 +2,15 @@ ManageLotSerial=Use batch/serial number ProductStatusOnBatch=Yes (Batch/serial required) ProductStatusNotOnBatch=No (Batch/serial not used) -ProductStatusOnBatchShort=Yes -ProductStatusNotOnBatchShort=No +ProductStatusOnBatchShort=Jā +ProductStatusNotOnBatchShort=Nē Batch=Batch/Serial atleast1batchfield=Eat-by date or Sell-by date or Batch number batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang index af56d19cd34..0a00746d8e3 100644 --- a/htdocs/langs/lv_LV/products.lang +++ b/htdocs/langs/lv_LV/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Numurs +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang index 1a098a76360..bc4ff4c3057 100644 --- a/htdocs/langs/lv_LV/projects.lang +++ b/htdocs/langs/lv_LV/projects.lang @@ -8,8 +8,10 @@ SharedProject=Visi PrivateProject=Kontakti Projekta MyProjectsDesc=Šis skats ir tikai uz projektiem, jums ir kontakts (kāds ir tipa). ProjectsPublicDesc=Šo viedokli iepazīstina visus projektus jums ir atļauts lasīt. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Šo viedokli iepazīstina visus projektus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu). MyTasksDesc=Šis skats ir tikai uz projektiem vai uzdevumus, jums ir kontakts (kāds ir tipa). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Šo viedokli iepazīstina visus projektus un uzdevumus, jums ir atļauts lasīt. TasksDesc=Šo viedokli iepazīstina visus projektus un uzdevumus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu). ProjectsArea=Projektu sadaļa @@ -29,6 +31,8 @@ NoProject=Neviens projekts nosaka, vai īpašumā NbOpenTasks=Nb atvērto uzdevumu NbOfProjects=Nb projektu TimeSpent=Laiks, kas pavadīts +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Laiks, kas patērēts RefTask=Ref. uzdevums LabelTask=Label uzdevums @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Saraksts piegādātāja pasūtījumu saistī ListSupplierInvoicesAssociatedProject=Saraksts no piegādātāja rēķinus saistīts ar projekta ListContractAssociatedProject=Līgumu sarakstu kas saistīti ar projektu ListFichinterAssociatedProject=Saraksts iejaukšanās saistīts ar projektu -ListTripAssociatedProject=Saraksts braucieniem un izdevumus, kas saistīti ar projektu +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Saraksts ar notikumiem, kas saistīti ar projektu ActivityOnProjectThisWeek=Aktivitāte projektu šonedēļ ActivityOnProjectThisMonth=Aktivitāte projektu šomēnes @@ -133,3 +137,6 @@ SearchAProject=Meklēt projektu ProjectMustBeValidatedFirst=Projektu vispirms jāpārbauda ProjectDraft=Melnraksta projekts FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang index 18b4acbec94..a08e7eca9b2 100644 --- a/htdocs/langs/lv_LV/salaries.lang +++ b/htdocs/langs/lv_LV/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Alga Salaries=Algas Employee=Darbinieks @@ -6,3 +8,6 @@ NewSalaryPayment=Jauna algas izmaksa SalaryPayment=Algas maksājums SalariesPayments=Algu maksājumi ShowSalaryPayment=Rādīt algu maksājumus +THM=Vidējā stundas cena +TJM=Vidējā dienas cena +CurrentSalary=Current salary diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang index c2533cccfc9..3816af9db35 100644 --- a/htdocs/langs/lv_LV/sendings.lang +++ b/htdocs/langs/lv_LV/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Pasūtītais daudzums QtyShipped=Daudzums kas nosūtīts QtyToShip=Daudzums, kas jānosūta QtyReceived=Saņemtais daudzums -KeepToShip=Glabāt uz kuģa +KeepToShip=Remain to ship OtherSendingsForSameOrder=Citas sūtījumiem uz šo rīkojumu DateSending=Datums nosūtot kārtība DateSendingShort=Datums nosūtot kārtība diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang index 739152d7728..dc0003b69dd 100644 --- a/htdocs/langs/lv_LV/stocks.lang +++ b/htdocs/langs/lv_LV/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Vidējā svērtā cena PMPValueShort=VSC EnhancedValueOfWarehouses=Noliktavas vērtība UserWarehouseAutoCreate=Izveidot noliktavu automātiski, veidojot lietotāju +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Nosūtītais daudzums QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Noliktava %s tiks izmantota krājumu samazinā WarehouseForStockIncrease=Noliktava %s tiks izmantota krājumu palielināšanai ForThisWarehouse=Šai noliktavai ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=Šis ir saraksts ar visiem atvērtajiem piegādātāju pasūtījumiem +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Papildinājumus NbOfProductBeforePeriod=Produktu daudzums %s noliktavā pirms izvēlētā perioda (< %s) NbOfProductAfterPeriod=Daudzums produktu %s krājumā pēc izvēlētā perioda (> %s) @@ -127,6 +128,7 @@ StockMustBeEnoughForShipment= Stock level must be enough to add product/service MovementLabel=Label of movement InventoryCode=Movement or inventory code IsInPackage=Contained into package -ShowWarehouse=Show warehouse +ShowWarehouse=Rādīt noliktavu MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang index 2e943b50b46..5d278bd1f7a 100644 --- a/htdocs/langs/lv_LV/suppliers.lang +++ b/htdocs/langs/lv_LV/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Piegādātāji -Supplier=Piegādātājs AddSupplier=Izveidot piegādātāju SupplierRemoved=Piegādātājs izņem SuppliersInvoice=Piegādātāji rēķins @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Piegādātāju rēķiniem un maksājumiem ExportDataset_fournisseur_3=Piegādātājs pasūtījumus un pasūtījumu līnijas ApproveThisOrder=Apstiprināt šo pasūtījumu ConfirmApproveThisOrder=Vai jūs tiešām vēlaties apstiprināt pasūtījumu %s? -DenyingThisOrder=Liedzot šo pasūtījumu +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Vai jūs tiešām vēlaties aizliegt šo pasūtījumu %s ? ConfirmCancelThisOrder=Vai esat pārliecināts, ka vēlaties atcelt šo pasūtījumu %s ? AddCustomerOrder=Izveidot klienta pasūtījumu @@ -42,5 +41,5 @@ NoneOrBatchFileNeverRan=Neviens vai partijas %s ne skrēja nesen SentToSuppliers=Nosūtīti uz piegādātājiem ListOfSupplierOrders=Saraksts ar piegādātāju pasūtījumiem MenuOrdersSupplierToBill=Supplier orders to invoice -NbDaysToDelivery=Delivery delay in days +NbDaysToDelivery=Piegādes kavēšanās dienās DescNbDaysToDelivery=The biggest delay is display among order product list diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang index 6fa2983bfa0..27f569e1b83 100644 --- a/htdocs/langs/lv_LV/trips.lang +++ b/htdocs/langs/lv_LV/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Brauciens -Trips=Braucieni -TripsAndExpenses=Trips un izdevumi -TripsAndExpensesStatistics=Trips un izdevumi statistika -TripCard=Ceļojuma kartiņa -AddTrip=Pievienot ceļojumu -ListOfTrips=Saraksts braucieniem +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Saraksts maksu -NewTrip=Jauns brauciens +NewTrip=New expense report CompanyVisited=Kompānija / organizācija apmeklēta Kilometers=Kilometri FeesKilometersOrAmout=Summa vai kilometri -DeleteTrip=Dzēst ceļojumu -ConfirmDeleteTrip=Vai tiešām vēlaties dzēst šo braucienu? -TF_OTHER=Cits -TF_LUNCH=Pusdienas -TF_TRIP=Brauciens -ListTripsAndExpenses=Saraksts braucienu un izdevumu -ExpensesArea=Trips un izdevumi zona -SearchATripAndExpense=Meklēt ceļojumu un izdevumiem +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Cits +TF_TRANSPORTATION=Transportation +TF_LUNCH=Pusdienas +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang index 38634cbd497..9782c2ea27f 100644 --- a/htdocs/langs/mk_MK/admin.lang +++ b/htdocs/langs/mk_MK/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=Development VersionUnknown=Unknown VersionRecommanded=Recommended +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Session ID SessionSaveHandler=Handler to save sessions SessionSavePath=Storage session localization @@ -493,10 +498,16 @@ Module600Name=Notifications Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. ExtraFields=Complementary attributes ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang index 10a5f5b3c14..a2306950fb4 100644 --- a/htdocs/langs/mk_MK/banks.lang +++ b/htdocs/langs/mk_MK/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Standing orders StandingOrder=Standing order Withdrawals=Withdrawals @@ -148,7 +152,7 @@ BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/mk_MK/commercial.lang b/htdocs/langs/mk_MK/commercial.lang index e7d2de76503..7acdc7bd7e6 100644 --- a/htdocs/langs/mk_MK/commercial.lang +++ b/htdocs/langs/mk_MK/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Prospects DeleteAction=Delete an event/task NewAction=New event/task -AddAction=Add event/task -AddAnAction=Add an event/task -AddActionRendezVous=Add a Rendez-vous event +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event/task ? CardAction=Event card @@ -44,8 +44,8 @@ DoneActions=Completed events DoneActionsFor=Completed events for %s ToDoActions=Incomplete events ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete diff --git a/htdocs/langs/mk_MK/contracts.lang b/htdocs/langs/mk_MK/contracts.lang index 57ba3bb15d8..d1be0e6513f 100644 --- a/htdocs/langs/mk_MK/contracts.lang +++ b/htdocs/langs/mk_MK/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired ServiceStatusClosed=Closed ServicesLegend=Services legend Contracts=Contracts +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=No contracts MenuServices=Services diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang index 82f4574b223..28dfc7770b2 100644 --- a/htdocs/langs/mk_MK/cron.lang +++ b/htdocs/langs/mk_MK/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang index 497ddd814e4..700e6344d7d 100644 --- a/htdocs/langs/mk_MK/errors.lang +++ b/htdocs/langs/mk_MK/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/mk_MK/install.lang b/htdocs/langs/mk_MK/install.lang index 5a494156672..dcd8df6e7db 100644 --- a/htdocs/langs/mk_MK/install.lang +++ b/htdocs/langs/mk_MK/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang index 62adb884547..81deb7c28f0 100644 --- a/htdocs/langs/mk_MK/main.lang +++ b/htdocs/langs/mk_MK/main.lang @@ -141,6 +141,7 @@ Cancel=Cancel Modify=Modify Edit=Edit Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Save SaveAs=Save As @@ -158,6 +159,7 @@ Search=Search SearchOf=Search Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Now Date=Date +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=From %s to %s DateFrom=From %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang index 34792ae1eb2..8efafa5e94e 100644 --- a/htdocs/langs/mk_MK/orders.lang +++ b/htdocs/langs/mk_MK/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Validated StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderToBill2=To bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang index 88991888183..08747ea884b 100644 --- a/htdocs/langs/mk_MK/other.lang +++ b/htdocs/langs/mk_MK/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/mk_MK/productbatch.lang +++ b/htdocs/langs/mk_MK/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang index 3a29639b12b..3a18cda69e7 100644 --- a/htdocs/langs/mk_MK/products.lang +++ b/htdocs/langs/mk_MK/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang index b3c150d1687..0a12f4c64b7 100644 --- a/htdocs/langs/mk_MK/projects.lang +++ b/htdocs/langs/mk_MK/projects.lang @@ -8,8 +8,10 @@ SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). ProjectsArea=Projects area @@ -29,6 +31,8 @@ NoProject=No project defined or owned NbOpenTasks=Nb of opened tasks NbOfProjects=Nb of projects TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project -ListTripAssociatedProject=List of trips and expenses associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/mk_MK/salaries.lang b/htdocs/langs/mk_MK/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/mk_MK/salaries.lang +++ b/htdocs/langs/mk_MK/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang index 794c9019c86..b1ff55f71c1 100644 --- a/htdocs/langs/mk_MK/sendings.lang +++ b/htdocs/langs/mk_MK/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qty ordered QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order DateSending=Date sending order DateSendingShort=Date sending order diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang index 9de2e5a4dbe..29706d17615 100644 --- a/htdocs/langs/mk_MK/stocks.lang +++ b/htdocs/langs/mk_MK/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang index 7b4d4acb244..baf573c66ac 100644 --- a/htdocs/langs/mk_MK/suppliers.lang +++ b/htdocs/langs/mk_MK/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -Supplier=Supplier AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Approve this order ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Denying this order +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? AddCustomerOrder=Create customer order diff --git a/htdocs/langs/mk_MK/trips.lang b/htdocs/langs/mk_MK/trips.lang index 4b0501a8346..ba36fc9b07b 100644 --- a/htdocs/langs/mk_MK/trips.lang +++ b/htdocs/langs/mk_MK/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Add trip -ListOfTrips=List of trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List of fees -NewTrip=New trip +NewTrip=New expense report CompanyVisited=Company/foundation visited Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? -TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang index 238fc3708dd..a094028679b 100644 --- a/htdocs/langs/nb_NO/admin.lang +++ b/htdocs/langs/nb_NO/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Eksperimentell VersionDevelopment=Utviklingsversjon VersionUnknown=Ukjent VersionRecommanded=Anbefalt +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Økt ID SessionSaveHandler=Handler for å lagre sessions SessionSavePath=Lagring økt lokalisering @@ -46,7 +51,7 @@ ErrorDecimalLargerThanAreForbidden=Feil: Presisjon over %s støttes ikke. DictionarySetup=Dictionary setup Dictionary=Dictionaries Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years +Fiscalyear=Regnskapsår ErrorReservedTypeSystemSystemAuto=Value 'system' og 'systemauto' for type er reservert. Du kan bruke 'user' som verdi å legge til din egen oppføring ErrorCodeCantContainZero=Koden kan ikke inneholde verdien 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -80,7 +85,7 @@ NextValue=Neste verdi NextValueForInvoices=Neste verdi (fakturaer) NextValueForCreditNotes=Neste verdi (kreditnotaer) NextValueForDeposit=Next value (deposit) -NextValueForReplacements=Next value (replacements) +NextValueForReplacements=Neste verdi (erstatninger) MustBeLowerThanPHPLimit=OBS: PHP begrenser hver filopplastning til %s %s, uansett hva som er angitt her NoMaxSizeByPHPLimit=OBS: Det er ikke satt noen øvre grense i PHP på denne serveren MaxSizeForUploadedFiles=Maksimal filstørrelse for opplasting av filer (0 for å ikke tillate opplasting) @@ -493,10 +498,16 @@ Module600Name=Varselmeldinger Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donasjoner Module700Desc=Behandling av donasjoner +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantisintegrasjon Module1400Name=Regnskapsekspert Module1400Desc=Behandling av regnskapssopplysninger for eksperter (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategorier Module1780Desc=Behandling av kategorier (varer, leverandører og kunder) Module2000Name=Fckeditor @@ -522,7 +533,7 @@ Module3100Name=Skype Module3100Desc=Add a Skype button into card of adherents / third parties / contacts Module5000Name=Multi-selskap Module5000Desc=Lar deg administrere flere selskaper -Module6000Name=Workflow +Module6000Name=Arbeidsflyt Module6000Desc=Workflow management Module20000Name=Leave Requests management Module20000Desc=Declare and follow employees leaves requests @@ -631,7 +642,7 @@ Permission181=Vise leverandøreorde Permission182=Lage/endre leverandørordre Permission183=Godkjenne leverandørordre Permission184=Bekrefte leverandørerordre -Permission185=Bestille leverandørordre +Permission185=Order or cancel supplier orders Permission186=Motta leverandørordre Permission187=Lukke leverandørordre Permission188=Avbryte leverandørordre @@ -711,6 +722,13 @@ Permission538=Eksporter tjenester Permission701=Vise donasjoner Permission702=Lage/endre donasjoner Permission703=Slette donasjoner +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Vise beholdning Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Passord for å bruke proxy-server DefineHereComplementaryAttributes=Definer her alle atributes, ikke allerede er tilgjengelig som standard, og at du ønsker å bli støttet for %s. ExtraFields=Komplementære attributter ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Komplementære attributter (thirdparty) ExtraFieldsContacts=Komplementære attributter (kontakt / adresse) ExtraFieldsMember=Komplementære attributter (medlem) @@ -1059,8 +1079,8 @@ SearchOptim=Search optimization YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response. BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance. BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari. -XDebugInstalled=XDebug is loaded. -XCacheInstalled=XCache is loaded. +XDebugInstalled=XDebug er lastet +XCacheInstalled=XCache er lastet AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp". FieldEdition=Edition of field %s FixTZ=TimeZone fix @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=En produkt/tjeneste med med null i kvantum blir betrak FreeLegalTextOnProposal=Fritekst på tilbud WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Innstillinger for ordre OrdersNumberingModules=Nummereringsmodul for ordre @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Kommandolinjeverktøy for generering av strekkode (brukes av phpbarcode til noen strekkodetyper) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Kassekonto som skal brukes til kontantsalg CashDeskBankAccountForCheque= Konto som skal brukes til å motta utbetalinger via sjekk CashDeskBankAccountForCB= Konto som skal brukes til å motta kontant betaling med kredittkort -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Legg modul oppsett @@ -1540,7 +1568,7 @@ TestGeoIPResult=Test av en konvertering IP -> landet ProjectsNumberingModules=Prosjekter nummerering modulen ProjectsSetup=Prosjekt modul oppsett ProjectsModelModule=Prosjektets rapport dokument modellen -TasksNumberingModules=Tasks numbering module +TasksNumberingModules=Modul for oppgavenummerering TaskModelModule=Tasks reports document model ##### ECM (GED) ##### ECMSetup = GED Setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang index 33d73a70db1..dfddfc2b3e6 100644 --- a/htdocs/langs/nb_NO/agenda.lang +++ b/htdocs/langs/nb_NO/agenda.lang @@ -58,9 +58,9 @@ OrderSentByEMail=Kundeordrer %s på e-post InvoiceSentByEMail=Faktura %s på e-post SupplierOrderSentByEMail=Leverandør bestill %s på e-post SupplierInvoiceSentByEMail=Leverandørfaktura %s på e-post -ShippingSentByEMail=Shipment %s sent by EMail -ShippingValidated= Shipment %s validated -InterventionSentByEMail=Intervention %s sent by EMail +ShippingSentByEMail=Forsendelse %s sendt på epost +ShippingValidated= Forsendelse %s godkjent +InterventionSentByEMail=Intervensjon %s sendt på epost NewCompanyToDolibarr= Tredjepart opprettet DateActionPlannedStart= Planlagt startdato DateActionPlannedEnd= Planlagt sluttdato diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang index 6c09ee45ac6..754164a0f69 100644 --- a/htdocs/langs/nb_NO/banks.lang +++ b/htdocs/langs/nb_NO/banks.lang @@ -8,7 +8,7 @@ FinancialAccount=Hovedbokskonto FinancialAccounts=Hovebokskonti BankAccount=Bankkonto BankAccounts=Bankkonti -ShowAccount=Show Account +ShowAccount=Vis konto AccountRef=Kontonummer hovedbokskonto AccountLabel=Kontonavn hovedbokskonto CashAccount=Kassekonto @@ -33,7 +33,11 @@ AllTime=Fra start Reconciliation=Bankavstemming RIB=Bankkontonummer IBAN=IBAN-nummer +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT-nummer +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Åpne ordre StandingOrder=Åpne ordre Withdrawals=Uttak @@ -148,7 +152,7 @@ BackToAccount=Tilbake til kontoen ShowAllAccounts=Vis for alle kontoer FutureTransaction=Transaksjon i Futur. Ingen måte å forsone. SelectChequeTransactionAndGenerate=Velg / filter sjekker for å inkludere inn sjekken innskudd kvitteringen og klikk på "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang index 69715443816..db2883bb788 100644 --- a/htdocs/langs/nb_NO/bills.lang +++ b/htdocs/langs/nb_NO/bills.lang @@ -1,16 +1,16 @@ # Dolibarr language file - Source file is en_US - bills Bill=Faktura Bills=Fakturaer -BillsCustomers=Customers invoices -BillsCustomer=Customers invoice -BillsSuppliers=Suppliers invoices -BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomers=Kundens fakturaer +BillsCustomer=Kundens faktura +BillsSuppliers=Leverandørens fakturaer +BillsCustomersUnpaid=Ubetalte kundefakturaer BillsCustomersUnpaidForCompany=Ubetalte kundefakturaer for %s BillsSuppliersUnpaid=Ubetalte leverandørfakturaer BillsSuppliersUnpaidForCompany=Ubetalt leverandørens fakturaer for %s BillsLate=Sene betalinger -BillsStatistics=Customers invoices statistics -BillsStatisticsSuppliers=Suppliers invoices statistics +BillsStatistics=Kundens fakturastatistikk +BillsStatisticsSuppliers=Leverandørens fakturastatistikk DisabledBecauseNotErasable=Deaktivert fordi kan ikke slettes InvoiceStandard=Standardfaktura InvoiceStandardAsk=Standardfaktura @@ -66,12 +66,12 @@ ConfirmConvertToReduc=Ønsker du å konvertere denne kreditnotaen til absolutt r SupplierPayments=Leverandørbetalinger ReceivedPayments=Mottatte betalinger ReceivedCustomersPayments=Betalinger mottatt fra kunder -PayedSuppliersPayments=Payments payed to suppliers +PayedSuppliersPayments=Betalinger til leverandører ReceivedCustomersPaymentsToValid=Mottatte kundebetalinger som trenger godkjenning PaymentsReportsForYear=Betalingsrapport for %s PaymentsReports=Betalingsrapporter PaymentsAlreadyDone=Betalinger allerede utført -PaymentsBackAlreadyDone=Payments back already done +PaymentsBackAlreadyDone=Tilbakebetalinger allerede utført PaymentRule=Betalingsregel PaymentMode=Betalingsmåte PaymentConditions=Betalingsbetingelser @@ -87,7 +87,7 @@ ClassifyCanceled=Merk 'Tapsført' ClassifyClosed=Merk 'Lukket' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Lag faktura -AddBill=Create invoice or credit note +AddBill=Legg til faktura eller kreditnota AddToDraftInvoices=Add to draft invoice DeleteBill=Slett faktura SearchACustomerInvoice=Finn kundefaktura @@ -99,7 +99,7 @@ DoPaymentBack=Utfør tilbakebetaling ConvertToReduc=Konverter til framtidig rabatt EnterPaymentReceivedFromCustomer=Legg inn betaling mottatt fra kunde EnterPaymentDueToCustomer=Lag purring til kunde -DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero +DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null Amount=Beløp PriceBase=Prisgrunnlag BillStatus=Fakturastatus @@ -186,7 +186,7 @@ ShowInvoiceDeposit=Vis depositum faktura ShowPayment=Vis betaling File=Fil AlreadyPaid=Allerede betalt -AlreadyPaidBack=Already paid back +AlreadyPaidBack=Allerede tilbakebetalt AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditt notater og innskudd) Abandoned=Tapsført RemainderToPay=Remaining unpaid @@ -202,7 +202,7 @@ StandingOrders=Utestående ordre StandingOrder=Utestående ordre NoDraftBills=Ingen fakturakladder NoOtherDraftBills=Ingen andre fakturakladder -NoDraftInvoices=No draft invoices +NoDraftInvoices=Ingen fakturakladder RefBill=Fakturareferanse ToBill=Til fakturering RemainderToBill=Resterende til fakturering diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang index ec23fa05e30..91a6b66cb78 100644 --- a/htdocs/langs/nb_NO/boxes.lang +++ b/htdocs/langs/nb_NO/boxes.lang @@ -1,63 +1,67 @@ # Dolibarr language file - Source file is en_US - boxes BoxLastRssInfos=Rss informasjon BoxLastProducts=Siste produkter/tjenester -# BoxProductsAlertStock=Products in stock alert +BoxProductsAlertStock=Varsel om produkter på lager BoxLastProductsInContract=Siste kontraktsinngåtte produkter/tjenester BoxLastSupplierBills=Siste leverandørfakturaer BoxLastCustomerBills=Siste kundefakturaer BoxOldestUnpaidCustomerBills=Eldste ubetalte kundefakturaer BoxOldestUnpaidSupplierBills=Eldste ubetalte leverandørfakturaer -BoxLastProposals=Siste tilbuder -BoxLastProspects=Siste prospekter -BoxLastCustomers=Siste kunder -BoxLastSuppliers=Siste leverandører +BoxLastProposals=Siste tilbud +BoxLastProspects=Siste endrede prospekter +BoxLastCustomers=Siste endrede kunder +BoxLastSuppliers=Siste endrede leverandører BoxLastCustomerOrders=Siste kundeordre +BoxLastValidatedCustomerOrders=Siste godkjente kundeordrer BoxLastBooks=Siste bøker BoxLastActions=Siste handlinger BoxLastContracts=Siste kontrakter BoxLastContacts=Siste kontakter / adresser BoxLastMembers=Siste medlemmer -# BoxFicheInter=Last interventions -# BoxCurrentAccounts=Opened accounts balance +BoxFicheInter=Siste intervensjoner +BoxCurrentAccounts=Åpnet kontobalanse BoxSalesTurnover=Omsetning -BoxTotalUnpaidCustomerBills=Totalt utestående kunder -BoxTotalUnpaidSuppliersBills=Totalt utestående leverandører +BoxTotalUnpaidCustomerBills=Totalt utestående kundefakturaer +BoxTotalUnpaidSuppliersBills=Totalt utestående leverandørfakturaer BoxTitleLastBooks=Siste %s registrerte bøker BoxTitleNbOfCustomers=Antall kunder BoxTitleLastRssInfos=Siste %s nyheter fra %s BoxTitleLastProducts=Siste %s endrede produkter/tjenester -# BoxTitleProductsAlertStock=Products in stock alert -BoxTitleLastCustomerOrders=Siste %s endrede kundeordre +BoxTitleProductsAlertStock=Varsel om produkter på lager +BoxTitleLastCustomerOrders=Siste %s kundeordre +BoxTitleLastModifiedCustomerOrders=Siste %s endrede kundeordrer BoxTitleLastSuppliers=Siste %s registrerte leverandører BoxTitleLastCustomers=Siste %s registrerte kunder -BoxTitleLastModifiedSuppliers=Sist endret %s leverandører -BoxTitleLastModifiedCustomers=Sist endret %s kunder +BoxTitleLastModifiedSuppliers=Sist endrede %s leverandører +BoxTitleLastModifiedCustomers=Sist endrede %s kunder BoxTitleLastCustomersOrProspects=Siste %s registrerte kunder eller prospekter BoxTitleLastPropals=Siste %s registrerte tilbud +BoxTitleLastModifiedPropals=Siste %s endrede tilbud BoxTitleLastCustomerBills=Siste %s kundefakturaer +BoxTitleLastModifiedCustomerBills=Siste %s endrede kundefakturaer BoxTitleLastSupplierBills=Siste %s leverandørfakturaer -BoxTitleLastProspects=Siste %s registrerte prospekter -BoxTitleLastModifiedProspects=Sist %s endret utsiktene -BoxTitleLastProductsInContract=Siste %s produkter/tjenerster i kontraketer -BoxTitleLastModifiedMembers=Siste %s endret medlemmer -# BoxTitleLastFicheInter=Last %s modified intervention +BoxTitleLastModifiedSupplierBills=Siste %s endrede leverandørfakturaer +BoxTitleLastModifiedProspects=Sist %s endrede prospekter +BoxTitleLastProductsInContract=Siste %s produkter/tjenerster i kontrakter +BoxTitleLastModifiedMembers=Siste %s endrede medlemmer +BoxTitleLastFicheInter=Siste %s endrede intervensjon BoxTitleOldestUnpaidCustomerBills=Eldste %s ubetalte kundefakturaer BoxTitleOldestUnpaidSupplierBills=Eldste %s ubetalte leverandørfakturaer -# BoxTitleCurrentAccounts=Opened account's balances +BoxTitleCurrentAccounts=Åpnede kontobalanser BoxTitleSalesTurnover=Omsetning BoxTitleTotalUnpaidCustomerBills=Ubetalte kundefakturaer BoxTitleTotalUnpaidSuppliersBills=Ubetalte leverandørfakturaer -BoxTitleLastModifiedContacts=Siste %s endret kontakter / adresser +BoxTitleLastModifiedContacts=Siste %s endrede kontakter/adresser BoxMyLastBookmarks=Mine siste %s bokmerker BoxOldestExpiredServices=Eldste aktive utløpte tjenester BoxLastExpiredServices=Siste %s eldste kontakter med aktive utløpte tjenester BoxTitleLastActionsToDo=Siste %s åpne handlinger BoxTitleLastContracts=Siste %s kontrakter -BoxTitleLastModifiedDonations=Siste %s endret donasjoner -BoxTitleLastModifiedExpenses=Siste %s endret utgifter -# BoxGlobalActivity=Global activity (invoices, proposals, orders) +BoxTitleLastModifiedDonations=Siste %s endrede donasjoner +BoxTitleLastModifiedExpenses=Siste %s endrede utgifter +BoxGlobalActivity=Global aktivitet (fakturaer, tilbud, ordrer) FailedToRefreshDataInfoNotUpToDate=Klarte ikke å oppdatere RSS-strøm. Siste vellykkede oppdatering: %s -LastRefreshDate=Siste oppdatering dato +LastRefreshDate=Siste oppdateringsdato NoRecordedBookmarks=Ingen bokmerker definert. Trykk her for å legge til bokmerker. ClickToAdd=Klikk her for å legge til. NoRecordedCustomers=Ingen registrerte kunder @@ -69,23 +73,24 @@ NoRecordedInvoices=Ingen registrerte kundefakturaer NoUnpaidCustomerBills=Ingen ubetalte kundefakturaer NoRecordedSupplierInvoices=Ingen registrte leverandørfakturaer NoUnpaidSupplierBills=Ingen ubetalte leverandørfakturaer -NoModifiedSupplierBills=Ingen registrert leverandørens faktura -NoRecordedProducts=Ingen registrert produkter / tjenester -NoRecordedProspects=Ingen registrert utsikter -NoContractedProducts=Ingen produkter / tjenester innleide -NoRecordedContracts=Ingen registrert kontrakter -# NoRecordedInterventions=No recorded interventions -# BoxLatestSupplierOrders=Latest supplier orders -# BoxTitleLatestSupplierOrders=%s latest supplier orders -# NoSupplierOrder=No recorded supplier order -# BoxCustomersInvoicesPerMonth=Customer invoices per month -# BoxSuppliersInvoicesPerMonth=Supplier invoices per month -# BoxCustomersOrdersPerMonth=Customer orders per month -# BoxSuppliersOrdersPerMonth=Supplier orders per month -# BoxProposalsPerMonth=Proposals per month -# NoTooLowStockProducts=No product under the low stock limit -# BoxProductDistribution=Products/Services distribution -# BoxProductDistributionFor=Distribution of %s for %s +NoModifiedSupplierBills=Ingen registrerte leverandørfakturaer +NoRecordedProducts=Ingen registrerte produkter/tjenester +NoRecordedProspects=Ingen registrerte prospekter +NoContractedProducts=Ingen innleide produkter/tjenester +NoRecordedContracts=Ingen registrerte kontrakter +NoRecordedInterventions=Ingen registrerte intervensjoner +BoxLatestSupplierOrders=Siste leverandørordrer +BoxTitleLatestSupplierOrders=Siste %s leverandørordrer +BoxTitleLatestModifiedSupplierOrders=Siste %s endrede leverandørordrer +NoSupplierOrder=Ingen registrerte leveradørordrer +BoxCustomersInvoicesPerMonth=Kundefakturaer pr. mnd. +BoxSuppliersInvoicesPerMonth=Leverandørfakturaer pr. mnd. +BoxCustomersOrdersPerMonth=Kundeordrer pr. mnd. +BoxSuppliersOrdersPerMonth=Leverandørordrer pr. mnd. +BoxProposalsPerMonth=Tilbud pr. mnd. +NoTooLowStockProducts=Ingen produkter med for lav beholdning +BoxProductDistribution=Fordeling produkter/tjenester +BoxProductDistributionFor=Fordeling av %s for %s ForCustomersInvoices=Kundens fakturaer -# ForCustomersOrders=Customers orders +ForCustomersOrders=Kundeordrer ForProposals=Tilbud diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang index 0e0b168257c..c01ee45a2c7 100644 --- a/htdocs/langs/nb_NO/cashdesk.lang +++ b/htdocs/langs/nb_NO/cashdesk.lang @@ -1,40 +1,40 @@ # Language file - Source file is en_US - cashdesk -CashDeskMenu=Point of sale -CashDesk=Point of sale -CashDesks=Point of salg +CashDeskMenu=Utsalgssted +CashDesk=Utsalgssted +CashDesks=Utsalgssted CashDeskBank=Bankkonto CashDeskBankCash=Bankkonto (kontanter) CashDeskBankCB=Bankkonto (kort) CashDeskBankCheque=Bankkonto (sjekk) -CashDeskWarehouse=Warehouse -CashdeskShowServices=Selge tjenester +CashDeskWarehouse=Varehus +CashdeskShowServices=Selgende tjenester CashDeskProducts=Produkter CashDeskStock=Lager CashDeskOn=på CashDeskThirdParty=Tredjepart -# CashdeskDashboard=Point of sale access +CashdeskDashboard=Adgang utsalgssted ShoppingCart=Handlekurv -NewSell=Ny selger -BackOffice=Tilbake kontor -AddThisArticle=Legg denne artikkelen -RestartSelling=Gå tilbake på selger -SellFinished=Selg ferdig +NewSell=Nytt salg +BackOffice=Administrasjonen +AddThisArticle=Legg til denne artikkelen +RestartSelling=Gå tilbake på salg +SellFinished=Salg avsluttet PrintTicket=Skriv billett -NoProductFound=Ingen artikkelen funnet -ProductFound=Produktet funnet +NoProductFound=Ingen artikler funnet +ProductFound=produktet funnet ProductsFound=produkter funnet -NoArticle=Ingen artikkelen +NoArticle=Ingen artikkel Identification=Identifisering Article=Artikkel Difference=Forskjell TotalTicket=Totalt billett -NoVAT=Ingen moms for dette salget -Change=Overflødig mottatt +NoVAT=Ingen mva for dette salget +Change=For mye mottatt CalTip=Klikk for å vise kalenderen -CashDeskSetupStock=Du spør for å redusere beholdningen faktura etableringen, men lager for dette er ikke ble definert
Endre lager modul oppsett, eller velge en lagerbygning +CashDeskSetupStock=Forespørsel om å redusere varebeholdning ved opprettelse av faktura uten at varehus er definert
Endre lagermodul oppsettet, eller velg et annet varehus BankToPay=Debiteringskonto ShowCompany=Vis selskap ShowStock=Vis lager DeleteArticle=Klikk for å fjerne denne artikkelen -# FilterRefOrLabelOrBC=Search (Ref/Label) -# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock. +FilterRefOrLabelOrBC=Søk (Referanse/Etikett) +UserNeedPermissionToEditStockToUsePos=Forespørsel om å redusere varebeholdning ved opprettelse av faktura. POS bruker må ha adgang til å endre varebeholdning diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang index 2458dff2fb9..d03d3f0aa7b 100644 --- a/htdocs/langs/nb_NO/categories.lang +++ b/htdocs/langs/nb_NO/categories.lang @@ -15,12 +15,12 @@ ProductsCategoriesArea=Område for kategorier : produkter/tjenester SuppliersCategoriesArea=Område for kategorier : Leverandører CustomersCategoriesArea=Område for kategorier : Kunder ThirdPartyCategoriesArea=Område for kategorier : Tredjeparter -MembersCategoriesArea=Medlemmer kategorier området +MembersCategoriesArea=Medlemmers kategoriområder ContactsCategoriesArea=Kontaktkategorier MainCats=Hovedkategorier SubCats=Underkategorier CatStatistics=Statistikk -CatList=Oversikt over kategorier +CatList=Liste over kategorier AllCats=Alle kategorier ViewCat=Vis kategori NewCat=Legg til kategori @@ -39,7 +39,7 @@ ErrSameCatSelected=Du har valgt samme kategori flere ganger ErrForgotCat=Du glemte å velge kategorien ErrForgotField=Du glemte feltene ErrCatAlreadyExists=Dette navnet er allerede i bruk -AddProductToCat=Legg dette produktet til en kategori? +AddProductToCat=Legg til dette produktet i en kategori? ImpossibleAddCat=Umulig å legge til kategorien ImpossibleAssociateCategory=Umulig å knytte kategorien til WasAddedSuccessfully=%s ble lagt til. @@ -49,7 +49,7 @@ ProductIsInCategories=Dette produktet/tjenesten hører til følgende kategorier SupplierIsInCategories=Denne tredjeparten hører til følgende leverandørkategorier CompanyIsInCustomersCategories=Denne tredjeparten hører til følgende kunder/prospektkategorier CompanyIsInSuppliersCategories=Denne tredjeparten hører til følgende leverandørkategorier -MemberIsInCategories=Dette medlemmet eier til følgende medlemmer kategorier +MemberIsInCategories=Dette medlemmet hører til følgende medlemmeskategorier ContactIsInCategories=Denne kontakten hører til følgende kontaktkategorier ProductHasNoCategory=Dette produktet/tjenesten er ikke i noen kategorier SupplierHasNoCategory=Denne leverandøren er ikke i noen kategorier @@ -59,10 +59,10 @@ ContactHasNoCategory=Denne kontakten er ikke i noen kategorier ClassifyInCategory=Klassifiser i kategori NoneCategory=Ingen NotCategorized=Uten kategori -CategoryExistsAtSameLevel=Denne kategorien eksisterer allerede på samme sted -ReturnInProduct=Tilbake til produkt/tjeneste-kort +CategoryExistsAtSameLevel=Denne kategorien finnes allerede med denne referansen +ReturnInProduct=Tilbake til produkt-/tjenestekort ReturnInSupplier=Tilbake til leverandørkort -ReturnInCompany=Tilbake til kunde/prospekt-kort +ReturnInCompany=Tilbake til kunde-/prospektkort ContentsVisibleByAll=Inneholdet vil være synlig for alle ContentsVisibleByAllShort=Innhold synlig for alle ContentsNotVisibleByAllShort=Innhold ikke synlig for alle @@ -70,17 +70,17 @@ CategoriesTree=Kategori-tre DeleteCategory=Slett kategori ConfirmDeleteCategory=Er du sikker på at du vil slette denne kategorien? RemoveFromCategory=Fjern lenke med kategori -RemoveFromCategoryConfirm=Er di sikker på at du vil fjerne lenken mellom transaksjonen og kategorien? +RemoveFromCategoryConfirm=Er du sikker på at du vil fjerne lenken mellom transaksjonen og kategorien? NoCategoriesDefined=Ingen kategori definert SuppliersCategoryShort=Leverandøkategori CustomersCategoryShort=Kundekategori ProductsCategoryShort=Produktkategori -MembersCategoryShort=Medlemmer kategori +MembersCategoryShort=Medlemskategori SuppliersCategoriesShort=Leverandøkategorier CustomersCategoriesShort=Kundekategorier -CustomersProspectsCategoriesShort=Kunde/prospektkategorier +CustomersProspectsCategoriesShort=Kunde-/prospektkategorier ProductsCategoriesShort=Produktkategorier -MembersCategoriesShort=Medlemmer kategorier +MembersCategoriesShort=Medlemskategorier ContactCategoriesShort=Kontaktkategorier ThisCategoryHasNoProduct=Denne kategorien inneholder ingen produkter. ThisCategoryHasNoSupplier=Denne kategorien inneholder ingen leverandører. @@ -92,21 +92,21 @@ AssignedToTheCustomer=Knyttet til kunden InternalCategory=Intern kategori CategoryContents=Innhold i kategori CategId=Kategori-ID -CatSupList=Liste av leverandør kategorier -CatCusList=Liste over kunde / prospektet kategorier -CatProdList=Liste over produkter kategorier -CatMemberList=Liste over medlemmer kategorier -CatContactList=Liste over kontakt kategorier og kontakt +CatSupList=Liste av leverandørkategorier +CatCusList=Liste over kunde-/prospektkategorier +CatProdList=Liste over produktkategorier +CatMemberList=Liste over medlemskategorier +CatContactList=Liste over kontaktkategorier og kontakt CatSupLinks=Koblinger mellom leverandører og kategorier -CatCusLinks=Koblinger mellom kunder / prospekter og kategorier -CatProdLinks=Koblinger mellom produkter / tjenester og kategorier +CatCusLinks=Koblinger mellom kunder/prospekter og kategorier +CatProdLinks=Koblinger mellom produkter/tjenester og kategorier CatMemberLinks=Koblinger mellom medlemmer og kategorier DeleteFromCat=Fjern fra kategori DeletePicture=Slette bilde ConfirmDeletePicture=Bekreft bildesletting? ExtraFieldsCategories=Komplementære attributter CategoriesSetup=Kategori-oppsett -CategorieRecursiv=Link med overordnet kategori automatisk +CategorieRecursiv=Link automatisk med overordnet kategori CategorieRecursivHelp=Hvis aktivert, vil produktet også knyttes til overordnet kategori når du legger inn en underkategori AddProductServiceIntoCategory=Legg til følgende produkt/tjeneste ShowCategory=Vis kategori diff --git a/htdocs/langs/nb_NO/commercial.lang b/htdocs/langs/nb_NO/commercial.lang index 92b090a74bf..5ce686e3b3c 100644 --- a/htdocs/langs/nb_NO/commercial.lang +++ b/htdocs/langs/nb_NO/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospekt Prospects=Prospekter DeleteAction=Slett handling/oppgave NewAction=Ny handling/oppgave -AddAction=Legg til handling/oppgave -AddAnAction=Legg til en handling/oppgave -AddActionRendezVous=Legg til møte +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Er du sikker på at du vil slette denne oppgaven? CardAction=Handlingskort @@ -44,8 +44,8 @@ DoneActions=Utførte handlinger DoneActionsFor=Utførte handlinger for %s ToDoActions=Ikke fullførte handlinger ToDoActionsFor=Ikke fullførte handlinger for %s -SendPropalRef=Send tilbud %s -SendOrderRef=Send ordre %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Ikke aktuelt StatusActionToDo=To Do StatusActionDone=Utført @@ -62,7 +62,7 @@ LastProspectContactDone=Kontakt utført DateActionPlanned=Dato for planlagt handling DateActionDone=Dato for utført handling ActionAskedBy=Handling ønsket av -ActionAffectedTo=Handling knyttet til +ActionAffectedTo=Event assigned to ActionDoneBy=Handling utført av ActionUserAsk=Registrert av ErrorStatusCantBeZeroIfStarted=Hvis feltet 'Dato utført' er fylt ut er handlingen startet (eller utført), defor kan ikke feltet 'Status' være 0%%. diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang index 02ad3315d63..a111e8f1b6a 100644 --- a/htdocs/langs/nb_NO/companies.lang +++ b/htdocs/langs/nb_NO/companies.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - companies ErrorCompanyNameAlreadyExists=Firmanavnet %s finnes allerede. Velg et annet! -ErrorPrefixAlreadyExists=Prefix %s finnes allered. Velg et annet! +ErrorPrefixAlreadyExists=Prefiks %s finnes allerede. Velg et annet! ErrorSetACountryFirst=Angi land først SelectThirdParty=Velg en tredjepart DeleteThirdParty=Slett en tredjepart @@ -25,13 +25,13 @@ IdThirdParty=Tredjepart-ID IdCompany=Firma-ID IdContact=Kontaktperson-ID Contacts=Kontakter -ThirdPartyContacts=Tredjepart kontakter -ThirdPartyContact=Tredjepart kontakt +ThirdPartyContacts=Tredjepartskontakter +ThirdPartyContact=Tredjepartskontakt StatusContactValidated=Status for kontakt Company=Bedrift CompanyName=Firmanavn Companies=Bedrifter -CountryIsInEEC=Landet er en del av Det europeiske fellesskap +CountryIsInEEC=Landet er en del av det europeiske økonomiske fellesskap ThirdPartyName=Tredjepart navn ThirdParty=Tredjepart ThirdParties=Tredjeparter @@ -40,7 +40,7 @@ ThirdPartyProspects=Prospekter ThirdPartyProspectsStats=Prospekter ThirdPartyCustomers=Kunder ThirdPartyCustomersStats=Kunder -ThirdPartyCustomersWithIdProf12=Kunder ned %s eller %s +ThirdPartyCustomersWithIdProf12=Kunder med %s eller %s ThirdPartySuppliers=Leverandører ThirdPartyType=Type tredjepart Company/Fundation=Firma/Organisasjon @@ -51,7 +51,7 @@ Subsidiary=Datterselskap Subsidiaries=Datterselskaper NoSubsidiary=Ingen datterselskap ReportByCustomers=Rapporter pr kunde -ReportByQuarter=Rapporter pr kvartal +ReportByQuarter=Rapporter pr sats CivilityCode=Civility code (ikke i Norge) RegisteredOffice=Registered office (ikke i Norge) Name=Navn @@ -64,7 +64,7 @@ Address=Adresse State=Fylke(delstat) Region=Region Country=Land -CountryCode=Landkode +CountryCode=Landskode CountryId=Land id Phone=Telefon Skype=Skype @@ -73,13 +73,13 @@ Chat=Chat PhonePro=Tlf. arbeid PhonePerso=Tlf. privat PhoneMobile=Tlf. mobil -No_Email=Ikke send masse-epost-utsendelser -Fax=Fax +No_Email=Ikke send masse-epost +Fax=Faks Zip=Postnummer Town=Poststed Web=Web Poste= Posisjon -DefaultLang=Språk som standard +DefaultLang=Standardspråk VATIsUsed=MVA skal beregnes VATIsNotUsed=MVA skal ikke beregnes CopyAddressFromSoc=Fyll adresse med tredjeparts adresse @@ -113,8 +113,8 @@ ProfId3=Professional ID 3 ProfId4=Professional ID 4 ProfId5=Profesjonell ID 5 ProfId6=Profesjonell ID 6 -ProfId1AR=Prof Id 1 (CUIL) -ProfId2AR=Prof ID 2 (inntekter på brutes) +ProfId1AR=Prof Id 1 (CUIT/CUIL) +ProfId2AR=Prof ID 2 (bruttoinntekter) ProfId3AR=- ProfId4AR=- ProfId5AR=- @@ -125,7 +125,7 @@ ProfId3AU=- ProfId4AU=- ProfId5AU=- ProfId6AU=- -ProfId1BE=Prof Id 1 (Professionnel number) +ProfId1BE=Prof Id 1 (Profesjonelt nummer) ProfId2BE=- ProfId3BE=- ProfId4BE=- @@ -139,7 +139,7 @@ ProfId4BR=CPF #ProfId6BR=INSS ProfId1CH=- ProfId2CH=- -ProfId3CH=Prof Id 1 (Federal number) +ProfId3CH=Prof Id 1 (Føderalt nummer) ProfId4CH=Prof Id 2 (Commercial Record number) ProfId5CH=- ProfId6CH=- @@ -169,11 +169,11 @@ ProfId5ES=- ProfId6ES=- ProfId1FR=Prof Id 1 (SIREN) ProfId2FR=Prof Id 2 (SIRET) -ProfId3FR=Prof Id 3 (NAF, old APE) +ProfId3FR=Prof Id 3 (NAF, gammel APE) ProfId4FR=Prof Id 4 (RCS/RM) ProfId5FR=Prof Id 5 ProfId6FR=- -ProfId1GB=Prof Id 1 (Registration Number) +ProfId1GB=Prof Id 1 (Registreringsnummer) ProfId2GB=- ProfId3GB=Prof Id 3 (SIC) ProfId4GB=- @@ -186,31 +186,31 @@ ProfId4HN=- ProfId5HN=- ProfId6HN=- ProfId1IN=Prof Id 1 (TIN) -ProfId2IN=Prof ID 2 -ProfId3IN=Prof ID 3 +ProfId2IN=Prof ID 2 (PAN) +ProfId3IN=Prof ID 3 (SRVC TAX) ProfId4IN=Prof ID 4 ProfId5IN=Prof Id 5 ProfId6IN=- ProfId1MA=Id prof. 1 (RC) -ProfId2MA=Id prof. 2 (patente) +ProfId2MA=Id prof. 2 (patent) ProfId3MA=Id prof. 3 (IF) ProfId4MA=Id prof. 4 (CNSS) ProfId5MA=- ProfId6MA=- ProfId1MX=Prof Id 1 (RFC). ProfId2MX=Prof Id 2 (R.. P. IMSS) -ProfId3MX=Prof Id 3 (Profesional Charter) +ProfId3MX=Prof Id 3 (Profesjonell lisens) ProfId4MX=- ProfId5MX=- ProfId6MX=- ProfId1NL=KVK nummer ProfId2NL=- ProfId3NL=- -ProfId4NL=- +ProfId4NL=Burgerservicenummer (BSN) ProfId5NL=- ProfId6NL=- ProfId1PT=Prof Id 1 (NIPC) -ProfId2PT=Prof Id 2 (Social security number) +ProfId2PT=Prof Id 2 (Personnummer) ProfId3PT=Prof Id 3 (Commercial Record number) ProfId4PT=Prof Id 4 (Conservatory) ProfId5PT=- @@ -234,9 +234,9 @@ ProfId4RU=Prof Id 4 (OKPO) ProfId5RU=- ProfId6RU=- VATIntra=Organisasjonsnummer -VATIntraShort=Org.nr. -VATIntraVeryShort=ORG -VATIntraSyntaxIsValid=Gyldig syntax +VATIntraShort=Organisasjonsnummer +VATIntraVeryShort=MVA +VATIntraSyntaxIsValid=Gyldig syntaks VATIntraValueIsValid=Gyldig verdi ProspectCustomer=Prospekt/Kunde Prospect=Prospekt @@ -261,13 +261,13 @@ Supplier=Leverandør CompanyList=Firmaoversikt AddContact=Opprett kontakt AddContactAddress=Opprett kontakt/adresse -EditContact=Endre kontakt / adresse -EditContactAddress=Endre kontakt / adresse +EditContact=Endre kontakt +EditContactAddress=Endre kontakt/adresse Contact=Kontaktperson ContactsAddresses=Kontakter / Adresser NoContactDefinedForThirdParty=Ingen kontakt definert for denne tredjepart -NoContactDefined=Denne tredjeparten har ingen kontaktpersoner registrert -DefaultContact=Gjeldende kontakt +NoContactDefined=Ingen kontaktpersoner definert +DefaultContact=Standardkontakt AddCompany=Opprett firma AddThirdParty=Opprett tredjepart DeleteACompany=Slett et firma @@ -290,23 +290,23 @@ ListOfContacts=Oversikt over kontaktpersoner ListOfContactsAddresses=Liste over kontakter / adresser ListOfProspectsContacts=Oversikt over prospekters kontaktpersoner ListOfCustomersContacts=Oversikt over kunders kontaktpersoner -ListOfSuppliersContacts=Oversikt over leverandøeres kontaktpersoner +ListOfSuppliersContacts=Oversikt over leverandørkontakter ListOfCompanies=Oversikt over firmaer ListOfThirdParties=Oversikt over tredjeparter ShowCompany=Vis firma ShowContact=Vis kontaktperson ContactsAllShort=Alle (ingen filter) ContactType=Kontaktperson type -ContactForOrders=Relaterte ordre -ContactForProposals=Relaterte tilbud -ContactForContracts=Relaterte kontrakter -ContactForInvoices=Relaterte fakturaer +ContactForOrders=Ordrekontakt +ContactForProposals=Tilbudskontakt +ContactForContracts=Kontraktkontakt +ContactForInvoices=Fakturakontakt NoContactForAnyOrder=Kontaktpersonen er ikke tilknyttet noen ordre NoContactForAnyProposal=Kontaktpersonen er ikke tilknyttet noen tilbud NoContactForAnyContract=Kontaktpersonen er ikke tilknyttet noen kontrakt NoContactForAnyInvoice=Kontaktpersonen er ikke tilknyttet noen faktura NewContact=Ny kontaktperson -NewContactAddress=Ny kontakt / adresse +NewContactAddress=Ny kontakt/adresse LastContacts=Siste kontaktpersoner MyContacts=Mine kontaktpersoner Phones=Telefoner @@ -320,12 +320,12 @@ VATIntraCheckDesc=Lenken %s slår opp i den europeiske kontrolltjenesten VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do VATIntraCheckableOnEUSite=Slå opp i Intracomunnautary VAT på EU-kommisjonens nettsted VATIntraManualCheck=Du kan også sjekke manuelt på %s -ErrorVATCheckMS_UNAVAILABLE=Kontollrn er ikke tilgjengelig. Tjenesten er ikke tilgjengelig for landet (%s). +ErrorVATCheckMS_UNAVAILABLE=Sjekk er ikke tilgjengelig. Tjenesten er ikke tilgjengelig for landet (%s). NorProspectNorCustomer=Hverken prospekt eller kunde JuridicalStatus=Juridsk status Staff=Ansatte ProspectLevelShort=Potensiell -ProspectLevel=Potensiell prospekt +ProspectLevel=Prospektpotensiale ContactPrivate=Privat ContactPublic=Delt ContactVisibility=Synlighet @@ -348,29 +348,29 @@ TE_PRIVATE=Privatperson TE_OTHER=Annet StatusProspect-1=Kontaktes ikke StatusProspect0=Aldri kontaktet -StatusProspect1=Bør kontaktes +StatusProspect1=Skal kontaktes StatusProspect2=Kontakt pågår StatusProspect3=Kontakt utført ChangeDoNotContact=Endre status til 'Kontaktes ikke' ChangeNeverContacted=Endre status til 'Aldri kontaktet' -ChangeToContact=Endre status til 'Bør kontaktes' +ChangeToContact=Endre status til 'Skal kontaktes' ChangeContactInProcess=Endre status til 'Kontakt pågår' ChangeContactDone=Endre status til 'Kontakt utført' ProspectsByStatus=Prospekter etter status BillingContact=Fakturakontakt NbOfAttachedFiles=Antall vedlagte filer -AttachANewFile=Legg ved fil -NoRIB=Ingen konto registrert +AttachANewFile=Legg ved ny fil +NoRIB=Ingen bankkonto registrert NoParentCompany=Ingen ExportImport=Import-Eksport -ExportCardToFormat=Eksportkort til format +ExportCardToFormat=Eksporter kort til format ContactNotLinkedToCompany=Kontaktpersonen er ikke lenket til noen tredjepart DolibarrLogin=Dolibarr innlogging NoDolibarrAccess=Ingen tilgang til Dolibarr ExportDataset_company_1=Tredjeparter (Selskaper / stiftelser / fysiske personer) og egenskaper -ExportDataset_company_2=Kontaktpersoner med opplysninger -ImportDataset_company_1=Tredjeparter (Selskaper / stiftelser / fysiske personer) og egenskaper -ImportDataset_company_2=Kontakter / adresser (av tredjeparter eller ikke) og attributter +ExportDataset_company_2=Kontaktpersoner og egenskaper +ImportDataset_company_1=Tredjeparter (Selskaper/stiftelser/fysiske personer) og egenskaper +ImportDataset_company_2=Kontakter/adresser (av tredjeparter eller ikke) og attributter ImportDataset_company_3=Bankopplysninger PriceLevel=Prisnivå DeliveriesAddress=Leveringsadresser @@ -382,33 +382,33 @@ NewDeliveryAddress=Ny leveringsadresse AddDeliveryAddress=Opprett adresse AddAddress=Opprett adresse NoOtherDeliveryAddress=Ingen alternativ leveringsadresse lagt inn -SupplierCategory=Leverandør kategori +SupplierCategory=Leverandørkategori JuridicalStatus200=Uavhengig DeleteFile=Slett fil ConfirmDeleteFile=Er du sikker på at du vil slette denne filen? -AllocateCommercial=Tildelt til salg representant +AllocateCommercial=Tildelt til salgsrepresentant SelectCountry=Velg land SelectCompany=Velg tredjepart Organization=Organisasjon AutomaticallyGenerated=Automatisk opprettet FiscalYearInformation=Informasjon om regnskapsåret FiscalMonthStart=Første måned i regnskapsåret -YouMustCreateContactFirst=Du må opprette e-postmeldinger kontakter for tredjepart første for å kunne legge til e-post meldinger. +YouMustCreateContactFirst=Du må opprette e-postkontakter for tredjepart først, for å kunne legge til e-post meldinger. ListSuppliersShort=Liste over leverandører -ListProspectsShort=Liste av prospekter +ListProspectsShort=Liste over prospekter ListCustomersShort=Liste over kunder ThirdPartiesArea=Tredjepart og kontaktområde -LastModifiedThirdParties=Siste %s endret tredjeparter -UniqueThirdParties=Totalt unike tredjeparter -InActivity=Åpent +LastModifiedThirdParties=Siste %s endrede tredjeparter +UniqueThirdParties=Totalt antall unike tredjeparter +InActivity=Åpen ActivityCeased=Stengt -ActivityStateFilter=Aktivitet status +ActivityStateFilter=Aktivitetstatus ProductsIntoElements=Produktliste i %s CurrentOutstandingBill=Gjeldende utestående regning OutstandingBill=Max. utestående beløp OutstandingBillReached=Nådd maks. for utestående regning -MonkeyNumRefModelDesc=Tilbake numero med format %syymm-nnnn for kunden koden og %syymm-nnnn for leverandør koden der åå er året, er mm måned og nnnn er en sekvens uten pause og ingen retur til 0. -LeopardNumRefModelDesc=Kunde / leverandør-koden er gratis. Denne koden kan endres når som helst. +MonkeyNumRefModelDesc=Returnerer nummer med format %syymm-nnnn for kundekode og %syymm-nnnn for leverandørkode, der åå er året, er mm måned og nnnn er et løpenummer som starter på 0+1. +LeopardNumRefModelDesc=Fri kode. Denne koden kan endres når som helst. ManagingDirectors=(E) navn (CEO, direktør, president ...) SearchThirdparty=Søk etter tredjepart SearchContact=Søk etter kontakt diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang index e8fe7fe9637..e09b5e6c173 100644 --- a/htdocs/langs/nb_NO/contracts.lang +++ b/htdocs/langs/nb_NO/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Utløpt ServiceStatusClosed=Lukket ServicesLegend=Tjeneste legend Contracts=Kontrakter +ContractsAndLine=Contracts and line of contracts Contract=Kontrakt NoContracts=Ingen kontrakter MenuServices=Tjenester diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang index 933ec2647b4..e15b4232a60 100644 --- a/htdocs/langs/nb_NO/cron.lang +++ b/htdocs/langs/nb_NO/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang index 7fa9524b08f..7f06fb6e0fa 100644 --- a/htdocs/langs/nb_NO/errors.lang +++ b/htdocs/langs/nb_NO/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Kilde og målkonto må være forskjellig. ErrorBadThirdPartyName=Ugyldig verdi for tredjepartens navn ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Ugyldig syntaks for kundekode -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Kundekode påkrevet ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Kundekoden er allerede benyttet @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript må ikke deaktiveres å ha denne funksjo ErrorPasswordsMustMatch=Begge har skrevet passord må samsvare med hverandre ErrorContactEMail=En teknisk feil oppsto. Vennligst kontakt administrator for å følge e %s no gi feilmeldingsnumrene %s i meldingen, eller enda bedre ved å legge til en skjerm kopi av denne siden. ErrorWrongValueForField=Feil verdi for feltet tall %s (verdien «%s" samsvarer ikke med regex regel %s) -ErrorFieldValueNotIn=Feil verdi for feltnummer %s (verdien «%s" er ikke en verdi tilgjengelig i felten %s av tabellen %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Feil verdi for feltnummer %s (verdi '%s "er ikke en %s eksisterende ref) ErrorsOnXLines=Feil på %s kilde linjer ErrorFileIsInfectedWithAVirus=Det antivirus programmet var ikke i stand til å validere filen (filen kan være infisert av et virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang index 78bd25f24c3..e087efd5896 100644 --- a/htdocs/langs/nb_NO/install.lang +++ b/htdocs/langs/nb_NO/install.lang @@ -155,7 +155,8 @@ MigrationFinished=Migrasjon ferdig LastStepDesc=Siste trinn: Definer her login og passord du har tenkt å bruke til å koble til programvare. Ikke mist dette som det er kontoen for å administrere alle andre. ActivateModule=Aktiver modulen %s ShowEditTechnicalParameters=Klikk her for å vise/endre avanserte parametre (expert mode) -WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +WarningUpgrade=Advarsel!\nTok du en backup av databasen først?\nDette anbefales på det sterkeste! F.eks: Pga. feil/bugs i databasesystemer (f.eks. Mysql versjon 5.5.40), kan data eller tabeller gå tapt i denne prosessen. Det er sterkt anbefalt å ha en komplett kopi av databasen før du starter overføringen.\n\n\nKlikk OK for å starte overføringsprosessen... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade @@ -207,7 +208,7 @@ MigrationProjectTaskTime=Oppdater tid i sekunder MigrationActioncommElement=Oppdatering data på handlinger MigrationPaymentMode=Datamigrering for betaling modus MigrationCategorieAssociation=Migrer kategorier -MigrationEvents=Migration of events to add event owner into assignement table +MigrationEvents=Overføring av hendelser for å legge hendelseseier inn i oppdragstabellen ShowNotAvailableOptions=Vis utilgjengelige opsjoner HideNotAvailableOptions=Gjem utilgjengelige opsjoner diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang index 8281c41b469..6fc76ac7a89 100644 --- a/htdocs/langs/nb_NO/main.lang +++ b/htdocs/langs/nb_NO/main.lang @@ -141,6 +141,7 @@ Cancel=Avbryt Modify=Endre Edit=Rediger Validate=Godkjenn +ValidateAndApprove=Validate and Approve ToValidate=Å godkjenne Save=Lagre SaveAs=Lagre som @@ -158,6 +159,7 @@ Search=Søk SearchOf=Søk Valid=Gyldig Approve=Godkjenn +Disapprove=Disapprove ReOpen=Gjenåpne Upload=Send fil ToLink=Link @@ -219,6 +221,7 @@ Cards=Kort Card=Kort Now=Nå Date=Dato +DateAndHour=Date and hour DateStart=Startdato DateEnd=Sluttdato DateCreation=Opprettet den @@ -295,6 +298,7 @@ UnitPriceHT=Enhetspris (netto) UnitPriceTTC=Enhetspris PriceU=Pris PriceUHT=Pris (netto) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=Pris Amount=Beløp AmountInvoice=Fakturabeløp @@ -521,6 +525,7 @@ DateFromTo=Fra %s til %s DateFrom=Fra %s DateUntil=Til og med %s Check=Sjekk +Uncheck=Uncheck Internal=Intern External=Ekstern Internals=Intern @@ -688,6 +693,7 @@ PublicUrl=Offentlig URL AddBox=Legg til boks SelectElementAndClickRefresh=Velg et element og klikk Oppfrisk PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Mandag Tuesday=Tirsdag diff --git a/htdocs/langs/nb_NO/opensurvey.lang b/htdocs/langs/nb_NO/opensurvey.lang index 0290f3f467f..b6c393f99fa 100644 --- a/htdocs/langs/nb_NO/opensurvey.lang +++ b/htdocs/langs/nb_NO/opensurvey.lang @@ -1,66 +1,66 @@ # Dolibarr language file - Source file is en_US - opensurvey -# Survey=Poll -# Surveys=Polls -# OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... -# NewSurvey=New poll -# NoSurveysInDatabase=%s poll(s) into database. -# OpenSurveyArea=Polls area -# AddACommentForPoll=You can add a comment into poll... -# AddComment=Add comment -# CreatePoll=Create poll -# PollTitle=Poll title -# ToReceiveEMailForEachVote=Receive an email for each vote -# TypeDate=Type date -# TypeClassic=Type standard -# OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it -# RemoveAllDays=Remove all days -# CopyHoursOfFirstDay=Copy hours of first day -# RemoveAllHours=Remove all hours -# SelectedDays=Selected days -# TheBestChoice=The best choice currently is -# TheBestChoices=The best choices currently are -# with=with -# OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. -# CommentsOfVoters=Comments of voters -# ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes) -# RemovePoll=Remove poll -# UrlForSurvey=URL to communicate to get a direct access to poll -# PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: -# CreateSurveyDate=Create a date poll -# CreateSurveyStandard=Create a standard poll -# CheckBox=Simple checkbox -# YesNoList=List (empty/yes/no) -# PourContreList=List (empty/for/against) -# AddNewColumn=Add new column -# TitleChoice=Choice label -# ExportSpreadsheet=Export result spreadsheet +Survey=Poll +Surveys=Polls +OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... +NewSurvey=New poll +NoSurveysInDatabase=%s poll(s) into database. +OpenSurveyArea=Polls area +AddACommentForPoll=You can add a comment into poll... +AddComment=Add comment +CreatePoll=Create poll +PollTitle=Poll title +ToReceiveEMailForEachVote=Receive an email for each vote +TypeDate=Type date +TypeClassic=Type standard +OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it +RemoveAllDays=Remove all days +CopyHoursOfFirstDay=Copy hours of first day +RemoveAllHours=Remove all hours +SelectedDays=Valgte dager +TheBestChoice=The best choice currently is +TheBestChoices=The best choices currently are +with=with +OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. +CommentsOfVoters=Comments of voters +ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes) +RemovePoll=Remove poll +UrlForSurvey=URL to communicate to get a direct access to poll +PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: +CreateSurveyDate=Create a date poll +CreateSurveyStandard=Create a standard poll +CheckBox=Simple checkbox +YesNoList=List (empty/yes/no) +PourContreList=List (empty/for/against) +AddNewColumn=Add new column +TitleChoice=Choice label +ExportSpreadsheet=Export result spreadsheet ExpireDate=Limit date -# NbOfSurveys=Number of polls -# NbOfVoters=Nb of voters -# SurveyResults=Results -# PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s. -# 5MoreChoices=5 more choices -# Abstention=Abstention -# Against=Against -# YouAreInivitedToVote=You are invited to vote for this poll -# VoteNameAlreadyExists=This name was already used for this poll -# ErrorPollDoesNotExists=Error, poll %s does not exists. -# OpenSurveyNothingToSetup=There is no specific setup to do. -# PollWillExpire=Your poll will expire automatically %s days after the last date of your poll. -# AddADate=Add a date -# AddStartHour=Add start hour -# AddEndHour=Add end hour -# votes=vote(s) -# NoCommentYet=No comments have been posted for this poll yet -# CanEditVotes=Can change vote of others -# CanComment=Voters can comment in the poll -# CanSeeOthersVote=Voters can see other people's vote -# SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. -# BackToCurrentMonth=Back to current month -# ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation -# ErrorOpenSurveyOneChoice=Enter at least one choice -# ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD -# ErrorInsertingComment=There was an error while inserting your comment -# MoreChoices=Enter more choices for the voters -# SurveyExpiredInfo=The voting time of this poll has expired. -# EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s +NbOfSurveys=Number of polls +NbOfVoters=Nb of voters +SurveyResults=Results +PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s. +5MoreChoices=5 more choices +Abstention=Abstention +Against=Against +YouAreInivitedToVote=You are invited to vote for this poll +VoteNameAlreadyExists=This name was already used for this poll +ErrorPollDoesNotExists=Error, poll %s does not exists. +OpenSurveyNothingToSetup=There is no specific setup to do. +PollWillExpire=Your poll will expire automatically %s days after the last date of your poll. +AddADate=Add a date +AddStartHour=Add start hour +AddEndHour=Add end hour +votes=vote(s) +NoCommentYet=No comments have been posted for this poll yet +CanEditVotes=Can change vote of others +CanComment=Voters can comment in the poll +CanSeeOthersVote=Voters can see other people's vote +SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. +BackToCurrentMonth=Back to current month +ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation +ErrorOpenSurveyOneChoice=Enter at least one choice +ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD +ErrorInsertingComment=There was an error while inserting your comment +MoreChoices=Enter more choices for the voters +SurveyExpiredInfo=The voting time of this poll has expired. +EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang index 11c92b04ada..8aea126a9c1 100644 --- a/htdocs/langs/nb_NO/orders.lang +++ b/htdocs/langs/nb_NO/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Kansellert StatusOrderDraft=Kladd (trenger godkjenning) StatusOrderValidated=Godkjent StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Behandlet StatusOrderToBill=Levert StatusOrderToBill2=Til fakturering @@ -58,6 +59,7 @@ MenuOrdersToBill=Ordre levert MenuOrdersToBill2=Fakturerbare ordre SearchOrder=Søk i ordre SearchACustomerOrder=Søk etter kundeordre +SearchASupplierOrder=Search a supplier order ShipProduct=Lever produkt Discount=Rabatt CreateOrder=Lag ordre diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang index d634da4b41f..57beeca7610 100644 --- a/htdocs/langs/nb_NO/other.lang +++ b/htdocs/langs/nb_NO/other.lang @@ -54,12 +54,13 @@ MaxSize=Maksimal størrelse AttachANewFile=Legg ved ny fil/dokument LinkedObject=Lenkede objekter Miscellaneous=Diverse -NbOfActiveNotifications=Antall påminnelser +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Dette er en test post. \\ NDe to linjer er atskilt med en vognretur. PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fet skrift).
De to linjene er skilt med en vognretur. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/nb_NO/productbatch.lang +++ b/htdocs/langs/nb_NO/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang index 7b77f870cdf..1a443f724cd 100644 --- a/htdocs/langs/nb_NO/products.lang +++ b/htdocs/langs/nb_NO/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang index 1d656410bad..86f6159f0fa 100644 --- a/htdocs/langs/nb_NO/projects.lang +++ b/htdocs/langs/nb_NO/projects.lang @@ -8,8 +8,10 @@ SharedProject=Alle PrivateProject=Kontaktpersoner for prosjektet MyProjectsDesc=Denne visningen er begrenset til prosjekter du er en kontakt for (hva er den type). ProjectsPublicDesc=Denne visningen presenterer alle prosjektene du har lov til å lese. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Denne visningen presenterer alle prosjekter (dine brukertillatelser gi deg tillatelse til å vise alt). MyTasksDesc=Denne visningen er begrenset til prosjekter eller oppgaver du er en kontakt for (hva er den type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Denne visningen presenterer alle prosjekter og oppgaver du har lov til å lese. TasksDesc=Denne visningen presenterer alle prosjekter og oppgaver (dine brukertillatelser gi deg tillatelse til å vise alt). ProjectsArea=Prosjektområde @@ -29,6 +31,8 @@ NoProject=Ingen prosjekter definert NbOpenTasks=Ant. åpne oppgaver NbOfProjects=Ant. prosjekter TimeSpent=Tid brukt +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Tid brukt RefTask=Ref. oppgave LabelTask=Oppgave @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Liste over leverandørens ordre knyttet til ListSupplierInvoicesAssociatedProject=Liste over leverandørens fakturaer knyttet til prosjektet ListContractAssociatedProject=Liste over kontrakter knyttet til prosjektet ListFichinterAssociatedProject=Liste over tiltak knyttet til prosjektet -ListTripAssociatedProject=Liste over turer og utgifter knyttet til prosjektet +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Liste over tiltak knyttet til prosjektet ActivityOnProjectThisWeek=Aktiviteter i prosjektet denne uke ActivityOnProjectThisMonth=Aktiviteter i prosjektet denne måned @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/nb_NO/salaries.lang +++ b/htdocs/langs/nb_NO/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang index 69f7e0739b4..c2e8b0514b6 100644 --- a/htdocs/langs/nb_NO/sendings.lang +++ b/htdocs/langs/nb_NO/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Ant. bestilt QtyShipped=Ant. levert QtyToShip=Ant. å levere QtyReceived=Ant. mottatt -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Andre leveringer på denne ordren DateSending=Leveringsdato DateSendingShort=Leveringsdato diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang index d784469d779..988c8729d87 100644 --- a/htdocs/langs/nb_NO/stocks.lang +++ b/htdocs/langs/nb_NO/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Veid gjennomsnittlig pris PMPValueShort=WAP EnhancedValueOfWarehouses=Lagerverdi UserWarehouseAutoCreate=Opprett lager automatisk når en bruker opprettes +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Antall sendt QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang index d6457622bf2..219237d952d 100644 --- a/htdocs/langs/nb_NO/suppliers.lang +++ b/htdocs/langs/nb_NO/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Leverandører -Supplier=Leverandør AddSupplier=Create a supplier SupplierRemoved=Leverandør slettet SuppliersInvoice=Leverandørfaktura @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Leverandørfakturaer og betalinger ExportDataset_fournisseur_3=Leverandør ordrer og ordrelinjer ApproveThisOrder=Godkjenn denne innkjøpsordren ConfirmApproveThisOrder=Er du sikker på at du vil godkjenne denne innkjøpsordren? -DenyingThisOrder=Avvis denne innkjøpsordren +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Er du sikker på at du vil avvise denne innkjøpsordren? ConfirmCancelThisOrder=Er du sikker på at du vil avbryte denne innkjøpsordren? AddCustomerOrder=Opprett kundeordre diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang index c96afd01553..03337d82ee6 100644 --- a/htdocs/langs/nb_NO/trips.lang +++ b/htdocs/langs/nb_NO/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Reise -Trips=Reiser -TripsAndExpenses=Reiser og utgifter -TripsAndExpensesStatistics=Turer og utgifter statistikk -TripCard=Reisekort -AddTrip=Legg til reise -ListOfTrips=Oversikt over reiser +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Oversikt over avgifter -NewTrip=Ny reise +NewTrip=New expense report CompanyVisited=Firma/organiasjon besøkt Kilometers=Kilometer FeesKilometersOrAmout=Beløp eller kilometer -DeleteTrip=Slett reise -ConfirmDeleteTrip=Er du sikker på at du vil slette denne reisen? -TF_OTHER=Annet -TF_LUNCH=Lunsj -TF_TRIP=Reise -ListTripsAndExpenses=Liste over turer og utgifter -ExpensesArea=Turer og utgifter området -SearchATripAndExpense=Søk etter tur og regning +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Annet +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunsj +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang index e417a4ffc01..f7c21052fa8 100644 --- a/htdocs/langs/nl_BE/main.lang +++ b/htdocs/langs/nl_BE/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y @@ -154,7 +155,6 @@ DolibarrWorkBoard=Werktaken overzicht to=tot Other=Ander Others=Anderen -ReCalculate=Herbouw Draft=Ontwerp Drafts=Ontwerpen Rejects=Verwerpen diff --git a/htdocs/langs/nl_BE/trips.lang b/htdocs/langs/nl_BE/trips.lang index c0ecfb50dec..3496c7748fe 100644 --- a/htdocs/langs/nl_BE/trips.lang +++ b/htdocs/langs/nl_BE/trips.lang @@ -10,4 +10,3 @@ CompanyVisited=Bedrijf / partikulier bezocht FeesKilometersOrAmout=Bedrag of kilometers DeleteTrip=Verwijderen verplaatsing ConfirmDeleteTrip=Weet u zeker dat u deze verplaatsing wilt verwijderen? -TF_TRIP=Verplaatsing diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang index ee574b01753..c961b2450f3 100644 --- a/htdocs/langs/nl_NL/admin.lang +++ b/htdocs/langs/nl_NL/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimenteel VersionDevelopment=Ontwikkeling VersionUnknown=Onbekend VersionRecommanded=Aanbevolen +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Sessie-ID SessionSaveHandler=Wijze van sessieopslag SessionSavePath=Sessie opslaglocatie @@ -493,10 +498,16 @@ Module600Name=Kennisgevingen Module600Desc=Stuur EMail notificaties van bepaalde Dolibarr zakelijke gebeurtenissen naar derde-partijen contacten (setup gedefinieerd in iedere derde-partij) Module700Name=Giften Module700Desc=Donatiebeheer +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integratie Module1400Name=Boekhouden Module1400Desc=Boekhoudkundig beheer van deskundigen (dubbel partijen) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categorieën Module1780Desc=Categoriebeheer (producten, leveranciers en afnemers) Module2000Name=Fckeditor @@ -631,7 +642,7 @@ Permission181=Bekijk leverancier opdrachten Permission182=Creëren / wijzigen leverancier opdrachten Permission183=Valideer leveranciersopdrachten Permission184=Goedkeuren leveranciersopdrachten -Permission185=Bestel leverancieropdrachten +Permission185=Order or cancel supplier orders Permission186=Ontvang leveranciersopdrachten Permission187=Sluiten leverancieropdrachten Permission188=Annuleren leverancieropdrachten @@ -711,6 +722,13 @@ Permission538=Diensten exporteren Permission701=Bekijk donaties Permission702=Creëren / wijzigen donaties Permission703=Verwijderen donaties +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Bekijk voorraden Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Wachtwoord voor de proxy-server te gebruiken DefineHereComplementaryAttributes=Definieer hier alle attributen, niet reeds standaard beschikbaar, en dat je wilt worden ondersteund voor %s. ExtraFields=Aanvullende attributen ExtraFieldsLines=Aanvullende kenmerken (lijnen) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Aanvullende kenmerken (relaties) ExtraFieldsContacts=Aanvullende kenmerken (contact / adres) ExtraFieldsMember=Aanvullende kenmerken (lid) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Product- / dienstregels met een waarde van 0 gebruiken FreeLegalTextOnProposal=Vrije tekst op Offertes WatermarkOnDraftProposal=Watermerk op ontwerp offertes (geen indien leeg) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Opdrachtenbeheerinstellingen OrdersNumberingModules=Opdrachtennummeringmodules @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Streepjescodetype UPC BarcodeDescISBN=Streepjescodetype ISBN BarcodeDescC39=Streepjescodetype C39 BarcodeDescC128=Streepjescodetype C128 -GenbarcodeLocation=Opdrachtregelprogramma voor streepjescodegeneratie (gebruikt door phpbarcode voor enkele streepjescode typen) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Beheerder om automatisch barcode nummers te bepalen. ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Te gebruiken rekening voor ontvangst van contacte betalingen CashDeskBankAccountForCheque= Te gebruiken rekening voor ontvangst van betalingen per cheque CashDeskBankAccountForCB= Te gebruiken rekening voor ontvangst van betalingen per CreditCard -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Weblinkmoduleinstellingen @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Formaat TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang index 78926b0359c..8e8b94df0d2 100644 --- a/htdocs/langs/nl_NL/banks.lang +++ b/htdocs/langs/nl_NL/banks.lang @@ -33,7 +33,11 @@ AllTime=Vanaf het begin Reconciliation=Overeenstemming RIB=Bankrekeningnummer IBAN=IBAN-nummer +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC- / SWIFT-nummer +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Periodieke overboekingen StandingOrder=Periodieke overboeking Withdrawals=Opnames @@ -148,7 +152,7 @@ BackToAccount=Terug naar rekening ShowAllAccounts=Toon alle rekeningen FutureTransaction=Overboeking in de toekomst. Geen manier mogelijk om af te stemmen SelectChequeTransactionAndGenerate=Select / filter controleert op te nemen in het controleren stortingsbewijs en op "Create" klikken. -InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbaar numerieke waarde (zoals YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Tenslotte een categorie opgeven waarin de gegevens bewaard kunnen worden ToConciliate=Te bemiddelen? ThenCheckLinesAndConciliate=Duid dan de lijnen aan van het bankafschrift en klik diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang index 807bdccd23b..8302407576c 100644 --- a/htdocs/langs/nl_NL/commercial.lang +++ b/htdocs/langs/nl_NL/commercial.lang @@ -62,7 +62,7 @@ LastProspectContactDone=Contact opgevolgd DateActionPlanned=Datum actie gepland voor DateActionDone=Datum actie uitgevoerd ActionAskedBy=Actie gevraagd door -ActionAffectedTo=Gebeurtenis is eigendom van +ActionAffectedTo=Event assigned to ActionDoneBy=Actie gedaan door ActionUserAsk=Geregistreerd door ErrorStatusCantBeZeroIfStarted=Als veld 'Datum uitgevoerd' is gevuld, is de actie gestart (of afgelopen), dus veld 'Status' kan niet 0%% worden. diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang index 80c0173ed8d..88aab0ea14d 100644 --- a/htdocs/langs/nl_NL/contracts.lang +++ b/htdocs/langs/nl_NL/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=verlopen ServiceStatusClosed=Gesloten ServicesLegend=Dienstenlegenda Contracts=Contracten +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=Geen contracten MenuServices=Diensten diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang index bcd3b1c774f..509725038ef 100644 --- a/htdocs/langs/nl_NL/cron.lang +++ b/htdocs/langs/nl_NL/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell commando CronMenu=Cron CronCannotLoadClass=Kan klasse %s of object %s niet laden UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang index 9d16482afa5..0a8f7093045 100644 --- a/htdocs/langs/nl_NL/errors.lang +++ b/htdocs/langs/nl_NL/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=De bron- en doelrekening mogen niet dezelfde zijn ErrorBadThirdPartyName=Onjuiste waarde voor naam derde partij ErrorProdIdIsMandatory=De %s is verplicht ErrorBadCustomerCodeSyntax=Verkeerde syntaxis voor afnemerscode -ErrorBadBarCodeSyntax=Slechte syntax voor barcode +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Afnemerscode nodig ErrorBarCodeRequired=Bar code nodig ErrorCustomerCodeAlreadyUsed=Afnemerscode al gebruikt @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript dient niet uitgeschakeld te zijn voor de ErrorPasswordsMustMatch=De twee ingevoerde wachtwoorden komen niet overeen. ErrorContactEMail=Er is een technische fout opgetreden. Neemt u alstublieft contact op met de beheerder via het e-mailadres %s en vermeld de volgende foutcode %s in uw bericht, of nog beter voeg een schermafbeelding van de pagina toe. ErrorWrongValueForField=Foutiefe waarde voor het veld nummer %s (waarde %s voldoet niet aan de reguliere expressieregel %s) -ErrorFieldValueNotIn=Verkeerde waarde voor het veld nummer %s (Waarde '%s' is geen waarde beschikbaar in het veld %s van de tabel %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Verkeerde waarde voor veldnummer %s (waarde '%s' is geen %s bestaande ref) ErrorsOnXLines=Fouten op bronregels %s ErrorFileIsInfectedWithAVirus=Het antivirusprogramma kon dit bestand niet valideren (het zou met een virus geïnfecteerd kunnen zijn) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Verplichte setup parameters zijn nog niet gedefinieerd diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang index a0f1f51790b..5575250b112 100644 --- a/htdocs/langs/nl_NL/install.lang +++ b/htdocs/langs/nl_NL/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Laatste stap: Definieer hier de login en het wacht ActivateModule=Activeer module %s ShowEditTechnicalParameters=Klik hier om verder gevorderde parameters te zien of aan te passen. (expert instellingen) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang index 104be6c74de..e2029732446 100644 --- a/htdocs/langs/nl_NL/main.lang +++ b/htdocs/langs/nl_NL/main.lang @@ -141,6 +141,7 @@ Cancel=Annuleren Modify=Wijzigen Edit=Bewerken Validate=Valideer +ValidateAndApprove=Validate and Approve ToValidate=Te valideren Save=Opslaan SaveAs=Opslaan als @@ -158,6 +159,7 @@ Search=Zoeken SearchOf=Zoeken Valid=Geldig Approve=Goedkeuren +Disapprove=Disapprove ReOpen=Heropenen Upload=Upload ToLink=Link @@ -219,6 +221,7 @@ Cards=Kaarten Card=Kaart Now=Nu Date=Datum +DateAndHour=Date and hour DateStart=Begindatum DateEnd=Einddatum DateCreation=Aanmaakdatum @@ -295,6 +298,7 @@ UnitPriceHT=Eenheidsprijs (netto) UnitPriceTTC=Eenheidsprijs (bruto) PriceU=E.P. PriceUHT=EP (netto) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=EP (bruto) Amount=Hoeveelheid AmountInvoice=Factuurbedrag @@ -521,6 +525,7 @@ DateFromTo=Van %s naar %s DateFrom=Vanaf %s DateUntil=Tot %s Check=Controleren +Uncheck=Uncheck Internal=Interne External=Extern Internals=Internen @@ -688,6 +693,7 @@ PublicUrl=Openbare URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Maandag Tuesday=Dinsdag diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang index 4d220f6bb16..83f76d2ab97 100644 --- a/htdocs/langs/nl_NL/orders.lang +++ b/htdocs/langs/nl_NL/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Geannuleerd StatusOrderDraft=Concept (moet worden gevalideerd) StatusOrderValidated=Gevalideerd StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Verwerkt StatusOrderToBill=Te factureren StatusOrderToBill2=Te factureren @@ -58,6 +59,7 @@ MenuOrdersToBill=Te factureren opdrachten MenuOrdersToBill2=Billable orders SearchOrder=Zoekopdracht SearchACustomerOrder=Zoek een klant bestelling +SearchASupplierOrder=Search a supplier order ShipProduct=Verzend product Discount=Korting CreateOrder=Creeer opdracht diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang index ff034237d4b..4445dfcb6ca 100644 --- a/htdocs/langs/nl_NL/other.lang +++ b/htdocs/langs/nl_NL/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximale grootte AttachANewFile=Voeg een nieuw bestand / document bij LinkedObject=Gekoppeld object Miscellaneous=Diversen -NbOfActiveNotifications=Aantal kennisgevingen +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Dit is een test e-mail.\nDe twee lijnen worden gescheiden door een harde return. PredefinedMailTestHtml=Dit is een test e-mail (het woord test moet vetgedrukt worden weergegeven).
De twee lijnen worden gescheiden door een harde return. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/nl_NL/productbatch.lang +++ b/htdocs/langs/nl_NL/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang index bdfc6083c66..784314a472c 100644 --- a/htdocs/langs/nl_NL/products.lang +++ b/htdocs/langs/nl_NL/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang index 319c71c72dc..e242d88716f 100644 --- a/htdocs/langs/nl_NL/projects.lang +++ b/htdocs/langs/nl_NL/projects.lang @@ -8,8 +8,10 @@ SharedProject=Iedereen PrivateProject=Contacten van het project MyProjectsDesc=Deze weergave is beperkt tot projecten waarvoor u een contactpersoon bent (ongeacht het type). ProjectsPublicDesc=Deze weergave toont alle projecten waarvoor u gerechtigd bent deze in te zien. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Deze weergave toont alle projecten (Uw gebruikersrechten staan het u toe alles in te zien). MyTasksDesc=Deze weergave is beperkt tot projecten en taken waarvoor u een contactpersoon bent (ongeacht het type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Deze weergave toont alle projecten en taken die u mag inzien. TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staan het u toe alles in te zien). ProjectsArea=Projectenoverzicht @@ -29,6 +31,8 @@ NoProject=Geen enkel project gedefinieerd of in eigendom NbOpenTasks=Aantal geopende taken NbOfProjects=Aantal projecten TimeSpent=Bestede tijd +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Bestede tijd RefTask=Ref. taak LabelTask=Label taak @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lijst van aan het project verbonden leveranc ListSupplierInvoicesAssociatedProject=Lijst van aan het project verbonden leveranciersfacturen ListContractAssociatedProject=Lijst van aan het project verbonden contracten ListFichinterAssociatedProject=Lijst van aan het project verbonden interventies -ListTripAssociatedProject=Lijst van aan het project verbonden kosten +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Lijst van aan het project verbonden acties ActivityOnProjectThisWeek=Projectactiviteit in deze week ActivityOnProjectThisMonth=Projectactiviteit in deze maand @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/nl_NL/salaries.lang +++ b/htdocs/langs/nl_NL/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang index b754a4dca1c..72a94edeec1 100644 --- a/htdocs/langs/nl_NL/sendings.lang +++ b/htdocs/langs/nl_NL/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Aantal besteld QtyShipped=Aantal verzonden QtyToShip=Aantal te verzenden QtyReceived=Aantal ontvangen -KeepToShip=Houd verzendklaar +KeepToShip=Remain to ship OtherSendingsForSameOrder=Andere verzendingen voor deze opdracht DateSending=Datum versturing opdracht DateSendingShort=Datum versturing opdracht diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang index d8019eb9d0d..8dec2f9aca9 100644 --- a/htdocs/langs/nl_NL/stocks.lang +++ b/htdocs/langs/nl_NL/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Waardering (PMP) PMPValueShort=Waarde EnhancedValueOfWarehouses=Voorraadwaardering UserWarehouseAutoCreate=Creëer automatisch een magazijn bij het aanmaken van een gebruiker +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Hoeveelheid verzonden QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=De voorraad van magazijn %s zal verminderd word WarehouseForStockIncrease=De voorraad van magazijn %s zal verhoogd worden ForThisWarehouse=Voor dit magazijn ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=Lijst van alle open leveranciersbestellingen +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Bevoorradingen NbOfProductBeforePeriod=Aantal op voorraad van product %s voor de gekozen periode (<%s) NbOfProductAfterPeriod=Aantal op voorraad van product %s na de gekozen periode (<%s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang index d468bff689e..e38970a6513 100644 --- a/htdocs/langs/nl_NL/suppliers.lang +++ b/htdocs/langs/nl_NL/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Leveranciers -Supplier=Leverancier AddSupplier=Create a supplier SupplierRemoved=Leverancier verwijderd SuppliersInvoice=Leveranciersfactuur @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Leveranciersfacturen en -betalingen ExportDataset_fournisseur_3=Leveranciersorders en orderlijnen ApproveThisOrder=Opdracht goedkeuren ConfirmApproveThisOrder=Weet u zeker dat u de Opdracht %s wilt goedkeuren? -DenyingThisOrder=Opdracht weigeren +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Weet u zeker dat u deze Opdracht %s wilt weigeren? ConfirmCancelThisOrder=Weet u zeker dat u deze Opdracht %s wilt annuleren? AddCustomerOrder=Voeg afnemersopdracht toe diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang index 9496bc1e921..789566f3214 100644 --- a/htdocs/langs/nl_NL/trips.lang +++ b/htdocs/langs/nl_NL/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Reis -Trips=Reizen -TripsAndExpenses=Reizen en uitgaven -TripsAndExpensesStatistics=Reizen en uitgaven statistieken -TripCard=Reizenkaart -AddTrip=Reis toevoegen -ListOfTrips=Reizenlijst +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Vergoedingenlijst -NewTrip=Nieuwe reis +NewTrip=New expense report CompanyVisited=Bedrijf / stichting bezocht Kilometers=Kilometers FeesKilometersOrAmout=Kilometerskosten -DeleteTrip=Verwijder reis -ConfirmDeleteTrip=Weet u zeker dat u deze reis wilt verwijderen? -TF_OTHER=Ander -TF_LUNCH=Lunch -TF_TRIP=Reis -ListTripsAndExpenses=Lijst van de reis- en onkosten -ExpensesArea=Trips en uitgaven gebied -SearchATripAndExpense=Zoek een reis en kosten +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Ander +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang index 05f40c55bd3..d048aa3a61b 100644 --- a/htdocs/langs/pl_PL/admin.lang +++ b/htdocs/langs/pl_PL/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Eksperymentalny VersionDevelopment=Rozwój VersionUnknown=Nieznany VersionRecommanded=Zalecana +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID sesji SessionSaveHandler=Asystent zapisu sesji SessionSavePath=Lokalizacja sesji danych @@ -17,32 +22,32 @@ NoSessionListWithThisHandler=Asystent zapisu sesji skonfigurowany w PHP nie zezw LockNewSessions=Zablokuj nowe połączenia ConfirmLockNewSessions=Czy na pewno chcesz ograniczyć wszelkie nowe połączenie Dolibarr do siebie. Tylko %s użytkownik będzie mógł się połączyć po tym. UnlockNewSessions=Usuwanie blokady połączeń -YourSession=Sesji -Sessions=Użytkownicy sesji +YourSession=Twoja sesja +Sessions=Sesja użytkowników WebUserGroup=Serwer sieci Web użytkownik / grupa NoSessionFound=PHP wydaje się nie dopuścić do listy aktywnych sesji. Katalog używany do zapisywania sesji (%s) mogą być chronione (np. przez uprawnienia OS dyrektywy open_basedir lub PHP). -HTMLCharset=Charset dla generowanych stron HTML -DBStoringCharset=Charset bazy danych do przechowywania danych -DBSortingCharset=Database charset sortowanie danych +HTMLCharset=Kodowanie dla generowanych stron HTML +DBStoringCharset=Kodowanie bazy danych do przechowywania danych +DBSortingCharset=Kodowanie bazy danych by sortować dane WarningModuleNotActive=Moduł %s musi być aktywny -WarningOnlyPermissionOfActivatedModules=Tylko uprawnienia związane z aktywowane moduły pokazane są tutaj. Możesz uaktywnić inne moduły w instalacji - moduł strony. -DolibarrSetup=Dolibarr konfiguracji -DolibarrUser=Dolibarr użytkownika +WarningOnlyPermissionOfActivatedModules=Tylko uprawnienia związane z funkcją aktywowania modułów pokazane są tutaj. Możesz uaktywnić inne moduły w instalacji - moduł strony. +DolibarrSetup=Instalacja lub ulepszenie Dollibar'a +DolibarrUser=Użytkownik Dolibarr InternalUser=Wewnętrzny użytkownik -ExternalUser=Zewnętrzne użytkownika -InternalUsers=Użytkownicy wewnętrzni -ExternalUsers=Użytkowników zewnętrznych -GlobalSetup=Global konfiguracji +ExternalUser=Zewnętrzny użytkownik +InternalUsers=Wewnętrzni użytkownicy +ExternalUsers=Zewnetrzni użytkownicy +GlobalSetup=Globalna konfiguracja GUISetup=Wyświetlanie -SetupArea=Ustawienia obszaru -FormToTestFileUploadForm=Formularz do wysyłania pliku test (w zależności od konfiguracji) -IfModuleEnabled=Uwaga: tak jest skuteczne tylko wtedy, gdy modułu %s jest aktywny -RemoveLock=Usuwanie pliku %s, jeśli istnieje, aby umożliwić aktualizację narzędzia. -RestoreLock=Zastąp plik %s odczytu z uprawnień jedynie na plik wyłączyć wszelkie korzystanie z aktualizacji narzędzia. +SetupArea=Dział konfiguracji +FormToTestFileUploadForm=Formularz do wysyłania pliku testowego (według konfiguracji) +IfModuleEnabled=Uwaga: tak jest skuteczne tylko wtedy, gdy moduł %s jest aktywny +RemoveLock=Usuń plik %s, jeśli istnieje, aby umożliwić aktualizację narzędzia. +RestoreLock=Zastąp plik %s tylko z uprawnieniami do odczytu, by wyłączyć wszelkie korzystanie z aktualizacji narzędzia. SecuritySetup=Ustawienia bezpieczeństwa -ErrorModuleRequirePHPVersion=Błąd ten moduł wymaga PHP w wersji %s lub większy -ErrorModuleRequireDolibarrVersion=Błąd ten moduł wymaga Dolibarr wersji %s lub większy -ErrorDecimalLargerThanAreForbidden=Błąd, dokładność większa niż %s nie jest obsługiwany. +ErrorModuleRequirePHPVersion=Błąd ten moduł wymaga PHP w wersji %s lub większej +ErrorModuleRequireDolibarrVersion=Błąd ten moduł wymaga Dolibarr wersji %s lub większej +ErrorDecimalLargerThanAreForbidden=Błąd, dokładność większa niż %s nie jest obsługiwana DictionarySetup=Dictionary setup Dictionary=Dictionaries Chartofaccounts=Chart of accounts @@ -50,7 +55,7 @@ Fiscalyear=Fiscal years ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=Kod nie może zawierać wartości "0" DisableJavascript=Wyłącz funkcje JavaScript i Ajax (rekomendowane dla osób niewidomych oraz przeglądarek tekstowych) -ConfirmAjax=Wykorzystanie Ajax potwierdzenie pop +ConfirmAjax=Wykorzystanie potwierdzeń Ajax popups UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. ActivityStateToSelectCompany= Dodaj filtr opcję aby pokazać / ukryć thirdparties, które są aktualnie w działalności lub przestał go @@ -137,7 +142,7 @@ Box=Box Boxes=Pulpity informacyjne MaxNbOfLinesForBoxes=Maksymalna liczba linii na polach PositionByDefault=Domyślna kolejność -Position=Position +Position=Pozycja MenusDesc=Menu menedżerów określić zawartość menu 2 bary (prętem poziomym i pionowym pasku). MenusEditorDesc=W menu edytora pozwala określić indywidualną pozycje w menu. Używaj go ostrożnie, aby uniknąć podejmowania dolibarr niestabilne i stałe pozycje menu nieosiągalny.
Niektóre moduły dodać pozycje w menu (w menu Wszystkie w większości przypadków). Jeśli usunęliśmy niektóre z tych zapisów przez pomyłkę, możesz przywrócić im przez wyłączenie i reenabling modułu. MenuForUsers=Menu dla użytkowników @@ -294,7 +299,7 @@ DoNotUseInProduction=Nie używaj w produkcji ThisIsProcessToFollow=Jest to proces konfiguracji do: StepNb=Krok %s FindPackageFromWebSite=Znaleźć pakiet, który zapewnia funkcję chcesz (np. na oficjalnej stronie internetowej %s). -DownloadPackageFromWebSite=Download package %s. +DownloadPackageFromWebSite=Pobieram paczke %s UnpackPackageInDolibarrRoot=Rozpakuj pakiet plików do katalogu głównego Dolibarr %s SetupIsReadyForUse=Instalacja jest zakończona i Dolibarr jest gotowy do użycia z tym nowym elementem. NotExistsDirect=Alternatywna ścieżka root nie została zdefiniowana.
@@ -394,10 +399,10 @@ WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pd LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax) SMS=SMS LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s -RefreshPhoneLink=Refresh link +RefreshPhoneLink=Odśwież link LinkToTest=Clickable link generated for user %s (click phone number to test) -KeepEmptyToUseDefault=Keep empty to use default value -DefaultLink=Default link +KeepEmptyToUseDefault=Zostaw puste by używać domyślnych wartości +DefaultLink=Domyślny link ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) ExternalModule=External module - Installed into directory %s BarcodeInitForThirdparties=Mass barcode init for thirdparties @@ -443,7 +448,7 @@ Module52Name=Zapasy Module52Desc=Zapasy zarządzania produktów Module53Name=Usługi Module53Desc=Usługi zarządzania -Module54Name=Contracts/Subscriptions +Module54Name=Kontakty/Subskrypcje Module54Desc=Management of contracts (services or reccuring subscriptions) Module55Name=Kody kreskowe Module55Desc=Kody kreskowe zarządzania @@ -493,10 +498,16 @@ Module600Name=Powiadomienia Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Darowizny Module700Desc=Darowizny zarządzania +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integracji Module1400Name=Księgowość ekspertów Module1400Desc=Księgowość zarządzania dla ekspertów (double stron) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategorie Module1780Desc=Kategorie zarządzania (produktów, dostawców i klientów) Module2000Name=FCKeditor @@ -623,7 +634,7 @@ Permission164=Disable a service/subscription of a contract Permission165=Delete contracts/subscriptions Permission171=Read trips and expenses (own and his subordinates) Permission172=Create/modify trips and expenses -Permission173=Delete trips and expenses +Permission173=Usuń wyjazdy i wydatki Permission174=Read all trips and expenses Permission178=Export trips and expenses Permission180=Czytaj dostawców @@ -631,7 +642,7 @@ Permission181=Czytaj dostawcy zamówienia Permission182=Tworzenie / zmodyfikować dostawcy zamówienia Permission183=Validate dostawcy zamówienia Permission184=Zatwierdź dostawcy zamówienia -Permission185=Postanowienie dostawcy zamówienia +Permission185=Order or cancel supplier orders Permission186=Odbiór dostawcy zamówienia Permission187=Zamknij dostawcy zamówienia Permission188=Zrezygnuj dostawcy zamówienia @@ -711,6 +722,13 @@ Permission538=Eksport usług Permission701=Czytaj darowizn Permission702=Tworzenie / zmodyfikować darowizn Permission703=Usuń darowizn +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Czytaj zapasów Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Hasło do korzystania z serwera proxy DefineHereComplementaryAttributes=Określ tutaj wszystkie ATUTY, nie są już dostępne domyślnie i że chcesz być obsługiwane przez %s. ExtraFields=Uzupełniające atrybuty ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Linia produktów / usług z zerową ilość jest trakt FreeLegalTextOnProposal=Darmowy tekstu propozycji WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Zamówienia zarządzania konfiguracją OrdersNumberingModules=Zamówienia numeracji modules @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Kod kreskowy typu UPC BarcodeDescISBN=Kod kreskowy typu ISBN BarcodeDescC39=Kod kreskowy typu C39 BarcodeDescC128=Kod kreskowy typu C128 -GenbarcodeLocation=Kod kreskowy generowania narzędzie wiersza polecenia (używanego przez phpbarcode silników dla niektórych typów kodów kreskowych) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Środki pieniężne na rachunku do korzystania sprzedaje CashDeskBankAccountForCheque= Chcesz używać do otrzymywania płatności w formie czeku CashDeskBankAccountForCB= Chcesz używać do przyjmowania płatności gotówkowych za pomocą kart kredytowych -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Zakładka konfiguracji modułu @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang index 612aab42806..bbb51193375 100644 --- a/htdocs/langs/pl_PL/banks.lang +++ b/htdocs/langs/pl_PL/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Pojednanie RIB=Numer konta bankowego IBAN=Numer IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=Numer BIC / SWIFT +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Zlecenia stałe StandingOrder=Zlecenie stałe Withdrawals=Wypłaty @@ -148,7 +152,7 @@ BackToAccount=Powrót do konta ShowAllAccounts=Pokaż wszystkich rachunków FutureTransaction=Transakcja w futur. Nie da się pogodzić. SelectChequeTransactionAndGenerate=Wybierz / filtr sprawdza, to do otrzymania depozytu wyboru i kliknij przycisk "Utwórz". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang index 9e72e149a44..0d11b2c8bf0 100644 --- a/htdocs/langs/pl_PL/bills.lang +++ b/htdocs/langs/pl_PL/bills.lang @@ -1,10 +1,10 @@ # Dolibarr language file - Source file is en_US - bills Bill=Faktura Bills=Faktury -BillsCustomers=Customers invoices -BillsCustomer=Customers invoice -BillsSuppliers=Suppliers invoices -BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomers=Faktury klientów +BillsCustomer=Faktura klientów +BillsSuppliers=Faktury dostawców +BillsCustomersUnpaid=Niezapłacone faktury klientów BillsCustomersUnpaidForCompany=Należne wpłaty klientów faktur dla %s BillsSuppliersUnpaid=Należne wpłaty dostawców faktur BillsSuppliersUnpaidForCompany=Nieodpłatnej dostawcy faktury za %s diff --git a/htdocs/langs/pl_PL/bookmarks.lang b/htdocs/langs/pl_PL/bookmarks.lang index 05ca4530e66..e3bfe9ad09e 100644 --- a/htdocs/langs/pl_PL/bookmarks.lang +++ b/htdocs/langs/pl_PL/bookmarks.lang @@ -10,10 +10,10 @@ BookmarkTargetNewWindowShort=Nowe okno BookmarkTargetReplaceWindowShort=Aktualne okno BookmarkTitle=Tytuł zakładki UrlOrLink=URL -BehaviourOnClick=Zachowanie po kliknięciu na adres URL +BehaviourOnClick=Zachowaj po kliknięciu na adres URL CreateBookmark=Stwórz zakładkę SetHereATitleForLink=Zdefiniuj nazwę zakładki -UseAnExternalHttpLinkOrRelativeDolibarrLink=Użyj zewnętrznego adresu http lub względnego URL Dolibarr +UseAnExternalHttpLinkOrRelativeDolibarrLink=Użyj zewnętrznego adresu http lub względnego adresu URL Dolibarr ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Wybierz czy strona ma się otwierać w bieżącym czy w nowym oknie BookmarksManagement=Zarządzanie zakładkami ListOfBookmarks=Lista zakładek diff --git a/htdocs/langs/pl_PL/commercial.lang b/htdocs/langs/pl_PL/commercial.lang index 8e18d15fa0a..5e8c6f36a04 100644 --- a/htdocs/langs/pl_PL/commercial.lang +++ b/htdocs/langs/pl_PL/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Potencjalni klienci DeleteAction=Usuń działania / zadania NewAction=Nowe działania / zadania -AddAction=Dodaj działania / zadania -AddAnAction=Dodaj działania / zadania -AddActionRendezVous=Dodać zadanie Rendezvous +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Spotkanie ConfirmDeleteAction=Czy na pewno chcesz usunąć to zadanie? CardAction=Działanie karty @@ -44,8 +44,8 @@ DoneActions=Sporządzono działania DoneActionsFor=Sporządzono działań dla %s ToDoActions=Niekompletne działań ToDoActionsFor=Niekompletne działań na rzecz %s -SendPropalRef=Wyślij handlowych wniosku %s -SendOrderRef=Wyślij zamówienie %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Nie dotyczy StatusActionToDo=Aby to zrobić StatusActionDone=Zrobione @@ -62,7 +62,7 @@ LastProspectContactDone=Kontakt zrobić DateActionPlanned=Data działania planowane na DateActionDone=Data zrobienia działania ActionAskedBy=Działanie zadawane przez -ActionAffectedTo=Wpływ na działanie +ActionAffectedTo=Event assigned to ActionDoneBy=Działania wykonywane przez ActionUserAsk=Zarejestrowane przez ErrorStatusCantBeZeroIfStarted=Jeżeli pole 'Data zrobienia "jest wypełniona, rozpoczęto działania (lub gotowy), więc pole" Status "nie może być 0%%. diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang index c38e732a362..460076d7f8e 100644 --- a/htdocs/langs/pl_PL/companies.lang +++ b/htdocs/langs/pl_PL/companies.lang @@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF jest używany LocalTax2IsNotUsedES= IRPF nie jest używany LocalTax1ES=RE LocalTax2ES=IRPF -TypeLocaltax1ES=RE Type -TypeLocaltax2ES=IRPF Type -TypeES=Type +TypeLocaltax1ES=Typ Re +TypeLocaltax2ES=Typ IRPF +TypeES=Typ ThirdPartyEMail=%s WrongCustomerCode=Nieprawidłowy kod Klienta WrongSupplierCode=Nieprawidłowy kod Dostawcy @@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Bezwzględne rabaty dostępne DiscountNone=Żaden Supplier=Dostawca CompanyList=Lista firm -AddContact=Dodaj kontakt -AddContactAddress=Dodaj kontakt / adres +AddContact=Stwórz konktakt +AddContactAddress=Stwórz kontakt/adres EditContact=Edytuj kontakt EditContactAddress=Edytuj kontakt / adres Contact=Kontakt @@ -268,8 +268,8 @@ ContactsAddresses=Kontakty / Adresy NoContactDefinedForThirdParty=Brak zdefiniowanych kontaktów dla tego kontrahenta NoContactDefined=Brak zdefinowanych kontaktów DefaultContact=Domyślny kontakt/adres -AddCompany=Dodaj firmę -AddThirdParty=Dodaj kontrahenta +AddCompany=Stwórz firmę +AddThirdParty=Dodaj stronę trzecią DeleteACompany=Usuń firmę PersonalInformations=Prywatne dane osobowe AccountancyCode=Kod księgowy @@ -343,7 +343,7 @@ TE_MEDIUM=Średnia firma TE_ADMIN=Rządowy TE_SMALL=Mała firma TE_RETAIL=Klient detaliczny -TE_WHOLE=Wholetailer +TE_WHOLE=Całościowy TE_PRIVATE=Osoba prywatna TE_OTHER=Inny StatusProspect-1=Nie kontaktować się @@ -397,18 +397,18 @@ YouMustCreateContactFirst=Musisz stworzyć e-maile, kontakty dla trzeciej pierws ListSuppliersShort=Lista dostawców ListProspectsShort=Lista potencjalnych klientów ListCustomersShort=Lista klientów -ThirdPartiesArea=Third parties and contact area +ThirdPartiesArea=Zamówienie i konktakt LastModifiedThirdParties=%s ostatnio modyfikowanych kontrahentów UniqueThirdParties=Łącznie unikatowych kontrahentów InActivity=Otwarte ActivityCeased=Zamknięte ActivityStateFilter=Status aktywności -ProductsIntoElements=List of products into %s +ProductsIntoElements=Lista produktów w %s CurrentOutstandingBill=Biężący, niezapłacony rachunek OutstandingBill=Maksymalna kwota niezapłaconego rachunku OutstandingBillReached=Osiągnieto maksimum niezapłaconych rachunków MonkeyNumRefModelDesc=Wróć NUMERO z formatu %syymm-nnnn klienta i kod %syymm-nnnn dla dostawcy kod yy gdzie jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0.\nZwraca numer w formacie %syymm-nnnn dla kodu klienta i %syymm-nnnn dla kodu dostawcy, gdzie yy to rok, mm to miesiąc i nnnn jest sekwencją bez przerwy, bez powrotu do 0. LeopardNumRefModelDesc=Dowolny kod Klienta / Dostawcy. Ten kod może być modyfikowany w dowolnym momencie. ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...) -SearchThirdparty=Search thirdparty -SearchContact=Search contact +SearchThirdparty=Szukaj zamówienia +SearchContact=Znajdz kontakt diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang index 04e1d26974d..138ce5b91c7 100644 --- a/htdocs/langs/pl_PL/contracts.lang +++ b/htdocs/langs/pl_PL/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Minął ServiceStatusClosed=Zamknięte ServicesLegend=Usługi legendy Contracts=Kontrakty +ContractsAndLine=Contracts and line of contracts Contract=Kontrakt NoContracts=Nr umowy MenuServices=Usługi diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang index a1a4ba56588..d9628c890ea 100644 --- a/htdocs/langs/pl_PL/cron.lang +++ b/htdocs/langs/pl_PL/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang index a97ed635e4d..2cf540a0d8d 100644 --- a/htdocs/langs/pl_PL/errors.lang +++ b/htdocs/langs/pl_PL/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Źródło i celów rachunków bankowych muszą by ErrorBadThirdPartyName=Zła wartość w trzeciej imię ErrorProdIdIsMandatory=%s jest obowiązkowy ErrorBadCustomerCodeSyntax=Bad składni kodu klienta -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Klient kod wymagane ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Klient kod już używane @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=JavaScript nie musi być wyłączona do tej pracy f ErrorPasswordsMustMatch=Zarówno wpisane hasło musi się zgadzać się ErrorContactEMail=Techniczny błąd. Proszę skontaktować się z administratorem, aby po %s email pl zapewnić %s kod błędu w wiadomości, a nawet lepsze, dodając kopię ekranu strony. ErrorWrongValueForField=Nieprawidłowa wartość dla %s numer pola (wartość "%s" nie pasuje regex %s zasady) -ErrorFieldValueNotIn=Nieprawidłowa wartość dla %s liczba terenowych (value '%s "nie wartość dostępna w %s terenowych %s deserowe) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Nieprawidłowa wartość dla %s liczba pól (wartość '%s "nie jest %s istniejących ref) ErrorsOnXLines=Błędów na linii źródło %s ErrorFileIsInfectedWithAVirus=Program antywirusowy nie był w stanie potwierdzić (plik może być zainfekowany przez wirusa) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang index 474e25cf13d..2361a900a14 100644 --- a/htdocs/langs/pl_PL/install.lang +++ b/htdocs/langs/pl_PL/install.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - install -InstallEasy=Staraliśmy się by instalacja Dolibarra była tak prosta jak to możliwe. Postępuj wg instrukcji krok po kroku. +InstallEasy=Postępuj według instrukcji krok po kroku. MiscellaneousChecks=Sprawdzenie wymagań DolibarrWelcome=Witaj w Dolibarrze ConfFileExists=Plik konfiguracyjny %s istnieje. ConfFileDoesNotExists=Plik konfiguracyjny %s nie istnieje! ConfFileDoesNotExistsAndCouldNotBeCreated=Plik konfiguracyjny %s nie istnieje i nie mógł zostać utworzony! -ConfFileCouldBeCreated=Plik konfiguracyjny %s mógł zostać utworzony. +ConfFileCouldBeCreated=Plik konfiguracyjny %s został lub mógł zostać utworzony. ConfFileIsNotWritable=Plik konfiguracyjny %s nie ma uprawnień do zapisu. Sprawdź uprawnienia. Przy pierwszej instalacji Twój serwer WWW musi posiadać uprawnienia do zapisu tego pliku podczas procesu konfiguracji (Dla systemów uniksowych wystarczy wykonać polecenie "chmod 666"). ConfFileIsWritable=Plik konfiguracyjny %s ma uprawnienia do zapisu. ConfFileReload=Odśwież wszystkie informacje z pliku konfiguracyjnego. @@ -13,21 +13,21 @@ PHPSupportSessions=PHP obsługuje sesje. PHPSupportPOSTGETOk=PHP obsługuje zmienne POST i GET. PHPSupportPOSTGETKo=Możliwe, że PHP nie obsługuje zmiennych POST i/lub GET. Sprawdź parametr variables_order w php.ini. PHPSupportGD=PHP obsługuje graficzne funkcje GD. -PHPSupportUTF8=To wsparcie PHP UTF8 funkcji. -PHPMemoryOK=Maksymalna ilość pamięci sesji PHP to %s. Powinno wystarczyć. +PHPSupportUTF8=Ta wersja PHP oferuje wsparcie funkcji UTF8. +PHPMemoryOK=Maksymalna ilość pamięci sesji PHP ustawiona jest na %s. Powinno wystarczyć. PHPMemoryTooLow=Maksymalna ilość pamięci sesji PHP %s bajtów. To może nie wystarczyć. Zmień w php.ini parametr memory_limit na przynajmniej %s bajtów. -Recheck=Bardziej dokładny test +Recheck=Potwierdz w celu dokładniejszego testu ErrorPHPDoesNotSupportSessions=Instalacja PHP nie obsługuje sesji. Taka funkcjonalność jest wymagana do działania Dolibarra. Sprawdź swoje ustawienia PHP. -ErrorPHPDoesNotSupportGD=Twoja instalacji PHP nie obsługuje funkcji graficznych GD. Nr wykresie będą dostępne. -ErrorPHPDoesNotSupportUTF8=Twoja instalacji PHP nie obsługuje funkcji UTF8. Dolibarr może nie działać poprawnie. Rozwiązać ten problem przed instalacją Dolibarr. +ErrorPHPDoesNotSupportGD=Twoja instalacji PHP nie obsługuje funkcji graficznych GD. wykresy nie będą dostępne. +ErrorPHPDoesNotSupportUTF8=Twoja instalacji PHP nie obsługuje funkcji UTF8. Dolibarr może nie działać poprawnie. Rozwiązać ten problem przed instalacją Dolibarr'a. ErrorDirDoesNotExists=Katalog %s nie istnieje. -ErrorGoBackAndCorrectParameters=Cofnij się i popraw parametry. -ErrorWrongValueForParameter=Wprowadzono nieprawidłową wartość dla parametru '%s'. +ErrorGoBackAndCorrectParameters=Cofnij się i popraw złe parametry. +ErrorWrongValueForParameter=Możliwe, że wprowadzono nieprawidłową wartość dla parametru '%s'. ErrorFailedToCreateDatabase=Utworzenie bazy danych '%s' nie powiodło się. ErrorFailedToConnectToDatabase=Połączenie z bazą danych '%s' nie powiodło się. ErrorDatabaseVersionTooLow=Wersja (%s) bazy danych jest zbyt stara. Wymagana jest wersja %s lub wyższa. ErrorPHPVersionTooLow=Wersja PHP zbyt stara. Wymagana wersja to przynajmniej %s. -WarningPHPVersionTooLow=Wersja PHP jest zbyt stara. %s wersji lub więcej oczekuje. Wersja ta powinna umożliwić zainstalowanie ale nie jest obsługiwany. +WarningPHPVersionTooLow=Wersja PHP jest zbyt stara. Oczekiwana wersja %s lub większa. Wersja, którą posiadasz powinna umożliwić instalcję ale nie będzie obsługiwana. ErrorConnectedButDatabaseNotFound=Połączenie z serwerem powiodło się, ale nie znaleziony bazy '%s'. ErrorDatabaseAlreadyExists=Baza danych '%s' już istnieje. IfDatabaseNotExistsGoBackAndUncheckCreate=Jeśli baza danych nie istnieje, w poprzednim kroku zaznacz opcję "Utwórz bazę danych". @@ -38,13 +38,13 @@ YouCanContinue=Możesz kontynuować... PleaseBePatient=Proszę o cierpliwość... License=Użyta licencja ConfigurationFile=Plik konfiguracyjny -WebPagesDirectory=Katalog na strony WWW +WebPagesDirectory=Katalog, gdzie przechowywana jest strona WWW DocumentsDirectory=Katalog na przesłane i wygenerowane dokumenty URLRoot=Główny (Root) URL ForceHttps=Wymuś połączenia bezpieczne (HTTPS) CheckToForceHttps=Zaznacz tę opcję, aby wymusić połączenia bezpieczne (HTTPS).
Wymaga to, aby serwer WWW był skonfigurowany z certyfikatem SSL. -DolibarrDatabase=Baza danych Dolibarr -DatabaseChoice=Wybrana baza danych +DolibarrDatabase=Baza danych Dolibarr'a +DatabaseChoice=Wybór bazy danych DatabaseType=Rodzaj bazy danych DriverType=Rodzaj sterownika Server=Serwer @@ -54,16 +54,16 @@ DatabaseServer=Serwer baz danych DatabaseName=Nazwa bazy danych DatabasePrefix=Tabela prefiksów bazy danych Login=Login -AdminLogin=Login do bazy danych. Zostaw puste jeśli korzystasz z połączeń anonimowych +AdminLogin=Login do administratora bazy danych Password=Hasło PasswordAgain=Powtórz hasło -AdminPassword=Hasło do bazy danych. Zostaw puste jeśli korzystasz z połączeń anonimowych +AdminPassword=Hasło do bazy danych CreateDatabase=Utwórz bazę danych CreateUser=Utwórz użytkownika DatabaseSuperUserAccess=Baza danych z dostępem na prawach superużytkownika -CheckToCreateDatabase=Zaznacz jeśli baza danych nie istnieje i musi zostać utworzona.
W takim przypadku na dole tej strony musisz podać użytkownika/hasło do konta superużytkownika. -CheckToCreateUser=Zaznacz jeśli użytkownik nie istnieje i musi zostać utworzony.
W takim przypadku na dole tej strony musisz podać użytkownika/hasło do konta superużytkownika. -Experimental=(eksperymentalne, nie działające) +CheckToCreateDatabase=Zaznacz jeśli baza danych nie istnieje i musi zostać utworzona.
W przypadku takim na dole tej strony musisz podać użytkownika/hasło do konta superużytkownika. +CheckToCreateUser=Zaznacz jeśli użytkownik nie istnieje i musi zostać utworzony.
W przypadku takim na dole tej strony musisz podać użytkownika/hasło do konta superużytkownika. +Experimental=(eksperymentalnie, na własną odpowiedzialność) DatabaseRootLoginDescription=Login użytkownika mogącego tworzyć nowe bazy lub nowych użytkowników, wymagane jeśli baza danych oraz jej właściciel nie istnieją. KeepEmptyIfNoPassword=Zostaw puste jeśli użytkownik nie posiada hasła (unikaj takiej sytuacji) SaveConfigurationFile=Zapis wartości @@ -88,17 +88,17 @@ SystemIsInstalled=Instalacja zakończona. SystemIsUpgraded=Dolibarr został zaktualizowany pomyślnie. YouNeedToPersonalizeSetup=Teraz należy ustawić Dolibarra tak by spełniał Twoje wymagania (wygląd, możliwości, ...). Kliknij w poniższy link by przejść do ustawień: AdminLoginCreatedSuccessfuly=Użytkownik administracyjny Dolibarra '%s' utworzony pomyślnie. -GoToDolibarr=Idź do Dolibarr +GoToDolibarr=Idź do Dolibarr'a GoToSetupArea=Przejdź do ustawień Dolibarra -MigrationNotFinished=Wersja bazy danych nie jest w pełni aktualna, więc musisz uruchomić proces aktualizacji ponownie. +MigrationNotFinished=Wersja bazy danych nie jest w pełni aktualna. Musisz uruchomić proces aktualizacji ponownie. GoToUpgradePage=Wejdź na stronę aktualizacji ponownie Examples=Przykłady WithNoSlashAtTheEnd=Bez znaku ukośnika "/" na końcu DirectoryRecommendation=Zalecane jest by umieścić ten katalog poza katalogiem ze stronami WWW. LoginAlreadyExists=Już istnieje DolibarrAdminLogin=Użytkownik administracyjny Dolibarra -AdminLoginAlreadyExists=Konto administracyjne Dolibarra '%s' już istnieje. -WarningRemoveInstallDir=Ostrzeżenie: ze względów bezpieczeństwa po instalacji lub aktualizacji powinno się usunąć katalog install lub zmienić jego nazwę na install.lock by zapobiec jego nieuprawnionemu użyciu. +AdminLoginAlreadyExists=Konto administracyjne Dolibarra '%s' już istnieje. Cofnij się jeśli chcesz utworzyć kolejne. +WarningRemoveInstallDir=Ostrzeżenie: ze względów bezpieczeństwa by zapobiec nieuprawnionemu użyciu po instalacji lub aktualizacji powinno się usunąć katalog install lub zmienić jego nazwę na install.lock. ThisPHPDoesNotSupportTypeBase=Ta wersja PHP nie obsługuje żadnego interfejsu dostępu do baz danych typu %s FunctionNotAvailableInThisPHP=Niedostępne w tej wersji PHP MigrateScript=Skrypt migracyjny @@ -107,21 +107,21 @@ DataMigration=Migracja danych DatabaseMigration=Migracja struktur baz danych ProcessMigrateScript=Przetwarzanie skryptów ChooseYourSetupMode=Wybierz tryb instalacji i potwierdź przyciskiem "Start"... -FreshInstall=Świeża instalacja -FreshInstallDesc=Użyj tego trybu jeśli to pierwsza instalacja. Jeśli nie to w tym trybie można naprawić poprzednią niepełną instalację, ale w przypadku aktualizacji skorzystaj z trybu "Aktualizacja". +FreshInstall=Nowa instalacja +FreshInstallDesc=Użyj tego trybu jeśli to pierwsza instalacja. Jeśli nie, to w tym trybie można naprawić poprzednią niepełną instalację. W przypadku aktualizacji skorzystaj z trybu "Aktualizacja". Upgrade=Aktualizacja UpgradeDesc=Użyj tego trybu jeśli podmieniono stare pliki Dolibarra plikami z nowszej wersji. Ten tryb uaktualni bazę danych i poprzednie dane. Start=Start InstallNotAllowed=Ustawienie niedostępne przez uprawnienia conf.php NotAvailable=Niedostępne YouMustCreateWithPermission=Musisz utworzyć plik %s i ustawić mu prawa zapisu dla serwera WWW podczas procesu instalacyjnego. -CorrectProblemAndReloadPage=Proszę poprawić te ustawienia i odświeżyć stronę. +CorrectProblemAndReloadPage=Proszę poprawić te ustawienia i odświeżyć stronę (domyślnie F5). AlreadyDone=Migracja już przeprowadzona. DatabaseVersion=Wersja bazy danych ServerVersion=Wersja serwera baz danych YouMustCreateItAndAllowServerToWrite=Musisz utworzyć ten katalog i zezwolić serwerowi WWW na zapis w nim. CharsetChoice=Wybór zestawu kodowania -CharacterSetClient=Zestaw kodowania dla wygenerowanych stron HTML +CharacterSetClient=Zestaw kodowania użyty dla wygenerowanych stron HTML CharacterSetClientComment=Wybierz zestaw kodowania znaków dla stron HTML.
Domyślnym wyborem zestawu znaków jest ten zastosowany w bazie danych. DBSortingCollation=Sposób sortowania znaków DBSortingCollationComment=Wybierz stronę kodową, która definiuje sposób sortowania znaków używany przez bazę danych. Ten parametr jest często nazywany 'collation'.
Jeśli baza już istnieje, nie ma możliwości zdefiniowania tego parametru. @@ -129,45 +129,46 @@ CharacterSetDatabase=Zestaw znaków dla bazy danych CharacterSetDatabaseComment=Wybierz zesta znaków, który zostanie użyty do utworzenia bazy danych.
Jeśli baza już istnieje, nie ma możliwości zdefiniowania tego parametru. YouAskDatabaseCreationSoDolibarrNeedToConnect=Wybrano by utworzyć bazę danych %s, ale by tego dokonać Dolibarr musi połączyć się z serwerem %s na prawach superużytkownika %s. YouAskLoginCreationSoDolibarrNeedToConnect=Wybrano by utworzyć użytkownika %s, ale by tego dokonać Dolibarr musi połączyć się z serwerem %s na prawach superużytkownika %s. -BecauseConnectionFailedParametersMayBeWrong=Połączenie nie powiodło się, więc adres serwera lub parametry superużytkownika musiały być nieprawidłowe. +BecauseConnectionFailedParametersMayBeWrong=Połączenie nie powiodło się. Adres serwera lub parametry superużytkownika musiały być nieprawidłowe. OrphelinsPaymentsDetectedByMethod=Osierocona płatność wykryta przez metodę %s -RemoveItManuallyAndPressF5ToContinue=Usuń go ręcznie i odśwież stronę by kontynuować. +RemoveItManuallyAndPressF5ToContinue=Usuń go ręcznie i odśwież stronę (domyślnie F5) by kontynuować. KeepDefaultValuesWamp=Używasz kreatora instalacji, więc zaproponowane wartości są zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz. -KeepDefaultValuesDeb=Du bruker Dolibarr konfigurasjonsveiviseren fra en Ubuntu eller Debian-pakke, så verdiene foreslått her allerede er optimalisert. Bare passordet til databasen eieren til å opprette må fullføres. Endre andre parametere bare hvis du vet hva du gjør. +KeepDefaultValuesDeb=Uzywasz kreatora instalacji dla Linuxa (Ubutu, Debian, Fedora..), więc zaproponowane wartości są zoptymalizowane. Tylko hasło właściciela bazy danych do stworzenia musi być kompletne. Inne parametry zmieniaj TYLKO jeśli wiesz co robisz. KeepDefaultValuesMamp=Używasz kreatora instalacji, więc zaproponowane wartości są zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz. -KeepDefaultValuesProxmox=Możesz skorzystać z kreatora konfiguracji Dolibarr z urządzeniem wirtualnym Proxmox, więc wartościami zaproponowanymi tutaj są już zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz. +KeepDefaultValuesProxmox=Możesz skorzystać z kreatora konfiguracji Dolibarr z urządzeniem wirtualnym Proxmox, więc wartości zaproponowane tutaj są już zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz. FieldRenamed=Nazwa pola zmieniona -IfLoginDoesNotExistsCheckCreateUser=Jeśli logowania jeszcze nie istnieje, należy sprawdzić opcję "Utwórz użytkownika" -ErrorConnection=Serwer " %s", nazwa bazy danych " %s" login " %s" lub hasło bazy danych mogą być złe lub PHP wersji klienckiej może być zbyt stare porównaniu do wersji bazy danych. -InstallChoiceRecommanded=Zaleciły wybór zainstalować wersję %s od aktualnej wersji %s +IfLoginDoesNotExistsCheckCreateUser=Jeśli login jeszcze nie istnieje, sprawdzić opcję "Utwórz użytkownika" +ErrorConnection=Serwer " %s", nazwa bazy danych " %s" login " %s" lub hasło bazy danych mogą być złe lub PHP wersji klienckiej może być zbyt stare w porównaniu do wersji bazy danych. +InstallChoiceRecommanded=Zalecany wybór: zainstalować wersję %s od aktualnej wersji %s InstallChoiceSuggested=Wybór sugerowany przez instalator. -MigrateIsDoneStepByStep=Ukierunkowane wersja (%s) ma lukę w kilku wersjach, tak zainstalować kreator powróci do sugerować kolejną migrację raz ten jeden będzie gotowy. -CheckThatDatabasenameIsCorrect=Sjekk at database navn "%s" er korrekt. -IfAlreadyExistsCheckOption=Hvis dette navnet er riktig, og at databasen ikke eksisterer ennå, du må sjekke alternativet "Opprett database". -OpenBaseDir=PHP openbasedir parameter -YouAskToCreateDatabaseSoRootRequired=Du merket "Opprett database". For dette, må du oppgi brukernavn / passord av superbruker (nederst på skjemaet). -YouAskToCreateDatabaseUserSoRootRequired=Du merket "Opprett database eier". For dette, må du oppgi brukernavn / passord av superbruker (nederst på skjemaet). -NextStepMightLastALongTime=Gjeldende trinn kan vare i flere minutter. Vennligst vent til neste skjermbildet vises helt før du fortsetter. -MigrationCustomerOrderShipping=Migrer frakt for kundeordrer oppbevaring -MigrationShippingDelivery=Oppgrader lagring av shipping -MigrationShippingDelivery2=Oppgrader lagring av shipping 2 +MigrateIsDoneStepByStep=Konkretna wersja (%s) ma lukę w kilku wersjach, kreator powróci do sugerowawanej kolejnej migracji, kiedy aktualna będzie gotowa. +CheckThatDatabasenameIsCorrect=Sprawdz czy nazwa bazy danych "%s" jest poprawna. +IfAlreadyExistsCheckOption=Jeśli ta nazwa jest poprawna i baza danych jeszcze nie istnieje, sprawdz opcję "utwórz bazę danych" +OpenBaseDir=PHP parametr otwarcia katalogu bazy danych +YouAskToCreateDatabaseSoRootRequired=Zaznaczyłeś opcje "Stwórz baze danych". Wprowadz proszę nazwę i hasło Super Użytkownika +YouAskToCreateDatabaseUserSoRootRequired=Zaznaczyłeś opcje "Stwórz właściciela bazy danych". Wprowadz proszę nazwę i hasło Super Użytkownika. +NextStepMightLastALongTime=Aktulany krok potrwa chwilę. By kontynuować, proszę czekać, aż kolejny krok będzie dostępny. +MigrationCustomerOrderShipping=Migracja danych przesyłek zamówień odbiorców +MigrationShippingDelivery=Aktualizacja stanu do wysyłki +MigrationShippingDelivery2=Aktualizacja stanu do wysyłki 2 MigrationFinished=Migracja zakończona -LastStepDesc=Ostatni krok: Zdefiniuj tutaj login i hasło masz zamiar użyć do połączenia z oprogramowaniem. Nie trać tego, ponieważ jest to konto do administrowania wszystkimi innymi. +LastStepDesc=Ostatni krok: Zdefiniuj tutaj nazwę i hasło, które masz zamiar użyć do połączenia z oprogramowaniem. Zapamiętaj je, ponieważ jest to konto do administrowania wszystkimi innymi ustawieniami. ActivateModule=Aktywuj moduł %s ShowEditTechnicalParameters=Kliknij tutaj, aby pokazać / edytować zaawansowane parametry (tryb ekspert) -WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +WarningUpgrade=Uwaga:\nPamiętaj o zrobieniu kopi zapasowej bazy!\nWysoko rekomendowane: dla przykładu, podczas wystąpienia błędu w bazie danych systemu (dla przykładu w wersji 5.5.40 mySQL), niektóre dane lub tabele mogą zostać stracone podczas tego procesu. Rekomendowane jest by zrobic kopię swojej bazy przed migracją.\n\nNaciśnij OK by zacząć migrację... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade -MigrationFixData=Fastsette for denormalized data +MigrationFixData=Napraw nieznormalizowane dane MigrationOrder=Migracja danych zamówień odbiorców MigrationSupplierOrder=Migracja danych zamówień dostawców MigrationProposal=Migracja danych propozycji handlowych -MigrationInvoice=Migracja danych faktur odbiorców +MigrationInvoice=Migracja dla danych faktur odbiorców MigrationContract=Migracja danych kontraktów MigrationSuccessfullUpdate=Aktualizacja powiodła się MigrationUpdateFailed=Aktualizacja nie powiodła się -MigrationRelationshipTables=Data migrering for forholdet tabeller (%s) +MigrationRelationshipTables=Migracja dla danych propozycji handlowych (%s) MigrationPaymentsUpdate=Korekta danych płatności MigrationPaymentsNumberToUpdate=%s płatności do aktualizacji MigrationProcessPaymentUpdate=Aktualizacja płatności %s @@ -187,7 +188,7 @@ MigrationContractsInvalidDateFix=Korekta kontraktu %s (Data kontraktu=%s, Minima MigrationContractsInvalidDatesNumber=%s kontraktów zmodyfikowano MigrationContractsInvalidDatesNothingToUpdate=Brak dat z nieprawidłową wartością do korekty MigrationContractsIncoherentCreationDateUpdate=Nieprawidłowa wartość daty początkowej kontraktu do korekty -MigrationContractsIncoherentCreationDateUpdateSuccess=Nieprawidłowa wartość początkowej daty kontraktu skorygowana poprawnie +MigrationContractsIncoherentCreationDateUpdateSuccess=Nieprawidłowa wartość początkowej daty kontraktu. Skorygowana poprawnie MigrationContractsIncoherentCreationDateNothingToUpdate=Brak nieprawidłowych wartości początkowej daty kontraktu do korekty MigrationReopeningContracts=Otwarte kontrakty zamknięte z przyczyny błędu MigrationReopenThisContract=Ponownie otwórz kontrakt %s @@ -199,15 +200,15 @@ MigrationShipmentOrderMatching=Aktualizacja rachunków za wysyłki MigrationDeliveryOrderMatching=Aktualizacja rachunków za dostawy MigrationDeliveryDetail=Aktualizacja dostawy MigrationStockDetail=Aktualizacja wartości zapasów produktów -MigrationMenusDetail=Aktualizacja dynamiczne menu tabele +MigrationMenusDetail=Aktualizacja dynamicznego meni tabeli MigrationDeliveryAddress=Aktualizacja adresu dostarczenia przesyłki -MigrationProjectTaskActors=Data migrering for llx_projet_task_actors bord -MigrationProjectUserResp=Data migrering feltet fk_user_resp av llx_projet å llx_element_contact -MigrationProjectTaskTime=Oppdater tid i sekunder +MigrationProjectTaskActors=Migracja danych z tabeli llx_projet_task_actors +MigrationProjectUserResp=Migracja danych pola fk_user_resp z llx_projet do llx_element_contact +MigrationProjectTaskTime=Pokonany czas uaktualnienia w sekundach MigrationActioncommElement=Aktualizacja danych na temat działań MigrationPaymentMode=Migracji danych w trybie płatności MigrationCategorieAssociation=Migracja kategorii -MigrationEvents=Migration of events to add event owner into assignement table +MigrationEvents=Przenieś wydarzenie by dodać nowego właściciela do przypisanej tabeli. -ShowNotAvailableOptions=Show not available options -HideNotAvailableOptions=Hide not available options +ShowNotAvailableOptions=Pokaż niedostępne opcje. +HideNotAvailableOptions=Ukryj niedostępne opcje. diff --git a/htdocs/langs/pl_PL/ldap.lang b/htdocs/langs/pl_PL/ldap.lang index af146a42d6e..5ab82adba70 100644 --- a/htdocs/langs/pl_PL/ldap.lang +++ b/htdocs/langs/pl_PL/ldap.lang @@ -17,13 +17,13 @@ LDAPUsers=Użytkowników w bazie danych LDAP LDAPGroups=Grupy w bazie danych LDAP LDAPFieldStatus=Stan LDAPFieldFirstSubscriptionDate=Pierwsze subskrypcji daty -LDAPFieldFirstSubscriptionAmount=Fist kwoty abonamentu +LDAPFieldFirstSubscriptionAmount=Pierwsza subskrypcja kwoty LDAPFieldLastSubscriptionDate=Ostatnia data subskrypcji LDAPFieldLastSubscriptionAmount=Ostatnia kwota subskrypcji SynchronizeDolibarr2Ldap=Synchronizacja użytkownika (Dolibarr -> LDAP) -UserSynchronized=Użytkownik zsynchronizowane -GroupSynchronized=Grupa zsynchronizowane +UserSynchronized=Użytkownik zsynchronizowany +GroupSynchronized=Grupa zsynchronizowana MemberSynchronized=Państwa zsynchronizowane -ContactSynchronized=Kontakt zsynchronizowane -ForceSynchronize=Siły synchronizujące Dolibarr -> LDAP +ContactSynchronized=Kontakt zsynchronizowany +ForceSynchronize=Synchronizacja użytkownika (Dolibarr -> LDAP) ErrorFailedToReadLDAP=Nie można odczytać bazy danych LDAP. Sprawdź LDAP moduł konfiguracji bazy danych i dostępności. diff --git a/htdocs/langs/pl_PL/link.lang b/htdocs/langs/pl_PL/link.lang index 8b1efb75ef3..81c4c7b4ffd 100644 --- a/htdocs/langs/pl_PL/link.lang +++ b/htdocs/langs/pl_PL/link.lang @@ -1,8 +1,8 @@ -LinkANewFile=Link a new file/document -LinkedFiles=Linked files and documents -NoLinkFound=No registered links -LinkComplete=The file has been linked successfully -ErrorFileNotLinked=The file could not be linked -LinkRemoved=The link %s has been removed -ErrorFailedToDeleteLink= Failed to remove link '%s' -ErrorFailedToUpdateLink= Failed to update link '%s' +LinkANewFile=Podepnij nowy plik/dokument +LinkedFiles=Podepnij plik i dokument +NoLinkFound=Brak zarejestrowanych linków +LinkComplete=Plik został podlinkowany poprawnie +ErrorFileNotLinked=Plik nie mógł zostać podlinkowany +LinkRemoved=Link %s został usunięty +ErrorFailedToDeleteLink= Niemożna usunąc linku '%s' +ErrorFailedToUpdateLink= Niemożna uaktualnić linku '%s' diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index ddad87dc664..edc327913a3 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -5,104 +5,104 @@ DIRECTION=ltr # stsongstdlight or cid0cs are for simplified Chinese # To read Chinese pdf with Linux: sudo apt-get install poppler-data FONTFORPDF=DejaVuSans -FONTSIZEFORPDF=8 +FONTSIZEFORPDF=10 SeparatorDecimal=, SeparatorThousand=Space -FormatDateShort=%d-%m-%Y -FormatDateShortInput=%d-%m-%Y -FormatDateShortJava=dd-MM-yyyy -FormatDateShortJavaInput=dd-MM-yyyy -FormatDateShortJQuery=dd-mm-yy -FormatDateShortJQueryInput=dd-mm-yy -FormatHourShortJQuery=HH:MI -FormatHourShort=%H:%M +FormatDateShort=%d-%m-%r +FormatDateShortInput=%d-%m-%r +FormatDateShortJava=dd-MM-rrrr +FormatDateShortJavaInput=dd-MM-rrrr +FormatDateShortJQuery=dd-mm-rr +FormatDateShortJQueryInput=dd-mm-rr +FormatHourShortJQuery=HH:MM +FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M -FormatDateTextShort=%d %b %Y -FormatDateText=%d %B %Y -FormatDateHourShort=%d-%m-%Y %H:%M +FormatDateTextShort=%d %b %R +FormatDateText=%B %d, %Y +FormatDateHourShort=%m/%d/%Y %I:%M %p FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p -FormatDateHourTextShort=%d %b %Y %H:%M -FormatDateHourText=%d %B %Y %H:%M +FormatDateHourTextShort=%b %d, %Y, %I:%M %p +FormatDateHourText=%B %d, %Y, %I:%M %p DatabaseConnection=Połączenia z bazą danych NoTranslation=Brak tłumaczenia -NoRecordFound=No record found +NoRecordFound=Rekord nie został znaleziony. NoError=Brak błędów Error=Błąd ErrorFieldRequired=Pole ' %s' jest wymagane ErrorFieldFormat=Pole ' %s' ma złe wartości ErrorFileDoesNotExists=Plik %s nie istnieje ErrorFailedToOpenFile=Nie można otworzyć pliku %s -ErrorCanNotCreateDir=Nie można utworzyć %s reż -ErrorCanNotReadDir=Nie można odczytać %s reż -ErrorConstantNotDefined=Parametr %s nie zostało zdefiniowane -ErrorUnknown=Unknown error +ErrorCanNotCreateDir=Nie można utworzyć folderu %s +ErrorCanNotReadDir=Nie można odczytać folderu %s +ErrorConstantNotDefined=Parametr %s nie został zdefiniowany +ErrorUnknown=Nieznany błąd ErrorSQL=Błąd SQL -ErrorLogoFileNotFound=Logo file ' %s' nie został odnaleziony -ErrorGoToGlobalSetup=Idź do "Firma / Fundacja" Aby rozwiązać ten problem z konfiguracją -ErrorGoToModuleSetup=Przejdź do modułu konfiguracji Aby rozwiązać ten -ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=Nie można wysłać mail (nadawcy= %s, odbiornik= %s) -ErrorAttachedFilesDisabled=Podłączanie plików funkcja jest wyłączona na tym serveur -ErrorFileNotUploaded=Plik nie został załadowany. Sprawdź, czy rozmiar nie przekracza maksymalnej dopuszczalnej, że wolnego miejsca jest dostępna na dysku i że nie ma już plik o takiej samej nazwie w tym katalogu. +ErrorLogoFileNotFound=Logo pliku ' %s' nie zostało odnalezione +ErrorGoToGlobalSetup=Idź do "Firma / Fundacja" Aby rozwiązać problem +ErrorGoToModuleSetup=Przejdź do modułu konfiguracji aby naprawić +ErrorFailedToSendMail=Próba wysłania maila nie udana (nadawca=%s, odbiorca=%s) +ErrorAttachedFilesDisabled=Na tym serwerze funkcja łączania plików jest wyłączona +ErrorFileNotUploaded=Plik nie został załadowany. Sprawdź, czy rozmiar nie przekracza maksymalnej dopuszczalnej wagi, lub czy wolne miejsce jest dostępne na dysku. Sprawdz czy nie ma już pliku o takiej samej nazwie w tym katalogu. ErrorInternalErrorDetected=Wykryto błąd -ErrorNoRequestRan=Nr wniosek prowadził -ErrorWrongHostParameter=Niewłaściwy hosta parametr -ErrorYourCountryIsNotDefined=Twój kraj nie jest zdefiniowane. Przejdź do Start-setup-Edycja i po raz kolejny formularz. -ErrorRecordIsUsedByChild=Nie można usunąć rekordu. Ten zapis jest używany przez co najmniej na dziecko rekordy. +ErrorNoRequestRan=Brak aktywnych zapytań +ErrorWrongHostParameter=Niewłaściwy parametr hosta +ErrorYourCountryIsNotDefined=Twój kraj nie został zdefiniowany. Przejdź do Start-setup-Edycja i wypełnij poprawnie formularz. +ErrorRecordIsUsedByChild=Nie można usunąć rekordu. Ten zapis jest używany przez co najmniej jeden pokrewny rekord. ErrorWrongValue=Błędna wartość ErrorWrongValueForParameterX=Nieprawidłowa wartość dla parametru %s -ErrorNoRequestInError=Żadne życzenie nie jest w błędzie +ErrorNoRequestInError=Nie wykryto żadneog błednego zapytania. ErrorServiceUnavailableTryLater=Usługa nie jest dostępna w tej chwili. Spróbuj ponownie później. ErrorDuplicateField=Zduplikuj niepowtarzalną wartość w polu -ErrorSomeErrorWereFoundRollbackIsDone=Niektóre błędy znaleziono. Mamy cofnąć zmiany. -ErrorConfigParameterNotDefined=Parametr %s nie jest zdefiniowany wewnątrz Dolibarr plik konfiguracyjny conf.php. -ErrorCantLoadUserFromDolibarrDatabase=Nie można znaleźć użytkownika %s Dolibarr w bazie danych. +ErrorSomeErrorWereFoundRollbackIsDone=Znaleziono błedy. Cofam zmiany +ErrorConfigParameterNotDefined=Parametr %s nie jest zdefiniowany wewnątrz pliku konfiguracyjnego conf.php. Dollibara +ErrorCantLoadUserFromDolibarrDatabase=Nie można znaleźć użytkownika %s Dolibarra w bazie danych. ErrorNoVATRateDefinedForSellerCountry=Błąd, nie określono stawki VAT dla kraju " %s". -ErrorNoSocialContributionForSellerCountry=Błąd, nie typ społeczny wkład określone dla kraju "%s". +ErrorNoSocialContributionForSellerCountry=Błąd, społeczny wkład określony dla kraju %s niezdefiniowany. ErrorFailedToSaveFile=Błąd, nie udało się zapisać pliku. -SetDate=Set date -SelectDate=Select a date -SeeAlso=See also %s -SeeHere=See here +SetDate=Ustaw datę +SelectDate=Wybierz datę +SeeAlso=Zobacz także %s +SeeHere=Zobacz tutaj BackgroundColorByDefault=domyślny kolor tła -FileNotUploaded=The file was not uploaded -FileUploaded=The file was successfully uploaded -FileWasNotUploaded=Wybraniu pliku do zamocowania, ale jeszcze nie wysłał. Kliknij na "Dołącz plik" w tej sprawie. -NbOfEntries=Uwaga wpisów -GoToWikiHelpPage=Przeczytaj pomoc online (potrzeba dostępu do Internetu) +FileNotUploaded=Plik nie został wysłany +FileUploaded=Plik został pomyślnie przesłany +FileWasNotUploaded=Wybrano pliku do zamontowaia, ale jeszcze nie wysłano. W tym celu wybierz opcję "dołącz plik". +NbOfEntries=Liczba wejść +GoToWikiHelpPage=Przeczytaj pomoc online GoToHelpPage=Przeczytaj pomoc -RecordSaved=Zapis zapisane -RecordDeleted=Record deleted -LevelOfFeature=Poziom funkcje +RecordSaved=Rekord zapisany +RecordDeleted=Rekord usunięty +LevelOfFeature=możliwości funkcji NotDefined=Nie zdefiniowany -DefinedAndHasThisValue=Zdefiniowane i wartości -IsNotDefined=undefined -DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr uwierzytelniania w trybie %s do konfiguracji w pliku konfiguracyjnym conf.php.
Oznacza to, że hasło do bazy danych jest extern Dolibarr, więc zmianę tej dziedzinie może mieć skutki. +DefinedAndHasThisValue=Zdefiniowao i przeliczono +IsNotDefined=Nie zdefiniowano +DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr uwierzytelnia w trybie %s do konfiguracji w pliku konfiguracyjnym conf.php.
Oznacza to, że hasło do bazy danych jest zewnętrzne Dolibarr, więc zmiany w tej dziedzinie mogą nie mieć skutków. Administrator=Administrator -Undefined=Niezdefiniowana +Undefined=Niezdefiniowano PasswordForgotten=Zapomniałeś hasła? SeeAbove=Patrz wyżej HomeArea=Strona Startowa LastConnexion=Ostatnie połączenia PreviousConnexion=Poprzednie połączenia -ConnectedOnMultiCompany=Połączenie na podmiot -ConnectedSince=Połączenie od -AuthenticationMode=Autentyczności trybie -RequestedUrl=Żądanego adresu -DatabaseTypeManager=Database Type Manager -RequestLastAccess=Wniosek o ostatnim dostępu do baz danych -RequestLastAccessInError=Wniosek o ostatnim dostępu do baz danych w wyniku błędu -ReturnCodeLastAccessInError=Kod powrotu do ostatniego dostępu do baz danych w błąd -InformationLastAccessInError=Informacje dla ostatniego dostępu do baz danych w błąd -DolibarrHasDetectedError=Dolibarr wykrył błędu technicznego -InformationToHelpDiagnose=To informacje, które mogą pomóc w diagnozowaniu +ConnectedOnMultiCompany=Podłączono do środowiska +ConnectedSince=Połączeno od +AuthenticationMode=Tryb autentycznośći +RequestedUrl=Zażądano adresu URL +DatabaseTypeManager=Typ managera bazy danych +RequestLastAccess=Zapytanie o ostatni dostęp do baz danych +RequestLastAccessInError=Zapytanie o ostatni dostęp do baz danych w wyniku błędu +ReturnCodeLastAccessInError=Kod powrotu ostatniego dostępu do baz danych w błędzie +InformationLastAccessInError=Informacje ostatniego dostępu do baz danych w błędzie +DolibarrHasDetectedError=Dolibarr wykrył błąd techniczny +InformationToHelpDiagnose=Informacje, które mogą pomóc w diagnozowaniu MoreInformation=Więcej informacji -TechnicalInformation=Technical information -NotePublic=Uwaga (publiczne) -NotePrivate=Uwaga (prywatne) -PrecisionUnitIsLimitedToXDecimals=Dolibarr był konfiguracji do ograniczenia dokładności cen jednostkowych do %s miejsc po przecinku. +TechnicalInformation=Informację techniczne +NotePublic=Uwaga (publiczna) +NotePrivate=Uwaga (prywatna) +PrecisionUnitIsLimitedToXDecimals=Dolibarr ustawił ograniczenia dokładności cen jednostkowych do %s miejsc po przecinku. DoTest=Test ToFilter=Filtr -WarningYouHaveAtLeastOneTaskLate=Ostrzeżenie, masz co najmniej jeden element, który przekroczył tolerancji zwłoki. +WarningYouHaveAtLeastOneTaskLate=Ostrzeżenie! masz co najmniej jeden element, który przekroczył tolerancje zwłoki. yes=tak Yes=Tak no=nie @@ -116,41 +116,42 @@ Always=Zawsze Never=Nigdy Under=pod Period=Okres -PeriodEndDate=Datę zakończenia okresu +PeriodEndDate=Data zakończenia okresu Activate=Uaktywnij Activated=Aktywowany Closed=Zamknięte Closed2=Zamknięte -Enabled=Włączone -Deprecated=Deprecated -Disable=Wyłączyć -Disabled=Niepełnosprawnych +Enabled=Dostępne +Deprecated=Nieaktualne +Disable=Niedostępne +Disabled=Niedostępne/Wyłączone Add=Dodać AddLink=Dodaj link Update=Uaktualnić -AddActionToDo=Dodaj do działania -AddActionDone=Dodaj działania zrobienia -Close=Blisko -Close2=Blisko +AddActionToDo=Dodaj działanie do +AddActionDone=Dodaj działania zrobiene +Close=Zamknij +Close2=Zamknij Confirm=Potwierdź -ConfirmSendCardByMail=Czy na pewno chcesz wysłać tę kartę pocztą? -Delete=Usunąć +ConfirmSendCardByMail=Czy na pewno chcesz wysłać tą treść mailem do %s? +Delete=Skasować Remove=Usunąć -Resiliate=Resiliate +Resiliate=Wypowiedzenie Cancel=Zrezygnuj Modify=Modyfikuj Edit=Edytuj -Validate=Validate +Validate=Potwierdz +ValidateAndApprove=Validate and Approve ToValidate=Aby potwierdzić Save=Zapisać SaveAs=Zapisz jako TestConnection=Test połączenia -ToClone=Clone -ConfirmClone=Wybierz dane, które chcesz klon: -NoCloneOptionsSpecified=Brak danych na klon zdefiniowane. +ToClone=Duplikuj +ConfirmClone=Wybierz dane, które chcesz zduplikować +NoCloneOptionsSpecified=Brak zdefiniowanych danych do zduplikowania. Of=z -Go=Go -Run=Run +Go=Idź +Run=Uruchom CopyOf=Kopia Show=Pokazać ShowCardHere=Pokaż kartę @@ -158,20 +159,21 @@ Search=Wyszukaj SearchOf=Szukaj Valid=Aktualny Approve=Zatwierdź -ReOpen=Re-Open +Disapprove=Disapprove +ReOpen=Otwórz ponownie Upload=Wyślij plik -ToLink=Link +ToLink=Łącze Select=Wybierz Choose=Wybrać ChooseLangage=Proszę wybrać język Resize=Zmiana rozmiaru -Recenter=Recenter +Recenter=Wyśrodkuj Author=Autor User=Użytkownik Users=Użytkownicy Group=Grupa Groups=Grupy -NoUserGroupDefined=No user group defined +NoUserGroupDefined=Niezdefiniowano grup użytkowników Password=Hasło PasswordRetype=Powtórz hasło NoteSomeFeaturesAreDisabled=Należy pamiętać, że wiele funkcji / modułów są wyłączone w tej demonstracji. @@ -180,36 +182,36 @@ Person=Osoba Parameter=Parametr Parameters=Parametry Value=Wartość -GlobalValue=Global Value +GlobalValue=Globalna wartość PersonalValue=Osobiste wartości NewValue=Nowa wartość CurrentValue=Aktualna wartość Code=Kod Type=Typ Language=Język -MultiLanguage=Multi-language +MultiLanguage=Wielo-językowość Note=Uwaga CurrentNote=Aktualna uwaga Title=Tytuł Label=Etykieta RefOrLabel=Nr ref. lub etykieta -Info=Zaloguj +Info=Log Family=Rodzina Description=Opis Designation=Opis Model=Model -DefaultModel=Domyślne modelu +DefaultModel=Domyślny model Action=Działanie About=O Number=Liczba NumberByMonth=Ilość na miesiąc -AmountByMonth=Kwota, o miesiąc -Numero=Numero +AmountByMonth=Kwota na miesiąc +Numero=Numer Limit=Limit Limits=Limity DevelopmentTeam=Development Team Logout=Wyloguj -NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s +NoLogoutProcessWithAuthMode=żadna aplikacja nierozłączona w skutek uwierzytelniania trybu %s Connection=Połączenie Setup=Konfiguracja Alert=Sygnał @@ -219,60 +221,61 @@ Cards=Kartki Card=Karta Now=Teraz Date=Data +DateAndHour=Date and hour DateStart=Data rozpoczęcia DateEnd=Data zakończenia DateCreation=Data utworzenia DateModification=Zmiana daty -DateModificationShort=Modif. data +DateModificationShort=Modyfik. daty DateLastModification=Ostatnia zmiana daty -DateValidation=Walidacja daty +DateValidation=Zatwierdzenie daty DateClosing=Ostateczny termin -DateDue=Termin +DateDue=W trakcie terminu DateValue=Wartość daty DateValueShort=Wartość daty DateOperation=Data operacji -DateOperationShort=OPE. Data +DateOperationShort=Data operacji DateLimit=Limit daty -DateRequest=Wniosek daty +DateRequest=Żądanie daty DateProcess=Proces daty -DatePlanShort=Data strugane -DateRealShort=Data rzeczywistym. -DateBuild=Sprawozdanie budować daty +DatePlanShort=Planowana data +DateRealShort=Rzeczywista data +DateBuild=Raport stworzenia daty DatePayment=Data płatności DurationYear=rok DurationMonth=miesiąc DurationWeek=tydzień DurationDay=dzień DurationYears=lat -DurationMonths=miesiąc -DurationWeeks=tydzień -DurationDays=dzień +DurationMonths=miesięcy +DurationWeeks=tygodni +DurationDays=dni Year=Rok Month=Miesiąc Week=Tydzień Day=Dzień Hour=Godzina Minute=Minute -Second=Po drugie +Second=Sekund Years=Lata Months=Miesiące Days=Dni -days=dzień +days=dni Hours=Godziny -Minutes=Protokoły +Minutes=Minut Seconds=Sekund -Weeks=Weeks +Weeks=Tygodnie Today=Dzisiaj Yesterday=Wczoraj Tomorrow=Jutro -Morning=Morning -Afternoon=Afternoon -Quadri=Quadri -MonthOfDay=Miesiąc dzień -HourShort=O +Morning=Rano +Afternoon=Popołudniu +Quadri=Kwadrans +MonthOfDay=Dzień miesiąca +HourShort=H MinuteShort=mn -Rate=Tempo -UseLocalTax=Include tax +Rate=Stawka +UseLocalTax=Zawiera podatek Bytes=Bajty KiloBytes=Kilobajtów MegaBytes=MB @@ -283,55 +286,56 @@ Kb=Kb Mb=Mb Gb=Gb Tb=Tb -Cut=Ciąć +Cut=Wytnij Copy=Kopiowanie Paste=Wklej Default=Domyślny DefaultValue=Wartość domyślna -DefaultGlobalValue=Global Value +DefaultGlobalValue=Wartość globalna Price=Cena UnitPrice=Cena jednostkowa UnitPriceHT=Cena jednostkowa (netto) UnitPriceTTC=Cena jednostkowa -PriceU=UP -PriceUHT=UP (netto) -PriceUTTC=UP +PriceU=cen/szt. +PriceUHT=cen/szt (netto) +AskPriceSupplierUHT=P.U. HT Requested +PriceUTTC=cena/szt. Amount=Ilość AmountInvoice=Kwota faktury AmountPayment=Kwota płatności AmountHTShort=Kwota (netto) -AmountTTCShort=Kwota (Inc podatkowych) -AmountHT=Kwoty (po odliczeniu podatku) -AmountTTC=Kwota (Inc podatkowych) +AmountTTCShort=Kwota (zawierająca VAT) +AmountHT=Kwota (netto bez podatku) +AmountTTC=Kwota (zawierająca VAT) AmountVAT=Kwota podatku VAT -AmountLT1=Amount tax 2 -AmountLT2=Amount tax 3 -AmountLT1ES=Kwoty RE +AmountLT1=Wartość podatku 2 +AmountLT2=Wartość podatku 3 +AmountLT1ES=Kwota RE AmountLT2ES=Kwota IRPF AmountTotal=Całkowita kwota AmountAverage=Średnia kwota -PriceQtyHT=Cena za tę ilość (po odliczeniu podatku) -PriceQtyMinHT=Cena ilości min. (po odliczeniu podatku) -PriceQtyTTC=Cena za tę ilość (Inc podatkowych) -PriceQtyMinTTC=Cena ilości min. (Inc podatkowych) -Percentage=Pourcentage +PriceQtyHT=Cena za tę ilość (netto) +PriceQtyMinHT=Cena ilości min. (netto) +PriceQtyTTC=Cena za tę ilość (z VAT) +PriceQtyMinTTC=Cena ilości min. (z VAT) +Percentage=Procentowo Total=Razem -SubTotal=Razem +SubTotal=Po podliczeniu TotalHTShort=Ogółem (netto) -TotalTTCShort=Ogółem (Inc podatkowych) +TotalTTCShort=Ogółem (z VAT) TotalHT=Razem (po odliczeniu podatku) -TotalHTforthispage=Total (net of tax) for this page -TotalTTC=Ogółem (Inc podatkowych) -TotalTTCToYourCredit=Ogółem (Inc podatku) na konto kredytowe -TotalVAT=Razem z VAT -TotalLT1=Total tax 2 -TotalLT2=Total tax 3 +TotalHTforthispage=Razem (po odliczeniu podatku) dla tej strony +TotalTTC=Ogółem (z VAT) +TotalTTCToYourCredit=Ogółem (z VAT) na twoje konto +TotalVAT=Razem VAT +TotalLT1=Podatek całkowity 2 +TotalLT2=Podatek całkowity 3 TotalLT1ES=Razem RE TotalLT2ES=Razem IRPF -IncludedVAT=Zaliczenie podatku VAT -HT=Bez podatku -TTC=Inc VAT -VAT=VAT +IncludedVAT=Zawiera VAT +HT=Bez VAT +TTC=z VAT +VAT=Sprzedaż opodatkowana VAT LT1ES=RE LT2ES=IRPF VATRate=Stawka VAT @@ -345,47 +349,47 @@ FullList=Pełna lista Statistics=Statystyki OtherStatistics=Inne statystyki Status=Stan -Favorite=Favorite +Favorite=Ulubiony ShortInfo=Info. Ref=Nr ref. RefSupplier=Nr ref. Dostawca RefPayment=Nr ref. płatności -CommercialProposalsShort=Commercial propozycje +CommercialProposalsShort=Propozycje komercyjne Comment=Komentarz Comments=Komentarze -ActionsToDo=Działania mające na celu nie -ActionsDone=Działania zrobić -ActionsToDoShort=Aby to zrobić -ActionsRunningshort=Rozpoczęcie +ActionsToDo=Działania do zrobienia +ActionsDone=Działania zrobione +ActionsToDoShort=Do zrobienia +ActionsRunningshort=Rozpoczęto ActionsDoneShort=Zrobione ActionNotApplicable=Nie dotyczy -ActionRunningNotStarted=Nie rozpoczęto -ActionRunningShort=Rozpoczęcie +ActionRunningNotStarted=By rozpocząć +ActionRunningShort=Rozpoczęte ActionDoneShort=Zakończone -ActionUncomplete=Uncomplete +ActionUncomplete=Niekompletne CompanyFoundation=Firma / Fundacja -ContactsForCompany=Kontakty na ten trzeciej -ContactsAddressesForCompany=Contacts/addresses for this third party -AddressesForCompany=Addresses for this third party -ActionsOnCompany=Działania na temat tej osoby trzeciej -ActionsOnMember=Wydarzenia O tego użytkownika -NActions=%s działania +ContactsForCompany=Kontakty dla tego zamówienia +ContactsAddressesForCompany=Kontakt/adres dla tej części/zamówienia/ +AddressesForCompany=Adressy dla części trzeciej +ActionsOnCompany=Działania na temat tego zamówienia +ActionsOnMember=Informacje o wydarzeniach dla tego uzytkownika +NActions=%s wydarzeń NActionsLate=%s późno -RequestAlreadyDone=Request already recorded +RequestAlreadyDone=Żądanie już wysłane Filter=Filtr RemoveFilter=Usuń filtr -ChartGenerated=Wykres generowany -ChartNotGenerated=Wykres nie powstały -GeneratedOn=Budować na %s +ChartGenerated=Wykres wygenerowany +ChartNotGenerated=Wykres niewygenerowany +GeneratedOn=Zbuduj na %s Generate=Wygeneruj Duration=Czas trwania TotalDuration=Łączny czas trwania Summary=Podsumowanie MyBookmarks=Moje zakładki OtherInformationsBoxes=Inne informacje -DolibarrBoard=Dolibarr pokładzie +DolibarrBoard=Załoga Dollibara DolibarrStateBoard=Statystyki -DolibarrWorkBoard=Pracy zadań pokładzie +DolibarrWorkBoard=Zadania załogi Available=Dostępny NotYetAvailable=Nie są jeszcze dostępne NotAvailable=Niedostępne @@ -394,7 +398,7 @@ Categories=Kategorie Category=Kategoria By=Przez From=Od -to=by +to=do and=i or=lub Other=Inny @@ -403,11 +407,11 @@ OtherInformations=Inne informacje Quantity=Ilość Qty=Ilosc ChangedBy=Zmieniona przez -ReCalculate=Recalculate +ReCalculate=Przelicz ResultOk=Sukces ResultKo=Porażka -Reporting=Sprawozdawczość -Reportings=Sprawozdawczość +Reporting=Raportowanie +Reportings=Raportowanie Draft=Szkic Drafts=Robocze Validated=Zatwierdzona @@ -418,26 +422,26 @@ Unknown=Nieznany General=Ogólne Size=Rozmiar Received=Odebrane -Paid=Paid -Topic=SUJET -ByCompanies=Według firm -ByUsers=Przez użytkowników +Paid=Zapłacone +Topic=Temat +ByCompanies=Według zamówień +ByUsers=Według użytkowników Links=Linki -Link=Łącze +Link=Link Receipts=Wpływy -Rejects=Odrzuca +Rejects=Odrzucone Preview=Podgląd NextStep=Następny krok PreviousStep=Poprzedni krok -Datas=Danych +Datas=Dane None=Żaden NoneF=Żaden Late=Późno -Photo=Obrazek -Photos=Foto -AddPhoto=Dodaj zdjęcie +Photo=Obraz +Photos=Obrazy +AddPhoto=Dodaj obraz Login=Login -CurrentLogin=Aktualna logowania +CurrentLogin=Aktualny login January=Styczeń February=Luty March=Marzec @@ -450,23 +454,23 @@ September=Wrzesień October=Październik November=Listopad December=Grudzień -JanuaryMin=Jan -FebruaryMin=Luty +JanuaryMin=Sty +FebruaryMin=Lut MarchMin=Mar -AprilMin=Kwietnia +AprilMin=Kwi MayMin=Maj -JuneMin=Czerwca -JulyMin=Lipca -AugustMin=Sierpnia -SeptemberMin=Września -OctoberMin=Października -NovemberMin=Listopada -DecemberMin=Grudzień +JuneMin=Cze +JulyMin=Lip +AugustMin=Sier +SeptemberMin=Wrz +OctoberMin=Paź +NovemberMin=Lis +DecemberMin=Gru Month01=styczeń Month02=luty Month03=marzec Month04=kwiecień -Month05=może +Month05=maj Month06=cze Month07=lipiec Month08=sierpień @@ -474,53 +478,54 @@ Month09=wrzesień Month10=październik Month11=listopad Month12=grudzień -MonthShort01=styczeń -MonthShort02=luty +MonthShort01=sty +MonthShort02=lut MonthShort03=mar -MonthShort04=kwiecień -MonthShort05=może +MonthShort04=kwi +MonthShort05=maj MonthShort06=cze -MonthShort07=lipiec -MonthShort08=sierpień -MonthShort09=sep -MonthShort10=październik -MonthShort11=listopad -MonthShort12=grudzień +MonthShort07=lip +MonthShort08=sier +MonthShort09=wrz +MonthShort10=paź +MonthShort11=lis +MonthShort12=gru AttachedFiles=Dołączone pliki i dokumenty -FileTransferComplete=Plik został przesłany successfuly +FileTransferComplete=Plik został przesłany poprawnie DateFormatYYYYMM=RRRR-MM DateFormatYYYYMMDD=RRRR-MM-DD DateFormatYYYYMMDDHHMM=RRRR-MM-DD GG: SS ReportName=Nazwa raportu -ReportPeriod=Okresu sprawozdawczego +ReportPeriod=Raport z okresu ReportDescription=Opis Report=Sprawozdanie -Keyword=Mot cl +Keyword=brak odpowiednika/ cant be translated. Legend=Legenda -FillTownFromZip=Wypełnij miasta zip -Fill=Fill -Reset=Reset +FillTownFromZip=Wypełnij miasta po kodzie +Fill=Wypełnij +Reset=Wyczyść ShowLog=Pokaż dziennik File=Plik Files=Pliki NotAllowed=Niedozwolone -ReadPermissionNotAllowed=Czytaj zgody nie wolno +ReadPermissionNotAllowed=brak uprawnień odczytu AmountInCurrency=Kwota w walucie %s Example=Przykład Examples=Przykłady -NoExample=Nr przykład +NoExample=brak przykładu FindBug=Zgłoś błąd -NbOfThirdParties=Liczba osób trzecich +NbOfThirdParties=Liczba zamówień NbOfCustomers=Liczba klientów NbOfLines=Liczba linii NbOfObjects=Liczba obiektów NbOfReferers=Liczba stron odsyłających -Referers=Refering objects +Referers=Liczba objektów TotalQuantity=Całkowita ilość DateFromTo=Z %s do %s DateFrom=Z %s -DateUntil=Do %s +DateUntil=Dopuki %s Check=Sprawdzić +Uncheck=Uncheck Internal=Wewnętrzne External=Zewnętrzne Internals=Wewnętrzne @@ -528,19 +533,19 @@ Externals=Zewnętrzne Warning=Ostrzeżenie Warnings=Ostrzeżenia BuildPDF=Zbuduj PDF -RebuildPDF=Rebuild PDF +RebuildPDF=Popraw PDF BuildDoc=Zbuduj Doc -RebuildDoc=Rebuild Doc +RebuildDoc=Popraw Doc Entity=Podmiot Entities=Podmioty EventLogs=Logi -CustomerPreview=Klient podglądu -SupplierPreview=Dostawca podglądu -AccountancyPreview=Księgowość podglądu +CustomerPreview=Podgląd klienta +SupplierPreview=Podgląd dostawcy +AccountancyPreview=Podgląd księgowości ShowCustomerPreview=Pokaż podgląd klienta -ShowSupplierPreview=Pokaż dostawcy podglądu -ShowAccountancyPreview=Pokaż podgląd rachunkowych -ShowProspectPreview=Pokaż perspektywa podglądu +ShowSupplierPreview=Pokaż podląd dostawcy +ShowAccountancyPreview=Pokaż podgląd rachunkowy +ShowProspectPreview=Pokaż podgląd prospektu RefCustomer=Nr ref. klient Currency=Waluta InfoAdmin=Informacje dla administratorów @@ -556,57 +561,57 @@ Response=Odpowiedź Priority=Priorytet SendByMail=Wyślij przez email MailSentBy=E-mail został wysłany przez -TextUsedInTheMessageBody=Email ciała -SendAcknowledgementByMail=Wyślij Ack. przez e-mail +TextUsedInTheMessageBody=Zawartość emaila +SendAcknowledgementByMail=Wyślij potwierdzenie przez e-mail NoEMail=Brak e-mail -NoMobilePhone=No mobile phone +NoMobilePhone=Brak telefonu komórkowego Owner=Właściciel -DetectedVersion=Wykryto wersji -FollowingConstantsWillBeSubstituted=Po stałych będzie zastąpić o odpowiedniej wartości. +DetectedVersion=Wykryto wersje +FollowingConstantsWillBeSubstituted=Kolejna zawartość będzie zastąpiona wartością z korespondencji. Refresh=Odśwież BackToList=Powrót do listy GoBack=Wróć -CanBeModifiedIfOk=Mogą być zmienione, jeśli ważnych -CanBeModifiedIfKo=Mogą być zmienione, jeśli nie obowiązuje +CanBeModifiedIfOk=Mogą być zmienione jeśli ważne +CanBeModifiedIfKo=Mogą być zmienione, jeśli nie ważne RecordModifiedSuccessfully=Zapis zmodyfikowany pomyślnie -RecordsModified=%s records modified -AutomaticCode=Automatyczne kod -NotManaged=Nie udało +RecordsModified=%s zmodyfikowanych rekordów +AutomaticCode=Automatyczny kod +NotManaged=Nie zarządzono FeatureDisabled=Funkcja wyłączona MoveBox=Przenieś pole %s -Offered=Bezpłatny +Offered=Oferowany NotEnoughPermissions=Nie masz uprawnień do tego działania -SessionName=Sesja nazwa +SessionName=Nazwa sesji Method=Metoda Receive=Odbiór -PartialWoman=Częściowe -PartialMan=Częściowe +PartialWoman=Część +PartialMan=Część TotalWoman=Razem TotalMan=Razem NeverReceived=Nigdy nie otrzymała -Canceled=Odwołany -YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary +Canceled=Anulowany +YouCanChangeValuesForThisListFromDictionarySetup=Możesz zmieniać wartości dla tej listy z menu setup - słownik Color=Kolor -Documents=Związany plików -DocumentsNb=Dołączonych plików (%s) +Documents=Związanych plików +DocumentsNb=Związanych plików (%s) Documents2=Dokumenty BuildDocuments=Wygenerowano dokumentów -UploadDisabled=Prześlij niepełnosprawnych +UploadDisabled=Prześlij nieaktywne MenuECM=Dokumenty MenuAWStats=AWStats MenuMembers=Członkowie -MenuAgendaGoogle=Google porządku -ThisLimitIsDefinedInSetup=Dolibarr limit (Menu Start-setup-bezpieczeństwa): %s KB, PHP, limit: %s KB -NoFileFound=Żadnych dokumentów zapisanych w tym katalogu +MenuAgendaGoogle=Google agenda +ThisLimitIsDefinedInSetup=Limit Dollibara (Menu główne-setup-bezpieczeństwo): %s KB, PHP, limit: %s KB +NoFileFound=Brak dokumentów zapisanych w tym katalogu CurrentUserLanguage=Język bieżący CurrentTheme=Aktualny temat -CurrentMenuManager=Current menu manager -DisabledModules=Niepełnosprawnych modules +CurrentMenuManager=Aktualny Menu menager +DisabledModules=Nieaktywnych modułów For=Dla ForCustomer=Dla klienta Signature=Podpis -HidePassword=Pokaż polecenie hasłem ukryte -UnHidePassword=Pokaż prawdziwe polecenia z jasnymi hasło +HidePassword=Pokaż polecenie z ukrytym hasłem +UnHidePassword=Pokaż prawdziwe polecenie z otwartym hasłem Root=Root Informations=Informacje Page=Strona @@ -614,20 +619,20 @@ Notes=Uwagi AddNewLine=Dodaj nowy wiersz AddFile=Dodaj plik ListOfFiles=Lista dostępnych plików -FreeZone=Free entry -FreeLineOfType=Free entry of type -CloneMainAttributes=Clone obiektu z jej głównych atrybutów -PDFMerge=PDF Merge -Merge=Scalanie +FreeZone=wolność wyboru +FreeLineOfType=Wolność wyboru typu +CloneMainAttributes=Skopiuj obiekt z jego głównymi atrybutami +PDFMerge=Scalanie/ dzielenie PDF +Merge=Scalanie/ dzielenie PrintContentArea=Pokaż stronę do wydruku głównej treści -MenuManager=Menu manager -NoMenu=Nie podmenu -WarningYouAreInMaintenanceMode=Uwaga, jesteś w trybie konserwacji, więc tylko logowanie %s może używać aplikacji w danym momencie. +MenuManager=Menu menager +NoMenu=Brak podmenu +WarningYouAreInMaintenanceMode=Uwaga, jesteś w trybie konserwacji, więc tylko zalogowani %s mogą używać aplikacji w danym momencie. CoreErrorTitle=Błąd systemu -CoreErrorMessage=Przepraszamy, wystąpił błąd. Sprawdź dzienniki lub skontaktuj się z administratorem systemu. -CreditCard=kart kredytowych -FieldsWithAreMandatory=%s pola są obowiązkowe -FieldsWithIsForPublic=Pola %s są wyświetlane na publiczną listę członków. Jeśli nie chcesz, zaznacz opcję "publicznych" polu. +CoreErrorMessage=Przepraszamy, wystąpił błąd. Sprawdź dzienniki błedu lub skontaktuj się z administratorem systemu. +CreditCard=Karta kredytowa +FieldsWithAreMandatory=Pola %s są obowiązkowe +FieldsWithIsForPublic=Pola %s są wyświetlane na publiczną listę członków. Jeśli nie chcesz, odznacz opcję "publiczny". AccordingToGeoIPDatabase=(Zgodnie z konwersji GeoIP) Line=Linia NotSupported=Nie są obsługiwane @@ -645,49 +650,50 @@ Before=Przed After=Po IPAddress=Adres IP Frequency=Częstotliwość -IM=Komunikatory +IM=Ciągła wiadomość NewAttribute=Nowy atrybut AttributeCode=Kod atrybut OptionalFieldsSetup=Dodatkowa konfiguracja atrybutów -URLPhoto=Url zdjęciem / logo -SetLinkToThirdParty=Link do innych stron trzecich -CreateDraft=Utwórz projekt -SetToDraft=Back to draft -ClickToEdit=Kliknij, aby edytować +URLPhoto=Url ze zdjęciem / logo +SetLinkToThirdParty=Link do zamówień +CreateDraft=Utwórz Szic +SetToDraft=Wróć do szkicu +ClickToEdit=Kliknij by edytować ObjectDeleted=%s obiekt usunięty ByCountry=Według kraju -ByTown=Przez miasto +ByTown=Według miasta ByDate=Według daty -ByMonthYear=Przez miesiąc / rok -ByYear=Przez rok -ByMonth=przez miesiąc -ByDay=Na dzień -BySalesRepresentative=Przez przedstawiciela handlowego -LinkedToSpecificUsers=Linked to a particular user contact -DeleteAFile=Delete a file -ConfirmDeleteAFile=Are you sure you want to delete file -NoResults=No results -ModulesSystemTools=Modules tools +ByMonthYear=Według miesiąc / rok +ByYear=Według roku +ByMonth=Według miesiąca +ByDay=Według dnia +BySalesRepresentative=Według przedstawiciela handlowego +LinkedToSpecificUsers=Podpięty do kontaktu współużytkownika +DeleteAFile=Usuń plik +ConfirmDeleteAFile=Czy na pewno chcesz usunąć ten plik? +NoResults=Brak wyników +ModulesSystemTools=Narzędzia modułów Test=Test Element=Element -NoPhotoYet=No pictures available yet -HomeDashboard=Home summary -Deductible=Deductible -from=from -toward=toward -Access=Access -HelpCopyToClipboard=Use Ctrl+C to copy to clipboard -SaveUploadedFileWithMask=Save file on server with name "%s" (otherwise "%s") -OriginFileName=Original filename -SetDemandReason=Set source -SetBankAccount=Define Bank Account -AccountCurrency=Account Currency -ViewPrivateNote=View notes -XMoreLines=%s line(s) hidden -PublicUrl=Public URL -AddBox=Add box -SelectElementAndClickRefresh=Select an element and click Refresh -PrintFile=Print File %s +NoPhotoYet=Brak obrazów +HomeDashboard=Podsumowanie całościowe +Deductible=Odliczenie +from=od +toward=kierunek +Access=Dostęp +HelpCopyToClipboard=Użyj Ctrl+C by skopiować +SaveUploadedFileWithMask=Zapisz plik na serwerze z nazwą "%s" (w innym wypadku "%s") +OriginFileName=Oryginalna nazwa pliku +SetDemandReason=Wybierz źródło +SetBankAccount=Przypisz konto bankowe +AccountCurrency=Waluta konta +ViewPrivateNote=Wyświetl notatki +XMoreLines=%s lini(e) ukryte +PublicUrl=Publiczny URL +AddBox=Dodaj skrzynke +SelectElementAndClickRefresh=Zaznacz element i kliknij Odśwież +PrintFile=Wydrukuj plik %s +ShowTransaction=Show transaction # Week day Monday=Poniedziałek Tuesday=Wtorek @@ -696,13 +702,13 @@ Thursday=Czwartek Friday=Piątek Saturday=Sobota Sunday=Niedziela -MondayMin=Mo -TuesdayMin=Tu -WednesdayMin=My -ThursdayMin=Th -FridayMin=O. -SaturdayMin=Sa -SundayMin=Ni +MondayMin=Pon +TuesdayMin=Wt +WednesdayMin=Śr +ThursdayMin=Czw +FridayMin=Pią +SaturdayMin=Sob +SundayMin=Nie Day1=Poniedziałek Day2=Wtorek Day3=Środa @@ -710,10 +716,10 @@ Day4=Czwartek Day5=Piątek Day6=Sobota Day0=Niedziela -ShortMonday=M -ShortTuesday=T -ShortWednesday=W -ShortThursday=T -ShortFriday=F -ShortSaturday=S -ShortSunday=S +ShortMonday=Po +ShortTuesday=W +ShortWednesday=Śr +ShortThursday=Cz +ShortFriday=Pi +ShortSaturday=So +ShortSunday=Ni diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang index 235096ce352..86ff6886783 100644 --- a/htdocs/langs/pl_PL/orders.lang +++ b/htdocs/langs/pl_PL/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Odwołany StatusOrderDraft=Projekt (musi zostać zatwierdzone) StatusOrderValidated=Zatwierdzona StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Przetworzone StatusOrderToBill=Do rachunku StatusOrderToBill2=Do rachunku @@ -58,6 +59,7 @@ MenuOrdersToBill=Zamówienia na rachunku MenuOrdersToBill2=Billable orders SearchOrder=Szukaj celu SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Statek produktu Discount=Rabat CreateOrder=Tworzenie Zamówienie diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang index fe2b5107356..fb8f7bab39f 100644 --- a/htdocs/langs/pl_PL/other.lang +++ b/htdocs/langs/pl_PL/other.lang @@ -54,12 +54,13 @@ MaxSize=Maksymalny rozmiar AttachANewFile=Załącz nowy plik / dokument LinkedObject=Związany obiektu Miscellaneous=Różne -NbOfActiveNotifications=Liczba zgłoszeń +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Dette er en test post. \\ NDe to linjer er atskilt med en vognretur. PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fet skrift).
De to linjene er skilt med en vognretur. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/pl_PL/paybox.lang b/htdocs/langs/pl_PL/paybox.lang index 9d629ea7e16..a23a037fc83 100644 --- a/htdocs/langs/pl_PL/paybox.lang +++ b/htdocs/langs/pl_PL/paybox.lang @@ -1,40 +1,40 @@ # Dolibarr language file - Source file is en_US - paybox PayBoxSetup=PayBox konfiguracji modułu -PayBoxDesc=Moduł ten oferują strony, aby umożliwić płatności na Paybox przez klientów. Może to być wykorzystane do swobodnego zapłatę lub płatność w szczególności Dolibarr obiektu (faktury, zamówienia, ...) -FollowingUrlAreAvailableToMakePayments=Po adresy są dostępne na stronie ofertę do klienta, aby dokonać płatności na Dolibarr obiektów +PayBoxDesc=Moduł ten oferują strony, umożliwiające płatności na Paybox przez klientów. Może to być wykorzystane do swobodnej zapłaty lub płatności w szczególności obiektu Dolibara np za faktury, zamówienia, ... +FollowingUrlAreAvailableToMakePayments=Nastepujące adresy są dostępne dla klienta, by mógł dokonać płatności za faktury zamówienia PaymentForm=Forma płatności -WelcomeOnPaymentPage=Witamy na naszej usługi płatności online +WelcomeOnPaymentPage=Witamy w naszej usłudze płatności online ThisScreenAllowsYouToPay=Ten ekran pozwala na dokonanie płatności on-line do %s. -ThisIsInformationOnPayment=To jest informacja o płatności do +ThisIsInformationOnPayment=To jest informacja o płatności do zrobienia ToComplete=Aby zakończyć -YourEMail=E-mail z potwierdzeniem zapłaty +YourEMail=E-mail by otrzymać potwierdzenie zapłaty Creditor=Wierzyciel -PaymentCode=Płatność kod -PayBoxDoPayment=Przejdź na płatności -YouWillBeRedirectedOnPayBox=Zostaniesz przekierowany na zabezpieczone Paybox stronę wejścia ci karty kredytowej informacje +PaymentCode=Kod płatności +PayBoxDoPayment=Przejdź do płatności +YouWillBeRedirectedOnPayBox=Zostaniesz przekierowany na zabezpieczoną stronę Paybox bys mógł podać informację z karty kredytowej. PleaseBePatient=Proszę, bądź cierpliwy -Continue=Następny +Continue=Dalej ToOfferALinkForOnlinePayment=URL %s płatności -ToOfferALinkForOnlinePaymentOnOrder=URL zaoferowania %s płatności online interfejsu użytkownika na zamówienie -ToOfferALinkForOnlinePaymentOnInvoice=URL zaoferowania %s płatności online interfejsu użytkownika na fakturze -ToOfferALinkForOnlinePaymentOnContractLine=URL zaoferować płatności online %s interfejs użytkownika do umowy linii -ToOfferALinkForOnlinePaymentOnFreeAmount=URL zaoferować płatności online %s interfejs użytkownika w celu utworzenia bezpłatnego kwotę +ToOfferALinkForOnlinePaymentOnOrder=URL zaoferowania %s płatności online interfejsu użytkownika za zamówienie +ToOfferALinkForOnlinePaymentOnInvoice=URL zaoferowania %s płatności online interfejsu użytkownika za fakture +ToOfferALinkForOnlinePaymentOnContractLine=URL zaoferowania płatności online %s interfejsu użytkownika do umowy +ToOfferALinkForOnlinePaymentOnFreeAmount=URL zaoferowania płatności online %s interfejsu użytkownika w celu utworzenia dowolnej kwoty. ToOfferALinkForOnlinePaymentOnMemberSubscription=Adres URL do zaoferowania płatności online %s interfejs użytkownika jest członkiem subskrypcji -YouCanAddTagOnUrl=Możesz również dodać parametr & url = wartość tagu do żadnej z tych adresów URL (wymagany tylko za darmo płatności), aby dodać swój komentarz płatności tag. -SetupPayBoxToHavePaymentCreatedAutomatically=Skonfiguruj PayBox url z %s do zapłaty tworzone automatycznie, gdy zatwierdzone przez paybox. -YourPaymentHasBeenRecorded=Ta strona potwierdza, że ​​płatność została nagrana. Dziękuję. -YourPaymentHasNotBeenRecorded=Jesteś płatność nie została nagrana i transakcja została anulowana. Dziękuję. +YouCanAddTagOnUrl=Możesz również dodać parametr & url = wartość tagu do żadnej z tych adresów URL (wymagany tylko dla bezpłatnych), aby dodać swój komentarz płatności tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Skonfiguruj PayBox url z %s do opłay stworzonych automatycznie, gdy są zatwierdzone przez paybox. +YourPaymentHasBeenRecorded=Ta strona potwierdza, że ​​płatność została wprowadzona. Dziękuję. +YourPaymentHasNotBeenRecorded=Twoja płatność nie została wprowadzona i transakcja została anulowana. Dziękuję. AccountParameter=Parametry konta UsageParameter=Parametry serwera -InformationToFindParameters=Pomoc znaleźć %s informacje o koncie +InformationToFindParameters=Pomóż znaleźć %s informacje o koncie PAYBOX_CGI_URL_V2=Url Paybox moduł CGI płatności VendorName=Nazwa dostawcy -CSSUrlForPaymentForm=CSS url arkusz dla formy płatności -MessageOK=Wiadomość na zatwierdzonych strony powrót płatności -MessageKO=Wiadomość na odwołana strony powrotnej płatności -NewPayboxPaymentReceived=New Paybox payment received -NewPayboxPaymentFailed=New Paybox payment tried but failed -PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) -PAYBOX_PBX_SITE=Value for PBX SITE -PAYBOX_PBX_RANG=Value for PBX Rang -PAYBOX_PBX_IDENTIFIANT=Value for PBX ID +CSSUrlForPaymentForm=Styl CSS arkuszy dla form płatności +MessageOK=Wiadomość dla zatwierdzonych stron. Powrót do płatności +MessageKO=Wiadomość dla odwołanych stron. Powrót do płatności +NewPayboxPaymentReceived=Nowa płatnośc Paybox otrzymana +NewPayboxPaymentFailed=Nowa płatnośc Paybox - próba nie udana. +PAYBOX_PAYONLINE_SENDEMAIL=Mail ostrzegający po płatności (sukces lub porażka) +PAYBOX_PBX_SITE=Wartośc dla strony PBX +PAYBOX_PBX_RANG=Wartość dla zasięgu PBX +PAYBOX_PBX_IDENTIFIANT=Wartośc dla PBX ID diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang index 864782023a0..4455da495cd 100644 --- a/htdocs/langs/pl_PL/productbatch.lang +++ b/htdocs/langs/pl_PL/productbatch.lang @@ -1,21 +1,21 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) -ProductStatusOnBatchShort=Yes -ProductStatusNotOnBatchShort=No -Batch=Batch/Serial -atleast1batchfield=Eat-by date or Sell-by date or Batch number -batch_number=Batch/Serial number -l_eatby=Eat-by date -l_sellby=Sell-by date -DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) -printBatch=Batch: %s -printEatby=Eat-by: %s -printSellby=Sell-by: %s -printQty=Qty: %d -AddDispatchBatchLine=Add a line for Shelf Life dispatching -BatchDefaultNumber=Undefined -WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. -ProductDoesNotUseBatchSerial=This product does not use batch/serial number +ManageLotSerial=Użyj plik/wsad/numer seryjny +ProductStatusOnBatch=Tak ('plik/wsad//nr seryjny' wymagany) +ProductStatusNotOnBatch=Nie ('plik/wsad//nr seryjny' nie użyty) +ProductStatusOnBatchShort=Tak +ProductStatusNotOnBatchShort=Nie +Batch=plik/wsad//numer seryjny +atleast1batchfield=Data wykorzystania lub data sprzedaży lub numer pliku/wsadu +batch_number=Plik/wsad/numer seryjny +l_eatby=Wykorzystaj - po dacie +l_sellby=Sprzedaj - po dacie +DetailBatchNumber=Detale pliku/wsadu/ nr seryjnego +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Plik/Wsad: %s +printEatby=Wykorzystaj po: %s +printSellby=Sprzedaj po: %s +printQty=Ilość: %d +AddDispatchBatchLine=Dodaj linię dla przedłużenia wysyłki +BatchDefaultNumber=Niezdefiniowano +WhenProductBatchModuleOnOptionAreForced=Gdy moduł Batch / Serial jest , zwiększony/ zmniejszony Tryb czasu jest zmuszony do ostatniego wyboru i nie może być edytowany . Inne opcje można określić jak chcesz . +ProductDoesNotUseBatchSerial=Ten produkt nie używa pliku/wsadu/numeru seryjnego diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang index 3db6a921c2d..aadbe802a8f 100644 --- a/htdocs/langs/pl_PL/products.lang +++ b/htdocs/langs/pl_PL/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang index 08e1f21fcd9..2c0a3ee7470 100644 --- a/htdocs/langs/pl_PL/projects.lang +++ b/htdocs/langs/pl_PL/projects.lang @@ -8,8 +8,10 @@ SharedProject=Współużytkowane projektu PrivateProject=Kontakt z projektu MyProjectsDesc=Ten widok jest ograniczony do projektów jesteś kontaktu (cokolwiek to typ). ProjectsPublicDesc=Ten widok przedstawia wszystkie projekty, które możesz przeczytać. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Ten widok przedstawia wszystkie projekty (uprawnień użytkownika przyznać uprawnienia do wyświetlania wszystko). MyTasksDesc=Ten widok jest ograniczony do projektów i zadań, które są do kontaktu (cokolwiek to typ). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Ten widok przedstawia wszystkich projektów i zadań, które możesz przeczytać. TasksDesc=Ten widok przedstawia wszystkich projektów i zadań (uprawnień użytkownika przyznać uprawnienia do wyświetlania wszystko). ProjectsArea=Projekty obszaru @@ -29,6 +31,8 @@ NoProject=Projekt zdefiniowane NbOpenTasks=Nb otwartych zadań NbOfProjects=Nb projektów TimeSpent=Czas spędzony +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Czas spędzony RefTask=Nr ref. zadanie LabelTask=Wytwórnia zadanie @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista dostawców zamówień związanych z pr ListSupplierInvoicesAssociatedProject=Lista dostawców faktur związanych z projektem ListContractAssociatedProject=Wykaz umów związanych z projektem ListFichinterAssociatedProject=Wykaz interwencji związanych z projektem -ListTripAssociatedProject=Lista wycieczek i wydatków związanych z projektem +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Wykaz działań związanych z projektem ActivityOnProjectThisWeek=Aktywność na projekt w tym tygodniu ActivityOnProjectThisMonth=Aktywność w sprawie projektu w tym miesiącu @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang index ad137b77146..ac6d41946be 100644 --- a/htdocs/langs/pl_PL/propal.lang +++ b/htdocs/langs/pl_PL/propal.lang @@ -16,7 +16,7 @@ Prospect=Prospect ProspectList=Prospect listy DeleteProp=Usuń handlowych wniosku ValidateProp=Validate handlowych wniosku -AddProp=Dodaj projekt +AddProp=Utwórz wniosek ConfirmDeleteProp=Czy na pewno chcesz usunąć tę propozycję handlową? ConfirmValidateProp=Czy na pewno chcesz, aby potwierdzić tę propozycję handlową? LastPropals=Ostatnia %s propozycje @@ -55,8 +55,6 @@ NoOpenedPropals=Nie otworzył propozycji NoOtherOpenedPropals=Żadne inne otwarte propozycji RefProposal=Commercial wniosku ref SendPropalByMail=Wyślij handlowych wniosku pocztą -FileNotUploaded=Plik nie został wysłany -FileUploaded=Plik został pomyślnie przesłany AssociatedDocuments=Dokumenty związane z projektem: ErrorCantOpenDir=Nie można otworzyć katalogu DatePropal=Data wniosku @@ -70,8 +68,8 @@ ErrorPropalNotFound=Propal %s nie znaleziono Estimate=Prognoza: EstimateShort=Prognoza OtherPropals=Inne propozycje -# AddToDraftProposals=Add to draft proposal -# NoDraftProposals=No draft proposals +AddToDraftProposals=Dodaj do szkicu wniosku +NoDraftProposals=Brak szkiców wniosku CopyPropalFrom=Tworzenie komercyjnych wniosek kopiowanie istniejących wniosku CreateEmptyPropal=Utwórz pusty propozycji Vierge lub z wykazu produktów / usług DefaultProposalDurationValidity=Domyślny czas ważności wniosku handlowych (w dniach) @@ -97,6 +95,6 @@ TypeContact_propal_external_CUSTOMER=kontakt klienta w ślad za wniosek # Document models DocModelAzurDescription=Kompletny wniosek modelu (logo. ..) DocModelJauneDescription=Jaune propozycję modelu -# DefaultModelPropalCreate=Default model creation -# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) -# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) +DefaultModelPropalCreate=Domyślny model kreacji. +DefaultModelPropalToBill=Domyślny szablon po zamknięciu wniosku biznesowego ( do zafakturowania) +DefaultModelPropalClosed=Domyślny szablon po zamknięciu projektu biznesowego ( weryfikowane ) diff --git a/htdocs/langs/pl_PL/resource.lang b/htdocs/langs/pl_PL/resource.lang index 32bdd92f884..ce83505c83c 100644 --- a/htdocs/langs/pl_PL/resource.lang +++ b/htdocs/langs/pl_PL/resource.lang @@ -1,34 +1,34 @@ -MenuResourceIndex=Resources -MenuResourceAdd=New resource -MenuResourcePlanning=Resource planning -DeleteResource=Delete resource -ConfirmDeleteResourceElement=Confirm delete the resource for this element -NoResourceInDatabase=No resource in database. -NoResourceLinked=No resource linked +MenuResourceIndex=Zasoby +MenuResourceAdd=Nowe zasoby +MenuResourcePlanning=Planowane Zasoby +DeleteResource=Usuń zasoby +ConfirmDeleteResourceElement=Potwierdz usunięcie zasobów dla tego elementu +NoResourceInDatabase=Brak zasobów w bazie danych +NoResourceLinked=Brak podliknowanych zasobów -ResourcePageIndex=Resources list -ResourceSingular=Resource -ResourceCard=Resource card -AddResource=Create a resource -ResourceFormLabel_ref=Resource name -ResourceType=Resource type -ResourceFormLabel_description=Resource description +ResourcePageIndex=Lista zasobów +ResourceSingular=Zasoby +ResourceCard=Karta zasobów +AddResource=Utwórz zasoby +ResourceFormLabel_ref=Nazwa zasobów +ResourceType=Typ zasobów +ResourceFormLabel_description=Opis zasobów -ResourcesLinkedToElement=Resources linked to element +ResourcesLinkedToElement=Zasaby połączone z elementem -ShowResourcePlanning=Show resource planning -GotoDate=Go to date +ShowResourcePlanning=Pokaż zasoby planowane +GotoDate=Idz do daty -ResourceElementPage=Element resources -ResourceCreatedWithSuccess=Resource successfully created -RessourceLineSuccessfullyDeleted=Resource line successfully deleted -RessourceLineSuccessfullyUpdated=Resource line successfully updated -ResourceLinkedWithSuccess=Resource linked with success +ResourceElementPage=Element zasobów +ResourceCreatedWithSuccess=Zasoby poprawnie utworzone +RessourceLineSuccessfullyDeleted=Linia zasobów poprawnie usunięta +RessourceLineSuccessfullyUpdated=Linia zasobów poprawnie uaktualniona +ResourceLinkedWithSuccess=Zasoby podlinkowane poprawnie -TitleResourceCard=Resource card -ConfirmDeleteResource=Confirm to delete this resource -RessourceSuccessfullyDeleted=Resource successfully deleted -DictionaryResourceType=Type of resources +TitleResourceCard=Karta zasobów +ConfirmDeleteResource=Potwierdz by usunąc te zasoby +RessourceSuccessfullyDeleted=Zasoby usunięte poprawnie +DictionaryResourceType=Typ zasobów -SelectResource=Select resource +SelectResource=Wybierz zasoby diff --git a/htdocs/langs/pl_PL/salaries.lang b/htdocs/langs/pl_PL/salaries.lang index edca71a1829..43b8413af9a 100644 --- a/htdocs/langs/pl_PL/salaries.lang +++ b/htdocs/langs/pl_PL/salaries.lang @@ -1,8 +1,13 @@ # Dolibarr language file - Source file is en_US - users -Salary=Salary -Salaries=Salaries -Employee=Employee -NewSalaryPayment=New salary payment -SalaryPayment=Salary payment -SalariesPayments=Salaries payments -ShowSalaryPayment=Show salary payment +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Kod rachunkowości dla wypłat +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Kod rachunkowości dla obciązeń finansowych +Salary=Wypłata +Salaries=Wypłaty +Employee=Zatrudnienie +NewSalaryPayment=Nowa wypłata +SalaryPayment=Wypłata wynagrodzenia +SalariesPayments=Wypłaty wynagordzeń +ShowSalaryPayment=Pokaż wypłaty wynagrodzeń +THM=Średnia cena za godzine +TJM=Średnia cena za dzień +CurrentSalary=Current salary diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang index a93c41f5c23..4626b302570 100644 --- a/htdocs/langs/pl_PL/sendings.lang +++ b/htdocs/langs/pl_PL/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Ilosc sortowane QtyShipped=Ilosc wysłane QtyToShip=Ilosc do statku QtyReceived=Ilość otrzymanych -KeepToShip=Lek na statku +KeepToShip=Remain to ship OtherSendingsForSameOrder=Inne sendings do tego celu DateSending=Data wysłania porządku DateSendingShort=Data wysłania porządku diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang index e1d1314519c..9ce3327dd7d 100644 --- a/htdocs/langs/pl_PL/stocks.lang +++ b/htdocs/langs/pl_PL/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Wartość PMPValueShort=WAP EnhancedValueOfWarehouses=Magazyny wartości UserWarehouseAutoCreate=Tworzenie stanie automatycznie podczas tworzenia użytkownika +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Ilość wysyłanych QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang index 0ae0e045149..bcf12754ec4 100644 --- a/htdocs/langs/pl_PL/suppliers.lang +++ b/htdocs/langs/pl_PL/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Dostawcy -Supplier=Dostawca AddSupplier=Create a supplier SupplierRemoved=Dostawca usunięty SuppliersInvoice=Faktury dostawców @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Faktury i płatności dostawcy ExportDataset_fournisseur_3=Zamówienia dostawcy i pozycje na zamówieniu ApproveThisOrder=Zatwierdź to zamówienie ConfirmApproveThisOrder=Czy na pewno chcesz zatwierdzić zamówienie %s ? -DenyingThisOrder=Odrzuć to zamówienie +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Czy na pewno chcesz odrzucić zamówienie %s ? ConfirmCancelThisOrder=Czy na pewno chcesz anulować zamówienie %s ? AddCustomerOrder=Stwórz zamówienie Klienta diff --git a/htdocs/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang index 526bdf77d25..126fe2dda63 100644 --- a/htdocs/langs/pl_PL/trips.lang +++ b/htdocs/langs/pl_PL/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Wycieczka -Trips=Wycieczki -TripsAndExpenses=Wycieczki i koszty -TripsAndExpensesStatistics=Koszty podróży i statystyki -TripCard=Wycieczka karty -AddTrip=Dodaj podróż -ListOfTrips=Lista wyjazdów +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Wykaz opłat -NewTrip=Nowa podróż -CompanyVisited=Firma / fundacji odwiedzili -Kilometers=Kilometers -FeesKilometersOrAmout=Kwota lub km -DeleteTrip=Usuń podróży -ConfirmDeleteTrip=Czy na pewno chcesz usunąć tę wycieczkę? +NewTrip=New expense report +CompanyVisited=Firm / fundacji odwiedzonych +Kilometers=Kilometrów +FeesKilometersOrAmout=Kwota lub kilometry +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report +ClassifyRefunded=Zakfalifikowano do refundacji. +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line TF_OTHER=Inny -TF_LUNCH=Lunch -TF_TRIP=Wycieczka -ListTripsAndExpenses=Lista wycieczek i wydatków -ExpensesArea=Wycieczki i obszar wydatki -SearchATripAndExpense=Szukaj w podróż i wydatki -ClassifyRefunded=Classify 'Refunded' +TF_TRANSPORTATION=Transportation +TF_LUNCH=Obiad +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 82d5c26f1bd..0a86251af87 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -73,7 +73,6 @@ Activation=Ativação SetupShort=Configuracao OtherSetup=Outras configuracoes CurrentValueSeparatorThousand=Separador milhar -Destination=Destino IdModule=Módulo ID IdPermissions=Permissão ID ModulesCommon=Módulos Principais @@ -346,7 +345,6 @@ Module200Desc=sincronização com um anuário LDAP Module310Desc=Administração de Membros de uma associação Module330Desc=Administração de Favoritos Module410Desc=Interface com calendário Webcalendar -Module500Name=Despesas especiais (impostos, contribuições sociais, dividendos) Module500Desc=Gestão de despesas especiais, como impostos, contribuição social, dividendos e salários Module510Desc=Gestão de funcionários salários e pagamentos Module600Desc=Enviar notificação via EMail para terceiros sobre algums eventos do Dolibarr ( configurado para cada terceiro) @@ -542,7 +540,6 @@ LocalTax2IsUsed=Use terceiro imposto LocalTax2IsNotUsed=Não use terceiro imposto LocalTax2IsUsedDesc=Use um terceiro tipo de impostos (excepto o VAT) LocalTax2IsNotUsedDesc=Não use outro tipo de impostos (excepto o VAT) -LocalTax2Management=Terceiro tipo de imposto LocalTax1IsUsedDescES=A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo:
Se te comprador não está sujeito a RE, RP por default = 0. Fim da regra.
Se o comprador está sujeito a RE então o RE por padrão. Fim da regra.
LocalTax1IsUsedExampleES=Na Espanha, eles são profissionais sujeitos a algumas seções específicas do IAE espanhol. LocalTax1IsNotUsedExampleES=Na Espanha, eles são profissionais e sociedades e sujeito a determinadas seções do IAE espanhol. @@ -552,11 +549,8 @@ LocalTax2IsNotUsedDescES=Por padrão, o IRPF proposta é 0. Fim da regra. LocalTax2IsUsedExampleES=Na Espanha, freelancers e profissionais independentes que prestam serviços e empresas que escolheram o sistema fiscal de módulos. LocalTax2IsNotUsedExampleES=Na Espanha, eles são bussines não sujeitas ao regime fiscal dos módulos. CalcLocaltax=Relatorio -CalcLocaltax1ES=Vendas - Compras CalcLocaltax1Desc=Relatorios de taxas locais são calculados pela differença entre taxas locais de venda e taxas locais de compra -CalcLocaltax2ES=Compras CalcLocaltax2Desc=Relatorio de taxas locais e o total de taxas locais nas compras -CalcLocaltax3ES=Vendas CalcLocaltax3Desc=Relatorio de taxas locais e o total de taxas locais de vendas NbOfDays=N� de Dias AlwaysActive=Sempre Ativo @@ -893,7 +887,6 @@ FilesOfTypeNotCached=Arquivos do tipo não são armazenados em cache pelo servid FilesOfTypeCompressed=Arquivos do tipo são comprimidas pelo servidor HTTP FilesOfTypeNotCompressed=Arquivos do tipo não são compactados pelo servidor HTTP CacheByServer=Cache por servidor -CacheByClient=Cache pelo navegador CompressionOfResources=A compressão das respostas HTTP ProductSetup=configuração do módulo produtos ServiceSetup=Configuração do módulo Serviços @@ -1029,10 +1022,6 @@ ECMAutoTree =Pasta árvore automática e documento FiscalYears=Anos fiscais FiscalYear=Ano fiscal FiscalYearCard=Ficha ano fiscal -EditFiscalYear=Editar ano fiscal -OpenFiscalYear=Abrir ano fiscal -CloseFiscalYear=Fechar ano fiscal DeleteFiscalYear=Remover ano fiscal ConfirmDeleteFiscalYear=Voçê tem certeza que quer deleitar este ano fical ? -Format=Formato TypePaymentDesc=0: Pagamento para Cliente, 1: Pagamento para Fornecedor, 2: Pagamentos para Clientes e Fornecedores diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang index 730cdb1ee6d..a807b965562 100644 --- a/htdocs/langs/pt_BR/bills.lang +++ b/htdocs/langs/pt_BR/bills.lang @@ -196,8 +196,6 @@ SetMode=Definir Modo de Pagamento Billed=Faturado RepeatableInvoice=Modelo fatura RepeatableInvoices=Modelos da fatura -Repeatable=Modelo -Repeatables=Modelos ChangeIntoRepeatableInvoice=Converter para modelo de fatura CreateRepeatableInvoice=Criar modelo de fatura CreateFromRepeatableInvoice=Criar da fatura modelo @@ -212,7 +210,6 @@ EditRelativeDiscount=Alterar Desconto Relativo AddGlobalDiscount=Adicionar Desconto Fixo EditGlobalDiscounts=Alterar Descontos Globais ShowDiscount=Ver o Desconto -ShowReduc=Mostrar a dedução RelativeDiscount=Desconto Relativo GlobalDiscount=Desconto Fixo CreditNote=Depósito diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang index d59bdbfeb77..064c999d7fd 100644 --- a/htdocs/langs/pt_BR/compta.lang +++ b/htdocs/langs/pt_BR/compta.lang @@ -34,7 +34,6 @@ LT1CustomerES=RE vendas LT1SupplierES=RE compras VATCollected=ICMS Recuperado ToGet=Para restituir -SpecialExpensesArea=Área para todos os pagamentos especiais MenuSpecialExpenses=Despesas especiais PaymentCustomerInvoice=Pagamento de fatura do cliente PaymentSupplierInvoice=Pagamento de fatura do fornecedor @@ -125,7 +124,6 @@ Pcg_subtype=PCG subtipo InvoiceLinesToDispatch=Linhas de nota fiscal para envio InvoiceDispatched=Faturas remetidas AccountancyDashboard=Resumo Contabilidade -ByProductsAndServices=Por produtos e serviços RefExt=Ref externo ToCreateAPredefinedInvoice=Para criar uma Fatura predefinida, criar uma fatura padrão, em seguida, sem validá-la, clique no botão "Converter para fatura pré-definida". LinkedOrder=Atalho para ordem diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang index 60c851b3eaf..2d8c7d33d13 100644 --- a/htdocs/langs/pt_BR/donations.lang +++ b/htdocs/langs/pt_BR/donations.lang @@ -7,7 +7,6 @@ Donors=Dadores ShowDonation=Mostrar doaçaõ DonationsPaid=Doações pagas DonationStatusPaid=Doaçaõ recebida -DonationStatusPaidShort=Recebido DonationReceipt=Recibo doaçaõ LastModifiedDonations=As ultimas %s doações modificadaas SearchADonation=Buscar doaçaõ diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang index 8b8a231b494..1b32494e7c8 100644 --- a/htdocs/langs/pt_BR/projects.lang +++ b/htdocs/langs/pt_BR/projects.lang @@ -32,7 +32,6 @@ ProgressDeclared=o progresso declarado ProgressCalculated=calculado do progresso ListOrdersAssociatedProject=Lista de Pedidos Associados ao Projeto ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedor Associados ao Projeto -ListTripAssociatedProject=Lista de viagens e despesas associadas com o projeto ActivityOnProjectThisWeek=Atividade ao Projeto esta Semana ActivityOnProjectThisMonth=Atividade ao Projeto este Mês ActivityOnProjectThisYear=Atividade ao Projeto este Ano @@ -63,7 +62,6 @@ CloneNotes=Copiar notas CloneProjectFiles=Copiar arquivos do projetos CloneTaskFiles=Copia(s) do(s) arquivo(s) do projeto(s) finalizado ConfirmCloneProject=Tem certeza que deseja copiar este projeto? -ProjectReportDate=Alterar a data da tarefa de acordo com a data de início do projeto ErrorShiftTaskDate=Impossível mudar data da tarefa de acordo com a nova data de início do projeto TaskCreatedInDolibarr=Tarefa %s criada TaskModifiedInDolibarr=Tarefa %s alterada diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang index 306b940d879..4822d5d1436 100644 --- a/htdocs/langs/pt_PT/admin.lang +++ b/htdocs/langs/pt_PT/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=Desenvolvimento VersionUnknown=Desconhecida VersionRecommanded=Recomendada +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Id. da Sessão SessionSaveHandler=Gestor para guardar as sessões SessionSavePath=Localização para guardar a sessão @@ -45,8 +50,8 @@ ErrorModuleRequireDolibarrVersion=Erro, este módulo requer a versão %s ou supe ErrorDecimalLargerThanAreForbidden=Erro, as casas decimais superiores a %s não são suportadas. DictionarySetup=Configurar Dicionário Dictionary=Dicionários -Chartofaccounts=Chart of accounts -Fiscalyear=Fiscal years +Chartofaccounts=Gráfico de contas +Fiscalyear=Anos fiscais ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record ErrorCodeCantContainZero=O código não pode conter o valor 0 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) @@ -69,7 +74,7 @@ ShowPreview=Ver Vista Prévia PreviewNotAvailable=Visualização não disponível ThemeCurrentlyActive=Tema Actualmente Activo CurrentTimeZone=Zona Horaria Actual -MySQLTimeZone=TimeZone MySql (database) +MySQLTimeZone=Zona Horária MySql (database) TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). Space=Área Table=Tabela @@ -79,8 +84,8 @@ Mask=Máscara NextValue=Próximo Valor NextValueForInvoices=Próximo Valor (Facturas) NextValueForCreditNotes=Próximo Valor (Notas de Entregas) -NextValueForDeposit=Next value (deposit) -NextValueForReplacements=Next value (replacements) +NextValueForDeposit=Valor seguinte (depósito) +NextValueForReplacements=Valor seguinte (restituições) MustBeLowerThanPHPLimit=Observação: Parametros PHP limita o tamanho a %s %s de máximo, qualquer que seja o valor deste parametro NoMaxSizeByPHPLimit=Nenhuma limitação interna no servidor PHP MaxSizeForUploadedFiles=Tamanho máximo dos documentos a carregar (0 para proibir o carregamento) @@ -108,9 +113,9 @@ OtherOptions=Outras Opções OtherSetup=Várias Configurações CurrentValueSeparatorDecimal=Separador decimal CurrentValueSeparatorThousand=Separador dos milhares -Destination=Destination -IdModule=Module ID -IdPermissions=Permissions ID +Destination=Destino +IdModule=Id. do Módulo +IdPermissions=Id. das Autorizações Modules=Módulos ModulesCommon=Módulos standard ModulesOther=Outros módulos @@ -242,7 +247,7 @@ OfficialWiki=Wiki ERP OfficialDemo=Demo em linha ERP/CRM OfficialMarketPlace=Mercado Oficial externo para os módulos / addons OfficialWebHostingService=Referenced web hosting services (Cloud hosting) -ReferencedPreferredPartners=Preferred Partners +ReferencedPreferredPartners=Parceiros Preferidos OtherResources=Autres ressources ForDocumentationSeeWiki=Para a documentação de utilizador, programador ou Perguntas Frequentes (FAQ), consulte o wiki do ERP:
%s SetupIsReadyForUse=A Instalação está finalizada e o ERP/CRM está disponivel com o novo componente. NotExistsDirect=A diretoria raiz alternativa não está definida.
@@ -399,7 +404,7 @@ LinkToTest=Clickable link generated for user %s (click phone nu KeepEmptyToUseDefault=Deixar em branco para usar o valor por omissão DefaultLink=Hiperligação predefinida ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) -ExternalModule=External module - Installed into directory %s +ExternalModule=Módulo externo - Instalado na diretoria %s BarcodeInitForThirdparties=Mass barcode init for thirdparties BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services CurrentlyNWithoutBarCode=Atualmente, tem %s registos em %s %s sem código de barras definido. @@ -485,7 +490,7 @@ Module400Name=Projetos/Oportunidades/Chefias Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. Module410Name=Webcalendar Module410Desc=Interface com calendario Webcalendar -Module500Name=Special expenses (tax, social contributions, dividends) +Module500Name=Despesas especiais (impostos, contribuições sociais, dividendos) Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries Module510Name=Salários Module510Desc=Management of employees salaries and payments @@ -493,10 +498,16 @@ Module600Name=Notificações Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Bolsas Module700Desc=Gestão de Bolsas +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Interface com o sistema de seguimento de incidencias Mantis Module1400Name=Perito de Contabilidade Module1400Desc=Perido de gestão da Contabilidade (dupla posição) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categorías Module1780Desc=Gestão de categorías (produtos, Fornecedores e clientes) Module2000Name=FCKeditor @@ -524,7 +535,7 @@ Module5000Name=Multi-empresa Module5000Desc=Permite-lhe gerir várias empresas Module6000Name=Fluxo de Trabalho Module6000Desc=Gestão do fluxo de trabalho -Module20000Name=Leave Requests management +Module20000Name=Deixar gestão de Pedidos Module20000Desc=Declare and follow employees leaves requests Module39000Name=Product batch Module39000Desc=Batch or serial number, eat-by and sell-by date management on products @@ -575,7 +586,7 @@ Permission67=Exportar Intervenções Permission71=Consultar Membros Permission72=Criar/Modificar Membros Permission74=Eliminar Membros -Permission75=Setup types of membership +Permission75=Configure os tipos de membros Permission76=Exportar Bolsas Permission78=Consultar honorários Permission79=Criar/Modificar honorários @@ -599,7 +610,7 @@ Permission109=Eliminar envios Permission111=Consultar contas financeiras (contas bancarias, caixas) Permission112=Criar/Modificar quantidade/eliminar registos bancarios Permission113=Setup financial accounts (create, manage categories) -Permission114=Reconciliate transactions +Permission114=Reconciliar transações Permission115=Exportar transacções e extractos Permission116=Captar transferencias entre contas Permission117=Gerir envío de cheques @@ -624,14 +635,14 @@ Permission165=Apagar contractos/subscrições Permission171=Read trips and expenses (own and his subordinates) Permission172=Criar/modificar viagens e despesas Permission173=Apagar viagens e despesas -Permission174=Read all trips and expenses +Permission174=Ler todas as viagens e despesas Permission178=Exportar viagens e despesas Permission180=Consultar Fornecedores Permission181=Consultar pedidos a Fornecedores Permission182=Criar/Modificar pedidos a Fornecedores Permission183=Confirmar pedidos a Fornecedores Permission184=Aprovar pedidos a Fornecedores -Permission185=Enviar pedidos a Fornecedores +Permission185=Order or cancel supplier orders Permission186=Receber pedidos de Fornecedores Permission187=Fechar pedidos a Fornecedores Permission188=Anular pedidos a Fornecedores @@ -653,8 +664,8 @@ Permission222=Criar/Modificar E-Mails (assunto, destinatarios, etc.) Permission223=Confirmar E-Mails (permite o envío) Permission229=Eliminar E-Mails Permission237=Ver destinatários e informação -Permission238=Manually send mailings -Permission239=Delete mailings after validation or sent +Permission238=Envie correio manualmente +Permission239=Apagar o correio depois da validação ou envio Permission241=Consultar categorías Permission242=Criar/Modificar categorías Permission243=Eliminar categorías @@ -700,9 +711,9 @@ Permission402=Criar/Modificar activos Permission403=Confirmar activos Permission404=Eliminar activos Permission510=Read Salaries -Permission512=Create/modify salaries -Permission514=Delete salaries -Permission517=Export salaries +Permission512=Criar/modificar salários +Permission514=Apagar salários +Permission517=Exportar salários Permission531=Ler serviços Permission532=Criar / modificar serviços Permission534=Apagar serviços @@ -711,6 +722,13 @@ Permission538=Exportação de serviços Permission701=Consultar Bolsas Permission702=Criar/Modificar Bolsas Permission703=Eliminar Bolsas +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Consultar stocks Permission1002=Criar/modificar armazéns Permission1003=Apagar armazéns @@ -774,7 +792,7 @@ DictionaryCountry=Países DictionaryCurrency=Moedas DictionaryCivility=Civility title DictionaryActions=Type of agenda events -DictionarySocialContributions=Social contributions types +DictionarySocialContributions=Tipos de contribuições sociais DictionaryVAT=VAT Rates or Sales Tax Rates DictionaryRevenueStamp=Amount of revenue stamps DictionaryPaymentConditions=Condições de Pagamento @@ -788,9 +806,9 @@ DictionaryStaff=Empregados DictionaryAvailability=Atraso na entrega DictionaryOrderMethods=Métodos de encomenda DictionarySource=Origem das propostas/ordens -DictionaryAccountancyplan=Chart of accounts -DictionaryAccountancysystem=Models for chart of accounts -DictionaryEMailTemplates=Emails templates +DictionaryAccountancyplan=Gráfico de contas +DictionaryAccountancysystem=Modelos para o gráfíco de contas +DictionaryEMailTemplates=Modelos de Mensagens SetupSaved=Configuração guardada BackToModuleList=Voltar à lista de módulos BackToDictionaryList=Voltar à lista de dicionários @@ -813,7 +831,7 @@ LocalTax2IsUsed=Utilizar um terceiro imposto LocalTax2IsNotUsed=Não utilizar um terceiro imposto LocalTax2IsUsedDesc=Use a third type of tax (other than VAT) LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT) -LocalTax2Management=Third type of tax +LocalTax2Management=Terceiro tipo de imposto LocalTax2IsUsedExample= LocalTax2IsNotUsedExample= LocalTax1ManagementES= RE Gestão @@ -826,12 +844,12 @@ LocalTax2IsUsedDescES= A taxa de RE por padrão, quando as perspectivas de cria LocalTax2IsNotUsedDescES= Por padrão, o IRPF proposto é 0. Fim da regra. LocalTax2IsUsedExampleES= Em Espanha, os freelancers e profissionais liberais que prestam serviços e empresas que escolheram o regime fiscal dos módulos. LocalTax2IsNotUsedExampleES= Em Espanha, eles não são negócios sujeitas ao regime fiscal dos módulos. -CalcLocaltax=Reports -CalcLocaltax1ES=Sales - Purchases +CalcLocaltax=Relatórios +CalcLocaltax1ES=Vendas - Compras CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases -CalcLocaltax2ES=Purchases +CalcLocaltax2ES=Compras CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases -CalcLocaltax3ES=Sales +CalcLocaltax3ES=Vendas CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales LabelUsedByDefault=Etiqueta que se utilizará se não se encontra tradução para este código LabelOnDocuments=Etiqueta sobre documentos @@ -951,7 +969,7 @@ InfoWebServer=Detalhes do servidor web InfoDatabase=Detalhes da base de dados InfoPHP=Detalhes do PHP InfoPerf=Detalhes de Performance -BrowserName=Browser name +BrowserName=Nome do Navegador BrowserOS=Browser OS ListEvents=Auditoría de eventos ListOfSecurityEvents=Listagem de eventos de segurança ERP/CRM @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Senha para usar o servidor proxy DefineHereComplementaryAttributes=Defina aqui todos os atributos complementares, que não estejam disponiveis por padrão, e que deseja ser suporte para %s. ExtraFields=Atributos complementares ExtraFieldsLines=Atributos complementares (linhas) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Atributos complementares (terceiro) ExtraFieldsContacts=Atributos complementares (contato/morada) ExtraFieldsMember=Atributos complementares (membro) @@ -1035,7 +1055,7 @@ ExtraFieldsSupplierOrders=Atributos complementares (encomendas) ExtraFieldsSupplierInvoices=Atributos complementares (faturas) ExtraFieldsProject=Atributos complementares (projetos) ExtraFieldsProjectTask=Atributos complementares (tarefas) -ExtraFieldHasWrongValue=Attribute %s has a wrong value. +ExtraFieldHasWrongValue=O atributo %s tem um valor errado. AlphaNumOnlyCharsAndNoSpace=apenas caracteres alfanuméricos sem espaços AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space SendingMailSetup=Configuração de envios por correio eletrónico @@ -1047,11 +1067,11 @@ TranslationSetup=Configuração da tradução TranslationDesc=Choice of language visible on screen can be modified:
* Globally from menu Home - Setup - Display
* For user only from tab User display of user card (click on login on top of screen). TotalNumberOfActivatedModules=Total de módulos de funcionalidades ativos: %s YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo -ClassNotFoundIntoPathWarning=Class %s not found into PHP path +ClassNotFoundIntoPathWarning=Classe %s não encontrada no caminho PHP YesInSummer=Sim no verão OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): SuhosinSessionEncrypt=Session storage encrypted by Suhosin -ConditionIsCurrently=Condition is currently %s +ConditionIsCurrently=A condição está atualmente %s YouUseBestDriver=You use driver %s that is best driver available currently. YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. @@ -1059,10 +1079,10 @@ SearchOptim=Optimização da pesquisa YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response. BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance. BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari. -XDebugInstalled=XDebug is loaded. -XCacheInstalled=XCache is loaded. +XDebugInstalled=XDebug está carregado. +XCacheInstalled=XCache está carregada. AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp". -FieldEdition=Edition of field %s +FieldEdition=Edição do campo %s FixTZ=Corrigir Fuso Horário FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) GetBarCode=Obter código de barras @@ -1089,7 +1109,7 @@ ModuleCompanyCodeDigitaria=Devolve um código contabilistico composto por o cód UseNotifications=Usar Notificações NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* or by setting a global target email address on module setup page. ModelModules=Documentos modelos -DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) +DocumentModelOdt=Crie documentos a partir dos modelos OpenDocuments (ficheiros .ODT ou .ODS para o KOffice, OpenOffice, TextEdit,...) WatermarkOnDraft=Marca d' JSOnPaimentBill=Activate feature to autofill payment lines on payment form CompanyIdProfChecker=Identidade profissional única @@ -1137,7 +1157,7 @@ EnableEditDeleteValidInvoice=Activar a possibilidade de editar/eliminar uma fact SuggestPaymentByRIBOnAccount=Sugerir o pagamento por transfência para a conta SuggestPaymentByChequeToAddress=Sugerir o pagamento por cheque a FreeLegalTextOnInvoices=Texto livre em facturas -WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty) +WatermarkOnDraftInvoices=Marca d'água nas faturas provisórias (nenhuma se em branco) ##### Proposals ##### PropalSetup=Configuração do módulo Orçamentos CreateForm=Criação formulario @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Uma linha de producto/serviço que tem uma quantidade FreeLegalTextOnProposal=Texto livre em Orçamentos WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Configuração do módulo pedidos OrdersNumberingModules=Módulos de numeração dos pedidos @@ -1159,7 +1186,7 @@ OrdersModelModule=Modelos de documentos dos pedidos HideTreadedOrders=Hide the treated or cancelled orders in the list ValidOrderAfterPropalClosed=Confirmar o pedido depois de fechar o orçamento, permite não passar por um pedido provisório FreeLegalTextOnOrders=Texto livre em pedidos -WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +WatermarkOnDraftOrders=Marca d'água nas encomendas provisórias (nenhuma se em branco) ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order ##### Clicktodial ##### @@ -1174,7 +1201,7 @@ FicheinterNumberingModules=Módulos de numeração das fichas de intervenção TemplatePDFInterventions=Modelo de documentos das fichas de intervenção WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) ##### Contracts ##### -ContractsSetup=Contracts/Subscriptions module setup +ContractsSetup=Configurar módulo de Contractos/Subscricões ContractsNumberingModules=Contratos de numeração módulos TemplatePDFContracts=Contracts documents models FreeLegalTextOnContracts=Free text on contracts @@ -1255,7 +1282,7 @@ LDAPTCPConnectOK=Ligação TCP ao servidor LDAP efectuada (Servidor LDAPTCPConnectKO=Falha de ligação TCP ao servidor LDAP (Servidor LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) LDAPBindKO=Fallo de ligação/autenticação ao servidor LDAP (Servidor -LDAPUnbindSuccessfull=Disconnect successful +LDAPUnbindSuccessfull=Desligado com sucesso LDAPUnbindFailed=Saida falhada LDAPConnectToDNSuccessfull=Ligação a DN (%s) realizada LDAPConnectToDNFailed=Conecção ao DN (%s) falhada @@ -1324,19 +1351,19 @@ ForANonAnonymousAccess=Para um acesso autentificado PerfDolibarr=Performance setup/optimizing report YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance. NotInstalled=Não instalado, o servidor não está mais lento por isso. -ApplicativeCache=Applicative cache +ApplicativeCache=Cache aplicativa MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server. MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete. MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled. -OPCodeCache=OPCode cache +OPCodeCache=Cache de OPCode NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad). HTTPCacheStaticResources=Cache HTTP para recursos estáticos (css, img, javascript) FilesOfTypeCached=Ficheiros do tipo %s são guardados na cache do servidor HTTP FilesOfTypeNotCached=Ficheiros do tipo %s não são guardados na cache do servidor HTTP FilesOfTypeCompressed=Ficheiros do tipo %s são comprimidos pelo servidor HTTP FilesOfTypeNotCompressed=Ficheiros do tipo %s não são comprimidos pelo servidor HTTP -CacheByServer=Cache by server -CacheByClient=Cache by browser +CacheByServer=Cache pelo servidor +CacheByClient=Cache pelo navegador CompressionOfResources=Compressão das respostas HTTP TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers ##### Products ##### @@ -1365,7 +1392,7 @@ SyslogSimpleFile=Ficheiro SyslogFilename=Nome e caminho do Ficheiro YouCanUseDOL_DATA_ROOT=Pode utilizar DOL_DATA_ROOT/dolibarr.log para um log na pasta 'documentos' de Dolibarr. ErrorUnknownSyslogConstant=A constante %s não é uma constante syslog conhecida -OnlyWindowsLOG_USER=Windows only supports LOG_USER +OnlyWindowsLOG_USER=O Windows suporta apenas LOG_USER ##### Donations ##### DonationsSetup=Configuração do módulo Bolsas DonationsReceiptModel=Modelo de recibo de doação @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Códigos de barras tipo UPC BarcodeDescISBN=Códigos de barras tipo ISBN BarcodeDescC39=Códigos de barras tipo C39 BarcodeDescC128=Códigos de barras tipo C128 -GenbarcodeLocation=Ferramenta de geração de código de barras em linha de pedido (utilizado por o motor phpbar para determinados tipos de códigos barra) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Motor interno BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1399,7 +1426,7 @@ MailingEMailFrom=E-Mail emissor (From) dos correios enviados por E-Mailing MailingEMailError=Retorno EMail (Erros a) para e-mails com erros MailingDelay=Seconds to wait after sending next message ##### Notification ##### -NotificationSetup=EMail notification module setup +NotificationSetup=Configurar módulo da notificação de mensagem NotificationEMailFrom=E-Mail emissor (From) dos correios enviados a traves de Notificações ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) FixedEmailTarget=Fixed email target @@ -1482,8 +1509,8 @@ Sell=Vender InvoiceDateUsed=Data da factura usada YourCompanyDoesNotUseVAT=Sua empresa não tem configuração definida para usar o IVA (Home - Setup - Empresa / Fundação), pelo que não há opções de configuração do IVA. AccountancyCode=Código de Contabilidade -AccountancyCodeSell=Sale account. code -AccountancyCodeBuy=Purchase account. code +AccountancyCodeSell=Código da conta de Vendas +AccountancyCodeBuy=Código da conta de Compras ##### Agenda ##### AgendaSetup=Módulo configuração de acções e agenda PasswordTogetVCalExport=Chave de autorização para exportação do link vcal. @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Conta de efectivo que se utilizará para as vendas CashDeskBankAccountForCheque= Conta a ser usada para receber pagamentos através de cheques CashDeskBankAccountForCB= Conta a ser usada para receber pagamentos em dinheiro ou por cartões de crédito -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Configuração do Modulo de Favoritos @@ -1546,26 +1574,30 @@ TaskModelModule=Tasks reports document model ECMSetup = Configuração GED ECMAutoTree = Automatic tree folder and document ##### Fiscal Year ##### -FiscalYears=Fiscal years -FiscalYear=Fiscal year +FiscalYears=Anos Fiscais +FiscalYear=Ano Fiscal FiscalYearCard=Fiscal year card -NewFiscalYear=New fiscal year -EditFiscalYear=Edit fiscal year -OpenFiscalYear=Open fiscal year -CloseFiscalYear=Close fiscal year -DeleteFiscalYear=Delete fiscal year -ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? -Opened=Opened -Closed=Closed -AlwaysEditable=Can always be edited +NewFiscalYear=Novo ano fiscal +EditFiscalYear=Editar ano fiscal +OpenFiscalYear=Abrir ano fiscal +CloseFiscalYear=Fechar ano fiscal +DeleteFiscalYear=Apagar ano fiscal +ConfirmDeleteFiscalYear=Tem a certeza de que deseja apagar este ano fiscal? +Opened=Aberto +Closed=Fechado +AlwaysEditable=Pode ser sempre editado MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) -NbMajMin=Minimum number of uppercase characters -NbNumMin=Minimum number of numeric characters -NbSpeMin=Minimum number of special characters -NbIteConsecutive=Maximum number of repeating same characters +NbMajMin=Número máximo de carateres maiúsculos +NbNumMin=Número mínimod de carateres numéricos +NbSpeMin=Número mínimo de carateres especiais +NbIteConsecutive=Número máximo para repetir os mesmos carateres NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation -SalariesSetup=Setup of module salaries -SortOrder=Sort order -Format=Format +SalariesSetup=Configuração do módulo de salários +SortOrder=Ordenação +Format=Formato TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang index 18e2a01c67f..aefc7e59618 100644 --- a/htdocs/langs/pt_PT/banks.lang +++ b/htdocs/langs/pt_PT/banks.lang @@ -33,7 +33,11 @@ AllTime=Do início Reconciliation=Conciliação RIB=Conta bancária IBAN=Identificador IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=Identificador BIC/SWIFT +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Débitos Directos StandingOrder=Domiciliação Withdrawals=Reembolsos @@ -148,7 +152,7 @@ BackToAccount=Voltar à Conta ShowAllAccounts=Mostrar para todas as Contas FutureTransaction=Transacção futura. Não há forma de conciliar. SelectChequeTransactionAndGenerate=Selecione o que pretende incluir no recibo de depósito e clique em "Criar". -InputReceiptNumber=Escolha o extrato bancário relacionadas com a conciliação. Use um valor numérico ordenável (como, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventualmente, especifique uma categoria que deseja classificar os movimentos ToConciliate=Para conciliar? ThenCheckLinesAndConciliate=Em seguida, verifique as linhas presentes no extrato bancário e clique diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang index be47a167a5e..8a28a423f86 100644 --- a/htdocs/langs/pt_PT/bills.lang +++ b/htdocs/langs/pt_PT/bills.lang @@ -1,16 +1,16 @@ # Dolibarr language file - Source file is en_US - bills Bill=Factura Bills=Facturas -BillsCustomers=Customers invoices -BillsCustomer=Customers invoice -BillsSuppliers=Suppliers invoices -BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomers=Facturas de Clientes +BillsCustomer=Fatura do Cliente +BillsSuppliers=Facturas de Fornecedores +BillsCustomersUnpaid=Facturas de Clientes a Receber BillsCustomersUnpaidForCompany=Facturas a Clientes Pendentes de Cobrança de %s BillsSuppliersUnpaid=Facturas de Fornecedores Pendentes de Pagamento BillsSuppliersUnpaidForCompany=Facturas de fornecedores não remunerado para a %s BillsLate=Os pagamentos em atraso -BillsStatistics=Customers invoices statistics -BillsStatisticsSuppliers=Suppliers invoices statistics +BillsStatistics=Estatísticas das faturas de clientes +BillsStatisticsSuppliers=Estatísticas das faturas de fornecedores DisabledBecauseNotErasable=Desactivada porque não podem ser apagados InvoiceStandard=Factura Standard InvoiceStandardAsk=Factura Standard @@ -87,7 +87,7 @@ ClassifyCanceled=Classificar 'Abandonado' ClassifyClosed=Classificar 'Fechado' ClassifyUnBilled=Classify 'Unbilled' CreateBill=Criar Factura -AddBill=Create invoice or credit note +AddBill=Criar Factura ou Nota de Crédito AddToDraftInvoices=Adicionar à fatura rascunho DeleteBill=Eliminar Factura SearchACustomerInvoice=Procurar uma factura de cliente @@ -189,15 +189,15 @@ AlreadyPaid=Já e AlreadyPaidBack=Já reembolsado AlreadyPaidNoCreditNotesNoDeposits=Já pagas (sem notas de crédito e depósitos) Abandoned=Abandonada -RemainderToPay=Remaining unpaid +RemainderToPay=Restante a receber RemainderToTake=Remaining amount to take RemainderToPayBack=Remaining amount to pay back Rest=Pendente AmountExpected=Montante reclamado ExcessReceived=Recebido em excesso EscompteOffered=Desconto (Pronto pagamento) -SendBillRef=Submission of invoice %s -SendReminderBillRef=Submission of invoice %s (reminder) +SendBillRef=Submissão da fatura %s +SendReminderBillRef=Submissão da fatura %s (lembrete) StandingOrders=Débitos Directos StandingOrder=Domiciliação NoDraftBills=Nenhuma factura rascunho @@ -222,13 +222,13 @@ NonPercuRecuperable=Não recuperável SetConditions=Definir Condições de pagamento SetMode=Definir modo de pagamento Billed=Facturado -RepeatableInvoice=Template invoice -RepeatableInvoices=Template invoices -Repeatable=Template -Repeatables=Templates -ChangeIntoRepeatableInvoice=Convert into template invoice -CreateRepeatableInvoice=Create template invoice -CreateFromRepeatableInvoice=Create from template invoice +RepeatableInvoice=Fatura Modelo +RepeatableInvoices=Faturas Modelo +Repeatable=Modelo +Repeatables=Modelos +ChangeIntoRepeatableInvoice=Converter em fatura modelo +CreateRepeatableInvoice=Criar fatura modelo +CreateFromRepeatableInvoice=Criar a partir da fatura modelo CustomersInvoicesAndInvoiceLines=Facturas a clientes e linhas de facturas CustomersInvoicesAndPayments=Facturas a clientes e pagamentos ExportDataset_invoice_1=Facturas a clientes e linhas de factura @@ -247,7 +247,7 @@ AddGlobalDiscount=Adicionar Desconto fixo EditGlobalDiscounts=Editar descontos absolutos AddCreditNote=Criar nota de crédito ShowDiscount=Ver o deposito -ShowReduc=Show the deduction +ShowReduc=Mostrar a dedução RelativeDiscount=Desconto relativo GlobalDiscount=Desconto fixo CreditNote=Deposito @@ -293,8 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual ConfirmRemoveDiscount=Tem certeza de que deseja remover este desconto? RelatedBill=factura relacionados RelatedBills=facturas relacionadas -LatestRelatedBill=Latest related invoice -WarningBillExist=Warning, one or more invoice already exist +LatestRelatedBill=Última fatura relacionada +WarningBillExist=Aviso, já existe uma ou mais faturas # PaymentConditions PaymentConditionShortRECEP=Pronto Pagamento @@ -313,7 +313,7 @@ PaymentConditionShortPT_ORDER=On order PaymentConditionPT_ORDER=On order PaymentConditionShortPT_5050=50-50 PaymentConditionPT_5050=50%% adiantado, 50%% na entrega -FixAmount=Fix amount +FixAmount=Valor fixo VarAmount=Quantidade variável (%% total.) # PaymentType PaymentTypeVIR=Transferência bancaria @@ -348,7 +348,7 @@ ChequeNumber=Cheque nº ChequeOrTransferNumber=Cheque/Transferência nº ChequeMaker=Emissor do cheque ChequeBank=Banco do cheque -CheckBank=Check +CheckBank=Verificar NetToBePaid=Neto a pagar PhoneNumber=Tel. FullPhoneNumber=telefone @@ -419,12 +419,12 @@ InvoiceSituationAsk=Invoice following the situation InvoiceSituationDesc=Create a new situation following an already existing one SituationAmount=Situation invoice amount(net) SituationDeduction=Situation subtraction -Progress=Progress -ModifyAllLines=Modify all lines +Progress=Progresso +ModifyAllLines=Modificar todas as linhas CreateNextSituationInvoice=Create next situation NotLastInCycle=This invoice in not the last in cycle and must not be modified. DisabledBecauseNotLastInCycle=The next situation already exists. -DisabledBecauseFinal=This situation is final. +DisabledBecauseFinal=Esta situação é final. CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. NoSituations=No opened situations -InvoiceSituationLast=Final and general invoice +InvoiceSituationLast=Fatura geral e final diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang index 7bf37e00221..7c35e34c5e4 100644 --- a/htdocs/langs/pt_PT/boxes.lang +++ b/htdocs/langs/pt_PT/boxes.lang @@ -1,7 +1,7 @@ # Dolibarr language file - Source file is en_US - boxes BoxLastRssInfos=Informação RSS BoxLastProducts=Últimos %s produtos/serviços -BoxProductsAlertStock=Products in stock alert +BoxProductsAlertStock=Produtos no alerta de stock BoxLastProductsInContract=Últimos %s produtos/serviços contratados BoxLastSupplierBills=Últimas faturas dos fornecedores BoxLastCustomerBills=Últimas faturas a clientes @@ -27,7 +27,7 @@ BoxTitleLastBooks=Os %s últimos Favoritos registados BoxTitleNbOfCustomers=Número de clientes BoxTitleLastRssInfos=As %s últimas notícias de %s BoxTitleLastProducts=Os %s últimos produtos/serviços modificados -BoxTitleProductsAlertStock=Products in stock alert +BoxTitleProductsAlertStock=Produtos no alerta de stock BoxTitleLastCustomerOrders=Last %s customer orders BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=Os %s últimos Fornecedores modificados @@ -88,7 +88,7 @@ BoxSuppliersInvoicesPerMonth=Facturas de fornecedores por mês BoxCustomersOrdersPerMonth=Encomendas de clientes por mês BoxSuppliersOrdersPerMonth=Encomendas de Fornecedores por mês BoxProposalsPerMonth=Propostas por mês -NoTooLowStockProducts=Nenhum produto abaixo do limite inferior de stock +NoTooLowStockProducts=Nenhum produto abaixo do limite mínimo de stock BoxProductDistribution=Distribuição de Produtos/Serviços BoxProductDistributionFor=Distribuição de %s para %s ForCustomersInvoices=Facturas de Clientes diff --git a/htdocs/langs/pt_PT/commercial.lang b/htdocs/langs/pt_PT/commercial.lang index 21fd2165145..4e3973d67b1 100644 --- a/htdocs/langs/pt_PT/commercial.lang +++ b/htdocs/langs/pt_PT/commercial.lang @@ -9,9 +9,9 @@ Prospect=Cliente Potencial Prospects=Clientes Potenciais DeleteAction=Eliminar uma Acção NewAction=Nova Acção -AddAction=Criar Acção -AddAnAction=Criar uma Acção -AddActionRendezVous=Criar uma Reunião +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Reunião ConfirmDeleteAction=Está seguro de querer eliminar esta acção? CardAction=Ficha da Acção @@ -44,8 +44,8 @@ DoneActions=Lista de acções realizadas DoneActionsFor=Lista de acções realizadas por %s ToDoActions=Lista de acções incompletas ToDoActionsFor=Lista de acções incompletas de %s -SendPropalRef=Enviar orçamento %s -SendOrderRef=Enviar pedido %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Não aplicável StatusActionToDo=A realizar StatusActionDone=Realizado @@ -62,7 +62,7 @@ LastProspectContactDone=Clientes potenciais contactados DateActionPlanned=Data planificação DateActionDone=Data realização ActionAskedBy=Acção questionada por -ActionAffectedTo=Acção assignada a +ActionAffectedTo=Event assigned to ActionDoneBy=Acção realizada por ActionUserAsk=Registada por ErrorStatusCantBeZeroIfStarted=Se o campo 'Ficha de Realização' tiver dados a acção está em curso, por isso o campo 'Estado' não pode ser 0%%. diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang index 8098ab7c1d5..c43f8cdc695 100644 --- a/htdocs/langs/pt_PT/compta.lang +++ b/htdocs/langs/pt_PT/compta.lang @@ -4,7 +4,7 @@ AccountancyCard=Ficha Contabilidade Treasury=Tesouraria MenuFinancial=Financeira TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation -TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation +TaxModuleSetupToModifyRulesLT=Ir para configurar Empresa para modificar as regras de cálculo OptionMode=Opção de Gestão Contabilidade OptionModeTrue=Opção Depósitos/Despesas OptionModeVirtual=Opção Créditos/Dividas @@ -19,8 +19,8 @@ AmountToBeCharged=Montante total a pagar: AccountsGeneral=Contas Gerais Account=Conta Accounts=Contas -Accountparent=Account parent -Accountsparent=Accounts parent +Accountparent=Conta original +Accountsparent=Contas originais BillsForSuppliers=Facturas de Fornecedores Income=Depósitos Outcome=Despesas @@ -33,7 +33,7 @@ AccountingResult=Accounting result Balance=Saldo Debit=Débito Credit=Crédito -Piece=Accounting Doc. +Piece=Doc. Contabilístico Withdrawal=Retirada Withdrawals=Retiradas AmountHTVATRealReceived=Total Recebido @@ -55,7 +55,7 @@ LT1SupplierES=RE purchases VATCollected=IVA Recuperado ToPay=A Pagar ToGet=Para Voltar -SpecialExpensesArea=Area for all special payments +SpecialExpensesArea=Área para todos os pagamentos especiais TaxAndDividendsArea=Área Impostos, gastos sociais e dividendos SocialContribution=Gasto social SocialContributions=Gastos sociais @@ -131,13 +131,13 @@ CalcModeLT1Rec= Mode %sRE on suppliers invoices%s CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s CalcModeLT2Debt=Mode %sIRPF on customer invoices%s CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s -AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary -AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary +AnnualSummaryDueDebtMode=Balanço da receita e despesas, resumo anual +AnnualSummaryInputOutputMode=Balanço da receita e despesas, resumo anual AnnualByCompaniesDueDebtMode=Balanço de depósitos e despesas, quebrado por Terceiros, em modo%sCréditos-dividas%s chamada Contabilidade de compromisso. AnnualByCompaniesInputOutputMode=Balanço de depósitos e despesas, quebrado por Terceiros, em modo %sdepositos-despesas%s chamada Contabilidade de Caixa. SeeReportInInputOutputMode=Ver o Relatório %sdepositos-despesas%s chamado Contabilidade de Caixa para um cálculo sobre as facturas pagas SeeReportInDueDebtMode=Ver o Relatório %sCréditos-dividas%s chamada Contabilidade de compromisso para um cálculo das facturas Pendentes de pagamento -RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included +RulesAmountWithTaxIncluded=- Os montantes exibidos contêm todas as taxas incluídas RulesResultDue=- Os montantes mostrados são montantes totais
- Inclui as facturas, gastos e IVA devido, que estão pagas ou não.
- Se baseia na data de validação para as facturas e o IVA e na data de vencimento para as gastos.
RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT.
- It is based on the payment dates of the invoices, expenses and VAT. RulesCADue=- Inclui as facturas a clientes, estejam pagas ou não.
- Se baseia na data de validação das mesmas.
@@ -186,10 +186,10 @@ Pcg_subtype=Pcg subtype InvoiceLinesToDispatch=Invoice lines to dispatch InvoiceDispatched=Dispatched invoices AccountancyDashboard=Accountancy summary -ByProductsAndServices=By products and services +ByProductsAndServices=Por produtos e serviços RefExt=Ref externa ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". -LinkedOrder=Link to order +LinkedOrder=Hiperligação para encomendar ReCalculate=Recalcular Mode1=Método 1 Mode2=Método 2 @@ -202,6 +202,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties -CloneTax=Clone a social contribution -ConfirmCloneTax=Confirm the clone of a social contribution -CloneTaxForNextMonth=Clone it for next month +CloneTax=Clonar uma contribuição social +ConfirmCloneTax=Confirme a clonagem de uma contribuição social +CloneTaxForNextMonth=Cloná-la para o mês seguinte diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang index 2c51fe50855..331cdf7a972 100644 --- a/htdocs/langs/pt_PT/contracts.lang +++ b/htdocs/langs/pt_PT/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expirado ServiceStatusClosed=Fechado ServicesLegend=Legenda para os serviços Contracts=contractos +ContractsAndLine=Contracts and line of contracts Contract=Contrato NoContracts=Sem contractos MenuServices=Serviços diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang index d3cf487ddd2..9c45da9a4da 100644 --- a/htdocs/langs/pt_PT/cron.lang +++ b/htdocs/langs/pt_PT/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Aceda a "Home - Ferramentas dos Módulos" para visualizar e editar as tarefas agendadas. +TaskDisabled=Task disabled diff --git a/htdocs/langs/pt_PT/donations.lang b/htdocs/langs/pt_PT/donations.lang index 7a31ae91628..0c3c915fb2f 100644 --- a/htdocs/langs/pt_PT/donations.lang +++ b/htdocs/langs/pt_PT/donations.lang @@ -4,35 +4,35 @@ Donations=Donativos DonationRef=Ref. do donativo Donor=Doador Donors=Doadores -AddDonation=Create a donation -NewDonation=Nova Doação +AddDonation=Crie uma donativo +NewDonation=Novo Donativo ShowDonation=Mostrar Donativo DonationPromise=Promessa de Doação PromisesNotValid=Promessas Não Validadas PromisesValid=Promessas Validadas -DonationsPaid=Doações Pagas -DonationsReceived=Doações Recebidas -PublicDonation=Doação Pública -DonationsNumber=Número de Doações -DonationsArea=Área de Doações +DonationsPaid=Donativos Pagos +DonationsReceived=Donativos Recebidos +PublicDonation=Donativo Público +DonationsNumber=Número de Donativos +DonationsArea=Área de Donativos DonationStatusPromiseNotValidated=Promessa Não Validada DonationStatusPromiseValidated=Promessa Validada -DonationStatusPaid=Doação Paga +DonationStatusPaid=Donativo Recebido DonationStatusPromiseNotValidatedShort=Não Validada -DonationStatusPromiseValidatedShort=Validada -DonationStatusPaidShort=Paga +DonationStatusPromiseValidatedShort=Validado +DonationStatusPaidShort=Recebido ValidPromess=Validar promessa -DonationReceipt=Recibo do donativo +DonationReceipt=Recibo do Donativo BuildDonationReceipt=Criar Recibo -DonationsModels=Modelo de documento de recepção de Doação -LastModifiedDonations=%s Última modificação doações -SearchADonation=Procure uma doação -DonationRecipient=Destinatário do donativo +DonationsModels=Modelos de documentos dos recibos de donativos +LastModifiedDonations=%s Última modificação de donativos +SearchADonation=Procure um donativo +DonationRecipient=Destinatário do Donativo ThankYou=Obrigado -IConfirmDonationReception=O destinatário acusou a recepção, como um donativo, do seguinte montante -MinimumAmount=Minimum amount is %s -FreeTextOnDonations=Free text to show in footer -FrenchOptions=Options for France +IConfirmDonationReception=O destinatário declarou a recepção, como um donativo, do seguinte montante +MinimumAmount=O montante mínimo é %s +FreeTextOnDonations=Texto livre para mostrar no rodapé +FrenchOptions=Opções para França DONATION_ART200=Show article 200 from CGI if you are concerned DONATION_ART238=Show article 238 from CGI if you are concerned DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang index d7d6a8f61f0..6ebfe918305 100644 --- a/htdocs/langs/pt_PT/errors.lang +++ b/htdocs/langs/pt_PT/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=A conta origem e destino devem ser diferentes. ErrorBadThirdPartyName=Nome de Terceiro incorrecto ErrorProdIdIsMandatory=O %s é obrigatório ErrorBadCustomerCodeSyntax=A sintaxis do código cliente é incorrecta -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Código cliente obrigatório ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Código de cliente já utilizado @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript não deve ser desativado para que este r ErrorPasswordsMustMatch=Ambas as senhas digitadas devem corresponder entre si ErrorContactEMail=Um erro técnico ocorreu. Por favor, contacte o administrador para seguir %s e-mail em fornecer os %s código de erro na sua mensagem, ou melhor ainda pela adição de uma cópia de tela da página. ErrorWrongValueForField=Valor errado para o número %s campo (valor "%s" não coincide com %s regra regex) -ErrorFieldValueNotIn=Valor errado para %s campo de número ("%s" de valor não é um valor disponível em %s %s campo de tabela) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Valor errado para %s número de campo ("%s" valor não é um ref %s existente) ErrorsOnXLines=%s sobre as linhas das fontes de erros ErrorFileIsInfectedWithAVirus=O programa antivírus não foi capaz de validar o arquivo (arquivo pode ser infectado por um vírus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Os parâmetros de configuração obrigatórios ainda não estão definidos diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang index 2f8cd8f23f1..63bb32c1033 100644 --- a/htdocs/langs/pt_PT/holiday.lang +++ b/htdocs/langs/pt_PT/holiday.lang @@ -1,30 +1,30 @@ # Dolibarr language file - Source file is en_US - holiday HRM=RH -Holidays=Folgas -CPTitreMenu=Folgas -MenuReportMonth=Monthly statement -MenuAddCP=Faça uma requesição de folgas -NotActiveModCP=Deve ativar o modulo de folgas para ver esta página -NotConfigModCP=Você deve configurar o módulo de folgas para ver esta página. Para fazer isso, click here . -NoCPforUser=Não tem nenhum dia disponivel -AddCP=Faça uma requisição de folga -Employe=Empregado +Holidays=Licenças +CPTitreMenu=Licenças +MenuReportMonth=Comunicado mensal +MenuAddCP=Efetue um pedido de licença +NotActiveModCP=Deve ativar o módulo de Licenças para ver esta página. +NotConfigModCP=Deve configurar o módulo de Licenças para ver esta página. Para o efetuar, clique aqui . +NoCPforUser=Não tem nenhum dia disponivel. +AddCP=Efetue um pedido de licença +Employe=Funcionário DateDebCP=Data de início DateFinCP=Data de fim DateCreateCP=Data de criação DraftCP=Rascunho ToReviewCP=Aguarda aprovação -ApprovedCP=Aprovado -CancelCP=Cancelado -RefuseCP=Recusado -ValidatorCP=Approbator -ListeCP=Lista de folgas -ReviewedByCP=Será analisado por +ApprovedCP=Aprovada +CancelCP=Cancelada +RefuseCP=Recusada +ValidatorCP=Autorizada por +ListeCP=Lista de Licenças +ReviewedByCP=Será revista por DescCP=Descrição -SendRequestCP=Criar requisição de folga -DelayToRequestCP=Requisição de folga de ser feita pelo menos %s dia(s) antes de. -MenuConfCP=Editar balanço de folgas -UpdateAllCP=Atualisar folgas +SendRequestCP=Criar requisição de licença +DelayToRequestCP=Os pedidos de licença devem ser efetuados com pelo menos %s dia(s) de antecedência. +MenuConfCP=Editar balanço das licenças +UpdateAllCP=Atualize as licenças SoldeCPUser=Balanço de folgas é %s dias ErrorEndDateCP=You must select an end date greater than the start date. ErrorSQLCreateCP=Ocorreu um erro de SQL durante a criação: diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang index 2a038935c53..e281ee14d50 100644 --- a/htdocs/langs/pt_PT/install.lang +++ b/htdocs/langs/pt_PT/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Último passo: Defina aqui o login ea senha que vo ActivateModule=Ative o módulo %s ShowEditTechnicalParameters=Clique aqui para mostrar/editar os parâmetros avançados (modo avançado) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang index 473dd490106..67f384c4152 100644 --- a/htdocs/langs/pt_PT/languages.lang +++ b/htdocs/langs/pt_PT/languages.lang @@ -13,7 +13,7 @@ Language_de_AT=Alemão (Áustria) Language_de_CH=Alemão (Suíça) Language_el_GR=Grego Language_en_AU=Inglês (Austrália) -Language_en_CA=English (Canada) +Language_en_CA=Inglês (Canadá) Language_en_GB=Inglês (Reino Unido) Language_en_IN=Inglês (Índia) Language_en_NZ=Inglês (Nova Zelândia) diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index 23c51af82a8..b017d2c856e 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -141,6 +141,7 @@ Cancel=Cancelar Modify=Modificar Edit=Editar Validate=Validar +ValidateAndApprove=Validate and Approve ToValidate=Para validar Save=Guardar SaveAs=Guardar Como @@ -158,6 +159,7 @@ Search=Procurar SearchOf=Procurar Valid=Confirmar Approve=Aprovar +Disapprove=Disapprove ReOpen=Reabrir Upload=Enviar Ficheiro ToLink=Link @@ -219,6 +221,7 @@ Cards=Fichas Card=Ficha Now=Ahora Date=Data +DateAndHour=Date and hour DateStart=Data de Início DateEnd=Data de Fim DateCreation=Data de Criação @@ -295,6 +298,7 @@ UnitPriceHT=Preço Base (base) UnitPriceTTC=Preço Unitário PriceU=P.U. PriceUHT=P.U. (base) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=P.U. Amount=Montante AmountInvoice=Montante da Fatura @@ -521,6 +525,7 @@ DateFromTo=De %s a %s DateFrom=A partir de %s DateUntil=Até %s Check=Verificar +Uncheck=Uncheck Internal=Interno External=Externo Internals=Internos @@ -688,6 +693,7 @@ PublicUrl=URL público AddBox=Adicionar Caixa SelectElementAndClickRefresh=Selecione um elemento e actualize a pagina PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Segunda-feira Tuesday=Terça-feira diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang index 781be21e4db..31dde51f16a 100644 --- a/htdocs/langs/pt_PT/orders.lang +++ b/htdocs/langs/pt_PT/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Anulado StatusOrderDraft=Rascunho (a Confirmar) StatusOrderValidated=Validado StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processado StatusOrderToBill=A Facturar StatusOrderToBill2=A facturar @@ -58,6 +59,7 @@ MenuOrdersToBill=Pedidos por Facturar MenuOrdersToBill2=Billable orders SearchOrder=Procurar um Pedido SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Enviar Produto Discount=Desconto CreateOrder=Criar Pedido diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang index 6df1475eb17..764d37222a5 100644 --- a/htdocs/langs/pt_PT/other.lang +++ b/htdocs/langs/pt_PT/other.lang @@ -54,12 +54,13 @@ MaxSize=Tamanho Máximo AttachANewFile=Adicionar Novo Ficheiro/documento LinkedObject=Objecto adjudicado Miscellaneous=Diversos -NbOfActiveNotifications=Número Notificações +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Este é um email de teste. \\ NO duas linhas são separadas por um enter. PredefinedMailTestHtml=Este é um email de teste (o teste de palavra deve ser em negrito).
As duas linhas são separadas por um enter. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang index ff72b80058d..c65bb2b7247 100644 --- a/htdocs/langs/pt_PT/productbatch.lang +++ b/htdocs/langs/pt_PT/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Número de Lote/Série l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Detalhes de Lote/Série -DetailBatchFormat=Lote/Série: %s - E:%s - S: %s (Qt. : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Lote: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang index 15842116ed5..a543f3549d6 100644 --- a/htdocs/langs/pt_PT/products.lang +++ b/htdocs/langs/pt_PT/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang index f969b074f3f..31d5119f907 100644 --- a/htdocs/langs/pt_PT/projects.lang +++ b/htdocs/langs/pt_PT/projects.lang @@ -3,13 +3,15 @@ RefProject=Ref. do projeto ProjectId=Id. do Projeto Project=Projeto Projects=Projetos -ProjectStatus=Project status +ProjectStatus=Estado do projeto SharedProject=Toda a Gente PrivateProject=Contactos do projeto MyProjectsDesc=Esta visualização está limitada a projetos onde é um contacto para (seja qual for o tipo). ProjectsPublicDesc=Esta visualização apresenta todos os projetos que está autorizado a ler. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Esta visualização apresenta todos os projetos (as suas permissões de utilizador concedem-lhe a permissão para ver tudo). MyTasksDesc=Esta visualização está limitada aos projetos ou tarefas em que é um contacto para (seja qual for o tipo). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Esta visualização apresenta todos os projetos e tarefas que está autorizado a ler. TasksDesc=Esta visualização apresenta todos os projetos e tarefas (as suas permissões de utilizador concedem-lhe permissão para ver tudo). ProjectsArea=Área de Projetos @@ -29,6 +31,8 @@ NoProject=Nenhum projeto definido ou possuído NbOpenTasks=Nr. de Tarefas Abertas NbOfProjects=Nr. de Projetos TimeSpent=Tempo Dispendido +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Tempos Dispendidos RefTask=Ref. da Tarefa LabelTask=Etiqueta de Tarefa @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista de Pedidos a Fornecedores Associados a ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedores Associados ao Projeto ListContractAssociatedProject=Lista de Contratos Associados ao Projeto ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto -ListTripAssociatedProject=Lista de viagens e despesas associadas ao projeto +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Lista de eventos associados ao projeto ActivityOnProjectThisWeek=Atividade do Projeto nesta Semana ActivityOnProjectThisMonth=Actividade do Projecto neste Mês @@ -87,7 +91,7 @@ ActionsOnProject=Ações sobre o projeto YouAreNotContactOfProject=Não é um contato deste projeto privado DeleteATimeSpent=Excluir o tempo gasto ConfirmDeleteATimeSpent=Tem certeza que quer eliminar este tempo dispensado? -DoNotShowMyTasksOnly=See also tasks not assigned to me +DoNotShowMyTasksOnly=Ver também as tarefas não me atribuidas ShowMyTasksOnly=Ver só as tarefas que me foram atribuídas TaskRessourceLinks=Recursos ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro @@ -103,9 +107,9 @@ CloneContacts=Clonar contactos CloneNotes=Clonar notas CloneProjectFiles=Clone project joined files CloneTaskFiles=Clone task(s) joined files (if task(s) cloned) -CloneMoveDate=Update project/tasks dates from now ? +CloneMoveDate=Atualizar as datas do projeto/tarefas a partir de agora? ConfirmCloneProject=Tem a certeza para clonar este projeto? -ProjectReportDate=Change task date according project start date +ProjectReportDate=Alterar a data da tarefa de acordo com a data de início do projeto ErrorShiftTaskDate=Impossible to shift task date according to new project start date ProjectsAndTasksLines=Projetos e tarefas ProjectCreatedInDolibarr=Projeto %s criado @@ -130,6 +134,9 @@ PlannedWorkload = Carga de trabalho planeada WorkloadOccupation= Afectação da carga de trabalho ProjectReferers=Refering objects SearchAProject=Procurar um projeto -ProjectMustBeValidatedFirst=Project must be validated first +ProjectMustBeValidatedFirst=Primeiro deve validar o projeto ProjectDraft=Esboço de projetos FirstAddRessourceToAllocateTime=Associar um recuirso para alocar a hora +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang index 5966b69f13b..9c699574cc0 100644 --- a/htdocs/langs/pt_PT/salaries.lang +++ b/htdocs/langs/pt_PT/salaries.lang @@ -10,3 +10,4 @@ SalariesPayments=Pagamentos de Salários ShowSalaryPayment=Mostrar pagamento de salário THM=Preço médio da hora TJM=Preço médio diário +CurrentSalary=Current salary diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang index ad26c2228cd..ca9bf9bce91 100644 --- a/htdocs/langs/pt_PT/sendings.lang +++ b/htdocs/langs/pt_PT/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Quant. Pedida QtyShipped=Quant. Enviada QtyToShip=Quant. a Enviar QtyReceived=Quant. Recebida -KeepToShip=Manter por Enviar +KeepToShip=Remain to ship OtherSendingsForSameOrder=Outros Envios deste Pedido DateSending=Data de Expedição DateSendingShort=Data de Expedição diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang index 7211c46b431..d3fda31b63e 100644 --- a/htdocs/langs/pt_PT/stocks.lang +++ b/htdocs/langs/pt_PT/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Valor (PMP) PMPValueShort=PMP EnhancedValueOfWarehouses=Valor de stocks UserWarehouseAutoCreate=Criar existencias automáticamente na criação de um utilizador +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantidade desagregada QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=Para este armazém ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang index 1e0e55d1422..b57b823e0fd 100644 --- a/htdocs/langs/pt_PT/suppliers.lang +++ b/htdocs/langs/pt_PT/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Fornecedores -Supplier=Fornecedor AddSupplier=Create a supplier SupplierRemoved=Fornecedor Eliminado SuppliersInvoice=Facturas do Fornecedor @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Facturas Fornecedores e Pagamentos ExportDataset_fournisseur_3=Pedidos a fornecedores e linhas de pedido ApproveThisOrder=Aprovar este Pedido ConfirmApproveThisOrder=Está seguro de querer aprovar este pedido? -DenyingThisOrder=Negar este Pedido +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Está seguro de querer negar este pedido? ConfirmCancelThisOrder=Está seguro de querer cancelar este pedido? AddCustomerOrder=Criar Pedido do Cliente diff --git a/htdocs/langs/pt_PT/trips.lang b/htdocs/langs/pt_PT/trips.lang index 09f269a57e1..1733fe86dc2 100644 --- a/htdocs/langs/pt_PT/trips.lang +++ b/htdocs/langs/pt_PT/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Deslocação -Trips=Deslocações -TripsAndExpenses=Deslocações e Despesas -TripsAndExpensesStatistics=Viagens e estatísticas despesas -TripCard=Ficha de Deslocação -AddTrip=Adicionar Deslocação -ListOfTrips=Lista de Deslocações +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Lista de Taxas -NewTrip=Nova Deslocação +NewTrip=New expense report CompanyVisited=Empresa/Instituição Visitada Kilometers=Quilómetros FeesKilometersOrAmout=Quantidade de Quilómetros -DeleteTrip=Eliminar Deslocação -ConfirmDeleteTrip=Deseja mesmo eliminar esta deslocação? -TF_OTHER=Outro -TF_LUNCH=Alimentação -TF_TRIP=Viagem -ListTripsAndExpenses=Lista de viagens e despesas -ExpensesArea=Viagens e área de despesas -SearchATripAndExpense=Procure uma viagem e despesas +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Outro +TF_TRANSPORTATION=Transportation +TF_LUNCH=Alimentação +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang index ed875d3ec11..d91192821e9 100644 --- a/htdocs/langs/ro_RO/admin.lang +++ b/htdocs/langs/ro_RO/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=Dezvoltare VersionUnknown=Necunoscut VersionRecommanded=Recomandat +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID Sesiune SessionSaveHandler=Handler pentru a salva sesiunile SessionSavePath=Storage sesiune localizare @@ -294,7 +299,7 @@ DoNotUseInProduction=Nu utilizaţi în producţie ThisIsProcessToFollow=Acesta este procesul de configurare pentru a: StepNb=Pasul %s FindPackageFromWebSite=Găsiţi un pachet care ofera facilitate dorit (de exemplu, pe site-ul web %s). -DownloadPackageFromWebSite=Download package %s. +DownloadPackageFromWebSite=Descărcaţi pachetul %s. UnpackPackageInDolibarrRoot=Unpack pachet de fişiere în directorul rădăcină Dolibarr lui %s SetupIsReadyForUse=Instalarea este terminat şi Dolibarr este gata pentru a fi utilizate cu această nouă componentă. NotExistsDirect=Nu este definit directorroot alternativ.
@@ -383,12 +388,12 @@ ExtrafieldSelectList = Select din tabel ExtrafieldSeparator=Separator ExtrafieldCheckBox=Checkbox ExtrafieldRadio=Radio buton -ExtrafieldCheckBoxFromList= Checkbox from table +ExtrafieldCheckBoxFromList= Checkbox din tabel ExtrafieldParamHelpselect=Lista de parametri trebuie să fie ca cheie, valoare

pentru exemplul:
1, valoare1
2, valoare2
3, value3
...

Pentru a avea listă în funcție de o alta:
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key ExtrafieldParamHelpcheckbox=Lista de parametri trebuie să fie de tip cheie, valoare

pentru exemplul:
1, valoare1
2, valoare2
3, value3
... ExtrafieldParamHelpradio=Lista de parametri trebuie să fie de tip cheie, valoare

pentru exemplul:
1, valoare1
2, valoare2
3, value3
... ExtrafieldParamHelpsellist=Lista de parametri a venit de la tabelul
Sintaxa: able_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filtru poate fi un test simplu (de exemplu, activ = 1), pentru a afișa doar valoare activă
dacă doriți să filtrați pe extracâmpuri folosi sintaxa extra.fieldcode=... (unde codul de câmp este codul de extracâmp)

În scopul de avea lista depinzând de alta :
c_typent:libelle:id:parent_list_code|parent_column:filter -ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpchkbxlst=Lista de parametri a venit de la tabelul
Sintaxa: able_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filtru poate fi un test simplu (de exemplu, activ = 1), pentru a afișa doar valoare activă
dacă doriți să filtrați pe extracâmpuri folosi sintaxa extra.fieldcode=... (unde codul de câmp este codul de extracâmp)

În scopul de avea lista depinzând de alta :
c_typent:libelle:id:parent_list_code|parent_column:filter LibraryToBuildPDF=Librairie utilizată la construirea PDF ului WarningUsingFPDF=Atenție: conf.php contine Directiva dolibarr_pdf_force_fpdf = 1. Acest lucru înseamnă că utilizați biblioteca FPDF pentru a genera fișiere PDF. Această bibliotecă este vechi și nu suportă o mulțime de caracteristici (Unicode, transparența imagine, cu litere chirilice, limbi arabe și asiatice, ...), astfel încât este posibil să apară erori în timpul generație PDF.
Pentru a rezolva acest lucru și au un suport complet de generare PDF, vă rugăm să descărcați biblioteca TCPDF , atunci comentariu sau elimina linia $ dolibarr_pdf_force_fpdf = 1, și se adaugă în schimb $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' LocalTaxDesc=Unele țări aplică 2 sau 3 impozite la fiecare linie de factura. Dacă este cazul, alege tipul al doilea și al treilea de taxă și ratele lor. Tipuri posibile sunt:
1: Taxa hoteliera se aplică pe produse și servicii, fără TVA (TVA nu este aplicată la taxa locala)
2: taxa locala pe produse și servicii fără TVA (TVA-ul este calculat la suma + localtax)
3: Taxa locală se aplică la produsele fara TVA (TVA nu se aplică la taxa locala)
4: Taxa locală se aplică la produsele fără TVA (TVA-ul este calculat la suma + localtax)
5: Taxa locală se aplică pe servicii fara TVA (TVA nu este aplicată la taxa locala)
6: Taxa locală se aplică pe servicii fără TVA (TVA-ul este calculat la suma + localtax) @@ -493,10 +498,16 @@ Module600Name=Notificări Module600Desc=Trimite notificări prin email la unele evenimente de afaceri Dolibarr la contactele terților (configurare definită pe fiecare terţ) Module700Name=Donatii Module700Desc=MAnagementul Donaţiilor +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integrare Module1400Name=Contabilitate Module1400Desc=Management Contabilitate de gestiune (partidă dublă) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categorii Module1780Desc=Categorii de "management (produse, furnizori şi clienţi) Module2000Name=Fckeditor @@ -575,7 +586,7 @@ Permission67=Export intervenţii Permission71=Citeşte membrii Permission72=Creare / Modificare membri Permission74=Ştergere membri -Permission75=Setup types of membership +Permission75=Configurare tipuri membri Permission76=Export Date Permission78=Citeşte abonamente Permission79=Creare / Modificare abonamente @@ -598,8 +609,8 @@ Permission106=Export livrări Permission109=Ştergere sendings Permission111=Citeşte conturile financiare Permission112=Crea / modifica / delete şi compara tranzacţiile -Permission113=Setup financial accounts (create, manage categories) -Permission114=Reconciliate transactions +Permission113=Configurare conturi financiare( creare, gestionare categorii) +Permission114=Tranzactii Reconciliate Permission115=Tranzacţii de export şi în declaraţiile Permission116=Transferuri între conturile Permission117=Gestionare cecuri de expediţie @@ -631,7 +642,7 @@ Permission181=Citeşte furnizor ordinelor Permission182=Creare / Modificare furnizor ordinelor Permission183=Validate furnizor ordinelor Permission184=Aprobaţi furnizor ordinelor -Permission185=Comanda furnizor ordinelor +Permission185=Order or cancel supplier orders Permission186=Furnizor de a primi comenzi Permission187=Inchide furnizor ordinelor Permission188=Anulare furnizor ordinelor @@ -711,6 +722,13 @@ Permission538=Exportul de servicii Permission701=Citiţi donaţii Permission702=Creare / Modificare donaţii Permission703=Ştergere donaţii +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Citeşte stocuri Permission1002=Creare / modificare depozite Permission1003=Ștergere depozite @@ -764,7 +782,7 @@ Permission55001=Cieşte sondaje Permission55002=Creare / Modificare sondaje Permission59001=Citeşte marje comerciale Permission59002=Defineşte marje comerciale -Permission59003=Read every user margin +Permission59003=Citeşte marjele fiecarui utilizator DictionaryCompanyType=Tip Terţ DictionaryCompanyJuridicalType=Tipuri juridice terţi DictionaryProspectLevel=Nivel potenţial Prospect @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Parolă pentru a utiliza server proxy DefineHereComplementaryAttributes=Definiţi aici toate atributele, care nu sunt deja disponibile în mod implicit, şi că doriţi să fie sprijinite pentru %s. ExtraFields=Atribute complementare ExtraFieldsLines=Atribute complementare (linii) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Atribute complementare ( terţi) ExtraFieldsContacts=Atribute complementare (contact/addresă ) ExtraFieldsMember=Atribute complementare (membri) @@ -1042,7 +1062,7 @@ SendingMailSetup=Setup de trimiteri prin e-mail SendmailOptionNotComplete=Atenţie, pe unele sisteme Linux, pentru a trimite e-mail de la e-mail, sendmail configurare execuţie trebuie să conatins optiunea-ba (mail.force_extra_parameters parametri în fişierul php.ini). Dacă nu unor destinatari a primi e-mailuri, încercaţi să editaţi acest parametru PHP cu mail.force_extra_parameters =-BA). PathToDocuments=Cale de acces documente PathDirectory=Director -SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages. +SendmailOptionMayHurtBuggedMTA=Functionalitate pentru a trimite mesaje utilizând metoda "mail PHP direct" va genera un mesaj e-mail care nu s-ar putea să fie corect interpretat de către unele servere de e-mail . Rezultatul este că unele mail-uri nu pot fi citite de unele persoane . Este cazul unor furnizori de Internet (Ex: Orange în Franţa). Aceasta nu este o problemă în Dolibarr nici în PHP, dar primesc pe serverul de poştă electronică. Puteţi adăuga toate acestea, opţiunea MAIN_FIX_FOR_BUGGED_MTA la 1 în configurare - pentru a modifica alte Dolibarr pentru a evita acest lucru. Cu toate acestea, este posibil să aveţi probleme cu alte servere care sens strict standard SMTP. Altă soluţie (recommanded) este de a utiliza metoda "SMTP socket bibliotecă", care nu are dezavantaje. TranslationSetup=Configurarea traducerii TranslationDesc=Alegerea limbiilor vizibile pe ecran pot fi modificate:
* La nivel global din meniul Home - Configurare - Afişare
* Pe utilizator numai ,la Tabul Afișare utilizator al fişei de utilizator (click pe login din partea de sus a ecranului). TotalNumberOfActivatedModules=Numărul total al modulelor funcţionale activate: %s @@ -1061,7 +1081,7 @@ BrowserIsOK=Folosiţi navigatorul web %s. Acest navigator este ok pentru perform BrowserIsKO=Folosiţi browser-ul % s. Acest browser-ul pare a fi o alegere proasta pentru securitate, performanță și fiabilitate. Noi recomandam sa folositi Firefox, Chrome, Opera sau Safari. XDebugInstalled=XDebug este încărcat. XCacheInstalled=XCache este încărcată. -AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp". +AddRefInList=Afișează ref client / furnizor în lista (listă select sau combobox) și mai multe hyperlinkuri. Terții vor apare cu numele "CC12345 - SC45678 - The big company coorp", în loc de "The big company coorp". FieldEdition=Editarea campului %s FixTZ=Fixează TimeZone FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă problemele decalajjului fusului orar sunt cunoscute) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=O linie de produse / servicii cu o suma de zero este c FreeLegalTextOnProposal=Text liber pe ofertele comerciale WatermarkOnDraftProposal=Filigranul pe ofertele comerciale schiţă (niciunul daca e gol) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al ofertei +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Ordinele de gestionare setup OrdersNumberingModules=Ordinele de numerotare module @@ -1161,7 +1188,7 @@ ValidOrderAfterPropalClosed=Pentru a valida comanda după închiderea ofertei, FreeLegalTextOnOrders=Free text de pe ordinele de WatermarkOnDraftOrders=Filigranul pe comenzile schiţă (niciunul daca e gol) ShippableOrderIconInList=Adaugă un icon în lista Comenzilor care indica daca comanda este expediabilă -BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order +BANK_ASK_PAYMENT_BANK_DURING_ORDER=Cere contul bancar destinație al comenzii ##### Clicktodial ##### ClickToDialSetup=Click pentru a Dial modul setup ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises
__PHONETO__ qui sera remplac� par le t�l�phone de l'appel�
__PHONEFROM__ qui sera remplac� par le t�l�phone de l'appelant (le votre)
__LOGIN__ qui sera remplac� par votre login clicktodial (d�fini sur votre fiche utilisateur)
__PASS__ qui sera remplac� par votre mot de passe clicktodial (d�fini sur votre fiche utilisateur). @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Coduri de bare de tip UPC BarcodeDescISBN=Coduri de bare de tip ISBN BarcodeDescC39=Coduri de bare de tip C39 BarcodeDescC128=Coduri de bare de tip C128 -GenbarcodeLocation=Coduri de bare generaţie în linie de comandă (utilizat de către phpbarcode motor pentru anumite tipuri de coduri de bare) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Motor intern BarCodeNumberManager=Manager pentru autodefinire numere coduri bare ##### Prelevements ##### @@ -1397,7 +1424,7 @@ RSSUrlExample=Un interesant RSS feed MailingSetup=Să trimiteţi un email la modul de instalare MailingEMailFrom=Expeditorul e-mail (la) pentru e-mail-uri trimise prin email-uri de module MailingEMailError=Întoarcere Email (Erori-a) pentru e-mailuri cu erori -MailingDelay=Seconds to wait after sending next message +MailingDelay=Secunde de asteptare pentru trimiterea urmatorului mesaj ##### Notification ##### NotificationSetup=Configurare Modul Notificări Email NotificationEMailFrom=Expeditorul e-mail (la) pentru e-mail-uri trimise pentru notificări @@ -1407,9 +1434,9 @@ FixedEmailTarget=Targhet email fixat SendingsSetup=Trimiterea de modul de configurare SendingsReceiptModel=Trimiterea primirea model SendingsNumberingModules=Trimiteri de numerotare module -SendingsAbility=Support shipment sheets for customer deliveries +SendingsAbility=Avize expediere suport pentru livrari clienti NoNeedForDeliveryReceipts=În cele mai multe cazuri, sendings încasări sunt utilizate atât ca foi de client pentru livrări (lista de produse pentru a trimite) şi foi de faptul că este recevied şi semnat de către client. Deci, livrările de produse încasări este un duplicat caracteristică şi este rareori activat. -FreeLegalTextOnShippings=Free text on shipments +FreeLegalTextOnShippings=Text liber pe livrari ##### Deliveries ##### DeliveryOrderNumberingModules=Produse livrările primirea modul de numerotare DeliveryOrderModel=Produse livrările primirea model @@ -1420,7 +1447,7 @@ AdvancedEditor=Editor avansat ActivateFCKeditor=Activaţi FCKeditor pentru: FCKeditorForCompany=WYSIWIG crearea / editie a companiilor şi de note descriere FCKeditorForProduct=WYSIWIG crearea / editie a produselor / serviciilor "descrierea şi nota -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files. +FCKeditorForProductDetails=WYSIWIG creare / editare detalii linii de produse pentru toate entităţile (propuneri, comenzilor, facturilor, etc ..) Atenţie: Folosind această opţiune nu este recommanda deoarece astfel pot apare probleme la caracterele speciale şi paginare atunci când se creaza fişiere PDF. FCKeditorForMailing= WYSIWIG crearea / ediţie de mailing FCKeditorForUserSignature=Creare/editare WYSIWIG a semnăturii utilizatorilor FCKeditorForMail=Creare/editare WYSIWIG a tuturor emailurilor (exceptând Outils->eMailing) @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Terț generic implicit utilizat pentru vânzări CashDeskBankAccountForSell=Case de cont pentru a utiliza pentru vinde CashDeskBankAccountForCheque= Cont pentru a utiliza pentru a primi plăţi prin cec CashDeskBankAccountForCB= Cont pentru a folosi pentru a primi plăţi în numerar de carduri de credit -CashDeskDoNotDecreaseStock=Dezactivați scădere stoc atunci când o vinzare se face de la Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Forţează și limitează depozitul să folosească scăderea stocului StockDecreaseForPointOfSaleDisabled=Scădere stoc de la Point of Sale dezactivat +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=Nu ai dezactivați scăderea de stocului atunci când se face o vinzare de la Point Of Sale. Astfel, este necesar un depozit. ##### Bookmark ##### BookmarkSetup=Bookmark modul de configurare @@ -1568,4 +1596,8 @@ SalariesSetup=Configurare modul salarii SortOrder=Ordine sortare Format=Format TypePaymentDesc=0:Tip plata Client, 1:Tip plata Furnizor, 2:Ambele tipuri plata Client sau Furnizor -IncludePath=Include path (defined into variable %s) +IncludePath=Include calea (definita in variabila %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang index 8f109cb5e98..50ca3ae994c 100644 --- a/htdocs/langs/ro_RO/agenda.lang +++ b/htdocs/langs/ro_RO/agenda.lang @@ -69,7 +69,7 @@ DateActionDoneEnd= Data reală a terminării DateActionStart= Data începerii DateActionEnd= Data terminării AgendaUrlOptions1=Puteţi, de asemenea, să adăugaţi următorii parametri pentru filtrarea rezultatelor: -AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s. +AgendaUrlOptions2=login=%s ​​pentru a limita exportul de acțiuni create de, sau atribuite utilizatorului%s. AgendaUrlOptions3=logind=%s ​​pentru a limita exportul de acțiuni deţinute de utilizatorul %s AgendaUrlOptions4=logint=% s ​​pentru a limita exportul de acțiuni atribuite utilizatorului % s. AgendaUrlOptionsProject=project=PROJECT_ID pentru a limita exportul de acțiuni asociate la proiectul PROJECT_ID. diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang index ce9ea8d39b4..c090ed31326 100644 --- a/htdocs/langs/ro_RO/banks.lang +++ b/htdocs/langs/ro_RO/banks.lang @@ -8,7 +8,7 @@ FinancialAccount=Cont FinancialAccounts=Conturi BankAccount=Cont bancar BankAccounts=Conturi bancare -ShowAccount=Show Account +ShowAccount=Arată Cont AccountRef=Contul financiar ref AccountLabel=Contul financiar etichetă CashAccount=Cont Casa @@ -33,7 +33,11 @@ AllTime=De la inceput Reconciliation=Reconciliere RIB=Număr Cont Bancă IBAN=Cod IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=Cod BIC / SWIFT +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Ordine de plată StandingOrder=Ordin plată Withdrawals=Retrageri @@ -148,7 +152,7 @@ BackToAccount=Inapoi la cont ShowAllAccounts=Arată pentru toate conturile FutureTransaction=Tranzacţie viitoare. In nici un caz de decontat. SelectChequeTransactionAndGenerate=Selectaţi/ filtraţi cecurile pentru a le include în borderoul de remise şi faceţi clic pe "Crează". -InputReceiptNumber=Alegeți extrasul de cont privitor la conciliere. Folosiţi o valoare numerică sortabile (cum ar fi, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=În cele din urmă, precizează o categorie în care să clasezi înregistrările ToConciliate=De decontat ? ThenCheckLinesAndConciliate=Apoi, verifică liniile prezente în extrasul de bancă şi click diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang index 5885b7a76a8..2365a67dac4 100644 --- a/htdocs/langs/ro_RO/bills.lang +++ b/htdocs/langs/ro_RO/bills.lang @@ -412,19 +412,19 @@ TypeContact_invoice_supplier_external_BILLING=Contact facturare furnizor TypeContact_invoice_supplier_external_SHIPPING=Contact livrare furnizor TypeContact_invoice_supplier_external_SERVICE=Contact service furnizor # Situation invoices -InvoiceFirstSituationAsk=First situation invoice -InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice. +InvoiceFirstSituationAsk=Situatie initiala factura +InvoiceFirstSituationDesc= Situația facturilor este legata de situații legate de o progresie, de exemplu progresia unei construcții. Fiecare situație este legată de o factură. InvoiceSituation=Situatie factura -InvoiceSituationAsk=Invoice following the situation -InvoiceSituationDesc=Create a new situation following an already existing one -SituationAmount=Situation invoice amount(net) -SituationDeduction=Situation subtraction +InvoiceSituationAsk=Factura urmarind situatia +InvoiceSituationDesc=Creaza o situatie noua urmarind una existenta deja +SituationAmount=Situatie valoare(neta) factura +SituationDeduction=Situatie scadere Progress=Progres ModifyAllLines=Modifica toate liniile CreateNextSituationInvoice=Creaza urmatoarea situatie -NotLastInCycle=This invoice in not the last in cycle and must not be modified. +NotLastInCycle=Aceasta factura ce nu se afla in ultimul ciclu si nu poate fi modificata, DisabledBecauseNotLastInCycle=URmatoarea situatie deja exista DisabledBecauseFinal=Aceasta situatie este finala -CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. +CantBeLessThanMinPercent=Progresul nu poate fi mai mic decat valoarea lui in precedenta situatie NoSituations=Nicio situatie deschisa InvoiceSituationLast=Factura finala si generala diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang index 78eb9aecfc7..14370ebe680 100644 --- a/htdocs/langs/ro_RO/commercial.lang +++ b/htdocs/langs/ro_RO/commercial.lang @@ -62,7 +62,7 @@ LastProspectContactDone=Prospecte contactate DateActionPlanned=Dată realizare prevăzută DateActionDone=Dată realizare efectivă ActionAskedBy=Eveniment înregistrat de -ActionAffectedTo=Evenimente aparţinând de +ActionAffectedTo=Event assigned to ActionDoneBy=Eveniment realizat de către ActionUserAsk=Raportat de ErrorStatusCantBeZeroIfStarted=Dacă câmpul "Data reală debut realizare" este completat, acţiunea este începută (sau terminată), astfel câmpul "Status" nu poate fi 0%%. diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang index e400f9eab79..71204246fb0 100644 --- a/htdocs/langs/ro_RO/compta.lang +++ b/htdocs/langs/ro_RO/compta.lang @@ -29,7 +29,7 @@ ReportTurnover=Cifra de afaceri PaymentsNotLinkedToInvoice=Plăţile nu sunt legate de orice factură, astfel încât nu au legătură cu o terţă parte PaymentsNotLinkedToUser=Plăţile nu sunt legate de orice utilizator Profit=Profit -AccountingResult=Accounting result +AccountingResult=Rezultatl contabil Balance=Sold Debit=Debit Credit=Credit diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang index c90c961b9b9..7f300527533 100644 --- a/htdocs/langs/ro_RO/contracts.lang +++ b/htdocs/langs/ro_RO/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expirat ServiceStatusClosed=Închis ServicesLegend=Legendă Servicii Contracts=Contracte +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=Niciun contract MenuServices=Servicii diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang index 173adce646a..381d59c19bc 100644 --- a/htdocs/langs/ro_RO/cron.lang +++ b/htdocs/langs/ro_RO/cron.lang @@ -14,8 +14,8 @@ URLToLaunchCronJobs=URL-ul pentru a verifica și a lansa joburi cron, dacă este OrToLaunchASpecificJob=Sau pentru a verifica și a lansa un anumit job KeyForCronAccess=Cheie de securitate pentru URL de lansare a joburilor cron FileToLaunchCronJobs=Linie de comandă pentru lansare joburi cron -CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes -CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes +CronExplainHowToRunUnix=Pe mediul Unix veţi utiliza instrumentul crontab pentru a rula urmatoarea linia de comanda la fiecare 5 minute +CronExplainHowToRunWin=Pe mediul Microsoft(tm) Windows puteţi utiliza instrumentul Scheduled task pentru a rula linia de comanda la fiecare 5 minute # Menu CronJobs=Joburi programate CronListActive=Lista activelor/programatelor joburi @@ -84,3 +84,4 @@ CronType_command=Comandă shell CronMenu=Cron CronCannotLoadClass=Nu pot încărca clasa %s sau obiectul %s UseMenuModuleToolsToAddCronJobs=Intrați în meniul ''Acasă - Instrumentele modulelor - Lista de job-uri'' pentru a vedea și edita job-urile programate. +TaskDisabled=Task disabled diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang index 943cfbc57d5..8e73996c24d 100644 --- a/htdocs/langs/ro_RO/errors.lang +++ b/htdocs/langs/ro_RO/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Sursa obiective şi conturi bancare trebuie să f ErrorBadThirdPartyName=Bad valoarea de terţă parte nume ErrorProdIdIsMandatory=%s este obligatoriu ErrorBadCustomerCodeSyntax=Bad sintaxă pentru codul de client -ErrorBadBarCodeSyntax=Bad sintaxă pentru furnizor cod +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Clientul codul necesar ErrorBarCodeRequired=Cod de bare cerut ErrorCustomerCodeAlreadyUsed=Clientul codul folosit deja @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript nu trebuie să fie dezactivate pentru a ErrorPasswordsMustMatch=Ambele parolele tastate trebuie să se potrivească reciproc ErrorContactEMail=O eroare de tehnică avut loc. Vă rugăm, contactaţi administratorul de a urma %s de e-mail ro oferi %s cod de eroare în mesajul Dvs., sau chiar mai bine prin adăugarea o copie ecran a acestei pagini. ErrorWrongValueForField=Valoarea greşit pentru %s numărul de câmp (valoarea "%s" nu se potriveste cu regula %s regex) -ErrorFieldValueNotIn=Valoare greşită pentru %s numărul de câmp ("%s" valoare nu este o valoare disponibile în %s teren de %s de masă) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Valoare greşită pentru %s numărul de câmp ("%s" valoarea nu este o ref %s existente) ErrorsOnXLines=Erori pe liniile sursă %s ErrorFileIsInfectedWithAVirus=Programul antivirus nu a validet fisierul (fisierul ar putea fi infectat cu un virus) @@ -159,7 +159,8 @@ ErrorPriceExpression22=Rezultat negativ '%s' ErrorPriceExpressionInternal=Eroare internă '%s' ErrorPriceExpressionUnknown=Eroare Necunoscută '%s' ErrorSrcAndTargetWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere -ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorTryToMakeMoveOnProductRequiringBatchData=Eroare, se incerarca să se facă o mișcare de stoc, fără informații de lot / serie, pe un produs care necesită informații de lot /serie +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang index e74102c3b63..c4a8956bc4d 100644 --- a/htdocs/langs/ro_RO/install.lang +++ b/htdocs/langs/ro_RO/install.lang @@ -155,7 +155,8 @@ MigrationFinished=Migraţia terminată LastStepDesc=Ultimul pas: Definirea aici nume de utilizator şi parola pe care intenţionaţi să îl utilizaţi pentru conectarea la software-ul. Nu pierde aceasta ca este cont pentru a administra toate celelalte. ActivateModule=Activaţi modul %s ShowEditTechnicalParameters=Click aici pentru a vedea / edita parametrii avansaţi (mod expert) -WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +WarningUpgrade=Avertisment:\nAti facut o copie de rezervă a bazei de date mai întâi? \nAcest lucru este foarte recomandat: de exemplu, din cauza unor bug-uri în sistemele de baze de date (de exemplu, mysql versiune 5.5.40), unele date sau tabele pot fi pierdute în timpul acestui proces, de aceea este foarte recomandat să aveți o copie completa a bazei de date înaintea pornirii migrariii.\n\nFaceți clic pe OK pentru a începe procesul de migrare ... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade @@ -207,7 +208,7 @@ MigrationProjectTaskTime=Actualizare de timp petrecut în secunde MigrationActioncommElement=Actualizare date pe acţiuni MigrationPaymentMode=Migrare de date pentru modul de plată MigrationCategorieAssociation=Migrarea categoriilor -MigrationEvents=Migration of events to add event owner into assignement table +MigrationEvents=Migrația evenimentelor pentru a adăuga proprietarului evenimentul în tabelul de atribuire ShowNotAvailableOptions=Afişează opţiunile nedisponibile HideNotAvailableOptions=Acunde opţiunile nedisponibile diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang index d2edf76d388..483e5b1caa3 100644 --- a/htdocs/langs/ro_RO/languages.lang +++ b/htdocs/langs/ro_RO/languages.lang @@ -13,7 +13,7 @@ Language_de_AT=Germană (Austria) Language_de_CH=Germană (Elveţia) Language_el_GR=Greacă Language_en_AU=Engleză (Australia) -Language_en_CA=English (Canada) +Language_en_CA=Engleză (Canada) Language_en_GB=Engleză (Marea Britanie) Language_en_IN=Engleză (India) Language_en_NZ=Engleză (Noua Zeelandă) diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang index c540d9d4dc2..0b2b2e1411c 100644 --- a/htdocs/langs/ro_RO/main.lang +++ b/htdocs/langs/ro_RO/main.lang @@ -141,6 +141,7 @@ Cancel=Anulează Modify=Modifică Edit=Editează Validate=Validează +ValidateAndApprove=Validate and Approve ToValidate=De validat Save=Salvează SaveAs=Salvează ca @@ -158,6 +159,7 @@ Search=Caută SearchOf=Căutare Valid=Validează Approve=Aprobaţi +Disapprove=Disapprove ReOpen=Redeaschide Upload=Trimite fişier ToLink=Link @@ -219,6 +221,7 @@ Cards=Fişe Card=Fişă Now=Acum Date=Dată +DateAndHour=Date and hour DateStart=Dată început DateEnd=Dată sfârşit DateCreation=Dată creare @@ -295,6 +298,7 @@ UnitPriceHT=Preț unitar (net) UnitPriceTTC=Preț unitar PriceU=UP PriceUHT=UP (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=UP Amount=Valoare AmountInvoice=Valoare Factură @@ -521,6 +525,7 @@ DateFromTo=De la %s la %s DateFrom=Începând cu %s DateUntil=Până în %s Check=Verifică +Uncheck=Uncheck Internal=Intern External=Extern Internals=Interne @@ -688,6 +693,7 @@ PublicUrl=URL Public AddBox=Adauga box SelectElementAndClickRefresh=Selectează un element şi click Refresh PrintFile=Printeaza Fisierul %s +ShowTransaction=Show transaction # Week day Monday=Luni Tuesday=Marţi diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang index e1604cf5fd4..90ef9c964c1 100644 --- a/htdocs/langs/ro_RO/orders.lang +++ b/htdocs/langs/ro_RO/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Anulată StatusOrderDraft=Schiţă (de validat) StatusOrderValidated=Validată StatusOrderOnProcess=Comandate - receptie standby +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Procesată StatusOrderToBill=Livrată StatusOrderToBill2=De facturat @@ -58,6 +59,7 @@ MenuOrdersToBill=Comenzi livrate MenuOrdersToBill2=Comenzi facturabile SearchOrder=Caută Comanda SearchACustomerOrder=Caută o comandă client +SearchASupplierOrder=Search a supplier order ShipProduct=Expediază produs Discount=Discount CreateOrder=Crează Comanda diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang index b5114764699..123684dfc4e 100644 --- a/htdocs/langs/ro_RO/other.lang +++ b/htdocs/langs/ro_RO/other.lang @@ -54,12 +54,13 @@ MaxSize=Mărimea maximă a AttachANewFile=Ataşaţi un fişier nou / document LinkedObject=Legate de obiectul Miscellaneous=Diverse -NbOfActiveNotifications=Număr de notificări +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Acesta este un e-mail de test. \\ NMesajul două linii sunt separate printr-un retur de car. PredefinedMailTestHtml=Acesta este un e-mail de testare (test de cuvânt trebuie să fie în aldine).
Cele două linii sunt separate printr-un retur de car. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Am dori să vă avertizăm că factura __FACREF__ pare a nu fi platită. Deci, vă ataşăm din nou factura, ca un memento. \n\n__PERSONALIZED__ Cu respect \n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeţi găsi aici oferta comercială__PROPREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeţi găsi aici comanda __ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYVeţi găsi aici comanda noastră__ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__ diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang index 3adfd9dfc8d..0be80ae35d4 100644 --- a/htdocs/langs/ro_RO/productbatch.lang +++ b/htdocs/langs/ro_RO/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Lot / Număr de serie l_eatby=Data expirare l_sellby=Data vânzare DetailBatchNumber=Detalii Lot / Serie -DetailBatchFormat=Lot / Serie:%s - E:%s - S:%s (Cant.: %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Lot: %s printEatby=Expiră : %s printSellby=Vanzare: %s diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang index be764a715a5..35cd6613d46 100644 --- a/htdocs/langs/ro_RO/products.lang +++ b/htdocs/langs/ro_RO/products.lang @@ -22,16 +22,16 @@ ProductAccountancySellCode=Cont Contabilitate (vânzare) ProductOrService=Produs sau serviciu ProductsAndServices=Produse si Servicii ProductsOrServices=Produse sau servicii -ProductsAndServicesOnSell=Products and Services for sale or for purchase -ProductsAndServicesNotOnSell=Products and Services out of sale +ProductsAndServicesOnSell=Produse si Servicii supuse vânzării sau cumpărării +ProductsAndServicesNotOnSell=Produse si Servicii neoferite ProductsAndServicesStatistics=Statistici Produse si Servicii ProductsStatistics=Statistici Produse -ProductsOnSell=Product for sale or for pruchase -ProductsNotOnSell=Product out of sale and out of purchase -ProductsOnSellAndOnBuy=Products for sale and for purchase -ServicesOnSell=Services for sale or for purchase -ServicesNotOnSell=Services out of sale -ServicesOnSellAndOnBuy=Services for sale and for purchase +ProductsOnSell=Produs supus vânzării sau cumpărării +ProductsNotOnSell=Produs nesupus vânzării sau cumpărării +ProductsOnSellAndOnBuy=Produse supuse vânzării sau cumpărării +ServicesOnSell=Servicii supuse vânzării sau cumpărării +ServicesNotOnSell=Servicii neoferite prestarii +ServicesOnSellAndOnBuy=Servicii supuse vânzării sau cumpărării InternalRef=Referinţă internă LastRecorded=Ultimele produse / servicii disponibile înregistrate LastRecordedProductsAndServices=Ultimele %s produse / servicii înregistrate @@ -198,7 +198,7 @@ HelpAddThisServiceCard=Această opţiune vă permite să creaţi sau clonaţi un CurrentProductPrice=Preţ curent AlwaysUseNewPrice=Întotdeauna foloseşte preţul curent al produsului/serviciului AlwaysUseFixedPrice=Foloseşte preţul fix -PriceByQuantity=Different prices by quantity +PriceByQuantity=Preţuri diferite pe cantitate PriceByQuantityRange=Interval cantitate ProductsDashboard=Sumar Produse/Servicii UpdateOriginalProductLabel=Modifică eticheta originală @@ -234,7 +234,7 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definiția tipului sau valoarea codu BarCodeDataForProduct=Informaţii cod bare al produsului %s : BarCodeDataForThirdparty=Informaţii cod bare al terţului %s : ResetBarcodeForAllRecords=Defineşte valoare coduri de bare pentru toate înregistrările (aceasta va reseta, de asemenea, valorile deja definite, cu valori noi) -PriceByCustomer=Different price for each customer +PriceByCustomer=Preţuri diferite pentru fiecare client PriceCatalogue=Preţ unic pe produs/serviciu PricingRule=Reguli pentru preţuri clienţi AddCustomerPrice=Adaugă Preţ pe client @@ -244,9 +244,13 @@ MinimumPriceLimit=Preţul minim nu poate fi mai mic decat %s MinimumRecommendedPrice=Preţul minim recomandat este: %s PriceExpressionEditor=Editor expresie preț PriceExpressionSelected=Expresie preț selectatată -PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions -PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey# -PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# -PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# +PriceExpressionEditorHelp1="pret = 2 + 2" sau "2 + 2" pentru setarea pretului. Foloseste ; tpentru separarea expresiilor +PriceExpressionEditorHelp2=Puteți accesa ExtraFields cu variabile, cum ar fi #options_myextrafieldkey# +PriceExpressionEditorHelp3=In ambele preturi produs/serviciu si furnizori sunt disponibile variabilele:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# +PriceExpressionEditorHelp4=In pret produs/serviciu numai: #supplier_min_price#
In pret furnizor numai: #supplier_quantity# and #supplier_tva_tx# PriceMode=Mod preț PriceNumeric=Număr +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang index 52938a5e6eb..143ed2e0a43 100644 --- a/htdocs/langs/ro_RO/projects.lang +++ b/htdocs/langs/ro_RO/projects.lang @@ -3,13 +3,15 @@ RefProject=Ref. proiect ProjectId=ID proiect Project=Proiect Projects=Proiecte -ProjectStatus=Project status +ProjectStatus=Statut Proiect SharedProject=Toată lumea PrivateProject=Contacte proiect MyProjectsDesc=Această vedere este limitată la proiecte sau sarcini pentru care sunteţi contact(indiferent de tip). ProjectsPublicDesc=Această vedere prezintă toate proiectele la care aveţi permisiunea să le citiţi. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Această vedere prezintă toate proiectele (permisiuni de utilizator va acorda permisiunea de a vizualiza totul). MyTasksDesc=Această vedere este limitată la proiecte sau sarcini pentru care sunteţi contact(indiferent de tip). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Această vedere prezintă toate proiectele şi activităţile care sunt permise să le citiţi. TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni de utilizator va acorda permisiunea de a vizualiza totul). ProjectsArea=Proiecte @@ -29,6 +31,8 @@ NoProject=Niciun proiect definit sau responsabil NbOpenTasks=Nr taskuri deschise NbOfProjects=Nr proiecte TimeSpent=Timp comsumat +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Timpi consumaţi RefTask=Ref. Task LabelTask=Eticheta Task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista comenzi furnizori asociate la proie ListSupplierInvoicesAssociatedProject=Lista facturi furnizori asociate la proiect ListContractAssociatedProject=Lista contracte asociate la proiect ListFichinterAssociatedProject=Lista intervenţii asociate la proiectului -ListTripAssociatedProject=Lista note de cheltuieli asociate la proiect +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Lista evenimentelor asociate la proiectului ActivityOnProjectThisWeek=Activitatea de pe proiect în această săptămână ActivityOnProjectThisMonth=Activitatea de pe proiect în această lună @@ -103,7 +107,7 @@ CloneContacts=Clonează contacte CloneNotes=Clonează note CloneProjectFiles=Clonează proiect fişiere ataşate CloneTaskFiles=Clonează task(uri) fişiere ataşate (dacă task (urile) clonate) -CloneMoveDate=Update project/tasks dates from now ? +CloneMoveDate=Actualizeaza datele proiectului/ taskului din acest moment ? ConfirmCloneProject=Sigur vreţi să clonaţi acest proiect? ProjectReportDate=Schimbă data taskului conform cu data de debut a proiectului ErrorShiftTaskDate=Imposibil de schimbat data taskului conform cu noua data de debut a proiectului @@ -133,3 +137,6 @@ SearchAProject=Cauta proiect ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi ProjectDraft=Proiecte schiţă FirstAddRessourceToAllocateTime=Asociază o resursă la timpul alocat +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang index 3dde850405b..75c0b1969d3 100644 --- a/htdocs/langs/ro_RO/salaries.lang +++ b/htdocs/langs/ro_RO/salaries.lang @@ -10,3 +10,4 @@ SalariesPayments=Plati salarii ShowSalaryPayment=Arata plata salariu THM=Pret mediu pe ora TJM=Pret mediu zilnic +CurrentSalary=Current salary diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang index b023dbc1610..fd669e5577a 100644 --- a/htdocs/langs/ro_RO/sendings.lang +++ b/htdocs/langs/ro_RO/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Cant. comandată QtyShipped=Cant. livrată QtyToShip=Cant. de livrat QtyReceived=Cant. primită -KeepToShip=Rest de livrat +KeepToShip=Remain to ship OtherSendingsForSameOrder=Alte livrări pentru această comandă DateSending=Data dispoziţiei de livrare DateSendingShort=Data disp. de livrare @@ -62,12 +62,12 @@ ShipmentCreationIsDoneFromOrder=Pentru moment, crearea unei noi livrări se face RelatedShippings=Livrări asociate ShipmentLine=Linie de livrare CarrierList=Lista transportatori -SendingRunning=Product from ordered customer orders -SuppliersReceiptRunning=Product from ordered supplier orders -ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders -ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders -ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent -ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received +SendingRunning=Produs din comenzile clientului comandate +SuppliersReceiptRunning=Produs din comenzile furnizorului comandate +ProductQtyInCustomersOrdersRunning=Cantitate produs in comenzile clientilor deschise +ProductQtyInSuppliersOrdersRunning=Cantitate produs in comenzile furnizorilor deschise +ProductQtyInShipmentAlreadySent=Cantitate produs din comenzile clientilor deschise deja trimise +ProductQtyInSuppliersShipmentAlreadyRecevied=Cantitate produs din comenzile furnizorilor deschise deja primite # Sending methods SendingMethodCATCH=Colectată de client diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang index 24a5083aae4..394853cb355 100644 --- a/htdocs/langs/ro_RO/stocks.lang +++ b/htdocs/langs/ro_RO/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Valoric PMP PMPValueShort=WAP EnhancedValueOfWarehouses=Stoc valoric UserWarehouseAutoCreate=Creaţi un stoc în mod automat atunci când se creează un utilizator +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Cantitate dipecerizată QtyDispatchedShort=Cant Expediate QtyToDispatchShort=Cant de expediat @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Depozitul %s va fi utilizat pentru scăderea st WarehouseForStockIncrease=Depozitul %s va fi utilizat pentru creşterea stocului ForThisWarehouse=Pentru acest depozit ReplenishmentStatusDesc=Aceasta este lista cu toate produsele având stocul mai mic decât stocul dorit (sau valoarea de alertă dacă casuţa "doar alertă " este bifată) și sugerăm să vă creaţi comenzi furnizor pentru a completa diferența. -ReplenishmentOrdersDesc=Aceasta este lista cu toate comenzile furnizor deschise +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Reaprovizionări NbOfProductBeforePeriod=Cantitatea de produs %s în stoc înainte de perioada selectată (< %s) NbOfProductAfterPeriod=Cantitatea de produs %s în stoc după perioada selectată (> %s) @@ -130,3 +131,4 @@ IsInPackage=Continute in pachet ShowWarehouse=Arată depozit MovementCorrectStock=Corectie continut stoc pentru produsul %s MovementTransferStock=Transfer stoc al produsului %s in alt depozit +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang index 057f6dab55f..19ea854686f 100644 --- a/htdocs/langs/ro_RO/suppliers.lang +++ b/htdocs/langs/ro_RO/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Furnizori -Supplier=Furnizor AddSupplier=Crează un furnizor SupplierRemoved=Furnizor şters SuppliersInvoice=Factură furnizor @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Facturi Furnizor şi plăţi ExportDataset_fournisseur_3=Comenzi furnizori si lini comenzi ApproveThisOrder=Aprobă această comandă ConfirmApproveThisOrder=Sigur doriţi să aprobaţi această comandă %s? -DenyingThisOrder=Refuză comanda +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Sigur doriţi să refuzaţi această comandă %s? ConfirmCancelThisOrder=Sigur doriţi să anulaţi această comandă %s? AddCustomerOrder=Crează comandă client @@ -42,5 +41,5 @@ NoneOrBatchFileNeverRan=Nici una sau tratate %s ne executate recent SentToSuppliers=Trimite la furnizori ListOfSupplierOrders=Lista comenzi furnizori MenuOrdersSupplierToBill=Comenzi Furnizor de facturat -NbDaysToDelivery=Delivery delay in days -DescNbDaysToDelivery=The biggest delay is display among order product list +NbDaysToDelivery= Intârziere Livrare in zile +DescNbDaysToDelivery=Cea mai mare intarziere este afisata in lista produsului comandat diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang index a606801617c..f32deae8693 100644 --- a/htdocs/langs/ro_RO/trips.lang +++ b/htdocs/langs/ro_RO/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Deplasare -Trips=Deplasări -TripsAndExpenses=Deplasări şi cheltuieli -TripsAndExpensesStatistics=Statistici Deplasări şi cheltuieli -TripCard=Fişă Deplasare -AddTrip=Creare deplasare -ListOfTrips=Lista deplasări +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Lista note cheltuieli -NewTrip=Deplasare nouă +NewTrip=New expense report CompanyVisited=Societatea / Instituţia vizitată Kilometers=Kilometri FeesKilometersOrAmout=Valoarea sau km -DeleteTrip=Şterge Deplasare -ConfirmDeleteTrip=Sigur doriţi să ştergeţi aceasăt Deplasarei ? -TF_OTHER=Altele -TF_LUNCH=Prânz -TF_TRIP=Deplasare -ListTripsAndExpenses=Lista Deplasări şi cheltuieli -ExpensesArea=Deplasări şi cheltuieli -SearchATripAndExpense=Caută o deplasare şi cheltuială +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Clasează "Rambursată" +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Altele +TF_TRANSPORTATION=Transportation +TF_LUNCH=Prânz +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang index 73cb1153bd5..28dd4d7d3c9 100644 --- a/htdocs/langs/ro_RO/withdrawals.lang +++ b/htdocs/langs/ro_RO/withdrawals.lang @@ -79,7 +79,7 @@ CreditDate=Credit pe WithdrawalFileNotCapable=Imposibil de a genera fișierul chitanţă de retragere pentru țara dvs %s (Țara dvs. nu este acceptată) ShowWithdraw=Arată Retragere IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Cu toate acestea, dacă factura are cel puțin o plată de retragere încă neprelucrată, aceasta nu va fi setată ca plătită permite în prealabil gestionarea retragerii. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. +DoStandingOrdersBeforePayments=Acest tab vă permite să solicitaţi un ordin de plată. Odată ce este dat intră în meniul Bancă-> Retragere pentru a gestiona ordinul de plată. Când ordinul de plată este închis, plata pe factura va fi înregistrată în mod automat, iar factura închisă dacă restul de plata este nul. WithdrawalFile=Fişier Retragere SetToStatusSent=Setează statusul "Fişier Trimis" ThisWillAlsoAddPaymentOnInvoice=Aceasta se va aplica, de asemenea, plății facturilor și vor fi clasificate ca "Plătit" diff --git a/htdocs/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang index 2f1ffaae228..4dc8c56927b 100644 --- a/htdocs/langs/ro_RO/workflow.lang +++ b/htdocs/langs/ro_RO/workflow.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - admin WorkflowSetup=Configurare Modul Flux de Lucru -WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in. +WorkflowDesc=Acest modul vă permite modificarea comportamentului acțiunilor automate în aplicaţie. În mod implicit, fluxul de lucru este deschis (puteţi face ce doriţi în ordinea dorită). Puteți activa acțiunile automate de care sunteti interesat ThereIsNoWorkflowToModify=Nu există nici un flux de lucru modificabil pentru modulele activate. descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crează o comandă client automat, după ce o ofertă comercială este semnată descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crează o factură client automat, după ce o ofertă comercială este semnată diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang index 505b6b9dce2..9a7af148909 100644 --- a/htdocs/langs/ru_RU/admin.lang +++ b/htdocs/langs/ru_RU/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Экспериментальная VersionDevelopment=Разработка VersionUnknown=Неизвестно VersionRecommanded=Рекомендуемые +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID сессии SessionSaveHandler=Обработчик для сохранения сессий SessionSavePath=Хранение сессии локализации @@ -493,10 +498,16 @@ Module600Name=Уведомления Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Пожертвования Module700Desc=Пожертвования управления +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis интеграции Module1400Name=Бухгалтерия эксперт Module1400Desc=Бухгалтерия управления для экспертов (двойная сторон) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Категории Module1780Desc=Категории управления (продукции, поставщиков и заказчиков) Module2000Name=FCKeditor @@ -631,7 +642,7 @@ Permission181=Читать поставщик заказов Permission182=Создать / изменить поставщика заказы Permission183=Проверка поставщиком заказов Permission184=Одобрить поставщик заказов -Permission185=Заказ поставщику заказов +Permission185=Order or cancel supplier orders Permission186=Прием заказов поставщику Permission187=Закрыть поставщик заказов Permission188=Отмена заказов поставщику @@ -711,6 +722,13 @@ Permission538=Экспорт услуг Permission701=Читать пожертвований Permission702=Создать / изменить пожертвований Permission703=Удалить пожертвований +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Читать запасов Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Пароль для использования прокси-се DefineHereComplementaryAttributes=Определить здесь все атрибуты, а не уже доступны по умолчанию, и что вы хотите быть поддерживается %s. ExtraFields=Дополнительные атрибуты ExtraFieldsLines=Дополнительные атрибуты (строки) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Дополнительные атрибуты (контрагенты) ExtraFieldsContacts=Дополнительные атрибуты (контакт/адрес) ExtraFieldsMember=Дополнительные атрибуты (Участник) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Соответствие продукта / услуг FreeLegalTextOnProposal=Свободный текст на коммерческие предложения WatermarkOnDraftProposal=Водяные знаки на черновиках Коммерческих предложений ("Нет" если пусто) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Приказ 'Management Setup OrdersNumberingModules=Приказы нумерации модулей @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Штрих-код типа СКП BarcodeDescISBN=Штрих-код типа ISBN BarcodeDescC39=Штрих-код типа C39 BarcodeDescC128=Штрих-код типа C128 -GenbarcodeLocation=Штрих-код поколения утилиту командной строки (используется phpbarcode двигателя для некоторых типов штрих-кодов) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Денежные счета, используемого для продает CashDeskBankAccountForCheque= Счет будет использоваться для получения выплат чеком CashDeskBankAccountForCB= Учетной записи для использования на получение денежных выплат по кредитным картам -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Закладка Настройка модуля @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Формат TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang index a2601286314..7325c4e6538 100644 --- a/htdocs/langs/ru_RU/banks.lang +++ b/htdocs/langs/ru_RU/banks.lang @@ -33,7 +33,11 @@ AllTime=Сначала Reconciliation=Примирение RIB=Bank Account Number IBAN=IBAN номера +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT число +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Постоянные заказы StandingOrder=Постоянная порядка Withdrawals=Снятие @@ -148,7 +152,7 @@ BackToAccount=Перейти к ответу ShowAllAccounts=Шоу для всех учетных записей FutureTransaction=Сделки в Futur. Ни в коем случае к согласительной процедуре. SelectChequeTransactionAndGenerate=Выбор / фильтр проверяет, включать в получении депозита проверки и нажмите кнопку "Создать". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/ru_RU/commercial.lang b/htdocs/langs/ru_RU/commercial.lang index ff6852de0f2..f60182a8f80 100644 --- a/htdocs/langs/ru_RU/commercial.lang +++ b/htdocs/langs/ru_RU/commercial.lang @@ -9,9 +9,9 @@ Prospect=Проспект Prospects=Перспективы DeleteAction=Удалить действия / задачи NewAction=Новые меры / задачи -AddAction=Добавить действия / задачи -AddAnAction=Добавить меры / задачи -AddActionRendezVous=Добавить рандеву задачи +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Свидание ConfirmDeleteAction=Вы уверены, что хотите удалить эту задачу? CardAction=Действия карточки @@ -44,8 +44,8 @@ DoneActions=Совершено действия DoneActionsFor=Совершено меры для %s ToDoActions=Неполные действия ToDoActionsFor=Неполные действия %s -SendPropalRef=Отправить коммерческое предложение %s -SendOrderRef=Отправить заказ %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Не применяется StatusActionToDo=Чтобы сделать StatusActionDone=Готово @@ -62,7 +62,7 @@ LastProspectContactDone=Контакт сделали DateActionPlanned=Сроки действия, запланированные на DateActionDone=Сроки действия сделали ActionAskedBy=Действий, заданных -ActionAffectedTo=Действий для пострадавших +ActionAffectedTo=Event assigned to ActionDoneBy=Действий, проделанную ActionUserAsk=Зарегистрировано ErrorStatusCantBeZeroIfStarted=Если поле 'Дата сделали' заполнен, действие начинается (или закончили), так что поле "Статус" не может быть 0%%. diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang index 16b0b7d4c85..d64ad647ab7 100644 --- a/htdocs/langs/ru_RU/contracts.lang +++ b/htdocs/langs/ru_RU/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Истек ServiceStatusClosed=Закрытые ServicesLegend=Услуги легенда Contracts=Договоры +ContractsAndLine=Contracts and line of contracts Contract=Договор NoContracts=Нет договоров MenuServices=Услуги diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang index 0646dce05fb..9cfdaf5e1d9 100644 --- a/htdocs/langs/ru_RU/cron.lang +++ b/htdocs/langs/ru_RU/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang index 8b096b83105..839f620bd6c 100644 --- a/htdocs/langs/ru_RU/errors.lang +++ b/htdocs/langs/ru_RU/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Источник и цели банковског ErrorBadThirdPartyName=Неправильное значение для имени контрагента ErrorProdIdIsMandatory=%s является обязательным ErrorBadCustomerCodeSyntax=Плохо синтаксис для заказчика код -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Требуется код клиента ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Код клиента уже используется @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript не должна быть отключ ErrorPasswordsMustMatch=Оба введенных пароля должны совпадать друг с другом ErrorContactEMail=Техническая ошибка. Пожалуйста, обратитесь к администратору следующую электронную почту %s ан обеспечить %s код ошибки в ваше сообщение, или даже лучше, добавив экран копию этой страницы. ErrorWrongValueForField=Неверное значение для области количество %s (значение %s "не соответствует регулярное %s правило) -ErrorFieldValueNotIn=Неверное значение для %s номер поля %s значение не является значением доступны в поле %s таблицы %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Неверное значение для %s номер поля («%s" значение не является %s существующих ссылка) ErrorsOnXLines=Ошибки на источник %s линий ErrorFileIsInfectedWithAVirus=Антивирусная программа не смогла проверить файл (файл может быть заражен вирусом) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Обязательные параметры не определены diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang index a2512709918..2d2279104f8 100644 --- a/htdocs/langs/ru_RU/install.lang +++ b/htdocs/langs/ru_RU/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Последний шаг: Определить з ActivateModule=Активировать модуль %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang index 8e120892b47..e98cf570ed8 100644 --- a/htdocs/langs/ru_RU/main.lang +++ b/htdocs/langs/ru_RU/main.lang @@ -141,6 +141,7 @@ Cancel=Отмена Modify=Изменить Edit=Редактировать Validate=Проверить +ValidateAndApprove=Validate and Approve ToValidate=На проверке Save=Сохранить SaveAs=Сохранить как @@ -158,6 +159,7 @@ Search=Поиск SearchOf=Поиск Valid=Действительный Approve=Одобрить +Disapprove=Disapprove ReOpen=Переоткрыть Upload=Отправить файл ToLink=Ссылка @@ -219,6 +221,7 @@ Cards=Карточки Card=Карточка Now=Сейчас Date=Дата +DateAndHour=Date and hour DateStart=Дата начала DateEnd=Дата окончания DateCreation=Дата создания @@ -295,6 +298,7 @@ UnitPriceHT=Цена за единицу (нетто) UnitPriceTTC=Цена за единицу PriceU=Цена ед. PriceUHT=Цена ед. (нетто) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=Цена ед. Amount=Сумма AmountInvoice=Сумма счета-фактуры @@ -521,6 +525,7 @@ DateFromTo=С %s по %s DateFrom=С %s DateUntil=До %s Check=Проверить +Uncheck=Uncheck Internal=Внутренний External=Внешний Internals=Внутренние @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Понедельник Tuesday=Вторник diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang index 41bf0b62e66..aec90dd9d16 100644 --- a/htdocs/langs/ru_RU/orders.lang +++ b/htdocs/langs/ru_RU/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Отменен StatusOrderDraft=Проект (должно быть подтверждено) StatusOrderValidated=Подтвержденные StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Обработано StatusOrderToBill=В законопроекте StatusOrderToBill2=Для выставления @@ -58,6 +59,7 @@ MenuOrdersToBill=Заказы на законопроект MenuOrdersToBill2=Billable orders SearchOrder=Поиск тем SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Судно продукта Discount=Скидка CreateOrder=Создать заказ diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang index 62d309beae8..867240f9b84 100644 --- a/htdocs/langs/ru_RU/other.lang +++ b/htdocs/langs/ru_RU/other.lang @@ -54,12 +54,13 @@ MaxSize=Максимальный размер AttachANewFile=Присоединить новый файл / документ LinkedObject=Связанные объект Miscellaneous=Разное -NbOfActiveNotifications=Количество уведомлений +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Dette er en test post. \\ NDe to linjer er atskilt med en vognretur. PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fet skrift).
De to linjene er skilt med en vognretur. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/ru_RU/productbatch.lang +++ b/htdocs/langs/ru_RU/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang index a8b06bf9c23..b777ee9ed23 100644 --- a/htdocs/langs/ru_RU/products.lang +++ b/htdocs/langs/ru_RU/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang index 23b620b3ce4..91a4da8d284 100644 --- a/htdocs/langs/ru_RU/projects.lang +++ b/htdocs/langs/ru_RU/projects.lang @@ -8,8 +8,10 @@ SharedProject=Общий проект PrivateProject=Контакты проекта MyProjectsDesc=Эта точка зрения ограничена проекты, которые Вы контакте (что бы это тип). ProjectsPublicDesc=Эта точка зрения представлены все проекты, которые Вы позволили читать. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Эта точка зрения представляет все проекты (разрешений пользователей предоставить вам разрешение для просмотра всего). MyTasksDesc=Эта точка зрения ограничена на проекты или задачи, которые являются для контакта (что бы это тип). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Эта точка зрения представляет всех проектов и задач, которые могут читать. TasksDesc=Эта точка зрения представляет всех проектов и задач (разрешений пользователей предоставить вам разрешение для просмотра всего). ProjectsArea=Проекты области @@ -29,6 +31,8 @@ NoProject=Нет проекта определена NbOpenTasks=Nb открытых задач NbOfProjects=Nb проектов TimeSpent=Время, затраченное +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Время, проведенное RefTask=Ref. задача LabelTask=Этикетка задачи @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Список поставщиков зака ListSupplierInvoicesAssociatedProject=Список поставщиков счетов-фактур, связанных с проектом ListContractAssociatedProject=Перечень договоров, связанных с проектом ListFichinterAssociatedProject=Список мероприятий, связанных с проектом -ListTripAssociatedProject=Список поездки и расходы, связанные с проектом +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Список мероприятий, связанных с проектом ActivityOnProjectThisWeek=Деятельность по проекту на этой неделе ActivityOnProjectThisMonth=Деятельность по проектам в этом месяце @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang index 88e94f1e024..6ec5eaae2fd 100644 --- a/htdocs/langs/ru_RU/salaries.lang +++ b/htdocs/langs/ru_RU/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Зарплата Salaries=Зарплаты Employee=Сотрудник @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang index 154a05a98d6..efb3246b409 100644 --- a/htdocs/langs/ru_RU/sendings.lang +++ b/htdocs/langs/ru_RU/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Количество заказанных QtyShipped=Количество отгружен QtyToShip=Количество судов QtyReceived=Количество получил -KeepToShip=Держите на корабль +KeepToShip=Remain to ship OtherSendingsForSameOrder=Другие отправок с этой целью DateSending=Дата отправки порядка DateSendingShort=Дата отправки порядка diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang index 4a5e5c6071f..d89cb572fa1 100644 --- a/htdocs/langs/ru_RU/stocks.lang +++ b/htdocs/langs/ru_RU/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Значение PMPValueShort=WAP EnhancedValueOfWarehouses=Склады стоимости UserWarehouseAutoCreate=Создать запас автоматически при создании пользователя +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Количество направил QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Склад %s будет использован WarehouseForStockIncrease=Склад %s будет использован для увеличения остатка ForThisWarehouse=Для этого склада ReplenishmentStatusDesc=Это список всех продуктов с остатками меньше лимита (или меньше чем значение для оповещения если отмечен чекбокс "только оповещение"), и рекомендуем вам сформировать заказ поставщикам чтобы восполнить разницу -ReplenishmentOrdersDesc=Это список всех открытых заказов Поставщикам +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Пополнения NbOfProductBeforePeriod=Количество продукта %s в остатке на начало выбранного периода (< %s) NbOfProductAfterPeriod=Количество продукта %s в остатке на конец выбранного периода (< %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang index 02adddbc84c..cb0690f2bdf 100644 --- a/htdocs/langs/ru_RU/suppliers.lang +++ b/htdocs/langs/ru_RU/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Поставщики -Supplier=Поставщик AddSupplier=Create a supplier SupplierRemoved=Поставщик удален SuppliersInvoice=Счета-фактуры от поставщиков @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Поставщиком счета-фактуры и ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Утвердить этот заказ ConfirmApproveThisOrder=Вы уверены, что хотите утвердить этот порядок? -DenyingThisOrder=Отказ в таком порядке +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Вы уверены, что хотите лишить этого заказа? ConfirmCancelThisOrder=Вы уверены, что хотите отменить этот заказ? AddCustomerOrder=Создать клиента порядка diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang index f72d0e09b18..ceb0857662a 100644 --- a/htdocs/langs/ru_RU/trips.lang +++ b/htdocs/langs/ru_RU/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Поездка -Trips=Поездки -TripsAndExpenses=Поездки и расходы -TripsAndExpensesStatistics=Статистика поездок и расходов -TripCard=Карточка поездки -AddTrip=Добавить поездку -ListOfTrips=Список поездок +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Список сборов -NewTrip=Новая Поездка +NewTrip=New expense report CompanyVisited=Посещенная организация Kilometers=Километры FeesKilometersOrAmout=Сумма или километры -DeleteTrip=Удалить поездку -ConfirmDeleteTrip=Вы уверены, что хотите удалить эту поездку? -TF_OTHER=Другое -TF_LUNCH=Обед -TF_TRIP=Поездка -ListTripsAndExpenses=Список поездок и расходов -ExpensesArea=Область поездок и расходов -SearchATripAndExpense=Поиск поездок и расходов +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Другое +TF_TRANSPORTATION=Transportation +TF_LUNCH=Обед +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/ru_UA/contracts.lang b/htdocs/langs/ru_UA/contracts.lang index 74b462d5a7b..47e2f92dae0 100644 --- a/htdocs/langs/ru_UA/contracts.lang +++ b/htdocs/langs/ru_UA/contracts.lang @@ -1,7 +1,6 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Контракты области ListOfContracts=Список контрактов -LastContracts=Последнее изменение %s контрактов AllContracts=Все контракты ContractCard=Договор карты ContractStatus=Договор статус @@ -23,6 +22,7 @@ ListOfInactiveServices=Список услуг не активны ListOfExpiredServices=Список истек активные службы ListOfClosedServices=Список закрытых услуг ListOfRunningContractsLines=Список бегущие строки контракта +LastContracts=Последнее изменение %s контрактов NbOfServices=Кол-услуг DeleteContractLine=Удалить контракт линии ConfirmDeleteContractLine=Вы действительно хотите удалить этот контракт линии? diff --git a/htdocs/langs/ru_UA/install.lang b/htdocs/langs/ru_UA/install.lang index e097ba6161a..b4a3228f330 100644 --- a/htdocs/langs/ru_UA/install.lang +++ b/htdocs/langs/ru_UA/install.lang @@ -39,7 +39,6 @@ PasswordAgain=Введите пароль еще раз во второй раз CheckToCreateUser=Флажок, если владелец базы данных не существует, и должен быть создан.
В этом случае, вы должны выбрать его Логин и пароль, а также заполнить Логин / пароль для суперпользователя в нижней части этой страницы. Если этот флажок не установлен, владелец базы данных и ее пароли должны существует. Experimental=(Экспериментальная) DatabaseRootLoginDescription=Войти на пользователя позволили создать новые базы данных или новых пользователей, бесполезны, если ваша база данных и база данных Войти уже существует (например, когда вы организовано провайдера веб-хостинг). -SaveConfigurationFile=Сохранить значения ServerConnection=Соединение с сервером UserCreation=Пользователь создания AdminAccountCreation=Администратор Войти создания @@ -56,7 +55,6 @@ ThisPHPDoesNotSupportTypeBase=Эта система PHP не поддержив FunctionNotAvailableInThisPHP=Не доступно для этого PHP MigrateScript=Миграция сценариев ChoosedMigrateScript=Выберите сценарий миграции -DataMigration=Миграция данных ChooseYourSetupMode=Выберите режим настройки и нажмите кнопку "Пуск" ... FreshInstall=Свежая установка FreshInstallDesc=Используйте этот режим, если это ваша первая установка. Если нет, то этот режим может восстановить неполной предыдущей версии, но если вы хотите обновить версию, выберите "Обновить" режиме. diff --git a/htdocs/langs/ru_UA/main.lang b/htdocs/langs/ru_UA/main.lang index 9e92814a6a4..4d6b3876288 100644 --- a/htdocs/langs/ru_UA/main.lang +++ b/htdocs/langs/ru_UA/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd.MM.yyyy FormatDateShortJavaInput=dd.MM.yyyy FormatDateShortJQuery=dd.mm.yy FormatDateShortJQueryInput=dd.mm.yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang index e1e17cfe342..93790b6a9c3 100644 --- a/htdocs/langs/sk_SK/admin.lang +++ b/htdocs/langs/sk_SK/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimentálne VersionDevelopment=Vývoj VersionUnknown=Neznámy VersionRecommanded=Odporúčané +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID relácie SessionSaveHandler=Handler pre uloženie sedenia SessionSavePath=Skladovanie zasadnutie lokalizácia @@ -493,10 +498,16 @@ Module600Name=Upozornenie Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Dary Module700Desc=Darovanie riadenie +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integrácia Module1400Name=Účtovníctvo Module1400Desc=Vedenie účtovníctva (dvojité strany) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategórie Module1780Desc=Category management (produkty, dodávatelia a odberatelia) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Prečítajte si dodávateľských objednávok Permission182=Vytvoriť / upraviť dodávateľskej objednávky Permission183=Overiť dodávateľských objednávok Permission184=Schváliť dodávateľských objednávok -Permission185=Objednávky Objednať dodávateľ +Permission185=Order or cancel supplier orders Permission186=Príjem objednávok s dodávateľmi Permission187=Zavrieť dodávateľské objednávky Permission188=Zrušiť dodávateľských objednávok @@ -711,6 +722,13 @@ Permission538=Export služieb Permission701=Prečítajte si dary Permission702=Vytvoriť / upraviť dary Permission703=Odstrániť dary +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Prečítajte si zásoby Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Heslo používať proxy server DefineHereComplementaryAttributes=Definujte tu všetky atribúty, ktoré ešte nie sú k dispozícii v predvolenom nastavení, a že chcete byť podporované %s. ExtraFields=Doplnkové atribúty ExtraFieldsLines=Doplnkové atribúty (linky) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Doplnkové atribúty (thirdparty) ExtraFieldsContacts=Doplnkové atribúty (kontakt / adresa) ExtraFieldsMember=Doplnkové atribúty (člen) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Rad výrobkov / služieb s nulovej hodnoty je považov FreeLegalTextOnProposal=Voľný text o obchodných návrhov WatermarkOnDraftProposal=Vodoznak na predlôh návrhov komerčných (none ak prázdny) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Objednať riadenie nastavenia OrdersNumberingModules=Objednávky číslovanie modelov @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Čiarových kódov typu UPC BarcodeDescISBN=Čiarový kód typu ISBN BarcodeDescC39=Čiarový kód typu C39 BarcodeDescC128=Čiarový kód typu C128 -GenbarcodeLocation=Bar generovanie kódu nástroj pre príkazový riadok (používaný motorom s vnútorným u niektorých typov čiarových kódov) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Vnútorná motor BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Predvolený účet použiť na príjem platieb v hotovosti CashDeskBankAccountForCheque= Predvolený účet použiť pre príjem platieb šekom CashDeskBankAccountForCB= Predvolený účet použiť pre príjem platieb prostredníctvom kreditnej karty -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Záložka Nastavenie modulu @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang index ef5bfa2db54..b1c325a49e3 100644 --- a/htdocs/langs/sk_SK/banks.lang +++ b/htdocs/langs/sk_SK/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Zmierenie RIB=Číslo bankového účtu IBAN=IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT číslo +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Trvalé príkazy StandingOrder=Trvalý príkaz Withdrawals=Výbery @@ -148,7 +152,7 @@ BackToAccount=Späť na účte ShowAllAccounts=Zobraziť pre všetky účty FutureTransaction=Transakcie v Futur. Žiadny spôsob, ako sa zmieriť. SelectChequeTransactionAndGenerate=Výber / filter, aby kontroly zahŕňali do obdržaní šeku vkladov a kliknite na "Vytvoriť". -InputReceiptNumber=Vyberte si výpis z účtu súvisiace s zmierovacom konaní. Použite Sortable číselnú hodnotu (napríklad RRRRMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Nakoniec určiť kategóriu, v ktorej chcete klasifikovať záznamy ToConciliate=Zmieriť? ThenCheckLinesAndConciliate=Potom skontrolujte, či riadky, ktoré sú vo výpise z účtu a potom kliknite na tlačidlo diff --git a/htdocs/langs/sk_SK/commercial.lang b/htdocs/langs/sk_SK/commercial.lang index 4fe069876c1..7be1dd39c7f 100644 --- a/htdocs/langs/sk_SK/commercial.lang +++ b/htdocs/langs/sk_SK/commercial.lang @@ -9,9 +9,9 @@ Prospect=Vyhliadka Prospects=Vyhliadky DeleteAction=Odstrániť udalosť / úlohu NewAction=Nová udalosť / úlohu -AddAction=Pridať udalosť / úlohu -AddAnAction=Pridať udalosť / úlohu -AddActionRendezVous=Pridať Rendez-vous udalosti +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Schôdzka ConfirmDeleteAction=Ste si istí, že chcete zmazať túto udalosť / úlohu? CardAction=Udalosť karty @@ -44,8 +44,8 @@ DoneActions=Dokončenej akcie DoneActionsFor=Dokončenej akcie pre %s ToDoActions=Neúplné udalosti ToDoActionsFor=Neúplné akcie pre %s -SendPropalRef=Poslať komerčné návrhu %s -SendOrderRef=Pošli objednávku %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Nevzťahuje sa StatusActionToDo=Ak chcete StatusActionDone=Dokončiť @@ -62,7 +62,7 @@ LastProspectContactDone=Spojiť sa vykonáva DateActionPlanned=Dátum Akcie plánované na DateActionDone=Dátum Akcia vykonané ActionAskedBy=Akcia hlásené -ActionAffectedTo=Udalosť priradená +ActionAffectedTo=Event assigned to ActionDoneBy=Udalosť vykonáva ActionUserAsk=Spracoval ErrorStatusCantBeZeroIfStarted=Ak pole 'Dátum urobiť "je naplnený, je akcia zahájená (alebo hotový), tak pole" Stav "nemôže byť 0%%. diff --git a/htdocs/langs/sk_SK/contracts.lang b/htdocs/langs/sk_SK/contracts.lang index 9ed7ccf7da6..25cf7fc7e01 100644 --- a/htdocs/langs/sk_SK/contracts.lang +++ b/htdocs/langs/sk_SK/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Vypršala ServiceStatusClosed=Zatvorené ServicesLegend=Služby legenda Contracts=Zmluvy +ContractsAndLine=Contracts and line of contracts Contract=Zmluva NoContracts=Žiadne zmluvy MenuServices=Služby diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang index 4e1717149a8..5161517c219 100644 --- a/htdocs/langs/sk_SK/cron.lang +++ b/htdocs/langs/sk_SK/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell príkaz CronMenu=Cron CronCannotLoadClass=Nemožno načítať triedu alebo objekt %s %s UseMenuModuleToolsToAddCronJobs=Choďte do menu "Home - Moduly náradie - Zoznam úloh" vidieť a upravovať naplánované úlohy. +TaskDisabled=Task disabled diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang index 17b73f827fd..dc5032cc33a 100644 --- a/htdocs/langs/sk_SK/errors.lang +++ b/htdocs/langs/sk_SK/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Zdrojovej a cieľovej bankové účty musí byť ErrorBadThirdPartyName=Nesprávna hodnota pre tretie strany menom ErrorProdIdIsMandatory=%s je povinné ErrorBadCustomerCodeSyntax=Bad syntaxe pre zákazníka kódu -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Zákazník požadoval kód ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Zákaznícky kód už používaný @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript musí byť vypnutá, že táto funkcia p ErrorPasswordsMustMatch=Obaja napísaný hesla sa musia zhodovať sa navzájom ErrorContactEMail=Technické chybe. Prosím, obráťte sa na správcu, aby e-mailovú %s en poskytovať %s kód chyby v správe, alebo ešte lepšie pridaním obrazovky kópiu tejto stránky. ErrorWrongValueForField=Chybná hodnota %s číslo poľa (hodnota "%s 'nezodpovedá regex pravidiel %s) -ErrorFieldValueNotIn=Chybná hodnota %s číslo poľa (hodnota "%s 'nie je dostupná hodnota do poľa %s stolových %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Chybná hodnota %s číslo poľa (hodnota "%s" nie je %s existujúce ref) ErrorsOnXLines=Chyby na %s zdrojovom zázname (s) ErrorFileIsInfectedWithAVirus=Antivírusový program nebol schopný overiť súbor (súbor môže byť napadnutý vírusom) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Povinné parametre sú doteraz stanovené diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang index 23665b14d23..f3ebf70457a 100644 --- a/htdocs/langs/sk_SK/install.lang +++ b/htdocs/langs/sk_SK/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Posledný krok: Definujte tu prihlasovacie meno a ActivateModule=Aktivácia modulu %s ShowEditTechnicalParameters=Kliknite tu pre zobrazenie / editovať pokročilé parametre (expertný režim) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang index 9774b798099..12ea65a49b3 100644 --- a/htdocs/langs/sk_SK/main.lang +++ b/htdocs/langs/sk_SK/main.lang @@ -141,6 +141,7 @@ Cancel=Zrušiť Modify=Upraviť Edit=Upraviť Validate=Potvrdiť +ValidateAndApprove=Validate and Approve ToValidate=Ak chcete overiť Save=Uložiť SaveAs=Uložiť ako @@ -158,6 +159,7 @@ Search=Vyhľadávanie SearchOf=Vyhľadávanie Valid=Platný Approve=Schvaľovať +Disapprove=Disapprove ReOpen=Znovu otvoriť Upload=Odoslať súbor ToLink=Odkaz @@ -219,6 +221,7 @@ Cards=Karty Card=Karta Now=Teraz Date=Dátum +DateAndHour=Date and hour DateStart=Dátum začiatku DateEnd=Dátum ukončenia DateCreation=Dátum vytvorenia @@ -295,6 +298,7 @@ UnitPriceHT=Jednotková cena (bez DPH) UnitPriceTTC=Jednotková cena PriceU=UP PriceUHT=UP (bez DPH) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=UP Amount=Množstvo AmountInvoice=Fakturovaná čiastka @@ -521,6 +525,7 @@ DateFromTo=Od %s na %s DateFrom=Od %s DateUntil=Do %s Check=Kontrola +Uncheck=Uncheck Internal=Vnútorné External=Externé Internals=Vnútorné @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Pondelok Tuesday=Utorok diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang index 519ef09d036..baa18258b8c 100644 --- a/htdocs/langs/sk_SK/orders.lang +++ b/htdocs/langs/sk_SK/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Zrušený StatusOrderDraft=Návrh (musí byť overená) StatusOrderValidated=Overené StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Spracované StatusOrderToBill=Dodáva sa StatusOrderToBill2=K účtu @@ -58,6 +59,7 @@ MenuOrdersToBill=Objednávky dodaný MenuOrdersToBill2=Billable orders SearchOrder=Hľadať účelom SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Loď produkt Discount=Zľava CreateOrder=Vytvoriť objednávku diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang index 113f2d7dc2e..f89916a11c2 100644 --- a/htdocs/langs/sk_SK/other.lang +++ b/htdocs/langs/sk_SK/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximálny rozmer AttachANewFile=Pripojte nový súbor / dokument LinkedObject=Prepojený objekt Miscellaneous=Zmiešaný -NbOfActiveNotifications=Počet oznámení +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Toto je test e-mailom. \\ NAk dva riadky sú oddelené znakom konca riadku. \n\n __ SIGNATURE__ PredefinedMailTestHtml=Toto je test-mail (slovo test musí byť tučne).
Dva riadky sú oddelené znakom konca riadku.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/sk_SK/productbatch.lang +++ b/htdocs/langs/sk_SK/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang index 45d5006cb75..667875f4e17 100644 --- a/htdocs/langs/sk_SK/products.lang +++ b/htdocs/langs/sk_SK/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang index ae27e1348b2..8963a13c602 100644 --- a/htdocs/langs/sk_SK/projects.lang +++ b/htdocs/langs/sk_SK/projects.lang @@ -8,8 +8,10 @@ SharedProject=Všetci PrivateProject=Kontakty na projekte MyProjectsDesc=Tento pohľad je obmedzená na projekty, ste kontakt (nech je to typ). ProjectsPublicDesc=Tento názor predstavuje všetky projekty, ktoré sú prístupné pre čítanie. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Tento názor predstavuje všetky projekty (užívateľského oprávnenia udeliť oprávnenie k nahliadnutiu všetko). MyTasksDesc=Tento pohľad je obmedzená na projekty alebo úlohy, ktoré sú pre kontakt (nech je to typ). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Tento názor predstavuje všetky projekty a úlohy, ktoré sú prístupné pre čítanie. TasksDesc=Tento názor predstavuje všetky projekty a úlohy (vaše užívateľské oprávnenia udeliť oprávnenie k nahliadnutiu všetko). ProjectsArea=Projekty oblasť @@ -29,6 +31,8 @@ NoProject=Žiadny projekt definovaný alebo vlastné NbOpenTasks=Nb otvorených úloh NbOfProjects=Nb projektov TimeSpent=Čas strávený +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Čas strávený RefTask=Ref úloha LabelTask=Label úloha @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Zoznam dodávateľa zákaziek súvisiace s p ListSupplierInvoicesAssociatedProject=Zoznam dodávateľských faktúr súvisiace s projektom ListContractAssociatedProject=Zoznam zákaziek súvisiacich s projektom ListFichinterAssociatedProject=Zoznam výkonov spojených s projektom -ListTripAssociatedProject=Zoznam ciest a nákladov spojených s projektom +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Zoznam udalostí spojených s projektom ActivityOnProjectThisWeek=Aktivita na projekte tento týždeň ActivityOnProjectThisMonth=Aktivita na projekte tento mesiac @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/sk_SK/salaries.lang b/htdocs/langs/sk_SK/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/sk_SK/salaries.lang +++ b/htdocs/langs/sk_SK/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang index a28b7441b89..1d57822a222 100644 --- a/htdocs/langs/sk_SK/sendings.lang +++ b/htdocs/langs/sk_SK/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Množstvo objednať QtyShipped=Množstvo odoslané QtyToShip=Množstvo na loď QtyReceived=Množstvo prijatej -KeepToShip=Majte na loď +KeepToShip=Remain to ship OtherSendingsForSameOrder=Ďalšie zásielky pre túto objednávku DateSending=Dátum odoslania, aby DateSendingShort=Dátum odoslania, aby diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang index 80d09deb48a..80cf13a58f0 100644 --- a/htdocs/langs/sk_SK/stocks.lang +++ b/htdocs/langs/sk_SK/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Vážená priemerná cena PMPValueShort=WAP EnhancedValueOfWarehouses=Sklady hodnota UserWarehouseAutoCreate=Vytvorte sklad automaticky pri vytváraní užívateľa +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Množstvo odoslané QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Skladová %s budú použité pre zníženie skl WarehouseForStockIncrease=Skladová %s budú použité pre zvýšenie stavu zásob ForThisWarehouse=Z tohto skladu ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=Toto je zoznam všetkých otvorených dodávateľských objednávok +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Splátky NbOfProductBeforePeriod=Množstvo produktov %s na sklade, než zvolené obdobie (<%s) NbOfProductAfterPeriod=Množstvo produktov %s na sklade po zvolené obdobie (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang index 5d04f2d96fd..8917cbe8b4e 100644 --- a/htdocs/langs/sk_SK/suppliers.lang +++ b/htdocs/langs/sk_SK/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Dodávatelia -Supplier=Dodávateľ AddSupplier=Create a supplier SupplierRemoved=Dodávateľ odstráni SuppliersInvoice=Dodávatelia faktúra @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Dodávateľ faktúry a platby ExportDataset_fournisseur_3=Dodávateľ objednávky a objednávka linky ApproveThisOrder=Schváliť túto objednávku ConfirmApproveThisOrder=Ste si istí, že chcete schváliť poradí %s? -DenyingThisOrder=Popierať túto objednávku +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Ste si istí, že chcete popierať objednávky %s? ConfirmCancelThisOrder=Ste si istí, že chcete zrušiť túto objednávku %s? AddCustomerOrder=Vytvorenie objednávky zákazníka diff --git a/htdocs/langs/sk_SK/trips.lang b/htdocs/langs/sk_SK/trips.lang index 1367186b021..aa91658f502 100644 --- a/htdocs/langs/sk_SK/trips.lang +++ b/htdocs/langs/sk_SK/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Výlet -Trips=Výlety -TripsAndExpenses=Výlety a výdavky -TripsAndExpensesStatistics=Výlety a výdavky štatistiky -TripCard=Výlet karty -AddTrip=Pridať výlet -ListOfTrips=Zoznam ciest +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Sadzobník poplatkov -NewTrip=Nová cesta +NewTrip=New expense report CompanyVisited=Firma / nadácie navštívil Kilometers=Kilometre FeesKilometersOrAmout=Množstvo alebo kilometrov -DeleteTrip=Odstrániť výlet -ConfirmDeleteTrip=Ste si istí, že chcete zmazať túto cestu? -TF_OTHER=Ostatné -TF_LUNCH=Obed -TF_TRIP=Výlet -ListTripsAndExpenses=Zoznam ciest a nákladov -ExpensesArea=Výlety a náklady oblasť -SearchATripAndExpense=Hľadať na výlet a náklady +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Ostatné +TF_TRANSPORTATION=Transportation +TF_LUNCH=Obed +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang index 74e7506e000..e214389ecea 100644 --- a/htdocs/langs/sl_SI/admin.lang +++ b/htdocs/langs/sl_SI/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Preizkusna VersionDevelopment=Razvojna VersionUnknown=Neznana VersionRecommanded=Priporočena +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID seje SessionSaveHandler=Rutina za shranjevanje seje SessionSavePath=Lokalizacija shranjevanja seje @@ -493,10 +498,16 @@ Module600Name=Obvestila Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih (nastavitev je določena za vsakega partnerja) Module700Name=Donacije Module700Desc=Upravljanje donacij +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integracija Module1400Name=Računovodstvo Module1400Desc=Upravljanje računovodstva (dvostavno) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategorije Module1780Desc=Upravljanje kategorij (proizvodi, dobavitelji in kupci) Module2000Name=Fck urejevalnik @@ -631,7 +642,7 @@ Permission181=Branje naročil pri dobaviteljih Permission182=Kreiranje/spreminjanje naročil pri dobaviteljih Permission183=Potrjevanje naročil pri dobaviteljih Permission184=Odobritev naročil pri dobaviteljih -Permission185=Naročanje naročil pri dobaviteljih +Permission185=Order or cancel supplier orders Permission186=Prejem naročil pri dobaviteljih Permission187=Zaključek naročil pri dobaviteljih Permission188=Preklic naročil pri dobaviteljih @@ -711,6 +722,13 @@ Permission538=Izvoz storitev Permission701=Branje donacij Permission702=Kreiranje/spreminjanje donacij Permission703=Delete donacij +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Branje zalog Permission1002=Kreiranje/spreminjanje skladišč Permission1003=Brisanje skladišč @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Geslo za uporabo proxy strežnika DefineHereComplementaryAttributes=Tukaj doloćite vse atribute, ki niso na voljo kot privzeti, vendar želite da so podprti za %s. ExtraFields=Koplementarni atributi ExtraFieldsLines=Koplementarni atributi (postavke) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Koplementarni atributi (partner) ExtraFieldsContacts=Koplementarni atributi (kontakt/naslov) ExtraFieldsMember=Koplementarni atributi (član) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Vrstica proizvoda/storitve z vrednostjo 0 se smatra ko FreeLegalTextOnProposal=Poljubno besedilo na komercialni ponudbi WatermarkOnDraftProposal=Vodni tisk na osnutkih komercialnih ponudb (brez, če je prazno) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vprašajte za ciljni bančni račun ponudbe +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Nastavitve upravljanja z naročili OrdersNumberingModules=Moduli za številčenje naročil @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Črtna koda tipa UPC BarcodeDescISBN=Črtna koda tipa ISBN BarcodeDescC39=Črtna koda tipa C39 BarcodeDescC128=Črtna koda tipa C128 -GenbarcodeLocation=Orodje za generiranje črtne kode preko komandne vrstice (uporablja ga 'phpbarcode engine' za nekatere tipe črtnih kod) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Interno orodje BarCodeNumberManager=Upravljanje avtomatskega določanja številk črtnih kod ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Privzet generični partner, ki se uporabi za prodajo CashDeskBankAccountForSell=Račun, ki se uporabi za prejem gotovinskih plačil CashDeskBankAccountForCheque= Račun, ki se uporabi za prejem plačil s čeki CashDeskBankAccountForCB= Račun, ki se uporabi za prejem plačil s kreditnimi karticami -CashDeskDoNotDecreaseStock=Onemogoči zmanjšanje zaloge, če je prodaja izvršena s prodajnega mesta POS +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Prisilite ali blokirajte skladišče, uporabljeno za zmanjšanje zalog StockDecreaseForPointOfSaleDisabled=Onemogočeno zmanjševanje zaloge s prodajnega mesta POS +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=Niste omogočili zmanjšanje zaloge ob prodaji na prodajnem mestu POS. Potrebno je skladišče. ##### Bookmark ##### BookmarkSetup=Nastavitev modula za zaznamke @@ -1569,3 +1597,7 @@ SortOrder=Sortiraj naročilo Format=Format TypePaymentDesc=0:Tip plačila stranke, 1:Tip plačila dobavitelju, 2:Tip plačila stranke in dobavitelju IncludePath=Vključi pot (definirana v spremenljivki %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang index fdf87b11e54..a74dde0ed85 100644 --- a/htdocs/langs/sl_SI/banks.lang +++ b/htdocs/langs/sl_SI/banks.lang @@ -33,7 +33,11 @@ AllTime=Od začetka Reconciliation=Usklajevanje RIB=Transakcijski račun IBAN=IBAN številka +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT številka +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Trajni nalogi StandingOrder=Trajni nalog Withdrawals=Dvigi @@ -148,7 +152,7 @@ BackToAccount=Nazaj na račun ShowAllAccounts=Prikaži vse račune FutureTransaction=Bodoča transakcija. Ni možna uskladitev. SelectChequeTransactionAndGenerate=Izberi/filtriraj čeke za vključitev v prevzemnico čekovnih nakazil in klikni na "Ustvari" -InputReceiptNumber=Izberi bančni izpisek, povezan s posredovanjem. Uporabi numerično vrednost, ki se lahko sortira (npr.: YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventuelno določi kategorijo, v katero se razvrsti zapis ToConciliate=Za posredovanje? ThenCheckLinesAndConciliate=Nato preveri vrstice na bančnem izpisku in klikni diff --git a/htdocs/langs/sl_SI/commercial.lang b/htdocs/langs/sl_SI/commercial.lang index b5ffccdb1e1..d69651c6025 100644 --- a/htdocs/langs/sl_SI/commercial.lang +++ b/htdocs/langs/sl_SI/commercial.lang @@ -9,9 +9,9 @@ Prospect=Možna stranka Prospects=Možne stranke DeleteAction=Brisanje aktivnosti/naloge NewAction=Nova aktivnost/naloga -AddAction=Dodaj aktivnost/nalogo -AddAnAction=Dodajanje aktivnosti/naloge -AddActionRendezVous=Dodaj nalogo/srečanje +AddAction=Ustvari dogodek/nalogo +AddAnAction=Ustvari dogodek/nalogo +AddActionRendezVous=Ustvari srečanje Rendez-Vous=Srečanje ConfirmDeleteAction=Ali zares želite izbrisati to nalogo? CardAction=Kartica aktivnosti @@ -44,8 +44,8 @@ DoneActions=Dokončane aktivnosti DoneActionsFor=Dokončane aktivnosti za %s ToDoActions=Nedokončane aktivnosti ToDoActionsFor=Nedokončane aktivnosti za %s -SendPropalRef=Poslana komercialna ponudba %s -SendOrderRef=Poslano naročilo %s +SendPropalRef=Oddaja komercialne ponudbe %s +SendOrderRef=Oddaja naročila %s StatusNotApplicable=Ni veljaven StatusActionToDo=Odprto StatusActionDone=Dokončano @@ -62,7 +62,7 @@ LastProspectContactDone=Kontakt izveden DateActionPlanned=Datum planirane aktivnosti za DateActionDone=Datum izvedene aktivnosti ActionAskedBy=Aktivnost zahteval -ActionAffectedTo=Aktivnost, ki se tiče +ActionAffectedTo=Event assigned to ActionDoneBy=Aktivnost izvedel ActionUserAsk=Zabeležil ErrorStatusCantBeZeroIfStarted=Če je polje 'Date done' izpolnjeno, je aktivnost začeta (ali končana), zato polje 'Status' ne more biti 0%%. diff --git a/htdocs/langs/sl_SI/contracts.lang b/htdocs/langs/sl_SI/contracts.lang index 8f74a40c7c8..60ef9ee1b04 100644 --- a/htdocs/langs/sl_SI/contracts.lang +++ b/htdocs/langs/sl_SI/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Potekla ServiceStatusClosed=Zaključena ServicesLegend=Legenda storitev Contracts=Pogodbe +ContractsAndLine=Contracts and line of contracts Contract=Pogodba NoContracts=Ni pogodb MenuServices=Storitve diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang index 298acce66f0..a6e87be5cfe 100644 --- a/htdocs/langs/sl_SI/cron.lang +++ b/htdocs/langs/sl_SI/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang index 78f2fc71dba..8417f316e28 100644 --- a/htdocs/langs/sl_SI/errors.lang +++ b/htdocs/langs/sl_SI/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Plačilni in ciljni bančni račun morata biti ra ErrorBadThirdPartyName=Napačno ime partnerja ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Napačna koda kupca -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Obvezna koda kupca ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Koda kupca je že uporabljena @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript ne sme biti izklopljen, če želite da t ErrorPasswordsMustMatch=Obe vneseni gesli se morata ujemati ErrorContactEMail=Prišlo je do tehnične napake. Prosimo, obrnite se na administratorja na naslednji Email %s in mu sporočite kodo napake %s, Še bolje pa je, če priložite kopijo strani z napako. ErrorWrongValueForField=Napačna vrednost v polju številka %s (vrednost '%s' ne ustreza pravilu %s) -ErrorFieldValueNotIn=Napačna vrednost v polju številka%s (vrednost '%s' ni vrednost, ki je na voljo v polju %s tabele %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Napačna vrednost za %s številka polja (Vrednost '%s "ni %s obstoječe ref) ErrorsOnXLines=Napake v %s vrsticah izvorne kode ErrorFileIsInfectedWithAVirus=Antivirusni program ni mogel potrditi datoteke (datoteka je morda okužena) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang index ca1de1fe210..05e51e48ef4 100644 --- a/htdocs/langs/sl_SI/install.lang +++ b/htdocs/langs/sl_SI/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Zadnji korak: Tukaj določite uporabniško ime in ActivateModule=Vključite modul %s ShowEditTechnicalParameters=Kliknite tukaj za prikaz/popravek naprednih parametrov (expertni način) WarningUpgrade=Pozor:\nAli ste najprej naredili varnostno kopijo baze podatkov ?\nTo je zelo priporočeno: na primer zaradi nekaterih hroščev v sistemu baze podatkov (na primer mysql verzija 5.5.40), lahko med tem postopkom izgubite nekatere podatke ali tabele, zato je priporočeno imeti celotno kopijo vaše baze podatkov pred začetkom migracije.\n\nKliknite OK za začetek procesa migracije... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang index fce08c4ae5f..a41f62aba48 100644 --- a/htdocs/langs/sl_SI/main.lang +++ b/htdocs/langs/sl_SI/main.lang @@ -141,6 +141,7 @@ Cancel=Razveljavi Modify=Spremeni Edit=Uredi Validate=Potrdi +ValidateAndApprove=Validate and Approve ToValidate=Za potrditev Save=Shrani SaveAs=Shrani kot @@ -158,6 +159,7 @@ Search=Išči SearchOf=Iskanje Valid=Veljaven Approve=Potrdi +Disapprove=Disapprove ReOpen=Ponovno odpri Upload=Dodaj datoteko ToLink=Povezava @@ -219,6 +221,7 @@ Cards=Kartice Card=Kartica Now=Zdaj Date=Datum +DateAndHour=Date and hour DateStart=Začetni datum DateEnd=Končni datum DateCreation=Datum kreiranja @@ -295,6 +298,7 @@ UnitPriceHT=Cena enote (neto) UnitPriceTTC=Cena enote PriceU=C.E. PriceUHT=C.E. (neto) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=C.E. Amount=Znesek AmountInvoice=Znesek računa @@ -521,6 +525,7 @@ DateFromTo=Od %s do %s DateFrom=Od %s DateUntil=Do %s Check=Preveri +Uncheck=Uncheck Internal=Interno External=Eksterno Internals=Interni @@ -688,6 +693,7 @@ PublicUrl=Javni URL AddBox=Dodaj okvir SelectElementAndClickRefresh=Izberi element in klikni osveži PrintFile=Natisni datoteko %s +ShowTransaction=Show transaction # Week day Monday=Ponedeljek Tuesday=Torek diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang index 876d57cf02b..eb4d92ac319 100644 --- a/htdocs/langs/sl_SI/orders.lang +++ b/htdocs/langs/sl_SI/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Preklicano StatusOrderDraft=Osnutek (potrebno potrditi) StatusOrderValidated=Potrjeno StatusOrderOnProcess=Naročeno - čaka na prevzem +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Obdelano StatusOrderToBill=Za fakturiranje StatusOrderToBill2=Za fakturiranje @@ -58,6 +59,7 @@ MenuOrdersToBill=Naročila za fakturiranje MenuOrdersToBill2=Naročila za fakturiranje SearchOrder=Iskanje naročila SearchACustomerOrder=Iskanje naročila kupca +SearchASupplierOrder=Search a supplier order ShipProduct=Pošlji izdelek Discount=Popust CreateOrder=Kreiraj naročilo diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang index 20246977b5e..7b22d4ec296 100644 --- a/htdocs/langs/sl_SI/other.lang +++ b/htdocs/langs/sl_SI/other.lang @@ -54,12 +54,13 @@ MaxSize=Največja velikost AttachANewFile=Pripni novo datoteko/dokument LinkedObject=Povezani objekti Miscellaneous=Razno -NbOfActiveNotifications=Število sporočil +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=To je testni mail.\nDve vrstici sta ločeni z carriage return. PredefinedMailTestHtml=To je test mail (beseda test mora biti v krepkem tisku).
Dve vrstici sta ločeni z carriage return. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nŽelimo vas opozoriti, da račun __FACREF__ ni bil poravnan. Zato vam račun še enkrat pošiljamo v prilogi.\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nV prilogi je ponudba __PROPREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nV prilogi je potrditev naročila __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nV prilogi je naše naročilo __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__ diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/sl_SI/productbatch.lang +++ b/htdocs/langs/sl_SI/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang index 1af1122f798..66b438442e1 100644 --- a/htdocs/langs/sl_SI/products.lang +++ b/htdocs/langs/sl_SI/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=Tako za proizvode/storitve, kot za nabavne cene, so n PriceExpressionEditorHelp4=Samo za cene proizvodov/storitev: #supplier_min_price#
Samo za nabavne cene: #supplier_quantity# in #supplier_tva_tx# PriceMode=Način cene PriceNumeric=Številka +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang index 114bd850d0f..86aa5c2da19 100644 --- a/htdocs/langs/sl_SI/projects.lang +++ b/htdocs/langs/sl_SI/projects.lang @@ -8,8 +8,10 @@ SharedProject=Projekti v skupni rabi PrivateProject=Privatni projekti MyProjectsDesc=Ta pogled je omejen na projekte za katere ste vi kontaktna oseba (ne glede na vrsto). ProjectsPublicDesc=To pogled predstavlja vse projekte, za katere imate dovoljenje za branje. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Ta pogled predstavlja vse projekte (vaše uporabniško dovoljenje vam omogoča ogled vseh). MyTasksDesc=Ta pogled je omejen na projekte ali naloge, za katere ste kontaktna oseba (ne glede na vrsto). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Ta pogled predstavlja vse projekte in naloge, za katere imate dovoljenje za branje. TasksDesc=Ta pogled predstavlja vse projekte in naloge (vaše uporabniško dovoljenje vam omogoča ogled vseh). ProjectsArea=Področje projektov @@ -29,6 +31,8 @@ NoProject=Nimate definiranega ali lastnega projekta NbOpenTasks=Število odprtih nalog NbOfProjects=Število projektov TimeSpent=Porabljen čas +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Porabljen čas RefTask=Referenčna naloga LabelTask=Naziv naloge @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Seznam naročil pri dobaviteljih, povezanih ListSupplierInvoicesAssociatedProject=Seznam računov dobaviteljev, povezanih s projektom ListContractAssociatedProject=Seznam pogodb, povezanih s projektom ListFichinterAssociatedProject=Seznam intervencij, povezanih s projektom -ListTripAssociatedProject=Seznam potovanj in stroškov, povezanih s projektom +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Seznam aktivnosti, povezanih s projektom ActivityOnProjectThisWeek=Aktivnosti na projektu v tem tednu ActivityOnProjectThisMonth=Aktivnosti na projektu v tem mesecu @@ -133,3 +137,6 @@ SearchAProject=Iskanje projekta ProjectMustBeValidatedFirst=Projekt mora biti najprej potrjen ProjectDraft=Osnutek projekta FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/sl_SI/salaries.lang b/htdocs/langs/sl_SI/salaries.lang index 28358cd23ec..6ac11760aea 100644 --- a/htdocs/langs/sl_SI/salaries.lang +++ b/htdocs/langs/sl_SI/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Plača Salaries=Plače Employee=Zaposleni @@ -6,3 +8,6 @@ NewSalaryPayment=Novo izplačilo plače SalaryPayment=Izplačilo plače SalariesPayments=Izplačila plač ShowSalaryPayment=Prikaži izplačilo plač +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang index 527162ad3d9..5a318a13eb8 100644 --- a/htdocs/langs/sl_SI/sendings.lang +++ b/htdocs/langs/sl_SI/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Naročena količina QtyShipped=Poslana količina QtyToShip=Količina za pošiljanje QtyReceived=Prejeta količina -KeepToShip=Zadrži pošiljanje +KeepToShip=Remain to ship OtherSendingsForSameOrder=Ostale pošiljke za to naročilo DateSending=Datum pošiljanja naročila DateSendingShort=Datum pošiljanja diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang index 3f37e27fd3b..ff1eed42243 100644 --- a/htdocs/langs/sl_SI/stocks.lang +++ b/htdocs/langs/sl_SI/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Uravnotežena povprečna cena PMPValueShort=UPC EnhancedValueOfWarehouses=Vrednost skladišč UserWarehouseAutoCreate=Avtomatsko ustvari zalogo, ko kreirate uporabnika +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Odposlana količina QtyDispatchedShort=Odposlana količina QtyToDispatchShort=Količina za odpošiljanje @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Skladiščee %s bo uporabljeno za zmanjšanje z WarehouseForStockIncrease=Skladišče %s bo uporabljeno za povečanje zaloge ForThisWarehouse=Za to skladišče ReplenishmentStatusDesc=Seznam vseh proizvodov, ki imajo nižje stanje zaloge od želenega (ali nižje od opozorilne vrednosti, če je kvadratek "samo opozorilo" odkljukan) in predlog za kreiranje naročila pri dobavitelju za dopolnitev razlike. -ReplenishmentOrdersDesc=To je seznam vseh odprtih naročil pri dobavitelju +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Obnovitve NbOfProductBeforePeriod=Količina proizvoda %s na zalogi pred izbranim obdobjem (< %s) NbOfProductAfterPeriod=Količina proizvoda %s na zalogi po izbranem obdobju (> %s) @@ -130,3 +131,4 @@ IsInPackage=Vsebina paketa ShowWarehouse=Prikaži skladišče MovementCorrectStock=Popravek količine zaloge za proizvod %s MovementTransferStock=Skladiščni prenos proizvoda %s v drugo skladišče +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang index a19e3dab7e5..ef34fc2ba1b 100644 --- a/htdocs/langs/sl_SI/suppliers.lang +++ b/htdocs/langs/sl_SI/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Dobavitelji -Supplier=Dobavitelj AddSupplier=Ustvari dobavitelja SupplierRemoved=Dobavitelj odstranjen SuppliersInvoice=Računi dobavitelja @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Računi dobaviteljev in plačila ExportDataset_fournisseur_3=Naročila pri dobaviteljih in vrstice naročila ApproveThisOrder=Odobri to naročilo ConfirmApproveThisOrder=Ali zares želite odobriti to naročilo ? -DenyingThisOrder=Zavrni to naročilo +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Ali zares želite zavrniti to naročilo? ConfirmCancelThisOrder=Ali zares želite preklicati to naročilo? AddCustomerOrder=Kreirajte naročilo kupca diff --git a/htdocs/langs/sl_SI/trips.lang b/htdocs/langs/sl_SI/trips.lang index ae053137a54..9b9729b3d9e 100644 --- a/htdocs/langs/sl_SI/trips.lang +++ b/htdocs/langs/sl_SI/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Pot -Trips=Poti -TripsAndExpenses=Poti in stroški -TripsAndExpensesStatistics=Statistika poti in stroškov -TripCard=Kartica poti -AddTrip=Dodaj pot -ListOfTrips=Seznam poti +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Seznam stroškov -NewTrip=Nova pot +NewTrip=New expense report CompanyVisited=Obiskano podjetje/ustanova Kilometers=Kilometri FeesKilometersOrAmout=Količina kilometrov -DeleteTrip=Izbriši pot -ConfirmDeleteTrip=Ali zares želite izbrisati to pot ? +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report +ClassifyRefunded=Označi kot "Povrnjeno" +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line TF_OTHER=Ostalo +TF_TRANSPORTATION=Transportation TF_LUNCH=Kosilo -TF_TRIP=Pot -ListTripsAndExpenses=Seznam poti in stroškov -ExpensesArea=Področje poti in stroškov -SearchATripAndExpense=Iskanje poti in stroška -ClassifyRefunded=Classify 'Refunded' +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang index 38634cbd497..9782c2ea27f 100644 --- a/htdocs/langs/sq_AL/admin.lang +++ b/htdocs/langs/sq_AL/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=Development VersionUnknown=Unknown VersionRecommanded=Recommended +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Session ID SessionSaveHandler=Handler to save sessions SessionSavePath=Storage session localization @@ -493,10 +498,16 @@ Module600Name=Notifications Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. ExtraFields=Complementary attributes ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang index 10a5f5b3c14..a2306950fb4 100644 --- a/htdocs/langs/sq_AL/banks.lang +++ b/htdocs/langs/sq_AL/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Standing orders StandingOrder=Standing order Withdrawals=Withdrawals @@ -148,7 +152,7 @@ BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/sq_AL/commercial.lang b/htdocs/langs/sq_AL/commercial.lang index e7d2de76503..7acdc7bd7e6 100644 --- a/htdocs/langs/sq_AL/commercial.lang +++ b/htdocs/langs/sq_AL/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Prospects DeleteAction=Delete an event/task NewAction=New event/task -AddAction=Add event/task -AddAnAction=Add an event/task -AddActionRendezVous=Add a Rendez-vous event +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event/task ? CardAction=Event card @@ -44,8 +44,8 @@ DoneActions=Completed events DoneActionsFor=Completed events for %s ToDoActions=Incomplete events ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete diff --git a/htdocs/langs/sq_AL/contracts.lang b/htdocs/langs/sq_AL/contracts.lang index 57ba3bb15d8..d1be0e6513f 100644 --- a/htdocs/langs/sq_AL/contracts.lang +++ b/htdocs/langs/sq_AL/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired ServiceStatusClosed=Closed ServicesLegend=Services legend Contracts=Contracts +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=No contracts MenuServices=Services diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang index 82f4574b223..28dfc7770b2 100644 --- a/htdocs/langs/sq_AL/cron.lang +++ b/htdocs/langs/sq_AL/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang index 497ddd814e4..700e6344d7d 100644 --- a/htdocs/langs/sq_AL/errors.lang +++ b/htdocs/langs/sq_AL/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang index 5a494156672..dcd8df6e7db 100644 --- a/htdocs/langs/sq_AL/install.lang +++ b/htdocs/langs/sq_AL/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang index ea91cfb3438..c9794e8b2ed 100644 --- a/htdocs/langs/sq_AL/main.lang +++ b/htdocs/langs/sq_AL/main.lang @@ -141,6 +141,7 @@ Cancel=Cancel Modify=Modify Edit=Edit Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Save SaveAs=Save As @@ -158,6 +159,7 @@ Search=Search SearchOf=Search Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Now Date=Date +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=From %s to %s DateFrom=From %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang index 34792ae1eb2..8efafa5e94e 100644 --- a/htdocs/langs/sq_AL/orders.lang +++ b/htdocs/langs/sq_AL/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Validated StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderToBill2=To bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang index 88991888183..08747ea884b 100644 --- a/htdocs/langs/sq_AL/other.lang +++ b/htdocs/langs/sq_AL/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/sq_AL/productbatch.lang +++ b/htdocs/langs/sq_AL/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang index 3a29639b12b..3a18cda69e7 100644 --- a/htdocs/langs/sq_AL/products.lang +++ b/htdocs/langs/sq_AL/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang index b3c150d1687..0a12f4c64b7 100644 --- a/htdocs/langs/sq_AL/projects.lang +++ b/htdocs/langs/sq_AL/projects.lang @@ -8,8 +8,10 @@ SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). ProjectsArea=Projects area @@ -29,6 +31,8 @@ NoProject=No project defined or owned NbOpenTasks=Nb of opened tasks NbOfProjects=Nb of projects TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project -ListTripAssociatedProject=List of trips and expenses associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/sq_AL/salaries.lang +++ b/htdocs/langs/sq_AL/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang index 794c9019c86..b1ff55f71c1 100644 --- a/htdocs/langs/sq_AL/sendings.lang +++ b/htdocs/langs/sq_AL/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qty ordered QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order DateSending=Date sending order DateSendingShort=Date sending order diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang index 9de2e5a4dbe..29706d17615 100644 --- a/htdocs/langs/sq_AL/stocks.lang +++ b/htdocs/langs/sq_AL/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang index 7b4d4acb244..baf573c66ac 100644 --- a/htdocs/langs/sq_AL/suppliers.lang +++ b/htdocs/langs/sq_AL/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -Supplier=Supplier AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Approve this order ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Denying this order +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? AddCustomerOrder=Create customer order diff --git a/htdocs/langs/sq_AL/trips.lang b/htdocs/langs/sq_AL/trips.lang index 4b0501a8346..ba36fc9b07b 100644 --- a/htdocs/langs/sq_AL/trips.lang +++ b/htdocs/langs/sq_AL/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Add trip -ListOfTrips=List of trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List of fees -NewTrip=New trip +NewTrip=New expense report CompanyVisited=Company/foundation visited Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? -TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang index 953962457db..a0f32ed0aa5 100644 --- a/htdocs/langs/sv_SE/accountancy.lang +++ b/htdocs/langs/sv_SE/accountancy.lang @@ -15,7 +15,7 @@ JournalFinancial=Finansiella journaler Exports=Export Export=Export Modelcsv=Modell av export -OptionsDeactivatedForThisExportModel=For this export model, options are deactivated +OptionsDeactivatedForThisExportModel=För denna exportmodell är tillval inaktiverade Selectmodelcsv=Välj en modell av export Modelcsv_normal=Klassisk export Modelcsv_CEGID=Export mot CEGID Expert @@ -68,7 +68,7 @@ Lineofinvoice=Line of faktura VentilatedinAccount=Ventilerade framgångsrikt i redovisningskonto NotVentilatedinAccount=Inte ventilerad i redovisningskonto -ACCOUNTING_SEPARATORCSV=Column separator in export file +ACCOUNTING_SEPARATORCSV=Kolumnseparator i exportfil ACCOUNTING_LIMIT_LIST_VENTILATION=Antal element att vara uppdelning framgår av sidan (max rekommenderad: 50) ACCOUNTING_LIST_SORT_VENTILATION_TODO=Börja sortering av nedbrytnings sidor "Måste uppdelning" av de senaste element diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang index 07f6a21ef83..ae34d563120 100644 --- a/htdocs/langs/sv_SE/admin.lang +++ b/htdocs/langs/sv_SE/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimentell VersionDevelopment=Utveckling VersionUnknown=Okänd VersionRecommanded=Rekommenderad +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Session ID SessionSaveHandler=Handler för att spara sessioner SessionSavePath=Lagring session lokalisering @@ -294,7 +299,7 @@ DoNotUseInProduction=Använd inte i poroduktion ThisIsProcessToFollow=Detta är inställd för att behandla: StepNb=Steg %s FindPackageFromWebSite=Hitta ett paket som ger funktionen du vill ha (till exempel om %s webbplats). -DownloadPackageFromWebSite=Download package %s. +DownloadPackageFromWebSite=Ladda hem paket %s. UnpackPackageInDolibarrRoot=Packa upp paketet fil till Dolibarr s katalog %s rot SetupIsReadyForUse=Installera är klar och Dolibarr är klar att användas med den nya komponenten. NotExistsDirect=Den alternativa rotkatalogen är inte definierad.
@@ -304,7 +309,7 @@ YouCanSubmitFile=Välj modul: CurrentVersion=Dolibarr nuvarande version CallUpdatePage=Gå till sidan som uppdaterar databasen struktur och data: %s. LastStableVersion=Senaste stabila version -UpdateServerOffline=Update server offline +UpdateServerOffline=Uppdatera server offline GenericMaskCodes=Du kan ange någon numrering mask. I denna mask skulle följande taggar användas:
(000000) motsvarar ett antal som kommer att ökas på varje %s. Ange så många nollor som den önskade längden på disken. Räknaren kommer att fyllas ut med nollor från vänster för att få så många nollor som masken.
(000000 000) samma som tidigare men en kompensation som motsvarar det antal till höger om tecknet + tillämpas med början den första %s.
(000000 @ x) samma som tidigare, men räknaren återställs till noll när månaden x uppnås (x mellan 1 och 12). Om detta alternativ används och x är 2 eller högre, då sekvensen (yy) (mm) eller (ÅÅÅÅ) (mm) krävs också.
(Dd) dag (01 till 31).
(Mm) månad (01 till 12).
(Yy), (ÅÅÅÅ) eller (y) år under 2, 4 eller ett nummer.
GenericMaskCodes2={Cccc} klientkoden på n tecken
{Cccc000} klientkoden på n tecken följs av en räknare dedikerad för kunden. Denna räknare tillägnad kund återställs vid samma tidpunkt än den globala räknare.
{Tttt} Koden för tredjeparts typ på n tecken (se ordlistan-tredjeparts typer).
GenericMaskCodes3=Alla andra tecken i masken förblir intakt.
Blanksteg är inte tillåtna.
@@ -383,12 +388,12 @@ ExtrafieldSelectList = Välj från tabell ExtrafieldSeparator=Avskiljare ExtrafieldCheckBox=Kryssruta ExtrafieldRadio=Radioknapp -ExtrafieldCheckBoxFromList= Checkbox from table +ExtrafieldCheckBoxFromList= Kryssruta från tabell ExtrafieldParamHelpselect=Parametrar listan måste vara som nyckel, värde

till exempel:
1, value1
2, värde2
3, value3
...

För att få en lista beroende på en annan:
1, value1 | parent_list_code: parent_key
2, värde2 | parent_list_code: parent_key ExtrafieldParamHelpcheckbox=Parametrar listan måste vara som nyckel, värde

till exempel:
1, value1
2, värde2
3, value3
... ExtrafieldParamHelpradio=Parametrar listan måste vara som nyckel, värde

till exempel:
1, value1
2, värde2
3, value3
... ExtrafieldParamHelpsellist=Parametrar lista kommer från en tabell
Syntax: tabellnamn: label_field: id_field :: filtrering
Exempel: c_typent: libelle: id :: filter

Filtret kan vara ett enkelt test (t.ex. aktiv = 1) för att visa endast aktiv värde
Om du vill filtrera på extrafields använder syntaxt extra.fieldcode = ... (där fältkoden är koden för Mig &)

För att få en lista beroende på en annan:
c_typent: libelle: id: parent_list_code | parent_column: filter -ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpchkbxlst=Parameterlista från en tabell
Syntax : table_name:label_field:id_field::filter
Exempel: c_typent:libelle:id::filter

filter kan vara ett enkelt test (t.ex. active=1) för att visa enbart aktiva värden
Använd extra.fieldcode=... (där fältkod är extrafält) syntax för att filtrera på extrafält.

För att få listan beroende en annan:
c_typent:libelle:id:parent_list_code|parent_column:filter LibraryToBuildPDF=Katalog som används för att skapa PDF WarningUsingFPDF=Varning: Din conf.php innehåller direktiv dolibarr_pdf_force_fpdf = 1. Detta innebär att du använder fpdf bibliotek för att generera PDF-filer. Detta bibliotek är gammalt och inte stöder en mängd funktioner (Unicode, bild öppenhet, kyrilliska, arabiska och asiatiska språk, ...), så att du kan uppleva fel under PDF generation.
För att lösa detta och ha ett fullt stöd för PDF-generering, ladda ner TCPDF bibliotek , sedan kommentera eller ta bort linjen $ dolibarr_pdf_force_fpdf = 1, och lägg istället $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir' LocalTaxDesc=Vissa länder tillämpar 2 eller 3 skatter på varje fakturarad. Om så är fallet, välj typ för andra och tredje skatte- och dess hastighet. Möjlig typ är:
1: lokal skatt tillämpas på produkter och tjänster utan moms (moms inte tillämpas på lokal skatt)
2: lokal skatt tillämpas på produkter och tjänster innan moms (moms beräknas på beloppet + localtax)
3: lokal skatt tillämpas på produkter utan moms (moms inte tillämpas på lokal skatt)
4: lokal skatt tillämpas på produkter innan moms (moms beräknas på beloppet + localtax)
5: lokal skatt tillämpas på tjänster utan moms (moms inte tillämpas på lokal skatt)
6: lokal skatt tillämpas på tjänster innan moms (moms beräknas på beloppet + localtax) @@ -493,10 +498,16 @@ Module600Name=Anmälningar Module600Desc=Skicka e-postmeddelanden på vissa Dolibarr affärshändelser till kontakter tredjeparts (inställnings definieras på varje tredjeparts) Module700Name=Donationer Module700Desc=Donation ledning +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Bokföring Module1400Desc=Bokföring och redovisning (dubbel part) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategorier Module1780Desc=Categorie ledning (produkter, leverantörer och kunder) Module2000Name=FCKeditor @@ -575,7 +586,7 @@ Permission67=Export insatser Permission71=Läs medlemmar Permission72=Skapa / modifiera medlemmar Permission74=Ta bort medlemmar -Permission75=Setup types of membership +Permission75=Definera typer av medlemskap Permission76=Exportera data seten Permission78=Läs prenumerationer Permission79=Skapa / ändra abonnemang @@ -598,8 +609,8 @@ Permission106=Exportsend Permission109=Ta bort sendings Permission111=Läs finansiella räkenskaper Permission112=Skapa / ändra / radera och jämför transaktioner -Permission113=Setup financial accounts (create, manage categories) -Permission114=Reconciliate transactions +Permission113=Ställ upp finansiella konton (skapa, handha kategorier) +Permission114=Avstämning av transaktioner Permission115=Exporttransaktioner och kontoutdrag Permission116=Överföringar mellan konton Permission117=Hantera kontroller avsändning @@ -631,7 +642,7 @@ Permission181=Läs leverantör order Permission182=Skapa / ändra leverantör order Permission183=Validate leverantör order Permission184=Godkänn leverantör order -Permission185=Beställ leverantör order +Permission185=Order or cancel supplier orders Permission186=Ta emot leverantör order Permission187=Stäng leverantör order Permission188=Avbryt leverantör order @@ -711,6 +722,13 @@ Permission538=Exportera tjänster Permission701=Läs donationer Permission702=Skapa / ändra donationer Permission703=Ta bort donationer +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Läs lager Permission1002=Skapa / ändra lager Permission1003=Radera lager @@ -764,7 +782,7 @@ Permission55001=Läs omröstningar Permission55002=Skapa / ändra omröstningar Permission59001=Läs kommersiella marginaler Permission59002=Definiera kommersiella marginaler -Permission59003=Read every user margin +Permission59003=Läs varje användaremarginal DictionaryCompanyType=Thirdparties typ DictionaryCompanyJuridicalType=Juridiska sorters thirdparties DictionaryProspectLevel=Prospect potentiella nivå @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Lösenord för att använda proxyservern DefineHereComplementaryAttributes=Här definierar du alla atributes inte redan finns tillgänglig som standard, och att du vill bli stöd för %s. ExtraFields=Komplementära egenskaper ExtraFieldsLines=Kompletterande attribut (rader) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Kompletterande attribut (tredjeparts) ExtraFieldsContacts=Kompletterande attribut (kontaktperson / adress) ExtraFieldsMember=Kompletterande attribut (medlem) @@ -1042,7 +1062,7 @@ SendingMailSetup=Inställning av sändningarna via e-post SendmailOptionNotComplete=Varning, på vissa Linux-system, för att skicka e-post från e-post, sendmail utförande inställning måste conatins Alternativ-ba (parameter mail.force_extra_parameters i din php.ini-fil). Om vissa mottagare inte emot e-post, försök att redigera den här PHP parameter med mail.force_extra_parameters =-BA). PathToDocuments=Sökväg till handlingar PathDirectory=Directory -SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages. +SendmailOptionMayHurtBuggedMTA=Funktion för att skicka e-post med hjälp av metoden "PHP mail direct" genererar ett e-postmeddelande som kanske inte tolkas korrekt av vissa e-postservrar. Resultatet är att viss epost inte kan läsas av användare som hostas på sådana system som tolkar fel. Det är fallet för vissa internetleverantörer (t.ex. Orange i Frankrike). Detta är inte ett Dolibarr- eller PHP-problem men fel på inkommande e-post server. Du kan sätta MAIN_FIX_FOR_BUGGED_MTA till 1 i "Setup - andra" för att Dolibarr ska undvika detta. Du kan dock uppleva problem med andra servrar som strikt följer SMTP standard. Den andra lösningen (Rekomenderad) är att använda metoden "SMTP socket library" som inte har några nackdelar. TranslationSetup=Konfigurera översättning TranslationDesc=Val av språk visas på skärmen kan ändras:
* Globalt från menyn Hem - Inställningar - Display
* För användaren endast från fliken Användar visning av användarkort (klicka på inloggning på toppen av skärmen). TotalNumberOfActivatedModules=Totalt antal aktiverade funktionsmoduler:% s @@ -1061,7 +1081,7 @@ BrowserIsOK=Du använder webbläsaren %s. Denna webbläsare är ok för säkerhe BrowserIsKO=Du använder webbläsaren %s. Denna webbläsare är känt för att vara ett dåligt val för säkerhet, prestanda och tillförlitlighet. Vi rekommendera att du använder Firefox, Chrome, Opera eller Safari. XDebugInstalled=Xdebug är laddad. XCacheInstalled=Xcache är laddad. -AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp". +AddRefInList=Visa kund- / leverantörreferens i lista (välj lista eller combobox) och del av hyperlink. Tredjepart visas med namn "CC12345 - SC45678 - Stor AB" istället för "Stor AB". FieldEdition=Edition av fält %s FixTZ=Timezone fix FillThisOnlyIfRequired=Exempel: +2 (fyll endast om tidszon offset problem är erfarna) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=En rad av produkt / tjänst med en nolla belopp anses FreeLegalTextOnProposal=Fri text på affärsförslag WatermarkOnDraftProposal=Vattenstämpel på utkast till affärsförslag (ingen om tom) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto destination förslag +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Beställ ledning setup OrdersNumberingModules=Beställningar numrering moduler @@ -1161,7 +1188,7 @@ ValidOrderAfterPropalClosed=Att godkänna beställningen efter förslaget närma FreeLegalTextOnOrders=Fri text på order WatermarkOnDraftOrders=Vattenstämpel på utkast till beställningar (ingen om tom) ShippableOrderIconInList=Lägg en ikon i Order lista som anger om beställningen är shippable -BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order +BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fråga om målbankkonto för order ##### Clicktodial ##### ClickToDialSetup=Klicka för att Dial modul setup ClickToDialUrlDesc=Url anropas när ett klick på telefon picto görs. I URL kan du använda taggar
__PHONETO__ Som kommer att ersättas med telefonnumret för personen att ringa
__PHONEFROM__ Som ska ersättas med telefonnummer att ringa person (er)
__LOGIN__ Som ska ersättas med clicktodial inloggning (definierad på ditt användarnamn kort)
__PASS__ Som ska ersättas med ditt clicktodial lösenord (definierad på ditt användarnamn kort). @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode av typ UPC BarcodeDescISBN=Barcode av typ ISBN BarcodeDescC39=Streckkod av typen C39 BarcodeDescC128=Barcode av typ C128 -GenbarcodeLocation=Bar kodgenerering kommandoradsverktyg (som används av phpbarcode motor för vissa typer streckkod) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Intern motor BarCodeNumberManager=Manager för att automatiskt definiera streckkodsnummer ##### Prelevements ##### @@ -1397,7 +1424,7 @@ RSSUrlExample=En intressant RSS-flöde MailingSetup=E-post modul setup MailingEMailFrom=Avsändare Epost (från) för e-post skickas via e-post modul MailingEMailError=Retur-e (fel-till) för e-post med fel -MailingDelay=Seconds to wait after sending next message +MailingDelay=Sekunder fördröjning efter sändning av nästa meddelande ##### Notification ##### NotificationSetup=EMail modul anmälan inställnings NotificationEMailFrom=Avsändare Epost (från) för e-post som skickas till anmälningar @@ -1407,9 +1434,9 @@ FixedEmailTarget=Fast e målet SendingsSetup=Sända modul setup SendingsReceiptModel=Att skicka kvitto modell SendingsNumberingModules=Sänts numrering moduler -SendingsAbility=Support shipment sheets for customer deliveries +SendingsAbility=Stöd fraktsedlar för kundleveranser. NoNeedForDeliveryReceipts=I de flesta fall är sendings kvitton användas både som ark för kundleveranser (förteckning över produkter för att skicka) och ark som är recevied och undertecknas av kunden. Så produktleveranser intäkter är en dubbel funktion och är sällan aktiveras. -FreeLegalTextOnShippings=Free text on shipments +FreeLegalTextOnShippings=Fritext på fraktsedlar ##### Deliveries ##### DeliveryOrderNumberingModules=Produkter leveranser kvitto numrering modul DeliveryOrderModel=Produkter leveranser kvitto modell @@ -1420,7 +1447,7 @@ AdvancedEditor=Avancerad redaktör ActivateFCKeditor=Aktivera FCKeditor för: FCKeditorForCompany=WYSIWYG skapande / upplaga av Companie beskrivning och notera FCKeditorForProduct=WYSIWYG skapande / upplaga av produkter / tjänster: s beskrivning och anteckning -FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files. +FCKeditorForProductDetails=WYSIWYG skapande / redigering av artikeldetaljrader för alla enheter (offertar, order, fakturor mm). Varning: Användning av detta alternativ är inte rekommenderat då det kan leda till problem med speciella tecken och sidformatering vid framställning av PDF-filer. FCKeditorForMailing= WYSIWYG skapande / utgåva av försändelser FCKeditorForUserSignature=WYSIWYG skapande / upplaga av signatur FCKeditorForMail=WYSIWYG skapande / utgåva för alla mail (utom Outils-> mejla) @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Standard generiska tredje part att använda för Sells CashDeskBankAccountForSell=Konto som ska användas för att ta emot kontant betalning CashDeskBankAccountForCheque= Konto som ska användas för att ta emot betalningar med check CashDeskBankAccountForCB= Konto som ska användas för att ta emot kontant betalning med kreditkort -CashDeskDoNotDecreaseStock=Inaktivera lager minskning när en sälja görs från Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Tvinga och begränsa lager att använda för aktie minskning StockDecreaseForPointOfSaleDisabled=Stock minskning från Point of Sale inaktiv +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=Du har inte inaktivera lager minskning när du gör en sälja från Point of Sale. Så ett lager krävs. ##### Bookmark ##### BookmarkSetup=Bokmärk modul setup @@ -1568,4 +1596,8 @@ SalariesSetup=Inställning av modul löner SortOrder=Sorteringsordning Format=Format TypePaymentDesc=0: Kundbetalning typ, 1: Leverantörsbetalnings typ, 2: Både kunder och leverantörer betalnings typ -IncludePath=Include path (defined into variable %s) +IncludePath=Inkludera sökväg (definerad i variabel %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang index 8d888af7945..fce76b40e62 100644 --- a/htdocs/langs/sv_SE/agenda.lang +++ b/htdocs/langs/sv_SE/agenda.lang @@ -58,9 +58,9 @@ OrderSentByEMail=Kundorderprojekt %s via e-post InvoiceSentByEMail=Kundfaktura %s via e-post SupplierOrderSentByEMail=Leverantör beställa %s via e-post SupplierInvoiceSentByEMail=Leverantörsfaktura %s via e-post -ShippingSentByEMail=Shipment %s sent by EMail -ShippingValidated= Shipment %s validated -InterventionSentByEMail=Intervention %s sent by EMail +ShippingSentByEMail=Leverans %s skickat per epost +ShippingValidated= Leverans %s validerad +InterventionSentByEMail=Ärende %s skickat per epost NewCompanyToDolibarr= Tredje part har skapats DateActionPlannedStart= Planerat startdatum DateActionPlannedEnd= Planerat slutdatum @@ -69,7 +69,7 @@ DateActionDoneEnd= Real slutdatum DateActionStart= Startdatum DateActionEnd= Slutdatum AgendaUrlOptions1=Du kan också lägga till följande parametrar för att filtrera utgång: -AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s. +AgendaUrlOptions2=login=%s för att begränsa utdata till händelser skapade av eller tilldelade användare %s. AgendaUrlOptions3=Logina =%s ​​att begränsa produktionen till åtgärder som ägs av en användare%s. AgendaUrlOptions4=logint = %s att begränsa produktionen till handlande påverkade användarnas %s. AgendaUrlOptionsProject=projekt = PROJECT_ID att begränsa produktionen till åtgärder i samband med projektet PROJECT_ID. diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang index ad874db18e7..2f6dc103262 100644 --- a/htdocs/langs/sv_SE/banks.lang +++ b/htdocs/langs/sv_SE/banks.lang @@ -8,7 +8,7 @@ FinancialAccount=Konto FinancialAccounts=Konton BankAccount=Bankkonto BankAccounts=Bankkonton -ShowAccount=Show Account +ShowAccount=Visa konto AccountRef=Finansiell balans ref AccountLabel=Finansiell balans etikett CashAccount=Cash konto @@ -33,7 +33,11 @@ AllTime=Från början Reconciliation=Avstämning RIB=Bankkontonummer IBAN=IBAN-nummer +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT nummer +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Stående order StandingOrder=Stående order Withdrawals=Uttag @@ -148,7 +152,7 @@ BackToAccount=Tillbaka till konto ShowAllAccounts=Visa för alla konton FutureTransaction=Transaktioner i Futur. Inget sätt att blidka. SelectChequeTransactionAndGenerate=Välj / Filtret kontrollerar att inkludera i kontrollen insättning kvittot och klicka på "Skapa". -InputReceiptNumber=Välj kontoutdrag samband med förlikningen. Använd en sorterbar numeriskt värde (t.ex., ÅÅÅÅMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Så småningom, ange en kategori där för att klassificera de register ToConciliate=För att förena? ThenCheckLinesAndConciliate=Kontrollera sedan linjerna som finns i kontoutdraget och klicka diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang index 58ce46d83f5..2228c0a85ef 100644 --- a/htdocs/langs/sv_SE/bills.lang +++ b/htdocs/langs/sv_SE/bills.lang @@ -1,16 +1,16 @@ # Dolibarr language file - Source file is en_US - bills Bill=Faktura Bills=Fakturor -BillsCustomers=Customers invoices -BillsCustomer=Customers invoice -BillsSuppliers=Suppliers invoices -BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomers=Kundfakturor +BillsCustomer=Kundfaktura +BillsSuppliers=Leverantörsfakturor +BillsCustomersUnpaid=Obetalda kundfakturor BillsCustomersUnpaidForCompany=Obetalda kundens fakturor för %s BillsSuppliersUnpaid=Obetalda leverantörs fakturor BillsSuppliersUnpaidForCompany=Obetald leverantörens fakturor för %s BillsLate=Sena betalningar -BillsStatistics=Customers invoices statistics -BillsStatisticsSuppliers=Suppliers invoices statistics +BillsStatistics=Kundfakturor statistik +BillsStatisticsSuppliers=Leverantörsfakturor statistik DisabledBecauseNotErasable=Inaktiverats på grund kan inte raderas InvoiceStandard=Standard faktura InvoiceStandardAsk=Standard faktura @@ -389,7 +389,7 @@ DisabledBecausePayments=Inte möjlig eftersom det inte finns några betalningar CantRemovePaymentWithOneInvoicePaid=Kan inte ta bort betalning eftersom det inte finns åtminstone på fakturan klassificeras betalt ExpectedToPay=Förväntad utbetalning PayedByThisPayment=Betalas av denna betalning -ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid. +ClosePaidInvoicesAutomatically=Klassificera "Betald" alla standard-, löpande och ersättningsfakturor som är fullständigt betalda. ClosePaidCreditNotesAutomatically=Beteckna "Betalda" alla fullständigt återbetalda kreditnotor. AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstående att betala kommer automatiskt stängd för status "betald". ToMakePayment=Betala @@ -412,19 +412,19 @@ TypeContact_invoice_supplier_external_BILLING=Leverantörsfaktura kontakt TypeContact_invoice_supplier_external_SHIPPING=Leverantör Frakt Kontakta TypeContact_invoice_supplier_external_SERVICE=Leverantör tjänst kontakt # Situation invoices -InvoiceFirstSituationAsk=First situation invoice -InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice. -InvoiceSituation=Situation invoice -InvoiceSituationAsk=Invoice following the situation -InvoiceSituationDesc=Create a new situation following an already existing one -SituationAmount=Situation invoice amount(net) -SituationDeduction=Situation subtraction -Progress=Progress -ModifyAllLines=Modify all lines -CreateNextSituationInvoice=Create next situation -NotLastInCycle=This invoice in not the last in cycle and must not be modified. -DisabledBecauseNotLastInCycle=The next situation already exists. -DisabledBecauseFinal=This situation is final. -CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. -NoSituations=No opened situations -InvoiceSituationLast=Final and general invoice +InvoiceFirstSituationAsk=Första löpande faktura +InvoiceFirstSituationDesc=Löpande fakturor avser delfakturor vid pågående arbeten, t.ex. vid ett bygge. +InvoiceSituation=Löpande faktura +InvoiceSituationAsk=Faktura på löpande räkning +InvoiceSituationDesc=Skapa en avstämning / faktura på löpande räkning, följande en tidigare +SituationAmount=Löpande faktura belopp (netto) +SituationDeduction=Löpande räkning avdrag +Progress=Framsteg +ModifyAllLines=Ändra alla rader +CreateNextSituationInvoice=Skapa nästa löpande faktura +NotLastInCycle=Denna faktura är inte den sista i en serie och får inte ändras. +DisabledBecauseNotLastInCycle=Påföljande avstämning finns redan. +DisabledBecauseFinal=Denna avstämning är slutlig. +CantBeLessThanMinPercent=Framsteget kan inte vara mindre än dess värde vid förra avstämningen. +NoSituations=Inga öppnade löpande räkningar +InvoiceSituationLast=Slutlig sammanställningsfaktura. diff --git a/htdocs/langs/sv_SE/commercial.lang b/htdocs/langs/sv_SE/commercial.lang index 4e4fd7f51aa..350e80a0cb9 100644 --- a/htdocs/langs/sv_SE/commercial.lang +++ b/htdocs/langs/sv_SE/commercial.lang @@ -62,7 +62,7 @@ LastProspectContactDone=Kontakta gjort DateActionPlanned=Datum planerade åtgärder för DateActionDone=Datum insatser görs ActionAskedBy=Åtgärd bad -ActionAffectedTo=Händelse som ägs av +ActionAffectedTo=Event assigned to ActionDoneBy=Åtgärder som utförs av ActionUserAsk=Registrerats av ErrorStatusCantBeZeroIfStarted=Om fältet "Datum gjort" är fylld, är arbetet igång (eller färdiga), så fältet "Status" kan inte 0%%. diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang index 9c425408904..f412350b869 100644 --- a/htdocs/langs/sv_SE/compta.lang +++ b/htdocs/langs/sv_SE/compta.lang @@ -29,7 +29,7 @@ ReportTurnover=Omsättning PaymentsNotLinkedToInvoice=Betalningar inte kopplade till någon faktura, så inte är kopplade till någon tredje part PaymentsNotLinkedToUser=Betalningar inte är kopplade till alla användare Profit=Resultat -AccountingResult=Accounting result +AccountingResult=Bokföring resultat Balance=Balans Debit=Debet Credit=Credit diff --git a/htdocs/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang index 8fc4e33c6e3..3d72d8709f1 100644 --- a/htdocs/langs/sv_SE/contracts.lang +++ b/htdocs/langs/sv_SE/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Utgångna ServiceStatusClosed=Stängt ServicesLegend=Tjänster legend Contracts=Kontrakt +ContractsAndLine=Contracts and line of contracts Contract=Kontrakt NoContracts=Inga kontrakt MenuServices=Tjänster diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang index dda29874c43..1bb38438cc9 100644 --- a/htdocs/langs/sv_SE/cron.lang +++ b/htdocs/langs/sv_SE/cron.lang @@ -14,8 +14,8 @@ URLToLaunchCronJobs=URL för att kontrollera och starta cron-jobb om det behövs OrToLaunchASpecificJob=Eller för att kontrollera och starta ett specifikt arbete KeyForCronAccess=Säkerhetsnyckel för URL för att lansera cron-jobb FileToLaunchCronJobs=Kommandorad för att starta cron jobb -CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes -CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes +CronExplainHowToRunUnix=I en Unix-miljö bör följande rad läggas i crontab så kommandot exekveras var 5:e minut. +CronExplainHowToRunWin=I Microsoft(tm) Windows-miljö kan schemalagd aktivitet användas för att exekvera kommandoraden var 5:e minut # Menu CronJobs=Schemalagda jobb CronListActive=Lista över aktiva / schemalagda jobb @@ -84,3 +84,4 @@ CronType_command=Skalkommando CronMenu=Cron CronCannotLoadClass=Det går inte att läsa in klassen% s eller objekt% s UseMenuModuleToolsToAddCronJobs=Gå in på menyn "Home - Moduler verktyg - Job list" för att se och redigera schemalagda jobb. +TaskDisabled=Task disabled diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang index d257d6e4f60..19b3f75848e 100644 --- a/htdocs/langs/sv_SE/ecm.lang +++ b/htdocs/langs/sv_SE/ecm.lang @@ -43,8 +43,8 @@ ECMDocsByContracts=Handlingar som är kopplade till kontrakt ECMDocsByInvoices=Dokument med koppling till kunderna fakturor ECMDocsByProducts=Dokument med koppling till produkter ECMDocsByProjects=Handlingar som är kopplade till projekt -ECMDocsByUsers=Documents linked to users -ECMDocsByInterventions=Documents linked to interventions +ECMDocsByUsers=Dokument länkade till användare +ECMDocsByInterventions=Dokument länkade till ärenden ECMNoDirectoryYet=Ingen katalog skapas ShowECMSection=Visa katalog DeleteSection=Ta bort katalog diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang index 06034972e09..2dfe10cfa08 100644 --- a/htdocs/langs/sv_SE/errors.lang +++ b/htdocs/langs/sv_SE/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Källa och mål bankkonton måste vara olika. ErrorBadThirdPartyName=Felaktigt värde för tredje part namn ErrorProdIdIsMandatory=%s är obligatoriskt ErrorBadCustomerCodeSyntax=Dålig syntax för kundkod -ErrorBadBarCodeSyntax=Dålig syntax för streckkod +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Kunden som erfordras ErrorBarCodeRequired=Streckkod krävs ErrorCustomerCodeAlreadyUsed=Kund-kod som används redan @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript måste inte avaktiveras att ha denna fun ErrorPasswordsMustMatch=Båda skrivit lösenord måste matcha varandra ErrorContactEMail=Ett tekniskt fel uppstod. Vänligen kontakta administratören att följa e-%s en ge %s felkod i ditt meddelande, eller ännu bättre genom att lägga till en skärm kopia av denna sida. ErrorWrongValueForField=Felaktigt värde för antalet %s området (värde "%s" inte matchar regex regel %s) -ErrorFieldValueNotIn=Fel värde för %s fältnummer (värde "%s" är inte ett värde tillgängligt i fält %s av tabell %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Fel värde för %s fältnummer (värde "%s" är inte ett %s befintlig ref) ErrorsOnXLines=Fel på %s källrader ErrorFileIsInfectedWithAVirus=Antivirusprogrammet inte har kunnat validera (fil kan vara smittade av ett virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internt fel '%s' ErrorPriceExpressionUnknown=Okänt fel '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Obligatoriska inställningsparametrarna har ännu inte definierat diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang index 385ac6e854c..c5380d1f831 100644 --- a/htdocs/langs/sv_SE/install.lang +++ b/htdocs/langs/sv_SE/install.lang @@ -155,7 +155,8 @@ MigrationFinished=Migration färdiga LastStepDesc=Sista steget: Definiera här login och lösenord som du planerar att använda för att ansluta till programmet. Tappa inte detta eftersom det är det konto för att administrera alla andra. ActivateModule=Aktivera modul %s ShowEditTechnicalParameters=Klicka här för att visa / redigera avancerade parametrar (expertläge) -WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +WarningUpgrade=Varning:\nHar du säkerhetskopierat databasen?\nDet är starkt rekommenderat att säkerhetskopiera databasen. På grund av fel i databassystemen (t.ex. mysql version 5.5.40) kan tabeller gå förlorade. Det är därför rekommenderat att ta en full dump av databasen innan migreringen påbörjas.\n\nKlicka OK för att starta migreringen... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade @@ -207,7 +208,7 @@ MigrationProjectTaskTime=Uppdatera tid i sekunder MigrationActioncommElement=Uppdatera uppgifter om åtgärder MigrationPaymentMode=Datamigrering betalning mode MigrationCategorieAssociation=Migreringskategorier -MigrationEvents=Migration of events to add event owner into assignement table +MigrationEvents=Överföring av händelser för att lägga till händelseägaren i uppdragslista ShowNotAvailableOptions=Visa ej tillgängliga val HideNotAvailableOptions=Dölj ej tillgängliga val diff --git a/htdocs/langs/sv_SE/languages.lang b/htdocs/langs/sv_SE/languages.lang index 6c909af19fd..031b70fc398 100644 --- a/htdocs/langs/sv_SE/languages.lang +++ b/htdocs/langs/sv_SE/languages.lang @@ -13,7 +13,7 @@ Language_de_AT=Tyska (Österrike) Language_de_CH=Tyska (Schweiz) Language_el_GR=Grekiska Language_en_AU=Engelska (Australien) -Language_en_CA=English (Canada) +Language_en_CA=Engelska (Kanada) Language_en_GB=Engelska (Storbritannien) Language_en_IN=Engelska (Indien) Language_en_NZ=Engelska (Nya Zeeland) diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang index eaaca274910..2c1bb7d593e 100644 --- a/htdocs/langs/sv_SE/main.lang +++ b/htdocs/langs/sv_SE/main.lang @@ -14,7 +14,7 @@ FormatDateShortJava=yyyy-MM-dd FormatDateShortJavaInput=yyyy-MM-dd FormatDateShortJQuery=yy-mm-dd FormatDateShortJQueryInput=yy-mm-dd -FormatHourShortJQuery=HH:MI +FormatHourShortJQuery=tt:mm FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d %Y @@ -62,7 +62,7 @@ ErrorFailedToSaveFile=Fel, kunde inte spara filen. SetDate=Ställ in datum SelectDate=Välj datum SeeAlso=Se även %s -SeeHere=See here +SeeHere=Se hänvisning BackgroundColorByDefault=Standard bakgrundsfärg FileNotUploaded=Filen har inte laddats upp FileUploaded=Filen har laddats upp @@ -141,6 +141,7 @@ Cancel=Avbryt Modify=Ändra Edit=Redigera Validate=Validera +ValidateAndApprove=Validate and Approve ToValidate=Att validera Save=Spara SaveAs=Spara som @@ -158,6 +159,7 @@ Search=Sök SearchOf=Sök Valid=Giltig Approve=Godkänn +Disapprove=Disapprove ReOpen=Öppnar igen Upload=Skicka fil ToLink=Länk @@ -171,7 +173,7 @@ User=Användare Users=Användare Group=Grupp Groups=Grupper -NoUserGroupDefined=No user group defined +NoUserGroupDefined=Ingen användargrupp är definerad Password=Lösenord PasswordRetype=Ange ditt lösenord NoteSomeFeaturesAreDisabled=Observera att en hel del funktioner / moduler är inaktiverade i denna demonstration. @@ -219,6 +221,7 @@ Cards=Kort Card=Kort Now=Nu Date=Datum +DateAndHour=Date and hour DateStart=Startdatum DateEnd=Slutdatum DateCreation=Datum för skapande @@ -261,7 +264,7 @@ days=dagar Hours=Timmar Minutes=Minuter Seconds=Sekunder -Weeks=Weeks +Weeks=Veckor Today=I dag Yesterday=I går Tomorrow=I morgon @@ -295,6 +298,7 @@ UnitPriceHT=Pris per enhet (netto) UnitPriceTTC=Pris per enhet PriceU=Styckpris PriceUHT=St.pris(net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=St.pris Amount=Belopp AmountInvoice=Fakturabelopp @@ -521,6 +525,7 @@ DateFromTo=Från %s till %s DateFrom=Från %s DateUntil=Fram %s Check=Kontrollera +Uncheck=Uncheck Internal=Interna External=Extern Internals=Interna @@ -687,7 +692,8 @@ XMoreLines=%s rader osynliga PublicUrl=Offentlig webbadress AddBox=Lägg till låda SelectElementAndClickRefresh=Välj ett element och klicka på uppdatera -PrintFile=Print File %s +PrintFile=Skriv ut fil %s +ShowTransaction=Show transaction # Week day Monday=Måndag Tuesday=Tisdag diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang index 9cc8eb7d001..6b67e495d3f 100644 --- a/htdocs/langs/sv_SE/orders.lang +++ b/htdocs/langs/sv_SE/orders.lang @@ -16,20 +16,20 @@ SupplierOrder=Leverantör för SuppliersOrders=Leverantörens order SuppliersOrdersRunning=Nuvarande leverantörens order CustomerOrder=Kundorder -CustomersOrders=Customers orders +CustomersOrders=Kundorder CustomersOrdersRunning=Nuvarande kundens order CustomersOrdersAndOrdersLines=Kundorder och ordning: s linjer -OrdersToValid=Customers orders to validate -OrdersToBill=Customers orders delivered -OrdersInProcess=Customers orders in process -OrdersToProcess=Customers orders to process +OrdersToValid=Kundorder att validera +OrdersToBill=Levererade kundorder +OrdersInProcess=Kundorder under behandling +OrdersToProcess=Kundorder att behandla SuppliersOrdersToProcess=Leverantörens order att behandla StatusOrderCanceledShort=Annullerad StatusOrderDraftShort=Förslag StatusOrderValidatedShort=Validerad StatusOrderSentShort=I processen StatusOrderSent=Sändning pågår -StatusOrderOnProcessShort=Ordered +StatusOrderOnProcessShort=Beställda StatusOrderProcessedShort=Bearbetade StatusOrderToBillShort=Till Bill StatusOrderToBill2Short=Till Bill @@ -41,7 +41,8 @@ StatusOrderReceivedAllShort=Allt fick StatusOrderCanceled=Annullerad StatusOrderDraft=Utkast (måste valideras) StatusOrderValidated=Validerad -StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcess=Beställda, väntar på inleverans +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Bearbetade StatusOrderToBill=Till Bill StatusOrderToBill2=Till Bill @@ -50,14 +51,15 @@ StatusOrderRefused=Refused StatusOrderReceivedPartially=Delvis fått StatusOrderReceivedAll=Allt fick ShippingExist=En sändning föreligger -ProductQtyInDraft=Product quantity into draft orders -ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered +ProductQtyInDraft=Produktmängd till beställningsutkast +ProductQtyInDraftOrWaitingApproved=Produktmnängd till beställningsutkast eller godkända beställningar, ännu ej lagda DraftOrWaitingApproved=Förslag eller godkänts ännu ej beställas DraftOrWaitingShipped=Förslag eller godkännas ännu inte sändas MenuOrdersToBill=Order till faktura MenuOrdersToBill2=Fakturerbara order SearchOrder=Sök ordning SearchACustomerOrder=Sök en kundorder +SearchASupplierOrder=Search a supplier order ShipProduct=Ship produkt Discount=Rabatt CreateOrder=Skapa ordning diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang index 326d05f3b36..3144d5f7412 100644 --- a/htdocs/langs/sv_SE/other.lang +++ b/htdocs/langs/sv_SE/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximal storlek AttachANewFile=Bifoga en ny fil / dokument LinkedObject=Länkat objekt Miscellaneous=Diverse -NbOfActiveNotifications=Antal anmälningar +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Detta är en test post. \nDet två linjerna är åtskilda av en vagnretur.\n\n__SIGNATURE__ PredefinedMailTestHtml=Detta är en test post (ordet Provningen skall i fetstil).
De två linjerna är åtskilda av en vagnretur. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Vi vill varna er att fakturan __FACREF__ tycks inte betalt. Så detta är fakturan i bilagan igen, som en påminnelse. __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \nHär hittar du det kommersiella förslaget __PROPREF__\n__PERSONALIZED__mvh\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Här hittar ordern __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Här hittar du vår ordning __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang index 97c10290bfe..df95cb13bea 100644 --- a/htdocs/langs/sv_SE/productbatch.lang +++ b/htdocs/langs/sv_SE/productbatch.lang @@ -1,16 +1,16 @@ # ProductBATCH language file - en_US - ProductBATCH -ManageLotSerial=Use batch/serial number -ProductStatusOnBatch=Yes (Batch/serial required) -ProductStatusNotOnBatch=No (Batch/serial not used) -ProductStatusOnBatchShort=Yes -ProductStatusNotOnBatchShort=No +ManageLotSerial=Använd batch- / serienummer +ProductStatusOnBatch=Ja (batch- / serienr krävs) +ProductStatusNotOnBatch=Nej (batch- / serienr används inte) +ProductStatusOnBatchShort=Ja +ProductStatusNotOnBatchShort=Nej Batch=Batch / Serial atleast1batchfield=Ät före-datum eller bäst före-datum eller batchnummer batch_number=Batch / Serienummer l_eatby=Ät efter datum l_sellby=Sälj före-datum DetailBatchNumber=Batch / Serial detaljer -DetailBatchFormat=Batch / Serial: %s - E:%s - S:%s (Antal: %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Sats: %s printEatby=Äter med:%s printSellby=Sälj-med :%s @@ -18,4 +18,4 @@ printQty=Antal: %d AddDispatchBatchLine=Lägg en linje för Hållbarhet avsändning BatchDefaultNumber=Odefinierat WhenProductBatchModuleOnOptionAreForced=När modulen Batch / Serial är på, öka / minska aktieläget tvingas senaste val och kan inte redigeras. Andra alternativ kan definieras som du vill. -ProductDoesNotUseBatchSerial=This product does not use batch/serial number +ProductDoesNotUseBatchSerial=Denna artikel använder inte batch- / serienummer diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang index cce8a3064cc..e8f20528c1c 100644 --- a/htdocs/langs/sv_SE/products.lang +++ b/htdocs/langs/sv_SE/products.lang @@ -22,16 +22,16 @@ ProductAccountancySellCode=Bokföring kod (sälja) ProductOrService=Produkt eller tjänst ProductsAndServices=Produkter och tjänster ProductsOrServices=Produkter eller tjänster -ProductsAndServicesOnSell=Products and Services for sale or for purchase -ProductsAndServicesNotOnSell=Products and Services out of sale +ProductsAndServicesOnSell=Produkter och tjänster till försäljning eller inköp +ProductsAndServicesNotOnSell=Utgångna produkter och tjänster m.a.p. försäljning ProductsAndServicesStatistics=Produkter och tjänster statistik ProductsStatistics=Produkter statistik -ProductsOnSell=Product for sale or for pruchase -ProductsNotOnSell=Product out of sale and out of purchase -ProductsOnSellAndOnBuy=Products for sale and for purchase -ServicesOnSell=Services for sale or for purchase -ServicesNotOnSell=Services out of sale -ServicesOnSellAndOnBuy=Services for sale and for purchase +ProductsOnSell=Produkter till försäljning eller inköp +ProductsNotOnSell=Utgångna produkter m.a.p. försäljning och inköp +ProductsOnSellAndOnBuy=Produkter till försäljning och inköp +ServicesOnSell=Tjänster till försäljning eller inköp +ServicesNotOnSell=Utgångna tjänster m.a.p. försäljning +ServicesOnSellAndOnBuy=Tjänster till försäljning och inköp InternalRef=Intern hänvisning LastRecorded=Senaste produkter / tjänster att sälja in LastRecordedProductsAndServices=Senaste %s inspelade produkter / tjänster @@ -198,7 +198,7 @@ HelpAddThisServiceCard=Detta alternativ medger att skapa eller klona en tjänst CurrentProductPrice=Nuvarande pris AlwaysUseNewPrice=Använd alltid nuvarande pris för produkt / tjänst AlwaysUseFixedPrice=Använd fast pris -PriceByQuantity=Different prices by quantity +PriceByQuantity=Olika priser m.a.p. mängd PriceByQuantityRange=Pris för mängdgaffel ProductsDashboard=Sammanfattning produkter / tjänster UpdateOriginalProductLabel=Ändra ursprunglig märkning @@ -234,9 +234,9 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Angivelse av typ och värde för str BarCodeDataForProduct=Streckkodsinfo för produkt %s: BarCodeDataForThirdparty=Streckkodsinfo för tredje part %s: ResetBarcodeForAllRecords=Definiera streckkodsvärde för alla poster (detta kommer även att återställa streckkodsvärden som redan är definierade med nya värden) -PriceByCustomer=Different price for each customer +PriceByCustomer=Olika pris m.a.p. kund PriceCatalogue=Unikt pris för produkt eller tjänst -PricingRule=Rules for customer prices +PricingRule=Regler för kundpriser AddCustomerPrice=Lägg till pris per kund ForceUpdateChildPriceSoc=Sätt samma pris på kunds filialer PriceByCustomerLog=Pris per kundlogg @@ -244,9 +244,13 @@ MinimumPriceLimit=Minimipris kan inte vara lägre än %s MinimumRecommendedPrice=Minsta rekommenderade priset är : %s PriceExpressionEditor=Pris uttryck redigerare PriceExpressionSelected=Valda pris uttryck -PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions -PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey# -PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# -PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# +PriceExpressionEditorHelp1="pris = 2 + 2" eller "2 + 2" för att sätta pris. Använd ; för att skilja uttryck +PriceExpressionEditorHelp2=För att använda ExtraFields använd variabler som #options_myextrafieldkey# +PriceExpressionEditorHelp3=I både produkt- / tjänste- och leverantörspriser är följande variabler tillgängliga:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# +PriceExpressionEditorHelp4=Endast i produkt- / tjänstepris: #supplier_min_price#
Endast i leverantörspris: #supplier_quantity# och #supplier_tva_tx# PriceMode=Prisläge PriceNumeric=Nummer +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang index 664a33fd4d5..cdec5ad6557 100644 --- a/htdocs/langs/sv_SE/projects.lang +++ b/htdocs/langs/sv_SE/projects.lang @@ -3,13 +3,15 @@ RefProject=Ref. projekt ProjectId=Projekt Id Project=Projekt Projects=Projekt -ProjectStatus=Project status +ProjectStatus=Projektstatus SharedProject=Alla PrivateProject=Kontakter av projekt MyProjectsDesc=Denna syn är begränsad till projekt du en kontakt för (allt som är "typ"). ProjectsPublicDesc=Denna uppfattning presenterar alla projekt du har rätt att läsa. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Denna uppfattning presenterar alla projekt (din användarbehörighet tillåta dig att visa allt). MyTasksDesc=Denna syn är begränsad till projekt eller uppdrag du en kontakt för (allt som är "typ"). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Denna uppfattning presenterar alla projekt och uppgifter som du får läsa. TasksDesc=Denna uppfattning presenterar alla projekt och uppgifter (din användarbehörighet tillåta dig att visa allt). ProjectsArea=Projekt område @@ -29,6 +31,8 @@ NoProject=Inget projekt definieras eller ägs NbOpenTasks=Nb i öppnade uppgifter NbOfProjects=Nb av projekt TimeSpent=Tid som tillbringas +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Tid RefTask=Ref. uppgift LabelTask=Label uppgift @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista över leverantörens order i samband m ListSupplierInvoicesAssociatedProject=Lista över leverantörens fakturor i samband med projektet ListContractAssociatedProject=Förteckning över avtal i samband med projektet ListFichinterAssociatedProject=Lista över åtgärder i samband med projektet -ListTripAssociatedProject=Förteckning över resor och kostnader i samband med projektet +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Förteckning över åtgärder i samband med projektet ActivityOnProjectThisWeek=Aktivitet på projekt den här veckan ActivityOnProjectThisMonth=Aktivitet på projekt denna månad @@ -103,7 +107,7 @@ CloneContacts=Klon kontakter CloneNotes=Klon anteckningar CloneProjectFiles=Klon projekt fogade filer CloneTaskFiles=Klon uppgift(er) anslöt filer (om uppgiften(s) klonad) -CloneMoveDate=Update project/tasks dates from now ? +CloneMoveDate=Uppdatera projekt- / uppgiftdatum från nu? ConfirmCloneProject=Är du säker på att klona detta projekt? ProjectReportDate=Ändra uppgift datum enligt projektets startdatum ErrorShiftTaskDate=Omöjligt att flytta datum på uppgiften enligt nytt projekt startdatum @@ -133,3 +137,6 @@ SearchAProject=Sök ett projekt ProjectMustBeValidatedFirst=Projekt måste valideras först ProjectDraft=Utkast projekt FirstAddRessourceToAllocateTime=Associera en resurse att avsätta tid +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/sv_SE/salaries.lang b/htdocs/langs/sv_SE/salaries.lang index f2fc8c20068..93545569c2f 100644 --- a/htdocs/langs/sv_SE/salaries.lang +++ b/htdocs/langs/sv_SE/salaries.lang @@ -10,3 +10,4 @@ SalariesPayments=Löneutbetalningar ShowSalaryPayment=Visa löneutbetalning THM=Genomsnitt timpris TJM=Genomsnittlig dagligt pris +CurrentSalary=Current salary diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang index d723d2da074..1f32d5bebb4 100644 --- a/htdocs/langs/sv_SE/sendings.lang +++ b/htdocs/langs/sv_SE/sendings.lang @@ -4,8 +4,8 @@ Sending=Sändning Sendings=Transporter Shipment=Sändning Shipments=Transporter -ShowSending=Show Sending -Receivings=Receipts +ShowSending=Visa skickade +Receivings=Kvitto SendingsArea=Transporter område ListOfSendings=Lista över transporter SendingMethod=Frakt metod @@ -15,7 +15,7 @@ SearchASending=Sök efter transport StatisticsOfSendings=Statistik för transporter NbOfSendings=Antal transporter NumberOfShipmentsByMonth=Antal leveranser per månad -SendingCard=Shipment card +SendingCard=Fraktkort NewSending=Ny leverans CreateASending=Skapa en sändning CreateSending=Skapa leverans @@ -23,7 +23,7 @@ QtyOrdered=Antal beställda QtyShipped=Antal sändas QtyToShip=Antal till-fartyg QtyReceived=Antal mottagna -KeepToShip=Håll dig till fartyg +KeepToShip=Remain to ship OtherSendingsForSameOrder=Andra sändningar för denna beställning DateSending=Datum skicka ordning DateSendingShort=Datum skicka ordning @@ -38,7 +38,7 @@ StatusSendingCanceledShort=Annullerad StatusSendingDraftShort=Förslag StatusSendingValidatedShort=Validerad StatusSendingProcessedShort=Bearbetade -SendingSheet=Shipment sheet +SendingSheet=Packsedel Carriers=Bärare Carrier=Carrier CarriersArea=Bärare område @@ -59,15 +59,15 @@ SendShippingRef=Inlämning av leveransen %s ActionsOnShipping=Evenemang på leverans LinkToTrackYourPackage=Länk till spåra ditt paket ShipmentCreationIsDoneFromOrder=För närvarande är skapandet av en ny leverans sker från ordern kortet. -RelatedShippings=Related shipments +RelatedShippings=Hänförliga leveranser ShipmentLine=Transport linje CarrierList=Lista över transportörer -SendingRunning=Product from ordered customer orders -SuppliersReceiptRunning=Product from ordered supplier orders -ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders -ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders -ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent -ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received +SendingRunning=Produkt från beställda kundorder +SuppliersReceiptRunning=Produkt från beställda leverantörsorder +ProductQtyInCustomersOrdersRunning=Produktkvantitet till öppnade kundorder +ProductQtyInSuppliersOrdersRunning=Produktkvantitet till öppnade leverantörsorder +ProductQtyInShipmentAlreadySent=Produktkvantitet från öppnade kundorder är redan skickade +ProductQtyInSuppliersShipmentAlreadyRecevied=Produktkvantitet från öppnade leverantörsorder är redan skickade # Sending methods SendingMethodCATCH=Fångst av kunden diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang index c8c742d154a..ac0a569d542 100644 --- a/htdocs/langs/sv_SE/stocks.lang +++ b/htdocs/langs/sv_SE/stocks.lang @@ -47,9 +47,10 @@ PMPValue=Vägda genomsnittliga priset PMPValueShort=WAP EnhancedValueOfWarehouses=Lagervärde UserWarehouseAutoCreate=Skapa ett lager automatiskt när du skapar en användare +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Sänd kvantitet -QtyDispatchedShort=Qty dispatched -QtyToDispatchShort=Qty to dispatch +QtyDispatchedShort=Antal skickade +QtyToDispatchShort=Antal att skicka OrderDispatch=Stock avsändning RuleForStockManagementDecrease=Regel för lagerminskning RuleForStockManagementIncrease=Regel för lagerökning @@ -61,7 +62,7 @@ ReStockOnValidateOrder=Öka befintligt lager vid godkänd leverantörsorder ReStockOnDispatchOrder=Öka befintligt lager vid manuell sändning till lager, efter mottagande av leverantörsorder ReStockOnDeleteInvoice=Öka befintligt lager vid radering av faktura OrderStatusNotReadyToDispatch=Beställningen har ännu inte / inte längre status som tillåter sändning av produkter till lager. -StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock +StockDiffPhysicTeoric=Förklaring för skillnad mellan verkligt och beräknat lagersaldo NoPredefinedProductToDispatch=Inga fördefinierade produkter för det här objektet. Så ingen sändning till lager krävs. DispatchVerb=Sändning StockLimitShort=Gräns ​​för varning @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Lager %s kommer att användas för lagerminskni WarehouseForStockIncrease=Lager %s kommer att användas för lagerökning ForThisWarehouse=För detta lager ReplenishmentStatusDesc=Detta är en lista över allla produkter med lägre lagersaldo än önskat lager (eller lägre än larmvärde om "Endast larm" är markerad). Föreslagen åtgärd är att skapa leverantörsordrar för att fylla på lagren. -ReplenishmentOrdersDesc=Detta är en lista över alla öppna leverantörsorder +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Påfyllningar NbOfProductBeforePeriod=Antal av produkt %s i lager före vald period (< %s) NbOfProductAfterPeriod=Antal av produkt %s i lager efter vald period (> %s) @@ -118,15 +119,16 @@ MassMovement=Massrörelse MassStockMovement=Mass lager rörelse SelectProductInAndOutWareHouse=Välj produkt, antal, ursprungslager och mållager och klicka "%s". När det är gjort för alla lageröverföringar klicka på "%s". RecordMovement=Spela in överföring -ReceivingForSameOrder=Receipts for this order +ReceivingForSameOrder=Kvitton för denna beställning StockMovementRecorded=Sparade lageröverföringar RuleForStockAvailability=Regler om krav på lagerhållning StockMustBeEnoughForInvoice=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i faktura StockMustBeEnoughForOrder=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i beställning StockMustBeEnoughForShipment= Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i transporten -MovementLabel=Label of movement -InventoryCode=Movement or inventory code -IsInPackage=Contained into package -ShowWarehouse=Show warehouse -MovementCorrectStock=Stock content correction for product %s -MovementTransferStock=Stock transfer of product %s into another warehouse +MovementLabel=Etikett för lagerrörelse +InventoryCode=Lagerrörelse- eller inventeringskod +IsInPackage=Ingår i förpackning +ShowWarehouse=Visa lagret +MovementCorrectStock=Lagerrättelse för produkt %s +MovementTransferStock=Lagerförflyttning av produkt %s till ett annat lager +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang index 5dd3f4020da..34e27b7955e 100644 --- a/htdocs/langs/sv_SE/suppliers.lang +++ b/htdocs/langs/sv_SE/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Leverantörer -Supplier=Leverantör AddSupplier=Skapa en leverantör SupplierRemoved=Leverantör bort SuppliersInvoice=Leverantörer faktura @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Leverantörsfakturor och betalningar ExportDataset_fournisseur_3=Leverantörs order och orderrader ApproveThisOrder=Godkänna denna ordning ConfirmApproveThisOrder=Är du säker på att du vill godkänna att %s? -DenyingThisOrder=Att förneka denna beställning +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Är du säker på att du vill förneka detta syfte %s? ConfirmCancelThisOrder=Är du säker på att du vill avbryta denna order %s? AddCustomerOrder=Skapa kundorder @@ -42,5 +41,5 @@ NoneOrBatchFileNeverRan=Ingen eller parti %s sprang inte nyligen SentToSuppliers=Skickas till leverantörer ListOfSupplierOrders=Lista över leverantörsorder MenuOrdersSupplierToBill=Leverantörs order att fakturera -NbDaysToDelivery=Delivery delay in days -DescNbDaysToDelivery=The biggest delay is display among order product list +NbDaysToDelivery=Leveransförsening, dagar +DescNbDaysToDelivery=Den största förseningen visas med produktbeställningslista diff --git a/htdocs/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang index 888f20ddd2d..758ffaa367b 100644 --- a/htdocs/langs/sv_SE/trips.lang +++ b/htdocs/langs/sv_SE/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Resor -TripsAndExpenses=Resor och kostnader -TripsAndExpensesStatistics=Resor och kostnader statistik -TripCard=Trip-kort -AddTrip=Skapa resa -ListOfTrips=Förteckning över resor +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Prislista för -NewTrip=Ny resa +NewTrip=New expense report CompanyVisited=Företag / stiftelse besökt Kilometers=Kilometer FeesKilometersOrAmout=Belopp eller kilometer -DeleteTrip=Radera resa -ConfirmDeleteTrip=Är du säker på att du vill ta bort denna resa? -TF_OTHER=Andra -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=Förteckning över resor och kostnader -ExpensesArea=Resor och kostnader område -SearchATripAndExpense=Sök en resa och kostnader +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Klassificerad 'Återbetalas' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Andra +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang index ee0ceb8ecee..724d7766e0c 100644 --- a/htdocs/langs/sv_SE/withdrawals.lang +++ b/htdocs/langs/sv_SE/withdrawals.lang @@ -79,7 +79,7 @@ CreditDate=Krediter på WithdrawalFileNotCapable=Det går inte att skapa uttags kvitto fil för ditt land %s (ditt land stöds inte) ShowWithdraw=Visa Dra IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Om faktura har minst ett uttag betalning som ännu inte behandlats, kommer det inte anges som betalas för att hantera uttag innan. -DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. +DoStandingOrdersBeforePayments=Denna flik ger möjlighet att begära en stående order. Väl utförd, gå till meny Bank->Uttag för att ställa in stående order. När en stående order stängs kommer betalning på faktura att registreras automatiskt och fakturorna att stängas om restbelopp är noll. WithdrawalFile=Utträde fil SetToStatusSent=Ställ in på status "File Skickat" ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att gälla utbetalningar till fakturor och kommer att klassificera dem som "Paid" diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang index efefbb03c97..fd2d15713bd 100644 --- a/htdocs/langs/sv_SE/workflow.lang +++ b/htdocs/langs/sv_SE/workflow.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - admin WorkflowSetup=Arbetsflöde modul konfiguration -WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in. +WorkflowDesc=Denna modul ändrar beteendet av automatiska händelser i tillämpningar. Standardbeteende är att arbetsflöde öppnas (du gör saker i den ordning du vill). Automatiska händelser kan aktiveras för de händelser som önskas. ThereIsNoWorkflowToModify=Det finns ingen arbetsflöde du kan ändra för modul du har aktiverat. descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Skapa en kundorder automatiskt efter en kommersiell förslag undertecknas descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter en kommersiell förslag undertecknas diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang index 2460fb1167f..ed6d1b2709c 100644 --- a/htdocs/langs/th_TH/admin.lang +++ b/htdocs/langs/th_TH/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=การพัฒนา VersionUnknown=ไม่มีข้อมูล VersionRecommanded=แนะนำ +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Session ID SessionSaveHandler=Handler to save sessions SessionSavePath=Storage session localization @@ -493,10 +498,16 @@ Module600Name=Notifications Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. ExtraFields=Complementary attributes ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang index 10a5f5b3c14..a2306950fb4 100644 --- a/htdocs/langs/th_TH/banks.lang +++ b/htdocs/langs/th_TH/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Standing orders StandingOrder=Standing order Withdrawals=Withdrawals @@ -148,7 +152,7 @@ BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/th_TH/commercial.lang b/htdocs/langs/th_TH/commercial.lang index e7d2de76503..7acdc7bd7e6 100644 --- a/htdocs/langs/th_TH/commercial.lang +++ b/htdocs/langs/th_TH/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Prospects DeleteAction=Delete an event/task NewAction=New event/task -AddAction=Add event/task -AddAnAction=Add an event/task -AddActionRendezVous=Add a Rendez-vous event +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event/task ? CardAction=Event card @@ -44,8 +44,8 @@ DoneActions=Completed events DoneActionsFor=Completed events for %s ToDoActions=Incomplete events ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete diff --git a/htdocs/langs/th_TH/contracts.lang b/htdocs/langs/th_TH/contracts.lang index 57ba3bb15d8..d1be0e6513f 100644 --- a/htdocs/langs/th_TH/contracts.lang +++ b/htdocs/langs/th_TH/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired ServiceStatusClosed=Closed ServicesLegend=Services legend Contracts=Contracts +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=No contracts MenuServices=Services diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang index 82f4574b223..28dfc7770b2 100644 --- a/htdocs/langs/th_TH/cron.lang +++ b/htdocs/langs/th_TH/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang index 497ddd814e4..700e6344d7d 100644 --- a/htdocs/langs/th_TH/errors.lang +++ b/htdocs/langs/th_TH/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang index 5a494156672..dcd8df6e7db 100644 --- a/htdocs/langs/th_TH/install.lang +++ b/htdocs/langs/th_TH/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang index e06e7c12e29..18fbfefd1dd 100644 --- a/htdocs/langs/th_TH/main.lang +++ b/htdocs/langs/th_TH/main.lang @@ -141,6 +141,7 @@ Cancel=Cancel Modify=Modify Edit=Edit Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Save SaveAs=Save As @@ -158,6 +159,7 @@ Search=Search SearchOf=Search Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Now Date=Date +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=From %s to %s DateFrom=From %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang index 34792ae1eb2..8efafa5e94e 100644 --- a/htdocs/langs/th_TH/orders.lang +++ b/htdocs/langs/th_TH/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Validated StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderToBill2=To bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang index 88991888183..08747ea884b 100644 --- a/htdocs/langs/th_TH/other.lang +++ b/htdocs/langs/th_TH/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/th_TH/productbatch.lang +++ b/htdocs/langs/th_TH/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang index 3a29639b12b..3a18cda69e7 100644 --- a/htdocs/langs/th_TH/products.lang +++ b/htdocs/langs/th_TH/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang index b3c150d1687..0a12f4c64b7 100644 --- a/htdocs/langs/th_TH/projects.lang +++ b/htdocs/langs/th_TH/projects.lang @@ -8,8 +8,10 @@ SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). ProjectsArea=Projects area @@ -29,6 +31,8 @@ NoProject=No project defined or owned NbOpenTasks=Nb of opened tasks NbOfProjects=Nb of projects TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project -ListTripAssociatedProject=List of trips and expenses associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/th_TH/salaries.lang b/htdocs/langs/th_TH/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/th_TH/salaries.lang +++ b/htdocs/langs/th_TH/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang index 794c9019c86..b1ff55f71c1 100644 --- a/htdocs/langs/th_TH/sendings.lang +++ b/htdocs/langs/th_TH/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qty ordered QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order DateSending=Date sending order DateSendingShort=Date sending order diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang index 9de2e5a4dbe..29706d17615 100644 --- a/htdocs/langs/th_TH/stocks.lang +++ b/htdocs/langs/th_TH/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang index 7b4d4acb244..baf573c66ac 100644 --- a/htdocs/langs/th_TH/suppliers.lang +++ b/htdocs/langs/th_TH/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -Supplier=Supplier AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Approve this order ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Denying this order +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? AddCustomerOrder=Create customer order diff --git a/htdocs/langs/th_TH/trips.lang b/htdocs/langs/th_TH/trips.lang index 4b0501a8346..ba36fc9b07b 100644 --- a/htdocs/langs/th_TH/trips.lang +++ b/htdocs/langs/th_TH/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Add trip -ListOfTrips=List of trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List of fees -NewTrip=New trip +NewTrip=New expense report CompanyVisited=Company/foundation visited Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? -TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang index 221e8331c9f..17bc48b1142 100644 --- a/htdocs/langs/tr_TR/admin.lang +++ b/htdocs/langs/tr_TR/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Deneysel VersionDevelopment=Geliştirme VersionUnknown=Bilinmeyen VersionRecommanded=Önerilen +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Oturum Kimliği SessionSaveHandler=Oturum kayıt yürütücüsü SessionSavePath=Oturum kayıt konumu @@ -493,10 +498,16 @@ Module600Name=Duyurlar Module600Desc=Üçüncü parti kişilerine bazı Dolibarr iş etkinlikleriyle ilgili Eposta bildirimleri gönderin (her üçüncü parti için ayarlar tanımlanmıştır) Module700Name=Bağışlar Module700Desc=Bağış yönetimi +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis entegrasyonu Module1400Name=Muhasebe Module1400Desc=Muhasebe yönetimi (her iki parti için) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Kategoriler Module1780Desc=Kategori yönetimi (ürünler, tedarikçiler ve müşteriler) Module2000Name=FCKdüzenleyici (FCKeditor) @@ -631,7 +642,7 @@ Permission181=Tedarikçi siparişi oku Permission182=Tedarikçi siparişi oluştur/değiştir Permission183=Tedarikçi siparişi doğrula Permission184=Tedarikçi siparişi onayla -Permission185=Tedarikçi siparişi ver +Permission185=Order or cancel supplier orders Permission186=Tedarikçi siparişi al Permission187=Tedarikçi siparişi kapat Permission188=Tedarikçi siparişi iptal et @@ -711,6 +722,13 @@ Permission538=Hizmet dışaaktar Permission701=Bağış oluştur/değiştir Permission702=Bağış sil Permission703=Bağış sil +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Stok oku Permission1002=Depo oluştur/değiştir Permission1003=Depo sil @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Proxy sunucusunu kullanacak parola DefineHereComplementaryAttributes=Burada bütün öznitelikleri tanımlayın, yalnızca mevcut varsayılanları değil desteklenmenizi istediğiniz %s leri de. ExtraFields=Tamamlayıcı öznitelikler ExtraFieldsLines=Tamamlayıcı öznitelikler (satırlar) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Ek öznitelikler (üçüncüparti) ExtraFieldsContacts=Ek öznitelikler (kişi/adres) ExtraFieldsMember=Tamamlayıcı öznitelikler (üye) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Sıfır tutarında olan ürün/hizmet satırını bir FreeLegalTextOnProposal=Teklifler üzerinde serbest metin WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Sipariş yönetimi kurulumu OrdersNumberingModules=Sipariş numaralandırma modülü @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barkod türü UPC BarcodeDescISBN=Barkod türü ISBN BarcodeDescC39=Barkod türü C39 BarcodeDescC128=Barkod türü C128 -GenbarcodeLocation=Bar kod oluşturma komut satırı aracı (phpbarcode motoru tarafından bazı barkod tipleri için kullanılır) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=İç motor BarCodeNumberManager=Barkod sayılarını otomatik olarak tanımlayacak yönetici ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Satışlar için kullanılacak varsayılan genel üç CashDeskBankAccountForSell=Nakit ödemeleri almak için kullanılan varsayılan hesap CashDeskBankAccountForCheque= Ödemeleri çek ile almak için kullanılan varsayılan hesap CashDeskBankAccountForCB= Nakit ödemeleri kredi kartıyla almak için kullanılan varsayılan hesap -CashDeskDoNotDecreaseStock=Satış Noktasından satış yapıldığında stok eksiltilmesini engelle +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Depoyu stok azaltmada kullanmak için zorla ve sınırla StockDecreaseForPointOfSaleDisabled=Satış Noktasından stok eksiltme engelli +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=Satış Noktasından satış yapılırken stok eksiltilmesini engellemediniz. Bu durumda depo gereklidir. ##### Bookmark ##### BookmarkSetup=Yerimi modülü kurulumu @@ -1569,3 +1597,7 @@ SortOrder=Sıralama düzeni Format=Biçim TypePaymentDesc=0:Müşteri ödeme türü, 1:Tedarikçi ödeme türü, 2:Hem müşteri hem de tedarikçi ödeme türü IncludePath=Yolu içerir (%s değişlende tanımlanır) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang index 45459c215f6..4f843b6a57b 100644 --- a/htdocs/langs/tr_TR/banks.lang +++ b/htdocs/langs/tr_TR/banks.lang @@ -33,7 +33,11 @@ AllTime=Başlangıç Reconciliation=Uzlaşma RIB=Banka Hesap Numarası IBAN=IBAN numarası +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT numarası +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Ödeme talimatları StandingOrder=Ödeme talimatı Withdrawals=Para çekmeler @@ -148,7 +152,7 @@ BackToAccount=Hesaba geri dön ShowAllAccounts=Tüm hesaplar için göster FutureTransaction=Gelecekteki işlem. Hiçbir şekilde uzlaştırılamaz. SelectChequeTransactionAndGenerate=Çek tahsilat makbuzunun içereceği çekleri seç/süz ve “Oluştur” a tıkla. -InputReceiptNumber=Uzlaşma ile ilgili banka hesap özetini seçin. Sıralanabilir bir sayısal değer kullanın (YYYYMM gibi) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Sonunda, kayıtları sınıflandırmak için bir kategori belirtin ToConciliate=Uzlaştırılacak mı? ThenCheckLinesAndConciliate=Sonra, banka hesap özetindeki kalemleri işaretleyin ve tıklayın diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang index dc040a6d77c..88f8c321083 100644 --- a/htdocs/langs/tr_TR/commercial.lang +++ b/htdocs/langs/tr_TR/commercial.lang @@ -39,7 +39,7 @@ LastDoneTasks=Tamamlanan son %s görev LastRecordedTasks=Son kaydedilen görevler LastActionsToDo=Tamamlanmamış son %s en eski işlem DoneAndToDoActionsFor=%s için tamamlanan ve yapılacak etkinlikler -DoneAndToDoActions=Tamamlanan ve yapılacak görevler +DoneAndToDoActions=Tamamlanan ve yapılacak etkinlikler DoneActions=Tamamlanan etkinlikler DoneActionsFor=%s için tamamlanan etkinlikler ToDoActions=Tamamlanmamış etkinlikler @@ -61,8 +61,8 @@ LastProspectContactInProcess=Kişi işlemde LastProspectContactDone=Görüşme yapıldı DateActionPlanned=Planlanan etkinlik tarihi DateActionDone=Etkinliğin yapıldığı tarih -ActionAskedBy=Etkinliği sunan -ActionAffectedTo=Etkinlik sahibi +ActionAskedBy=Etkinliği bildiren +ActionAffectedTo=Event assigned to ActionDoneBy=Etkinliği yapan ActionUserAsk=Raporlayan ErrorStatusCantBeZeroIfStarted=Eğer Yapıldığı tarih alanı doluysa, etkinlik başlamıştır (veya bitmiştir), bu durumda 'Durum' alanı 0%% olamaz. @@ -81,7 +81,7 @@ ActionAC_SHIP=Sevkiyatı postayla gönder ActionAC_SUP_ORD=Tedarikçi siparişini postayla gönder ActionAC_SUP_INV=Tedarikçi faturasını postayla gönder ActionAC_OTH=Diğer -ActionAC_OTH_AUTO=Diğer otomatikman eklenen etkinlikler) +ActionAC_OTH_AUTO=Diğer (otomatikman eklenen etkinlikler) ActionAC_MANUAL=Elle eklenen etkinlikler ActionAC_AUTO=Otomatikman eklenen etkinlikler Stats=Satış istatistikleri @@ -92,5 +92,5 @@ RecapAnnee=Yıl özeti NoData=Veri yok StatusProsp=Aday durumu DraftPropals=Taslak teklifler -SearchPropal=Bir teklif ara +SearchPropal=Teklif ara CommercialDashboard=Ticaret özeti diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang index 69cb8b4606c..ef18a5fb522 100644 --- a/htdocs/langs/tr_TR/contracts.lang +++ b/htdocs/langs/tr_TR/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Süresi dolmuş ServiceStatusClosed=Kapalı ServicesLegend=Hizmetler göstergesi Contracts=Sözleşmeler +ContractsAndLine=Contracts and line of contracts Contract=Sözleşme NoContracts=Sözleşme yok MenuServices=Hizmetler diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang index 7dc15f232c9..3a55dd2b134 100644 --- a/htdocs/langs/tr_TR/cron.lang +++ b/htdocs/langs/tr_TR/cron.lang @@ -84,3 +84,4 @@ CronType_command=Kabuk komutu CronMenu=Kron CronCannotLoadClass=%s sınıfı ya da %s nesnesi yüklenemiyor UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Giriş - Modül araçları - İş listesi" menüsüne gidin. +TaskDisabled=Task disabled diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang index e4e9eb9eb3c..269f6173807 100644 --- a/htdocs/langs/tr_TR/errors.lang +++ b/htdocs/langs/tr_TR/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Kaynak ve hedef banka hesapları farklı olmalıd ErrorBadThirdPartyName=Üçüncü parti adı için hatalı değer ErrorProdIdIsMandatory=Bu %s zorunludur ErrorBadCustomerCodeSyntax=Hatalı müşteri kodu -ErrorBadBarCodeSyntax=Bar kodu için hatalı sözdizimi +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Müşteri kodu gereklidir ErrorBarCodeRequired=Bar kod gerekli ErrorCustomerCodeAlreadyUsed=Müşteri kodu zaten kullanılmış @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Bu özelliğin çalışması için Javascript engel ErrorPasswordsMustMatch=Her iki yazdığınız şifrenin birbiriyle eşleşmesi gerekir ErrorContactEMail=Teknik bir hata oluştu. Lütfen, aşağıdaki %s Eposta ile yöneticiye danışın, mesajınızda %s hata kodunu belirtin ve hatta bir ekran görünümünü de eklerseniz daha iyi olur. ErrorWrongValueForField=%s alan numarası için yanlış değer ('%s' değeri '%s' regex kuralı ile uyuşmuyor) -ErrorFieldValueNotIn=%s alan numarası için yanlış değer ('%s' değeri %s tablosunun %s alanı için uygun bir değer değildir) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Alan numarası %s için yanlış değer (değer '%s' bir %s ref mevcut değildir) ErrorsOnXLines=% kaynak satırlarındaki hatalar ErrorFileIsInfectedWithAVirus=Virüs koruma programı dosyayı doğrulayamıyor (dosyaya bir virüs bulaşmış olabilir) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=İç hata '%s' ErrorPriceExpressionUnknown=Bilinmeyen hata '%s' ErrorSrcAndTargetWarehouseMustDiffers=Kaynak ve hedef depolar farklı olmalı ErrorTryToMakeMoveOnProductRequiringBatchData=Hata, parti/seri bilgisi gerektiren ürün için parti/seri bilgisi olmadan stok hareketi yapılmaya çalışılıyor. +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang index cd980985987..731c1b2d344 100644 --- a/htdocs/langs/tr_TR/install.lang +++ b/htdocs/langs/tr_TR/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Son adım: Burada yazılıma bağlanmayı düşün ActivateModule=%s modülünü etkinleştir ShowEditTechnicalParameters=Gelişmiş parametreleri (uzman modu) göstermek/düzenlemek için burayı tıklayın WarningUpgrade=Uyarı:\nÖnce bir veritabanı yedeklemesi yaptınız mı?\nBu son derece önerilir: örneğin; veritabanı sistemindeki bazı hatalar nedeniyle (örneğin mysql sürüm 5.5.40) bu işlem sırasında bazı veriler ve tablolar kaybolabilir. Bu yüzden taşımaya başlamadan önce veritabanının tam bir dökümünün olması son derece önerilir.\n\nTaşıma işlemini başlatmak için Tamam'a tıklayın... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang index 204406547b2..36d6a87625e 100644 --- a/htdocs/langs/tr_TR/main.lang +++ b/htdocs/langs/tr_TR/main.lang @@ -141,6 +141,7 @@ Cancel=İptal Modify=Değiştir Edit=Düzenle Validate=Doğrula +ValidateAndApprove=Validate and Approve ToValidate=Doğrulanacak Save=Kaydet SaveAs=Farklı kaydet @@ -158,6 +159,7 @@ Search=Ara SearchOf=Ara Valid=Geçerli Approve=Onayla +Disapprove=Disapprove ReOpen=Yeniden aç Upload=Dosya gönder ToLink=Bağlantı @@ -219,6 +221,7 @@ Cards=Kartlar Card=Kart Now=Şimdi Date=Tarih +DateAndHour=Date and hour DateStart=Başlama tarihi DateEnd=Bitiş tarih DateCreation=Oluşturma tarihi @@ -295,6 +298,7 @@ UnitPriceHT=Birim fiyat (net) UnitPriceTTC=Birim fiyat PriceU=B.F. PriceUHT=B.F. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=B.F. Amount=Tutar AmountInvoice=Fatura tutarı @@ -521,6 +525,7 @@ DateFromTo=%s den %s e kadar DateFrom=%s den DateUntil=%s e Kadar Check=Denetle +Uncheck=Uncheck Internal=İç External=Dış Internals=İçler @@ -688,6 +693,7 @@ PublicUrl=Genel URL AddBox=Kutu ekle SelectElementAndClickRefresh=Bir öğe seçin ve Yenile'ye tıkla PrintFile=%s Dosyasını Yazdır +ShowTransaction=Show transaction # Week day Monday=Pazartesi Tuesday=Salı diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang index 17254bf7a3d..d203ffa5a23 100644 --- a/htdocs/langs/tr_TR/orders.lang +++ b/htdocs/langs/tr_TR/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=İptal edilmiş StatusOrderDraft=Taslak (doğrulanması gerekir) StatusOrderValidated=Doğrulanmış StatusOrderOnProcess=Sipariş edildi - Teslime hazır +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=İşlenmiş StatusOrderToBill=Teslim edildi StatusOrderToBill2=Faturalanacak @@ -58,6 +59,7 @@ MenuOrdersToBill=Teslim edilen siparişler MenuOrdersToBill2=Faturalanabilir siparişler SearchOrder=Sipariş ara SearchACustomerOrder=Müşteri siparişi ara +SearchASupplierOrder=Search a supplier order ShipProduct=Ürünü sevket Discount=İndirim CreateOrder=Sipariş oluştur diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang index 666bfc89754..f8f84232e9d 100644 --- a/htdocs/langs/tr_TR/other.lang +++ b/htdocs/langs/tr_TR/other.lang @@ -54,12 +54,13 @@ MaxSize=Ençok boyut AttachANewFile=Yeni bir dosya/belge ekle LinkedObject=Bağlantılı nesne Miscellaneous=Çeşitli -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Bu bir deneme postasıdır.\nİki satır enter tuşu ile ayrılmıştır. PredefinedMailTestHtml=Bu bir deneme postası (deneme sözcüğü koyu olmalı).
İki satır enter tuşu ile ayrılmıştır. PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nSize faturanız __FACREF__ için ödeme yapılmamış göründüğünü belirtmek isteriz. Anımsatma amacıyla ilgili fatura ekte sunulmuştur.\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz bilgilerinize sunulmuştur __PROPREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFatura buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__ diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang index e6fc79ade2c..24ea291a110 100644 --- a/htdocs/langs/tr_TR/productbatch.lang +++ b/htdocs/langs/tr_TR/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Parti/Seri numarası l_eatby=Son yenme tarihi l_sellby=Son satış tarihi DetailBatchNumber=Parti/Seri ayrıntıları -DetailBatchFormat=Parti/Seri: %s - Y: %s - S: %s (Mik : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Parti: %s printEatby=Son Yenme: %s printSellby=Son satış: %s diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang index 2c3a9bf0d86..fdf8b1a3b98 100644 --- a/htdocs/langs/tr_TR/products.lang +++ b/htdocs/langs/tr_TR/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=Ürün/hizmet ve tedarikçi fiyatlarının her ikisin PriceExpressionEditorHelp4=Ürün/hizmet fiyatında yalnızca: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Fiyat biçimi PriceNumeric=Sayı +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang index 208dad079bb..b9531646c0b 100644 --- a/htdocs/langs/tr_TR/projects.lang +++ b/htdocs/langs/tr_TR/projects.lang @@ -8,8 +8,10 @@ SharedProject=Herkes PrivateProject=Proje ilgilileri MyProjectsDesc=Bu görünüm ilgilisi olduğunuz projelerle sınırlıdır (türü ne olursa olsun). ProjectsPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri içerir. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Bu görünüm tüm projeleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar). MyTasksDesc=Bu görünüm ilgilisi olduğunuz projelerle ya da görevlerle sınırlıdır (türü ne olursa olsun). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri ve görevleri içerir. TasksDesc=Bu görünüm tüm projeleri ve görevleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar). ProjectsArea=Projeler alanı @@ -29,6 +31,8 @@ NoProject=Tanımlı ya da sahip olunan hiçbir proje yok NbOpenTasks=Açık görev sayısı NbOfProjects=Proje sayısı TimeSpent=Harcanan süre +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Harcanan süre RefTask=Görev ref. LabelTask=Görev etiketi @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Proje ile ilgili tedarikçi siparişlerinin ListSupplierInvoicesAssociatedProject=Proje ile ilgili tedarikçi faturalarının listesi ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi -ListTripAssociatedProject=Proje ile ilgili geziler ve giderlerin listesi +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Proje ile ilgili etkinliklerin listesi ActivityOnProjectThisWeek=Projede bu haftaki etkinlik ActivityOnProjectThisMonth=Projede bu ayki etkinlik @@ -133,3 +137,6 @@ SearchAProject=Bir proje ara ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır ProjectDraft=Taslak projeler FirstAddRessourceToAllocateTime=Zaman ayırmak için bir kaynak ilişkilendirin +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang index 61c1db446e8..1d5aa85d140 100644 --- a/htdocs/langs/tr_TR/salaries.lang +++ b/htdocs/langs/tr_TR/salaries.lang @@ -10,3 +10,4 @@ SalariesPayments=Ücret ödemeleri ShowSalaryPayment=Ücret ödemesi göster THM=Ortalama saat ücreti TJM=Ortalama günlük ücret +CurrentSalary=Current salary diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang index c7b30cba846..9a202a374f2 100644 --- a/htdocs/langs/tr_TR/sendings.lang +++ b/htdocs/langs/tr_TR/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Sipariş mikt. QtyShipped=Sevkedilen mikt. QtyToShip=Sevk edilecek mikt. QtyReceived=Alınan mikt. -KeepToShip=Sevkiyat için tut +KeepToShip=Remain to ship OtherSendingsForSameOrder=Bu sipariş için diğer sevkiyatlar DateSending=Sipariş gönderme tarihi DateSendingShort=Sipariş gönderme tarihi diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang index 4e458e00129..8856d87badd 100644 --- a/htdocs/langs/tr_TR/stocks.lang +++ b/htdocs/langs/tr_TR/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Ağırlıklı ortalama fiyat PMPValueShort=AOF EnhancedValueOfWarehouses=Depolar değeri UserWarehouseAutoCreate=Bir kullanıcı oluştururken otomatik olarak bir stok oluştur +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Sevkedilen miktar QtyDispatchedShort=Dağıtılan mik QtyToDispatchShort=Dağıtılacak mik @@ -110,7 +111,7 @@ WarehouseForStockDecrease=%s deposu stok eksiltme için kullanılacaktır WarehouseForStockIncrease=%s deposu stok arttırma için kullanılacaktır ForThisWarehouse=Bu depo için ReplenishmentStatusDesc=Bu liste istenen stoktan daha az stoklu bütün ürünler içindir (ya da eğer onay kutusunda "yalnızca uyarı" işaretliyse, uyarı değerinden az olan) ve bu farkı kapatmanız için tedarikçi siparişi oluşturmanızı önerir. -ReplenishmentOrdersDesc=Bu liste tüm açık tedarikçi siparişlerinindir +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=İkmal NbOfProductBeforePeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) önceki miktarıdır NbOfProductAfterPeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) sonraki miktarıdır @@ -130,3 +131,4 @@ IsInPackage=Pakette içerilir ShowWarehouse=Depo göster MovementCorrectStock=%s ürünü için stok içeriği düzeltmesi MovementTransferStock=%s ürününün başka bir depoya stok aktarılması +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang index 585a82d5f80..b4b16859cc1 100644 --- a/htdocs/langs/tr_TR/suppliers.lang +++ b/htdocs/langs/tr_TR/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Tedarikçiler -Supplier=Tedarikçi AddSupplier=Bir tedarikçi oluştur SupplierRemoved=Tedarikçi kaldırıldı SuppliersInvoice=Tedarikçi faturası @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Tedarikçi faturaları ve ödemeleri ExportDataset_fournisseur_3=Tedarikçi siparişleri ve sipariş satırları ApproveThisOrder=Bu siparişi onayla ConfirmApproveThisOrder=%s siparişini onaylamak istediğinizden emin misiniz? -DenyingThisOrder=Bu siparişi reddet +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=%s siparişini reddetmek istediğinizden emin misiniz? ConfirmCancelThisOrder=%s siparişini iptal etmek istediğinizden emin misiniz? AddCustomerOrder=Müşteri siparişi oluştur diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang index bd709af9859..30c0831f5ac 100644 --- a/htdocs/langs/tr_TR/trips.lang +++ b/htdocs/langs/tr_TR/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Gezi -Trips=Geziler -TripsAndExpenses=Geziler ve giderler -TripsAndExpensesStatistics=Gezi ve gider istatistikleri -TripCard=Gezi kartı -AddTrip=Gezi ekle -ListOfTrips=Gezi listesi +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Ücretler listesi -NewTrip=Yeni gezi +NewTrip=New expense report CompanyVisited=Ziyaret edilen firma/kuruluş Kilometers=Kilometre FeesKilometersOrAmout=Tutar ya da kilometre -DeleteTrip=Gezi sil -ConfirmDeleteTrip=Bu geziyi silmek istediğinizden emin misiniz? -TF_OTHER=Diğer -TF_LUNCH=Öğle yemeği -TF_TRIP=Gezi -ListTripsAndExpenses=Geziler ve giderler listesi -ExpensesArea=Geziler ve giderler alanı -SearchATripAndExpense=Bir gezi ve gider ara +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Sınıflandırma 'İade edildi' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Diğer +TF_TRANSPORTATION=Transportation +TF_LUNCH=Öğle yemeği +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang index f9049def3dd..c244a6aacf4 100644 --- a/htdocs/langs/uk_UA/admin.lang +++ b/htdocs/langs/uk_UA/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Експериментальна VersionDevelopment=Розробча VersionUnknown=Невизначена VersionRecommanded=Рекомендована +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID Сессії SessionSaveHandler=Handler to save sessions SessionSavePath=Storage session localization @@ -493,10 +498,16 @@ Module600Name=Notifications Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. ExtraFields=Complementary attributes ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang index 10a5f5b3c14..a2306950fb4 100644 --- a/htdocs/langs/uk_UA/banks.lang +++ b/htdocs/langs/uk_UA/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Standing orders StandingOrder=Standing order Withdrawals=Withdrawals @@ -148,7 +152,7 @@ BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/uk_UA/commercial.lang b/htdocs/langs/uk_UA/commercial.lang index e7d2de76503..7acdc7bd7e6 100644 --- a/htdocs/langs/uk_UA/commercial.lang +++ b/htdocs/langs/uk_UA/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Prospects DeleteAction=Delete an event/task NewAction=New event/task -AddAction=Add event/task -AddAnAction=Add an event/task -AddActionRendezVous=Add a Rendez-vous event +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event/task ? CardAction=Event card @@ -44,8 +44,8 @@ DoneActions=Completed events DoneActionsFor=Completed events for %s ToDoActions=Incomplete events ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete diff --git a/htdocs/langs/uk_UA/contracts.lang b/htdocs/langs/uk_UA/contracts.lang index 57ba3bb15d8..d1be0e6513f 100644 --- a/htdocs/langs/uk_UA/contracts.lang +++ b/htdocs/langs/uk_UA/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired ServiceStatusClosed=Closed ServicesLegend=Services legend Contracts=Contracts +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=No contracts MenuServices=Services diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang index 82f4574b223..28dfc7770b2 100644 --- a/htdocs/langs/uk_UA/cron.lang +++ b/htdocs/langs/uk_UA/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang index 497ddd814e4..700e6344d7d 100644 --- a/htdocs/langs/uk_UA/errors.lang +++ b/htdocs/langs/uk_UA/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang index 5a494156672..dcd8df6e7db 100644 --- a/htdocs/langs/uk_UA/install.lang +++ b/htdocs/langs/uk_UA/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang index 31e70c2b72a..05b5f395001 100644 --- a/htdocs/langs/uk_UA/main.lang +++ b/htdocs/langs/uk_UA/main.lang @@ -141,6 +141,7 @@ Cancel=Cancel Modify=Modify Edit=Edit Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Save SaveAs=Save As @@ -158,6 +159,7 @@ Search=Search SearchOf=Search Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Now Date=Date +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=From %s to %s DateFrom=From %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang index 34792ae1eb2..8efafa5e94e 100644 --- a/htdocs/langs/uk_UA/orders.lang +++ b/htdocs/langs/uk_UA/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Validated StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderToBill2=To bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang index 88991888183..08747ea884b 100644 --- a/htdocs/langs/uk_UA/other.lang +++ b/htdocs/langs/uk_UA/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/uk_UA/productbatch.lang +++ b/htdocs/langs/uk_UA/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang index 3a29639b12b..3a18cda69e7 100644 --- a/htdocs/langs/uk_UA/products.lang +++ b/htdocs/langs/uk_UA/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang index b3c150d1687..0a12f4c64b7 100644 --- a/htdocs/langs/uk_UA/projects.lang +++ b/htdocs/langs/uk_UA/projects.lang @@ -8,8 +8,10 @@ SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). ProjectsArea=Projects area @@ -29,6 +31,8 @@ NoProject=No project defined or owned NbOpenTasks=Nb of opened tasks NbOfProjects=Nb of projects TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project -ListTripAssociatedProject=List of trips and expenses associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/uk_UA/salaries.lang b/htdocs/langs/uk_UA/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/uk_UA/salaries.lang +++ b/htdocs/langs/uk_UA/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang index 794c9019c86..b1ff55f71c1 100644 --- a/htdocs/langs/uk_UA/sendings.lang +++ b/htdocs/langs/uk_UA/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qty ordered QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order DateSending=Date sending order DateSendingShort=Date sending order diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang index 9de2e5a4dbe..29706d17615 100644 --- a/htdocs/langs/uk_UA/stocks.lang +++ b/htdocs/langs/uk_UA/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang index 7b4d4acb244..baf573c66ac 100644 --- a/htdocs/langs/uk_UA/suppliers.lang +++ b/htdocs/langs/uk_UA/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -Supplier=Supplier AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Approve this order ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Denying this order +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? AddCustomerOrder=Create customer order diff --git a/htdocs/langs/uk_UA/trips.lang b/htdocs/langs/uk_UA/trips.lang index 4b0501a8346..ba36fc9b07b 100644 --- a/htdocs/langs/uk_UA/trips.lang +++ b/htdocs/langs/uk_UA/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Add trip -ListOfTrips=List of trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List of fees -NewTrip=New trip +NewTrip=New expense report CompanyVisited=Company/foundation visited Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? -TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang index 38634cbd497..9782c2ea27f 100644 --- a/htdocs/langs/uz_UZ/admin.lang +++ b/htdocs/langs/uz_UZ/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Experimental VersionDevelopment=Development VersionUnknown=Unknown VersionRecommanded=Recommended +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Session ID SessionSaveHandler=Handler to save sessions SessionSavePath=Storage session localization @@ -493,10 +498,16 @@ Module600Name=Notifications Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=Donations Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Categories Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor @@ -631,7 +642,7 @@ Permission181=Read supplier orders Permission182=Create/modify supplier orders Permission183=Validate supplier orders Permission184=Approve supplier orders -Permission185=Order supplier orders +Permission185=Order or cancel supplier orders Permission186=Receive supplier orders Permission187=Close supplier orders Permission188=Cancel supplier orders @@ -711,6 +722,13 @@ Permission538=Export services Permission701=Read donations Permission702=Create/modify donations Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Read stocks Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. ExtraFields=Complementary attributes ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid FreeLegalTextOnProposal=Free text on commercial proposals WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Order management setup OrdersNumberingModules=Orders numbering models @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC BarcodeDescISBN=Barcode of type ISBN BarcodeDescC39=Barcode of type C39 BarcodeDescC128=Barcode of type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Default account to use to receive cash payments CashDeskBankAccountForCheque= Default account to use to receive payments by cheque CashDeskBankAccountForCB= Default account to use to receive payments by credit cards -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Bookmark module setup @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang index 10a5f5b3c14..a2306950fb4 100644 --- a/htdocs/langs/uz_UZ/banks.lang +++ b/htdocs/langs/uz_UZ/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=Reconciliation RIB=Bank Account Number IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Standing orders StandingOrder=Standing order Withdrawals=Withdrawals @@ -148,7 +152,7 @@ BackToAccount=Back to account ShowAllAccounts=Show for all accounts FutureTransaction=Transaction in futur. No way to conciliate. SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/uz_UZ/commercial.lang b/htdocs/langs/uz_UZ/commercial.lang index e7d2de76503..7acdc7bd7e6 100644 --- a/htdocs/langs/uz_UZ/commercial.lang +++ b/htdocs/langs/uz_UZ/commercial.lang @@ -9,9 +9,9 @@ Prospect=Prospect Prospects=Prospects DeleteAction=Delete an event/task NewAction=New event/task -AddAction=Add event/task -AddAnAction=Add an event/task -AddActionRendezVous=Add a Rendez-vous event +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=Rendezvous ConfirmDeleteAction=Are you sure you want to delete this event/task ? CardAction=Event card @@ -44,8 +44,8 @@ DoneActions=Completed events DoneActionsFor=Completed events for %s ToDoActions=Incomplete events ToDoActionsFor=Incomplete events for %s -SendPropalRef=Send commercial proposal %s -SendOrderRef=Send order %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=Not applicable StatusActionToDo=To do StatusActionDone=Complete diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang index 57ba3bb15d8..d1be0e6513f 100644 --- a/htdocs/langs/uz_UZ/contracts.lang +++ b/htdocs/langs/uz_UZ/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired ServiceStatusClosed=Closed ServicesLegend=Services legend Contracts=Contracts +ContractsAndLine=Contracts and line of contracts Contract=Contract NoContracts=No contracts MenuServices=Services diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang index 82f4574b223..28dfc7770b2 100644 --- a/htdocs/langs/uz_UZ/cron.lang +++ b/htdocs/langs/uz_UZ/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang index 497ddd814e4..700e6344d7d 100644 --- a/htdocs/langs/uz_UZ/errors.lang +++ b/htdocs/langs/uz_UZ/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen ErrorBadThirdPartyName=Bad value for third party name ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=Bad syntax for customer code -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Customer code required ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=Customer code already used @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur ErrorPasswordsMustMatch=Both typed passwords must match each other ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) ErrorsOnXLines=Errors on %s source record(s) ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang index 5a494156672..dcd8df6e7db 100644 --- a/htdocs/langs/uz_UZ/install.lang +++ b/htdocs/langs/uz_UZ/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan ActivateModule=Activate module %s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang index ea5bebeaebf..f34681e8530 100644 --- a/htdocs/langs/uz_UZ/main.lang +++ b/htdocs/langs/uz_UZ/main.lang @@ -141,6 +141,7 @@ Cancel=Cancel Modify=Modify Edit=Edit Validate=Validate +ValidateAndApprove=Validate and Approve ToValidate=To validate Save=Save SaveAs=Save As @@ -158,6 +159,7 @@ Search=Search SearchOf=Search Valid=Valid Approve=Approve +Disapprove=Disapprove ReOpen=Re-Open Upload=Send file ToLink=Link @@ -219,6 +221,7 @@ Cards=Cards Card=Card Now=Now Date=Date +DateAndHour=Date and hour DateStart=Date start DateEnd=Date end DateCreation=Creation date @@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net) UnitPriceTTC=Unit price PriceU=U.P. PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=U.P. Amount=Amount AmountInvoice=Invoice amount @@ -521,6 +525,7 @@ DateFromTo=From %s to %s DateFrom=From %s DateUntil=Until %s Check=Check +Uncheck=Uncheck Internal=Internal External=External Internals=Internal @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang index 34792ae1eb2..8efafa5e94e 100644 --- a/htdocs/langs/uz_UZ/orders.lang +++ b/htdocs/langs/uz_UZ/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled StatusOrderDraft=Draft (needs to be validated) StatusOrderValidated=Validated StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Processed StatusOrderToBill=Delivered StatusOrderToBill2=To bill @@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered MenuOrdersToBill2=Billable orders SearchOrder=Search order SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Discount CreateOrder=Create Order diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang index 88991888183..08747ea884b 100644 --- a/htdocs/langs/uz_UZ/other.lang +++ b/htdocs/langs/uz_UZ/other.lang @@ -54,12 +54,13 @@ MaxSize=Maximum size AttachANewFile=Attach a new file/document LinkedObject=Linked object Miscellaneous=Miscellaneous -NbOfActiveNotifications=Number of notifications +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang index 3a29639b12b..3a18cda69e7 100644 --- a/htdocs/langs/uz_UZ/products.lang +++ b/htdocs/langs/uz_UZ/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang index b3c150d1687..0a12f4c64b7 100644 --- a/htdocs/langs/uz_UZ/projects.lang +++ b/htdocs/langs/uz_UZ/projects.lang @@ -8,8 +8,10 @@ SharedProject=Everybody PrivateProject=Contacts of project MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). ProjectsArea=Projects area @@ -29,6 +31,8 @@ NoProject=No project defined or owned NbOpenTasks=Nb of opened tasks NbOfProjects=Nb of projects TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Time spent RefTask=Ref. task LabelTask=Label task @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project -ListTripAssociatedProject=List of trips and expenses associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang index 794c9019c86..b1ff55f71c1 100644 --- a/htdocs/langs/uz_UZ/sendings.lang +++ b/htdocs/langs/uz_UZ/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Qty ordered QtyShipped=Qty shipped QtyToShip=Qty to ship QtyReceived=Qty received -KeepToShip=Keep to ship +KeepToShip=Remain to ship OtherSendingsForSameOrder=Other shipments for this order DateSending=Date sending order DateSendingShort=Date sending order diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang index 9de2e5a4dbe..29706d17615 100644 --- a/htdocs/langs/uz_UZ/stocks.lang +++ b/htdocs/langs/uz_UZ/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Weighted average price PMPValueShort=WAP EnhancedValueOfWarehouses=Warehouses value UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Quantity dispatched QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang index 7b4d4acb244..baf573c66ac 100644 --- a/htdocs/langs/uz_UZ/suppliers.lang +++ b/htdocs/langs/uz_UZ/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Suppliers -Supplier=Supplier AddSupplier=Create a supplier SupplierRemoved=Supplier removed SuppliersInvoice=Suppliers invoice @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=Approve this order ConfirmApproveThisOrder=Are you sure you want to approve order %s ? -DenyingThisOrder=Denying this order +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? AddCustomerOrder=Create customer order diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang index 4b0501a8346..ba36fc9b07b 100644 --- a/htdocs/langs/uz_UZ/trips.lang +++ b/htdocs/langs/uz_UZ/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Trip -Trips=Trips -TripsAndExpenses=Trips and expenses -TripsAndExpensesStatistics=Trips and expenses statistics -TripCard=Trip card -AddTrip=Add trip -ListOfTrips=List of trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=List of fees -NewTrip=New trip +NewTrip=New expense report CompanyVisited=Company/foundation visited Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers -DeleteTrip=Delete trip -ConfirmDeleteTrip=Are you sure you want to delete this trip ? -TF_OTHER=Other -TF_LUNCH=Lunch -TF_TRIP=Trip -ListTripsAndExpenses=List of trips and expenses -ExpensesArea=Trips and expenses area -SearchATripAndExpense=Search a trip and expense +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang index fb7efc64748..a88043962f5 100644 --- a/htdocs/langs/vi_VN/admin.lang +++ b/htdocs/langs/vi_VN/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=Thử nghiệm VersionDevelopment=Phát triển VersionUnknown=Chưa rõ VersionRecommanded=Khuyên dùng +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Số thứ tự phiên làm việc SessionSaveHandler=Quản lý lưu phiên làm việc SessionSavePath=Chuyển ngữ phiên làm việc lưu trữ @@ -493,10 +498,16 @@ Module600Name=Thông báo Module600Desc=Gửi thông báo EMail trên một số sự kiện kinh doanh Dolibarr để liên hệ của bên thứ ba (thiết lập được xác định trên mỗi thirdparty) Module700Name=Tài trợ Module700Desc=Quản lý tài trợ +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis hội nhập Module1400Name=Kế toán Module1400Desc=Kế toán quản trị (đôi bên) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=Loại Module1780Desc=Quản lý danh mục (sản phẩm, nhà cung cấp và khách hàng) Module2000Name=Trình soạn thảo WYSIWYG @@ -631,7 +642,7 @@ Permission181=Đọc đơn đặt hàng nhà cung cấp Permission182=Tạo / chỉnh sửa đơn đặt hàng nhà cung cấp Permission183=Xác nhận đơn đặt hàng nhà cung cấp Permission184=Phê duyệt đơn đặt hàng nhà cung cấp -Permission185=Đơn đặt hàng nhà cung cấp thứ tự +Permission185=Order or cancel supplier orders Permission186=Nhận đặt hàng cung cấp Permission187=Đóng cửa các đơn đặt hàng nhà cung cấp Permission188=Hủy bỏ đơn đặt hàng nhà cung cấp @@ -711,6 +722,13 @@ Permission538=Xuất dữ liệu Dịch vụ Permission701=Đọc thông tin Tài trợ Permission702=Tạo / sửa đổi hiến Permission703=Xóa tài trợ +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=Đọc tồn kho Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Mật khẩu để sử dụng máy chủ proxy DefineHereComplementaryAttributes=Xác định đây tất cả các thuộc tính, không phải đã có sẵn theo mặc định, và bạn muốn được hỗ trợ cho%s. ExtraFields=Thuộc tính bổ sung ExtraFieldsLines=Thuộc tính bổ sung (dòng) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Thuộc tính bổ sung (của bên thứ ba) ExtraFieldsContacts=Thuộc tính bổ sung (liên lạc / địa chỉ) ExtraFieldsMember=Thuộc tính bổ sung (thành viên) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Một dòng sản phẩm / dịch vụ với một s FreeLegalTextOnProposal=Miễn phí văn bản trên đề xuất thương mại WatermarkOnDraftProposal=Watermark về dự thảo đề xuất thương mại (nếu không có sản phẩm nào) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=Thiết lập quản lý đơn hàng OrdersNumberingModules=Mô hình đánh số đơn hàng @@ -1383,7 +1410,7 @@ BarcodeDescUPC=Mã vạch UPC loại BarcodeDescISBN=Barcode loại ISBN BarcodeDescC39=Barcode loại C39 BarcodeDescC128=Barcode loại C128 -GenbarcodeLocation=Thanh công cụ dòng lệnh thế hệ mã (sử dụng động cơ nội bộ đối với một số loại mã vạch) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Động cơ nội bộ BarCodeNumberManager=Manager để tự động xác định số mã vạch ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=Tài khoản mặc định để sử dụng để nhận thanh toán bằng tiền mặt CashDeskBankAccountForCheque= Tài khoản mặc định để sử dụng để nhận thanh toán bằng séc CashDeskBankAccountForCB= Tài khoản mặc định để sử dụng để nhận thanh toán bằng thẻ tín dụng -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=Thiết lập mô-đun Bookmark @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Định dạng TypePaymentDesc=0: Loại khách hàng thanh toán 1: Nhà cung cấp phương thức thanh toán, 2: Cả hai khách hàng và nhà cung cấp loại hình thanh toán IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang index 284f998d741..0c65a74d4cb 100644 --- a/htdocs/langs/vi_VN/banks.lang +++ b/htdocs/langs/vi_VN/banks.lang @@ -33,7 +33,11 @@ AllTime=Từ đầu Reconciliation=Hòa giải RIB=Số tài khoản ngân hàng IBAN=Số IBAN +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=BIC / SWIFT số +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=Đứng đơn đặt hàng StandingOrder=Lệnh chuyển tiền định Withdrawals=Tiền thu hồi @@ -148,7 +152,7 @@ BackToAccount=Trở lại vào tài khoản ShowAllAccounts=Hiển thị cho tất cả tài khoản FutureTransaction=Giao dịch trong futur. Không có cách nào để hoà giải. SelectChequeTransactionAndGenerate=Chọn / kiểm tra bộ lọc để đưa vào nhận tiền gửi kiểm tra và bấm vào "Create". -InputReceiptNumber=Chọn kê ngân hàng liên quan đến hoà giải. Sử dụng một giá trị số có thể phân loại (ví dụ như, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Cuối cùng, chỉ định một danh mục trong đó để phân loại các hồ sơ ToConciliate=Hoà giải? ThenCheckLinesAndConciliate=Sau đó, kiểm tra những dòng hiện trong báo cáo ngân hàng và nhấp diff --git a/htdocs/langs/vi_VN/commercial.lang b/htdocs/langs/vi_VN/commercial.lang index 438fc7048a3..d905b474831 100644 --- a/htdocs/langs/vi_VN/commercial.lang +++ b/htdocs/langs/vi_VN/commercial.lang @@ -62,7 +62,7 @@ LastProspectContactDone=Liên hệ với thực hiện DateActionPlanned=Ngày lên kế hoạch cho sự kiện DateActionDone=Ngày thực hiện sự kiện ActionAskedBy=Tổ chức sự kiện báo cáo của -ActionAffectedTo=Tổ chức sự kiện thuộc sở hữu của +ActionAffectedTo=Event assigned to ActionDoneBy=Sự kiện được thực hiện bởi ActionUserAsk=Báo cáo của ErrorStatusCantBeZeroIfStarted=Nếu trường 'ngày thực hiện "được làm đầy, hành động được bắt đầu (hoặc hoàn thành), do đó lĩnh vực' Trạng thái 'không thể là 0 %%. diff --git a/htdocs/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang index e5d7db9f1bb..b1434177727 100644 --- a/htdocs/langs/vi_VN/contracts.lang +++ b/htdocs/langs/vi_VN/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=Hết hạn ServiceStatusClosed=Đóng ServicesLegend=Dịch vụ truyền thuyết Contracts=Hợp đồng +ContractsAndLine=Contracts and line of contracts Contract=Hợp đồng NoContracts=Không có hợp đồng MenuServices=Dịch vụ diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang index e72c787d499..20956d32a97 100644 --- a/htdocs/langs/vi_VN/cron.lang +++ b/htdocs/langs/vi_VN/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell lệnh CronMenu=Cron CronCannotLoadClass=Không thể tải lớp% s hoặc đối tượng% s UseMenuModuleToolsToAddCronJobs=Đi vào menu "Trang chủ - module công cụ - danh sách công việc" để xem và chỉnh sửa các công việc theo lịch trình. +TaskDisabled=Task disabled diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang index ae106155037..2f1ec444337 100644 --- a/htdocs/langs/vi_VN/errors.lang +++ b/htdocs/langs/vi_VN/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Nguồn tài khoản ngân hàng và các mục t ErrorBadThirdPartyName=Bad giá trị so với tên của bên thứ ba ErrorProdIdIsMandatory=% S là bắt buộc ErrorBadCustomerCodeSyntax=Bad cú pháp cho mã khách hàng -ErrorBadBarCodeSyntax=Bad cú pháp mã vạch +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=Mã khách hàng yêu cầu ErrorBarCodeRequired=Mã vạch yêu cầu ErrorCustomerCodeAlreadyUsed=Mã số khách hàng đã sử dụng @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript không được vô hiệu hóa để l ErrorPasswordsMustMatch=Cả hai mật khẩu gõ phải phù hợp với nhau ErrorContactEMail=Một lỗi kỹ thuật xảy ra. Xin vui lòng liên hệ với quản trị viên để sau email% s en cung cấp các mã lỗi% s trong thông điệp của bạn, hoặc thậm chí tốt hơn bằng cách thêm một bản sao màn hình của trang này. ErrorWrongValueForField=Giá trị sai số cho lĩnh vực% s (giá trị '% s' không phù hợp với quy tắc regex% s) -ErrorFieldValueNotIn=Giá trị sai số cho lĩnh vực% s (giá trị '% s' không phải là một giá trị có sẵn vào lĩnh vực% s của bảng% s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=Giá trị sai số cho lĩnh vực% s (giá trị '% s' không phải là ref hiện% s) ErrorsOnXLines=Lỗi được ghi nhận nguồn% s (s) ErrorFileIsInfectedWithAVirus=Các chương trình chống virus đã không thể xác nhận các tập tin (tập tin có thể bị nhiễm bởi một loại virus) @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Thiết lập các thông số bắt buộc chưa được xác định diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang index efc226e1a58..168fcac4a45 100644 --- a/htdocs/langs/vi_VN/install.lang +++ b/htdocs/langs/vi_VN/install.lang @@ -156,6 +156,7 @@ LastStepDesc=Bước cuối cùng: Xác định đây đăng nh ActivateModule=Kích hoạt module %s ShowEditTechnicalParameters=Click vào đây để hiển thị các thông số tiên tiến / chỉnh sửa (chế độ chuyên môn) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang index 363fd296611..62ee8e2af29 100644 --- a/htdocs/langs/vi_VN/main.lang +++ b/htdocs/langs/vi_VN/main.lang @@ -141,6 +141,7 @@ Cancel=Hủy bỏ Modify=Sửa đổi Edit=Chỉnh sửa Validate=Xác nhận +ValidateAndApprove=Validate and Approve ToValidate=Để xác nhận Save=Lưu SaveAs=Save As @@ -158,6 +159,7 @@ Search=Tìm kiếm SearchOf=Tìm kiếm Valid=Hợp lệ Approve=Phê duyệt +Disapprove=Disapprove ReOpen=Re-Open Upload=Gửi tập tin ToLink=Liên kết @@ -219,6 +221,7 @@ Cards=Thẻ Card=Thẻ Now=Bây giờ Date=Ngày +DateAndHour=Date and hour DateStart=Ngày bắt đầu DateEnd=Ngày kết thúc DateCreation=Ngày tạo @@ -295,6 +298,7 @@ UnitPriceHT=Đơn giá (net) UnitPriceTTC=Đơn giá PriceU=UP PriceUHT=UP (net) +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=UP Amount=Số tiền AmountInvoice=Lượng hóa đơn @@ -521,6 +525,7 @@ DateFromTo=Từ %s đến %s DateFrom=Từ% s DateUntil=Cho đến% s Check=Kiểm tra +Uncheck=Uncheck Internal=Nội bộ External=Bên ngoài Internals=Nội bộ @@ -688,6 +693,7 @@ PublicUrl=URL công cộng AddBox=Thêm vào hộp SelectElementAndClickRefresh=Chọn một phần tử và nhấn Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=Thứ hai Tuesday=Thứ ba diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang index 735f5774e4f..16df451c547 100644 --- a/htdocs/langs/vi_VN/orders.lang +++ b/htdocs/langs/vi_VN/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=Đã bị hủy StatusOrderDraft=Nháp (cần phải được xác nhận) StatusOrderValidated=Xác nhận StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=Đã xử lý StatusOrderToBill=Đã giao hàng StatusOrderToBill2=Thanh toán @@ -58,6 +59,7 @@ MenuOrdersToBill=Đơn hàng đã giao MenuOrdersToBill2=Billable orders SearchOrder=Tìm kiếm đơn hàng SearchACustomerOrder=Tìm kiếm một đơn đặt hàng +SearchASupplierOrder=Search a supplier order ShipProduct=Ship product Discount=Giảm giá CreateOrder=Tạo đơn hàng diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang index a87e0bbfbcb..7bbe0059342 100644 --- a/htdocs/langs/vi_VN/other.lang +++ b/htdocs/langs/vi_VN/other.lang @@ -54,12 +54,13 @@ MaxSize=Kích thước tối đa AttachANewFile=Đính kèm một tập tin mới / tài liệu LinkedObject=Đối tượng liên quan Miscellaneous=Linh tinh -NbOfActiveNotifications=Số thông báo +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=Đây là một email thử nghiệm. Hai dòng được phân cách bằng một trở về vận chuyển. __SIGNATURE__ PredefinedMailTestHtml=Đây là một thư kiểm tra (kiểm tra từ phải được in đậm).
Hai dòng được phân cách bằng một trở về vận chuyển.

__SIGNATURE__ PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Chúng tôi muốn cảnh báo bạn rằng __FACREF__ hóa đơn dường như không được payed. Vì vậy, đây là hóa đơn kèm một lần nữa, như một lời nhắc nhở. __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây đề nghị thương mại __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây thứ tự __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây để chúng tôi __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__ diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/vi_VN/productbatch.lang +++ b/htdocs/langs/vi_VN/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang index ec161d09574..4278c8abe94 100644 --- a/htdocs/langs/vi_VN/products.lang +++ b/htdocs/langs/vi_VN/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang index d06e3d14f88..13576931acd 100644 --- a/htdocs/langs/vi_VN/projects.lang +++ b/htdocs/langs/vi_VN/projects.lang @@ -8,8 +8,10 @@ SharedProject=Mọi người PrivateProject=Liên lạc về dự án MyProjectsDesc=Phần xem này được giới hạn với từng dự án phụ thuộc vào phần bạn có liên hệ với (đối với bất kỳ loại dự án nào). ProjectsPublicDesc=Phần xem này hiển thị tất cả các dự án mà bạn đã theo dõi. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=Phần xem này hiển thị tất cả các dự án (quyền người dùng hiện tại của bạn được phép xem chi tiết mọi thứ). MyTasksDesc=Phần xem này bị giới hạn với các dự án hoặc tác vụ mà bạn có mối liên hệ với (bất kỳ loại dự án nào). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép theo dõi. TasksDesc=Phần xem này hiển thị tất cả các dự án và tác vụ (quyền người dùng của bạn hiện đang cho phép bạn xem tất cả thông tin). ProjectsArea=Khu vực dự án @@ -29,6 +31,8 @@ NoProject=Không có dự án nào được định lược hoặc sở hữu NbOpenTasks=Nb của tác vụ được mở NbOfProjects=Nb của dự án TimeSpent=Thời gian đã qua +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=Thời gian đã qua RefTask=Tác vụ tham chiếu LabelTask=Nhãn của tác vụ @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Danh sách các đơn đặt hàng từ nhà ListSupplierInvoicesAssociatedProject=Danh sách các hóa đơn của nhà cung cấp được gắn với dự án ListContractAssociatedProject=Danh sách các hợp đồng được gắn với dự án ListFichinterAssociatedProject=Danh sách các sự can thiệp được gắn với dự án -ListTripAssociatedProject=Danh sách các chuyến đi và chi phí công tác gắn với dự án +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=Danh sách các hoạt động được gắn với dự án ActivityOnProjectThisWeek=Các hoạt động của dự án trong tuần này ActivityOnProjectThisMonth=Các hoạt động của dự án trong tháng này @@ -133,3 +137,6 @@ SearchAProject=Tìm kiếm một dự án ProjectMustBeValidatedFirst=Dự án phải được xác nhận đầu tiên ProjectDraft=Dự thảo dự án FirstAddRessourceToAllocateTime=Kết hợp một ressource để phân bổ thời gian +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang index a709c52f7a5..0568daa4efe 100644 --- a/htdocs/langs/vi_VN/salaries.lang +++ b/htdocs/langs/vi_VN/salaries.lang @@ -10,3 +10,4 @@ SalariesPayments=Lương thanh toán ShowSalaryPayment=Hiện thanh toán tiền lương THM=Giá trung bình theo giờ TJM=Giá trung bình hàng ngày +CurrentSalary=Current salary diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang index 94e807f91b5..c6581043f86 100644 --- a/htdocs/langs/vi_VN/sendings.lang +++ b/htdocs/langs/vi_VN/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=Số lượng đặt hàng QtyShipped=Số lượng vận chuyển QtyToShip=Số lượng xuất xưởng QtyReceived=Số lượng nhận được -KeepToShip=Giữ tàu +KeepToShip=Remain to ship OtherSendingsForSameOrder=Lô hàng khác về đơn hàng này DateSending=Ngày gửi đơn đặt hàng DateSendingShort=Ngày gửi đơn đặt hàng diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang index a78e65a63b8..656a87714c5 100644 --- a/htdocs/langs/vi_VN/stocks.lang +++ b/htdocs/langs/vi_VN/stocks.lang @@ -47,6 +47,7 @@ PMPValue=Giá bình quân gia quyền PMPValueShort=WAP EnhancedValueOfWarehouses=Các kho hàng giá trị UserWarehouseAutoCreate=Tạo một kho tự động khi tạo một người sử dụng +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=Số lượng cử QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=Kho% s sẽ được sử dụng cho kho giảm WarehouseForStockIncrease=Kho% s sẽ được sử dụng cho kho tăng ForThisWarehouse=Đối với kho này ReplenishmentStatusDesc=Đây là danh sách của tất cả các sản phẩm với một tồn kho thấp hơn so với tồn kho mong muốn (hoặc thấp hơn giá trị cảnh báo nếu hộp kiểm "cảnh báo chỉ" được chọn), và đề nghị bạn để tạo ra các đơn đặt hàng nhà cung cấp để lấp đầy sự khác biệt. -ReplenishmentOrdersDesc=Đây là danh sách của tất cả các đơn đặt hàng nhà cung cấp mở +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Số lượng sản phẩm% s trong kho trước khi thời gian được lựa chọn (<% s) NbOfProductAfterPeriod=Số lượng sản phẩm% s trong kho sau khi được lựa chọn thời gian (>% s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang index 44feaea27fe..bd00d3e0e7b 100644 --- a/htdocs/langs/vi_VN/suppliers.lang +++ b/htdocs/langs/vi_VN/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=Nhà cung cấp -Supplier=Nhà cung cấp AddSupplier=Tạo một nhà cung cấp SupplierRemoved=Nhà cung cấp loại bỏ SuppliersInvoice=Nhà cung cấp hóa đơn @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Hoá đơn và các khoản thanh toán nhà cung c ExportDataset_fournisseur_3=Đơn đặt hàng nhà cung cấp và các dòng lệnh ApproveThisOrder=Chấp thuận đơn hàng này ConfirmApproveThisOrder=Bạn Bạn có chắc chắn muốn chấp nhận để% s? -DenyingThisOrder=Phủ nhận thứ tự này +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=Bạn có chắc chắn bạn muốn từ chối lệnh này% s? ConfirmCancelThisOrder=Bạn có chắc chắn bạn muốn hủy bỏ lệnh này% s? AddCustomerOrder=Tạo đơn đặt hàng diff --git a/htdocs/langs/vi_VN/trips.lang b/htdocs/langs/vi_VN/trips.lang index 98314aea027..10710992222 100644 --- a/htdocs/langs/vi_VN/trips.lang +++ b/htdocs/langs/vi_VN/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Chuyến đi -Trips=Các chuyến đi -TripsAndExpenses=Các chuyến đi và các chi phí -TripsAndExpensesStatistics=Các chuyến đi và các chi phí thống kê -TripCard=Thẻ đi -AddTrip=Thêm chuyến đi -ListOfTrips=Danh sách các chuyến đi +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=Danh sách phí -NewTrip=Chuyến đi mới +NewTrip=New expense report CompanyVisited=Công ty / cơ sở thăm Kilometers=Km FeesKilometersOrAmout=Số tiền hoặc km -DeleteTrip=Xóa đi -ConfirmDeleteTrip=Bạn Bạn có chắc chắn muốn xóa chuyến đi này? -TF_OTHER=Khác -TF_LUNCH=Ăn trưa -TF_TRIP=Chuyến đi -ListTripsAndExpenses=Danh sách các chuyến đi và các chi phí -ExpensesArea=Chi phí chuyến đi và khu vực -SearchATripAndExpense=Tìm kiếm một chuyến đi và chi phí +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Phân loại 'hoàn trả' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Khác +TF_TRANSPORTATION=Transportation +TF_LUNCH=Ăn trưa +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang index ed3f62b3a6c..150b021dcae 100644 --- a/htdocs/langs/zh_CN/admin.lang +++ b/htdocs/langs/zh_CN/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=试验性 VersionDevelopment=开发 VersionUnknown=未知 VersionRecommanded=推荐项目 +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=会话 ID SessionSaveHandler=会话保存处理程序 SessionSavePath=存储会话本地化 @@ -493,10 +498,16 @@ Module600Name=通知 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=捐赠 Module700Desc=捐款的管理 +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=Mantis Module1200Desc=Mantis 整合 Module1400Name=会计 Module1400Desc=会计管理(双方) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=分类 Module1780Desc=分类的管理(产品、供应商和客户) Module2000Name=所见即所得编辑器 @@ -631,7 +642,7 @@ Permission181=读取采购订单 Permission182=建立/修改采购订单 Permission183=确认供采购订单 Permission184=批准采购订单 -Permission185=整理采购订单 +Permission185=Order or cancel supplier orders Permission186=接收采购订单 Permission187=关闭采购订单 Permission188=取消采购订单 @@ -711,6 +722,13 @@ Permission538=导出服务 Permission701=读取捐款资讯 Permission702=建立/修改捐款资讯 Permission703=删除捐款资讯 +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=读取库存资讯 Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=使用代理服务器的密码 DefineHereComplementaryAttributes=此处定义所有默认安装中没有，但您又希望能在 %s 中使用的属性。 ExtraFields=自定义增补属性 ExtraFieldsLines=增补属性 (行列) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=增补属性 (往来单位) ExtraFieldsContacts=增补属性 (联系人/地址) ExtraFieldsMember=增补属性 (成员) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=定量为0的产品或服务项视为可选项* FreeLegalTextOnProposal=报价单中的额外说明文本 WatermarkOnDraftProposal=为商业计划书草案添加水印(如果空) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=订单管理设置 OrdersNumberingModules=订单编号模块 @@ -1383,7 +1410,7 @@ BarcodeDescUPC=通用产品条码(UPC) BarcodeDescISBN=ISBN 书籍条码 BarcodeDescC39=Code 39 条码 BarcodeDescC128=Code 128 条码 -GenbarcodeLocation=条形码生成用的命令行工具 (内部引擎用来生成某些类型的条码) +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=内部引擎 BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=接收现金付款的默认帐户 CashDeskBankAccountForCheque= 接收支票付款的默认帐户 CashDeskBankAccountForCB= 接收信用卡支付的默认帐户 -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=书签模块设置 @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=格式 TypePaymentDesc=0：客户支付类型，1：供应商支付类型，2：客户和供应商的付款方式 IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang index a5c26c5a4ac..906138fb720 100644 --- a/htdocs/langs/zh_CN/banks.lang +++ b/htdocs/langs/zh_CN/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=和解 RIB=银行帐号 IBAN=IBAN号码 +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=的BIC / SWIFT的号码 +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=常年订单 StandingOrder=长期订单 Withdrawals=提款 @@ -148,7 +152,7 @@ BackToAccount=回到帐户 ShowAllAccounts=显示所有帐户 FutureTransaction=在FUTUR的交易。调解没有办法。 SelectChequeTransactionAndGenerate=选择/过滤器检查纳入支票存款收据，并单击“创建”。 -InputReceiptNumber=选择用于调解的银行对帐单。使用排序的数值(如YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=最后，指定一个范畴对其中的记录进行分类 ToConciliate=取得谅解？ ThenCheckLinesAndConciliate=然后按一下，连线检查银行对账单。 diff --git a/htdocs/langs/zh_CN/commercial.lang b/htdocs/langs/zh_CN/commercial.lang index 13a864bb130..6a88865a84e 100644 --- a/htdocs/langs/zh_CN/commercial.lang +++ b/htdocs/langs/zh_CN/commercial.lang @@ -9,9 +9,9 @@ Prospect=展望 Prospects=前途 DeleteAction=删除一个动作/任务 NewAction=新的行动/任务 -AddAction=新增行动/任务 -AddAnAction=添加一个动作/任务 -AddActionRendezVous=添加交会任务 +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=会合 ConfirmDeleteAction=你确定要删除这个任务吗？ CardAction=行动卡 @@ -44,8 +44,8 @@ DoneActions=已完成的行动 DoneActionsFor=为%完成01-0014-03 ToDoActions=不完整的行动 ToDoActionsFor=不完全对%01-0014-03 -SendPropalRef=%s的发送商业建议 -SendOrderRef=发送命令%s的 +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=不适用 StatusActionToDo=要做到 StatusActionDone=完成 @@ -62,7 +62,7 @@ LastProspectContactDone=联系工作 DateActionPlanned=日期行动计划 DateActionDone=日期行动完成 ActionAskedBy=行动问 -ActionAffectedTo=受影响的行动 +ActionAffectedTo=Event assigned to ActionDoneBy=行动方面所做的 ActionUserAsk=记录 ErrorStatusCantBeZeroIfStarted=如果字段' 日期做 '是充满行动启动（或成品），所以外地的状态 '不能为0%%。 diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang index b5ccca60cad..6e3696d7cb2 100644 --- a/htdocs/langs/zh_CN/contracts.lang +++ b/htdocs/langs/zh_CN/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=过期 ServiceStatusClosed=关闭 ServicesLegend=服务的传说 Contracts=合同 +ContractsAndLine=Contracts and line of contracts Contract=合同 NoContracts=没有合同 MenuServices=服务 diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang index 6c5880d43a0..2cc313aad59 100644 --- a/htdocs/langs/zh_CN/cron.lang +++ b/htdocs/langs/zh_CN/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang index bae0d3f806d..e4adeba918d 100644 --- a/htdocs/langs/zh_CN/errors.lang +++ b/htdocs/langs/zh_CN/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=源和目标的银行帐户必须是不同的。 ErrorBadThirdPartyName=坏第三者名义价值 ErrorProdIdIsMandatory=%s 是强制性的 ErrorBadCustomerCodeSyntax=坏客户代码的语法 -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=客户代码需要 ErrorBarCodeRequired=需要条形码 ErrorCustomerCodeAlreadyUsed=客户代码已被使用 @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=不能禁用JavaScript必须有此功能的工作 ErrorPasswordsMustMatch=这两种类型的密码必须相互匹配 ErrorContactEMail=一个技术性错误发生。请联系管理员，以下连接提供错误代码%s在您的邮件，甚至更好，加入了这个页面的屏幕拷贝的电子邮件%s。 ErrorWrongValueForField=s'的领域的一些错误值的%s（价值'%不匹配正则表达式规则%s） -ErrorFieldValueNotIn=场数%s错误值（值'%s'是不是一个值到领域表%s %s） +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=错场数%s值（值'%s'是不是一个的%s现有文献） ErrorsOnXLines=%误差的源上线 ErrorFileIsInfectedWithAVirus=防病毒程序无法验证文件（文件可能被病毒感染） @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=强制设置参数尚未定义 diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang index fa94910fb70..9b2b50d9249 100644 --- a/htdocs/langs/zh_CN/install.lang +++ b/htdocs/langs/zh_CN/install.lang @@ -156,6 +156,7 @@ LastStepDesc=最后一步 ：此处定义的登录名和密码 ActivateModule=激活模块%s ShowEditTechnicalParameters=点击此处显示/编辑高级参数（专家模式） WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang index e46b3e779e3..ecfa96b7692 100644 --- a/htdocs/langs/zh_CN/main.lang +++ b/htdocs/langs/zh_CN/main.lang @@ -141,6 +141,7 @@ Cancel=取消 Modify=修改 Edit=编辑 Validate=验证 +ValidateAndApprove=Validate and Approve ToValidate=为了验证 Save=保存 SaveAs=另存为 @@ -158,6 +159,7 @@ Search=搜索 SearchOf=搜索 Valid=有效 Approve=批准 +Disapprove=Disapprove ReOpen=重新开放 Upload=发送文件 ToLink=Link @@ -219,6 +221,7 @@ Cards=牌 Card=卡 Now=现在 Date=日期 +DateAndHour=Date and hour DateStart=开始日期 DateEnd=结束日期 DateCreation=创建日期 @@ -295,6 +298,7 @@ UnitPriceHT=单位价格（净值） UnitPriceTTC=单价 PriceU=向上 PriceUHT=不含税价格 +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=向上 Amount=金额 AmountInvoice=发票金额 @@ -521,6 +525,7 @@ DateFromTo=从%s到%s DateFrom=第05期从% DateUntil=直到%s的 Check=支票 +Uncheck=Uncheck Internal=内部 External=外部 Internals=内部 @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=星期一 Tuesday=星期二 diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang index 280b701742f..973b5713bb8 100644 --- a/htdocs/langs/zh_CN/orders.lang +++ b/htdocs/langs/zh_CN/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=已取消 StatusOrderDraft=草案（需要验证） StatusOrderValidated=已验证 StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=已处理 StatusOrderToBill=已递送 StatusOrderToBill2=待付账 @@ -58,6 +59,7 @@ MenuOrdersToBill=已发货订单 MenuOrdersToBill2=Billable orders SearchOrder=搜索订单 SearchACustomerOrder=搜索一个客户订单 +SearchASupplierOrder=Search a supplier order ShipProduct=航运产品 Discount=折扣 CreateOrder=创建订单 diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang index 87e6584b4d6..e775c8b18fb 100644 --- a/htdocs/langs/zh_CN/other.lang +++ b/htdocs/langs/zh_CN/other.lang @@ -54,12 +54,13 @@ MaxSize=最大尺寸 AttachANewFile=附加一个新的文件/文件 LinkedObject=链接对象 Miscellaneous=杂项 -NbOfActiveNotifications=号码的通知 +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=这是一个测试邮件。\\ n该两行是由一个回车分隔。 PredefinedMailTestHtml=这是一个测试邮件（单词测试必须大胆）。
这两条线隔开，回车。 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/zh_CN/productbatch.lang +++ b/htdocs/langs/zh_CN/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang index 5ee6af20ff5..2ac2df060d9 100644 --- a/htdocs/langs/zh_CN/products.lang +++ b/htdocs/langs/zh_CN/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang index 7ce7b5665e7..b8326f1613d 100644 --- a/htdocs/langs/zh_CN/projects.lang +++ b/htdocs/langs/zh_CN/projects.lang @@ -8,8 +8,10 @@ SharedProject=每个人 PrivateProject=项目联系人 MyProjectsDesc=这种观点是有限的项目你是一个接触（不管是类型）。 ProjectsPublicDesc=这种观点提出了所有你被允许阅读的项目。 +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=这种观点提出的所有项目（你的用户权限批准你认为一切）。 MyTasksDesc=这种观点是有限的项目或任务你是一个接触（不管是类型）。 +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=这种观点提出的所有项目，您可阅读任务。 TasksDesc=这种观点提出的所有项目和任务（您的用户权限批准你认为一切）。 ProjectsArea=项目领域 @@ -29,6 +31,8 @@ NoProject=没有项目或拥有的定义 NbOpenTasks=铌打开任务 NbOfProjects=铌项目 TimeSpent=花费的时间 +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=所花费的时间 RefTask=号。任务 LabelTask=标签任务 @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=名单与项目相关的供应商的订单 ListSupplierInvoicesAssociatedProject=名单与项目相关的供应商的发票 ListContractAssociatedProject=名单与项目有关的合同 ListFichinterAssociatedProject=名单与项目相关的干预措施 -ListTripAssociatedProject=名单旅行和与项目有关的费用 +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=名单与项目有关的行动 ActivityOnProjectThisWeek=对项目活动周 ActivityOnProjectThisMonth=本月初对项目活动 @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/zh_CN/salaries.lang b/htdocs/langs/zh_CN/salaries.lang index 6e5624fd475..1aab039ba50 100644 --- a/htdocs/langs/zh_CN/salaries.lang +++ b/htdocs/langs/zh_CN/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=雇员 @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang index d498aa8ead8..2b316b2c21d 100644 --- a/htdocs/langs/zh_CN/sendings.lang +++ b/htdocs/langs/zh_CN/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=订购数量 QtyShipped=出货数量 QtyToShip=出货数量 QtyReceived=收到的数量 -KeepToShip=保持对船舶 +KeepToShip=Remain to ship OtherSendingsForSameOrder=这个命令的其他货物 DateSending=为了发送日期 DateSendingShort=为了发送日期 diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang index b9a37e83685..f78f8468b67 100644 --- a/htdocs/langs/zh_CN/stocks.lang +++ b/htdocs/langs/zh_CN/stocks.lang @@ -47,6 +47,7 @@ PMPValue=加权平均价格 PMPValueShort=的WAP EnhancedValueOfWarehouses=仓库价值 UserWarehouseAutoCreate=创建一个股票时自动创建一个用户 +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=派出数量 QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang index e03729ca861..fb95ba7355c 100644 --- a/htdocs/langs/zh_CN/suppliers.lang +++ b/htdocs/langs/zh_CN/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=供应商 -Supplier=供应商 AddSupplier=Create a supplier SupplierRemoved=供应商删除 SuppliersInvoice=供应商发票 @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=供应商发票和付款 ExportDataset_fournisseur_3=供应商的订单和订单行 ApproveThisOrder=批准这一命令 ConfirmApproveThisOrder=你确定要批准了这项命令？ -DenyingThisOrder=否认这种秩序 +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=你确定要否认这个秩序？ ConfirmCancelThisOrder=您确定要取消此订单？ AddCustomerOrder=创建客户订单 diff --git a/htdocs/langs/zh_CN/trips.lang b/htdocs/langs/zh_CN/trips.lang index 239e2d1265c..4962abe8c28 100644 --- a/htdocs/langs/zh_CN/trips.lang +++ b/htdocs/langs/zh_CN/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=旅程 -Trips=旅游 -TripsAndExpenses=旅游和费用 -TripsAndExpensesStatistics=旅行和费用统计 -TripCard=旅卡 -AddTrip=添加行程 -ListOfTrips=旅行名单 +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=费用清单 -NewTrip=新旅程 +NewTrip=New expense report CompanyVisited=公司/基础访问 Kilometers=公里 FeesKilometersOrAmout=金额或公里 -DeleteTrip=删除行 -ConfirmDeleteTrip=你确定要删除此行？ -TF_OTHER=其他 -TF_LUNCH=午餐 -TF_TRIP=旅程 -ListTripsAndExpenses=旅行和费用清单 -ExpensesArea=与贸易有关的知识产权协定“和开支面积 -SearchATripAndExpense=寻找旅行和费用 +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=其他 +TF_TRANSPORTATION=Transportation +TF_LUNCH=午餐 +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang index 7c22ab166f0..5ce0072aebb 100644 --- a/htdocs/langs/zh_TW/admin.lang +++ b/htdocs/langs/zh_TW/admin.lang @@ -8,6 +8,11 @@ VersionExperimental=實驗 VersionDevelopment=發展 VersionUnknown=未知 VersionRecommanded=推薦 +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=會話ID SessionSaveHandler=處理程序，以節省會議 SessionSavePath=本地化存儲會議 @@ -493,10 +498,16 @@ Module600Name=通知 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) Module700Name=捐贈 Module700Desc=捐款的管理 +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices Module1200Name=螂 Module1200Desc=螳螂一體化 Module1400Name=會計 Module1400Desc=會計管理（雙方） +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation Module1780Name=分類 Module1780Desc=分類的管理（產品，供應商和客戶） Module2000Name=fckeditor的 @@ -631,7 +642,7 @@ Permission181=讀取供應商訂單 Permission182=建立/修改供應商訂單 Permission183=驗證供應商訂單 Permission184=核准供應商訂單 -Permission185=整理供應商訂單 +Permission185=Order or cancel supplier orders Permission186=接收供應商訂單 Permission187=關閉供應商訂單 Permission188=取消供應商訂單 @@ -711,6 +722,13 @@ Permission538=出口服務 Permission701=閲讀捐款 Permission702=建立/修改捐款 Permission703=刪除捐款 +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports Permission1001=讀取庫存資訊 Permission1002=Create/modify warehouses Permission1003=Delete warehouses @@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=使用代理服務器的密碼 DefineHereComplementaryAttributes=請再這裡新增客制化欄位，以便讓 %s 模組可以支援顯示。 ExtraFields=新增客制化欄位 ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) ExtraFieldsThirdParties=Complementary attributes (thirdparty) ExtraFieldsContacts=Complementary attributes (contact/address) ExtraFieldsMember=Complementary attributes (member) @@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=一個產品線/服務的，是作為一個選項視 FreeLegalTextOnProposal=可在下面輸入額外的建議書資訊 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request ##### Orders ##### OrdersSetup=設定訂單管理模組 OrdersNumberingModules=訂單編號模組 @@ -1383,7 +1410,7 @@ BarcodeDescUPC=通用產品條碼(UPC) BarcodeDescISBN=書籍條碼類型 BarcodeDescC39=Code 39 條碼 BarcodeDescC128=Code 128 條碼 -GenbarcodeLocation=條碼生成命令行工具（由phpbarcode引擎用於某些類型的條形碼） +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode BarcodeInternalEngine=Internal engine BarCodeNumberManager=Manager to auto define barcode numbers ##### Prelevements ##### @@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells CashDeskBankAccountForSell=帳戶用於接收現金付款 CashDeskBankAccountForCheque= 帳戶用於接收支票付款 CashDeskBankAccountForCB= 帳戶用於接收信用卡支付現金 -CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. ##### Bookmark ##### BookmarkSetup=模組設置書籤 @@ -1569,3 +1597,7 @@ SortOrder=Sort order Format=Format TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang index 7a6b5d7355f..93639850ef2 100644 --- a/htdocs/langs/zh_TW/banks.lang +++ b/htdocs/langs/zh_TW/banks.lang @@ -33,7 +33,11 @@ AllTime=From start Reconciliation=和解 RIB=銀行帳號 IBAN=IBAN號碼 +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid BIC=的BIC / SWIFT的號碼 +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid StandingOrders=常年訂單 StandingOrder=長期訂單 Withdrawals=提款 @@ -148,7 +152,7 @@ BackToAccount=回到帳戶 ShowAllAccounts=顯示所有帳戶 FutureTransaction=在FUTUR的交易。調解沒有辦法。 SelectChequeTransactionAndGenerate=選擇/篩選器檢查納入支票存款收據，並單擊“創建”。 -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM) +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD EventualyAddCategory=Eventually, specify a category in which to classify the records ToConciliate=To conciliate? ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click diff --git a/htdocs/langs/zh_TW/commercial.lang b/htdocs/langs/zh_TW/commercial.lang index 465a6118291..bf96053a8ec 100644 --- a/htdocs/langs/zh_TW/commercial.lang +++ b/htdocs/langs/zh_TW/commercial.lang @@ -9,9 +9,9 @@ Prospect=展望 Prospects=潛在 DeleteAction=刪除一個動作/任務 NewAction=新的行動/任務 -AddAction=新增行動/任務 -AddAnAction=添加一個動作/任務 -AddActionRendezVous=添加交會任務 +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event Rendez-Vous=會合 ConfirmDeleteAction=你確定要刪除這個任務嗎？ CardAction=行動卡 @@ -44,8 +44,8 @@ DoneActions=已完成的行動 DoneActionsFor=為%s完成01-0014-03 ToDoActions=不完整的行動 ToDoActionsFor=不完全對%01-0014-03 -SendPropalRef=%s的發送商業建議 -SendOrderRef=發送訂單 %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s StatusNotApplicable=不適用 StatusActionToDo=要做到 StatusActionDone=完成 @@ -62,7 +62,7 @@ LastProspectContactDone=聯絡完成 DateActionPlanned=日期行動計劃 DateActionDone=日期行動完成 ActionAskedBy=行動問 -ActionAffectedTo=受影響的行動 +ActionAffectedTo=Event assigned to ActionDoneBy=行動方面所做的 ActionUserAsk=記錄 ErrorStatusCantBeZeroIfStarted=如果字段' 日期做 '是充滿行動啟動（或成品），所以外地的狀態 '不能為0%%。 diff --git a/htdocs/langs/zh_TW/contracts.lang b/htdocs/langs/zh_TW/contracts.lang index d513a4f4b35..63b5742cf83 100644 --- a/htdocs/langs/zh_TW/contracts.lang +++ b/htdocs/langs/zh_TW/contracts.lang @@ -19,6 +19,7 @@ ServiceStatusLateShort=過期 ServiceStatusClosed=關閉 ServicesLegend=服務的傳說 Contracts=合同 +ContractsAndLine=Contracts and line of contracts Contract=合同 NoContracts=沒有合同 MenuServices=服務 diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang index c8e534528f5..a2b5296ad01 100644 --- a/htdocs/langs/zh_TW/cron.lang +++ b/htdocs/langs/zh_TW/cron.lang @@ -84,3 +84,4 @@ CronType_command=Shell command CronMenu=Cron CronCannotLoadClass=Cannot load class %s or object %s UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang index 2f8a6e35c64..4245e06fb04 100644 --- a/htdocs/langs/zh_TW/errors.lang +++ b/htdocs/langs/zh_TW/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=源和目標的銀行帳戶必須是不同的。 ErrorBadThirdPartyName=錯誤的客戶/供應商名稱 ErrorProdIdIsMandatory=The %s is mandatory ErrorBadCustomerCodeSyntax=壞客戶代碼的語法 -ErrorBadBarCodeSyntax=Bad syntax for bar code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. ErrorCustomerCodeRequired=客戶代碼需要 ErrorBarCodeRequired=Bar code required ErrorCustomerCodeAlreadyUsed=客戶代碼已被使用 @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=不能禁用JavaScript必須有此功能的工作 ErrorPasswordsMustMatch=這兩種類型的密碼必須相互匹配 ErrorContactEMail=一個技術性錯誤發生。請聯系管理員，以下連接提供錯誤代碼%s在您的郵件，甚至更好，加入了這個頁面的屏幕拷貝的電子郵件%s。 ErrorWrongValueForField=s'的領域的一些錯誤值的%s（價值'%不匹配正則表達式規則%s） -ErrorFieldValueNotIn=場數%s錯誤值（值'%s'是不是一個值到領域表%s %s） +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) ErrorFieldRefNotIn=錯場數%s值（值'%s'是不是一個的%s現有文獻） ErrorsOnXLines=%誤差的源上線 ErrorFileIsInfectedWithAVirus=防病毒程序無法驗證文件（文件可能被病毒感染） @@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang index 51a93e88a66..0d8db02acc2 100644 --- a/htdocs/langs/zh_TW/install.lang +++ b/htdocs/langs/zh_TW/install.lang @@ -156,6 +156,7 @@ LastStepDesc=最後一步 ：此處定義的登錄名和密碼 ActivateModule=激活模塊%s ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) ######### # upgrade diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang index dcc25276db5..825700c91da 100644 --- a/htdocs/langs/zh_TW/main.lang +++ b/htdocs/langs/zh_TW/main.lang @@ -141,6 +141,7 @@ Cancel=取消 Modify=修改 Edit=編輯 Validate=驗證 +ValidateAndApprove=Validate and Approve ToValidate=為了驗證 Save=儲存 SaveAs=另存為 @@ -158,6 +159,7 @@ Search=搜尋 SearchOf=搜尋 Valid=有效 Approve=批準 +Disapprove=Disapprove ReOpen=重新開放 Upload=發送文件 ToLink=Link @@ -219,6 +221,7 @@ Cards=資訊卡 Card=資訊卡 Now=現在 Date=日期 +DateAndHour=Date and hour DateStart=開始日期 DateEnd=結束日期 DateCreation=建立日期 @@ -295,6 +298,7 @@ UnitPriceHT=單位價格（凈值） UnitPriceTTC=單價 PriceU=向上 PriceUHT=不含稅價格 +AskPriceSupplierUHT=P.U. HT Requested PriceUTTC=向上 Amount=總額 AmountInvoice=發票金額 @@ -521,6 +525,7 @@ DateFromTo=從%s到%s DateFrom=第05期從%s DateUntil=直到%s的 Check=支票 +Uncheck=Uncheck Internal=內部 External=非內部 Internals=內部 @@ -688,6 +693,7 @@ PublicUrl=Public URL AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s +ShowTransaction=Show transaction # Week day Monday=星期一 Tuesday=星期二 diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang index 105a3209321..acf0e5c9696 100644 --- a/htdocs/langs/zh_TW/orders.lang +++ b/htdocs/langs/zh_TW/orders.lang @@ -42,6 +42,7 @@ StatusOrderCanceled=取消 StatusOrderDraft=草案（等待驗證） StatusOrderValidated=驗證階段 StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation StatusOrderProcessed=處理完畢 StatusOrderToBill=等待帳單 StatusOrderToBill2=為了法案 @@ -58,6 +59,7 @@ MenuOrdersToBill=訂單To帳單 MenuOrdersToBill2=Billable orders SearchOrder=搜尋訂單 SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order ShipProduct=船舶產品 Discount=折扣 CreateOrder=創建訂單 diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang index 227494058af..49b687412d6 100644 --- a/htdocs/langs/zh_TW/other.lang +++ b/htdocs/langs/zh_TW/other.lang @@ -54,12 +54,13 @@ MaxSize=檔案最大 AttachANewFile=附加一個新的檔案/文件 LinkedObject=鏈接對象 Miscellaneous=雜項 -NbOfActiveNotifications=號碼的通知 +NbOfActiveNotifications=Number of notifications (nb of recipient emails) PredefinedMailTest=這是一個測試郵件。\\ n該兩行是由一個回車分隔。 PredefinedMailTestHtml=這是一個測試郵件（單詞測試必須大膽）。
這兩條線隔開，回車。 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang index 864782023a0..45263681965 100644 --- a/htdocs/langs/zh_TW/productbatch.lang +++ b/htdocs/langs/zh_TW/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Batch/Serial number l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details -DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d) +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) printBatch=Batch: %s printEatby=Eat-by: %s printSellby=Sell-by: %s diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang index e18d6416532..60d05dae9f0 100644 --- a/htdocs/langs/zh_TW/products.lang +++ b/htdocs/langs/zh_TW/products.lang @@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# PriceMode=Price mode PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang index 2970d7c4481..4c29cb68aad 100644 --- a/htdocs/langs/zh_TW/projects.lang +++ b/htdocs/langs/zh_TW/projects.lang @@ -8,8 +8,10 @@ SharedProject=每個人 PrivateProject=項目聯系人 MyProjectsDesc=這種觀點是有限的項目你是一個接觸（不管是類型）。 ProjectsPublicDesc=這種觀點提出了所有你被允許閱讀的項目。 +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. ProjectsDesc=這種觀點提出的所有項目（你的用戶權限批準你認為一切）。 MyTasksDesc=這種觀點是有限的項目或任務你是一個接觸（不管是類型）。 +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=這種觀點提出的所有項目，您可閱讀任務。 TasksDesc=這種觀點提出的所有項目和任務（您的用戶權限批準你認為一切）。 ProjectsArea=項目領域 @@ -29,6 +31,8 @@ NoProject=沒有項目或擁有的定義 NbOpenTasks=鈮打開任務 NbOfProjects=鈮項目 TimeSpent=花費的時間 +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user TimesSpent=所花費的時間 RefTask=任務編號 LabelTask=標簽任務 @@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=名單與項目相關的供應商的訂單 ListSupplierInvoicesAssociatedProject=名單與項目相關的供應商的發票 ListContractAssociatedProject=名單與項目有關的合同 ListFichinterAssociatedProject=名單與項目相關的幹預措施 -ListTripAssociatedProject=名單旅行和與項目有關的費用 +ListExpenseReportsAssociatedProject=List of expense reports associated with the project ListActionsAssociatedProject=名單與項目有關的行動 ActivityOnProjectThisWeek=對項目活動周 ActivityOnProjectThisMonth=本月初對項目活動 @@ -133,3 +137,6 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang index edca71a1829..28c21adfad3 100644 --- a/htdocs/langs/zh_TW/salaries.lang +++ b/htdocs/langs/zh_TW/salaries.lang @@ -1,4 +1,6 @@ # Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge Salary=Salary Salaries=Salaries Employee=Employee @@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment SalaryPayment=Salary payment SalariesPayments=Salaries payments ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang index 8cd48f0d71f..55380896853 100644 --- a/htdocs/langs/zh_TW/sendings.lang +++ b/htdocs/langs/zh_TW/sendings.lang @@ -23,7 +23,7 @@ QtyOrdered=訂購數量 QtyShipped=出貨數量 QtyToShip=出貨數量 QtyReceived=收到的數量 -KeepToShip=持續出貨 +KeepToShip=Remain to ship OtherSendingsForSameOrder=此訂單的其他出貨清單 DateSending=出貨日期 DateSendingShort=出貨日期 diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang index a0973e97c5b..9c1b117b91e 100644 --- a/htdocs/langs/zh_TW/stocks.lang +++ b/htdocs/langs/zh_TW/stocks.lang @@ -47,6 +47,7 @@ PMPValue=加權平均價格 PMPValueShort=的WAP EnhancedValueOfWarehouses=倉庫價值 UserWarehouseAutoCreate=當建立一個用戶時，自動建立一個倉庫 +IndependantSubProductStock=Product stock and subproduct stock are independant QtyDispatched=派出數量 QtyDispatchedShort=Qty dispatched QtyToDispatchShort=Qty to dispatch @@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas WarehouseForStockIncrease=The warehouse %s will be used for stock increase ForThisWarehouse=For this warehouse ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. -ReplenishmentOrdersDesc=This is list of all opened supplier orders +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. Replenishments=Replenishments NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) @@ -130,3 +131,4 @@ IsInPackage=Contained into package ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang index 8ad3d74c0b0..b7f31a8d40a 100644 --- a/htdocs/langs/zh_TW/suppliers.lang +++ b/htdocs/langs/zh_TW/suppliers.lang @@ -1,6 +1,5 @@ # Dolibarr language file - Source file is en_US - suppliers Suppliers=供應商 -Supplier=供應商 AddSupplier=Create a supplier SupplierRemoved=供應商刪除 SuppliersInvoice=供應商的發票 @@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=供應商發票和付款 ExportDataset_fournisseur_3=Supplier orders and order lines ApproveThisOrder=批準這個訂單 ConfirmApproveThisOrder=你確定要批準這個訂單？ -DenyingThisOrder=否認這個訂單 +DenyingThisOrder=Deny this order ConfirmDenyingThisOrder=你確定要否認這個訂單？ ConfirmCancelThisOrder=您確定要取消此訂單？ AddCustomerOrder=創建客戶訂單 diff --git a/htdocs/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang index 4d4375cbb3e..fc99f600d25 100644 --- a/htdocs/langs/zh_TW/trips.lang +++ b/htdocs/langs/zh_TW/trips.lang @@ -1,22 +1,126 @@ # Dolibarr language file - Source file is en_US - trips -Trip=旅程 -Trips=旅遊 -TripsAndExpenses=旅遊和費用 -TripsAndExpensesStatistics=旅行和費用統計 -TripCard=旅卡 -AddTrip=添加行程 -ListOfTrips=旅行名單 +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report ListOfFees=費用清單 -NewTrip=新旅程 +NewTrip=New expense report CompanyVisited=公司/基礎訪問 Kilometers=公裏 FeesKilometersOrAmout=金額或公裏 -DeleteTrip=刪除行 -ConfirmDeleteTrip=你確定要刪除此行？ -TF_OTHER=其他 -TF_LUNCH=午餐 -TF_TRIP=旅程 -ListTripsAndExpenses=旅行和費用清單 -ExpensesArea=與貿易有關的知識產權協定“和開支面積 -SearchATripAndExpense=尋找旅行和費用 +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=其他 +TF_TRANSPORTATION=Transportation +TF_LUNCH=午餐 +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. From 971f9b0c30bbd01a79a15da9adf81036f8a070dd Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Fri, 13 Mar 2015 22:08:24 +0100 Subject: [PATCH 068/412] Fix: Migration script --- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 73ace187708..b7475d88f91 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -368,5 +368,5 @@ INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DAP', 'Delivered At INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DDP', 'Delivered Duty Paid, marchandises (non déchargées) livrées à destination finale, dédouanement import et taxes à la charge du vendeur ; l''acheteur prend en charge uniquement le déchargement (si exclusion des taxes type TVA, le préciser clairement)', 1); -- Extrafields fk_object must be unique (1-1 relation) -ALTER TABLE llx_societe_extrafields DROP INDEX idx_societe_extrafields +ALTER TABLE llx_societe_extrafields DROP INDEX idx_societe_extrafields; ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_object); From 7a877e9cfbdad0be652145e1fe27b35b180d897c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2015 00:51:12 +0100 Subject: [PATCH 069/412] Restore correct keys --- htdocs/langs/pl_PL/main.lang | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index edc327913a3..4cc0afc76c2 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -8,12 +8,12 @@ FONTFORPDF=DejaVuSans FONTSIZEFORPDF=10 SeparatorDecimal=, SeparatorThousand=Space -FormatDateShort=%d-%m-%r -FormatDateShortInput=%d-%m-%r -FormatDateShortJava=dd-MM-rrrr -FormatDateShortJavaInput=dd-MM-rrrr -FormatDateShortJQuery=dd-mm-rr -FormatDateShortJQueryInput=dd-mm-rr +FormatDateShort=%d-%m-%Y +FormatDateShortInput=%d-%m-%Y +FormatDateShortJava=dd-MM-yyyy +FormatDateShortJavaInput=dd-MM-yyyy +FormatDateShortJQuery=dd-mm-yy +FormatDateShortJQueryInput=dd-mm-yy FormatHourShortJQuery=HH:MM FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M From 0ef2369399ac31584c44c23ea8d89341af580bcb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2015 02:37:18 +0100 Subject: [PATCH 070/412] Enhance tools to make transifex sync --- .tx/config | 2 +- dev/fixaltlanguages.sh | 12 +- dev/translation/strip_language_file.php | 75 +- dev/translation/txpull.sh | 20 +- htdocs/langs/de_AT/admin.lang | 5 - htdocs/langs/de_AT/bills.lang | 1 - htdocs/langs/de_AT/companies.lang | 15 - htdocs/langs/de_AT/dict.lang | 17 - htdocs/langs/de_AT/donations.lang | 1 - htdocs/langs/de_AT/ftp.lang | 1 - htdocs/langs/de_AT/main.lang | 1 - htdocs/langs/de_AT/other.lang | 1 - htdocs/langs/de_AT/products.lang | 3 - htdocs/langs/de_AT/propal.lang | 2 - htdocs/langs/de_CH/companies.lang | 1 - htdocs/langs/{nl_BE => en_GB}/commercial.lang | 1 + htdocs/langs/en_GB/cron.lang | 3 + htdocs/langs/en_GB/exports.lang | 1 - htdocs/langs/en_GB/orders.lang | 3 + htdocs/langs/en_GB/suppliers.lang | 2 + htdocs/langs/en_GB/trips.lang | 14 + htdocs/langs/en_US/productbatch.lang | 12 +- htdocs/langs/en_ZA/companies.lang | 1 - htdocs/langs/en_ZA/compta.lang | 1 - htdocs/langs/es_AR/cron.lang | 3 + htdocs/langs/es_AR/main.lang | 21 + htdocs/langs/es_AR/orders.lang | 3 + htdocs/langs/es_AR/trips.lang | 13 + htdocs/langs/es_CO/admin.lang | 5 + htdocs/langs/es_CO/bills.lang | 2 + htdocs/langs/es_CO/companies.lang | 29 + htdocs/langs/es_CO/cron.lang | 3 + htdocs/langs/es_CO/main.lang | 21 + htdocs/langs/es_CO/orders.lang | 3 + htdocs/langs/es_CO/trips.lang | 13 + htdocs/langs/es_ES/trips.lang | 26 +- htdocs/langs/fr_FR/admin.lang | 12 +- htdocs/langs/fr_FR/banks.lang | 10 +- htdocs/langs/fr_FR/commercial.lang | 2 +- htdocs/langs/fr_FR/contracts.lang | 2 +- htdocs/langs/fr_FR/cron.lang | 2 +- htdocs/langs/fr_FR/errors.lang | 2 +- htdocs/langs/fr_FR/trips.lang | 52 +- htdocs/langs/kn_IN/accountancy.lang | 160 ++ htdocs/langs/kn_IN/admin.lang | 1603 +++++++++++++++++ htdocs/langs/kn_IN/agenda.lang | 93 + htdocs/langs/kn_IN/banks.lang | 165 ++ htdocs/langs/kn_IN/bills.lang | 430 +++++ htdocs/langs/kn_IN/bookmarks.lang | 19 + htdocs/langs/kn_IN/boxes.lang | 96 + htdocs/langs/kn_IN/cashdesk.lang | 40 + htdocs/langs/kn_IN/categories.lang | 112 ++ htdocs/langs/kn_IN/commercial.lang | 96 + htdocs/langs/kn_IN/companies.lang | 414 +++++ htdocs/langs/kn_IN/compta.lang | 207 +++ htdocs/langs/kn_IN/contracts.lang | 103 ++ htdocs/langs/kn_IN/cron.lang | 87 + htdocs/langs/kn_IN/deliveries.lang | 28 + htdocs/langs/kn_IN/dict.lang | 327 ++++ htdocs/langs/kn_IN/donations.lang | 38 + htdocs/langs/kn_IN/ecm.lang | 57 + htdocs/langs/kn_IN/errors.lang | 183 ++ htdocs/langs/kn_IN/exports.lang | 134 ++ htdocs/langs/kn_IN/externalsite.lang | 5 + htdocs/langs/kn_IN/ftp.lang | 12 + htdocs/langs/kn_IN/help.lang | 28 + htdocs/langs/kn_IN/holiday.lang | 148 ++ htdocs/langs/kn_IN/install.lang | 214 +++ htdocs/langs/kn_IN/interventions.lang | 53 + htdocs/langs/kn_IN/languages.lang | 72 + htdocs/langs/kn_IN/ldap.lang | 29 + htdocs/langs/{pt_BR => kn_IN}/link.lang | 5 +- htdocs/langs/kn_IN/mailmanspip.lang | 27 + htdocs/langs/kn_IN/mails.lang | 141 ++ htdocs/langs/kn_IN/main.lang | 725 ++++++++ htdocs/langs/kn_IN/margins.lang | 45 + htdocs/langs/kn_IN/members.lang | 206 +++ htdocs/langs/kn_IN/opensurvey.lang | 66 + htdocs/langs/kn_IN/orders.lang | 166 ++ htdocs/langs/kn_IN/other.lang | 238 +++ htdocs/langs/kn_IN/paybox.lang | 40 + htdocs/langs/kn_IN/paypal.lang | 25 + htdocs/langs/kn_IN/printipp.lang | 14 + htdocs/langs/kn_IN/productbatch.lang | 21 + htdocs/langs/kn_IN/products.lang | 256 +++ htdocs/langs/kn_IN/projects.lang | 142 ++ htdocs/langs/kn_IN/propal.lang | 100 + htdocs/langs/kn_IN/resource.lang | 34 + htdocs/langs/kn_IN/salaries.lang | 13 + htdocs/langs/kn_IN/sendings.lang | 85 + htdocs/langs/kn_IN/sms.lang | 53 + htdocs/langs/kn_IN/stocks.lang | 134 ++ htdocs/langs/kn_IN/suppliers.lang | 45 + htdocs/langs/kn_IN/trips.lang | 126 ++ htdocs/langs/kn_IN/users.lang | 122 ++ htdocs/langs/kn_IN/withdrawals.lang | 97 + htdocs/langs/kn_IN/workflow.lang | 11 + htdocs/langs/lo_LA/accountancy.lang | 160 ++ htdocs/langs/lo_LA/admin.lang | 1603 +++++++++++++++++ htdocs/langs/lo_LA/agenda.lang | 93 + htdocs/langs/lo_LA/banks.lang | 165 ++ htdocs/langs/lo_LA/bills.lang | 430 +++++ htdocs/langs/lo_LA/bookmarks.lang | 19 + htdocs/langs/lo_LA/boxes.lang | 96 + htdocs/langs/lo_LA/cashdesk.lang | 40 + htdocs/langs/lo_LA/categories.lang | 112 ++ htdocs/langs/lo_LA/commercial.lang | 96 + htdocs/langs/lo_LA/companies.lang | 414 +++++ htdocs/langs/lo_LA/compta.lang | 207 +++ htdocs/langs/lo_LA/contracts.lang | 103 ++ htdocs/langs/lo_LA/cron.lang | 87 + htdocs/langs/lo_LA/deliveries.lang | 28 + htdocs/langs/lo_LA/dict.lang | 327 ++++ htdocs/langs/lo_LA/donations.lang | 38 + htdocs/langs/lo_LA/ecm.lang | 57 + htdocs/langs/lo_LA/errors.lang | 183 ++ htdocs/langs/lo_LA/exports.lang | 134 ++ htdocs/langs/lo_LA/externalsite.lang | 5 + htdocs/langs/lo_LA/ftp.lang | 12 + htdocs/langs/lo_LA/help.lang | 28 + htdocs/langs/lo_LA/holiday.lang | 148 ++ htdocs/langs/lo_LA/install.lang | 214 +++ htdocs/langs/lo_LA/interventions.lang | 53 + htdocs/langs/lo_LA/languages.lang | 72 + htdocs/langs/lo_LA/ldap.lang | 29 + htdocs/langs/lo_LA/link.lang | 8 + htdocs/langs/lo_LA/mailmanspip.lang | 27 + htdocs/langs/lo_LA/mails.lang | 141 ++ htdocs/langs/lo_LA/main.lang | 725 ++++++++ htdocs/langs/lo_LA/margins.lang | 45 + htdocs/langs/lo_LA/members.lang | 206 +++ htdocs/langs/lo_LA/opensurvey.lang | 66 + htdocs/langs/lo_LA/orders.lang | 166 ++ htdocs/langs/lo_LA/other.lang | 238 +++ htdocs/langs/lo_LA/paybox.lang | 40 + htdocs/langs/lo_LA/paypal.lang | 25 + htdocs/langs/lo_LA/printipp.lang | 14 + htdocs/langs/lo_LA/productbatch.lang | 21 + htdocs/langs/lo_LA/products.lang | 256 +++ htdocs/langs/lo_LA/projects.lang | 142 ++ htdocs/langs/lo_LA/propal.lang | 100 + htdocs/langs/lo_LA/resource.lang | 34 + htdocs/langs/lo_LA/salaries.lang | 13 + htdocs/langs/lo_LA/sendings.lang | 85 + htdocs/langs/lo_LA/sms.lang | 53 + htdocs/langs/lo_LA/stocks.lang | 134 ++ htdocs/langs/lo_LA/suppliers.lang | 45 + htdocs/langs/lo_LA/trips.lang | 126 ++ htdocs/langs/lo_LA/users.lang | 122 ++ htdocs/langs/lo_LA/withdrawals.lang | 97 + htdocs/langs/lo_LA/workflow.lang | 11 + htdocs/langs/nl_BE/banks.lang | 2 - htdocs/langs/nl_BE/bills.lang | 6 - htdocs/langs/nl_BE/boxes.lang | 1 - htdocs/langs/nl_BE/companies.lang | 1 - htdocs/langs/nl_BE/compta.lang | 2 - htdocs/langs/nl_BE/dict.lang | 4 - htdocs/langs/nl_BE/ecm.lang | 1 - htdocs/langs/nl_BE/errors.lang | 7 - htdocs/langs/nl_BE/exports.lang | 6 - htdocs/langs/nl_BE/ftp.lang | 1 - htdocs/langs/nl_BE/help.lang | 1 - htdocs/langs/nl_BE/install.lang | 6 - htdocs/langs/nl_BE/languages.lang | 1 - htdocs/langs/nl_BE/mails.lang | 1 - htdocs/langs/nl_BE/main.lang | 21 - htdocs/langs/nl_BE/orders.lang | 1 - htdocs/langs/nl_BE/other.lang | 3 - htdocs/langs/nl_BE/paybox.lang | 1 - htdocs/langs/nl_BE/products.lang | 5 - htdocs/langs/pl_PL/main.lang | 2 +- htdocs/langs/pt_BR/accountancy.lang | 78 - htdocs/langs/pt_BR/admin.lang | 8 - htdocs/langs/pt_BR/companies.lang | 19 - htdocs/langs/pt_BR/holiday.lang | 42 - htdocs/langs/pt_BR/install.lang | 2 - htdocs/langs/pt_BR/languages.lang | 1 - htdocs/langs/pt_BR/main.lang | 13 - htdocs/langs/pt_BR/members.lang | 1 - htdocs/langs/pt_BR/orders.lang | 2 - htdocs/langs/pt_BR/other.lang | 3 - htdocs/langs/pt_BR/printipp.lang | 10 + htdocs/langs/pt_BR/productbatch.lang | 3 + htdocs/langs/pt_PT/orders.lang | 2 +- htdocs/langs/ru_UA/banks.lang | 1 - htdocs/langs/ru_UA/cron.lang | 1 - htdocs/langs/ru_UA/holiday.lang | 1 - htdocs/langs/ru_UA/mailmanspip.lang | 1 - htdocs/langs/ru_UA/margins.lang | 1 - htdocs/langs/ru_UA/opensurvey.lang | 1 - htdocs/langs/ru_UA/users.lang | 1 - htdocs/langs/sw_SW/accountancy.lang | 160 ++ htdocs/langs/sw_SW/admin.lang | 1603 +++++++++++++++++ htdocs/langs/sw_SW/agenda.lang | 93 + htdocs/langs/sw_SW/banks.lang | 165 ++ htdocs/langs/sw_SW/bills.lang | 430 +++++ htdocs/langs/sw_SW/bookmarks.lang | 19 + htdocs/langs/sw_SW/boxes.lang | 96 + htdocs/langs/sw_SW/cashdesk.lang | 40 + htdocs/langs/sw_SW/categories.lang | 112 ++ htdocs/langs/sw_SW/commercial.lang | 96 + htdocs/langs/sw_SW/companies.lang | 414 +++++ htdocs/langs/sw_SW/compta.lang | 207 +++ htdocs/langs/sw_SW/contracts.lang | 103 ++ htdocs/langs/sw_SW/cron.lang | 87 + htdocs/langs/sw_SW/deliveries.lang | 28 + htdocs/langs/sw_SW/dict.lang | 327 ++++ htdocs/langs/sw_SW/donations.lang | 38 + htdocs/langs/sw_SW/ecm.lang | 57 + htdocs/langs/sw_SW/errors.lang | 183 ++ htdocs/langs/sw_SW/exports.lang | 134 ++ htdocs/langs/sw_SW/externalsite.lang | 5 + htdocs/langs/sw_SW/ftp.lang | 12 + htdocs/langs/sw_SW/help.lang | 28 + htdocs/langs/sw_SW/holiday.lang | 148 ++ htdocs/langs/sw_SW/install.lang | 214 +++ htdocs/langs/sw_SW/interventions.lang | 53 + htdocs/langs/sw_SW/languages.lang | 72 + htdocs/langs/sw_SW/ldap.lang | 29 + htdocs/langs/sw_SW/link.lang | 8 + htdocs/langs/sw_SW/mailmanspip.lang | 27 + htdocs/langs/sw_SW/mails.lang | 141 ++ htdocs/langs/sw_SW/main.lang | 725 ++++++++ htdocs/langs/sw_SW/margins.lang | 45 + htdocs/langs/sw_SW/members.lang | 206 +++ htdocs/langs/sw_SW/opensurvey.lang | 66 + htdocs/langs/sw_SW/orders.lang | 166 ++ htdocs/langs/sw_SW/other.lang | 238 +++ htdocs/langs/sw_SW/paybox.lang | 40 + htdocs/langs/sw_SW/paypal.lang | 25 + htdocs/langs/sw_SW/printipp.lang | 14 + htdocs/langs/sw_SW/productbatch.lang | 21 + htdocs/langs/sw_SW/products.lang | 256 +++ htdocs/langs/sw_SW/projects.lang | 142 ++ htdocs/langs/sw_SW/propal.lang | 100 + htdocs/langs/sw_SW/resource.lang | 34 + htdocs/langs/sw_SW/salaries.lang | 13 + htdocs/langs/sw_SW/sendings.lang | 85 + htdocs/langs/sw_SW/sms.lang | 53 + htdocs/langs/sw_SW/stocks.lang | 134 ++ htdocs/langs/sw_SW/suppliers.lang | 45 + htdocs/langs/sw_SW/trips.lang | 126 ++ htdocs/langs/sw_SW/users.lang | 122 ++ htdocs/langs/sw_SW/withdrawals.lang | 97 + htdocs/langs/sw_SW/workflow.lang | 11 + htdocs/langs/uz_UZ/accountancy.lang | 160 ++ htdocs/langs/uz_UZ/link.lang | 8 + htdocs/langs/uz_UZ/printipp.lang | 14 + htdocs/langs/uz_UZ/productbatch.lang | 21 + htdocs/langs/uz_UZ/resource.lang | 34 + htdocs/langs/uz_UZ/salaries.lang | 13 + 251 files changed, 24237 insertions(+), 372 deletions(-) delete mode 100644 htdocs/langs/de_AT/donations.lang delete mode 100644 htdocs/langs/de_AT/ftp.lang delete mode 100644 htdocs/langs/de_CH/companies.lang rename htdocs/langs/{nl_BE => en_GB}/commercial.lang (63%) create mode 100644 htdocs/langs/en_GB/cron.lang delete mode 100644 htdocs/langs/en_GB/exports.lang create mode 100644 htdocs/langs/en_GB/orders.lang create mode 100644 htdocs/langs/en_GB/suppliers.lang create mode 100644 htdocs/langs/en_GB/trips.lang delete mode 100644 htdocs/langs/en_ZA/companies.lang delete mode 100644 htdocs/langs/en_ZA/compta.lang create mode 100644 htdocs/langs/es_AR/cron.lang create mode 100644 htdocs/langs/es_AR/main.lang create mode 100644 htdocs/langs/es_AR/orders.lang create mode 100644 htdocs/langs/es_AR/trips.lang create mode 100644 htdocs/langs/es_CO/admin.lang create mode 100644 htdocs/langs/es_CO/bills.lang create mode 100644 htdocs/langs/es_CO/companies.lang create mode 100644 htdocs/langs/es_CO/cron.lang create mode 100644 htdocs/langs/es_CO/main.lang create mode 100644 htdocs/langs/es_CO/orders.lang create mode 100644 htdocs/langs/es_CO/trips.lang create mode 100644 htdocs/langs/kn_IN/accountancy.lang create mode 100644 htdocs/langs/kn_IN/admin.lang create mode 100644 htdocs/langs/kn_IN/agenda.lang create mode 100644 htdocs/langs/kn_IN/banks.lang create mode 100644 htdocs/langs/kn_IN/bills.lang create mode 100644 htdocs/langs/kn_IN/bookmarks.lang create mode 100644 htdocs/langs/kn_IN/boxes.lang create mode 100644 htdocs/langs/kn_IN/cashdesk.lang create mode 100644 htdocs/langs/kn_IN/categories.lang create mode 100644 htdocs/langs/kn_IN/commercial.lang create mode 100644 htdocs/langs/kn_IN/companies.lang create mode 100644 htdocs/langs/kn_IN/compta.lang create mode 100644 htdocs/langs/kn_IN/contracts.lang create mode 100644 htdocs/langs/kn_IN/cron.lang create mode 100644 htdocs/langs/kn_IN/deliveries.lang create mode 100644 htdocs/langs/kn_IN/dict.lang create mode 100644 htdocs/langs/kn_IN/donations.lang create mode 100644 htdocs/langs/kn_IN/ecm.lang create mode 100644 htdocs/langs/kn_IN/errors.lang create mode 100644 htdocs/langs/kn_IN/exports.lang create mode 100644 htdocs/langs/kn_IN/externalsite.lang create mode 100644 htdocs/langs/kn_IN/ftp.lang create mode 100644 htdocs/langs/kn_IN/help.lang create mode 100644 htdocs/langs/kn_IN/holiday.lang create mode 100644 htdocs/langs/kn_IN/install.lang create mode 100644 htdocs/langs/kn_IN/interventions.lang create mode 100644 htdocs/langs/kn_IN/languages.lang create mode 100644 htdocs/langs/kn_IN/ldap.lang rename htdocs/langs/{pt_BR => kn_IN}/link.lang (59%) create mode 100644 htdocs/langs/kn_IN/mailmanspip.lang create mode 100644 htdocs/langs/kn_IN/mails.lang create mode 100644 htdocs/langs/kn_IN/main.lang create mode 100644 htdocs/langs/kn_IN/margins.lang create mode 100644 htdocs/langs/kn_IN/members.lang create mode 100644 htdocs/langs/kn_IN/opensurvey.lang create mode 100644 htdocs/langs/kn_IN/orders.lang create mode 100644 htdocs/langs/kn_IN/other.lang create mode 100644 htdocs/langs/kn_IN/paybox.lang create mode 100644 htdocs/langs/kn_IN/paypal.lang create mode 100644 htdocs/langs/kn_IN/printipp.lang create mode 100644 htdocs/langs/kn_IN/productbatch.lang create mode 100644 htdocs/langs/kn_IN/products.lang create mode 100644 htdocs/langs/kn_IN/projects.lang create mode 100644 htdocs/langs/kn_IN/propal.lang create mode 100644 htdocs/langs/kn_IN/resource.lang create mode 100644 htdocs/langs/kn_IN/salaries.lang create mode 100644 htdocs/langs/kn_IN/sendings.lang create mode 100644 htdocs/langs/kn_IN/sms.lang create mode 100644 htdocs/langs/kn_IN/stocks.lang create mode 100644 htdocs/langs/kn_IN/suppliers.lang create mode 100644 htdocs/langs/kn_IN/trips.lang create mode 100644 htdocs/langs/kn_IN/users.lang create mode 100644 htdocs/langs/kn_IN/withdrawals.lang create mode 100644 htdocs/langs/kn_IN/workflow.lang create mode 100644 htdocs/langs/lo_LA/accountancy.lang create mode 100644 htdocs/langs/lo_LA/admin.lang create mode 100644 htdocs/langs/lo_LA/agenda.lang create mode 100644 htdocs/langs/lo_LA/banks.lang create mode 100644 htdocs/langs/lo_LA/bills.lang create mode 100644 htdocs/langs/lo_LA/bookmarks.lang create mode 100644 htdocs/langs/lo_LA/boxes.lang create mode 100644 htdocs/langs/lo_LA/cashdesk.lang create mode 100644 htdocs/langs/lo_LA/categories.lang create mode 100644 htdocs/langs/lo_LA/commercial.lang create mode 100644 htdocs/langs/lo_LA/companies.lang create mode 100644 htdocs/langs/lo_LA/compta.lang create mode 100644 htdocs/langs/lo_LA/contracts.lang create mode 100644 htdocs/langs/lo_LA/cron.lang create mode 100644 htdocs/langs/lo_LA/deliveries.lang create mode 100644 htdocs/langs/lo_LA/dict.lang create mode 100644 htdocs/langs/lo_LA/donations.lang create mode 100644 htdocs/langs/lo_LA/ecm.lang create mode 100644 htdocs/langs/lo_LA/errors.lang create mode 100644 htdocs/langs/lo_LA/exports.lang create mode 100644 htdocs/langs/lo_LA/externalsite.lang create mode 100644 htdocs/langs/lo_LA/ftp.lang create mode 100644 htdocs/langs/lo_LA/help.lang create mode 100644 htdocs/langs/lo_LA/holiday.lang create mode 100644 htdocs/langs/lo_LA/install.lang create mode 100644 htdocs/langs/lo_LA/interventions.lang create mode 100644 htdocs/langs/lo_LA/languages.lang create mode 100644 htdocs/langs/lo_LA/ldap.lang create mode 100644 htdocs/langs/lo_LA/link.lang create mode 100644 htdocs/langs/lo_LA/mailmanspip.lang create mode 100644 htdocs/langs/lo_LA/mails.lang create mode 100644 htdocs/langs/lo_LA/main.lang create mode 100644 htdocs/langs/lo_LA/margins.lang create mode 100644 htdocs/langs/lo_LA/members.lang create mode 100644 htdocs/langs/lo_LA/opensurvey.lang create mode 100644 htdocs/langs/lo_LA/orders.lang create mode 100644 htdocs/langs/lo_LA/other.lang create mode 100644 htdocs/langs/lo_LA/paybox.lang create mode 100644 htdocs/langs/lo_LA/paypal.lang create mode 100644 htdocs/langs/lo_LA/printipp.lang create mode 100644 htdocs/langs/lo_LA/productbatch.lang create mode 100644 htdocs/langs/lo_LA/products.lang create mode 100644 htdocs/langs/lo_LA/projects.lang create mode 100644 htdocs/langs/lo_LA/propal.lang create mode 100644 htdocs/langs/lo_LA/resource.lang create mode 100644 htdocs/langs/lo_LA/salaries.lang create mode 100644 htdocs/langs/lo_LA/sendings.lang create mode 100644 htdocs/langs/lo_LA/sms.lang create mode 100644 htdocs/langs/lo_LA/stocks.lang create mode 100644 htdocs/langs/lo_LA/suppliers.lang create mode 100644 htdocs/langs/lo_LA/trips.lang create mode 100644 htdocs/langs/lo_LA/users.lang create mode 100644 htdocs/langs/lo_LA/withdrawals.lang create mode 100644 htdocs/langs/lo_LA/workflow.lang delete mode 100644 htdocs/langs/nl_BE/companies.lang delete mode 100644 htdocs/langs/nl_BE/ftp.lang delete mode 100644 htdocs/langs/nl_BE/help.lang delete mode 100644 htdocs/langs/nl_BE/languages.lang delete mode 100644 htdocs/langs/nl_BE/paybox.lang create mode 100644 htdocs/langs/pt_BR/printipp.lang create mode 100644 htdocs/langs/pt_BR/productbatch.lang delete mode 100644 htdocs/langs/ru_UA/cron.lang delete mode 100644 htdocs/langs/ru_UA/holiday.lang delete mode 100644 htdocs/langs/ru_UA/mailmanspip.lang delete mode 100644 htdocs/langs/ru_UA/margins.lang delete mode 100644 htdocs/langs/ru_UA/opensurvey.lang delete mode 100644 htdocs/langs/ru_UA/users.lang create mode 100644 htdocs/langs/sw_SW/accountancy.lang create mode 100644 htdocs/langs/sw_SW/admin.lang create mode 100644 htdocs/langs/sw_SW/agenda.lang create mode 100644 htdocs/langs/sw_SW/banks.lang create mode 100644 htdocs/langs/sw_SW/bills.lang create mode 100644 htdocs/langs/sw_SW/bookmarks.lang create mode 100644 htdocs/langs/sw_SW/boxes.lang create mode 100644 htdocs/langs/sw_SW/cashdesk.lang create mode 100644 htdocs/langs/sw_SW/categories.lang create mode 100644 htdocs/langs/sw_SW/commercial.lang create mode 100644 htdocs/langs/sw_SW/companies.lang create mode 100644 htdocs/langs/sw_SW/compta.lang create mode 100644 htdocs/langs/sw_SW/contracts.lang create mode 100644 htdocs/langs/sw_SW/cron.lang create mode 100644 htdocs/langs/sw_SW/deliveries.lang create mode 100644 htdocs/langs/sw_SW/dict.lang create mode 100644 htdocs/langs/sw_SW/donations.lang create mode 100644 htdocs/langs/sw_SW/ecm.lang create mode 100644 htdocs/langs/sw_SW/errors.lang create mode 100644 htdocs/langs/sw_SW/exports.lang create mode 100644 htdocs/langs/sw_SW/externalsite.lang create mode 100644 htdocs/langs/sw_SW/ftp.lang create mode 100644 htdocs/langs/sw_SW/help.lang create mode 100644 htdocs/langs/sw_SW/holiday.lang create mode 100644 htdocs/langs/sw_SW/install.lang create mode 100644 htdocs/langs/sw_SW/interventions.lang create mode 100644 htdocs/langs/sw_SW/languages.lang create mode 100644 htdocs/langs/sw_SW/ldap.lang create mode 100644 htdocs/langs/sw_SW/link.lang create mode 100644 htdocs/langs/sw_SW/mailmanspip.lang create mode 100644 htdocs/langs/sw_SW/mails.lang create mode 100644 htdocs/langs/sw_SW/main.lang create mode 100644 htdocs/langs/sw_SW/margins.lang create mode 100644 htdocs/langs/sw_SW/members.lang create mode 100644 htdocs/langs/sw_SW/opensurvey.lang create mode 100644 htdocs/langs/sw_SW/orders.lang create mode 100644 htdocs/langs/sw_SW/other.lang create mode 100644 htdocs/langs/sw_SW/paybox.lang create mode 100644 htdocs/langs/sw_SW/paypal.lang create mode 100644 htdocs/langs/sw_SW/printipp.lang create mode 100644 htdocs/langs/sw_SW/productbatch.lang create mode 100644 htdocs/langs/sw_SW/products.lang create mode 100644 htdocs/langs/sw_SW/projects.lang create mode 100644 htdocs/langs/sw_SW/propal.lang create mode 100644 htdocs/langs/sw_SW/resource.lang create mode 100644 htdocs/langs/sw_SW/salaries.lang create mode 100644 htdocs/langs/sw_SW/sendings.lang create mode 100644 htdocs/langs/sw_SW/sms.lang create mode 100644 htdocs/langs/sw_SW/stocks.lang create mode 100644 htdocs/langs/sw_SW/suppliers.lang create mode 100644 htdocs/langs/sw_SW/trips.lang create mode 100644 htdocs/langs/sw_SW/users.lang create mode 100644 htdocs/langs/sw_SW/withdrawals.lang create mode 100644 htdocs/langs/sw_SW/workflow.lang create mode 100644 htdocs/langs/uz_UZ/accountancy.lang create mode 100644 htdocs/langs/uz_UZ/link.lang create mode 100644 htdocs/langs/uz_UZ/printipp.lang create mode 100644 htdocs/langs/uz_UZ/productbatch.lang create mode 100644 htdocs/langs/uz_UZ/resource.lang create mode 100644 htdocs/langs/uz_UZ/salaries.lang diff --git a/.tx/config b/.tx/config index e4d1fc65732..67c7b863f37 100644 --- a/.tx/config +++ b/.tx/config @@ -1,6 +1,6 @@ [main] host = https://www.transifex.com -lang_map = uz: uz_UZ +lang_map = uz: uz_UZ, sw: sw_SW [dolibarr.accountancy] file_filter = htdocs/langs//accountancy.lang diff --git a/dev/fixaltlanguages.sh b/dev/fixaltlanguages.sh index eec9df4b88f..bfb9aa900b6 100755 --- a/dev/fixaltlanguages.sh +++ b/dev/fixaltlanguages.sh @@ -32,6 +32,7 @@ then for dir in `find htdocs/langs/$3* -type d` do dirshort=`basename $dir` + #echo $dirshort export aa=`echo $dirshort | nawk -F"_" '{ print $1 }'` @@ -42,7 +43,7 @@ then aaupper="US" fi bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'` - if [ "$aa" != "$bblower" -a "$bblower" != "us" ] + if [ "$aa" != "$bblower" -a "$dirshort" != "en_US" ] then reflang="htdocs/langs/"$aa"_"$aaupper if [ -d $reflang ] @@ -52,6 +53,15 @@ then echo ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2 ./dev/translation/strip_language_file.php $aa"_"$aaupper $aa"_"$bb $2 for fic in `ls htdocs/langs/${aa}_${bb}/*.delta`; do f=`echo $fic | sed -e 's/\.delta//'`; echo $f; mv $f.delta $f; done + for fic in `ls htdocs/langs/${aa}_${bb}/*.lang`; + do f=`cat $fic | wc -l`; + #echo $f lines into file $fic; + if [ $f = 1 ] + then + echo Only one line remainging into file $fic, we delete it; + rm $fic + fi; + done fi fi done; diff --git a/dev/translation/strip_language_file.php b/dev/translation/strip_language_file.php index e3c31b89b58..6102ed3826c 100755 --- a/dev/translation/strip_language_file.php +++ b/dev/translation/strip_language_file.php @@ -60,6 +60,7 @@ $rc = 0; $lPrimary = isset($argv[1])?$argv[1]:''; $lSecondary = isset($argv[2])?$argv[2]:''; +$lEnglish = 'en_US'; $filesToProcess = isset($argv[3])?$argv[3]:''; if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess)) @@ -73,6 +74,7 @@ if (empty($lPrimary) || empty($lSecondary) || empty($filesToProcess)) $aPrimary = array(); $aSecondary = array(); +$aEnglish = array(); // Define array $filesToProcess if ($filesToProcess == 'all') @@ -96,6 +98,7 @@ foreach($filesToProcess as $fileToProcess) { $lPrimaryFile = 'htdocs/langs/'.$lPrimary.'/'.$fileToProcess; $lSecondaryFile = 'htdocs/langs/'.$lSecondary.'/'.$fileToProcess; + $lEnglishFile = 'htdocs/langs/'.$lEnglish.'/'.$fileToProcess; $output = $lSecondaryFile . '.delta'; print "---- Process language file ".$lSecondaryFile."\n"; @@ -114,6 +117,13 @@ foreach($filesToProcess as $fileToProcess) continue; } + if ( ! is_readable($lEnglishFile) ) { + $rc = 3; + $msg = "Cannot read english language file $lEnglishFile. We discard this file."; + print $msg . "\n"; + continue; + } + // Start reading and parsing Secondary if ( $handle = fopen($lSecondaryFile, 'r') ) @@ -172,6 +182,65 @@ foreach($filesToProcess as $fileToProcess) } + // Start reading and parsing English + + if ( $handle = fopen($lEnglishFile, 'r') ) + { + print "Read English File $lEnglishFile:\n"; + $cnt = 0; + while (($line = fgets($handle)) !== false) + { + $cnt++; + + // strip comments + if ( preg_match("/^\w*#/", $line) ) { + continue; + } + // strip empty lines + if ( preg_match("/^\w*$/", $line) ) { + continue; + } + + $a = mb_split('=', trim($line), 2); + if ( count($a) != 2 ) { + print "ERROR in file $lEnglishFile, line $cnt: " . trim($line) . "\n"; + continue; + } + + list($key, $value) = $a; + + // key is redundant + if ( array_key_exists($key, $aEnglish) ) { + print "Key $key is redundant in file $lEnglishFile (line: $cnt).\n"; + continue; + } + + // String has no value + if ( $value == '' ) { + print "Key $key has no value in file $lEnglishFile (line: $cnt).\n"; + continue; + } + + $aEnglish[$key] = trim($value); + } + if ( ! feof($handle) ) + { + $rc = 5; + $msg = "Unexpected fgets() fail"; + print $msg . " (rc=$rc).\n"; + exit($rc); + } + fclose($handle); + } + else { + $rc = 6; + $msg = "Cannot open file $lEnglishFile"; + print $msg . " (rc=$rc).\n"; + exit($rc); + } + + + // Start reading and parsing Primary. See rules in header! $arrayofkeytoalwayskeep=array('DIRECTION','FONTFORPDF','FONTSIZEFORPDF','SeparatorDecimal','SeparatorThousand'); @@ -246,7 +315,11 @@ foreach($filesToProcess as $fileToProcess) } // String exists in both files and does not match - if ((! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key]) || in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key)) + if ( + (! empty($aSecondary[$key]) && $aSecondary[$key] != $aPrimary[$key] + && ! empty($aEnglish[$key]) && $aSecondary[$key] != $aEnglish[$key]) + || in_array($key, $arrayofkeytoalwayskeep) || preg_match('/^FormatDate/',$key) || preg_match('/^FormatHour/',$key) + ) { //print "Key $key differs so we add it into new secondary language (line: $cnt).\n"; fwrite($oh, $key."=".(empty($aSecondary[$key])?$aPrimary[$key]:$aSecondary[$key])."\n"); diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh index 2e4470111e6..0154fb14c72 100755 --- a/dev/translation/txpull.sh +++ b/dev/translation/txpull.sh @@ -13,7 +13,7 @@ then echo "This pull remote transifex files to local dir." echo "Note: If you pull a language file (not source), file will be skipped if local file is newer." echo " Using -f will overwrite local file (does not work with 'all')." - echo "Usage: ./dev/translation/txpull.sh (all|xx_XX) [-r dolibarr.file] [-f]" + echo "Usage: ./dev/translation/txpull.sh (all|xx_XX) [-r dolibarr.file] [-f] [-s]" exit fi @@ -26,13 +26,21 @@ fi if [ "x$1" = "xall" ] then - for fic in ar_SA bg_BG bs_BA ca_ES cs_CZ da_DK de_DE el_GR es_ES et_EE eu_ES fa_IR fi_FI fr_FR he_IL hr_HR hu_HU id_ID is_IS it_IT ja_JP ka_GE ko_KR lt_LT lv_LV mk_MK nb_NO nl_NL pl_PL pt_PT ro_RO ru_RU ru_UA sk_SK sl_SI sq_AL sv_SE th_TH tr_TR uk_UA uz_UZ vi_VN zh_CN zh_TW + cd htdocs/lang + for dir in `find htdocs/langs/* -type d` do - echo "tx pull -l $fic $2 $3" - tx pull -l $fic $2 $3 + fic=`basename $dir` + if [ $fic != "en_US" ] + then + echo "tx pull -l $fic $2 $3" + tx pull -l $fic $2 $3 + fi done + cd - else - echo "tx pull -l $1 $2 $3 $4" - tx pull -l $1 $2 $3 $4 + echo "tx pull -l $1 $2 $3 $4 $5" + tx pull -l $1 $2 $3 $4 $5 fi +echo Think to launch also: +echo "> dev/fixaltlanguages.sh fix all" diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang index 72053d81e4b..fbde76477d8 100644 --- a/htdocs/langs/de_AT/admin.lang +++ b/htdocs/langs/de_AT/admin.lang @@ -9,7 +9,6 @@ GenericMaskCodes2=(cccc) den Client-Code
() cccc000 den Clien GenericMaskCodes5=ABC (yy) (mm) - (000000) wird ABC0701-000099
(0000 +100)-ZZZ / tt () / XXX wird 0199-ZZZ/31/XXX NumberOfModelFilesFound=Anzahl der in diesen Verzeichnissen gefundenen .odt-Dokumentvorlagen ExampleOfDirectoriesForModelGen=Beispiele für Syntax:
c:\mydir
/Home/mydir
DOL_DATA_ROOT/ecm/ecmdir -Module53Name=Services Module53Desc=Services-Verwaltung Module70Name=Eingriffe Module70Desc=Eingriffsverwaltung @@ -73,16 +72,12 @@ DictionaryCompanyJuridicalType=Rechtsform DictionaryCanton=Bundesland VATReceivedOnly=Nur Mehtwertsteuererhalt VATIsNotUsedDesc=Die vorgeschlagene MwSt. ist standardmäßig 0 für alle Fälle wie Stiftungen, Einzelpersonen oder Kleinunternehmen- -VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. -VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices. VirtualServerName=Virtual Server Name -PhpConf=Conf PhpWebLink=Php Web-Link DatabaseName=Datenbankname DatabasePort=Datenbank-Port DatabaseUser=Datenbankbenutzer DatabasePassword=Datenbankpasswort -Constraints=Constraints ConstraintsType=Constraint-Typ ConstraintsToShowOrNotEntry=Constraint zeigen oder nicht - Menü-Eintrag AllMustBeOk=Alle erfordern eine Überprüfung diff --git a/htdocs/langs/de_AT/bills.lang b/htdocs/langs/de_AT/bills.lang index 135854c6022..5ff216e9fd4 100644 --- a/htdocs/langs/de_AT/bills.lang +++ b/htdocs/langs/de_AT/bills.lang @@ -10,7 +10,6 @@ InvoiceProFormaAsk=Proforma Rechnung InvoiceProFormaDesc=Proforma Rechnung ist ein Bild eines echten Rechnung, hat aber keine Buchhaltung Wert. ConsumedBy=Consumed von CardBill=Rechnungskarte -Abandoned=Abandoned CustomerBillsUnpaid=Kunden wegen eines nicht bezahlten Rechnungen NewRelativeDiscount=Neue relative Rabatt DescTaxAndDividendsArea=Dieser Bereich stellt eine Übersicht über alle Zahlungen, die für die Steuer-oder Sozialabgaben. Nur Datensätze mit der Bezahlung während der festgesetzten Jahr hier. diff --git a/htdocs/langs/de_AT/companies.lang b/htdocs/langs/de_AT/companies.lang index eccdf9bd2cb..5d03cea798a 100644 --- a/htdocs/langs/de_AT/companies.lang +++ b/htdocs/langs/de_AT/companies.lang @@ -8,23 +8,8 @@ Web=Webadresse LocalTax1IsUsedES=RE wird LocalTax2IsUsedES=IRPF verwendet wird ProfId1AR=Prof Id 1 (CUIL) -ProfId2AU=- -ProfId3AU=- -ProfId4AU=- -ProfId2BE=- -ProfId3BE=- -ProfId4BE=- -ProfId1CH=- -ProfId2CH=- -ProfId1DE=Prof Id 1 (USt.-IdNr) -ProfId2DE=Prof Id 2 (USt.-Nr) -ProfId3DE=Prof Id 3 (Handelsregister-Nr.) -ProfId4DE=- -ProfId2GB=- -ProfId4GB=- CustomerCode=Kunden-Code CapitalOf=Hauptstadt von %s NorProspectNorCustomer=Weder Lead noch Kunde OthersNotLinkedToThirdParty=Andere, nicht mit einem Partner verknüpfte -TE_UNKNOWN=- ExportDataset_company_1=Partner und Eigenschaften diff --git a/htdocs/langs/de_AT/dict.lang b/htdocs/langs/de_AT/dict.lang index adc324ae56a..eb8aea115d5 100644 --- a/htdocs/langs/de_AT/dict.lang +++ b/htdocs/langs/de_AT/dict.lang @@ -1,45 +1,28 @@ # Dolibarr language file - Source file is en_US - dict CountryCI=Ivoiry Küste CountryAX=Land-Inseln -CountryAI=Anguilla CountryBW=Botsuana CountryCV=Kap Verde -CountryKY=Cayman Islands -CountryCX=Christmas Island CountryCC=Cocos (Keeling) Inseln CountryHT=Hati CountryHM=Heard und McDonald CountryVA=Heiliger Stuhl (Staat Vatikanstadt) -CountryIS=Icelande -CountryKG=Kyrghyztan CountryLA=Laotisch CountryLY=Libysch -CountryLT=Lituania CountryMK=Mazedonien, die ehemalige jugoslawische der CountryMD=Republik Moldau CountryMM=Birma (Myanmar) -CountryNF=Norfolk Island CountryKN=Saint Kitts und Nevis -CountryLC=Saint Lucia CountryGS=Süd-Georgien und Süd-Sandwich-Inseln CivilityMLE=Frau CivilityMTRE=Mag. CurrencyCAD=CAN-Dollar CurrencySingCAD=CAN-Dollar -CurrencySingCHF=Swiss Franc CurrencyFRF=Französische Franken CurrencyGBP=GB Pfund -CurrencySingGBP=GB Pound -CurrencyMAD=Dirham -CurrencySingMAD=Dirham -CurrencyMGA=Ariary -CurrencySingMGA=Ariary -CurrencyNOK=Norwegian krones CurrencyTND=TND CurrencyUSD=US-Dollar CurrencySingUSD=US-Dollar -CurrencyUAH=Hryvnia -CurrencySingUAH=Hryvnia CurrencyXAF=CFA-Franc BEAC DemandReasonTypeSRC_CAMP_MAIL=Mailing-Kampagne DemandReasonTypeSRC_CAMP_EMAIL=Emailing Kampagne diff --git a/htdocs/langs/de_AT/donations.lang b/htdocs/langs/de_AT/donations.lang deleted file mode 100644 index 2d4eb63c1fd..00000000000 --- a/htdocs/langs/de_AT/donations.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - donations diff --git a/htdocs/langs/de_AT/ftp.lang b/htdocs/langs/de_AT/ftp.lang deleted file mode 100644 index 66407cca057..00000000000 --- a/htdocs/langs/de_AT/ftp.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - ftp diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang index ebda6905a62..0cfce637f4a 100644 --- a/htdocs/langs/de_AT/main.lang +++ b/htdocs/langs/de_AT/main.lang @@ -37,7 +37,6 @@ PasswordRetype=Geben Sie das Passwort erneut ein DateRequest=Verlange Datum DurationDays=Tag days=Tag -Quadri=Quadri UnitPriceHT=Nettopreis (Stk.) UnitPriceTTC=Bruttopreis (Stk.) AmountAverage=Durchnschnittsbetrag diff --git a/htdocs/langs/de_AT/other.lang b/htdocs/langs/de_AT/other.lang index 5243fcaad9d..3504dd431ff 100644 --- a/htdocs/langs/de_AT/other.lang +++ b/htdocs/langs/de_AT/other.lang @@ -28,7 +28,6 @@ PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ \n\n Hier finden Sie PredefinedMailContentSendShipping=__CONTACTCIVNAME__ \n\n Hier finden Sie die Versandkosten __SHIPPINGREF__ \n\nSincerely \n\n__SIGNATURE__ PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ \n\n Hier finden Sie die Intervention __FICHINTERREF__ \n\nSincerely \n\n__SIGNATURE__ FeatureNotYetAvailableShort=Erhältlich in einer der nächsten Versionen -Top=Top Bottom=Boden Right=Recht CalculatedWeight=Errechnetes Gewicht diff --git a/htdocs/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang index 20e306719ed..9e4f09d628c 100644 --- a/htdocs/langs/de_AT/products.lang +++ b/htdocs/langs/de_AT/products.lang @@ -24,16 +24,13 @@ ConfirmDeleteProduct=Möchten Sie dieses Produkt/Service wirklich löschen? ProductDeleted=Produkt/Service "%s" aus der Datenbank gelöscht. DeletePicture=Bild löschen ExportDataset_produit_1=Produkte und Services -ExportDataset_service_1=Services NoProductMatching=Kein Produkt/Service entspricht Ihren Suchkriterien MatchingProducts=Passende Produkte/Services Restock=Bestandserinnerung -ProductSpecial=Special QtyMin=Mindestabnahme PriceQty=Preis für Mindestabnahme PriceQtyMin=Gesamtpreis Mindestabnahme RecordedProductsAndServices=Erfasste Produkte/Services -ServiceNb=Service #%s ListProductServiceByPopularity=Liste der Produkte/Services nach Beliebtheit ListProductByPopularity=Liste der Produkte/Services nach Beliebtheit ListServiceByPopularity=Liste der Services nach Beliebtheit diff --git a/htdocs/langs/de_AT/propal.lang b/htdocs/langs/de_AT/propal.lang index 190907aebe3..a91f5399aef 100644 --- a/htdocs/langs/de_AT/propal.lang +++ b/htdocs/langs/de_AT/propal.lang @@ -6,8 +6,6 @@ PropalsDraft=Entwurf PropalStatusSigned=Unterzeichnet (auf Rechnung) NoOtherOpenedPropals=Keine offenen Angebote Anderer RefProposal=Angebots Nr. -FileNotUploaded=Datei nicht hochgeladen -FileUploaded=Datei erfolgreich hochgeladen DatePropal=Datum des Angebots DateEndPropal=Ablauf der Bindefrist ValidityDuration=Bindefrist diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang deleted file mode 100644 index 70564679d5f..00000000000 --- a/htdocs/langs/de_CH/companies.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - companies diff --git a/htdocs/langs/nl_BE/commercial.lang b/htdocs/langs/en_GB/commercial.lang similarity index 63% rename from htdocs/langs/nl_BE/commercial.lang rename to htdocs/langs/en_GB/commercial.lang index b881117de93..18d8db06801 100644 --- a/htdocs/langs/nl_BE/commercial.lang +++ b/htdocs/langs/en_GB/commercial.lang @@ -1 +1,2 @@ # Dolibarr language file - Source file is en_US - commercial +ActionAffectedTo=Event assigned to diff --git a/htdocs/langs/en_GB/cron.lang b/htdocs/langs/en_GB/cron.lang new file mode 100644 index 00000000000..3f755fc725d --- /dev/null +++ b/htdocs/langs/en_GB/cron.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - cron +CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes +CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes diff --git a/htdocs/langs/en_GB/exports.lang b/htdocs/langs/en_GB/exports.lang deleted file mode 100644 index 982dcc4bca9..00000000000 --- a/htdocs/langs/en_GB/exports.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - exports diff --git a/htdocs/langs/en_GB/orders.lang b/htdocs/langs/en_GB/orders.lang new file mode 100644 index 00000000000..2c71fc66ccc --- /dev/null +++ b/htdocs/langs/en_GB/orders.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - orders +StatusOrderOnProcessShort=Ordered +StatusOrderOnProcess=Ordered - Standby reception diff --git a/htdocs/langs/en_GB/suppliers.lang b/htdocs/langs/en_GB/suppliers.lang new file mode 100644 index 00000000000..5213cec4e07 --- /dev/null +++ b/htdocs/langs/en_GB/suppliers.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - suppliers +DenyingThisOrder=Deny this order diff --git a/htdocs/langs/en_GB/trips.lang b/htdocs/langs/en_GB/trips.lang new file mode 100644 index 00000000000..f5e6f1a92eb --- /dev/null +++ b/htdocs/langs/en_GB/trips.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - trips +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report +NewTrip=New expense report +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang index ded965131de..45263681965 100644 --- a/htdocs/langs/en_US/productbatch.lang +++ b/htdocs/langs/en_US/productbatch.lang @@ -1,10 +1,9 @@ # ProductBATCH language file - en_US - ProductBATCH -CHARSET= UTF-8 -ManageLotSerial=Manage lot or serial -ProductStatusOnBatch=Managed -ProductStatusNotOnBatch=Not Managed -ProductStatusOnBatchShort=Managed -ProductStatusNotOnBatchShort=Not Managed +ManageLotSerial=Use batch/serial number +ProductStatusOnBatch=Yes (Batch/serial required) +ProductStatusNotOnBatch=No (Batch/serial not used) +ProductStatusOnBatchShort=Yes +ProductStatusNotOnBatchShort=No Batch=Batch/Serial atleast1batchfield=Eat-by date or Sell-by date or Batch number batch_number=Batch/Serial number @@ -19,3 +18,4 @@ printQty=Qty: %d AddDispatchBatchLine=Add a line for Shelf Life dispatching BatchDefaultNumber=Undefined WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. +ProductDoesNotUseBatchSerial=This product does not use batch/serial number diff --git a/htdocs/langs/en_ZA/companies.lang b/htdocs/langs/en_ZA/companies.lang deleted file mode 100644 index 70564679d5f..00000000000 --- a/htdocs/langs/en_ZA/companies.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - companies diff --git a/htdocs/langs/en_ZA/compta.lang b/htdocs/langs/en_ZA/compta.lang deleted file mode 100644 index 1738634c769..00000000000 --- a/htdocs/langs/en_ZA/compta.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - compta diff --git a/htdocs/langs/es_AR/cron.lang b/htdocs/langs/es_AR/cron.lang new file mode 100644 index 00000000000..3f755fc725d --- /dev/null +++ b/htdocs/langs/es_AR/cron.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - cron +CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes +CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes diff --git a/htdocs/langs/es_AR/main.lang b/htdocs/langs/es_AR/main.lang new file mode 100644 index 00000000000..2e691473326 --- /dev/null +++ b/htdocs/langs/es_AR/main.lang @@ -0,0 +1,21 @@ +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 +SeparatorDecimal=. +SeparatorThousand=, +FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y +FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%I:%M %p +FormatHourShortDuration=%H:%M +FormatDateTextShort=%b %d, %Y +FormatDateText=%B %d, %Y +FormatDateHourShort=%m/%d/%Y %I:%M %p +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p +FormatDateHourTextShort=%b %d, %Y, %I:%M %p +FormatDateHourText=%B %d, %Y, %I:%M %p diff --git a/htdocs/langs/es_AR/orders.lang b/htdocs/langs/es_AR/orders.lang new file mode 100644 index 00000000000..2c71fc66ccc --- /dev/null +++ b/htdocs/langs/es_AR/orders.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - orders +StatusOrderOnProcessShort=Ordered +StatusOrderOnProcess=Ordered - Standby reception diff --git a/htdocs/langs/es_AR/trips.lang b/htdocs/langs/es_AR/trips.lang new file mode 100644 index 00000000000..b4a068e21c4 --- /dev/null +++ b/htdocs/langs/es_AR/trips.lang @@ -0,0 +1,13 @@ +# Dolibarr language file - Source file is en_US - trips +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report +NewTrip=New expense report +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ExpensesArea=Expense reports area diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang new file mode 100644 index 00000000000..d43134a3f9c --- /dev/null +++ b/htdocs/langs/es_CO/admin.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - admin +AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Example for ClamAv: /usr/bin/clamscan +AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" +ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang new file mode 100644 index 00000000000..f1e67a676c3 --- /dev/null +++ b/htdocs/langs/es_CO/bills.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - bills +ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid. diff --git a/htdocs/langs/es_CO/companies.lang b/htdocs/langs/es_CO/companies.lang new file mode 100644 index 00000000000..35eea56e886 --- /dev/null +++ b/htdocs/langs/es_CO/companies.lang @@ -0,0 +1,29 @@ +# Dolibarr language file - Source file is en_US - companies +ConfirmDeleteCompany=¿Está seguro de querer eliminar esta empresa y toda la información contenida? +ConfirmDeleteContact=¿Está seguro de querer eliminar este contacto y toda la información contenida? +NewSocGroup=Nueva alianza de empresas +SocGroup=Alianza de empresas +ParentCompany=Sede principal +Subsidiary=Sucursal +Subsidiaries=Sucursales +NoSubsidiary=Ninguna sucursal +RegisteredOffice=Domicilio principal +PostOrFunction=Cargo/función +State=Departamento +PhonePerso=Teléf. personal +ProfId2CO=Identificación (CC, NIT, CE) +ProfId3CO=CIIU +VATIntra=NIT +VATIntraShort=NIT +VATIntraVeryShort=NIT +NoContactForAnyProposal=Este contacto no es contacto de ningúna cotización +VATIntraCheckDesc=El link %s permite consultar al servicio RUES el NIT. Se requiere acceso a internet para que el servicio funcione +VATIntraCheckURL=http://www.rues.org.co/RUES_Web/Consultas#tabs-3 +VATIntraCheckableOnEUSite=Verificar en la web +VATIntraManualCheck=Puede también realizar una verificación manual en la web %s +ConfirmDeleteDeliveryAddress=¿Está seguro que quiere eliminar esta dirección de envío? +AddDeliveryAddress=Añadir la dirección +ConfirmDeleteFile=¿Está seguro que quiere eliminar este archivo? +ThirdPartiesArea=Área Terceros +ManagingDirectors=Administrador(es) (CEO, gerente, director, presidente, etc.) +SearchThirdparty=Buscar terceros diff --git a/htdocs/langs/es_CO/cron.lang b/htdocs/langs/es_CO/cron.lang new file mode 100644 index 00000000000..3f755fc725d --- /dev/null +++ b/htdocs/langs/es_CO/cron.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - cron +CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes +CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang new file mode 100644 index 00000000000..2e691473326 --- /dev/null +++ b/htdocs/langs/es_CO/main.lang @@ -0,0 +1,21 @@ +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 +SeparatorDecimal=. +SeparatorThousand=, +FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y +FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%I:%M %p +FormatHourShortDuration=%H:%M +FormatDateTextShort=%b %d, %Y +FormatDateText=%B %d, %Y +FormatDateHourShort=%m/%d/%Y %I:%M %p +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p +FormatDateHourTextShort=%b %d, %Y, %I:%M %p +FormatDateHourText=%B %d, %Y, %I:%M %p diff --git a/htdocs/langs/es_CO/orders.lang b/htdocs/langs/es_CO/orders.lang new file mode 100644 index 00000000000..2c71fc66ccc --- /dev/null +++ b/htdocs/langs/es_CO/orders.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - orders +StatusOrderOnProcessShort=Ordered +StatusOrderOnProcess=Ordered - Standby reception diff --git a/htdocs/langs/es_CO/trips.lang b/htdocs/langs/es_CO/trips.lang new file mode 100644 index 00000000000..b4a068e21c4 --- /dev/null +++ b/htdocs/langs/es_CO/trips.lang @@ -0,0 +1,13 @@ +# Dolibarr language file - Source file is en_US - trips +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report +NewTrip=New expense report +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ExpensesArea=Expense reports area diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang index b75dbfd2bad..a3e5cf804bf 100644 --- a/htdocs/langs/es_ES/trips.lang +++ b/htdocs/langs/es_ES/trips.lang @@ -1,23 +1,23 @@ # Dolibarr language file - Source file is en_US - trips ExpenseReport=Expense report ExpenseReports=Expense reports -Trip=Expense report -Trips=Expense reports -TripsAndExpenses=Expenses reports -TripsAndExpensesStatistics=Expense reports statistics -TripCard=Expense report card -AddTrip=Create expense report -ListOfTrips=List of expense report +Trip=Informe de gastos +Trips=Informes de gastos +TripsAndExpenses=Informes de gastos +TripsAndExpensesStatistics=Estadísticas de gastos +TripCard=Ficha informe de gastos +AddTrip=Crear informe de gastos +ListOfTrips=Listado de informe de gastos ListOfFees=Listado notas de honorarios -NewTrip=New expense report +NewTrip=Nuevo informe de gastos CompanyVisited=Empresa/institución visitada Kilometers=Kilometros FeesKilometersOrAmout=Importe o kilómetros -DeleteTrip=Delete expense report -ConfirmDeleteTrip=Are you sure you want to delete this expense report ? -ListTripsAndExpenses=List of expense reports +DeleteTrip=Eliminar informe de gastos +ConfirmDeleteTrip=¿Está seguro de querer eliminar este informe de gastos? +ListTripsAndExpenses=Listado de informe de gastos ListToApprove=Waiting for approval -ExpensesArea=Expense reports area +ExpensesArea=Área informe de gastos SearchATripAndExpense=Search an expense report ClassifyRefunded=Clasificar 'Reembolsado' ExpenseReportWaitingForApproval=A new expense report has been submitted for approval @@ -44,7 +44,7 @@ TF_HOTEL=Hostel TF_TAXI=Taxi ErrorDoubleDeclaration=You have declared another expense report into a similar date range. -ListTripsAndExpenses=List of expense reports +ListTripsAndExpenses=Listado de informe de gastos AucuneNDF=No expense reports found for this criteria AucuneLigne=There is no expense report declared yet AddLine=Add a line diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 512b2f3133d..ddf5de96a89 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -10,8 +10,8 @@ VersionUnknown=Inconnue VersionRecommanded=Recommandé FileCheck=Files Integrity FilesMissing=Missing Files -FilesUpdated=Updated Files -FileCheckDolibarr=Check Dolibarr Files Integrity +FilesUpdated=Mettre à jour les fichiers +FileCheckDolibarr=Vérifier l'intégrité des fichiers XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=ID Session SessionSaveHandler=Modalité de sauvegarde des sessions @@ -642,7 +642,7 @@ Permission181=Consulter les commandes fournisseurs Permission182=Créer/modifier les commandes fournisseurs Permission183=Valider les commandes fournisseurs Permission184=Approuver les commandes fournisseurs -Permission185=Order or cancel supplier orders +Permission185=Commander ou annuler les commandes fournisseurs Permission186=Accuser réception des commandes fournisseurs Permission187=Clôturer les commandes fournisseurs Permission188=Annuler les commandes fournisseurs @@ -1410,7 +1410,7 @@ BarcodeDescUPC=code-barres de type UPC BarcodeDescISBN=code-barres de type ISBN BarcodeDescC39=code-barres de type C39 BarcodeDescC128=code-barres de type C128 -GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode +GenbarcodeLocation=Outil de génération de code-barres en ligne de commande (utilisé par le moteur interne pour certains types de codes-barres). Doit être compatible avec "genbarcode".
Par exemple: /usr/local/bin/genbarcode BarcodeInternalEngine=Moteur interne BarCodeNumberManager=Gestionnaire pour la génération automatique de numéro de code-barre ##### Prelevements ##### @@ -1597,7 +1597,7 @@ SortOrder=Ordre de tri Format=Format TypePaymentDesc=0:Type de paiement client, 1:Type de paiement fournisseur, 2:Paiement de type client et fournisseur IncludePath=Chemin Include (définir dans la variable %s) -ExpenseReportsSetup=Setup of module Expense Reports -TemplatePDFExpenseReports=Document templates to generate expense report document +ExpenseReportsSetup=Configuration du module Notes de frais +TemplatePDFExpenseReports=Modèles de documents pour générer les document de Notes de frais NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang index bd6c96ae3fd..84f2225b771 100644 --- a/htdocs/langs/fr_FR/banks.lang +++ b/htdocs/langs/fr_FR/banks.lang @@ -33,11 +33,11 @@ AllTime=Depuis le début Reconciliation=Rapprochement RIB=Numéro de compte bancaire IBAN=Identifiant IBAN -IbanValid=IBAN is Valid -IbanNotValid=IBAN is Not Valid +IbanValid=IBAN est valide +IbanNotValid=IBAN n'est pas valide BIC=Identifiant BIC/SWIFT -SwiftValid=BIC/SWIFT is Valid -SwiftNotValid=BIC/SWIFT is Not Valid +SwiftValid=BIC / SWIFT est valide +SwiftNotValid=BIC / SWIFT n'est pas valide StandingOrders=Prélèvements StandingOrder=Prélèvement Withdrawals=Retraits @@ -152,7 +152,7 @@ BackToAccount=Retour au compte ShowAllAccounts=Afficher pour tous les comptes FutureTransaction=Transaction future. Pas moyen de concilier. SelectChequeTransactionAndGenerate=Sélectionner/filtrer les chèques à inclure dans le bordereau de remise et cliquer sur "Créer". -InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD +InputReceiptNumber=Choisissez le relevé bancaire liés au rapprochement. Utilisez une valeur numérique triable: AAAAMM ou AAAAMMJJ EventualyAddCategory=Eventuellement, saisissez une catégorie dans laquelle classer les écritures ToConciliate=À rapprocher ? ThenCheckLinesAndConciliate=Ensuite, cochez les lignes présentes sur le relevé et cliquez sur diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang index f4961a1e1c5..e4547c3b53d 100644 --- a/htdocs/langs/fr_FR/commercial.lang +++ b/htdocs/langs/fr_FR/commercial.lang @@ -62,7 +62,7 @@ LastProspectContactDone=Prospects contactés DateActionPlanned=Date réalisation prévue DateActionDone=Date réalisation effective ActionAskedBy=Action enregistrée par -ActionAffectedTo=Event assigned to +ActionAffectedTo=Événement assigné à ActionDoneBy=Action faite par ActionUserAsk=Enregistré par ErrorStatusCantBeZeroIfStarted=Si le champ 'Date début réalisation réelle' est renseigné alors l'action est commencée voire finie, aussi le champ 'État' ne peut être 0%%. diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang index e305789f82d..a04821f85b7 100644 --- a/htdocs/langs/fr_FR/contracts.lang +++ b/htdocs/langs/fr_FR/contracts.lang @@ -19,7 +19,7 @@ ServiceStatusLateShort=Expiré ServiceStatusClosed=Fermé ServicesLegend=Légende pour les services Contracts=Contrats -ContractsAndLine=Contracts and line of contracts +ContractsAndLine=Contrats et lignes de contrats Contract=Contrat NoContracts=Pas de contrats MenuServices=Services diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang index a94a7bafe3f..659113176be 100644 --- a/htdocs/langs/fr_FR/cron.lang +++ b/htdocs/langs/fr_FR/cron.lang @@ -84,4 +84,4 @@ CronType_command=Commande terminal CronMenu=Cron CronCannotLoadClass=Impossible de charger la classe %s ou l'objet %s UseMenuModuleToolsToAddCronJobs=Aller dans le menu "Accueil - Outils modules - Liste des travaux" pour voir et éditer les travaux planifiés. -TaskDisabled=Task disabled +TaskDisabled=Tâche désactivée diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 7bcae13433a..ae65a532774 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Le javascript ne doit pas être désactivé pour qu ErrorPasswordsMustMatch=Les 2 mots de passe saisis doivent correspondre ErrorContactEMail=Une erreur technique est apparue. Merci de contacter l'administrateur à l'email suivant %s en lui indiquant le code erreur %s dans votre message ou mieux en fournissant une copie d'écran de cette page. ErrorWrongValueForField=Mauvaise valeur pour le champ numéro %s (la valeur '%s' ne respecte pas la règle %s) -ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) +ErrorFieldValueNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une valeure présente dans le champ %s de la table %s = %s) ErrorFieldRefNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une référence existante comme %s) ErrorsOnXLines=Erreurs sur %s enregistrement(s) source ErrorFileIsInfectedWithAVirus=L'antivirus n'a pas pu valider ce fichier (il est probablement infecté par un virus) ! diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang index 1d9f41e09c9..3a11b7c4036 100644 --- a/htdocs/langs/fr_FR/trips.lang +++ b/htdocs/langs/fr_FR/trips.lang @@ -1,33 +1,33 @@ # Dolibarr language file - Source file is en_US - trips -ExpenseReport=Expense report -ExpenseReports=Expense reports -Trip=Expense report -Trips=Expense reports -TripsAndExpenses=Expenses reports -TripsAndExpensesStatistics=Expense reports statistics -TripCard=Expense report card -AddTrip=Create expense report -ListOfTrips=List of expense report +ExpenseReport=Note de frais +ExpenseReports=Notes de frais +Trip=Notes de frais +Trips=Note de frais +TripsAndExpenses=Notes de frais +TripsAndExpensesStatistics=Statistiques notes de frais +TripCard=Fiche note de frais +AddTrip=Créer note de frais +ListOfTrips=Liste des notes de frais ListOfFees=Liste des notes de frais -NewTrip=New expense report +NewTrip=Nouvelle note de frais CompanyVisited=Société/institution visitée Kilometers=Kilomètres FeesKilometersOrAmout=Montant ou kilomètres -DeleteTrip=Delete expense report -ConfirmDeleteTrip=Are you sure you want to delete this expense report ? -ListTripsAndExpenses=List of expense reports -ListToApprove=Waiting for approval -ExpensesArea=Expense reports area -SearchATripAndExpense=Search an expense report +DeleteTrip=Supprimer les notes de frais / déplacements +ConfirmDeleteTrip=Êtes-vous sûr de vouloir supprimer cette note de frais ? +ListTripsAndExpenses=Liste des notes de frais +ListToApprove=En attente d'approbation +ExpensesArea=Espace Notes de frais +SearchATripAndExpense=Rechercher une note de frais ClassifyRefunded=Classer 'Remboursé' -ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApproval=Une nouvelle note de frais a été soumise pour approbation ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s TripId=Id expense report AnyOtherInThisListCanValidate=Person to inform for validation. -TripSociete=Information company -TripSalarie=Informations user -TripNDF=Informations expense report -DeleteLine=Delete a ligne of the expense report +TripSociete=Information société +TripSalarie=Informations utilisateur +TripNDF=Informations note de frais +DeleteLine=Effacer une ligne de note de frais ConfirmDeleteLine=Are you sure you want to delete this line ? PDFStandardExpenseReports=Standard template to generate a PDF document for expense report ExpenseReportLine=Expense report line @@ -44,15 +44,15 @@ TF_HOTEL=Hostel TF_TAXI=Taxi ErrorDoubleDeclaration=You have declared another expense report into a similar date range. -ListTripsAndExpenses=List of expense reports +ListTripsAndExpenses=Liste des notes de frais AucuneNDF=No expense reports found for this criteria AucuneLigne=There is no expense report declared yet -AddLine=Add a line +AddLine=Ajout nouvelle ligne AddLineMini=Add -Date_DEBUT=Period date start -Date_FIN=Period date end -ModePaiement=Payment mode +Date_DEBUT=Date début +Date_FIN=Date fin +ModePaiement=Mode de paiement Note=Note Project=Project diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang new file mode 100644 index 00000000000..bb9b358c045 --- /dev/null +++ b/htdocs/langs/kn_IN/accountancy.lang @@ -0,0 +1,160 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Export=Export +Modelcsv=Model of export +OptionsDeactivatedForThisExportModel=For this export model, options are deactivated +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Breakdown +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic breakdown + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTING_SEPARATORCSV=Column separator in export file + +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal + +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait + +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Breakdown card diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang new file mode 100644 index 00000000000..9782c2ea27f --- /dev/null +++ b/htdocs/langs/kn_IN/admin.lang @@ -0,0 +1,1603 @@ +# Dolibarr language file - Source file is en_US - admin +Foundation=Foundation +Version=Version +VersionProgram=Version program +VersionLastInstall=Version initial install +VersionLastUpgrade=Version last upgrade +VersionExperimental=Experimental +VersionDevelopment=Development +VersionUnknown=Unknown +VersionRecommanded=Recommended +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found +SessionId=Session ID +SessionSaveHandler=Handler to save sessions +SessionSavePath=Storage session localization +PurgeSessions=Purge of sessions +ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself). +NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions. +LockNewSessions=Lock new connections +ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user %s will be able to connect after that. +UnlockNewSessions=Remove connection lock +YourSession=Your session +Sessions=Users session +WebUserGroup=Web server user/group +NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (%s) might be protected (For example, by OS permissions or by PHP directive open_basedir). +HTMLCharset=Charset for generated HTML pages +DBStoringCharset=Database charset to store data +DBSortingCharset=Database charset to sort data +WarningModuleNotActive=Module %s must be enabled +WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page. +DolibarrSetup=Dolibarr install or upgrade +DolibarrUser=Dolibarr user +InternalUser=Internal user +ExternalUser=External user +InternalUsers=Internal users +ExternalUsers=External users +GlobalSetup=Global setup +GUISetup=Display +SetupArea=Setup area +FormToTestFileUploadForm=Form to test file upload (according to setup) +IfModuleEnabled=Note: yes is effective only if module %s is enabled +RemoveLock=Remove file %s if it exists to allow usage of the update tool. +RestoreLock=Restore file %s, with read permission only, to disable any usage of update tool. +SecuritySetup=Security setup +ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher +ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher +ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. +DictionarySetup=Dictionary setup +Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record +ErrorCodeCantContainZero=Code can't contain value 0 +DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +ConfirmAjax=Use Ajax confirmation popups +UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. +ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it +UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) +SearchFilter=Search filters options +NumberOfKeyToSearch=Nbr of characters to trigger search: %s +ViewFullDateActions=Show full dates events in the third sheet +NotAvailableWhenAjaxDisabled=Not available when Ajax disabled +JavascriptDisabled=JavaScript disabled +UsePopupCalendar=Use popup for dates input +UsePreviewTabs=Use preview tabs +ShowPreview=Show preview +PreviewNotAvailable=Preview not available +ThemeCurrentlyActive=Theme currently active +CurrentTimeZone=TimeZone PHP (server) +MySQLTimeZone=TimeZone MySql (database) +TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). +Space=Space +Table=Table +Fields=Fields +Index=Index +Mask=Mask +NextValue=Next value +NextValueForInvoices=Next value (invoices) +NextValueForCreditNotes=Next value (credit notes) +NextValueForDeposit=Next value (deposit) +NextValueForReplacements=Next value (replacements) +MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to %s %s, whatever this parameter's value is +NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration +MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload) +UseCaptchaCode=Use graphical code (CAPTCHA) on login page +UseAvToScanUploadedFiles=Use anti-virus to scan uploaded files +AntiVirusCommand= Full path to antivirus command +AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Example for ClamAv: /usr/bin/clamscan +AntiVirusParam= More parameters on command line +AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" +ComptaSetup=Accounting module setup +UserSetup=User management setup +MenuSetup=Menu management setup +MenuLimits=Limits and accuracy +MenuIdParent=Parent menu ID +DetailMenuIdParent=ID of parent menu (empty for a top menu) +DetailPosition=Sort number to define menu position +PersonalizedMenusNotSupported=Personalized menus not supported +AllMenus=All +NotConfigured=Module not configured +Setup=Setup +Activation=Activation +Active=Active +SetupShort=Setup +OtherOptions=Other options +OtherSetup=Other setup +CurrentValueSeparatorDecimal=Decimal separator +CurrentValueSeparatorThousand=Thousand separator +Destination=Destination +IdModule=Module ID +IdPermissions=Permissions ID +Modules=Modules +ModulesCommon=Main modules +ModulesOther=Other modules +ModulesInterfaces=Interfaces modules +ModulesSpecial=Modules very specific +ParameterInDolibarr=Parameter %s +LanguageParameter=Language parameter %s +LanguageBrowserParameter=Parameter %s +LocalisationDolibarrParameters=Localisation parameters +ClientTZ=Client Time Zone (user) +ClientHour=Client time (user) +OSTZ=Server OS Time Zone +PHPTZ=PHP server Time Zone +PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds) +ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds) +DaylingSavingTime=Daylight saving time +CurrentHour=PHP Time (server) +CompanyTZ=Company Time Zone (main company) +CompanyHour=Company Time (main company) +CurrentSessionTimeOut=Current session timeout +YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris" +OSEnv=OS Environment +Box=Box +Boxes=Boxes +MaxNbOfLinesForBoxes=Max number of lines for boxes +PositionByDefault=Default order +Position=Position +MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar). +MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.
Some modules add entries in the menus (in menu All in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module. +MenuForUsers=Menu for users +LangFile=.lang file +System=System +SystemInfo=System information +SystemTools=System tools +SystemToolsArea=System tools area +SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for. +Purge=Purge +PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in %s directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server. +PurgeDeleteLogFile=Delete log file %s defined for Syslog module (no risk to loose data) +PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data) +PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory %s. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted. +PurgeRunNow=Purge now +PurgeNothingToDelete=No directory or file to delete. +PurgeNDirectoriesDeleted=%s files or directories deleted. +PurgeAuditEvents=Purge all security events +ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed. +NewBackup=New backup +GenerateBackup=Generate backup +Backup=Backup +Restore=Restore +RunCommandSummary=Backup has been launched with the following command +RunCommandSummaryToLaunch=Backup can be launched with the following command +WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands +BackupResult=Backup result +BackupFileSuccessfullyCreated=Backup file successfully generated +YouCanDownloadBackupFile=Generated files can now be downloaded +NoBackupFileAvailable=No backup files available. +ExportMethod=Export method +ImportMethod=Import method +ToBuildBackupFileClickHere=To build a backup file, click here. +ImportMySqlDesc=To import a backup file, you must use mysql command from command line: +ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line: +ImportMySqlCommand=%s %s < mybackupfile.sql +ImportPostgreSqlCommand=%s %s mybackupfile.sql +FileNameToGenerate=File name to generate +Compression=Compression +CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import +CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later +ExportCompatibility=Compatibility of generated export file +MySqlExportParameters=MySQL export parameters +PostgreSqlExportParameters= PostgreSQL export parameters +UseTransactionnalMode=Use transactional mode +FullPathToMysqldumpCommand=Full path to mysqldump command +FullPathToPostgreSQLdumpCommand=Full path to pg_dump command +ExportOptions=Export Options +AddDropDatabase=Add DROP DATABASE command +AddDropTable=Add DROP TABLE command +ExportStructure=Structure +Datas=Data +NameColumn=Name columns +ExtendedInsert=Extended INSERT +NoLockBeforeInsert=No lock commands around INSERT +DelayedInsert=Delayed insert +EncodeBinariesInHexa=Encode binary data in hexadecimal +IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE) +Yes=Yes +No=No +AutoDetectLang=Autodetect (browser language) +FeatureDisabledInDemo=Feature disabled in demo +Rights=Permissions +BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. +OnlyActiveElementsAreShown=Only elements from enabled modules are shown. +ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature. +ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services. +ModulesSpecialDesc=Special modules are very specific or seldom used modules. +ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for a particular business. +ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... +ModulesMarketPlaces=More modules... +DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) +WebSiteDesc=Web site providers you can search to find more modules... +URL=Link +BoxesAvailable=Boxes available +BoxesActivated=Boxes activated +ActivateOn=Activate on +ActiveOn=Activated on +SourceFile=Source file +AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled +AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled +AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled +Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only +Security=Security +Passwords=Passwords +DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) +MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended) +InstrucToEncodePass=To have password encoded into the conf.php file, replace the line
$dolibarr_main_db_pass="..."
by
$dolibarr_main_db_pass="crypted:%s" +InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line
$dolibarr_main_db_pass="crypted:..."
by
$dolibarr_main_db_pass="%s" +ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation) +ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices). +Feature=Feature +DolibarrLicense=License +DolibarrProjectLeader=Project leader +Developpers=Developers/contributors +OtherDeveloppers=Other developers/contributors +OfficialWebSite=Dolibarr international official web site +OfficialWebSiteFr=French official web site +OfficialWiki=Dolibarr documentation on Wiki +OfficialDemo=Dolibarr online demo +OfficialMarketPlace=Official market place for external modules/addons +OfficialWebHostingService=Referenced web hosting services (Cloud hosting) +ReferencedPreferredPartners=Preferred Partners +OtherResources=Autres ressources +ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),
take a look at the Dolibarr Wiki:
%s +ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:
%s +HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr. +HelpCenterDesc2=Some part of this service are available in english only. +CurrentTopMenuHandler=Current top menu handler +CurrentLeftMenuHandler=Current left menu handler +CurrentMenuHandler=Current menu handler +CurrentSmartphoneMenuHandler=Current smartphone menu handler +MeasuringUnit=Measuring unit +Emails=E-mails +EMailsSetup=E-mails setup +EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. +MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: %s) +MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s) +MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems) +MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems) +MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: %s) +MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent +MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to +MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to +MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos) +MAIN_MAIL_SENDMODE=Method to use to send EMails +MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required +MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required +MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt +MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos) +MAIN_SMS_SENDMODE=Method to use to send SMS +MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending +FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally. +SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on www.dolibarr.org forum. +ModuleSetup=Module setup +ModulesSetup=Modules setup +ModuleFamilyBase=System +ModuleFamilyCrm=Customer Relation Management (CRM) +ModuleFamilyProducts=Products Management +ModuleFamilyHr=Human Resource Management +ModuleFamilyProjects=Projects/Collaborative work +ModuleFamilyOther=Other +ModuleFamilyTechnic=Multi-modules tools +ModuleFamilyExperimental=Experimental modules +ModuleFamilyFinancial=Financial Modules (Accounting/Treasury) +ModuleFamilyECM=Electronic Content Management (ECM) +MenuHandlers=Menu handlers +MenuAdmin=Menu editor +DoNotUseInProduction=Do not use in production +ThisIsProcessToFollow=This is setup to process: +StepNb=Step %s +FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s). +DownloadPackageFromWebSite=Download package %s. +UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory %s +SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component. +NotExistsDirect=The alternative root directory is not defined.
+InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).
+InfDirExample=
Then declare it in the file conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*These lines are commented with "#", to uncomment only remove the character. +YouCanSubmitFile=Select module: +CurrentVersion=Dolibarr current version +CallUpdatePage=Go to the page that updates the database structure and datas: %s. +LastStableVersion=Last stable version +UpdateServerOffline=Update server offline +GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask.
{000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s.
{000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required.
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
+GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
{tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
+GenericMaskCodes3=All other characters in the mask will remain intact.
Spaces are not allowed.
+GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany done 2007-01-31:
+GenericMaskCodes4b=Example on third party created on 2007-03-01:
+GenericMaskCodes4c=Example on product created on 2007-03-01:
+GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX +GenericNumRefModelDesc=Returns a customizable number according to a defined mask. +ServerAvailableOnIPOrPort=Server is available at address %s on port %s +ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s +DoTestServerAvailability=Test server connectivity +DoTestSend=Test sending +DoTestSendHTML=Test sending HTML +ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask. +ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask. +UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system. +UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).
It must be the octal value (for example, 0666 means read and write for everyone).
This parameter is useless on a Windows server. +SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation +UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache) +DisableLinkToHelpCenter=Hide link "Need help or support" on login page +DisableLinkToHelp=Hide link "%s Online help" on left menu +AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea. +ModuleDisabled=Module disabled +ModuleDisabledSoNoEvent=Module disabled so event never created +ConfirmPurge=Are you sure you want to execute this purge ?
This will delete definitely all your data files with no way to restore them (ECM files, attached files...). +MinLength=Minimum length +LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory +ExamplesWithCurrentSetup=Examples with current running setup +ListOfDirectories=List of OpenDocument templates directories +ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. +NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories +ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: +FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template +FirstnameNamePosition=Position of Name/Lastname +DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values: +KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices) +TestSubmitForm=Input test form +ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours. +ThemeDir=Skins directory +ConnectionTimeout=Connexion timeout +ResponseTimeout=Response timeout +SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__ +ModuleMustBeEnabledFirst=Module %s must be enabled first before using this feature. +SecurityToken=Key to secure URLs +NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s +PDF=PDF +PDFDesc=You can set each global options related to the PDF generation +PDFAddressForging=Rules to forge address boxes +HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF +HideDescOnPDF=Hide products description on generated PDF +HideRefOnPDF=Hide products ref. on generated PDF +HideDetailsOnPDF=Hide products lines details on generated PDF +Library=Library +UrlGenerationParameters=Parameters to secure URLs +SecurityTokenIsUnique=Use a unique securekey parameter for each URL +EnterRefToBuildUrl=Enter reference for object %s +GetSecuredUrl=Get calculated URL +ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons +OldVATRates=Old VAT rate +NewVATRates=New VAT rate +PriceBaseTypeToChange=Modify on prices with base reference value defined on +MassConvert=Launch mass convert +String=String +TextLong=Long text +Int=Integer +Float=Float +DateAndTime=Date and hour +Unique=Unique +Boolean=Boolean (Checkbox) +ExtrafieldPhone = Phone +ExtrafieldPrice = Price +ExtrafieldMail = Email +ExtrafieldSelect = Select list +ExtrafieldSelectList = Select from table +ExtrafieldSeparator=Separator +ExtrafieldCheckBox=Checkbox +ExtrafieldRadio=Radio button +ExtrafieldCheckBoxFromList= Checkbox from table +ExtrafieldParamHelpselect=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key +ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... +ExtrafieldParamHelpradio=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... +ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +LibraryToBuildPDF=Library used to build PDF +WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' +LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax) +SMS=SMS +LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s +RefreshPhoneLink=Refresh link +LinkToTest=Clickable link generated for user %s (click phone number to test) +KeepEmptyToUseDefault=Keep empty to use default value +DefaultLink=Default link +ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) +ExternalModule=External module - Installed into directory %s +BarcodeInitForThirdparties=Mass barcode init for thirdparties +BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services +CurrentlyNWithoutBarCode=Currently, you have %s records on %s %s without barcode defined. +InitEmptyBarCode=Init value for next %s empty records +EraseAllCurrentBarCode=Erase all current barcode values +ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ? +AllBarcodeReset=All barcode values have been removed +NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup. +NoRecordWithoutBarcodeDefined=No record with no barcode value defined. + +# Modules +Module0Name=Users & groups +Module0Desc=Users and groups management +Module1Name=Third parties +Module1Desc=Companies and contact management (customers, prospects...) +Module2Name=Commercial +Module2Desc=Commercial management +Module10Name=Accounting +Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching. +Module20Name=Proposals +Module20Desc=Commercial proposal management +Module22Name=Mass E-mailings +Module22Desc=Mass E-mailing management +Module23Name= Energy +Module23Desc= Monitoring the consumption of energies +Module25Name=Customer Orders +Module25Desc=Customer order management +Module30Name=Invoices +Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers +Module40Name=Suppliers +Module40Desc=Supplier management and buying (orders and invoices) +Module42Name=Logs +Module42Desc=Logging facilities (file, syslog, ...) +Module49Name=Editors +Module49Desc=Editor management +Module50Name=Products +Module50Desc=Product management +Module51Name=Mass mailings +Module51Desc=Mass paper mailing management +Module52Name=Stocks +Module52Desc=Stock management (products) +Module53Name=Services +Module53Desc=Service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) +Module55Name=Barcodes +Module55Desc=Barcode management +Module56Name=Telephony +Module56Desc=Telephony integration +Module57Name=Standing orders +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. +Module58Name=ClickToDial +Module58Desc=Integration of a ClickToDial system (Asterisk, ...) +Module59Name=Bookmark4u +Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account +Module70Name=Interventions +Module70Desc=Intervention management +Module75Name=Expense and trip notes +Module75Desc=Expense and trip notes management +Module80Name=Shipments +Module80Desc=Shipments and delivery order management +Module85Name=Banks and cash +Module85Desc=Management of bank or cash accounts +Module100Name=External site +Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame +Module105Name=Mailman and SPIP +Module105Desc=Mailman or SPIP interface for member module +Module200Name=LDAP +Module200Desc=LDAP directory synchronisation +Module210Name=PostNuke +Module210Desc=PostNuke integration +Module240Name=Data exports +Module240Desc=Tool to export Dolibarr datas (with assistants) +Module250Name=Data imports +Module250Desc=Tool to import datas in Dolibarr (with assistants) +Module310Name=Members +Module310Desc=Foundation members management +Module320Name=RSS Feed +Module320Desc=Add RSS feed inside Dolibarr screen pages +Module330Name=Bookmarks +Module330Desc=Bookmark management +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module410Name=Webcalendar +Module410Desc=Webcalendar integration +Module500Name=Special expenses (tax, social contributions, dividends) +Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries +Module510Name=Salaries +Module510Desc=Management of employees salaries and payments +Module600Name=Notifications +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) +Module700Name=Donations +Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices +Module1200Name=Mantis +Module1200Desc=Mantis integration +Module1400Name=Accounting +Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation +Module1780Name=Categories +Module1780Desc=Category management (products, suppliers and customers) +Module2000Name=WYSIWYG editor +Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices +Module2300Name=Cron +Module2300Desc=Scheduled task management +Module2400Name=Agenda +Module2400Desc=Events/tasks and agenda management +Module2500Name=Electronic Content Management +Module2500Desc=Save and share documents +Module2600Name=WebServices +Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) +Module2700Name=Gravatar +Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access +Module2800Desc=FTP Client +Module2900Name=GeoIPMaxmind +Module2900Desc=GeoIP Maxmind conversions capabilities +Module3100Name=Skype +Module3100Desc=Add a Skype button into card of adherents / third parties / contacts +Module5000Name=Multi-company +Module5000Desc=Allows you to manage multiple companies +Module6000Name=Workflow +Module6000Desc=Workflow management +Module20000Name=Leave Requests management +Module20000Desc=Declare and follow employees leaves requests +Module39000Name=Product batch +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products +Module50000Name=PayBox +Module50000Desc=Module to offer an online payment page by credit card with PayBox +Module50100Name=Point of sales +Module50100Desc=Point of sales module +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal +Module50400Name=Accounting (advanced) +Module50400Desc=Accounting management (double parties) +Module54000Name=PrintIPP +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). +Module55000Name=Open Poll +Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) +Module59000Name=Margins +Module59000Desc=Module to manage margins +Module60000Name=Commissions +Module60000Desc=Module to manage commissions +Module150010Name=Batch number, eat-by date and sell-by date +Module150010Desc=batch number, eat-by date and sell-by date management for product +Permission11=Read customer invoices +Permission12=Create/modify customer invoices +Permission13=Unvalidate customer invoices +Permission14=Validate customer invoices +Permission15=Send customer invoices by email +Permission16=Create payments for customer invoices +Permission19=Delete customer invoices +Permission21=Read commercial proposals +Permission22=Create/modify commercial proposals +Permission24=Validate commercial proposals +Permission25=Send commercial proposals +Permission26=Close commercial proposals +Permission27=Delete commercial proposals +Permission28=Export commercial proposals +Permission31=Read products +Permission32=Create/modify products +Permission34=Delete products +Permission36=See/manage hidden products +Permission38=Export products +Permission41=Read projects (shared project and projects i'm contact for) +Permission42=Create/modify projects (shared project and projects i'm contact for) +Permission44=Delete projects (shared project and projects i'm contact for) +Permission61=Read interventions +Permission62=Create/modify interventions +Permission64=Delete interventions +Permission67=Export interventions +Permission71=Read members +Permission72=Create/modify members +Permission74=Delete members +Permission75=Setup types of membership +Permission76=Export datas +Permission78=Read subscriptions +Permission79=Create/modify subscriptions +Permission81=Read customers orders +Permission82=Create/modify customers orders +Permission84=Validate customers orders +Permission86=Send customers orders +Permission87=Close customers orders +Permission88=Cancel customers orders +Permission89=Delete customers orders +Permission91=Read social contributions and vat +Permission92=Create/modify social contributions and vat +Permission93=Delete social contributions and vat +Permission94=Export social contributions +Permission95=Read reports +Permission101=Read sendings +Permission102=Create/modify sendings +Permission104=Validate sendings +Permission106=Export sendings +Permission109=Delete sendings +Permission111=Read financial accounts +Permission112=Create/modify/delete and compare transactions +Permission113=Setup financial accounts (create, manage categories) +Permission114=Reconciliate transactions +Permission115=Export transactions and account statements +Permission116=Transfers between accounts +Permission117=Manage cheques dispatching +Permission121=Read third parties linked to user +Permission122=Create/modify third parties linked to user +Permission125=Delete third parties linked to user +Permission126=Export third parties +Permission141=Read projects (also private i am not contact for) +Permission142=Create/modify projects (also private i am not contact for) +Permission144=Delete projects (also private i am not contact for) +Permission146=Read providers +Permission147=Read stats +Permission151=Read standing orders +Permission152=Create/modify a standing orders request +Permission153=Transmission standing orders receipts +Permission154=Credit/refuse standing orders receipts +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses +Permission180=Read suppliers +Permission181=Read supplier orders +Permission182=Create/modify supplier orders +Permission183=Validate supplier orders +Permission184=Approve supplier orders +Permission185=Order or cancel supplier orders +Permission186=Receive supplier orders +Permission187=Close supplier orders +Permission188=Cancel supplier orders +Permission192=Create lines +Permission193=Cancel lines +Permission194=Read the bandwith lines +Permission202=Create ADSL connections +Permission203=Order connections orders +Permission204=Order connections +Permission205=Manage connections +Permission206=Read connections +Permission211=Read Telephony +Permission212=Order lines +Permission213=Activate line +Permission214=Setup Telephony +Permission215=Setup providers +Permission221=Read emailings +Permission222=Create/modify emailings (topic, recipients...) +Permission223=Validate emailings (allows sending) +Permission229=Delete emailings +Permission237=View recipients and info +Permission238=Manually send mailings +Permission239=Delete mailings after validation or sent +Permission241=Read categories +Permission242=Create/modify categories +Permission243=Delete categories +Permission244=See the contents of the hidden categories +Permission251=Read other users and groups +PermissionAdvanced251=Read other users +Permission252=Read permissions of other users +Permission253=Create/modify other users, groups and permisssions +PermissionAdvanced253=Create/modify internal/external users and permissions +Permission254=Create/modify external users only +Permission255=Modify other users password +Permission256=Delete or disable other users +Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves). +Permission271=Read CA +Permission272=Read invoices +Permission273=Issue invoices +Permission281=Read contacts +Permission282=Create/modify contacts +Permission283=Delete contacts +Permission286=Export contacts +Permission291=Read tariffs +Permission292=Set permissions on the tariffs +Permission293=Modify costumers tariffs +Permission300=Read bar codes +Permission301=Create/modify bar codes +Permission302=Delete bar codes +Permission311=Read services +Permission312=Assign service/subscription to contract +Permission331=Read bookmarks +Permission332=Create/modify bookmarks +Permission333=Delete bookmarks +Permission341=Read its own permissions +Permission342=Create/modify his own user information +Permission343=Modify his own password +Permission344=Modify its own permissions +Permission351=Read groups +Permission352=Read groups permissions +Permission353=Create/modify groups +Permission354=Delete or disable groups +Permission358=Export users +Permission401=Read discounts +Permission402=Create/modify discounts +Permission403=Validate discounts +Permission404=Delete discounts +Permission510=Read Salaries +Permission512=Create/modify salaries +Permission514=Delete salaries +Permission517=Export salaries +Permission531=Read services +Permission532=Create/modify services +Permission534=Delete services +Permission536=See/manage hidden services +Permission538=Export services +Permission701=Read donations +Permission702=Create/modify donations +Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports +Permission1001=Read stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses +Permission1004=Read stock movements +Permission1005=Create/modify stock movements +Permission1101=Read delivery orders +Permission1102=Create/modify delivery orders +Permission1104=Validate delivery orders +Permission1109=Delete delivery orders +Permission1181=Read suppliers +Permission1182=Read supplier orders +Permission1183=Create/modify supplier orders +Permission1184=Validate supplier orders +Permission1185=Approve supplier orders +Permission1186=Order supplier orders +Permission1187=Acknowledge receipt of supplier orders +Permission1188=Delete supplier orders +Permission1201=Get result of an export +Permission1202=Create/Modify an export +Permission1231=Read supplier invoices +Permission1232=Create/modify supplier invoices +Permission1233=Validate supplier invoices +Permission1234=Delete supplier invoices +Permission1235=Send supplier invoices by email +Permission1236=Export supplier invoices, attributes and payments +Permission1237=Export supplier orders and their details +Permission1251=Run mass imports of external data into database (data load) +Permission1321=Export customer invoices, attributes and payments +Permission1421=Export customer orders and attributes +Permission23001 = Read Scheduled task +Permission23002 = Create/update Scheduled task +Permission23003 = Delete Scheduled task +Permission23004 = Execute Scheduled task +Permission2401=Read actions (events or tasks) linked to his account +Permission2402=Create/modify actions (events or tasks) linked to his account +Permission2403=Delete actions (events or tasks) linked to his account +Permission2411=Read actions (events or tasks) of others +Permission2412=Create/modify actions (events or tasks) of others +Permission2413=Delete actions (events or tasks) of others +Permission2501=Read/Download documents +Permission2502=Download documents +Permission2503=Submit or delete documents +Permission2515=Setup documents directories +Permission2801=Use FTP client in read mode (browse and download only) +Permission2802=Use FTP client in write mode (delete or upload files) +Permission50101=Use Point of sales +Permission50201=Read transactions +Permission50202=Import transactions +Permission54001=Print +Permission55001=Read polls +Permission55002=Create/modify polls +Permission59001=Read commercial margins +Permission59002=Define commercial margins +Permission59003=Read every user margin +DictionaryCompanyType=Thirdparties type +DictionaryCompanyJuridicalType=Juridical kinds of thirdparties +DictionaryProspectLevel=Prospect potential level +DictionaryCanton=State/Cantons +DictionaryRegion=Regions +DictionaryCountry=Countries +DictionaryCurrency=Currencies +DictionaryCivility=Civility title +DictionaryActions=Type of agenda events +DictionarySocialContributions=Social contributions types +DictionaryVAT=VAT Rates or Sales Tax Rates +DictionaryRevenueStamp=Amount of revenue stamps +DictionaryPaymentConditions=Payment terms +DictionaryPaymentModes=Payment modes +DictionaryTypeContact=Contact/Address types +DictionaryEcotaxe=Ecotax (WEEE) +DictionaryPaperFormat=Paper formats +DictionaryFees=Type of fees +DictionarySendingMethods=Shipping methods +DictionaryStaff=Staff +DictionaryAvailability=Delivery delay +DictionaryOrderMethods=Ordering methods +DictionarySource=Origin of proposals/orders +DictionaryAccountancyplan=Chart of accounts +DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates +SetupSaved=Setup saved +BackToModuleList=Back to modules list +BackToDictionaryList=Back to dictionaries list +VATReceivedOnly=Special rate not charged +VATManagement=VAT Management +VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to VAT, then VAT by default=0. End of rule.
If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule.
If seller and buyer in the European Community and goods are transport products (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.
If seller and buyer in the European Community and buyer is not a company, then the VAT by default=VAT of product sold. End of rule.
If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.
Else the proposed default VAT=0. End of rule. +VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies. +VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. +VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices. +##### Local Taxes ##### +LTRate=Rate +LocalTax1IsUsed=Use second tax +LocalTax1IsNotUsed=Do not use second tax +LocalTax1IsUsedDesc=Use a second type of tax (other than VAT) +LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT) +LocalTax1Management=Second type of tax +LocalTax1IsUsedExample= +LocalTax1IsNotUsedExample= +LocalTax2IsUsed=Use third tax +LocalTax2IsNotUsed=Do not use third tax +LocalTax2IsUsedDesc=Use a third type of tax (other than VAT) +LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT) +LocalTax2Management=Third type of tax +LocalTax2IsUsedExample= +LocalTax2IsNotUsedExample= +LocalTax1ManagementES= RE Management +LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If te buyer is not subjected to RE, RE by default=0. End of rule.
If the buyer is subjected to RE then the RE by default. End of rule.
+LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule. +LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE. +LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE. +LocalTax2ManagementES= IRPF Management +LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.
If the seller is subjected to IRPF then the IRPF by default. End of rule.
+LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule. +LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules. +LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules. +CalcLocaltax=Reports +CalcLocaltax1ES=Sales - Purchases +CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases +CalcLocaltax2ES=Purchases +CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases +CalcLocaltax3ES=Sales +CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales +LabelUsedByDefault=Label used by default if no translation can be found for code +LabelOnDocuments=Label on documents +NbOfDays=Nb of days +AtEndOfMonth=At end of month +Offset=Offset +AlwaysActive=Always active +UpdateRequired=Your system needs to be updated. To do this, click on Update now. +Upgrade=Upgrade +MenuUpgrade=Upgrade / Extend +AddExtensionThemeModuleOrOther=Add extension (theme, module, ...) +WebServer=Web server +DocumentRootServer=Web server's root directory +DataRootServer=Data files directory +IP=IP +Port=Port +VirtualServerName=Virtual server name +AllParameters=All parameters +OS=OS +PhpEnv=Env +PhpModules=Modules +PhpConf=Conf +PhpWebLink=Web-Php link +Pear=Pear +PearPackages=Pear Packages +Browser=Browser +Server=Server +Database=Database +DatabaseServer=Database host +DatabaseName=Database name +DatabasePort=Database port +DatabaseUser=Database user +DatabasePassword=Database password +DatabaseConfiguration=Database setup +Tables=Tables +TableName=Table name +TableLineFormat=Line format +NbOfRecord=Nb of records +Constraints=Constraints +ConstraintsType=Constraints type +ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry +AllMustBeOk=All of these must be checked +Host=Server +DriverType=Driver type +SummarySystem=System information summary +SummaryConst=List of all Dolibarr setup parameters +SystemUpdate=System update +SystemSuccessfulyUpdate=Your system has been updated successfuly +MenuCompanySetup=Company/Foundation +MenuNewUser=New user +MenuTopManager=Top menu manager +MenuLeftManager=Left menu manager +MenuManager=Menu manager +MenuSmartphoneManager=Smartphone menu manager +DefaultMenuTopManager=Top menu manager +DefaultMenuLeftManager=Left menu manager +DefaultMenuManager= Standard menu manager +DefaultMenuSmartphoneManager=Smartphone menu manager +Skin=Skin theme +DefaultSkin=Default skin theme +MaxSizeList=Max length for list +DefaultMaxSizeList=Default max length for list +MessageOfDay=Message of the day +MessageLogin=Login page message +PermanentLeftSearchForm=Permanent search form on left menu +DefaultLanguage=Default language to use (language code) +EnableMultilangInterface=Enable multilingual interface +EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) +SystemSuccessfulyUpdated=Your system has been updated successfully +CompanyInfo=Company/foundation information +CompanyIds=Company/foundation identities +CompanyName=Name +CompanyAddress=Address +CompanyZip=Zip +CompanyTown=Town +CompanyCountry=Country +CompanyCurrency=Main currency +Logo=Logo +DoNotShow=Do not show +DoNotSuggestPaymentMode=Do not suggest +NoActiveBankAccountDefined=No active bank account defined +OwnerOfBankAccount=Owner of bank account %s +BankModuleNotActive=Bank accounts module not enabled +ShowBugTrackLink=Show link "Report a bug" +ShowWorkBoard=Show "workbench" on homepage +Alerts=Alerts +Delays=Delays +DelayBeforeWarning=Delay before warning +DelaysBeforeWarning=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. +Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events not yet realised +Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not yet processed +Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not yet processed +Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close +Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed +Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate +Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services +Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices +Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices +Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation +Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee +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. +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 Setup -> Company/foundation are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country). +SetupDescription4=Parameters in menu Setup -> Modules are required because Dolibarr is not a fixed ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in menus. +SetupDescription5=Other menu entries manage optional parameters. +EventsSetup=Setup for events logs +LogEvents=Security audit events +Audit=Audit +InfoDolibarr=Infos Dolibarr +InfoBrowser=Infos Browser +InfoOS=Infos OS +InfoWebServer=Infos web server +InfoDatabase=Infos database +InfoPHP=Infos PHP +InfoPerf=Infos performances +BrowserName=Browser name +BrowserOS=Browser OS +ListEvents=Audit events +ListOfSecurityEvents=List of Dolibarr security events +SecurityEventsPurged=Security events purged +LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu System tools - Audit. Warning, this feature can consume a large amount of data in database. +AreaForAdminOnly=Those features can be used by administrator users only. +SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only. +SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit. +CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page) +DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here +AvailableModules=Available modules +ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules). +SessionTimeOut=Time out for session +SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every %s/%s access, but only during access made by other sessions.
Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default session.gc_maxlifetime, no matter what the value entered here. +TriggersAvailable=Available triggers +TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory htdocs/core/triggers. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...). +TriggerDisabledByName=Triggers in this file are disabled by the -NORUN suffix in their name. +TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module %s is disabled. +TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules. +TriggerActiveAsModuleActive=Triggers in this file are active as module %s is enabled. +GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password +DictionaryDesc=Define here all reference datas. You can complete predefined value with yours. +ConstDesc=This page allows you to edit all other parameters not available in previous pages. They are reserved parameters for advanced developers or for troubleshouting. +OnceSetupFinishedCreateUsers=Warning, you are a Dolibarr administrator user. Administrator users are used to setup Dolibarr. For a usual usage of Dolibarr, it is recommended to use a non administrator user created from Users & Groups menu. +MiscellaneousDesc=Define here all other parameters related to security. +LimitsSetup=Limits/Precision setup +LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here +MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices +MAIN_MAX_DECIMALS_TOT=Max decimals for total prices +MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add ... after this number if you want to see ... when number is truncated when shown on screen) +MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files. +MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10) +UnitPriceOfProduct=Net unit price of a product +TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding +ParameterActiveForNextInputOnly=Parameter effective for next input only +NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page. +NoEventFoundWithCriteria=No security event has been found for such search criterias. +SeeLocalSendMailSetup=See your local sendmail setup +BackupDesc=To make a complete backup of Dolibarr, you must: +BackupDesc2=* Save content of documents directory (%s) that contains all uploaded and generated files (you can make a zip for example). +BackupDesc3=* Save content of your database into a dump file. For this, you can use following assistant. +BackupDescX=Archived directory should be stored in a secure place. +BackupDescY=The generated dump file should be stored in a secure place. +BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one +RestoreDesc=To restore a Dolibarr backup, you must: +RestoreDesc2=* Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s). +RestoreDesc3=* Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation. Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant. +RestoreMySQL=MySQL import +ForcedToByAModule= This rule is forced to %s by an activated module +PreviousDumpFiles=Available database backup dump files +WeekStartOnDay=First day of week +RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s) +YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s or you must add -W option at end of command line to provide %s password. +YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP +DownloadMoreSkins=More skins to download +SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset +ShowProfIdInAddress=Show professionnal id with addresses on documents +ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents +TranslationUncomplete=Partial translation +SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/. +MenuUseLayout=Make vertical menu hidable (option javascript must not be disabled) +MAIN_DISABLE_METEO=Disable meteo view +TestLoginToAPI=Test login to API +ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it. +ExternalAccess=External access +MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet) +MAIN_PROXY_HOST=Name/Address of proxy server +MAIN_PROXY_PORT=Port of proxy server +MAIN_PROXY_USER=Login to use the proxy server +MAIN_PROXY_PASS=Password to use the proxy server +DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. +ExtraFields=Complementary attributes +ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) +ExtraFieldsThirdParties=Complementary attributes (thirdparty) +ExtraFieldsContacts=Complementary attributes (contact/address) +ExtraFieldsMember=Complementary attributes (member) +ExtraFieldsMemberType=Complementary attributes (member type) +ExtraFieldsCustomerOrders=Complementary attributes (orders) +ExtraFieldsCustomerInvoices=Complementary attributes (invoices) +ExtraFieldsSupplierOrders=Complementary attributes (orders) +ExtraFieldsSupplierInvoices=Complementary attributes (invoices) +ExtraFieldsProject=Complementary attributes (projects) +ExtraFieldsProjectTask=Complementary attributes (tasks) +ExtraFieldHasWrongValue=Attribute %s has a wrong value. +AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space +AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space +SendingMailSetup=Setup of sendings by email +SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba). +PathToDocuments=Path to documents +PathDirectory=Directory +SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages. +TranslationSetup=Configuration de la traduction +TranslationDesc=Choice of language visible on screen can be modified:
* Globally from menu Home - Setup - Display
* For user only from tab User display of user card (click on login on top of screen). +TotalNumberOfActivatedModules=Total number of activated feature modules: %s +YouMustEnableOneModule=You must at least enable 1 module +ClassNotFoundIntoPathWarning=Class %s not found into PHP path +YesInSummer=Yes in summer +OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): +SuhosinSessionEncrypt=Session storage encrypted by Suhosin +ConditionIsCurrently=Condition is currently %s +YouUseBestDriver=You use driver %s that is best driver available currently. +YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. +NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. +SearchOptim=Search optimization +YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response. +BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance. +BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari. +XDebugInstalled=XDebug is loaded. +XCacheInstalled=XCache is loaded. +AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp". +FieldEdition=Edition of field %s +FixTZ=TimeZone fix +FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) +GetBarCode=Get barcode +EmptyNumRefModelDesc=The code is free. This code can be modified at any time. +##### Module password generation +PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. +PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually. +##### Users setup ##### +UserGroupSetup=Users and groups module setup +GeneratePassword=Suggest a generated password +RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords +DoNotSuggest=Do not suggest any password +EncryptedPasswordInDatabase=To allow the encryption of the passwords in the database +DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page +UsersSetup=Users module setup +UserMailRequired=EMail required to create a new user +##### Company setup ##### +CompanySetup=Companies module setup +CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier) +AccountCodeManager=Module for accountancy code generation (customer or supplier) +ModuleCompanyCodeAquarium=Return an accountancy code built by:
%s followed by third party supplier code for a supplier accountancy code,
%s followed by third party customer code for a customer accountancy code. +ModuleCompanyCodePanicum=Return an empty accountancy code. +ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. +UseNotifications=Use notifications +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* or by setting a global target email address on module setup page. +ModelModules=Documents templates +DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) +WatermarkOnDraft=Watermark on draft document +JSOnPaimentBill=Activate feature to autofill payment lines on payment form +CompanyIdProfChecker=Rules on Professional Ids +MustBeUnique=Must be unique ? +MustBeMandatory=Mandatory to create third parties ? +MustBeInvoiceMandatory=Mandatory to validate invoices ? +Miscellaneous=Miscellaneous +##### Webcal setup ##### +WebCalSetup=Webcalendar link setup +WebCalSyncro=Add Dolibarr events to WebCalendar +WebCalAllways=Always, no asking +WebCalYesByDefault=On demand (yes by default) +WebCalNoByDefault=On demand (no by default) +WebCalNever=Never +WebCalURL=URL for calendar access +WebCalServer=Server hosting calendar database +WebCalDatabaseName=Database name +WebCalUser=User to access database +WebCalSetupSaved=Webcalendar setup saved successfully. +WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. +WebCalTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. +WebCalTestKo2=Connection to server '%s' with user '%s' failed. +WebCalErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Webcalendar database. +WebCalAddEventOnCreateActions=Add calendar event on actions create +WebCalAddEventOnCreateCompany=Add calendar event on companies create +WebCalAddEventOnStatusPropal=Add calendar event on commercial proposals status change +WebCalAddEventOnStatusContract=Add calendar event on contracts status change +WebCalAddEventOnStatusBill=Add calendar event on bills status change +WebCalAddEventOnStatusMember=Add calendar event on members status change +WebCalUrlForVCalExport=An export link to %s format is available at following link: %s +WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct. +##### Invoices ##### +BillsSetup=Invoices module setup +BillsDate=Invoices date +BillsNumberingModule=Invoices and credit notes numbering model +BillsPDFModules=Invoice documents models +CreditNoteSetup=Credit note module setup +CreditNotePDFModules=Credit note document models +CreditNote=Credit note +CreditNotes=Credit notes +ForceInvoiceDate=Force invoice date to validation date +DisableRepeatable=Disable repeatable invoices +SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice +EnableEditDeleteValidInvoice=Enable the possibility to edit/delete valid invoice with no payment +SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account +SuggestPaymentByChequeToAddress=Suggest payment by cheque to +FreeLegalTextOnInvoices=Free text on invoices +WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty) +##### Proposals ##### +PropalSetup=Commercial proposals module setup +CreateForm=Create forms +NumberOfProductLines=Number of product lines +ProposalsNumberingModules=Commercial proposal numbering models +ProposalsPDFModules=Commercial proposal documents models +ClassifiedInvoiced=Classified invoiced +HideTreadedPropal=Hide the treated commercial proposals in the list +AddShippingDateAbility=Add shipping date ability +AddDeliveryAddressAbility=Add delivery date ability +UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option +FreeLegalTextOnProposal=Free text on commercial proposals +WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### Orders ##### +OrdersSetup=Order management setup +OrdersNumberingModules=Orders numbering models +OrdersModelModule=Order documents models +HideTreadedOrders=Hide the treated or cancelled orders in the list +ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order +FreeLegalTextOnOrders=Free text on orders +WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable +BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order +##### Clicktodial ##### +ClickToDialSetup=Click To Dial module setup +ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
__PHONETO__ that will be replaced with the phone number of person to call
__PHONEFROM__ that will be replaced with phone number of calling person (yours)
__LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
__PASS__ that will be replaced with your clicktodial password (defined on your user card). +##### Bookmark4u ##### +Bookmark4uSetup=Bookmark4u module setup +##### Interventions ##### +InterventionsSetup=Interventions module setup +FreeLegalTextOnInterventions=Free text on intervention documents +FicheinterNumberingModules=Intervention numbering models +TemplatePDFInterventions=Intervention card documents models +WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) +##### Contracts ##### +ContractsSetup=Contracts/Subscriptions module setup +ContractsNumberingModules=Contracts numbering modules +TemplatePDFContracts=Contracts documents models +FreeLegalTextOnContracts=Free text on contracts +WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) +##### Members ##### +MembersSetup=Members module setup +MemberMainOptions=Main options +AddSubscriptionIntoAccount=Suggest by default to create a bank transaction, in bank module, when adding a new payed subscription +AdherentLoginRequired= Manage a Login for each member +AdherentMailRequired=EMail required to create a new member +MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default +##### LDAP setup ##### +LDAPSetup=LDAP Setup +LDAPGlobalParameters=Global parameters +LDAPUsersSynchro=Users +LDAPGroupsSynchro=Groups +LDAPContactsSynchro=Contacts +LDAPMembersSynchro=Members +LDAPSynchronization=LDAP synchronisation +LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP +LDAPToDolibarr=LDAP -> Dolibarr +DolibarrToLDAP=Dolibarr -> LDAP +LDAPNamingAttribute=Key in LDAP +LDAPSynchronizeUsers=Organization of users in LDAP +LDAPSynchronizeGroups=Organization of groups in LDAP +LDAPSynchronizeContacts=Organization of contacts in LDAP +LDAPSynchronizeMembers=Organization of foundation's members in LDAP +LDAPTypeExample=OpenLdap, Egroupware or Active Directory +LDAPPrimaryServer=Primary server +LDAPSecondaryServer=Secondary server +LDAPServerPort=Server port +LDAPServerPortExample=Default port : 389 +LDAPServerProtocolVersion=Protocol version +LDAPServerUseTLS=Use TLS +LDAPServerUseTLSExample=Your LDAP server use TLS +LDAPServerDn=Server DN +LDAPAdminDn=Administrator DN +LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com) +LDAPPassword=Administrator password +LDAPUserDn=Users' DN +LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com) +LDAPGroupDn=Groups' DN +LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com) +LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) +LDAPServerDnExample=Complete DN (ex: dc=example,dc=com) +LDAPPasswordExample=Admin password +LDAPDnSynchroActive=Users and groups synchronization +LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization +LDAPDnContactActive=Contacts' synchronization +LDAPDnContactActiveYes=Activated synchronization +LDAPDnContactActiveExample=Activated/Unactivated synchronization +LDAPDnMemberActive=Members' synchronization +LDAPDnMemberActiveExample=Activated/Unactivated synchronization +LDAPContactDn=Dolibarr contacts' DN +LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com) +LDAPMemberDn=Dolibarr members DN +LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com) +LDAPMemberObjectClassList=List of objectClass +LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPUserObjectClassList=List of objectClass +LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPGroupObjectClassList=List of objectClass +LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames) +LDAPContactObjectClassList=List of objectClass +LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPMemberTypeDn=Dolibarr members type DN +LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=example,dc=com) +LDAPTestConnect=Test LDAP connection +LDAPTestSynchroContact=Test contacts synchronization +LDAPTestSynchroUser=Test user synchronization +LDAPTestSynchroGroup=Test group synchronization +LDAPTestSynchroMember=Test member synchronization +LDAPTestSearch= Test a LDAP search +LDAPSynchroOK=Synchronization test successful +LDAPSynchroKO=Failed synchronization test +LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates +LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s) +LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s) +LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPUnbindSuccessfull=Disconnect successful +LDAPUnbindFailed=Disconnect failed +LDAPConnectToDNSuccessfull=Connection to DN (%s) successful +LDAPConnectToDNFailed=Connection to DN (%s) failed +LDAPSetupForVersion3=LDAP server configured for version 3 +LDAPSetupForVersion2=LDAP server configured for version 2 +LDAPDolibarrMapping=Dolibarr Mapping +LDAPLdapMapping=LDAP Mapping +LDAPFieldLoginUnix=Login (unix) +LDAPFieldLoginExample=Example : uid +LDAPFilterConnection=Search filter +LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson) +LDAPFieldLoginSamba=Login (samba, activedirectory) +LDAPFieldLoginSambaExample=Example : samaccountname +LDAPFieldFullname=Full name +LDAPFieldFullnameExample=Example : cn +LDAPFieldPassword=Password +LDAPFieldPasswordNotCrypted=Password not crypted +LDAPFieldPasswordCrypted=Password crypted +LDAPFieldPasswordExample=Example : userPassword +LDAPFieldCommonName=Common name +LDAPFieldCommonNameExample=Example : cn +LDAPFieldName=Name +LDAPFieldNameExample=Example : sn +LDAPFieldFirstName=First name +LDAPFieldFirstNameExample=Example : givenName +LDAPFieldMail=Email address +LDAPFieldMailExample=Example : mail +LDAPFieldPhone=Professional phone number +LDAPFieldPhoneExample=Example : telephonenumber +LDAPFieldHomePhone=Personal phone number +LDAPFieldHomePhoneExample=Example : homephone +LDAPFieldMobile=Cellular phone +LDAPFieldMobileExample=Example : mobile +LDAPFieldFax=Fax number +LDAPFieldFaxExample=Example : facsimiletelephonenumber +LDAPFieldAddress=Street +LDAPFieldAddressExample=Example : street +LDAPFieldZip=Zip +LDAPFieldZipExample=Example : postalcode +LDAPFieldTown=Town +LDAPFieldTownExample=Example : l +LDAPFieldCountry=Country +LDAPFieldCountryExample=Example : c +LDAPFieldDescription=Description +LDAPFieldDescriptionExample=Example : description +LDAPFieldGroupMembers= Group members +LDAPFieldGroupMembersExample= Example : uniqueMember +LDAPFieldBirthdate=Birthdate +LDAPFieldBirthdateExample=Example : +LDAPFieldCompany=Company +LDAPFieldCompanyExample=Example : o +LDAPFieldSid=SID +LDAPFieldSidExample=Example : objectsid +LDAPFieldEndLastSubscription=Date of subscription end +LDAPFieldTitle=Post/Function +LDAPFieldTitleExample=Example: title +LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPSetupNotComplete=LDAP setup not complete (go on others tabs) +LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode. +LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts. +LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users. +LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups. +LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module. +LDAPDescValues=Example values are designed for OpenLDAP with following loaded schemas: core.schema, cosine.schema, inetorgperson.schema). If you use thoose values and OpenLDAP, modify your LDAP config file slapd.conf to have all thoose schemas loaded. +ForANonAnonymousAccess=For an authenticated access (for a write access for example) +PerfDolibarr=Performance setup/optimizing report +YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance. +NotInstalled=Not installed, so your server is not slow down by this. +ApplicativeCache=Applicative cache +MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server. +MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete. +MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled. +OPCodeCache=OPCode cache +NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad). +HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript) +FilesOfTypeCached=Files of type %s are cached by HTTP server +FilesOfTypeNotCached=Files of type %s are not cached by HTTP server +FilesOfTypeCompressed=Files of type %s are compressed by HTTP server +FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server +CacheByServer=Cache by server +CacheByClient=Cache by browser +CompressionOfResources=Compression of HTTP responses +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +##### Products ##### +ProductSetup=Products module setup +ServiceSetup=Services module setup +ProductServiceSetup=Products and Services modules setup +NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit) +ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms +ModifyProductDescAbility=Personalization of product descriptions in forms +ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip) +ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language +UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). +UseEcoTaxeAbility=Support Eco-Taxe (WEEE) +SetDefaultBarcodeTypeProducts=Default barcode type to use for products +SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties +ProductCodeChecker= Module for product code generation and checking (product or service) +ProductOtherConf= Product / Service configuration +##### Syslog ##### +SyslogSetup=Logs module setup +SyslogOutput=Logs outputs +SyslogSyslog=Syslog +SyslogFacility=Facility +SyslogLevel=Level +SyslogSimpleFile=File +SyslogFilename=File name and path +YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file. +ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant +OnlyWindowsLOG_USER=Windows only supports LOG_USER +##### Donations ##### +DonationsSetup=Donation module setup +DonationsReceiptModel=Template of donation receipt +##### Barcode ##### +BarcodeSetup=Barcode setup +PaperFormatModule=Print format module +BarcodeEncodeModule=Barcode encoding type +UseBarcodeInProductModule=Use bar codes for products +CodeBarGenerator=Barcode generator +ChooseABarCode=No generator defined +FormatNotSupportedByGenerator=Format not supported by this generator +BarcodeDescEAN8=Barcode of type EAN8 +BarcodeDescEAN13=Barcode of type EAN13 +BarcodeDescUPC=Barcode of type UPC +BarcodeDescISBN=Barcode of type ISBN +BarcodeDescC39=Barcode of type C39 +BarcodeDescC128=Barcode of type C128 +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode +BarcodeInternalEngine=Internal engine +BarCodeNumberManager=Manager to auto define barcode numbers +##### Prelevements ##### +WithdrawalsSetup=Withdrawal module setup +##### ExternalRSS ##### +ExternalRSSSetup=External RSS imports setup +NewRSS=New RSS Feed +RSSUrl=RSS URL +RSSUrlExample=An interesting RSS feed +##### Mailing ##### +MailingSetup=EMailing module setup +MailingEMailFrom=Sender EMail (From) for emails sent by emailing module +MailingEMailError=Return EMail (Errors-to) for emails with errors +MailingDelay=Seconds to wait after sending next message +##### Notification ##### +NotificationSetup=EMail notification module setup +NotificationEMailFrom=Sender EMail (From) for emails sent for notifications +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target +##### Sendings ##### +SendingsSetup=Sending module setup +SendingsReceiptModel=Sending receipt model +SendingsNumberingModules=Sendings numbering modules +SendingsAbility=Support shipment sheets for customer deliveries +NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated. +FreeLegalTextOnShippings=Free text on shipments +##### Deliveries ##### +DeliveryOrderNumberingModules=Products deliveries receipt numbering module +DeliveryOrderModel=Products deliveries receipt model +DeliveriesOrderAbility=Support products deliveries receipts +FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts +##### FCKeditor ##### +AdvancedEditor=Advanced editor +ActivateFCKeditor=Activate advanced editor for: +FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) +FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files. +FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) +FCKeditorForUserSignature=WYSIWIG creation/edition of user signature +FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing) +##### OSCommerce 1 ##### +OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s). +OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull. +OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. +OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. +##### Stock ##### +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. +##### Menu ##### +MenuDeleted=Menu deleted +TreeMenu=Tree menus +Menus=Menus +TreeMenuPersonalized=Personalized menus +NewMenu=New menu +MenuConf=Menus setup +Menu=Selection of menu +MenuHandler=Menu handler +MenuModule=Source module +HideUnauthorizedMenu= Hide unauthorized menus (gray) +DetailId=Id menu +DetailMenuHandler=Menu handler where to show new menu +DetailMenuModule=Module name if menu entry come from a module +DetailType=Type of menu (top or left) +DetailTitre=Menu label or label code for translation +DetailMainmenu=Group for which it belongs (obsolete) +DetailUrl=URL where menu send you (Absolute URL link or external link with http://) +DetailLeftmenu=Display condition or not (obsolete) +DetailEnabled=Condition to show or not entry +DetailRight=Condition to display unauthorized grey menus +DetailLangs=Lang file name for label code translation +DetailUser=Intern / Extern / All +Target=Target +DetailTarget=Target for links (_blank top open a new window) +DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu) +ModifMenu=Menu change +DeleteMenu=Delete menu entry +ConfirmDeleteMenu=Are you sure you want to delete menu entry %s ? +DeleteLine=Delete line +ConfirmDeleteLine=Are you sure you want to delete this line ? +##### Tax ##### +TaxSetup=Taxes, social contributions and dividends module setup +OptionVatMode=VAT due +OptionVATDefault=Cash basis +OptionVATDebitOption=Accrual basis +OptionVatDefaultDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on payments for services +OptionVatDebitOptionDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on invoice (debit) for services +SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: +OnDelivery=On delivery +OnPayment=On payment +OnInvoice=On invoice +SupposedToBePaymentDate=Payment date used +SupposedToBeInvoiceDate=Invoice date used +Buy=Buy +Sell=Sell +InvoiceDateUsed=Invoice date used +YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup. +AccountancyCode=Accountancy Code +AccountancyCodeSell=Sale account. code +AccountancyCodeBuy=Purchase account. code +##### Agenda ##### +AgendaSetup=Events and agenda module setup +PasswordTogetVCalExport=Key to authorize export link +PastDelayVCalExport=Do not export event older than +AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) +AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view +AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view +AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda +##### ClickToDial ##### +ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example. +##### Point Of Sales (CashDesk) ##### +CashDesk=Point of sales +CashDeskSetup=Point of sales module setup +CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskBankAccountForSell=Default account to use to receive cash payments +CashDeskBankAccountForCheque= Default account to use to receive payments by cheque +CashDeskBankAccountForCB= Default account to use to receive payments by credit cards +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). +CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease +StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management +CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. +##### Bookmark ##### +BookmarkSetup=Bookmark module setup +BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. +NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu +##### WebServices ##### +WebServicesSetup=Webservices module setup +WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services. +WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here +EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url +##### Bank ##### +BankSetupModule=Bank module setup +FreeLegalTextOnChequeReceipts=Free text on cheque receipts +BankOrderShow=Display order of bank accounts for countries using "detailed bank number" +BankOrderGlobal=General +BankOrderGlobalDesc=General display order +BankOrderES=Spanish +BankOrderESDesc=Spanish display order +##### Multicompany ##### +MultiCompanySetup=Multi-company module setup +##### Suppliers ##### +SuppliersSetup=Supplier module setup +SuppliersCommandModel=Complete template of supplier order (logo...) +SuppliersInvoiceModel=Complete template of supplier invoice (logo...) +SuppliersInvoiceNumberingModel=Supplier invoices numbering models +##### GeoIPMaxmind ##### +GeoIPMaxmindSetup=GeoIP Maxmind module setup +PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat +NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions). +YouCanDownloadFreeDatFileTo=You can download a free demo version of the Maxmind GeoIP country file at %s. +YouCanDownloadAdvancedDatFileTo=You can also download a more complete version, with updates, of the Maxmind GeoIP country file at %s. +TestGeoIPResult=Test of a conversion IP -> country +##### Projects ##### +ProjectsNumberingModules=Projects numbering module +ProjectsSetup=Project module setup +ProjectsModelModule=Project reports document model +TasksNumberingModules=Tasks numbering module +TaskModelModule=Tasks reports document model +##### ECM (GED) ##### +ECMSetup = GED Setup +ECMAutoTree = Automatic tree folder and document +##### Fiscal Year ##### +FiscalYears=Fiscal years +FiscalYear=Fiscal year +FiscalYearCard=Fiscal year card +NewFiscalYear=New fiscal year +EditFiscalYear=Edit fiscal year +OpenFiscalYear=Open fiscal year +CloseFiscalYear=Close fiscal year +DeleteFiscalYear=Delete fiscal year +ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? +Opened=Opened +Closed=Closed +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order +Format=Format +TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/kn_IN/agenda.lang b/htdocs/langs/kn_IN/agenda.lang new file mode 100644 index 00000000000..04e2ae30de8 --- /dev/null +++ b/htdocs/langs/kn_IN/agenda.lang @@ -0,0 +1,93 @@ +# Dolibarr language file - Source file is en_US - agenda +IdAgenda=ID event +Actions=Events +ActionsArea=Events area (Actions and tasks) +Agenda=Agenda +Agendas=Agendas +Calendar=Calendar +Calendars=Calendars +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by +AffectedTo=Assigned to +DoneBy=Done by +Event=Event +Events=Events +EventsNb=Number of events +MyEvents=My events +OtherEvents=Other events +ListOfActions=List of events +Location=Location +EventOnFullDay=Event on all day(s) +SearchAnAction= Search an event/task +MenuToDoActions=All incomplete events +MenuDoneActions=All terminated events +MenuToDoMyActions=My incomplete events +MenuDoneMyActions=My terminated events +ListOfEvents=List of events (internal calendar) +ActionsAskedBy=Events reported by +ActionsToDoBy=Events assigned to +ActionsDoneBy=Events done by +ActionsForUser=Events for user +ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to +AllMyActions= All my events/tasks +AllActions= All events/tasks +ViewList=List view +ViewCal=Month view +ViewDay=Day view +ViewWeek=Week view +ViewPerUser=Per user view +ViewWithPredefinedFilters= View with predefined filters +AutoActions= Automatic filling +AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. +AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) +AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status +InvoiceDeleteDolibarr=Invoice %s deleted +OrderValidatedInDolibarr= Order %s validated +OrderApprovedInDolibarr=Order %s approved +OrderRefusedInDolibarr=Order %s refused +OrderBackToDraftInDolibarr=Order %s go back to draft status +OrderCanceledInDolibarr=Order %s canceled +ProposalSentByEMail=Commercial proposal %s sent by EMail +OrderSentByEMail=Customer order %s sent by EMail +InvoiceSentByEMail=Customer invoice %s sent by EMail +SupplierOrderSentByEMail=Supplier order %s sent by EMail +SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail +ShippingSentByEMail=Shipment %s sent by EMail +ShippingValidated= Shipment %s validated +InterventionSentByEMail=Intervention %s sent by EMail +NewCompanyToDolibarr= Third party created +DateActionPlannedStart= Planned start date +DateActionPlannedEnd= Planned end date +DateActionDoneStart= Real start date +DateActionDoneEnd= Real end date +DateActionStart= Start date +DateActionEnd= End date +AgendaUrlOptions1=You can also add following parameters to filter output: +AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. +AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. +AgendaShowBirthdayEvents=Show birthday's contacts +AgendaHideBirthdayEvents=Hide birthday's contacts +Busy=Busy +ExportDataset_event1=List of agenda events +DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) +DefaultWorkingHours=Default working hours in day (Example: 9-18) +# External Sites ical +ExportCal=Export calendar +ExtSites=Import external calendars +ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesNbOfAgenda=Number of calendars +AgendaExtNb=Calendar nb %s +ExtSiteUrlAgenda=URL to access .ical file +ExtSiteNoLabel=No Description +WorkingTimeRange=Working time range +WorkingDaysRange=Working days range +AddEvent=Create event +MyAvailability=My availability diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang new file mode 100644 index 00000000000..a2306950fb4 --- /dev/null +++ b/htdocs/langs/kn_IN/banks.lang @@ -0,0 +1,165 @@ +# Dolibarr language file - Source file is en_US - banks +Bank=Bank +Banks=Banks +MenuBankCash=Bank/Cash +MenuSetupBank=Bank/Cash setup +BankName=Bank name +FinancialAccount=Account +FinancialAccounts=Accounts +BankAccount=Bank account +BankAccounts=Bank accounts +ShowAccount=Show Account +AccountRef=Financial account ref +AccountLabel=Financial account label +CashAccount=Cash account +CashAccounts=Cash accounts +MainAccount=Main account +CurrentAccount=Current account +CurrentAccounts=Current accounts +SavingAccount=Savings account +SavingAccounts=Savings accounts +ErrorBankLabelAlreadyExists=Financial account label already exists +BankBalance=Balance +BankBalanceBefore=Balance before +BankBalanceAfter=Balance after +BalanceMinimalAllowed=Minimum allowed balance +BalanceMinimalDesired=Minimum desired balance +InitialBankBalance=Initial balance +EndBankBalance=End balance +CurrentBalance=Current balance +FutureBalance=Future balance +ShowAllTimeBalance=Show balance from start +AllTime=From start +Reconciliation=Reconciliation +RIB=Bank Account Number +IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid +BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid +StandingOrders=Standing orders +StandingOrder=Standing order +Withdrawals=Withdrawals +Withdrawal=Withdrawal +AccountStatement=Account statement +AccountStatementShort=Statement +AccountStatements=Account statements +LastAccountStatements=Last account statements +Rapprochement=Reconciliate +IOMonthlyReporting=Monthly reporting +BankAccountDomiciliation=Account address +BankAccountCountry=Account country +BankAccountOwner=Account owner name +BankAccountOwnerAddress=Account owner address +RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN). +CreateAccount=Create account +NewAccount=New account +NewBankAccount=New bank account +NewFinancialAccount=New financial account +MenuNewFinancialAccount=New financial account +NewCurrentAccount=New current account +NewSavingAccount=New savings account +NewCashAccount=New cash account +EditFinancialAccount=Edit account +AccountSetup=Financial accounts setup +SearchBankMovement=Search bank movement +Debts=Debts +LabelBankCashAccount=Bank or cash label +AccountType=Account type +BankType0=Savings account +BankType1=Current or credit card account +BankType2=Cash account +IfBankAccount=If bank account +AccountsArea=Accounts area +AccountCard=Account card +DeleteAccount=Delete account +ConfirmDeleteAccount=Are you sure you want to delete this account ? +Account=Account +ByCategories=By categories +ByRubriques=By categories +BankTransactionByCategories=Bank transactions by categories +BankTransactionForCategory=Bank transactions for category %s +RemoveFromRubrique=Remove link with category +RemoveFromRubriqueConfirm=Are you sure you want to remove link between the transaction and the category ? +ListBankTransactions=List of bank transactions +IdTransaction=Transaction ID +BankTransactions=Bank transactions +SearchTransaction=Search transaction +ListTransactions=List transactions +ListTransactionsByCategory=List transaction/category +TransactionsToConciliate=Transactions to reconcile +Conciliable=Can be reconciled +Conciliate=Reconcile +Conciliation=Reconciliation +ConciliationForAccount=Reconcile this account +IncludeClosedAccount=Include closed accounts +OnlyOpenedAccount=Only opened accounts +AccountToCredit=Account to credit +AccountToDebit=Account to debit +DisableConciliation=Disable reconciliation feature for this account +ConciliationDisabled=Reconciliation feature disabled +StatusAccountOpened=Opened +StatusAccountClosed=Closed +AccountIdShort=Number +EditBankRecord=Edit record +LineRecord=Transaction +AddBankRecord=Add transaction +AddBankRecordLong=Add transaction manually +ConciliatedBy=Reconciled by +DateConciliating=Reconcile date +BankLineConciliated=Transaction reconciled +CustomerInvoicePayment=Customer payment +CustomerInvoicePaymentBack=Customer payment back +SupplierInvoicePayment=Supplier payment +WithdrawalPayment=Withdrawal payment +SocialContributionPayment=Social contribution payment +FinancialAccountJournal=Financial account journal +BankTransfer=Bank transfer +BankTransfers=Bank transfers +TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction) +TransferFrom=From +TransferTo=To +TransferFromToDone=A transfer from %s to %s of %s %s has been recorded. +CheckTransmitter=Transmitter +ValidateCheckReceipt=Validate this check receipt ? +ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done ? +DeleteCheckReceipt=Delete this check receipt ? +ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt ? +BankChecks=Bank checks +BankChecksToReceipt=Checks waiting for deposit +ShowCheckReceipt=Show check deposit receipt +NumberOfCheques=Nb of check +DeleteTransaction=Delete transaction +ConfirmDeleteTransaction=Are you sure you want to delete this transaction ? +ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions +BankMovements=Movements +CashBudget=Cash budget +PlannedTransactions=Planned transactions +Graph=Graphics +ExportDataset_banque_1=Bank transactions and account statement +ExportDataset_banque_2=Deposit slip +TransactionOnTheOtherAccount=Transaction on the other account +TransactionWithOtherAccount=Account transfer +PaymentNumberUpdateSucceeded=Payment number updated succesfully +PaymentNumberUpdateFailed=Payment number could not be updated +PaymentDateUpdateSucceeded=Payment date update succesfully +PaymentDateUpdateFailed=Payment date could not be updated +Transactions=Transactions +BankTransactionLine=Bank transaction +AllAccounts=All bank/cash accounts +BackToAccount=Back to account +ShowAllAccounts=Show for all accounts +FutureTransaction=Transaction in futur. No way to conciliate. +SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD +EventualyAddCategory=Eventually, specify a category in which to classify the records +ToConciliate=To conciliate? +ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click +BankDashboard=Bank accounts summary +DefaultRIB=Default BAN +AllRIB=All BAN +LabelRIB=BAN Label +NoBANRecord=No BAN record +DeleteARib=Delete BAN record +ConfirmDeleteRib=Are you sure you want to delete this BAN record ? diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang new file mode 100644 index 00000000000..7232f00e91c --- /dev/null +++ b/htdocs/langs/kn_IN/bills.lang @@ -0,0 +1,430 @@ +# Dolibarr language file - Source file is en_US - bills +Bill=Invoice +Bills=Invoices +BillsCustomers=Customers invoices +BillsCustomer=Customers invoice +BillsSuppliers=Suppliers invoices +BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s +BillsSuppliersUnpaid=Unpaid supplier's invoices +BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s +BillsLate=Late payments +BillsStatistics=Customers invoices statistics +BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseNotErasable=Disabled because can not be erased +InvoiceStandard=Standard invoice +InvoiceStandardAsk=Standard invoice +InvoiceStandardDesc=This kind of invoice is the common invoice. +InvoiceDeposit=Deposit invoice +InvoiceDepositAsk=Deposit invoice +InvoiceDepositDesc=This kind of invoice is done when a deposit has been received. +InvoiceProForma=Proforma invoice +InvoiceProFormaAsk=Proforma invoice +InvoiceProFormaDesc=Proforma invoice is an image of a true invoice but has no accountancy value. +InvoiceReplacement=Replacement invoice +InvoiceReplacementAsk=Replacement invoice for invoice +InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'. +InvoiceAvoir=Credit note +InvoiceAvoirAsk=Credit note to correct invoice +InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). +invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount +ReplaceInvoice=Replace invoice %s +ReplacementInvoice=Replacement invoice +ReplacedByInvoice=Replaced by invoice %s +ReplacementByInvoice=Replaced by invoice +CorrectInvoice=Correct invoice %s +CorrectionInvoice=Correction invoice +UsedByInvoice=Used to pay invoice %s +ConsumedBy=Consumed by +NotConsumed=Not consumed +NoReplacableInvoice=No replacable invoices +NoInvoiceToCorrect=No invoice to correct +InvoiceHasAvoir=Corrected by one or several invoices +CardBill=Invoice card +PredefinedInvoices=Predefined Invoices +Invoice=Invoice +Invoices=Invoices +InvoiceLine=Invoice line +InvoiceCustomer=Customer invoice +CustomerInvoice=Customer invoice +CustomersInvoices=Customers invoices +SupplierInvoice=Supplier invoice +SuppliersInvoices=Suppliers invoices +SupplierBill=Supplier invoice +SupplierBills=suppliers invoices +Payment=Payment +PaymentBack=Payment back +Payments=Payments +PaymentsBack=Payments back +PaidBack=Paid back +DatePayment=Payment date +DeletePayment=Delete payment +ConfirmDeletePayment=Are you sure you want to delete this payment ? +ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?
The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer. +SupplierPayments=Suppliers payments +ReceivedPayments=Received payments +ReceivedCustomersPayments=Payments received from customers +PayedSuppliersPayments=Payments payed to suppliers +ReceivedCustomersPaymentsToValid=Received customers payments to validate +PaymentsReportsForYear=Payments reports for %s +PaymentsReports=Payments reports +PaymentsAlreadyDone=Payments already done +PaymentsBackAlreadyDone=Payments back already done +PaymentRule=Payment rule +PaymentMode=Payment type +PaymentConditions=Payment term +PaymentConditionsShort=Payment term +PaymentAmount=Payment amount +ValidatePayment=Validate payment +PaymentHigherThanReminderToPay=Payment higher than reminder to pay +HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices. +HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm. +ClassifyPaid=Classify 'Paid' +ClassifyPaidPartially=Classify 'Paid partially' +ClassifyCanceled=Classify 'Abandoned' +ClassifyClosed=Classify 'Closed' +ClassifyUnBilled=Classify 'Unbilled' +CreateBill=Create Invoice +AddBill=Create invoice or credit note +AddToDraftInvoices=Add to draft invoice +DeleteBill=Delete invoice +SearchACustomerInvoice=Search for a customer invoice +SearchASupplierInvoice=Search for a supplier invoice +CancelBill=Cancel an invoice +SendRemindByMail=Send reminder by EMail +DoPayment=Do payment +DoPaymentBack=Do payment back +ConvertToReduc=Convert into future discount +EnterPaymentReceivedFromCustomer=Enter payment received from customer +EnterPaymentDueToCustomer=Make payment due to customer +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero +Amount=Amount +PriceBase=Price base +BillStatus=Invoice status +BillStatusDraft=Draft (needs to be validated) +BillStatusPaid=Paid +BillStatusPaidBackOrConverted=Paid or converted into discount +BillStatusConverted=Paid (ready for final invoice) +BillStatusCanceled=Abandoned +BillStatusValidated=Validated (needs to be paid) +BillStatusStarted=Started +BillStatusNotPaid=Not paid +BillStatusClosedUnpaid=Closed (unpaid) +BillStatusClosedPaidPartially=Paid (partially) +BillShortStatusDraft=Draft +BillShortStatusPaid=Paid +BillShortStatusPaidBackOrConverted=Processed +BillShortStatusConverted=Processed +BillShortStatusCanceled=Abandoned +BillShortStatusValidated=Validated +BillShortStatusStarted=Started +BillShortStatusNotPaid=Not paid +BillShortStatusClosedUnpaid=Closed +BillShortStatusClosedPaidPartially=Paid (partially) +PaymentStatusToValidShort=To validate +ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined +ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this. +ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes +ErrorBillNotFound=Invoice %s does not exist +ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s. +ErrorDiscountAlreadyUsed=Error, discount already used +ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount +ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount +ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status +BillFrom=From +BillTo=To +ActionsOnBill=Actions on invoice +NewBill=New invoice +LastBills=Last %s invoices +LastCustomersBills=Last %s customers invoices +LastSuppliersBills=Last %s suppliers invoices +AllBills=All invoices +OtherBills=Other invoices +DraftBills=Draft invoices +CustomersDraftInvoices=Customers draft invoices +SuppliersDraftInvoices=Suppliers draft invoices +Unpaid=Unpaid +ConfirmDeleteBill=Are you sure you want to delete this invoice ? +ConfirmValidateBill=Are you sure you want to validate this invoice with reference %s ? +ConfirmUnvalidateBill=Are you sure you want to change invoice %s to draft status ? +ConfirmClassifyPaidBill=Are you sure you want to change invoice %s to status paid ? +ConfirmCancelBill=Are you sure you want to cancel invoice %s ? +ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? +ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? +ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer +ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned +ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason +ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction») +ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note. +ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit +ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A bad customer is a customer that refuse to pay his debt. +ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned +ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:
- payment not complete because some products were shipped back
- amount claimed too important because a discount was forgotten
In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note. +ConfirmClassifyAbandonReasonOther=Other +ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice. +ConfirmCustomerPayment=Do you confirm this payment input for %s %s ? +ConfirmSupplierPayment=Do you confirm this payment input for %s %s ? +ConfirmValidatePayment=Are you sure you want to validate this payment ? No change can be made once payment is validated. +ValidateBill=Validate invoice +UnvalidateBill=Unvalidate invoice +NumberOfBills=Nb of invoices +NumberOfBillsByMonth=Nb of invoices by month +AmountOfBills=Amount of invoices +AmountOfBillsByMonthHT=Amount of invoices by month (net of tax) +ShowSocialContribution=Show social contribution +ShowBill=Show invoice +ShowInvoice=Show invoice +ShowInvoiceReplace=Show replacing invoice +ShowInvoiceAvoir=Show credit note +ShowInvoiceDeposit=Show deposit invoice +ShowPayment=Show payment +File=File +AlreadyPaid=Already paid +AlreadyPaidBack=Already paid back +AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) +Abandoned=Abandoned +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back +Rest=Pending +AmountExpected=Amount claimed +ExcessReceived=Excess received +EscompteOffered=Discount offered (payment before term) +SendBillRef=Submission of invoice %s +SendReminderBillRef=Submission of invoice %s (reminder) +StandingOrders=Standing orders +StandingOrder=Standing order +NoDraftBills=No draft invoices +NoOtherDraftBills=No other draft invoices +NoDraftInvoices=No draft invoices +RefBill=Invoice ref +ToBill=To bill +RemainderToBill=Remainder to bill +SendBillByMail=Send invoice by email +SendReminderBillByMail=Send reminder by email +RelatedCommercialProposals=Related commercial proposals +MenuToValid=To valid +DateMaxPayment=Payment due before +DateEcheance=Due date limit +DateInvoice=Invoice date +NoInvoice=No invoice +ClassifyBill=Classify invoice +SupplierBillsToPay=Suppliers invoices to pay +CustomerBillsUnpaid=Unpaid customers invoices +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +NonPercuRecuperable=Non-recoverable +SetConditions=Set payment terms +SetMode=Set payment mode +Billed=Billed +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice +CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines +CustomersInvoicesAndPayments=Customer invoices and payments +ExportDataset_invoice_1=Customer invoices list and invoice's lines +ExportDataset_invoice_2=Customer invoices and payments +ProformaBill=Proforma Bill: +Reduction=Reduction +ReductionShort=Reduc. +Reductions=Reductions +ReductionsShort=Reduc. +Discount=Discount +Discounts=Discounts +AddDiscount=Create discount +AddRelativeDiscount=Create relative discount +EditRelativeDiscount=Edit relative discount +AddGlobalDiscount=Create absolute discount +EditGlobalDiscounts=Edit absolute discounts +AddCreditNote=Create credit note +ShowDiscount=Show discount +ShowReduc=Show the deduction +RelativeDiscount=Relative discount +GlobalDiscount=Global discount +CreditNote=Credit note +CreditNotes=Credit notes +Deposit=Deposit +Deposits=Deposits +DiscountFromCreditNote=Discount from credit note %s +DiscountFromDeposit=Payments from deposit invoice %s +AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation +CreditNoteDepositUse=Invoice must be validated to use this king of credits +NewGlobalDiscount=New absolute discount +NewRelativeDiscount=New relative discount +NoteReason=Note/Reason +ReasonDiscount=Reason +DiscountOfferedBy=Granted by +DiscountStillRemaining=Discounts still remaining +DiscountAlreadyCounted=Discounts already counted +BillAddress=Bill address +HelpEscompte=This discount is a discount granted to customer because its payment was made before term. +HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose. +HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example) +IdSocialContribution=Social contribution id +PaymentId=Payment id +InvoiceId=Invoice id +InvoiceRef=Invoice ref. +InvoiceDateCreation=Invoice creation date +InvoiceStatus=Invoice status +InvoiceNote=Invoice note +InvoicePaid=Invoice paid +PaymentNumber=Payment number +RemoveDiscount=Remove discount +WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty) +InvoiceNotChecked=No invoice selected +CloneInvoice=Clone invoice +ConfirmCloneInvoice=Are you sure you want to clone this invoice %s ? +DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced +DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here. +NbOfPayments=Nb of payments +SplitDiscount=Split discount in two +ConfirmSplitDiscount=Are you sure you want to split this discount of %s %s into 2 lower discounts ? +TypeAmountOfEachNewDiscount=Input amount for each of two parts : +TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount. +ConfirmRemoveDiscount=Are you sure you want to remove this discount ? +RelatedBill=Related invoice +RelatedBills=Related invoices +LatestRelatedBill=Latest related invoice +WarningBillExist=Warning, one or more invoice already exist + +# PaymentConditions +PaymentConditionShortRECEP=Immediate +PaymentConditionRECEP=Immediate +PaymentConditionShort30D=30 days +PaymentCondition30D=30 days +PaymentConditionShort30DENDMONTH=30 days end of month +PaymentCondition30DENDMONTH=30 days end of month +PaymentConditionShort60D=60 days +PaymentCondition60D=60 days +PaymentConditionShort60DENDMONTH=60 days end of month +PaymentCondition60DENDMONTH=60 days end of month +PaymentConditionShortPT_DELIVERY=Delivery +PaymentConditionPT_DELIVERY=On delivery +PaymentConditionShortPT_ORDER=On order +PaymentConditionPT_ORDER=On order +PaymentConditionShortPT_5050=50-50 +PaymentConditionPT_5050=50%% in advance, 50%% on delivery +FixAmount=Fix amount +VarAmount=Variable amount (%% tot.) +# PaymentType +PaymentTypeVIR=Bank deposit +PaymentTypeShortVIR=Bank deposit +PaymentTypePRE=Bank's order +PaymentTypeShortPRE=Bank's order +PaymentTypeLIQ=Cash +PaymentTypeShortLIQ=Cash +PaymentTypeCB=Credit card +PaymentTypeShortCB=Credit card +PaymentTypeCHQ=Check +PaymentTypeShortCHQ=Check +PaymentTypeTIP=TIP +PaymentTypeShortTIP=TIP +PaymentTypeVAD=On line payment +PaymentTypeShortVAD=On line payment +PaymentTypeTRA=Bill payment +PaymentTypeShortTRA=Bill +BankDetails=Bank details +BankCode=Bank code +DeskCode=Desk code +BankAccountNumber=Account number +BankAccountNumberKey=Key +Residence=Domiciliation +IBANNumber=IBAN number +IBAN=IBAN +BIC=BIC/SWIFT +BICNumber=BIC/SWIFT number +ExtraInfos=Extra infos +RegulatedOn=Regulated on +ChequeNumber=Check N° +ChequeOrTransferNumber=Check/Transfer N° +ChequeMaker=Check transmitter +ChequeBank=Bank of Check +CheckBank=Check +NetToBePaid=Net to be paid +PhoneNumber=Tel +FullPhoneNumber=Telephone +TeleFax=Fax +PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration. +IntracommunityVATNumber=Intracommunity number of VAT +PaymentByChequeOrderedTo=Check payment (including tax) are payable to %s send to +PaymentByChequeOrderedToShort=Check payment (including tax) are payable to +SendTo=sent to +PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank account +VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI +LawApplicationPart1=By application of the law 80.335 of 12/05/80 +LawApplicationPart2=the goods remain the property of +LawApplicationPart3=the seller until the complete cashing of +LawApplicationPart4=their price. +LimitedLiabilityCompanyCapital=SARL with Capital of +UseLine=Apply +UseDiscount=Use discount +UseCredit=Use credit +UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit +MenuChequeDeposits=Checks deposits +MenuCheques=Checks +MenuChequesReceipts=Checks receipts +NewChequeDeposit=New deposit +ChequesReceipts=Checks receipts +ChequesArea=Checks deposits area +ChequeDeposits=Checks deposits +Cheques=Checks +CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s +UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices +ShowUnpaidAll=Show all unpaid invoices +ShowUnpaidLateOnly=Show late unpaid invoices only +PaymentInvoiceRef=Payment invoice %s +ValidateInvoice=Validate invoice +Cash=Cash +Reported=Delayed +DisabledBecausePayments=Not possible since there are some payments +CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid +ExpectedToPay=Expected payment +PayedByThisPayment=Paid by this payment +ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid. +ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back. +AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid". +ToMakePayment=Pay +ToMakePaymentBack=Pay back +ListOfYourUnpaidInvoices=List of unpaid invoices +NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative. +RevenueStamp=Revenue stamp +YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty +PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template) +TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +##### Types de contacts ##### +TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice +TypeContact_facture_external_BILLING=Customer invoice contact +TypeContact_facture_external_SHIPPING=Customer shipping contact +TypeContact_facture_external_SERVICE=Customer service contact +TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice +TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact +TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_invoice_supplier_external_SERVICE=Supplier service contact +# Situation invoices +InvoiceFirstSituationAsk=First situation invoice +InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice. +InvoiceSituation=Situation invoice +InvoiceSituationAsk=Invoice following the situation +InvoiceSituationDesc=Create a new situation following an already existing one +SituationAmount=Situation invoice amount(net) +SituationDeduction=Situation subtraction +Progress=Progress +ModifyAllLines=Modify all lines +CreateNextSituationInvoice=Create next situation +NotLastInCycle=This invoice in not the last in cycle and must not be modified. +DisabledBecauseNotLastInCycle=The next situation already exists. +DisabledBecauseFinal=This situation is final. +CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. +NoSituations=No opened situations +InvoiceSituationLast=Final and general invoice diff --git a/htdocs/langs/kn_IN/bookmarks.lang b/htdocs/langs/kn_IN/bookmarks.lang new file mode 100644 index 00000000000..7acb946bb62 --- /dev/null +++ b/htdocs/langs/kn_IN/bookmarks.lang @@ -0,0 +1,19 @@ +# Dolibarr language file - Source file is en_US - marque pages +AddThisPageToBookmarks=Add this page to bookmarks +Bookmark=Bookmark +Bookmarks=Bookmarks +NewBookmark=New bookmark +ShowBookmark=Show bookmark +OpenANewWindow=Open a new window +ReplaceWindow=Replace current window +BookmarkTargetNewWindowShort=New window +BookmarkTargetReplaceWindowShort=Current window +BookmarkTitle=Bookmark title +UrlOrLink=URL +BehaviourOnClick=Behaviour when a URL is clicked +CreateBookmark=Create bookmark +SetHereATitleForLink=Set a title for the bookmark +UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL +ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window +BookmarksManagement=Bookmarks management +ListOfBookmarks=List of bookmarks diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang new file mode 100644 index 00000000000..bf118b9b88e --- /dev/null +++ b/htdocs/langs/kn_IN/boxes.lang @@ -0,0 +1,96 @@ +# Dolibarr language file - Source file is en_US - boxes +BoxLastRssInfos=Rss information +BoxLastProducts=Last %s products/services +BoxProductsAlertStock=Products in stock alert +BoxLastProductsInContract=Last %s contracted products/services +BoxLastSupplierBills=Last supplier's invoices +BoxLastCustomerBills=Last customer's invoices +BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices +BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices +BoxLastProposals=Last commercial proposals +BoxLastProspects=Last modified prospects +BoxLastCustomers=Last modified customers +BoxLastSuppliers=Last modified suppliers +BoxLastCustomerOrders=Last customer orders +BoxLastValidatedCustomerOrders=Last validated customer orders +BoxLastBooks=Last books +BoxLastActions=Last actions +BoxLastContracts=Last contracts +BoxLastContacts=Last contacts/addresses +BoxLastMembers=Last members +BoxFicheInter=Last interventions +BoxCurrentAccounts=Opened accounts balance +BoxSalesTurnover=Sales turnover +BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices +BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices +BoxTitleLastBooks=Last %s recorded books +BoxTitleNbOfCustomers=Number of clients +BoxTitleLastRssInfos=Last %s news from %s +BoxTitleLastProducts=Last %s modified products/services +BoxTitleProductsAlertStock=Products in stock alert +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders +BoxTitleLastSuppliers=Last %s recorded suppliers +BoxTitleLastCustomers=Last %s recorded customers +BoxTitleLastModifiedSuppliers=Last %s modified suppliers +BoxTitleLastModifiedCustomers=Last %s modified customers +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals +BoxTitleLastCustomerBills=Last %s customer's invoices +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices +BoxTitleLastSupplierBills=Last %s supplier's invoices +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices +BoxTitleLastModifiedProspects=Last %s modified prospects +BoxTitleLastProductsInContract=Last %s products/services in a contract +BoxTitleLastModifiedMembers=Last %s members +BoxTitleLastFicheInter=Last %s modified intervention +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices +BoxTitleCurrentAccounts=Opened account's balances +BoxTitleSalesTurnover=Sales turnover +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices +BoxTitleLastModifiedContacts=Last %s modified contacts/addresses +BoxMyLastBookmarks=My last %s bookmarks +BoxOldestExpiredServices=Oldest active expired services +BoxLastExpiredServices=Last %s oldest contacts with active expired services +BoxTitleLastActionsToDo=Last %s actions to do +BoxTitleLastContracts=Last %s contracts +BoxTitleLastModifiedDonations=Last %s modified donations +BoxTitleLastModifiedExpenses=Last %s modified expenses +BoxGlobalActivity=Global activity (invoices, proposals, orders) +FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s +LastRefreshDate=Last refresh date +NoRecordedBookmarks=No bookmarks defined. +ClickToAdd=Click here to add. +NoRecordedCustomers=No recorded customers +NoRecordedContacts=No recorded contacts +NoActionsToDo=No actions to do +NoRecordedOrders=No recorded customer's orders +NoRecordedProposals=No recorded proposals +NoRecordedInvoices=No recorded customer's invoices +NoUnpaidCustomerBills=No unpaid customer's invoices +NoRecordedSupplierInvoices=No recorded supplier's invoices +NoUnpaidSupplierBills=No unpaid supplier's invoices +NoModifiedSupplierBills=No recorded supplier's invoices +NoRecordedProducts=No recorded products/services +NoRecordedProspects=No recorded prospects +NoContractedProducts=No products/services contracted +NoRecordedContracts=No recorded contracts +NoRecordedInterventions=No recorded interventions +BoxLatestSupplierOrders=Latest supplier orders +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders +NoSupplierOrder=No recorded supplier order +BoxCustomersInvoicesPerMonth=Customer invoices per month +BoxSuppliersInvoicesPerMonth=Supplier invoices per month +BoxCustomersOrdersPerMonth=Customer orders per month +BoxSuppliersOrdersPerMonth=Supplier orders per month +BoxProposalsPerMonth=Proposals per month +NoTooLowStockProducts=No product under the low stock limit +BoxProductDistribution=Products/Services distribution +BoxProductDistributionFor=Distribution of %s for %s +ForCustomersInvoices=Customers invoices +ForCustomersOrders=Customers orders +ForProposals=Proposals diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang new file mode 100644 index 00000000000..d3dcfb68e64 --- /dev/null +++ b/htdocs/langs/kn_IN/cashdesk.lang @@ -0,0 +1,40 @@ +# Language file - Source file is en_US - cashdesk +CashDeskMenu=Point of sale +CashDesk=Point of sale +CashDesks=Point of sales +CashDeskBank=Bank account +CashDeskBankCash=Bank account (cash) +CashDeskBankCB=Bank account (card) +CashDeskBankCheque=Bank account (cheque) +CashDeskWarehouse=Warehouse +CashdeskShowServices=Selling services +CashDeskProducts=Products +CashDeskStock=Stock +CashDeskOn=on +CashDeskThirdParty=Third party +CashdeskDashboard=Point of sale access +ShoppingCart=Shopping cart +NewSell=New sell +BackOffice=Back office +AddThisArticle=Add this article +RestartSelling=Go back on sell +SellFinished=Sell finished +PrintTicket=Print ticket +NoProductFound=No article found +ProductFound=product found +ProductsFound=products found +NoArticle=No article +Identification=Identification +Article=Article +Difference=Difference +TotalTicket=Total ticket +NoVAT=No VAT for this sale +Change=Excess received +CalTip=Click to view the calendar +CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined
Change stock module setup, or choose a warehouse +BankToPay=Charge Account +ShowCompany=Show company +ShowStock=Show warehouse +DeleteArticle=Click to remove this article +FilterRefOrLabelOrBC=Search (Ref/Label) +UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock. diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang new file mode 100644 index 00000000000..22914931db1 --- /dev/null +++ b/htdocs/langs/kn_IN/categories.lang @@ -0,0 +1,112 @@ +# Dolibarr language file - Source file is en_US - categories +Category=Category +Categories=Categories +Rubrique=Category +Rubriques=Categories +categories=categories +TheCategorie=The category +NoCategoryYet=No category of this type created +In=In +AddIn=Add in +modify=modify +Classify=Classify +CategoriesArea=Categories area +ProductsCategoriesArea=Products/Services categories area +SuppliersCategoriesArea=Suppliers categories area +CustomersCategoriesArea=Customers categories area +ThirdPartyCategoriesArea=Third parties categories area +MembersCategoriesArea=Members categories area +ContactsCategoriesArea=Contacts categories area +MainCats=Main categories +SubCats=Subcategories +CatStatistics=Statistics +CatList=List of categories +AllCats=All categories +ViewCat=View category +NewCat=Add category +NewCategory=New category +ModifCat=Modify category +CatCreated=Category created +CreateCat=Create category +CreateThisCat=Create this category +ValidateFields=Validate the fields +NoSubCat=No subcategory. +SubCatOf=Subcategory +FoundCats=Found categories +FoundCatsForName=Categories found for the name : +FoundSubCatsIn=Subcategories found in the category +ErrSameCatSelected=You selected the same category several times +ErrForgotCat=You forgot to choose the category +ErrForgotField=You forgot to inform the fields +ErrCatAlreadyExists=This name is already used +AddProductToCat=Add this product to a category? +ImpossibleAddCat=Impossible to add the category +ImpossibleAssociateCategory=Impossible to associate the category to +WasAddedSuccessfully=%s was added successfully. +ObjectAlreadyLinkedToCategory=Element is already linked to this category. +CategorySuccessfullyCreated=This category %s has been added with success. +ProductIsInCategories=Product/service owns to following categories +SupplierIsInCategories=Third party owns to following suppliers categories +CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories +CompanyIsInSuppliersCategories=This third party owns to following suppliers categories +MemberIsInCategories=This member owns to following members categories +ContactIsInCategories=This contact owns to following contacts categories +ProductHasNoCategory=This product/service is not in any categories +SupplierHasNoCategory=This supplier is not in any categories +CompanyHasNoCategory=This company is not in any categories +MemberHasNoCategory=This member is not in any categories +ContactHasNoCategory=This contact is not in any categories +ClassifyInCategory=Classify in category +NoneCategory=None +NotCategorized=Without category +CategoryExistsAtSameLevel=This category already exists with this ref +ReturnInProduct=Back to product/service card +ReturnInSupplier=Back to supplier card +ReturnInCompany=Back to customer/prospect card +ContentsVisibleByAll=The contents will be visible by all +ContentsVisibleByAllShort=Contents visible by all +ContentsNotVisibleByAllShort=Contents not visible by all +CategoriesTree=Categories tree +DeleteCategory=Delete category +ConfirmDeleteCategory=Are you sure you want to delete this category ? +RemoveFromCategory=Remove link with categorie +RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? +NoCategoriesDefined=No category defined +SuppliersCategoryShort=Suppliers category +CustomersCategoryShort=Customers category +ProductsCategoryShort=Products category +MembersCategoryShort=Members category +SuppliersCategoriesShort=Suppliers categories +CustomersCategoriesShort=Customers categories +CustomersProspectsCategoriesShort=Custo./Prosp. categories +ProductsCategoriesShort=Products categories +MembersCategoriesShort=Members categories +ContactCategoriesShort=Contacts categories +ThisCategoryHasNoProduct=This category does not contain any product. +ThisCategoryHasNoSupplier=This category does not contain any supplier. +ThisCategoryHasNoCustomer=This category does not contain any customer. +ThisCategoryHasNoMember=This category does not contain any member. +ThisCategoryHasNoContact=This category does not contain any contact. +AssignedToCustomer=Assigned to a customer +AssignedToTheCustomer=Assigned to the customer +InternalCategory=Internal category +CategoryContents=Category contents +CategId=Category id +CatSupList=List of supplier categories +CatCusList=List of customer/prospect categories +CatProdList=List of products categories +CatMemberList=List of members categories +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/kn_IN/commercial.lang b/htdocs/langs/kn_IN/commercial.lang new file mode 100644 index 00000000000..7acdc7bd7e6 --- /dev/null +++ b/htdocs/langs/kn_IN/commercial.lang @@ -0,0 +1,96 @@ +# Dolibarr language file - Source file is en_US - commercial +Commercial=Commercial +CommercialArea=Commercial area +CommercialCard=Commercial card +CustomerArea=Customers area +Customer=Customer +Customers=Customers +Prospect=Prospect +Prospects=Prospects +DeleteAction=Delete an event/task +NewAction=New event/task +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event +Rendez-Vous=Rendezvous +ConfirmDeleteAction=Are you sure you want to delete this event/task ? +CardAction=Event card +PercentDone=Percentage complete +ActionOnCompany=Task about company +ActionOnContact=Task about contact +TaskRDV=Meetings +TaskRDVWith=Meeting with %s +ShowTask=Show task +ShowAction=Show event +ActionsReport=Events report +ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative +SalesRepresentative=Sales representative +SalesRepresentatives=Sales representatives +SalesRepresentativeFollowUp=Sales representative (follow-up) +SalesRepresentativeSignature=Sales representative (signature) +CommercialInterlocutor=Commercial interlocutor +ErrorWrongCode=Wrong code +NoSalesRepresentativeAffected=No particular sales representative assigned +ShowCustomer=Show customer +ShowProspect=Show prospect +ListOfProspects=List of prospects +ListOfCustomers=List of customers +LastDoneTasks=Last %s completed tasks +LastRecordedTasks=Last recorded tasks +LastActionsToDo=Last %s oldest actions not completed +DoneAndToDoActionsFor=Completed and To do events for %s +DoneAndToDoActions=Completed and To do events +DoneActions=Completed events +DoneActionsFor=Completed events for %s +ToDoActions=Incomplete events +ToDoActionsFor=Incomplete events for %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s +StatusNotApplicable=Not applicable +StatusActionToDo=To do +StatusActionDone=Complete +MyActionsAsked=Events I have recorded +MyActionsToDo=Events I have to do +MyActionsDone=Events assigned to me +StatusActionInProcess=In process +TasksHistoryForThisContact=Events for this contact +LastProspectDoNotContact=Do not contact +LastProspectNeverContacted=Never contacted +LastProspectToContact=To contact +LastProspectContactInProcess=Contact in process +LastProspectContactDone=Contact done +DateActionPlanned=Date event planned for +DateActionDone=Date event done +ActionAskedBy=Event reported by +ActionAffectedTo=Event assigned to +ActionDoneBy=Event done by +ActionUserAsk=Reported by +ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%. +ActionAC_TEL=Phone call +ActionAC_FAX=Send fax +ActionAC_PROP=Send proposal by mail +ActionAC_EMAIL=Send Email +ActionAC_RDV=Meetings +ActionAC_INT=Intervention on site +ActionAC_FAC=Send customer invoice by mail +ActionAC_REL=Send customer invoice by mail (reminder) +ActionAC_CLO=Close +ActionAC_EMAILING=Send mass email +ActionAC_COM=Send customer order by mail +ActionAC_SHIP=Send shipping by mail +ActionAC_SUP_ORD=Send supplier order by mail +ActionAC_SUP_INV=Send supplier invoice by mail +ActionAC_OTH=Other +ActionAC_OTH_AUTO=Other (automatically inserted events) +ActionAC_MANUAL=Manually inserted events +ActionAC_AUTO=Automatically inserted events +Stats=Sales statistics +CAOrder=Sales volume (validated orders) +FromTo=from %s to %s +MargeOrder=Margins (validated orders) +RecapAnnee=Summary of the year +NoData=There is no data +StatusProsp=Prospect status +DraftPropals=Draft commercial proposals +SearchPropal=Search a commercial proposal +CommercialDashboard=Commercial summary diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang new file mode 100644 index 00000000000..0195d7566b0 --- /dev/null +++ b/htdocs/langs/kn_IN/companies.lang @@ -0,0 +1,414 @@ +# Dolibarr language file - Source file is en_US - companies +ErrorCompanyNameAlreadyExists=ಸಂಸ್ಥೆ ಹೆಸರು %s ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ಮತ್ತೊಂದನ್ನು ಆಯ್ದುಕೊಳ್ಳಿರಿ. +ErrorPrefixAlreadyExists=ಪೂರ್ವಪ್ರತ್ಯಯ %s ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ಮತ್ತೊಂದನ್ನು ಆಯ್ದುಕೊಳ್ಳಿರಿ. +ErrorSetACountryFirst=ಮೊದಲು ದೇಶವನ್ನು ಹೊಂದಿಸಿ. +SelectThirdParty=ಮೂರನೇ ವ್ಯಕ್ತಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿರಿ. +DeleteThirdParty=ಮೂರನೇ ವ್ಯಕ್ತಿಯನ್ನು ಅಳಿಸಿ. +ConfirmDeleteCompany=ನೀವು ಈ ಕಂಪನಿ ಮತ್ತು ಎಲ್ಲಾ ಆನುವಂಶಿಕವಾಗಿ ಮಾಹಿತಿಯನ್ನು ಅಳಿಸಲು ಬಯಸುತ್ತೀರೇ? +DeleteContact=ಸಂಪರ್ಕ / ವಿಳಾಸವೊಂದನ್ನು ಅಳಿಸಿ. +ConfirmDeleteContact=ನೀವು ಈ ಸಂಪರ್ಕವನ್ನು ಮತ್ತು ಎಲ್ಲಾ ಆನುವಂಶಿಕವಾಗಿ ಮಾಹಿತಿಯನ್ನು ಅಳಿಸಲು ಬಯಸುತ್ತೀರೆ? +MenuNewThirdParty=ಹೊಸ ತೃತೀಯ ಪಕ್ಷ +MenuNewCompany=ಹೊಸ ಕಂಪನಿ +MenuNewCustomer=ಹೊಸ ಗ್ರಾಹಕ +MenuNewProspect=ಹೊಸ ನಿರೀಕ್ಷಿತರು +MenuNewSupplier=ಹೊಸ ಪೂರೈಕೆದಾರ +MenuNewPrivateIndividual=ಹೊಸ ಖಾಸಗಿ ವ್ಯಕ್ತಿ +MenuSocGroup=ಗುಂಪುಗಳು +NewCompany=ಹೊಸ ಕಂಪನಿ (ನಿರೀಕ್ಷಿತ, ಗ್ರಾಹಕ, ಪೂರೈಕೆದಾರ) +NewThirdParty=ಹೊಸ ತೃತೀಯ (ನಿರೀಕ್ಷಿತ, ಗ್ರಾಹಕ, ಪೂರೈಕೆದಾರ) +NewSocGroup=ಹೊಸ ಕಂಪನಿ ಗುಂಪು +NewPrivateIndividual=ಹೊಸ ಖಾಸಗಿ ವ್ಯಕ್ತಿ (ನಿರೀಕ್ಷಿತ, ಗ್ರಾಹಕ, ಪೂರೈಕೆದಾರ) +CreateDolibarrThirdPartySupplier=Create a third party (supplier) +ProspectionArea=Prospection ಪ್ರದೇಶ +SocGroup=ಕಂಪನಿಗಳ ಸಮೂಹ +IdThirdParty=ತೃತೀಯ ಪಕ್ಷದ ಗುರುತು +IdCompany=ಸಂಸ್ಥೆಯ ಗುರುತು +IdContact=ಸಂಪರ್ಕದ ಗುರುತು +Contacts=ಸಂಪರ್ಕಗಳು / ವಿಳಾಸಗಳು +ThirdPartyContacts=ತೃತೀಯ ಸಂಪರ್ಕಗಳು +ThirdPartyContact=ತೃತೀಯ ಸಂಪರ್ಕ / ವಿಳಾಸ +StatusContactValidated=ಸಂಪರ್ಕ / ವಿಳಾಸದ ಸ್ಥಿತಿ +Company=ಸಂಸ್ಥೆ +CompanyName=ಸಂಸ್ಥೆಯ ಹೆಸರು +Companies=ಕಂಪನಿಗಳು +CountryIsInEEC=ದೇಶವು ಯುರೋಪಿಯನ್ ಎಕನಾಮಿಕ್ ಕಮ್ಯುನಿಟಿಯಲ್ಲಿದೆ +ThirdPartyName=ಮೂರನೇ ಪಾರ್ಟಿ ಹೆಸರು +ThirdParty=ಮೂರನೇ ಪಾರ್ಟಿ +ThirdParties=ಮೂರನೇ ಪಕ್ಷಗಳು +ThirdPartyAll=ಮೂರನೇ ಪಕ್ಷಗಳು (ಎಲ್ಲಾ) +ThirdPartyProspects=ನಿರೀಕ್ಷಿತರು +ThirdPartyProspectsStats=ನಿರೀಕ್ಷಿತರು +ThirdPartyCustomers=ಗ್ರಾಹಕರು +ThirdPartyCustomersStats=ಗ್ರಾಹಕರು +ThirdPartyCustomersWithIdProf12=%s ಅಥವಾ %s ಇರುವ ಗ್ರಾಹಕರು +ThirdPartySuppliers=ಪೂರೈಕೆದಾರರು +ThirdPartyType=ತೃತೀಯ ಮಾದರಿ +Company/Fundation=ಕಂಪನಿ / ಫೌಂಡೇಶನ್ +Individual=ಖಾಸಗಿ ವ್ಯಕ್ತಿ +ToCreateContactWithSameName=ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅದೇ ವಿವರಗಳನ್ನುಪಯೋಗಿಸಿಕೊಂಡು ಸಂಪರ್ಕವೊಂದನ್ನು ರಚಿಸುತ್ತದೆ +ParentCompany=ಪೋಷಕ ಸಂಸ್ಥೆ +Subsidiary=ಅಂಗಸಂಸ್ಥೆ +Subsidiaries=ಅಂಗಸಂಸ್ಥೆಗಳು +NoSubsidiary=ಯಾವುದೇ ಅಂಗಸಂಸ್ಥೆಗಳಿಲ್ಲ +ReportByCustomers=ಗ್ರಾಹಕರ ವರದಿ +ReportByQuarter=ದರದ ವರದಿ +CivilityCode=ಸೌಜನ್ಯದ ಕೋಡ್ +RegisteredOffice=ನೋಂದಾಯಿತ ಕಚೇರಿ +Name=ಹೆಸರು +Lastname=ಕೊನೆಯ ಹೆಸರು +Firstname=ಮೊದಲ ಹೆಸರು +PostOrFunction=ಪೋಸ್ಟ್ / ಫಂಕ್ಷನ್ +UserTitle=ಶೀರ್ಷಿಕೆ +Surname=ಉಪನಾಮ / ಗುಪ್ತನಾಮ +Address=ವಿಳಾಸ +State=ರಾಜ್ಯ / ಪ್ರಾಂತ್ಯ +Region=ಪ್ರದೇಶ +Country=ದೇಶ +CountryCode=ದೇಶ ಕೋಡ್ +CountryId=ದೇಶ ಐಡಿ +Phone=ದೂರವಾಣಿ +Skype=ಸ್ಕೈಪ್ +Call=ಕರೆ +Chat=ಚಾಟ್ +PhonePro=ವೃತ್ತಿಪರ ದೂರವಾಣಿ +PhonePerso=ವೈಯಿಕ್ತಿಕ ದೂರವಾಣಿ +PhoneMobile=ಮೊಬೈಲ್ ಸಂಖ್ಯೆ +No_Email=ಸಾಮೂಹಿಕ ಇ ರವಾನೆ ಕಳುಹಿಸಬೇಡಿ +Fax=ಫ್ಯಾಕ್ಸ್ +Zip=ಪಿನ್ ಕೋಡ್ +Town=ನಗರ +Web=ವೆಬ್ +Poste= ಸ್ಥಾನ +DefaultLang=ಪೂರ್ವನಿಯೋಜಿತವಾದ ಭಾಷೆ +VATIsUsed=ವ್ಯಾಟ್ ಬಳಸಲಾಗುತ್ತದೆ +VATIsNotUsed=ವ್ಯಾಟ್ ಬಳಸಲಾಗುವುದಿಲ್ಲ +CopyAddressFromSoc=ಮೂರನೇ ಪಾರ್ಟಿ ವಿಲಾಸದೊಂದಿಗೆ ವಿಳಾಸವನ್ನು ತುಂಬಿರಿ +NoEmailDefined=ಇ-ಮೇಲ್ ನಮೂದಿಸಿಲ್ಲ +##### Local Taxes ##### +LocalTax1IsUsedES= RE ಬಳಸಲಾಗುತ್ತದೆ +LocalTax1IsNotUsedES= RE ಬಳಸಲಾಗುವುದಿಲ್ಲ +LocalTax2IsUsedES= IRPF ಬಳಸಲಾಗುತ್ತದೆ +LocalTax2IsNotUsedES= IRPF ಬಳಸಲಾಗುವುದಿಲ್ಲ +LocalTax1ES=RE +LocalTax2ES=IRPF +TypeLocaltax1ES=RE Type +TypeLocaltax2ES=IRPF Type +TypeES=Type +ThirdPartyEMail=%s +WrongCustomerCode=ಗ್ರಾಹಕ ಕೋಡ್ ಸರಿಯಾಗಿದ್ದಂತಿಲ್ಲ +WrongSupplierCode=ಸರಬರಾಜುದಾರ ಕೋಡ್ ಸರಿಯಾಗಿದ್ದಂತಿಲ್ಲ +CustomerCodeModel=ಗ್ರಾಹಕ ಕೋಡ್ ಮಾದರಿ +SupplierCodeModel=ಸರಬರಾಜುದಾರ ಕೋಡ್ ಮಾದರಿ +Gencod=ಬಾರ್ ಕೋಡ್ +##### Professional ID ##### +ProfId1Short=ವೃತ್ತಿಪರ ಐಡಿ 1 +ProfId2Short=ವೃತ್ತಿಪರ ಐಡಿ 2 +ProfId3Short=ವೃತ್ತಿಪರ ಐಡಿ 3 +ProfId4Short=ವೃತ್ತಿಪರ ಐಡಿ 4 +ProfId5Short=ವೃತ್ತಿಪರ ಐಡಿ 5 +ProfId6Short=ವೃತ್ತಿಪರ ಐಡಿ 5 +ProfId1=ವೃತ್ತಿಪರ ID 1 +ProfId2=ವೃತ್ತಿಪರ ID 2 +ProfId3=ವೃತ್ತಿಪರ ID 3 +ProfId4=ವೃತ್ತಿಪರ ID 4 +ProfId5=ವೃತ್ತಿಪರ ID 5 +ProfId6=ವೃತ್ತಿಪರ ID 6 +ProfId1AR=ಪ್ರೊಫೆಸರ್ ಸಂ 1 (CUIT / Cuil) +ProfId2AR=ಪ್ರೊಫೆಸರ್ ಸಂ 2 (Revenu brutes) +ProfId3AR=- +ProfId4AR=- +ProfId5AR=- +ProfId6AR=- +ProfId1AU=Prof Id 1 (ABN) +ProfId2AU=- +ProfId3AU=- +ProfId4AU=- +ProfId5AU=- +ProfId6AU=- +ProfId1BE=Prof Id 1 (Professional number) +ProfId2BE=- +ProfId3BE=- +ProfId4BE=- +ProfId5BE=- +ProfId6BE=- +ProfId1BR=- +ProfId2BR=IE (Inscricao Estadual) +ProfId3BR=IM (Inscricao Municipal) +ProfId4BR=CPF +#ProfId5BR=CNAE +#ProfId6BR=INSS +ProfId1CH=- +ProfId2CH=- +ProfId3CH=Prof Id 1 (Federal number) +ProfId4CH=Prof Id 2 (Commercial Record number) +ProfId5CH=- +ProfId6CH=- +ProfId1CL=Prof Id 1 (R.U.T.) +ProfId2CL=- +ProfId3CL=- +ProfId4CL=- +ProfId5CL=- +ProfId6CL=- +ProfId1CO=Prof Id 1 (R.U.T.) +ProfId2CO=- +ProfId3CO=- +ProfId4CO=- +ProfId5CO=- +ProfId6CO=- +ProfId1DE=Prof Id 1 (USt.-IdNr) +ProfId2DE=Prof Id 2 (USt.-Nr) +ProfId3DE=Prof Id 3 (Handelsregister-Nr.) +ProfId4DE=- +ProfId5DE=- +ProfId6DE=- +ProfId1ES=Prof Id 1 (CIF/NIF) +ProfId2ES=Prof Id 2 (Social security number) +ProfId3ES=Prof Id 3 (CNAE) +ProfId4ES=Prof Id 4 (Collegiate number) +ProfId5ES=- +ProfId6ES=- +ProfId1FR=Prof Id 1 (SIREN) +ProfId2FR=Prof Id 2 (SIRET) +ProfId3FR=Prof Id 3 (NAF, old APE) +ProfId4FR=Prof Id 4 (RCS/RM) +ProfId5FR=- +ProfId6FR=- +ProfId1GB=ನೋಂದಣಿ ಸಂಖ್ಯೆ +ProfId2GB=- +ProfId3GB=SIC +ProfId4GB=- +ProfId5GB=- +ProfId6GB=- +ProfId1HN=Id prof. 1 (RTN) +ProfId2HN=- +ProfId3HN=- +ProfId4HN=- +ProfId5HN=- +ProfId6HN=- +ProfId1IN=ವೃತ್ತಿಪರ ಗುರುತಿನ ಸಂ 1 (TIN) +ProfId2IN=ವೃತ್ತಿಪರ ಗುರುತಿನ ಸಂ 2 (PAN) +ProfId3IN=ವೃತ್ತಿಪರ ಗುರುತಿನ ಸಂಖ್ಯೆ 3 (STN) +ProfId4IN=Prof Id 4 +ProfId5IN=Prof Id 5 +ProfId6IN=- +ProfId1MA=Id prof. 1 (R.C.) +ProfId2MA=Id prof. 2 (Patente) +ProfId3MA=Id prof. 3 (I.F.) +ProfId4MA=Id prof. 4 (C.N.S.S.) +ProfId5MA=- +ProfId6MA=- +ProfId1MX=Prof Id 1 (R.F.C). +ProfId2MX=Prof Id 2 (R..P. IMSS) +ProfId3MX=Prof Id 3 (Profesional Charter) +ProfId4MX=- +ProfId5MX=- +ProfId6MX=- +ProfId1NL=KVK nummer +ProfId2NL=- +ProfId3NL=- +ProfId4NL=Burgerservicenummer (BSN) +ProfId5NL=- +ProfId6NL=- +ProfId1PT=Prof Id 1 (NIPC) +ProfId2PT=Prof Id 2 (Social security number) +ProfId3PT=Prof Id 3 (Commercial Record number) +ProfId4PT=Prof Id 4 (Conservatory) +ProfId5PT=- +ProfId6PT=- +ProfId1SN=RC +ProfId2SN=NINEA +ProfId3SN=- +ProfId4SN=- +ProfId5SN=- +ProfId6SN=- +ProfId1TN=Prof Id 1 (RC) +ProfId2TN=Prof Id 2 (Fiscal matricule) +ProfId3TN=Prof Id 3 (Douane code) +ProfId4TN=Prof Id 4 (BAN) +ProfId5TN=- +ProfId6TN=- +ProfId1RU=Prof Id 1 (OGRN) +ProfId2RU=Prof Id 2 (INN) +ProfId3RU=Prof Id 3 (KPP) +ProfId4RU=Prof Id 4 (OKPO) +ProfId5RU=- +ProfId6RU=- +VATIntra=ಮೌಲ್ಯ ವರ್ಧಿತ ತೆರಿಗೆ (VAT) ಸಂಖ್ಯೆ +VATIntraShort=ಮೌಲ್ಯ ವರ್ಧಿತ ತೆರಿಗೆ (VAT) ಸಂಖ್ಯೆ +VATIntraVeryShort=ಮೌಲ್ಯ ವರ್ಧಿತ ತೆರಿಗೆ +VATIntraSyntaxIsValid=ಸಿಂಟ್ಯಾಕ್ಸ್ ಸರಿಯಿದ್ದಂತಿದೆ +VATIntraValueIsValid=ಮೌಲ್ಯ ಸರಿಯಿದ್ದಂತಿದೆ +ProspectCustomer=ನಿರೀಕ್ಷಿತ / ಗ್ರಾಹಕ +Prospect=ನಿರೀಕ್ಷಿತ +CustomerCard=ಗ್ರಾಹಕ ಕಾರ್ಡ್ +Customer=ಗ್ರಾಹಕ +CustomerDiscount=ಗ್ರಾಹಕ ಡಿಸ್ಕೌಂಟ್ +CustomerRelativeDiscount=ಸಾಪೇಕ್ಷ ಗ್ರಾಹಕ ರಿಯಾಯಿತಿ +CustomerAbsoluteDiscount=ಪರಮ ಗ್ರಾಹಕ ರಿಯಾಯಿತಿ +CustomerRelativeDiscountShort=ಸಾಪೇಕ್ಷ ರಿಯಾಯಿತಿ +CustomerAbsoluteDiscountShort=ಪರಮ ರಿಯಾಯಿತಿ +CompanyHasRelativeDiscount=ಈ ಗ್ರಾಹಕರಿಗೆ %s%% ರಿಯಾಯಿತಿ ಪೂರ್ವನಿಗದಿಯಾಗಿದೆ. +CompanyHasNoRelativeDiscount=ಈ ಗ್ರಾಹಕರಿಗೆ ಯಾವುದೇ ಸಾಪೇಕ್ಷ ರಿಯಾಯಿತಿ ಪೂರ್ವನಿಯೋಜಿತವಾಗಿಲ್ಲ +CompanyHasAbsoluteDiscount=ಈ ಗ್ರಾಹಕ ಇನ್ನೂ %s%s ರಿಯಾಯಿತಿ ವಿನಾಯಿತಿಗಳನ್ನು ಅಥವಾ ಠೇವಣಿಯನ್ನು ಹೊಂದಿದ್ದಾರೆ. +CompanyHasCreditNote=ಈ ಗ್ರಾಹಕ ಇನ್ನೂ %s%sರಷ್ಟಕ್ಕೆ ಸಾಲದ ಟಿಪ್ಪಣಿಯನ್ನು ಹೊಂದಿದ್ದಾರೆ. +CompanyHasNoAbsoluteDiscount=ಈ ಗ್ರಾಹಕ ಯಾವುದೇ ರಿಯಾಯಿತಿ ಕ್ರೆಡಿಟ್ ಹೊಂದಿಲ್ಲ +CustomerAbsoluteDiscountAllUsers=ಪರಮ ರಿಯಾಯಿತಿಗಳು (ಎಲ್ಲಾ ಬಳಕೆದಾರರಿಂದ ಮಂಜೂರಾದ) +CustomerAbsoluteDiscountMy=ಪರಮ ರಿಯಾಯಿತಿಗಳು (ನಿಮ್ಮಿಂದ ಮಂಜೂರಾದ) +DefaultDiscount=ಪೂರ್ವನಿಯೋಜಿತ ರಿಯಾಯಿತಿ +AvailableGlobalDiscounts=ಲಭ್ಯವಿರುವ ಪರಮ ರಿಯಾಯಿತಿಗಳು +DiscountNone=ಯಾವುದೂ ಇಲ್ಲ +Supplier=ಪೂರೈಕೆದಾರ +CompanyList=ಸಂಸ್ಥೆಯ ಪಟ್ಟಿ +AddContact=Create contact +AddContactAddress=Create contact/address +EditContact=ಸಂಪರ್ಕವನ್ನು ತಿದ್ದಿ +EditContactAddress=ಸಂಪರ್ಕ / ವಿಳಾಸವನ್ನು ತಿದ್ದಿ +Contact=ಸಂಪರ್ಕ +ContactsAddresses=ಸಂಪರ್ಕಗಳು / ವಿಳಾಸಗಳು +NoContactDefinedForThirdParty=ಈ ತೃತೀಯ ಪಾರ್ಟಿಗೆ ಯಾವುದೇ ಸಂಪರ್ಕ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿಲ್ಲ +NoContactDefined=ಯಾವುದೇ ಸಂಪರ್ಕ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿಲ್ಲ +DefaultContact=ಡೀಫಾಲ್ಟ್ ಸಂಪರ್ಕ / ವಿಳಾಸ +AddCompany=Create company +AddThirdParty=Create third party +DeleteACompany=ಸಂಸ್ಥೆಯೊಂದನ್ನು ತೆಗೆದುಹಾಕಿ +PersonalInformations=ವೈಯಕ್ತಿಕ ದತ್ತಾಂಶ +AccountancyCode=ಅಕೌಂಟೆನ್ಸಿ ಕೋಡ್ +CustomerCode=ಗ್ರಾಹಕ ಕೋಡ್ +SupplierCode=ಪೂರೈಕೆದಾರರ ಕೋಡ್ +CustomerAccount=ಗ್ರಾಹಕ ಖಾತೆ +SupplierAccount=ಸರಬರಾಜುದಾರ ಖಾತೆ +CustomerCodeDesc=ಗ್ರಾಹಕ ಕೋಡ್, ಎಲ್ಲಾ ಗ್ರಾಹಕರಿಗೂ ಅನನ್ಯ +SupplierCodeDesc=ಸರಬರಾಜುದಾರ ಕೋಡ್, ಎಲ್ಲಾ ಪೂರೈಕೆದಾರರಿಗೂ ಅನನ್ಯ +RequiredIfCustomer=ತೃತೀಯ ಪಾರ್ಟಿಯು ಗ್ರಾಹಕ ಅಥವಾ ನಿರೀಕ್ಷಿತರಾಗಿದ್ದ ವೇಳೆ ಅಗತ್ಯ +RequiredIfSupplier=ತೃತೀಯ ಪಾರ್ಟಿಯು ಸರಬರಾಜುದಾರರಾದಲ್ಲಿ ಅಗತ್ಯ +ValidityControledByModule=ವಾಯಿದೆ ನಿಯಂತ್ರಿತ ಘಟಕ +ThisIsModuleRules=ಈ ಘಟಕಕ್ಕೆ ಅನ್ವಯವಾಗುವ ನೇಮಗಳು +LastProspect=ಕೊನೆಯ +ProspectToContact='ನಿರೀಕ್ಷಿತ'ದಿಂದ 'ಸಂಪರ್ಕ'ಕ್ಕೆ +CompanyDeleted="%s" ಸಂಸ್ಥೆಯನ್ನು ಡೇಟಾಬೇಸ್-ನಿಂದ ತೆಗೆಯಲಾಗಿದೆ. +ListOfContacts=ಸಂಪರ್ಕಗಳ / ವಿಳಾಸಗಳ ಪಟ್ಟಿ +ListOfContactsAddresses=ಸಂಪರ್ಕಗಳ / ವಿಳಾಸಗಳ ಪಟ್ಟಿ +ListOfProspectsContacts=ನಿರೀಕ್ಷಿತ ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿ +ListOfCustomersContacts=ಗ್ರಾಹಕ ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿ +ListOfSuppliersContacts=ಪೂರೈಕೆದಾರ ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿ +ListOfCompanies=ಸಂಸ್ಥೆಗಳ ಪಟ್ಟಿ +ListOfThirdParties=ಮೂರನೇ ಪಕ್ಷಗಳ ಪಟ್ಟಿ +ShowCompany=ಸಂಸ್ಥೆಯನ್ನು ತೋರಿಸಿ +ShowContact=ಸಂಪರ್ಕವನ್ನು ತೋರಿಸಿ +ContactsAllShort=ಎಲ್ಲಾ (ಸೋಸಿಲ್ಲದ) +ContactType=ಸಂಪರ್ಕದ ಮಾದರಿ +ContactForOrders=ಆರ್ಡರ್ ಸಂಪರ್ಕ +ContactForProposals=ಪ್ರಸ್ತಾಪದ ಸಂಪರ್ಕ +ContactForContracts=ಗುತ್ತಿಗೆಯ ಸಂಪರ್ಕ +ContactForInvoices=ಸರಕುಪಟ್ಟಿ ಸಂಪರ್ಕ +NoContactForAnyOrder=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ಆರ್ಡರ್-ಗಾಗಿ ಅಲ್ಲ. +NoContactForAnyProposal=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ವಾಣಿಜ್ಯ ಪ್ರಸ್ತಾವನೆಗಾಗಿ ಅಲ್ಲ. +NoContactForAnyContract=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ಗುತ್ತಿಗೆಯಗಾಗಿ ಅಲ್ಲ. +NoContactForAnyInvoice=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ಸರಕುಪಟ್ಟಿಗಾಗಿ ಅಲ್ಲ. +NewContact=ಹೊಸ ಸಂಪರ್ಕ +NewContactAddress=ಹೊಸ ಸಂಪರ್ಕ / ವಿಳಾಸ +LastContacts=ಕೊನೆಯ ಸಂಪರ್ಕಗಳು +MyContacts=ನನ್ನ ಸಂಪರ್ಕಗಳು +Phones=ದೂರವಾಣಿಗಳು +Capital=ರಾಜಧಾನಿ +CapitalOf=%s ಕ್ಯಾಪಿಟಲ್ +EditCompany=ಸಂಸ್ಥೆಯನ್ನು ತಿದ್ದಿ +EditDeliveryAddress=ತಲುಪಿಸಬೇಕಾದ ವಿಳಾಸವನ್ನು ತಿದ್ದಿ +ThisUserIsNot=ಈ ಬಳಕೆದಾರ ಒಬ್ಬ ನಿರೀಕ್ಷಿತ, ಗ್ರಾಹಕ ಅಥವಾ ಪೂರೈಕೆದಾರ ಅಲ್ಲ +VATIntraCheck=ಪರಿಶೀಲಿಸಿ +VATIntraCheckDesc=The link %s allows to ask the european VAT checker service. An external internet access from server is required for this service to work. +VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do +VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site +VATIntraManualCheck=You can also check manually from european web site %s +ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). +NorProspectNorCustomer=ನಿರೆಕ್ಷಿತರೂ ಅಲ್ಲ, ಗ್ರಾಹಕರೂ ಅಲ್ಲ. +JuridicalStatus=ನ್ಯಾಯಾಂಗ ಸ್ಥಿತಿ +Staff=ನೌಕರರು +ProspectLevelShort=ಸಂಭವನೀಯ +ProspectLevel=ಸಂಭಾವ್ಯ ನಿರೀಕ್ಷಿತರು +ContactPrivate=ಖಾಸಗಿ +ContactPublic=ಹಂಚಲ್ಪಟ್ಟ +ContactVisibility=ಕಾಣುವಂತಿರುವಿಕೆ +OthersNotLinkedToThirdParty=ಇತರೆ, ಮೂರನೇ ವ್ಯಕ್ತಿಗೆ ಕೂಡಿಸಲ್ಪಡದ +ProspectStatus=ನಿರೀಕ್ಷಿತರ ಸ್ಥಿತಿ +PL_NONE=ಯಾವುದೂ ಇಲ್ಲ +PL_UNKNOWN=ತಿಳಿದಿಲ್ಲ +PL_LOW=ಕಡಿಮೆ +PL_MEDIUM=ಮಧ್ಯಮ +PL_HIGH=ಹೆಚ್ಚು +TE_UNKNOWN=- +TE_STARTUP=ಆರಂಭಿಕ +TE_GROUP=ದೊಡ್ಡ ಸಂಸ್ಥೆ +TE_MEDIUM=ಸಾಧಾರಣ ಸಂಸ್ಥೆ +TE_ADMIN=ಸರ್ಕಾರೀ +TE_SMALL=ಸಣ್ಣ ಸಂಸ್ಥೆ +TE_RETAIL=ಚಿಲ್ಲರೆ ವ್ಯಾಪಾರಿ +TE_WHOLE=Wholeseller +TE_PRIVATE=ಖಾಸಗಿ ವ್ಯಕ್ತಿ +TE_OTHER=ಇತರ +StatusProspect-1=ಸಂಪರ್ಕಿಸಬೇಡಿ +StatusProspect0=ಈವರೆಗೆ ಸಂಪರ್ಕಿಸಲ್ಪಡದ +StatusProspect1=ಸಂಪರ್ಕಿಸಬೇಕಾದದ್ದು +StatusProspect2=ಸಂಪರ್ಕದ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ +StatusProspect3=ಸಂಪರ್ಕಿಸಲಾಗಿದೆ +ChangeDoNotContact=ಸ್ಥಿತಿಯನ್ನು 'ಸಂಪರ್ಕಿಸಬೇಡಿ' ಎಂಬುದಕ್ಕೆ ಬದಲಿಸಿ +ChangeNeverContacted=ಸ್ಥಿತಿಯನ್ನು 'ಸಂಪರ್ಕಿಸಿಲ್ಲ' ಎಂಬುದಕ್ಕೆ ಬದಲಾಯಿಸಿ +ChangeToContact=ಸ್ಥಿತಿಯನ್ನು 'ಸಂಪರ್ಕಿಸಬೇಕಾದದ್ದು' ಎಂಬುದಕ್ಕೆ ಬದಲಾಯಿಸಿ +ChangeContactInProcess=ಸ್ಥಿತಿಯನ್ನು 'ಸಂಪರ್ಕದ ಪ್ರಕ್ರಿಯಯಲ್ಲಿ' ಎಂಬುದಕ್ಕೆ ಬದಲಾಯಿಸಿ +ChangeContactDone=ಸ್ಥಿತಿಯನ್ನು 'ಸಂಪರ್ಕೈಸಲಾಗಿದೆ' ಎಂಬುದಕ್ಕೆ ಬದಲಾಯಿಸಿ +ProspectsByStatus=ಸ್ಥಿತಿಯಂತೆ ನಿರೀಕ್ಷಿತರು +BillingContact=ಬಿಲ್ಲಿಂಗ್ ಸಂಪರ್ಕ +NbOfAttachedFiles=ಲಗತ್ತಿಸಲಾದ ಕಡತಗಳ ಸಂಖ್ಯೆ +AttachANewFile=ಹೊಸ ಕಡತ ಲಗತ್ತಿಸಿ +NoRIB=BAN ವ್ಯಾಖ್ಯಾನಿಸಲ್ಪಟ್ಟಿಲ್ಲ +NoParentCompany=ಯಾವುದೂ ಇಲ್ಲ +ExportImport=ಆಮದು-ರಫ್ತು +ExportCardToFormat=ಕಾರ್ಡನ್ನು ಸ್ವರೂಪಕ್ಕೆ ರಫ್ತು ಮಾಡಿ +ContactNotLinkedToCompany=ಸಂಪರ್ಕವು ಯಾವುದೇ ಮೂರನೇ ಪಾರ್ಟಿಗೆ ಕೂಡಿಸಲ್ಪಟ್ಟಿಲ್ಲ. +DolibarrLogin=ಲಾಗಿನ್ ಆಗಿ +NoDolibarrAccess=ಪ್ರವೇಶವಿಲ್ಲ +ExportDataset_company_1=ಮೂರನೇ ಪಕ್ಷಗಳು (ಸಂಸ್ಥೆಗಳು / ಫೌಂಡೇಶನ್ / ಜನರು) ಮತ್ತು ವಿವರಗಳು +ExportDataset_company_2=ಸಂಪರ್ಕಗಳು ಮತ್ತು ವಿವರಗಳು +ImportDataset_company_1=ಮೂರನೇ ಪಕ್ಷಗಳು (ಸಂಸ್ಥೆಗಳು / ಫೌಂಡೇಶನ್ / ಜನರು) ಮತ್ತು ವಿವರಗಳು +ImportDataset_company_2=ಸಂಪರ್ಕಗಳು / ವಿಳಾಸಗಳು (ಮೂರನೇ ಪಾರ್ಟಿಗಳದ್ದಾಗಿರಬಹುದು, ಆಗಿಲ್ಲದಿರಬಹುದು) ಮತ್ತು ಲಕ್ಷಣಗಳು +ImportDataset_company_3=ಬ್ಯಾಂಕ್ ವಿವರಗಳು +PriceLevel=ಬೆಲೆ ಮಟ್ಟ +DeliveriesAddress=ತಲುಪಿಸುವ ವಿಳಾಸಗಳು +DeliveryAddress=ತಲುಪಿಸುವ ವಿಳಾಸ +DeliveryAddressLabel=ತಲುಪಿಸುವ ವಿಳಾಸದ ಲೇಬಲ್ +DeleteDeliveryAddress=ತಲುಪಿಸುವ ವಿಳಾಸವನ್ನು ತೆಗೆಯಿರಿ +ConfirmDeleteDeliveryAddress=ನೀವು ಈ ತಲುಪಿಸುವ ವಿಳಾಸವನ್ನು ಖಂಡಿತವಾಗಿಯೂ ಅಳಿಸಲು ಬಯಸುತ್ತೀರೇ? +NewDeliveryAddress=ಹೊಸ ತಲುಪಿಸುವ ವಿಳಾಸ +AddDeliveryAddress=Create address +AddAddress=Create address +NoOtherDeliveryAddress=ಯಾವುದೇ ಪರ್ಯಾಯ ತಲುಪಿಸುವ ವಿಳಾಸವನ್ನು ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿಲ್ಲ. +SupplierCategory=ಸರಬರಾಜುದಾರ ವರ್ಗ +JuridicalStatus200=ಸ್ವತಂತ್ರ +DeleteFile=ಫೈಲ್ ತೆಗೆಯಿರಿ +ConfirmDeleteFile=ನೀವು ಈ ಫೈಲ್ಅನ್ನು ಖಂಡಿತವಾಗಿಯೂ ಶಾಶ್ವವವಾಗಿ ತೆಗೆದುಹಾಕಲು ಬಯಸುತ್ತೀರಾ? +AllocateCommercial=ಮಾರಾಟ ಪ್ರತಿನಿಧಿ ನಿಯೋಜಿಸಲಾಗಿದೆ +SelectCountry=ರಾಷ್ಟ್ರವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ +SelectCompany=ಮೂರನೇ ಪಾರ್ಟಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ +Organization=ಸಂಘಟನೆ +AutomaticallyGenerated=ಸ್ವಯಂಚಾಲಿತವಾಗಿ ರಚಿತವಾದ +FiscalYearInformation=ಹಣಕಾಸಿನ ವರ್ಷದ ಮಾಹಿತಿ +FiscalMonthStart=ಆರ್ಥಿಕ ವರ್ಷಾರಂಭದ ತಿಂಗಳು +YouMustCreateContactFirst=ಈ ಸಂಪರ್ಕವನ್ನು ಇ-ಮೇಲ್ ಅಧಿಸೂಚನಾ ಪಟ್ಟಿಗೆ ಸೇರಿಸುವ ಮುನ್ನ ಸಂಪರ್ಕದ ಇ-ಮೇಲ್ ವಿವರವನ್ನು ನಮೂದಿಸಿ. +ListSuppliersShort=ಪೂರೈಕೆದಾರರ ಪಟ್ಟಿ +ListProspectsShort=ನಿರೀಕ್ಷಿತರ ಪಟ್ಟಿ +ListCustomersShort=ಗ್ರಾಹಕರ ಪಟ್ಟಿ +ThirdPartiesArea=Third parties and contact area +LastModifiedThirdParties=ಕೊನೆಯ %sದಿಂದ ಬದಲಾಯಿಸಲಾದ ಮೂರನೇ ಪಕ್ಷಗಳು +UniqueThirdParties=ಒಟ್ಟು ಅನನ್ಯ ಮೂರನೇ ಪಾರ್ಟಿಗಳು +InActivity=ತೆರೆಯಲಾಗಿದೆ +ActivityCeased=ಮುಚ್ಚಲಾಗಿದೆ +ActivityStateFilter=ಚಟುವಟಿಕೆ ಸ್ಥಿತಿ +ProductsIntoElements=List of products into %s +CurrentOutstandingBill=ಪ್ರಸ್ತುತ ಬಾಕಿ ಉಳಿದಿರುವ ಬಿಲ್ +OutstandingBill=ಗರಿಷ್ಟ ಬಾಕಿ ಉಳಿದಿರುವ ಬಿಲ್ ಮೊತ್ತ +OutstandingBillReached=ಗರಿಷ್ಟ ಬಾಕಿ ಉಳಿಯಬಹುದಾದ ಬಿಲ್ ಮೊತ್ತ ತಲುಪಿದೆ +MonkeyNumRefModelDesc=ಫಾರ್ಮ್ಯಾಟ್% syymm-NNNN ಗ್ರಾಹಕ ಕೋಡ್ ಮತ್ತು% syymm-NNNN ವವ ವರ್ಷ ಅಲ್ಲಿ ಪೂರೈಕೆದಾರ ಕೋಡ್ ಫಾರ್ ಜೊತೆ ನ್ಯೂಮರೋ ಹಿಂತಿರುಗಿ, ಮಿಮೀ ತಿಂಗಳು ಮತ್ತು NNNN ಯಾವುದೇ ಬ್ರೇಕ್ ಮತ್ತು 0 ಯಾವುದೇ ಲಾಭ ಒಂದು ಅನುಕ್ರಮದ. +LeopardNumRefModelDesc=ಕೋಡ್ ಉಚಿತ. ಈ ಕೋಡ್ ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಮಾರ್ಪಡಿಸಬಹುದಾಗಿದೆ. +ManagingDirectors=ಮ್ಯಾನೇಜರ್ (ಗಳು) ಹೆಸರು (ಸಿಇಒ, ನಿರ್ದೇಶಕ, ಅಧ್ಯಕ್ಷ ...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang new file mode 100644 index 00000000000..0d579a06ff1 --- /dev/null +++ b/htdocs/langs/kn_IN/compta.lang @@ -0,0 +1,207 @@ +# Dolibarr language file - Source file is en_US - compta +Accountancy=Accountancy +AccountancyCard=Accountancy card +Treasury=Treasury +MenuFinancial=Financial +TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation +TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation +OptionMode=Option for accountancy +OptionModeTrue=Option Incomes-Expenses +OptionModeVirtual=Option Claims-Debts +OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices. +OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output. +FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration) +VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup. +LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. +Param=Setup +RemainingAmountPayment=Amount payment remaining : +AmountToBeCharged=Total amount to pay : +AccountsGeneral=Accounts +Account=Account +Accounts=Accounts +Accountparent=Account parent +Accountsparent=Accounts parent +BillsForSuppliers=Bills for suppliers +Income=Income +Outcome=Expense +ReportInOut=Income / Expense +ReportTurnover=Turnover +PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party +PaymentsNotLinkedToUser=Payments not linked to any user +Profit=Profit +AccountingResult=Accounting result +Balance=Balance +Debit=Debit +Credit=Credit +Piece=Accounting Doc. +Withdrawal=Withdrawal +Withdrawals=Withdrawals +AmountHTVATRealReceived=Net collected +AmountHTVATRealPaid=Net paid +VATToPay=VAT sells +VATReceived=VAT received +VATToCollect=VAT purchases +VATSummary=VAT Balance +LT2SummaryES=IRPF Balance +LT1SummaryES=RE Balance +VATPaid=VAT paid +SalaryPaid=Salary paid +LT2PaidES=IRPF Paid +LT1PaidES=RE Paid +LT2CustomerES=IRPF sales +LT2SupplierES=IRPF purchases +LT1CustomerES=RE sales +LT1SupplierES=RE purchases +VATCollected=VAT collected +ToPay=To pay +ToGet=To get back +SpecialExpensesArea=Area for all special payments +TaxAndDividendsArea=Tax, social contributions and dividends area +SocialContribution=Social contribution +SocialContributions=Social contributions +MenuSpecialExpenses=Special expenses +MenuTaxAndDividends=Taxes and dividends +MenuSalaries=Salaries +MenuSocialContributions=Social contributions +MenuNewSocialContribution=New contribution +NewSocialContribution=New social contribution +ContributionsToPay=Contributions to pay +AccountancyTreasuryArea=Accountancy/Treasury area +AccountancySetup=Accountancy setup +NewPayment=New payment +Payments=Payments +PaymentCustomerInvoice=Customer invoice payment +PaymentSupplierInvoice=Supplier invoice payment +PaymentSocialContribution=Social contribution payment +PaymentVat=VAT payment +PaymentSalary=Salary payment +ListPayment=List of payments +ListOfPayments=List of payments +ListOfCustomerPayments=List of customer payments +ListOfSupplierPayments=List of supplier payments +DatePayment=Payment date +DateStartPeriod=Date start period +DateEndPeriod=Date end period +NewVATPayment=New VAT payment +newLT2PaymentES=New IRPF payment +newLT1PaymentES=New RE payment +LT2PaymentES=IRPF Payment +LT2PaymentsES=IRPF Payments +LT1PaymentES=RE Payment +LT1PaymentsES=RE Payments +VATPayment=VAT Payment +VATPayments=VAT Payments +SocialContributionsPayments=Social contributions payments +ShowVatPayment=Show VAT payment +TotalToPay=Total to pay +TotalVATReceived=Total VAT received +CustomerAccountancyCode=Customer accountancy code +SupplierAccountancyCode=Supplier accountancy code +AccountNumberShort=Account number +AccountNumber=Account number +NewAccount=New account +SalesTurnover=Sales turnover +SalesTurnoverMinimum=Minimum sales turnover +ByThirdParties=By third parties +ByUserAuthorOfInvoice=By invoice author +AccountancyExport=Accountancy export +ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s +SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. +CheckReceipt=Check deposit +CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts +NewCheckReceipt=New discount +NewCheckDeposit=New check deposit +NewCheckDepositOn=Create receipt for deposit on account: %s +NoWaitingChecks=No checks waiting for deposit. +DateChequeReceived=Check reception date +NbOfCheques=Nb of checks +PaySocialContribution=Pay a social contribution +ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid? +DeleteSocialContribution=Delete a social contribution +ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution? +ExportDataset_tax_1=Social contributions and payments +CalcModeVATDebt=Mode %sVAT on commitment accounting%s. +CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s. +CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting. +CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting +CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s +CalcModeLT1Debt=Mode %sRE on customer invoices%s +CalcModeLT1Rec= Mode %sRE on suppliers invoices%s +CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s +CalcModeLT2Debt=Mode %sIRPF on customer invoices%s +CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s +AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary +AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary +AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode %sClaims-Debts%s said Commitment accounting. +AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode %sIncomes-Expenses%s said cash accounting. +SeeReportInInputOutputMode=See report %sIncomes-Expenses%s said cash accounting for a calculation on actual payments made +SeeReportInDueDebtMode=See report %sClaims-Debts%s said commitment accounting for a calculation on issued invoices +RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included +RulesResultDue=- It includes outstanding invoices, expenses and VAT whether they are paid or not.
- It is based on the validation date of invoices and VAT and on the due date for expenses. +RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT.
- It is based on the payment dates of the invoices, expenses and VAT. +RulesCADue=- It includes the client's due invoices whether they are paid or not.
- It is based on the validation date of these invoices.
+RulesCAIn=- It includes all the effective payments of invoices received from clients.
- It is based on the payment date of these invoices
+DepositsAreNotIncluded=- Deposit invoices are nor included +DepositsAreIncluded=- Deposit invoices are included +LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF +LT1ReportByCustomersInInputOutputModeES=Report by third party RE +VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid +VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid +VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid +LT1ReportByQuartersInInputOutputMode=Report by RE rate +LT2ReportByQuartersInInputOutputMode=Report by IRPF rate +VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid +LT1ReportByQuartersInDueDebtMode=Report by RE rate +LT2ReportByQuartersInDueDebtMode=Report by IRPF rate +SeeVATReportInInputOutputMode=See report %sVAT encasement%s for a standard calculation +SeeVATReportInDueDebtMode=See report %sVAT on flow%s for a calculation with an option on the flow +RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment. +RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date. +RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date. +RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date. +OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair. +PercentOfInvoice=%%/invoice +NotUsedForGoods=Not used on goods +ProposalStats=Statistics on proposals +OrderStats=Statistics on orders +InvoiceStats=Statistics on bills +Dispatch=Dispatching +Dispatched=Dispatched +ToDispatch=To dispatch +ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer +SellsJournal=Sales Journal +PurchasesJournal=Purchases Journal +DescSellsJournal=Sales Journal +DescPurchasesJournal=Purchases Journal +InvoiceRef=Invoice ref. +CodeNotDef=Not defined +AddRemind=Dispatch available amount +RemainToDivide= Remain to dispatch : +WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module. +DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date. +Pcg_version=Pcg version +Pcg_type=Pcg type +Pcg_subtype=Pcg subtype +InvoiceLinesToDispatch=Invoice lines to dispatch +InvoiceDispatched=Dispatched invoices +AccountancyDashboard=Accountancy summary +ByProductsAndServices=By products and services +RefExt=External ref +ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". +LinkedOrder=Link to order +ReCalculate=Recalculate +Mode1=Method 1 +Mode2=Method 2 +CalculationRuleDesc=To calculate total VAT, there is two methods:
Method 1 is rounding vat on each line, then summing them.
Method 2 is summing all vat on each line, then rounding result.
Final result may differs from few cents. Default mode is mode %s. +CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier. +TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). +CalculationMode=Calculation mode +AccountancyJournal=Accountancy code journal +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/kn_IN/contracts.lang b/htdocs/langs/kn_IN/contracts.lang new file mode 100644 index 00000000000..d1be0e6513f --- /dev/null +++ b/htdocs/langs/kn_IN/contracts.lang @@ -0,0 +1,103 @@ +# Dolibarr language file - Source file is en_US - contracts +ContractsArea=Contracts area +ListOfContracts=List of contracts +LastModifiedContracts=Last %s modified contracts +AllContracts=All contracts +ContractCard=Contract card +ContractStatus=Contract status +ContractStatusNotRunning=Not running +ContractStatusRunning=Running +ContractStatusDraft=Draft +ContractStatusValidated=Validated +ContractStatusClosed=Closed +ServiceStatusInitial=Not running +ServiceStatusRunning=Running +ServiceStatusNotLate=Running, not expired +ServiceStatusNotLateShort=Not expired +ServiceStatusLate=Running, expired +ServiceStatusLateShort=Expired +ServiceStatusClosed=Closed +ServicesLegend=Services legend +Contracts=Contracts +ContractsAndLine=Contracts and line of contracts +Contract=Contract +NoContracts=No contracts +MenuServices=Services +MenuInactiveServices=Services not active +MenuRunningServices=Running services +MenuExpiredServices=Expired services +MenuClosedServices=Closed services +NewContract=New contract +AddContract=Create contract +SearchAContract=Search a contract +DeleteAContract=Delete a contract +CloseAContract=Close a contract +ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ? +ConfirmValidateContract=Are you sure you want to validate this contract under name %s ? +ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract ? +ConfirmCloseService=Are you sure you want to close this service with date %s ? +ValidateAContract=Validate a contract +ActivateService=Activate service +ConfirmActivateService=Are you sure you want to activate this service with date %s ? +RefContract=Contract reference +DateContract=Contract date +DateServiceActivate=Service activation date +DateServiceUnactivate=Service deactivation date +DateServiceStart=Date for beginning of service +DateServiceEnd=Date for end of service +ShowContract=Show contract +ListOfServices=List of services +ListOfInactiveServices=List of not active services +ListOfExpiredServices=List of expired active services +ListOfClosedServices=List of closed services +ListOfRunningContractsLines=List of running contract lines +ListOfRunningServices=List of running services +NotActivatedServices=Inactive services (among validated contracts) +BoardNotActivatedServices=Services to activate among validated contracts +LastContracts=Last %s contracts +LastActivatedServices=Last %s activated services +LastModifiedServices=Last %s modified services +EditServiceLine=Edit service line +ContractStartDate=Start date +ContractEndDate=End date +DateStartPlanned=Planned start date +DateStartPlannedShort=Planned start date +DateEndPlanned=Planned end date +DateEndPlannedShort=Planned end date +DateStartReal=Real start date +DateStartRealShort=Real start date +DateEndReal=Real end date +DateEndRealShort=Real end date +NbOfServices=Nb of services +CloseService=Close service +ServicesNomberShort=%s service(s) +RunningServices=Running services +BoardRunningServices=Expired running services +ServiceStatus=Status of service +DraftContracts=Drafts contracts +CloseRefusedBecauseOneServiceActive=Contract can't be closed as ther is at least one open service on it +CloseAllContracts=Close all contract lines +DeleteContractLine=Delete a contract line +ConfirmDeleteContractLine=Are you sure you want to delete this contract line ? +MoveToAnotherContract=Move service into another contract. +ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract. +ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ? +PaymentRenewContractId=Renew contract line (number %s) +ExpiredSince=Expiration date +RelatedContracts=Related contracts +NoExpiredServices=No expired active services +ListOfServicesToExpireWithDuration=List of Services to expire in %s days +ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days +ListOfServicesToExpire=List of Services to expire +NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. +StandardContractsTemplate=Standard contracts template +ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. + +##### Types de contacts ##### +TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract +TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract +TypeContact_contrat_external_BILLING=Billing customer contact +TypeContact_contrat_external_CUSTOMER=Follow-up customer contact +TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact +Error_CONTRACT_ADDON_NotDefined=Constant CONTRACT_ADDON not defined diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang new file mode 100644 index 00000000000..28dfc7770b2 --- /dev/null +++ b/htdocs/langs/kn_IN/cron.lang @@ -0,0 +1,87 @@ +# Dolibarr language file - Source file is en_US - cron +# About page +About = About +CronAbout = About Cron +CronAboutPage = Cron about page +# Right +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task +# Admin +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes +CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes +# Menu +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs +# Page list +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job +CronNone= None +CronDtStart=Start date +CronDtEnd=End date +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe +CronMethod=Method +CronModule=Module +CronAction=Action +CronStatus=Status +CronStatusActive=Enabled +CronStatusInactive=Disabled +CronNoJobs=No jobs registered +CronPriority=Priority +CronLabel=Description +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished +#Page card +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create +CronArgs=Parameters +CronSaveSucess=Save succesfully +CronNote=Comment +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable +CronStatusInactiveBtn=Disable +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. +# Info +CronInfoPage=Information +# Common +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/kn_IN/deliveries.lang b/htdocs/langs/kn_IN/deliveries.lang new file mode 100644 index 00000000000..d711c3704b4 --- /dev/null +++ b/htdocs/langs/kn_IN/deliveries.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - deliveries +Delivery=Delivery +Deliveries=Deliveries +DeliveryCard=Delivery card +DeliveryOrder=Delivery order +DeliveryOrders=Delivery orders +DeliveryDate=Delivery date +DeliveryDateShort=Deliv. date +CreateDeliveryOrder=Generate delivery order +QtyDelivered=Qty delivered +SetDeliveryDate=Set shipping date +ValidateDeliveryReceipt=Validate delivery receipt +ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt ? +DeleteDeliveryReceipt=Delete delivery receipt +DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt %s ? +DeliveryMethod=Delivery method +TrackingNumber=Tracking number +DeliveryNotValidated=Delivery not validated +# merou PDF model +NameAndSignature=Name and Signature : +ToAndDate=To___________________________________ on ____/_____/__________ +GoodStatusDeclaration=Have received the goods above in good condition, +Deliverer=Deliverer : +Sender=Sender +Recipient=Recipient +ErrorStockIsNotEnough=There's not enough stock +Shippable=Shippable +NonShippable=Not Shippable diff --git a/htdocs/langs/kn_IN/dict.lang b/htdocs/langs/kn_IN/dict.lang new file mode 100644 index 00000000000..bef1f4821b4 --- /dev/null +++ b/htdocs/langs/kn_IN/dict.lang @@ -0,0 +1,327 @@ +# Dolibarr language file - Source file is en_US - dict +CountryFR=France +CountryBE=Belgium +CountryIT=Italy +CountryES=Spain +CountryDE=Germany +CountryCH=Switzerland +CountryGB=Great Britain +CountryUK=United Kingdom +CountryIE=Ireland +CountryCN=China +CountryTN=Tunisia +CountryUS=United States +CountryMA=Morocco +CountryDZ=Algeria +CountryCA=Canada +CountryTG=Togo +CountryGA=Gabon +CountryNL=Netherlands +CountryHU=Hungary +CountryRU=Russia +CountrySE=Sweden +CountryCI=Ivoiry Coast +CountrySN=Senegal +CountryAR=Argentina +CountryCM=Cameroon +CountryPT=Portugal +CountrySA=Saudi Arabia +CountryMC=Monaco +CountryAU=Australia +CountrySG=Singapore +CountryAF=Afghanistan +CountryAX=Åland Islands +CountryAL=Albania +CountryAS=American Samoa +CountryAD=Andorra +CountryAO=Angola +CountryAI=Anguilla +CountryAQ=Antarctica +CountryAG=Antigua and Barbuda +CountryAM=Armenia +CountryAW=Aruba +CountryAT=Austria +CountryAZ=Azerbaijan +CountryBS=Bahamas +CountryBH=Bahrain +CountryBD=Bangladesh +CountryBB=Barbados +CountryBY=Belarus +CountryBZ=Belize +CountryBJ=Benin +CountryBM=Bermuda +CountryBT=Bhutan +CountryBO=Bolivia +CountryBA=Bosnia and Herzegovina +CountryBW=Botswana +CountryBV=Bouvet Island +CountryBR=Brazil +CountryIO=British Indian Ocean Territory +CountryBN=Brunei Darussalam +CountryBG=Bulgaria +CountryBF=Burkina Faso +CountryBI=Burundi +CountryKH=Cambodia +CountryCV=Cape Verde +CountryKY=Cayman Islands +CountryCF=Central African Republic +CountryTD=Chad +CountryCL=Chile +CountryCX=Christmas Island +CountryCC=Cocos (Keeling) Islands +CountryCO=Colombia +CountryKM=Comoros +CountryCG=Congo +CountryCD=Congo, The Democratic Republic of the +CountryCK=Cook Islands +CountryCR=Costa Rica +CountryHR=Croatia +CountryCU=Cuba +CountryCY=Cyprus +CountryCZ=Czech Republic +CountryDK=Denmark +CountryDJ=Djibouti +CountryDM=Dominica +CountryDO=Dominican Republic +CountryEC=Ecuador +CountryEG=Egypt +CountrySV=El Salvador +CountryGQ=Equatorial Guinea +CountryER=Eritrea +CountryEE=Estonia +CountryET=Ethiopia +CountryFK=Falkland Islands +CountryFO=Faroe Islands +CountryFJ=Fiji Islands +CountryFI=Finland +CountryGF=French Guiana +CountryPF=French Polynesia +CountryTF=French Southern Territories +CountryGM=Gambia +CountryGE=Georgia +CountryGH=Ghana +CountryGI=Gibraltar +CountryGR=Greece +CountryGL=Greenland +CountryGD=Grenada +CountryGP=Guadeloupe +CountryGU=Guam +CountryGT=Guatemala +CountryGN=Guinea +CountryGW=Guinea-Bissau +CountryGY=Guyana +CountryHT=Haïti +CountryHM=Heard Island and McDonald +CountryVA=Holy See (Vatican City State) +CountryHN=Honduras +CountryHK=Hong Kong +CountryIS=Icelande +CountryIN=India +CountryID=Indonesia +CountryIR=Iran +CountryIQ=Iraq +CountryIL=Israel +CountryJM=Jamaica +CountryJP=Japan +CountryJO=Jordan +CountryKZ=Kazakhstan +CountryKE=Kenya +CountryKI=Kiribati +CountryKP=North Korea +CountryKR=South Korea +CountryKW=Kuwait +CountryKG=Kyrghyztan +CountryLA=Lao +CountryLV=Latvia +CountryLB=Lebanon +CountryLS=Lesotho +CountryLR=Liberia +CountryLY=Libyan +CountryLI=Liechtenstein +CountryLT=Lituania +CountryLU=Luxembourg +CountryMO=Macao +CountryMK=Macedonia, the former Yugoslav of +CountryMG=Madagascar +CountryMW=Malawi +CountryMY=Malaysia +CountryMV=Maldives +CountryML=Mali +CountryMT=Malta +CountryMH=Marshall Islands +CountryMQ=Martinique +CountryMR=Mauritania +CountryMU=Mauritius +CountryYT=Mayotte +CountryMX=Mexico +CountryFM=Micronesia +CountryMD=Moldova +CountryMN=Mongolia +CountryMS=Monserrat +CountryMZ=Mozambique +CountryMM=Birmania (Myanmar) +CountryNA=Namibia +CountryNR=Nauru +CountryNP=Nepal +CountryAN=Netherlands Antilles +CountryNC=New Caledonia +CountryNZ=New Zealand +CountryNI=Nicaragua +CountryNE=Niger +CountryNG=Nigeria +CountryNU=Niue +CountryNF=Norfolk Island +CountryMP=Northern Mariana Islands +CountryNO=Norway +CountryOM=Oman +CountryPK=Pakistan +CountryPW=Palau +CountryPS=Palestinian Territory, Occupied +CountryPA=Panama +CountryPG=Papua New Guinea +CountryPY=Paraguay +CountryPE=Peru +CountryPH=Philippines +CountryPN=Pitcairn Islands +CountryPL=Poland +CountryPR=Puerto Rico +CountryQA=Qatar +CountryRE=Reunion +CountryRO=Romania +CountryRW=Rwanda +CountrySH=Saint Helena +CountryKN=Saint Kitts and Nevis +CountryLC=Saint Lucia +CountryPM=Saint Pierre and Miquelon +CountryVC=Saint Vincent and Grenadines +CountryWS=Samoa +CountrySM=San Marino +CountryST=Sao Tome and Principe +CountryRS=Serbia +CountrySC=Seychelles +CountrySL=Sierra Leone +CountrySK=Slovakia +CountrySI=Slovenia +CountrySB=Solomon Islands +CountrySO=Somalia +CountryZA=South Africa +CountryGS=South Georgia and the South Sandwich Islands +CountryLK=Sri Lanka +CountrySD=Sudan +CountrySR=Suriname +CountrySJ=Svalbard and Jan Mayen +CountrySZ=Swaziland +CountrySY=Syrian +CountryTW=Taiwan +CountryTJ=Tajikistan +CountryTZ=Tanzania +CountryTH=Thailand +CountryTL=Timor-Leste +CountryTK=Tokelau +CountryTO=Tonga +CountryTT=Trinidad and Tobago +CountryTR=Turkey +CountryTM=Turkmenistan +CountryTC=Turks and Cailos Islands +CountryTV=Tuvalu +CountryUG=Uganda +CountryUA=Ukraine +CountryAE=United Arab Emirates +CountryUM=United States Minor Outlying Islands +CountryUY=Uruguay +CountryUZ=Uzbekistan +CountryVU=Vanuatu +CountryVE=Venezuela +CountryVN=Viet Nam +CountryVG=Virgin Islands, British +CountryVI=Virgin Islands, U.S. +CountryWF=Wallis and Futuna +CountryEH=Western Sahara +CountryYE=Yemen +CountryZM=Zambia +CountryZW=Zimbabwe +CountryGG=Guernsey +CountryIM=Isle of Man +CountryJE=Jersey +CountryME=Montenegro +CountryBL=Saint Barthelemy +CountryMF=Saint Martin + +##### Civilities ##### +CivilityMME=Mrs. +CivilityMR=Mr. +CivilityMLE=Ms. +CivilityMTRE=Master +CivilityDR=Doctor +##### Currencies ##### +Currencyeuros=Euros +CurrencyAUD=AU Dollars +CurrencySingAUD=AU Dollar +CurrencyCAD=CAN Dollars +CurrencySingCAD=CAN Dollar +CurrencyCHF=Swiss Francs +CurrencySingCHF=Swiss Franc +CurrencyEUR=Euros +CurrencySingEUR=Euro +CurrencyFRF=French Francs +CurrencySingFRF=French Franc +CurrencyGBP=GB Pounds +CurrencySingGBP=GB Pound +CurrencyINR=Indian rupees +CurrencySingINR=Indian rupee +CurrencyMAD=Dirham +CurrencySingMAD=Dirham +CurrencyMGA=Ariary +CurrencySingMGA=Ariary +CurrencyMUR=Mauritius rupees +CurrencySingMUR=Mauritius rupee +CurrencyNOK=Norwegian krones +CurrencySingNOK=Norwegian krone +CurrencyTND=Tunisian dinars +CurrencySingTND=Tunisian dinar +CurrencyUSD=US Dollars +CurrencySingUSD=US Dollar +CurrencyUAH=Hryvnia +CurrencySingUAH=Hryvnia +CurrencyXAF=CFA Francs BEAC +CurrencySingXAF=CFA Franc BEAC +CurrencyXOF=CFA Francs BCEAO +CurrencySingXOF=CFA Franc BCEAO +CurrencyXPF=CFP Francs +CurrencySingXPF=CFP Franc +CurrencyCentSingEUR=cent +CurrencyCentINR=paisa +CurrencyCentSingINR=paise +CurrencyThousandthSingTND=thousandth +#### Input reasons ##### +DemandReasonTypeSRC_INTE=Internet +DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign +DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign +DemandReasonTypeSRC_CAMP_PHO=Phone campaign +DemandReasonTypeSRC_CAMP_FAX=Fax campaign +DemandReasonTypeSRC_COMM=Commercial contact +DemandReasonTypeSRC_SHOP=Shop contact +DemandReasonTypeSRC_WOM=Word of mouth +DemandReasonTypeSRC_PARTNER=Partner +DemandReasonTypeSRC_EMPLOYEE=Employee +DemandReasonTypeSRC_SPONSORING=Sponsorship +#### Paper formats #### +PaperFormatEU4A0=Format 4A0 +PaperFormatEU2A0=Format 2A0 +PaperFormatEUA0=Format A0 +PaperFormatEUA1=Format A1 +PaperFormatEUA2=Format A2 +PaperFormatEUA3=Format A3 +PaperFormatEUA4=Format A4 +PaperFormatEUA5=Format A5 +PaperFormatEUA6=Format A6 +PaperFormatUSLETTER=Format Letter US +PaperFormatUSLEGAL=Format Legal US +PaperFormatUSEXECUTIVE=Format Executive US +PaperFormatUSLEDGER=Format Ledger/Tabloid +PaperFormatCAP1=Format P1 Canada +PaperFormatCAP2=Format P2 Canada +PaperFormatCAP3=Format P3 Canada +PaperFormatCAP4=Format P4 Canada +PaperFormatCAP5=Format P5 Canada +PaperFormatCAP6=Format P6 Canada diff --git a/htdocs/langs/kn_IN/donations.lang b/htdocs/langs/kn_IN/donations.lang new file mode 100644 index 00000000000..f7aed91cf81 --- /dev/null +++ b/htdocs/langs/kn_IN/donations.lang @@ -0,0 +1,38 @@ +# Dolibarr language file - Source file is en_US - donations +Donation=Donation +Donations=Donations +DonationRef=Donation ref. +Donor=Donor +Donors=Donors +AddDonation=Create a donation +NewDonation=New donation +ShowDonation=Show donation +DonationPromise=Gift promise +PromisesNotValid=Not validated promises +PromisesValid=Validated promises +DonationsPaid=Donations paid +DonationsReceived=Donations received +PublicDonation=Public donation +DonationsNumber=Donation number +DonationsArea=Donations area +DonationStatusPromiseNotValidated=Draft promise +DonationStatusPromiseValidated=Validated promise +DonationStatusPaid=Donation received +DonationStatusPromiseNotValidatedShort=Draft +DonationStatusPromiseValidatedShort=Validated +DonationStatusPaidShort=Received +ValidPromess=Validate promise +DonationReceipt=Donation receipt +BuildDonationReceipt=Build receipt +DonationsModels=Documents models for donation receipts +LastModifiedDonations=Last %s modified donations +SearchADonation=Search a donation +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/kn_IN/ecm.lang b/htdocs/langs/kn_IN/ecm.lang new file mode 100644 index 00000000000..4a1931a3217 --- /dev/null +++ b/htdocs/langs/kn_IN/ecm.lang @@ -0,0 +1,57 @@ +# Dolibarr language file - Source file is en_US - ecm +MenuECM=Documents +DocsMine=My documents +DocsGenerated=Generated documents +DocsElements=Elements documents +DocsThirdParties=Documents third parties +DocsContracts=Documents contracts +DocsProposals=Documents proposals +DocsOrders=Documents orders +DocsInvoices=Documents invoices +ECMNbOfDocs=Nb of documents in directory +ECMNbOfDocsSmall=Nb of doc. +ECMSection=Directory +ECMSectionManual=Manual directory +ECMSectionAuto=Automatic directory +ECMSectionsManual=Manual tree +ECMSectionsAuto=Automatic tree +ECMSections=Directories +ECMRoot=Root +ECMNewSection=New directory +ECMAddSection=Add directory +ECMNewDocument=New document +ECMCreationDate=Creation date +ECMNbOfFilesInDir=Number of files in directory +ECMNbOfSubDir=Number of sub-directories +ECMNbOfFilesInSubDir=Number of files in sub-directories +ECMCreationUser=Creator +ECMArea=EDM area +ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr. +ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.
* Manual directories can be used to save documents not linked to a particular element. +ECMSectionWasRemoved=Directory %s has been deleted. +ECMDocumentsSection=Document of directory +ECMSearchByKeywords=Search by keywords +ECMSearchByEntity=Search by object +ECMSectionOfDocuments=Directories of documents +ECMTypeManual=Manual +ECMTypeAuto=Automatic +ECMDocsBySocialContributions=Documents linked to social contributions +ECMDocsByThirdParties=Documents linked to third parties +ECMDocsByProposals=Documents linked to proposals +ECMDocsByOrders=Documents linked to customers orders +ECMDocsByContracts=Documents linked to contracts +ECMDocsByInvoices=Documents linked to customers invoices +ECMDocsByProducts=Documents linked to products +ECMDocsByProjects=Documents linked to projects +ECMDocsByUsers=Documents linked to users +ECMDocsByInterventions=Documents linked to interventions +ECMNoDirectoryYet=No directory created +ShowECMSection=Show directory +DeleteSection=Remove directory +ConfirmDeleteSection=Can you confirm you want to delete the directory %s ? +ECMDirectoryForFiles=Relative directory for files +CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files +ECMFileManager=File manager +ECMSelectASection=Select a directory on left tree... +DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory. + diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang new file mode 100644 index 00000000000..700e6344d7d --- /dev/null +++ b/htdocs/langs/kn_IN/errors.lang @@ -0,0 +1,183 @@ +# Dolibarr language file - Source file is en_US - errors + +# No errors +NoErrorCommitIsDone=No error, we commit +# Errors +Error=Error +Errors=Errors +ErrorButCommitIsDone=Errors found but we validate despite this +ErrorBadEMail=EMail %s is wrong +ErrorBadUrl=Url %s is wrong +ErrorLoginAlreadyExists=Login %s already exists. +ErrorGroupAlreadyExists=Group %s already exists. +ErrorRecordNotFound=Record not found. +ErrorFailToCopyFile=Failed to copy file '%s' into '%s'. +ErrorFailToRenameFile=Failed to rename file '%s' into '%s'. +ErrorFailToDeleteFile=Failed to remove file '%s'. +ErrorFailToCreateFile=Failed to create file '%s'. +ErrorFailToRenameDir=Failed to rename directory '%s' into '%s'. +ErrorFailToCreateDir=Failed to create directory '%s'. +ErrorFailToDeleteDir=Failed to delete directory '%s'. +ErrorFailedToDeleteJoinedFiles=Can not delete environment because there is some joined files. Remove join files first. +ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type. +ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only. +ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different. +ErrorBadThirdPartyName=Bad value for third party name +ErrorProdIdIsMandatory=The %s is mandatory +ErrorBadCustomerCodeSyntax=Bad syntax for customer code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. +ErrorCustomerCodeRequired=Customer code required +ErrorBarCodeRequired=Bar code required +ErrorCustomerCodeAlreadyUsed=Customer code already used +ErrorBarCodeAlreadyUsed=Bar code already used +ErrorPrefixRequired=Prefix required +ErrorUrlNotValid=The website address is incorrect +ErrorBadSupplierCodeSyntax=Bad syntax for supplier code +ErrorSupplierCodeRequired=Supplier code required +ErrorSupplierCodeAlreadyUsed=Supplier code already used +ErrorBadParameters=Bad parameters +ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) +ErrorBadDateFormat=Value '%s' has wrong date format +ErrorWrongDate=Date is not correct! +ErrorFailedToWriteInDir=Failed to write in directory %s +ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s) +ErrorUserCannotBeDelete=User can not be deleted. May be it is associated on Dolibarr entities. +ErrorFieldsRequired=Some required fields were not filled. +ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter safe_mode is enabled on this PHP, check that Dolibarr php files owns to web server user (or group). +ErrorNoMailDefinedForThisUser=No mail defined for this user +ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display. +ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'. +ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id. +ErrorFileNotFound=File %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) +ErrorDirNotFound=Directory %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) +ErrorFunctionNotAvailableInPHP=Function %s is required for this feature but is not available in this version/setup of PHP. +ErrorDirAlreadyExists=A directory with this name already exists. +ErrorFileAlreadyExists=A file with this name already exists. +ErrorPartialFile=File not received completely by server. +ErrorNoTmpDir=Temporary directy %s does not exists. +ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin. +ErrorFileSizeTooLarge=File size is too large. +ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum) +ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum) +ErrorNoValueForSelectType=Please fill value for select list +ErrorNoValueForCheckBoxType=Please fill value for checkbox list +ErrorNoValueForRadioType=Please fill value for radio list +ErrorBadFormatValueList=The list value cannot have more than one come : %s, but need at least one: llave,valores +ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters. +ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters. +ErrorNoAccountancyModuleLoaded=No accountancy module activated +ErrorExportDuplicateProfil=This profile name already exists for this export set. +ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete. +ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors. +ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled. +ErrorRefAlreadyExists=Ref used for creation already exists. +ErrorPleaseTypeBankTransactionReportName=Please type bank receipt name where transaction is reported (Format YYYYMM or YYYYMMDD) +ErrorRecordHasChildren=Failed to delete records since it has some childs. +ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object. +ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display. +ErrorPasswordsMustMatch=Both typed passwords must match each other +ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. +ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) +ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) +ErrorsOnXLines=Errors on %s source record(s) +ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) +ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s" +ErrorDatabaseParameterWrong=Database setup parameter '%s' has a value not compatible to use Dolibarr (must have value '%s'). +ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module. +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Setup - Modules to complete. +ErrorBadMask=Error on mask +ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number +ErrorBadMaskBadRazMonth=Error, bad reset value +ErrorMaxNumberReachForThisMask=Max number reach for this mask +ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits +ErrorSelectAtLeastOne=Error. Select at least one entry. +ErrorProductWithRefNotExist=Product with reference '%s' don't exist +ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated +ErrorProdIdAlreadyExist=%s is assigned to another third +ErrorFailedToSendPassword=Failed to send password +ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information. +ErrorPasswordDiffers=Passwords differs, please type them again. +ErrorForbidden=Access denied.
You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user. +ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s. +ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...). +ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display. +ErrorRecordAlreadyExists=Record already exists +ErrorCantReadFile=Failed to read file '%s' +ErrorCantReadDir=Failed to read directory '%s' +ErrorFailedToFindEntity=Failed to read environment '%s' +ErrorBadLoginPassword=Bad value for login or password +ErrorLoginDisabled=Your account has been disabled +ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP Safe Mode is enabled, check that command is inside a directory defined by parameter safe_mode_exec_dir. +ErrorFailedToChangePassword=Failed to change password +ErrorLoginDoesNotExists=User with login %s could not be found. +ErrorLoginHasNoEmail=This user has no email address. Process aborted. +ErrorBadValueForCode=Bad value for security code. Try again with new value... +ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative +ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that +ErrorNoActivatedBarcode=No barcode type activated +ErrUnzipFails=Failed to unzip %s with ZipArchive +ErrNoZipEngine=No engine to unzip %s file in this PHP +ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package +ErrorFileRequired=It takes a package Dolibarr file +ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal +ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base +ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base +ErrorNewValueCantMatchOldValue=New value can't be equal to old one +ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process. +ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start'). +ErrorFailedToAddContact=Failed to add contact +ErrorDateMustBeBeforeToday=The date can not be greater than today +ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode. +ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature. +ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s +ErrorWarehouseMustDiffers=Source and target warehouses must differs +ErrorBadFormat=Bad format! +ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. +ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' +ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action + +# Warnings +WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined +WarningSafeModeOnCheckExecDir=Warning, PHP option safe_mode is on so command must be stored inside a directory declared by php parameter safe_mode_exec_dir. +WarningAllowUrlFopenMustBeOn=Parameter allow_url_fopen must be set to on in filer php.ini for having this module working completely. You must modify this file manually. +WarningBuildScriptNotRunned=Script %s was not yet ran to build graphics, or there is no data to show. +WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists. +WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this. +WarningConfFileMustBeReadOnly=Warning, your config file (htdocs/conf/conf.php) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe. +WarningsOnXLines=Warnings on %s source record(s) +WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be choosed by default until you check your module setup. +WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file install.lock into directory %s. Missing this file is a security hole. +WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup). +WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution. +WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box. +WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). +WarningNotRelevant=Irrelevant operation for this dataset +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/kn_IN/exports.lang b/htdocs/langs/kn_IN/exports.lang new file mode 100644 index 00000000000..d79df485608 --- /dev/null +++ b/htdocs/langs/kn_IN/exports.lang @@ -0,0 +1,134 @@ +# Dolibarr language file - Source file is en_US - exports +ExportsArea=Exports area +ImportArea=Import area +NewExport=New export +NewImport=New import +ExportableDatas=Exportable dataset +ImportableDatas=Importable dataset +SelectExportDataSet=Choose dataset you want to export... +SelectImportDataSet=Choose dataset you want to import... +SelectExportFields=Choose fields you want to export, or select a predefined export profile +SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile: +NotImportedFields=Fields of source file not imported +SaveExportModel=Save this export profile if you plan to reuse it later... +SaveImportModel=Save this import profile if you plan to reuse it later... +ExportModelName=Export profile name +ExportModelSaved=Export profile saved under name %s. +ExportableFields=Exportable fields +ExportedFields=Exported fields +ImportModelName=Import profile name +ImportModelSaved=Import profile saved under name %s. +ImportableFields=Importable fields +ImportedFields=Imported fields +DatasetToExport=Dataset to export +DatasetToImport=Import file into dataset +NoDiscardedFields=No fields in source file are discarded +Dataset=Dataset +ChooseFieldsOrdersAndTitle=Choose fields order... +FieldsOrder=Fields order +FieldsTitle=Fields title +FieldOrder=Field order +FieldTitle=Field title +ChooseExportFormat=Choose export format +NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file... +AvailableFormats=Available formats +LibraryShort=Library +LibraryUsed=Library used +LibraryVersion=Version +Step=Step +FormatedImport=Import assistant +FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge. +FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load. +FormatedExport=Export assistant +FormatedExportDesc1=This area allows to export personalized data, using an assistant to help you in process without technical knowledge. +FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order. +FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to. +Sheet=Sheet +NoImportableData=No importable data (no module with definitions to allow data imports) +FileSuccessfullyBuilt=Export file generated +SQLUsedForExport=SQL Request used to build export file +LineId=Id of line +LineDescription=Description of line +LineUnitPrice=Unit price of line +LineVATRate=VAT Rate of line +LineQty=Quantity for line +LineTotalHT=Amount net of tax for line +LineTotalTTC=Amount with tax for line +LineTotalVAT=Amount of VAT for line +TypeOfLineServiceOrProduct=Type of line (0=product, 1=service) +FileWithDataToImport=File with data to import +FileToImport=Source file to import +FileMustHaveOneOfFollowingFormat=File to import must have one of following format +DownloadEmptyExample=Download example of empty source file +ChooseFormatOfFileToImport=Choose file format to use as import file format by clicking on picto %s to select it... +ChooseFileToImport=Upload file then click on picto %s to select file as source import file... +SourceFileFormat=Source file format +FieldsInSourceFile=Fields in source file +FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory) +Field=Field +NoFields=No fields +MoveField=Move field column number %s +ExampleOfImportFile=Example_of_import_file +SaveImportProfile=Save this import profile +ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name. +ImportSummary=Import setup summary +TablesTarget=Targeted tables +FieldsTarget=Targeted fields +TableTarget=Targeted table +FieldTarget=Targeted field +FieldSource=Source field +DoNotImportFirstLine=Do not import first line of source file +NbOfSourceLines=Number of lines in source file +NowClickToTestTheImport=Check import parameters you have defined. If they are correct, click on button "%s" to launch a simulation of import process (no data will be changed in your database, it's only a simulation for the moment)... +RunSimulateImportFile=Launch the import simulation +FieldNeedSource=This field requires data from the source file +SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file +InformationOnSourceFile=Information on source file +InformationOnTargetTables=Information on target fields +SelectAtLeastOneField=Switch at least one source field in the column of fields to export +SelectFormat=Choose this import file format +RunImportFile=Launch import file +NowClickToRunTheImport=Check result of import simulation. If everything is ok, launch the definitive import. +DataLoadedWithId=All data will be loaded with the following import id: %s +ErrorMissingMandatoryValue=Mandatory data is empty in source file for field %s. +TooMuchErrors=There is still %s other source lines with errors but output has been limited. +TooMuchWarnings=There is still %s other source lines with warnings but output has been limited. +EmptyLine=Empty line (will be discarded) +CorrectErrorBeforeRunningImport=You must first correct all errors before running definitive import. +FileWasImported=File was imported with number %s. +YouCanUseImportIdToFindRecord=You can find all imported records in your database by filtering on field import_key='%s'. +NbOfLinesOK=Number of lines with no errors and no warnings: %s. +NbOfLinesImported=Number of lines successfully imported: %s. +DataComeFromNoWhere=Value to insert comes from nowhere in source file. +DataComeFromFileFieldNb=Value to insert comes from field number %s in source file. +DataComeFromIdFoundFromRef=Value that comes from field number %s of source file will be used to find id of parent object to use (So the objet %s that has the ref. from source file must exists into Dolibarr). +DataComeFromIdFoundFromCodeId=Code that comes from field number %s of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary %s). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases. +DataIsInsertedInto=Data coming from source file will be inserted into the following field: +DataIDSourceIsInsertedInto=The id of parent object found using the data in source file, will be inserted into the following field: +DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field: +SourceRequired=Data value is mandatory +SourceExample=Example of possible data value +ExampleAnyRefFoundIntoElement=Any ref found for element %s +ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s +CSVFormatDesc=Comma Separated Value file format (.csv).
This is a text file format where fields are separated by separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ]. +Excel95FormatDesc=Excel file format (.xls)
This is native Excel 95 format (BIFF5). +Excel2007FormatDesc=Excel file format (.xlsx)
This is native Excel 2007 format (SpreadsheetML). +TsvFormatDesc=Tab Separated Value file format (.tsv)
This is a text file format where fields are separated by a tabulator [tab]. +ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ). +CsvOptions=Csv Options +Separator=Separator +Enclosure=Enclosure +SuppliersProducts=Suppliers Products +BankCode=Bank code +DeskCode=Desk code +BankAccountNumber=Account number +BankAccountNumberKey=Key +SpecialCode=Special code +ExportStringFilter=%% allows replacing one or more characters in the text +ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days +ExportNumericFilter='NNNNN' filters by one value
'NNNNN+NNNNN' filters over a range of values
'>NNNNN' filters by lower values
'>NNNNN' filters by higher values +## filters +SelectFilterFields=If you want to filter on some values, just input values here. +FilterableFields=Champs Filtrables +FilteredFields=Filtered fields +FilteredFieldsValues=Value for filter diff --git a/htdocs/langs/kn_IN/externalsite.lang b/htdocs/langs/kn_IN/externalsite.lang new file mode 100644 index 00000000000..da4853df0df --- /dev/null +++ b/htdocs/langs/kn_IN/externalsite.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - externalsite +ExternalSiteSetup=Setup link to external website +ExternalSiteURL=External Site URL +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/kn_IN/ftp.lang b/htdocs/langs/kn_IN/ftp.lang new file mode 100644 index 00000000000..9984ce689ee --- /dev/null +++ b/htdocs/langs/kn_IN/ftp.lang @@ -0,0 +1,12 @@ +# Dolibarr language file - Source file is en_US - ftp +FTPClientSetup=FTP Client module setup +NewFTPClient=New FTP connection setup +FTPArea=FTP Area +FTPAreaDesc=This screen show you content of a FTP server view +SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete +FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions +FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s) +FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password +FTPFailedToRemoveFile=Failed to remove file %s. +FTPFailedToRemoveDir=Failed to remove directory %s (Check permissions and that directory is empty). +FTPPassiveMode=Passive mode diff --git a/htdocs/langs/kn_IN/help.lang b/htdocs/langs/kn_IN/help.lang new file mode 100644 index 00000000000..1bbd6e94f03 --- /dev/null +++ b/htdocs/langs/kn_IN/help.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - help +CommunitySupport=Forum/Wiki support +EMailSupport=Emails support +RemoteControlSupport=Online real time / remote support +OtherSupport=Other support +ToSeeListOfAvailableRessources=To contact/see available resources: +ClickHere=Click here +HelpCenter=Help center +DolibarrHelpCenter=Dolibarr help and support center +ToGoBackToDolibarr=Otherwise, click here to use Dolibarr +TypeOfSupport=Source of support +TypeSupportCommunauty=Community (free) +TypeSupportCommercial=Commercial +TypeOfHelp=Type +NeedHelpCenter=Need help or support ? +Efficiency=Efficiency +TypeHelpOnly=Help only +TypeHelpDev=Help+Development +TypeHelpDevForm=Help+Development+Formation +ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on %s web site: +ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button +ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests. +BackToHelpCenter=Otherwise, click here to go back to help center home page. +LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated): +PossibleLanguages=Supported languages +MakeADonation=Help Dolibarr project, make a donation +SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation +SeeOfficalSupport=For official Dolibarr support in your language:
%s diff --git a/htdocs/langs/kn_IN/holiday.lang b/htdocs/langs/kn_IN/holiday.lang new file mode 100644 index 00000000000..f5b87fefb08 --- /dev/null +++ b/htdocs/langs/kn_IN/holiday.lang @@ -0,0 +1,148 @@ +# Dolibarr language file - Source file is en_US - holiday +HRM=HRM +Holidays=Leaves +CPTitreMenu=Leaves +MenuReportMonth=Monthly statement +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request +Employe=Employee +DateDebCP=Start date +DateFinCP=End date +DateCreateCP=Creation date +DraftCP=Draft +ToReviewCP=Awaiting approval +ApprovedCP=Approved +CancelCP=Canceled +RefuseCP=Refused +ValidatorCP=Approbator +ListeCP=List of leaves +ReviewedByCP=Will be reviewed by +DescCP=Description +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. +ErrorEndDateCP=You must select an end date greater than the start date. +ErrorSQLCreateCP=An SQL error occurred during the creation: +ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ReturnCP=Return to previous page +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request +InfosWorkflowCP=Information Workflow +RequestByCP=Requested by +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed +EditCP=Edit +DeleteCP=Delete +ActionValidCP=Validate +ActionRefuseCP=Refuse +ActionCancelCP=Cancel +StatutCP=Status +SendToValidationCP=Send to validation +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. +CantUpdate=You cannot update this leave request. +NoDateDebut=You must select a start date. +NoDateFin=You must select an end date. +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request +ConfirmValidCP=Are you sure you want to approve the leave request? +DateValidCP=Date approved +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? +TitleRefuseCP=Refuse the leave request +ConfirmRefuseCP=Are you sure you want to refuse the leave request? +NoMotifRefuseCP=You must choose a reason for refusing the request. +TitleCancelCP=Cancel the leave request +ConfirmCancelCP=Are you sure you want to cancel the leave request? +DetailRefusCP=Reason for refusal +DateRefusCP=Date of refusal +DateCancelCP=Date of cancellation +DefineEventUserCP=Assign an exceptional leave for a user +addEventToUserCP=Assign leave +MotifCP=Reason +UserCP=User +ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. +AddEventToUserOkCP=The addition of the exceptional leave has been completed. +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days +ActionByCP=Performed by +UserUpdateCP=For the user +PrevSoldeCP=Previous Balance +NewSoldeCP=New Balance +alreadyCPexist=A leave request has already been done on this period. +UserName=Name +Employee=Employee +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation +HolidaysMonthlyUpdate=Monthly update +ManualUpdate=Manual update +HolidaysCancelation=Leave request cancelation + +## Configuration du Module ## +ConfCP=Configuration of leave request module +DescOptionCP=Description of the option +ValueOptionCP=Value +GroupToValidateCP=Group with the ability to approve leave requests +ConfirmConfigCP=Validate the configuration +LastUpdateCP=Last automatic update of leaves allocation +UpdateConfCPOK=Updated successfully. +ErrorUpdateConfCP=An error occurred during the update, please try again. +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of leave request +TitleOptionEventCP=Settings of leave requets for events +ValidEventCP=Validate +UpdateEventCP=Update events +CreateEventCP=Create +NameEventCP=Event name +OkCreateEventCP=The addition of the event went well. +ErrorCreateEventCP=Error creating the event. +UpdateEventOkCP=The update of the event went well. +ErrorUpdateEventCP=Error while updating the event. +DeleteEventCP=Delete Event +DeleteEventOkCP=The event has been deleted. +ErrorDeleteEventCP=Error while deleting the event. +TitleDeleteEventCP=Delete a exceptional leave +TitleCreateEventCP=Create a exceptional leave +TitleUpdateEventCP=Edit or delete a exceptional leave +DeleteEventOptionCP=Delete +UpdateEventOptionCP=Update +ErrorMailNotSend=An error occurred while sending email: +NoCPforMonth=No leave this month. +nbJours=Number days +TitleAdminCP=Configuration of Leaves +#Messages +Hello=Hello +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/kn_IN/install.lang b/htdocs/langs/kn_IN/install.lang new file mode 100644 index 00000000000..dcd8df6e7db --- /dev/null +++ b/htdocs/langs/kn_IN/install.lang @@ -0,0 +1,214 @@ +# Dolibarr language file - Source file is en_US - install +InstallEasy=Just follow the instructions step by step. +MiscellaneousChecks=Prerequisites check +DolibarrWelcome=Welcome to Dolibarr +ConfFileExists=Configuration file %s exists. +ConfFileDoesNotExists=Configuration file %s does not exist ! +ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file %s does not exist and could not be created ! +ConfFileCouldBeCreated=Configuration file %s could be created. +ConfFileIsNotWritable=Configuration file %s is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS). +ConfFileIsWritable=Configuration file %s is writable. +ConfFileReload=Reload all information from configuration file. +PHPSupportSessions=This PHP supports sessions. +PHPSupportPOSTGETOk=This PHP supports variables POST and GET. +PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter variables_order in php.ini. +PHPSupportGD=This PHP support GD graphical functions. +PHPSupportUTF8=This PHP support UTF8 functions. +PHPMemoryOK=Your PHP max session memory is set to %s. This should be enough. +PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This should be too low. Change your php.ini to set memory_limit parameter to at least %s bytes. +Recheck=Click here for a more significative test +ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup. +ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available. +ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr. +ErrorDirDoesNotExists=Directory %s does not exist. +ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters. +ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'. +ErrorFailedToCreateDatabase=Failed to create database '%s'. +ErrorFailedToConnectToDatabase=Failed to connect to database '%s'. +ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required. +ErrorPHPVersionTooLow=PHP version too old. Version %s is required. +WarningPHPVersionTooLow=PHP version too old. Version %s or more is expected. This version should allow install but is not supported. +ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found. +ErrorDatabaseAlreadyExists=Database '%s' already exists. +IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database". +IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option. +WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded. +PHPVersion=PHP Version +YouCanContinue=You can continue... +PleaseBePatient=Please be patient... +License=Using license +ConfigurationFile=Configuration file +WebPagesDirectory=Directory where web pages are stored +DocumentsDirectory=Directory to store uploaded and generated documents +URLRoot=URL Root +ForceHttps=Force secure connections (https) +CheckToForceHttps=Check this option to force secure connections (https).
This requires that the web server is configured with an SSL certificate. +DolibarrDatabase=Dolibarr Database +DatabaseChoice=Database choice +DatabaseType=Database type +DriverType=Driver type +Server=Server +ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server +ServerPortDescription=Database server port. Keep empty if unknown. +DatabaseServer=Database server +DatabaseName=Database name +DatabasePrefix=Database prefix table +Login=Login +AdminLogin=Login for Dolibarr database owner. +Password=Password +PasswordAgain=Retype password a second time +AdminPassword=Password for Dolibarr database owner. +CreateDatabase=Create database +CreateUser=Create owner +DatabaseSuperUserAccess=Database server - Superuser access +CheckToCreateDatabase=Check box if database does not exist and must be created.
In this case, you must fill the login/password for superuser account at the bottom of this page. +CheckToCreateUser=Check box if database owner does not exist and must be created.
In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists. +Experimental=(experimental) +DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists. +KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this) +SaveConfigurationFile=Save values +ConfigurationSaving=Saving configuration file +ServerConnection=Server connection +DatabaseConnection=Database connection +DatabaseCreation=Database creation +UserCreation=User creation +CreateDatabaseObjects=Database objects creation +ReferenceDataLoading=Reference data loading +TablesAndPrimaryKeysCreation=Tables and Primary keys creation +CreateTableAndPrimaryKey=Create table %s +CreateOtherKeysForTable=Create foreign keys and indexes for table %s +OtherKeysCreation=Foreign keys and indexes creation +FunctionsCreation=Functions creation +AdminAccountCreation=Administrator login creation +PleaseTypePassword=Please type a password, empty passwords are not allowed ! +PleaseTypeALogin=Please type a login ! +PasswordsMismatch=Passwords differs, please try again ! +SetupEnd=End of setup +SystemIsInstalled=This installation is complete. +SystemIsUpgraded=Dolibarr has been upgraded successfully. +YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below: +AdminLoginCreatedSuccessfuly=Dolibarr administrator login '%s' created successfuly. +GoToDolibarr=Go to Dolibarr +GoToSetupArea=Go to Dolibarr (setup area) +MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again. +GoToUpgradePage=Go to upgrade page again +Examples=Examples +WithNoSlashAtTheEnd=Without the slash "/" at the end +DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages. +LoginAlreadyExists=Already exists +DolibarrAdminLogin=Dolibarr admin login +AdminLoginAlreadyExists=Dolibarr administrator account '%s' already exists. Go back, if you want to create another one. +WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called install.lock into Dolibarr document directory, in order to avoid malicious use of it. +ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to access database type %s +FunctionNotAvailableInThisPHP=Not available on this PHP +MigrateScript=Migration script +ChoosedMigrateScript=Choose migration script +DataMigration=Data migration +DatabaseMigration=Structure database migration +ProcessMigrateScript=Script processing +ChooseYourSetupMode=Choose your setup mode and click "Start"... +FreshInstall=Fresh install +FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode. +Upgrade=Upgrade +UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data. +Start=Start +InstallNotAllowed=Setup not allowed by conf.php permissions +NotAvailable=Not available +YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process. +CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page. +AlreadyDone=Already migrated +DatabaseVersion=Database version +ServerVersion=Database server version +YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it. +CharsetChoice=Character set choice +CharacterSetClient=Character set used for generated HTML web pages +CharacterSetClientComment=Choose character set for web display.
Default proposed character set is the one of your database. +DBSortingCollation=Character sorting order +DBSortingCollationComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.
This parameter can't be defined if database already exists. +CharacterSetDatabase=Character set for database +CharacterSetDatabaseComment=Choose character set wanted for database creation.
This parameter can't be defined if database already exists. +YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. +YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. +BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong. +OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s +RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue. +KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do. +KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do. +KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do. +KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do. +FieldRenamed=Field renamed +IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user" +ErrorConnection=Server "%s", database name "%s", login "%s", or database password may be wrong or PHP client version may be too old compared to database version. +InstallChoiceRecommanded=Recommended choice to install version %s from your current version %s +InstallChoiceSuggested=Install choice suggested by installer. +MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished. +CheckThatDatabasenameIsCorrect=Check that database name "%s" is correct. +IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database". +OpenBaseDir=PHP openbasedir parameter +YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form). +YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form). +NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing. +MigrationCustomerOrderShipping=Migrate shipping for customer orders storage +MigrationShippingDelivery=Upgrade storage of shipping +MigrationShippingDelivery2=Upgrade storage of shipping 2 +MigrationFinished=Migration finished +LastStepDesc=Last step: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others. +ActivateModule=Activate module %s +ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) +WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) + +######### +# upgrade +MigrationFixData=Fix for denormalized data +MigrationOrder=Data migration for customer's orders +MigrationSupplierOrder=Data migration for supplier's orders +MigrationProposal=Data migration for commercial proposals +MigrationInvoice=Data migration for customer's invoices +MigrationContract=Data migration for contracts +MigrationSuccessfullUpdate=Upgrade successful +MigrationUpdateFailed=Failed upgrade process +MigrationRelationshipTables=Data migration for relationship tables (%s) +MigrationPaymentsUpdate=Payment data correction +MigrationPaymentsNumberToUpdate=%s payment(s) to update +MigrationProcessPaymentUpdate=Update payment(s) %s +MigrationPaymentsNothingToUpdate=No more things to do +MigrationPaymentsNothingUpdatable=No more payments that can be corrected +MigrationContractsUpdate=Contract data correction +MigrationContractsNumberToUpdate=%s contract(s) to update +MigrationContractsLineCreation=Create contract line for contract ref %s +MigrationContractsNothingToUpdate=No more things to do +MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do. +MigrationContractsEmptyDatesUpdate=Contract empty date correction +MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfuly +MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct +MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct +MigrationContractsInvalidDatesUpdate=Bad value date contract correction +MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s) +MigrationContractsInvalidDatesNumber=%s contracts modified +MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct +MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction +MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done succesfuly +MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct +MigrationReopeningContracts=Open contract closed by error +MigrationReopenThisContract=Reopen contract %s +MigrationReopenedContractsNumber=%s contracts modified +MigrationReopeningContractsNothingToUpdate=No closed contract to open +MigrationBankTransfertsUpdate=Update links between bank transaction and a bank transfer +MigrationBankTransfertsNothingToUpdate=All links are up to date +MigrationShipmentOrderMatching=Sendings receipt update +MigrationDeliveryOrderMatching=Delivery receipt update +MigrationDeliveryDetail=Delivery update +MigrationStockDetail=Update stock value of products +MigrationMenusDetail=Update dynamic menus tables +MigrationDeliveryAddress=Update delivery address in shipments +MigrationProjectTaskActors=Data migration for llx_projet_task_actors table +MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact +MigrationProjectTaskTime=Update time spent in seconds +MigrationActioncommElement=Update data on actions +MigrationPaymentMode=Data migration for payment mode +MigrationCategorieAssociation=Migration of categories +MigrationEvents=Migration of events to add event owner into assignement table + +ShowNotAvailableOptions=Show not available options +HideNotAvailableOptions=Hide not available options diff --git a/htdocs/langs/kn_IN/interventions.lang b/htdocs/langs/kn_IN/interventions.lang new file mode 100644 index 00000000000..c79da05364e --- /dev/null +++ b/htdocs/langs/kn_IN/interventions.lang @@ -0,0 +1,53 @@ +# Dolibarr language file - Source file is en_US - interventions +Intervention=Intervention +Interventions=Interventions +InterventionCard=Intervention card +NewIntervention=New intervention +AddIntervention=Create intervention +ListOfInterventions=List of interventions +EditIntervention=Edit intervention +ActionsOnFicheInter=Actions on intervention +LastInterventions=Last %s interventions +AllInterventions=All interventions +CreateDraftIntervention=Create draft +CustomerDoesNotHavePrefix=Customer does not have a prefix +InterventionContact=Intervention contact +DeleteIntervention=Delete intervention +ValidateIntervention=Validate intervention +ModifyIntervention=Modify intervention +DeleteInterventionLine=Delete intervention line +ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? +ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? +ConfirmModifyIntervention=Are you sure you want to modify this intervention ? +ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? +NameAndSignatureOfInternalContact=Name and signature of intervening : +NameAndSignatureOfExternalContact=Name and signature of customer : +DocumentModelStandard=Standard document model for interventions +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Billed +RelatedInterventions=Related interventions +ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention +##### Types de contacts ##### +TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention +TypeContact_fichinter_internal_INTERVENING=Intervening +TypeContact_fichinter_external_BILLING=Billing customer contact +TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +# Modele numérotation +ArcticNumRefModelDesc1=Generic number model +ArcticNumRefModelError=Failed to activate +PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/kn_IN/languages.lang b/htdocs/langs/kn_IN/languages.lang new file mode 100644 index 00000000000..d20aab00146 --- /dev/null +++ b/htdocs/langs/kn_IN/languages.lang @@ -0,0 +1,72 @@ +# Dolibarr language file - Source file is en_US - languages + +Language_ar_AR=Arabic +Language_ar_SA=Arabic +Language_bg_BG=Bulgarian +Language_bs_BA=Bosnian +Language_ca_ES=Catalan +Language_cs_CZ=Czech +Language_da_DA=Danish +Language_da_DK=Danish +Language_de_DE=German +Language_de_AT=German (Austria) +Language_de_CH=German (Switzerland) +Language_el_GR=Greek +Language_en_AU=English (Australia) +Language_en_CA=English (Canada) +Language_en_GB=English (United Kingdom) +Language_en_IN=English (India) +Language_en_NZ=English (New Zealand) +Language_en_SA=English (Saudi Arabia) +Language_en_US=English (United States) +Language_en_ZA=English (South Africa) +Language_es_ES=Spanish +Language_es_DO=Spanish (Dominican Republic) +Language_es_AR=Spanish (Argentina) +Language_es_CL=Spanish (Chile) +Language_es_HN=Spanish (Honduras) +Language_es_MX=Spanish (Mexico) +Language_es_PY=Spanish (Paraguay) +Language_es_PE=Spanish (Peru) +Language_es_PR=Spanish (Puerto Rico) +Language_et_EE=Estonian +Language_eu_ES=Basque +Language_fa_IR=Persian +Language_fi_FI=Fins +Language_fr_BE=French (Belgium) +Language_fr_CA=French (Canada) +Language_fr_CH=French (Switzerland) +Language_fr_FR=French +Language_fr_NC=French (New Caledonia) +Language_he_IL=Hebrew +Language_hr_HR=Croatian +Language_hu_HU=Hungarian +Language_id_ID=Indonesian +Language_is_IS=Icelandic +Language_it_IT=Italian +Language_ja_JP=Japanese +Language_ko_KR=Korean +Language_lt_LT=Lithuanian +Language_lv_LV=Latvian +Language_mk_MK=Macedonian +Language_nb_NO=Norwegian (Bokmål) +Language_nl_BE=Dutch (Belgium) +Language_nl_NL=Dutch (Netherlands) +Language_pl_PL=Polish +Language_pt_BR=Portuguese (Brazil) +Language_pt_PT=Portuguese +Language_ro_RO=Romanian +Language_ru_RU=Russian +Language_ru_UA=Russian (Ukraine) +Language_tr_TR=Turkish +Language_sl_SI=Slovenian +Language_sv_SV=Swedish +Language_sv_SE=Swedish +Language_sq_AL=Albanian +Language_sk_SK=Slovakian +Language_th_TH=Thai +Language_uk_UA=Ukrainian +Language_uz_UZ=Uzbek +Language_vi_VN=Vietnamese +Language_zh_CN=Chinese +Language_zh_TW=Chinese (Traditional) diff --git a/htdocs/langs/kn_IN/ldap.lang b/htdocs/langs/kn_IN/ldap.lang new file mode 100644 index 00000000000..02e457446a6 --- /dev/null +++ b/htdocs/langs/kn_IN/ldap.lang @@ -0,0 +1,29 @@ +# Dolibarr language file - Source file is en_US - ldap +DomainPassword=Password for domain +YouMustChangePassNextLogon=Password for user %s on the domain %s must be changed. +UserMustChangePassNextLogon=User must change password on the domain %s +LdapUacf_NORMAL_ACCOUNT=User account +LdapUacf_DONT_EXPIRE_PASSWORD=Password never expires +LdapUacf_ACCOUNTDISABLE=Account is disabled in the domain %s +LDAPInformationsForThisContact=Information in LDAP database for this contact +LDAPInformationsForThisUser=Information in LDAP database for this user +LDAPInformationsForThisGroup=Information in LDAP database for this group +LDAPInformationsForThisMember=Information in LDAP database for this member +LDAPAttribute=LDAP attribute +LDAPAttributes=LDAP attributes +LDAPCard=LDAP card +LDAPRecordNotFound=Record not found in LDAP database +LDAPUsers=Users in LDAP database +LDAPGroups=Groups in LDAP database +LDAPFieldStatus=Status +LDAPFieldFirstSubscriptionDate=First subscription date +LDAPFieldFirstSubscriptionAmount=First subscription amount +LDAPFieldLastSubscriptionDate=Last subscription date +LDAPFieldLastSubscriptionAmount=Last subscription amount +SynchronizeDolibarr2Ldap=Synchronize user (Dolibarr -> LDAP) +UserSynchronized=User synchronized +GroupSynchronized=Group synchronized +MemberSynchronized=Member synchronized +ContactSynchronized=Contact synchronized +ForceSynchronize=Force synchronizing Dolibarr -> LDAP +ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility. diff --git a/htdocs/langs/pt_BR/link.lang b/htdocs/langs/kn_IN/link.lang similarity index 59% rename from htdocs/langs/pt_BR/link.lang rename to htdocs/langs/kn_IN/link.lang index c7f0b5b148e..8b1efb75ef3 100644 --- a/htdocs/langs/pt_BR/link.lang +++ b/htdocs/langs/kn_IN/link.lang @@ -1,9 +1,8 @@ -# Dolibarr language file - Source file is en_US - link LinkANewFile=Link a new file/document LinkedFiles=Linked files and documents NoLinkFound=No registered links LinkComplete=The file has been linked successfully ErrorFileNotLinked=The file could not be linked LinkRemoved=The link %s has been removed -ErrorFailedToDeleteLink=Failed to remove link '%s' -ErrorFailedToUpdateLink=Failed to update link '%s' +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/kn_IN/mailmanspip.lang b/htdocs/langs/kn_IN/mailmanspip.lang new file mode 100644 index 00000000000..c85b3d60db2 --- /dev/null +++ b/htdocs/langs/kn_IN/mailmanspip.lang @@ -0,0 +1,27 @@ +# Dolibarr language file - Source file is en_US - mailmanspip +MailmanSpipSetup=Mailman and SPIP module Setup +MailmanTitle=Mailman mailing list system +TestSubscribe=To test subscription to Mailman lists +TestUnSubscribe=To test unsubscribe from Mailman lists +MailmanCreationSuccess=Subscription test was executed succesfully +MailmanDeletionSuccess=Unsubscription test was executed succesfully +SynchroMailManEnabled=A Mailman update will be performed +SynchroSpipEnabled=A Spip update will be performed +DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password +DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions +DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions +DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma) +SPIPTitle=SPIP Content Management System +DescADHERENT_SPIP_SERVEUR=SPIP Server +DescADHERENT_SPIP_DB=SPIP database name +DescADHERENT_SPIP_USER=SPIP database login +DescADHERENT_SPIP_PASS=SPIP database password +AddIntoSpip=Add into SPIP +AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP? +AddIntoSpipError=Failed to add the user in SPIP +DeleteIntoSpip=Remove from SPIP +DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP? +DeleteIntoSpipError=Failed to suppress the user from SPIP +SPIPConnectionFailed=Failed to connect to SPIP +SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done +SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang new file mode 100644 index 00000000000..7a211198822 --- /dev/null +++ b/htdocs/langs/kn_IN/mails.lang @@ -0,0 +1,141 @@ +# Dolibarr language file - Source file is en_US - mails +Mailing=EMailing +EMailing=EMailing +Mailings=EMailings +EMailings=EMailings +AllEMailings=All eMailings +MailCard=EMailing card +MailTargets=Targets +MailRecipients=Recipients +MailRecipient=Recipient +MailTitle=Description +MailFrom=Sender +MailErrorsTo=Errors to +MailReply=Reply to +MailTo=Receiver(s) +MailCC=Copy to +MailCCC=Cached copy to +MailTopic=EMail topic +MailText=Message +MailFile=Attached files +MailMessage=EMail body +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +DeleteMailing=Delete emailing +DeleteAMailing=Delete an emailing +PreviewMailing=Preview emailing +PrepareMailing=Prepare emailing +CreateMailing=Create emailing +MailingDesc=This page allows you to send emailings to a group of people. +MailingResult=Sending emails result +TestMailing=Test email +ValidMailing=Valid emailing +ApproveMailing=Approve emailing +MailingStatusDraft=Draft +MailingStatusValidated=Validated +MailingStatusApproved=Approved +MailingStatusSent=Sent +MailingStatusSentPartialy=Sent partialy +MailingStatusSentCompletely=Sent completely +MailingStatusError=Error +MailingStatusNotSent=Not sent +MailSuccessfulySent=Email successfully sent (from %s to %s) +MailingSuccessfullyValidated=EMailing successfully validated +MailUnsubcribe=Unsubscribe +Unsuscribe=Unsubscribe +MailingStatusNotContact=Don't contact anymore +ErrorMailRecipientIsEmpty=Email recipient is empty +WarningNoEMailsAdded=No new Email to add to recipient's list. +ConfirmValidMailing=Are you sure you want to validate this emailing ? +ConfirmResetMailing=Warning, by reinitializing emailing %s, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do ? +ConfirmDeleteMailing=Are you sure you want to delete this emailling ? +NbOfRecipients=Number of recipients +NbOfUniqueEMails=Nb of unique emails +NbOfEMails=Nb of EMails +TotalNbOfDistinctRecipients=Number of distinct recipients +NoTargetYet=No recipients defined yet (Go on tab 'Recipients') +AddRecipients=Add recipients +RemoveRecipient=Remove recipient +CommonSubstitutions=Common substitutions +YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README. +EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values +MailingAddFile=Attach this file +NoAttachedFiles=No attached files +BadEMail=Bad value for EMail +CloneEMailing=Clone Emailing +ConfirmCloneEMailing=Are you sure you want to clone this emailing ? +CloneContent=Clone message +CloneReceivers=Cloner recipients +DateLastSend=Date of last sending +DateSending=Date sending +SentTo=Sent to %s +MailingStatusRead=Read +CheckRead=Read Receipt +YourMailUnsubcribeOK=The email %s is correctly unsubcribe from mailing list +MailtoEMail=Hyper link to email +ActivateCheckRead=Allow to use the "Unsubcribe" link +ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature +EMailSentToNRecipients=EMail sent to %s recipients. +XTargetsAdded=%s recipients added into target list +EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email. +MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s) +SendRemind=Send reminder by EMails +RemindSent=%s reminder(s) sent +AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent) +NoRemindSent=No EMail reminder sent +ResultOfMassSending=Result of mass EMail reminders sending + +# Libelle des modules de liste de destinataires mailing +MailingModuleDescContactCompanies=Contacts/addresses of all third parties (customer, prospect, supplier, ...) +MailingModuleDescDolibarrUsers=Dolibarr users +MailingModuleDescFundationMembers=Foundation members with emails +MailingModuleDescEmailsFromFile=EMails from a text file (email;lastname;firstname;other) +MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other) +MailingModuleDescContactsCategories=Third parties (by category) +MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines +MailingModuleDescContactsByCompanyCategory=Contacts/addresses of third parties (by third parties category) +MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category +MailingModuleDescMembersCategories=Foundation members (by categories) +MailingModuleDescContactsByFunction=Contacts/addresses of third parties (by position/function) +LineInFile=Line %s in file +RecipientSelectionModules=Defined requests for recipient's selection +MailSelectedRecipients=Selected recipients +MailingArea=EMailings area +LastMailings=Last %s emailings +TargetsStatistics=Targets statistics +NbOfCompaniesContacts=Unique contacts/addresses +MailNoChangePossible=Recipients for validated emailing can't be changed +SearchAMailing=Search mailing +SendMailing=Send emailing +SendMail=Send email +SentBy=Sent by +MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: +MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. +ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +TargetsReset=Clear list +ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing +ToAddRecipientsChooseHere=Add recipients by choosing from the lists +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent +IdRecord=ID record +DeliveryReceipt=Delivery Receipt +YouCanUseCommaSeparatorForSeveralRecipients=You can use the comma separator to specify several recipients. +TagCheckMail=Track mail opening +TagUnsubscribe=Unsubscribe link +TagSignature=Signature sending user +TagMailtoEmail=Recipient EMail +# Module Notifications +Notifications=Notifications +NoNotificationsWillBeSent=No email notifications are planned for this event and company +ANotificationsWillBeSent=1 notification will be sent by email +SomeNotificationsWillBeSent=%s notifications will be sent by email +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets +ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang new file mode 100644 index 00000000000..d40e28cb776 --- /dev/null +++ b/htdocs/langs/kn_IN/main.lang @@ -0,0 +1,725 @@ +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +# Note for Chinese: +# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader) +# stsongstdlight or cid0cs are for simplified Chinese +# To read Chinese pdf with Linux: sudo apt-get install poppler-data +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 +SeparatorDecimal=. +SeparatorThousand=, +FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y +FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%I:%M %p +FormatHourShortDuration=%H:%M +FormatDateTextShort=%b %d, %Y +FormatDateText=%B %d, %Y +FormatDateHourShort=%m/%d/%Y %I:%M %p +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p +FormatDateHourTextShort=%b %d, %Y, %I:%M %p +FormatDateHourText=%B %d, %Y, %I:%M %p +DatabaseConnection=Database connection +NoTranslation=No translation +NoRecordFound=No record found +NoError=No error +Error=Error +ErrorFieldRequired=Field '%s' is required +ErrorFieldFormat=Field '%s' has a bad value +ErrorFileDoesNotExists=File %s does not exist +ErrorFailedToOpenFile=Failed to open file %s +ErrorCanNotCreateDir=Can not create dir %s +ErrorCanNotReadDir=Can not read dir %s +ErrorConstantNotDefined=Parameter %s not defined +ErrorUnknown=Unknown error +ErrorSQL=SQL Error +ErrorLogoFileNotFound=Logo file '%s' was not found +ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this +ErrorGoToModuleSetup=Go to Module setup to fix this +ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s) +ErrorAttachedFilesDisabled=File attaching is disabled on this server +ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory. +ErrorInternalErrorDetected=Error detected +ErrorNoRequestRan=No request ran +ErrorWrongHostParameter=Wrong host parameter +ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form. +ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records. +ErrorWrongValue=Wrong value +ErrorWrongValueForParameterX=Wrong value for parameter %s +ErrorNoRequestInError=No request in error +ErrorServiceUnavailableTryLater=Service not available for the moment. Try again later. +ErrorDuplicateField=Duplicate value in a unique field +ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback changes. +ErrorConfigParameterNotDefined=Parameter %s is not defined inside Dolibarr config file conf.php. +ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr database. +ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. +ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. +ErrorFailedToSaveFile=Error, failed to save file. +SetDate=Set date +SelectDate=Select a date +SeeAlso=See also %s +SeeHere=See here +BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded +FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. +NbOfEntries=Nb of entries +GoToWikiHelpPage=Read online help (need Internet access) +GoToHelpPage=Read help +RecordSaved=Record saved +RecordDeleted=Record deleted +LevelOfFeature=Level of features +NotDefined=Not defined +DefinedAndHasThisValue=Defined and value to +IsNotDefined=undefined +DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to %s in configuration file conf.php.
This means that password database is extern to Dolibarr, so changing this field may have no effects. +Administrator=Administrator +Undefined=Undefined +PasswordForgotten=Password forgotten ? +SeeAbove=See above +HomeArea=Home area +LastConnexion=Last connection +PreviousConnexion=Previous connection +ConnectedOnMultiCompany=Connected on environment +ConnectedSince=Connected since +AuthenticationMode=Authentification mode +RequestedUrl=Requested Url +DatabaseTypeManager=Database type manager +RequestLastAccess=Request for last database access +RequestLastAccessInError=Request for last database access in error +ReturnCodeLastAccessInError=Return code for last database access in error +InformationLastAccessInError=Information for last database access in error +DolibarrHasDetectedError=Dolibarr has detected a technical error +InformationToHelpDiagnose=This is information that can help diagnostic +MoreInformation=More information +TechnicalInformation=Technical information +NotePublic=Note (public) +NotePrivate=Note (private) +PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to %s decimals. +DoTest=Test +ToFilter=Filter +WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay. +yes=yes +Yes=Yes +no=no +No=No +All=All +Home=Home +Help=Help +OnlineHelp=Online help +PageWiki=Wiki page +Always=Always +Never=Never +Under=under +Period=Period +PeriodEndDate=End date for period +Activate=Activate +Activated=Activated +Closed=Closed +Closed2=Closed +Enabled=Enabled +Deprecated=Deprecated +Disable=Disable +Disabled=Disabled +Add=Add +AddLink=Add link +Update=Update +AddActionToDo=Add event to do +AddActionDone=Add event done +Close=Close +Close2=Close +Confirm=Confirm +ConfirmSendCardByMail=Do you really want to send content of this card by mail to %s ? +Delete=Delete +Remove=Remove +Resiliate=Resiliate +Cancel=Cancel +Modify=Modify +Edit=Edit +Validate=Validate +ValidateAndApprove=Validate and Approve +ToValidate=To validate +Save=Save +SaveAs=Save As +TestConnection=Test connection +ToClone=Clone +ConfirmClone=Choose data you want to clone : +NoCloneOptionsSpecified=No data to clone defined. +Of=of +Go=Go +Run=Run +CopyOf=Copy of +Show=Show +ShowCardHere=Show card +Search=Search +SearchOf=Search +Valid=Valid +Approve=Approve +Disapprove=Disapprove +ReOpen=Re-Open +Upload=Send file +ToLink=Link +Select=Select +Choose=Choose +ChooseLangage=Please choose your language +Resize=Resize +Recenter=Recenter +Author=Author +User=User +Users=Users +Group=Group +Groups=Groups +NoUserGroupDefined=No user group defined +Password=Password +PasswordRetype=Retype your password +NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration. +Name=Name +Person=Person +Parameter=Parameter +Parameters=Parameters +Value=Value +GlobalValue=Global value +PersonalValue=Personal value +NewValue=New value +CurrentValue=Current value +Code=Code +Type=Type +Language=Language +MultiLanguage=Multi-language +Note=Note +CurrentNote=Current note +Title=Title +Label=Label +RefOrLabel=Ref. or label +Info=Log +Family=Family +Description=Description +Designation=Description +Model=Model +DefaultModel=Default model +Action=Event +About=About +Number=Number +NumberByMonth=Number by month +AmountByMonth=Amount by month +Numero=Number +Limit=Limit +Limits=Limits +DevelopmentTeam=Development Team +Logout=Logout +NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s +Connection=Connection +Setup=Setup +Alert=Alert +Previous=Previous +Next=Next +Cards=Cards +Card=Card +Now=Now +Date=Date +DateAndHour=Date and hour +DateStart=Date start +DateEnd=Date end +DateCreation=Creation date +DateModification=Modification date +DateModificationShort=Modif. date +DateLastModification=Last modification date +DateValidation=Validation date +DateClosing=Closing date +DateDue=Due date +DateValue=Value date +DateValueShort=Value date +DateOperation=Operation date +DateOperationShort=Oper. Date +DateLimit=Limit date +DateRequest=Request date +DateProcess=Process date +DatePlanShort=Date planed +DateRealShort=Date real. +DateBuild=Report build date +DatePayment=Date of payment +DurationYear=year +DurationMonth=month +DurationWeek=week +DurationDay=day +DurationYears=years +DurationMonths=months +DurationWeeks=weeks +DurationDays=days +Year=Year +Month=Month +Week=Week +Day=Day +Hour=Hour +Minute=Minute +Second=Second +Years=Years +Months=Months +Days=Days +days=days +Hours=Hours +Minutes=Minutes +Seconds=Seconds +Weeks=Weeks +Today=Today +Yesterday=Yesterday +Tomorrow=Tomorrow +Morning=Morning +Afternoon=Afternoon +Quadri=Quadri +MonthOfDay=Month of the day +HourShort=H +MinuteShort=mn +Rate=Rate +UseLocalTax=Include tax +Bytes=Bytes +KiloBytes=Kilobytes +MegaBytes=Megabytes +GigaBytes=Gigabytes +TeraBytes=Terabytes +b=b. +Kb=Kb +Mb=Mb +Gb=Gb +Tb=Tb +Cut=Cut +Copy=Copy +Paste=Paste +Default=Default +DefaultValue=Default value +DefaultGlobalValue=Global value +Price=Price +UnitPrice=Unit price +UnitPriceHT=Unit price (net) +UnitPriceTTC=Unit price +PriceU=U.P. +PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested +PriceUTTC=U.P. +Amount=Amount +AmountInvoice=Invoice amount +AmountPayment=Payment amount +AmountHTShort=Amount (net) +AmountTTCShort=Amount (inc. tax) +AmountHT=Amount (net of tax) +AmountTTC=Amount (inc. tax) +AmountVAT=Amount tax +AmountLT1=Amount tax 2 +AmountLT2=Amount tax 3 +AmountLT1ES=Amount RE +AmountLT2ES=Amount IRPF +AmountTotal=Total amount +AmountAverage=Average amount +PriceQtyHT=Price for this quantity (net of tax) +PriceQtyMinHT=Price quantity min. (net of tax) +PriceQtyTTC=Price for this quantity (inc. tax) +PriceQtyMinTTC=Price quantity min. (inc. of tax) +Percentage=Percentage +Total=Total +SubTotal=Subtotal +TotalHTShort=Total (net) +TotalTTCShort=Total (inc. tax) +TotalHT=Total (net of tax) +TotalHTforthispage=Total (net of tax) for this page +TotalTTC=Total (inc. tax) +TotalTTCToYourCredit=Total (inc. tax) to your credit +TotalVAT=Total tax +TotalLT1=Total tax 2 +TotalLT2=Total tax 3 +TotalLT1ES=Total RE +TotalLT2ES=Total IRPF +IncludedVAT=Included tax +HT=Net of tax +TTC=Inc. tax +VAT=Sales tax +LT1ES=RE +LT2ES=IRPF +VATRate=Tax Rate +Average=Average +Sum=Sum +Delta=Delta +Module=Module +Option=Option +List=List +FullList=Full list +Statistics=Statistics +OtherStatistics=Other statistics +Status=Status +Favorite=Favorite +ShortInfo=Info. +Ref=Ref. +RefSupplier=Ref. supplier +RefPayment=Ref. payment +CommercialProposalsShort=Commercial proposals +Comment=Comment +Comments=Comments +ActionsToDo=Events to do +ActionsDone=Events done +ActionsToDoShort=To do +ActionsRunningshort=Started +ActionsDoneShort=Done +ActionNotApplicable=Not applicable +ActionRunningNotStarted=To start +ActionRunningShort=Started +ActionDoneShort=Finished +ActionUncomplete=Uncomplete +CompanyFoundation=Company/Foundation +ContactsForCompany=Contacts for this third party +ContactsAddressesForCompany=Contacts/addresses for this third party +AddressesForCompany=Addresses for this third party +ActionsOnCompany=Events about this third party +ActionsOnMember=Events about this member +NActions=%s events +NActionsLate=%s late +RequestAlreadyDone=Request already recorded +Filter=Filter +RemoveFilter=Remove filter +ChartGenerated=Chart generated +ChartNotGenerated=Chart not generated +GeneratedOn=Build on %s +Generate=Generate +Duration=Duration +TotalDuration=Total duration +Summary=Summary +MyBookmarks=My bookmarks +OtherInformationsBoxes=Other information boxes +DolibarrBoard=Dolibarr board +DolibarrStateBoard=Statistics +DolibarrWorkBoard=Work tasks board +Available=Available +NotYetAvailable=Not yet available +NotAvailable=Not available +Popularity=Popularity +Categories=Categories +Category=Category +By=By +From=From +to=to +and=and +or=or +Other=Other +Others=Others +OtherInformations=Other informations +Quantity=Quantity +Qty=Qty +ChangedBy=Changed by +ReCalculate=Recalculate +ResultOk=Success +ResultKo=Failure +Reporting=Reporting +Reportings=Reporting +Draft=Draft +Drafts=Drafts +Validated=Validated +Opened=Opened +New=New +Discount=Discount +Unknown=Unknown +General=General +Size=Size +Received=Received +Paid=Paid +Topic=Sujet +ByCompanies=By third parties +ByUsers=By users +Links=Links +Link=Link +Receipts=Receipts +Rejects=Rejects +Preview=Preview +NextStep=Next step +PreviousStep=Previous step +Datas=Data +None=None +NoneF=None +Late=Late +Photo=Picture +Photos=Pictures +AddPhoto=Add picture +Login=Login +CurrentLogin=Current login +January=January +February=February +March=March +April=April +May=May +June=June +July=July +August=August +September=September +October=October +November=November +December=December +JanuaryMin=Jan +FebruaryMin=Feb +MarchMin=Mar +AprilMin=Apr +MayMin=May +JuneMin=Jun +JulyMin=Jul +AugustMin=Aug +SeptemberMin=Sep +OctoberMin=Oct +NovemberMin=Nov +DecemberMin=Dec +Month01=January +Month02=February +Month03=March +Month04=April +Month05=May +Month06=June +Month07=July +Month08=August +Month09=September +Month10=October +Month11=November +Month12=December +MonthShort01=Jan +MonthShort02=Feb +MonthShort03=Mar +MonthShort04=Apr +MonthShort05=May +MonthShort06=Jun +MonthShort07=Jul +MonthShort08=Aug +MonthShort09=Sep +MonthShort10=Oct +MonthShort11=Nov +MonthShort12=Dec +AttachedFiles=Attached files and documents +FileTransferComplete=File was uploaded successfuly +DateFormatYYYYMM=YYYY-MM +DateFormatYYYYMMDD=YYYY-MM-DD +DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS +ReportName=Report name +ReportPeriod=Report period +ReportDescription=Description +Report=Report +Keyword=Mot clé +Legend=Legend +FillTownFromZip=Fill city from zip +Fill=Fill +Reset=Reset +ShowLog=Show log +File=File +Files=Files +NotAllowed=Not allowed +ReadPermissionNotAllowed=Read permission not allowed +AmountInCurrency=Amount in %s currency +Example=Example +Examples=Examples +NoExample=No example +FindBug=Report a bug +NbOfThirdParties=Number of third parties +NbOfCustomers=Number of customers +NbOfLines=Number of lines +NbOfObjects=Number of objects +NbOfReferers=Number of referrers +Referers=Refering objects +TotalQuantity=Total quantity +DateFromTo=From %s to %s +DateFrom=From %s +DateUntil=Until %s +Check=Check +Uncheck=Uncheck +Internal=Internal +External=External +Internals=Internal +Externals=External +Warning=Warning +Warnings=Warnings +BuildPDF=Build PDF +RebuildPDF=Rebuild PDF +BuildDoc=Build Doc +RebuildDoc=Rebuild Doc +Entity=Environment +Entities=Entities +EventLogs=Logs +CustomerPreview=Customer preview +SupplierPreview=Supplier preview +AccountancyPreview=Accountancy preview +ShowCustomerPreview=Show customer preview +ShowSupplierPreview=Show supplier preview +ShowAccountancyPreview=Show accountancy preview +ShowProspectPreview=Show prospect preview +RefCustomer=Ref. customer +Currency=Currency +InfoAdmin=Information for administrators +Undo=Undo +Redo=Redo +ExpandAll=Expand all +UndoExpandAll=Undo expand +Reason=Reason +FeatureNotYetSupported=Feature not yet supported +CloseWindow=Close window +Question=Question +Response=Response +Priority=Priority +SendByMail=Send by EMail +MailSentBy=Email sent by +TextUsedInTheMessageBody=Email body +SendAcknowledgementByMail=Send Ack. by email +NoEMail=No email +NoMobilePhone=No mobile phone +Owner=Owner +DetectedVersion=Detected version +FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value. +Refresh=Refresh +BackToList=Back to list +GoBack=Go back +CanBeModifiedIfOk=Can be modified if valid +CanBeModifiedIfKo=Can be modified if not valid +RecordModifiedSuccessfully=Record modified successfully +RecordsModified=%s records modified +AutomaticCode=Automatic code +NotManaged=Not managed +FeatureDisabled=Feature disabled +MoveBox=Move box %s +Offered=Offered +NotEnoughPermissions=You don't have permission for this action +SessionName=Session name +Method=Method +Receive=Receive +PartialWoman=Partial +PartialMan=Partial +TotalWoman=Total +TotalMan=Total +NeverReceived=Never received +Canceled=Canceled +YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary +Color=Color +Documents=Linked files +DocumentsNb=Linked files (%s) +Documents2=Documents +BuildDocuments=Generated documents +UploadDisabled=Upload disabled +MenuECM=Documents +MenuAWStats=AWStats +MenuMembers=Members +MenuAgendaGoogle=Google agenda +ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb +NoFileFound=No documents saved in this directory +CurrentUserLanguage=Current language +CurrentTheme=Current theme +CurrentMenuManager=Current menu manager +DisabledModules=Disabled modules +For=For +ForCustomer=For customer +Signature=Signature +HidePassword=Show command with password hidden +UnHidePassword=Show real command with clear password +Root=Root +Informations=Informations +Page=Page +Notes=Notes +AddNewLine=Add new line +AddFile=Add file +ListOfFiles=List of available files +FreeZone=Free entry +FreeLineOfType=Free entry of type +CloneMainAttributes=Clone object with its main attributes +PDFMerge=PDF Merge +Merge=Merge +PrintContentArea=Show page to print main content area +MenuManager=Menu manager +NoMenu=No sub-menu +WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login %s is allowed to use application at the moment. +CoreErrorTitle=System error +CoreErrorMessage=Sorry, an error occurred. Check the logs or contact your system administrator. +CreditCard=Credit card +FieldsWithAreMandatory=Fields with %s are mandatory +FieldsWithIsForPublic=Fields with %s are shown on public list of members. If you don't want this, check off the "public" box. +AccordingToGeoIPDatabase=(according to GeoIP convertion) +Line=Line +NotSupported=Not supported +RequiredField=Required field +Result=Result +ToTest=Test +ValidateBefore=Card must be validated before using this feature +Visibility=Visibility +Private=Private +Hidden=Hidden +Resources=Resources +Source=Source +Prefix=Prefix +Before=Before +After=After +IPAddress=IP address +Frequency=Frequency +IM=Instant messaging +NewAttribute=New attribute +AttributeCode=Attribute code +OptionalFieldsSetup=Extra attributes setup +URLPhoto=URL of photo/logo +SetLinkToThirdParty=Link to another third party +CreateDraft=Create draft +SetToDraft=Back to draft +ClickToEdit=Click to edit +ObjectDeleted=Object %s deleted +ByCountry=By country +ByTown=By town +ByDate=By date +ByMonthYear=By month/year +ByYear=By year +ByMonth=By month +ByDay=By day +BySalesRepresentative=By sales representative +LinkedToSpecificUsers=Linked to a particular user contact +DeleteAFile=Delete a file +ConfirmDeleteAFile=Are you sure you want to delete file +NoResults=No results +ModulesSystemTools=Modules tools +Test=Test +Element=Element +NoPhotoYet=No pictures available yet +HomeDashboard=Home summary +Deductible=Deductible +from=from +toward=toward +Access=Access +HelpCopyToClipboard=Use Ctrl+C to copy to clipboard +SaveUploadedFileWithMask=Save file on server with name "%s" (otherwise "%s") +OriginFileName=Original filename +SetDemandReason=Set source +SetBankAccount=Define Bank Account +AccountCurrency=Account Currency +ViewPrivateNote=View notes +XMoreLines=%s line(s) hidden +PublicUrl=Public URL +AddBox=Add box +SelectElementAndClickRefresh=Select an element and click Refresh +PrintFile=Print File %s +ShowTransaction=Show transaction +# Week day +Monday=Monday +Tuesday=Tuesday +Wednesday=Wednesday +Thursday=Thursday +Friday=Friday +Saturday=Saturday +Sunday=Sunday +MondayMin=Mo +TuesdayMin=Tu +WednesdayMin=We +ThursdayMin=Th +FridayMin=Fr +SaturdayMin=Sa +SundayMin=Su +Day1=Monday +Day2=Tuesday +Day3=Wednesday +Day4=Thursday +Day5=Friday +Day6=Saturday +Day0=Sunday +ShortMonday=M +ShortTuesday=T +ShortWednesday=W +ShortThursday=T +ShortFriday=F +ShortSaturday=S +ShortSunday=S diff --git a/htdocs/langs/kn_IN/margins.lang b/htdocs/langs/kn_IN/margins.lang new file mode 100644 index 00000000000..748b3c71f30 --- /dev/null +++ b/htdocs/langs/kn_IN/margins.lang @@ -0,0 +1,45 @@ +# Dolibarr language file - Source file is en_US - marges + +Margin=Margin +Margins=Margins +TotalMargin=Total Margin +MarginOnProducts=Margin / Products +MarginOnServices=Margin / Services +MarginRate=Margin rate +MarkRate=Mark rate +DisplayMarginRates=Display margin rates +DisplayMarkRates=Display mark rates +InputPrice=Input price +margin=Profit margins management +margesSetup=Profit margins management setup +MarginDetails=Margin details +ProductMargins=Product margins +CustomerMargins=Customer margins +SalesRepresentativeMargins=Sales representative margins +UserMargins=User margins +ProductService=Product or Service +AllProducts=All products and services +ChooseProduct/Service=Choose product or service +StartDate=Start date +EndDate=End date +Launch=Start +ForceBuyingPriceIfNull=Force buying price if null +ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) +MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts +UseDiscountAsProduct=As a product +UseDiscountAsService=As a service +UseDiscountOnTotal=On subtotal +MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. +MARGIN_TYPE=Margin type +MargeBrute=Raw margin +MargeNette=Net margin +MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
Net margin : Selling price - Cost price +CostPrice=Cost price +BuyingCost=Cost price +UnitCharges=Unit charges +Charges=Charges +AgentContactType=Commercial agent contact type +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/kn_IN/members.lang b/htdocs/langs/kn_IN/members.lang new file mode 100644 index 00000000000..40bca8e85fb --- /dev/null +++ b/htdocs/langs/kn_IN/members.lang @@ -0,0 +1,206 @@ +# Dolibarr language file - Source file is en_US - members +MembersArea=Members area +PublicMembersArea=Public members area +MemberCard=Member card +SubscriptionCard=Subscription card +Member=Member +Members=Members +MemberAccount=Member login +ShowMember=Show member card +UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member +MembersTickets=Members Tickets +FundationMembers=Foundation members +Attributs=Attributes +ErrorMemberTypeNotDefined=Member type not defined +ListOfPublicMembers=List of public members +ListOfValidatedPublicMembers=List of validated public members +ErrorThisMemberIsNotPublic=This member is not public +ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). +ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. +ThisIsContentOfYourCard=This is details of your card +CardContent=Content of your member card +SetLinkToUser=Link to a Dolibarr user +SetLinkToThirdParty=Link to a Dolibarr third party +MembersCards=Members business cards +MembersList=List of members +MembersListToValid=List of draft members (to be validated) +MembersListValid=List of valid members +MembersListUpToDate=List of valid members with up to date subscription +MembersListNotUpToDate=List of valid members with subscription out of date +MembersListResiliated=List of resiliated members +MembersListQualified=List of qualified members +MenuMembersToValidate=Draft members +MenuMembersValidated=Validated members +MenuMembersUpToDate=Up to date members +MenuMembersNotUpToDate=Out of date members +MenuMembersResiliated=Resiliated members +MembersWithSubscriptionToReceive=Members with subscription to receive +DateAbonment=Subscription date +DateSubscription=Subscription date +DateNextSubscription=Next subscription +DateEndSubscription=Subscription end date +EndSubscription=End subscription +SubscriptionId=Subscription id +MemberId=Member id +NewMember=New member +NewType=New member type +MemberType=Member type +MemberTypeId=Member type id +MemberTypeLabel=Member type label +MembersTypes=Members types +MembersAttributes=Members attributes +SearchAMember=Search a member +MemberStatusDraft=Draft (needs to be validated) +MemberStatusDraftShort=Draft +MemberStatusActive=Validated (waiting subscription) +MemberStatusActiveShort=Validated +MemberStatusActiveLate=subscription expired +MemberStatusActiveLateShort=Expired +MemberStatusPaid=Subscription up to date +MemberStatusPaidShort=Up to date +MemberStatusResiliated=Resiliated member +MemberStatusResiliatedShort=Resiliated +MembersStatusToValid=Draft members +MembersStatusToValidShort=Draft members +MembersStatusValidated=Validated members +MembersStatusPaid=Subscription up to date +MembersStatusPaidShort=Up to date +MembersStatusNotPaid=Subscription out of date +MembersStatusNotPaidShort=Out of date +MembersStatusResiliated=Resiliated members +MembersStatusResiliatedShort=Resiliated members +NewCotisation=New contribution +PaymentSubscription=New contribution payment +EditMember=Edit member +SubscriptionEndDate=Subscription's end date +MembersTypeSetup=Members type setup +NewSubscription=New subscription +NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. +Subscription=Subscription +Subscriptions=Subscriptions +SubscriptionLate=Late +SubscriptionNotReceived=Subscription never received +SubscriptionLateShort=Late +SubscriptionNotReceivedShort=Never received +ListOfSubscriptions=List of subscriptions +SendCardByMail=Send card by Email +AddMember=Create member +NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" +NewMemberType=New member type +WelcomeEMail=Welcome e-mail +SubscriptionRequired=Subscription required +EditType=Edit member type +DeleteType=Delete +VoteAllowed=Vote allowed +Physical=Physical +Moral=Moral +MorPhy=Moral/Physical +Reenable=Reenable +ResiliateMember=Resiliate a member +ConfirmResiliateMember=Are you sure you want to resiliate this member ? +DeleteMember=Delete a member +ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? +DeleteSubscription=Delete a subscription +ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? +Filehtpasswd=htpasswd file +ValidateMember=Validate a member +ConfirmValidateMember=Are you sure you want to validate this member ? +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +PublicMemberList=Public member list +BlankSubscriptionForm=Public auto-subscription form +BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. +EnablePublicSubscriptionForm=Enable the public auto-subscription form +MemberPublicLinks=Public links/pages +ExportDataset_member_1=Members and subscriptions +ImportDataset_member_1=Members +LastMembers=Last %s members +LastMembersModified=Last %s modified members +LastSubscriptionsModified=Last %s modified subscriptions +AttributeName=Attribute name +String=String +Text=Text +Int=Int +Date=Date +DateAndTime=Date and time +PublicMemberCard=Member public card +MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe +AddSubscription=Create subscription +ShowSubscription=Show subscription +MemberModifiedInDolibarr=Member modified in Dolibarr +SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation +DescADHERENT_MAIL_VALID=EMail for member validation +DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription +DescADHERENT_MAIL_COTIS=EMail for subscription +DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation +DescADHERENT_MAIL_RESIL=EMail for member resiliation +DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_ETIQUETTE_TYPE=Format of labels page +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_CARD_TYPE=Format of cards page +DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards +DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) +DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) +DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards +GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here +MayBeOverwrited=This text can be overwrited by value defined for member's type +ShowTypeCard=Show type '%s' +HTPasswordExport=htpassword file generation +NoThirdPartyAssociatedToMember=No third party associated to this member +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions= Members and Subscriptions +MoreActions=Complementary action on recording +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionBankDirect=Create a direct transaction record on account +MoreActionBankViaInvoice=Create an invoice and payment on account +MoreActionInvoiceOnly=Create an invoice with no payment +LinkToGeneratedPages=Generate visit cards +LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. +DocForAllMembersCards=Generate business cards for all members +DocForOneMemberCards=Generate business cards for a particular member +DocForLabels=Generate address sheets +SubscriptionPayment=Subscription payment +LastSubscriptionDate=Last subscription date +LastSubscriptionAmount=Last subscription amount +MembersStatisticsByCountries=Members statistics by country +MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region +NbOfMembers=Number of members +NoValidatedMemberYet=No validated members found +MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. +MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. +MembersStatisticsDesc=Choose statistics you want to read... +MenuMembersStats=Statistics +LastMemberDate=Last member date +Nature=Nature +Public=Information are public +Exports=Exports +NewMemberbyWeb=New member added. Awaiting approval +NewMemberForm=New member form +SubscriptionsStatistics=Statistics on subscriptions +NbOfSubscriptions=Number of subscriptions +AmountOfSubscriptions=Amount of subscriptions +TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) +DefaultAmount=Default amount of subscription +CanEditAmount=Visitor can choose/edit amount of its subscription +MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page +Associations=Foundations +Collectivités=Organizations +Particuliers=Personal +Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/kn_IN/opensurvey.lang b/htdocs/langs/kn_IN/opensurvey.lang new file mode 100644 index 00000000000..0b191e426ec --- /dev/null +++ b/htdocs/langs/kn_IN/opensurvey.lang @@ -0,0 +1,66 @@ +# Dolibarr language file - Source file is en_US - opensurvey +Survey=Poll +Surveys=Polls +OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... +NewSurvey=New poll +NoSurveysInDatabase=%s poll(s) into database. +OpenSurveyArea=Polls area +AddACommentForPoll=You can add a comment into poll... +AddComment=Add comment +CreatePoll=Create poll +PollTitle=Poll title +ToReceiveEMailForEachVote=Receive an email for each vote +TypeDate=Type date +TypeClassic=Type standard +OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it +RemoveAllDays=Remove all days +CopyHoursOfFirstDay=Copy hours of first day +RemoveAllHours=Remove all hours +SelectedDays=Selected days +TheBestChoice=The best choice currently is +TheBestChoices=The best choices currently are +with=with +OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. +CommentsOfVoters=Comments of voters +ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes) +RemovePoll=Remove poll +UrlForSurvey=URL to communicate to get a direct access to poll +PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: +CreateSurveyDate=Create a date poll +CreateSurveyStandard=Create a standard poll +CheckBox=Simple checkbox +YesNoList=List (empty/yes/no) +PourContreList=List (empty/for/against) +AddNewColumn=Add new column +TitleChoice=Choice label +ExportSpreadsheet=Export result spreadsheet +ExpireDate=Limit date +NbOfSurveys=Number of polls +NbOfVoters=Nb of voters +SurveyResults=Results +PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s. +5MoreChoices=5 more choices +Abstention=Abstention +Against=Against +YouAreInivitedToVote=You are invited to vote for this poll +VoteNameAlreadyExists=This name was already used for this poll +ErrorPollDoesNotExists=Error, poll %s does not exists. +OpenSurveyNothingToSetup=There is no specific setup to do. +PollWillExpire=Your poll will expire automatically %s days after the last date of your poll. +AddADate=Add a date +AddStartHour=Add start hour +AddEndHour=Add end hour +votes=vote(s) +NoCommentYet=No comments have been posted for this poll yet +CanEditVotes=Can change vote of others +CanComment=Voters can comment in the poll +CanSeeOthersVote=Voters can see other people's vote +SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. +BackToCurrentMonth=Back to current month +ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation +ErrorOpenSurveyOneChoice=Enter at least one choice +ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD +ErrorInsertingComment=There was an error while inserting your comment +MoreChoices=Enter more choices for the voters +SurveyExpiredInfo=The voting time of this poll has expired. +EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s diff --git a/htdocs/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang new file mode 100644 index 00000000000..8efafa5e94e --- /dev/null +++ b/htdocs/langs/kn_IN/orders.lang @@ -0,0 +1,166 @@ +# Dolibarr language file - Source file is en_US - orders +OrdersArea=Customers orders area +SuppliersOrdersArea=Suppliers orders area +OrderCard=Order card +OrderId=Order Id +Order=Order +Orders=Orders +OrderLine=Order line +OrderFollow=Follow up +OrderDate=Order date +OrderToProcess=Order to process +NewOrder=New order +ToOrder=Make order +MakeOrder=Make order +SupplierOrder=Supplier order +SuppliersOrders=Suppliers orders +SuppliersOrdersRunning=Current suppliers orders +CustomerOrder=Customer order +CustomersOrders=Customers orders +CustomersOrdersRunning=Current customer's orders +CustomersOrdersAndOrdersLines=Customer orders and order's lines +OrdersToValid=Customers orders to validate +OrdersToBill=Customers orders delivered +OrdersInProcess=Customers orders in process +OrdersToProcess=Customers orders to process +SuppliersOrdersToProcess=Supplier's orders to process +StatusOrderCanceledShort=Canceled +StatusOrderDraftShort=Draft +StatusOrderValidatedShort=Validated +StatusOrderSentShort=In process +StatusOrderSent=Shipment in process +StatusOrderOnProcessShort=Ordered +StatusOrderProcessedShort=Processed +StatusOrderToBillShort=Delivered +StatusOrderToBill2Short=To bill +StatusOrderApprovedShort=Approved +StatusOrderRefusedShort=Refused +StatusOrderToProcessShort=To process +StatusOrderReceivedPartiallyShort=Partially received +StatusOrderReceivedAllShort=Everything received +StatusOrderCanceled=Canceled +StatusOrderDraft=Draft (needs to be validated) +StatusOrderValidated=Validated +StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation +StatusOrderProcessed=Processed +StatusOrderToBill=Delivered +StatusOrderToBill2=To bill +StatusOrderApproved=Approved +StatusOrderRefused=Refused +StatusOrderReceivedPartially=Partially received +StatusOrderReceivedAll=Everything received +ShippingExist=A shipment exists +ProductQtyInDraft=Product quantity into draft orders +ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered +DraftOrWaitingApproved=Draft or approved not yet ordered +DraftOrWaitingShipped=Draft or validated not yet shipped +MenuOrdersToBill=Orders delivered +MenuOrdersToBill2=Billable orders +SearchOrder=Search order +SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order +ShipProduct=Ship product +Discount=Discount +CreateOrder=Create Order +RefuseOrder=Refuse order +ApproveOrder=Accept order +ValidateOrder=Validate order +UnvalidateOrder=Unvalidate order +DeleteOrder=Delete order +CancelOrder=Cancel order +AddOrder=Create order +AddToMyOrders=Add to my orders +AddToOtherOrders=Add to other orders +AddToDraftOrders=Add to draft order +ShowOrder=Show order +NoOpenedOrders=No opened orders +NoOtherOpenedOrders=No other opened orders +NoDraftOrders=No draft orders +OtherOrders=Other orders +LastOrders=Last %s orders +LastModifiedOrders=Last %s modified orders +LastClosedOrders=Last %s closed orders +AllOrders=All orders +NbOfOrders=Number of orders +OrdersStatistics=Order's statistics +OrdersStatisticsSuppliers=Supplier order's statistics +NumberOfOrdersByMonth=Number of orders by month +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +ListOfOrders=List of orders +CloseOrder=Close order +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. +ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. +ConfirmDeleteOrder=Are you sure you want to delete this order ? +ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? +ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? +ConfirmCancelOrder=Are you sure you want to cancel this order ? +ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? +GenerateBill=Generate invoice +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed +ComptaCard=Accountancy card +DraftOrders=Draft orders +RelatedOrders=Related orders +OnProcessOrders=In process orders +RefOrder=Ref. order +RefCustomerOrder=Ref. customer order +RefCustomerOrderShort=Ref. cust. order +SendOrderByMail=Send order by mail +ActionsOnOrder=Events on order +NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order +OrderMode=Order method +AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process +UserWithApproveOrderGrant=Users granted with "approve orders" permission. +PaymentOrderRef=Payment of order %s +CloneOrder=Clone order +ConfirmCloneOrder=Are you sure you want to clone this order %s ? +DispatchSupplierOrder=Receiving supplier order %s +##### Types de contacts ##### +TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order +TypeContact_commande_internal_SHIPPING=Representative following-up shipping +TypeContact_commande_external_BILLING=Customer invoice contact +TypeContact_commande_external_SHIPPING=Customer shipping contact +TypeContact_commande_external_CUSTOMER=Customer contact following-up order +TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order +TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping +TypeContact_order_supplier_external_BILLING=Supplier invoice contact +TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order + +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined +Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' +Error_OrderNotChecked=No orders to invoice selected +# Sources +OrderSource0=Commercial proposal +OrderSource1=Internet +OrderSource2=Mail campaign +OrderSource3=Phone compaign +OrderSource4=Fax campaign +OrderSource5=Commercial +OrderSource6=Store +QtyOrdered=Qty ordered +AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order +# Documents models +PDFEinsteinDescription=A complete order model (logo...) +PDFEdisonDescription=A simple order model +PDFProformaDescription=A complete proforma invoice (logo…) +# Orders modes +OrderByMail=Mail +OrderByFax=Fax +OrderByEMail=EMail +OrderByWWW=Online +OrderByPhone=Phone +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang new file mode 100644 index 00000000000..08747ea884b --- /dev/null +++ b/htdocs/langs/kn_IN/other.lang @@ -0,0 +1,238 @@ +# Dolibarr language file - Source file is en_US - other +SecurityCode=Security code +Calendar=Calendar +Tools=Tools +ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

Those tools can be reached from menu on the side. +Birthday=Birthday +BirthdayDate=Birthday +DateToBirth=Date of birth +BirthdayAlertOn= birthday alert active +BirthdayAlertOff= birthday alert inactive +Notify_FICHINTER_VALIDATE=Intervention validated +Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail +Notify_BILL_VALIDATE=Customer invoice validated +Notify_BILL_UNVALIDATE=Customer invoice unvalidated +Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved +Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused +Notify_ORDER_VALIDATE=Customer order validated +Notify_PROPAL_VALIDATE=Customer proposal validated +Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed +Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused +Notify_WITHDRAW_TRANSMIT=Transmission withdrawal +Notify_WITHDRAW_CREDIT=Credit withdrawal +Notify_WITHDRAW_EMIT=Perform withdrawal +Notify_ORDER_SENTBYMAIL=Customer order sent by mail +Notify_COMPANY_CREATE=Third party created +Notify_COMPANY_SENTBYMAIL=Mails sent from third party card +Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail +Notify_BILL_PAYED=Customer invoice payed +Notify_BILL_CANCEL=Customer invoice canceled +Notify_BILL_SENTBYMAIL=Customer invoice sent by mail +Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated +Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail +Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated +Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed +Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail +Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled +Notify_CONTRACT_VALIDATE=Contract validated +Notify_FICHEINTER_VALIDATE=Intervention validated +Notify_SHIPPING_VALIDATE=Shipping validated +Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail +Notify_MEMBER_VALIDATE=Member validated +Notify_MEMBER_MODIFY=Member modified +Notify_MEMBER_SUBSCRIPTION=Member subscribed +Notify_MEMBER_RESILIATE=Member resiliated +Notify_MEMBER_DELETE=Member deleted +Notify_PROJECT_CREATE=Project creation +Notify_TASK_CREATE=Task created +Notify_TASK_MODIFY=Task modified +Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup +NbOfAttachedFiles=Number of attached files/documents +TotalSizeOfAttachedFiles=Total size of attached files/documents +MaxSize=Maximum size +AttachANewFile=Attach a new file/document +LinkedObject=Linked object +Miscellaneous=Miscellaneous +NbOfActiveNotifications=Number of notifications (nb of recipient emails) +PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ +PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ +PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ +DemoDesc=Dolibarr is a compact ERP/CRM composed by several functional modules. A demo that includes all modules does not mean anything as this never occurs. So, several demo profiles are available. +ChooseYourDemoProfil=Choose the demo profile that match your activity... +DemoFundation=Manage members of a foundation +DemoFundation2=Manage members and bank account of a foundation +DemoCompanyServiceOnly=Manage a freelance activity selling service only +DemoCompanyShopWithCashDesk=Manage a shop with a cash desk +DemoCompanyProductAndStocks=Manage a small or medium company selling products +DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules) +GoToDemo=Go to demo +CreatedBy=Created by %s +ModifiedBy=Modified by %s +ValidatedBy=Validated by %s +CanceledBy=Canceled by %s +ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed +FileWasRemoved=File %s was removed +DirWasRemoved=Directory %s was removed +FeatureNotYetAvailableShort=Available in a next version +FeatureNotYetAvailable=Feature not yet available in this version +FeatureExperimental=Experimental feature. Not stable in this version +FeatureDevelopment=Development feature. Not stable in this version +FeaturesSupported=Features supported +Width=Width +Height=Height +Depth=Depth +Top=Top +Bottom=Bottom +Left=Left +Right=Right +CalculatedWeight=Calculated weight +CalculatedVolume=Calculated volume +Weight=Weight +TotalWeight=Total weight +WeightUnitton=tonnes +WeightUnitkg=kg +WeightUnitg=g +WeightUnitmg=mg +WeightUnitpound=pound +Length=Length +LengthUnitm=m +LengthUnitdm=dm +LengthUnitcm=cm +LengthUnitmm=mm +Surface=Area +SurfaceUnitm2=m2 +SurfaceUnitdm2=dm2 +SurfaceUnitcm2=cm2 +SurfaceUnitmm2=mm2 +SurfaceUnitfoot2=ft2 +SurfaceUnitinch2=in2 +Volume=Volume +TotalVolume=Total volume +VolumeUnitm3=m3 +VolumeUnitdm3=dm3 +VolumeUnitcm3=cm3 +VolumeUnitmm3=mm3 +VolumeUnitfoot3=ft3 +VolumeUnitinch3=in3 +VolumeUnitounce=ounce +VolumeUnitlitre=litre +VolumeUnitgallon=gallon +Size=size +SizeUnitm=m +SizeUnitdm=dm +SizeUnitcm=cm +SizeUnitmm=mm +SizeUnitinch=inch +SizeUnitfoot=foot +SizeUnitpoint=point +BugTracker=Bug tracker +SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.
Change will be effective only after clicking on confirmation link inside this email.
Check your email reader software. +BackToLoginPage=Back to login page +AuthenticationDoesNotAllowSendNewPassword=Authentication mode is %s.
In this mode, Dolibarr can't know nor change your password.
Contact your system administrator if you want to change your password. +EnableGDLibraryDesc=Install or enable GD library with your PHP for use this option. +EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib) +ProfIdShortDesc=Prof Id %s is an information depending on third party country.
For example, for country %s, it's code %s. +DolibarrDemo=Dolibarr ERP/CRM demo +StatsByNumberOfUnits=Statistics in number of products/services units +StatsByNumberOfEntities=Statistics in number of referring entities +NumberOfProposals=Number of proposals on last 12 month +NumberOfCustomerOrders=Number of customer orders on last 12 month +NumberOfCustomerInvoices=Number of customer invoices on last 12 month +NumberOfSupplierOrders=Number of supplier orders on last 12 month +NumberOfSupplierInvoices=Number of supplier invoices on last 12 month +NumberOfUnitsProposals=Number of units on proposals on last 12 month +NumberOfUnitsCustomerOrders=Number of units on customer orders on last 12 month +NumberOfUnitsCustomerInvoices=Number of units on customer invoices on last 12 month +NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month +NumberOfUnitsSupplierInvoices=Number of units on supplier invoices on last 12 month +EMailTextInterventionValidated=The intervention %s has been validated. +EMailTextInvoiceValidated=The invoice %s has been validated. +EMailTextProposalValidated=The proposal %s has been validated. +EMailTextOrderValidated=The order %s has been validated. +EMailTextOrderApproved=The order %s has been approved. +EMailTextOrderApprovedBy=The order %s has been approved by %s. +EMailTextOrderRefused=The order %s has been refused. +EMailTextOrderRefusedBy=The order %s has been refused by %s. +EMailTextExpeditionValidated=The shipping %s has been validated. +ImportedWithSet=Importation data set +DolibarrNotification=Automatic notification +ResizeDesc=Enter new width OR new height. Ratio will be kept during resizing... +NewLength=New width +NewHeight=New height +NewSizeAfterCropping=New size after cropping +DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner) +CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is informations on current edited image +ImageEditor=Image editor +YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s. +YouReceiveMailBecauseOfNotification2=This event is the following: +ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start". +ClickHere=Click here +UseAdvancedPerms=Use the advanced permissions of some modules +FileFormat=File format +SelectAColor=Choose a color +AddFiles=Add Files +StartUpload=Start upload +CancelUpload=Cancel upload +FileIsTooBig=Files is too big +PleaseBePatient=Please be patient... +RequestToResetPasswordReceived=A request to change your Dolibarr password has been received +NewKeyIs=This is your new keys to login +NewKeyWillBe=Your new key to login to software will be +ClickHereToGoTo=Click here to go to %s +YouMustClickToChange=You must however first click on the following link to validate this password change +ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe. + +##### Calendar common ##### +AddCalendarEntry=Add entry in calendar %s +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted +##### Export ##### +Export=Export +ExportsArea=Exports area +AvailableFormats=Available formats +LibraryUsed=Librairy used +LibraryVersion=Version +ExportableDatas=Exportable data +NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions) +ToExport=Export +NewExport=New export +##### External sites ##### +ExternalSites=External sites diff --git a/htdocs/langs/kn_IN/paybox.lang b/htdocs/langs/kn_IN/paybox.lang new file mode 100644 index 00000000000..aced32a4944 --- /dev/null +++ b/htdocs/langs/kn_IN/paybox.lang @@ -0,0 +1,40 @@ +# Dolibarr language file - Source file is en_US - paybox +PayBoxSetup=PayBox module setup +PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects +PaymentForm=Payment form +WelcomeOnPaymentPage=Welcome on our online payment service +ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. +ThisIsInformationOnPayment=This is information on payment to do +ToComplete=To complete +YourEMail=Email to receive payment confirmation +Creditor=Creditor +PaymentCode=Payment code +PayBoxDoPayment=Go on payment +YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information +PleaseBePatient=Please, be patient +Continue=Next +ToOfferALinkForOnlinePayment=URL for %s payment +ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order +ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice +ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line +ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. +YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. +AccountParameter=Account parameters +UsageParameter=Usage parameters +InformationToFindParameters=Help to find your %s account information +PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment +VendorName=Name of vendor +CSSUrlForPaymentForm=CSS style sheet url for payment form +MessageOK=Message on validated payment return page +MessageKO=Message on canceled payment return page +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/kn_IN/paypal.lang b/htdocs/langs/kn_IN/paypal.lang new file mode 100644 index 00000000000..65a3dc45a23 --- /dev/null +++ b/htdocs/langs/kn_IN/paypal.lang @@ -0,0 +1,25 @@ +# Dolibarr language file - Source file is en_US - paypal +PaypalSetup=PayPal module setup +PaypalDesc=This module offer pages to allow payment on PayPal by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +PaypalOrCBDoPayment=Pay with credit card or Paypal +PaypalDoPayment=Pay with Paypal +PaypalCBDoPayment=Pay with credit card +PAYPAL_API_SANDBOX=Mode test/sandbox +PAYPAL_API_USER=API username +PAYPAL_API_PASSWORD=API password +PAYPAL_API_SIGNATURE=API signature +PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only +PaypalModeIntegral=Integral +PaypalModeOnlyPaypal=PayPal only +PAYPAL_CSS_URL=Optionnal Url of CSS style sheet on payment page +ThisIsTransactionId=This is id of transaction: %s +PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail +PAYPAL_IPN_MAIL_ADDRESS=E-mail address for the instant notification of payment (IPN) +PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n +YouAreCurrentlyInSandboxMode=You are currently in the "sandbox" mode +NewPaypalPaymentReceived=New Paypal payment received +NewPaypalPaymentFailed=New Paypal payment tried but failed +PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not) +ReturnURLAfterPayment=Return URL after payment +ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed +PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed diff --git a/htdocs/langs/kn_IN/printipp.lang b/htdocs/langs/kn_IN/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/kn_IN/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/kn_IN/productbatch.lang b/htdocs/langs/kn_IN/productbatch.lang new file mode 100644 index 00000000000..45263681965 --- /dev/null +++ b/htdocs/langs/kn_IN/productbatch.lang @@ -0,0 +1,21 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Use batch/serial number +ProductStatusOnBatch=Yes (Batch/serial required) +ProductStatusNotOnBatch=No (Batch/serial not used) +ProductStatusOnBatchShort=Yes +ProductStatusNotOnBatchShort=No +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. +ProductDoesNotUseBatchSerial=This product does not use batch/serial number diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang new file mode 100644 index 00000000000..3a18cda69e7 --- /dev/null +++ b/htdocs/langs/kn_IN/products.lang @@ -0,0 +1,256 @@ +# Dolibarr language file - Source file is en_US - products +ProductRef=Product ref. +ProductLabel=Product label +ProductServiceCard=Products/Services card +Products=Products +Services=Services +Product=Product +Service=Service +ProductId=Product/service id +Create=Create +Reference=Reference +NewProduct=New product +NewService=New service +ProductCode=Product code +ServiceCode=Service code +ProductVatMassChange=Mass VAT change +ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database. +MassBarcodeInit=Mass barcode init +MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete. +ProductAccountancyBuyCode=Accountancy code (buy) +ProductAccountancySellCode=Accountancy code (sell) +ProductOrService=Product or Service +ProductsAndServices=Products and Services +ProductsOrServices=Products or Services +ProductsAndServicesOnSell=Products and Services for sale or for purchase +ProductsAndServicesNotOnSell=Products and Services out of sale +ProductsAndServicesStatistics=Products and Services statistics +ProductsStatistics=Products statistics +ProductsOnSell=Product for sale or for pruchase +ProductsNotOnSell=Product out of sale and out of purchase +ProductsOnSellAndOnBuy=Products for sale and for purchase +ServicesOnSell=Services for sale or for purchase +ServicesNotOnSell=Services out of sale +ServicesOnSellAndOnBuy=Services for sale and for purchase +InternalRef=Internal reference +LastRecorded=Last products/services on sell recorded +LastRecordedProductsAndServices=Last %s recorded products/services +LastModifiedProductsAndServices=Last %s modified products/services +LastRecordedProducts=Last %s products recorded +LastRecordedServices=Last %s services recorded +LastProducts=Last products +CardProduct0=Product card +CardProduct1=Service card +CardContract=Contract card +Warehouse=Warehouse +Warehouses=Warehouses +WarehouseOpened=Warehouse opened +WarehouseClosed=Warehouse closed +Stock=Stock +Stocks=Stocks +Movement=Movement +Movements=Movements +Sell=Sales +Buy=Purchases +OnSell=For sale +OnBuy=For purchase +NotOnSell=Not for sale +ProductStatusOnSell=For sale +ProductStatusNotOnSell=Not for sale +ProductStatusOnSellShort=For sale +ProductStatusNotOnSellShort=Not for sale +ProductStatusOnBuy=For purchase +ProductStatusNotOnBuy=Not for purchase +ProductStatusOnBuyShort=For purchase +ProductStatusNotOnBuyShort=Not for purchase +UpdatePrice=Update price +AppliedPricesFrom=Applied prices from +SellingPrice=Selling price +SellingPriceHT=Selling price (net of tax) +SellingPriceTTC=Selling price (inc. tax) +PublicPrice=Public price +CurrentPrice=Current price +NewPrice=New price +MinPrice=Minim. selling price +MinPriceHT=Minim. selling price (net of tax) +MinPriceTTC=Minim. selling price (inc. tax) +CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount. +ContractStatus=Contract status +ContractStatusClosed=Closed +ContractStatusRunning=Running +ContractStatusExpired=expired +ContractStatusOnHold=Not running +ContractStatusToRun=To get running +ContractNotRunning=This contract is not running +ErrorProductAlreadyExists=A product with reference %s already exists. +ErrorProductBadRefOrLabel=Wrong value for reference or label. +ErrorProductClone=There was a problem while trying to clone the product or service. +ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +Suppliers=Suppliers +SupplierRef=Supplier's product ref. +ShowProduct=Show product +ShowService=Show service +ProductsAndServicesArea=Product and Services area +ProductsArea=Product area +ServicesArea=Services area +AddToMyProposals=Add to my proposals +AddToOtherProposals=Add to other proposals +AddToMyBills=Add to my bills +AddToOtherBills=Add to other bills +CorrectStock=Correct stock +AddPhoto=Add photo +ListOfStockMovements=List of stock movements +BuyingPrice=Buying price +SupplierCard=Supplier card +CommercialCard=Commercial card +AllWays=Path to find your product in stock +NoCat=Your product is not in any category +PrimaryWay=Primary path +PriceRemoved=Price removed +BarCode=Barcode +BarcodeType=Barcode type +SetDefaultBarcodeType=Set barcode type +BarcodeValue=Barcode value +NoteNotVisibleOnBill=Note (not visible on invoices, proposals...) +CreateCopy=Create copy +ServiceLimitedDuration=If product is a service with limited duration: +MultiPricesAbility=Several level of prices per product/service +MultiPricesNumPrices=Number of prices +MultiPriceLevelsName=Price categories +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product +EditAssociate=Associate +Translation=Translation +KeywordFilter=Keyword filter +CategoryFilter=Category filter +ProductToAddSearch=Search product to add +AddDel=Add/Delete +Quantity=Quantity +NoMatchFound=No match found +ProductAssociationList=List of related products/services: name of product/service (quantity affected) +ProductParentList=List of package products/services with this product as a component +ErrorAssociationIsFatherOfThis=One of selected product is parent with current product +DeleteProduct=Delete a product/service +ConfirmDeleteProduct=Are you sure you want to delete this product/service? +ProductDeleted=Product/Service "%s" deleted from database. +DeletePicture=Delete a picture +ConfirmDeletePicture=Are you sure you want to delete this picture ? +ExportDataset_produit_1=Products +ExportDataset_service_1=Services +ImportDataset_produit_1=Products +ImportDataset_service_1=Services +DeleteProductLine=Delete product line +ConfirmDeleteProductLine=Are you sure you want to delete this product line? +NoProductMatching=No product/service match your criteria +MatchingProducts=Matching products/services +NoStockForThisProduct=No stock for this product +NoStock=No Stock +Restock=Restock +ProductSpecial=Special +QtyMin=Minimum Qty +PriceQty=Price for this quantity +PriceQtyMin=Price for this min. qty (w/o discount) +VATRateForSupplierProduct=VAT Rate (for this supplier/product) +DiscountQtyMin=Default discount for qty +NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product +NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product +RecordedProducts=Products recorded +RecordedServices=Services recorded +RecordedProductsAndServices=Products/services recorded +PredefinedProductsToSell=Predefined products to sell +PredefinedServicesToSell=Predefined services to sell +PredefinedProductsAndServicesToSell=Predefined products/services to sell +PredefinedProductsToPurchase=Predefined product to purchase +PredefinedServicesToPurchase=Predefined services to purchase +PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase +GenerateThumb=Generate thumb +ProductCanvasAbility=Use special "canvas" addons +ServiceNb=Service #%s +ListProductServiceByPopularity=List of products/services by popularity +ListProductByPopularity=List of products by popularity +ListServiceByPopularity=List of services by popularity +Finished=Manufactured product +RowMaterial=Raw Material +CloneProduct=Clone product or service +ConfirmCloneProduct=Are you sure you want to clone product or service %s ? +CloneContentProduct=Clone all main informations of product/service +ClonePricesProduct=Clone main informations and prices +CloneCompositionProduct=Clone packaged product/services +ProductIsUsed=This product is used +NewRefForClone=Ref. of new product/service +CustomerPrices=Customers prices +SuppliersPrices=Suppliers prices +SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services) +CustomCode=Customs code +CountryOrigin=Origin country +HiddenIntoCombo=Hidden into select lists +Nature=Nature +ProductCodeModel=Product ref template +ServiceCodeModel=Service ref template +AddThisProductCard=Create product card +HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist. +AddThisServiceCard=Create service card +HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist. +CurrentProductPrice=Current price +AlwaysUseNewPrice=Always use current price of product/service +AlwaysUseFixedPrice=Use the fixed price +PriceByQuantity=Different prices by quantity +PriceByQuantityRange=Quantity range +ProductsDashboard=Products/Services summary +UpdateOriginalProductLabel=Modify original label +HelpUpdateOriginalProductLabel=Allows to edit the name of the product +### composition fabrication +Building=Production and items dispatchment +Build=Produce +BuildIt=Produce & Dispatch +BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action) +QtyNeed=Qty +UnitPmp=Net unit VWAP +CostPmpHT=Net total VWAP +ProductUsedForBuild=Auto consumed by production +ProductBuilded=Production completed +ProductsMultiPrice=Product multi-price +ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) +ProductSellByQuarterHT=Products turnover quarterly VWAP +ServiceSellByQuarterHT=Services turnover quarterly VWAP +Quarter1=1st. Quarter +Quarter2=2nd. Quarter +Quarter3=3rd. Quarter +Quarter4=4th. Quarter +BarCodePrintsheet=Print bar code +PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s. +NumberOfStickers=Number of stickers to print on page +PrintsheetForOneBarCode=Print several stickers for one barcode +BuildPageToPrint=Generate page to print +FillBarCodeTypeAndValueManually=Fill barcode type and value manually. +FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product. +FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty. +DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s. +DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s. +BarCodeDataForProduct=Barcode information of product %s : +BarCodeDataForThirdparty=Barcode information of thirdparty %s : +ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values) +PriceByCustomer=Different price for each customer +PriceCatalogue=Unique price per product/service +PricingRule=Rules for customer prices +AddCustomerPrice=Add price by customers +ForceUpdateChildPriceSoc=Set same price on customer subsidiaries +PriceByCustomerLog=Price by customer log +MinimumPriceLimit=Minimum price can't be lower that %s +MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions +PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey# +PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# +PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# +PriceMode=Price mode +PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang new file mode 100644 index 00000000000..0a12f4c64b7 --- /dev/null +++ b/htdocs/langs/kn_IN/projects.lang @@ -0,0 +1,142 @@ +# Dolibarr language file - Source file is en_US - projects +RefProject=Ref. project +ProjectId=Project Id +Project=Project +Projects=Projects +ProjectStatus=Project status +SharedProject=Everybody +PrivateProject=Contacts of project +MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). +ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. +ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). +MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). +TasksPublicDesc=This view presents all projects and tasks you are allowed to read. +TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). +ProjectsArea=Projects area +NewProject=New project +AddProject=Create project +DeleteAProject=Delete a project +DeleteATask=Delete a task +ConfirmDeleteAProject=Are you sure you want to delete this project ? +ConfirmDeleteATask=Are you sure you want to delete this task ? +OfficerProject=Officer project +LastProjects=Last %s projects +AllProjects=All projects +ProjectsList=List of projects +ShowProject=Show project +SetProject=Set project +NoProject=No project defined or owned +NbOpenTasks=Nb of opened tasks +NbOfProjects=Nb of projects +TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user +TimesSpent=Time spent +RefTask=Ref. task +LabelTask=Label task +TaskTimeSpent=Time spent on tasks +TaskTimeUser=User +TaskTimeNote=Note +TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined +NewTimeSpent=New time spent +MyTimeSpent=My time spent +MyTasks=My tasks +Tasks=Tasks +Task=Task +TaskDateStart=Task start date +TaskDateEnd=Task end date +TaskDescription=Task description +NewTask=New task +AddTask=Create task +AddDuration=Add duration +Activity=Activity +Activities=Tasks/activities +MyActivity=My activity +MyActivities=My tasks/activities +MyProjects=My projects +DurationEffective=Effective duration +Progress=Progress +ProgressDeclared=Declared progress +ProgressCalculated=Calculated progress +Time=Time +ListProposalsAssociatedProject=List of the commercial proposals associated with the project +ListOrdersAssociatedProject=List of customer's orders associated with the project +ListInvoicesAssociatedProject=List of customer's invoices associated with the project +ListPredefinedInvoicesAssociatedProject=List of customer's predefined invoices associated with project +ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project +ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project +ListContractAssociatedProject=List of contracts associated with the project +ListFichinterAssociatedProject=List of interventions associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project +ListActionsAssociatedProject=List of events associated with the project +ActivityOnProjectThisWeek=Activity on project this week +ActivityOnProjectThisMonth=Activity on project this month +ActivityOnProjectThisYear=Activity on project this year +ChildOfTask=Child of project/task +NotOwnerOfProject=Not owner of this private project +AffectedTo=Allocated to +CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab. +ValidateProject=Validate projet +ConfirmValidateProject=Are you sure you want to validate this project ? +CloseAProject=Close project +ConfirmCloseAProject=Are you sure you want to close this project ? +ReOpenAProject=Open project +ConfirmReOpenAProject=Are you sure you want to re-open this project ? +ProjectContact=Project contacts +ActionsOnProject=Events on project +YouAreNotContactOfProject=You are not a contact of this private project +DeleteATimeSpent=Delete time spent +ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me +TaskRessourceLinks=Ressources +ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party +NoTasks=No tasks for this project +LinkedToAnotherCompany=Linked to other third party +TaskIsNotAffectedToYou=Task not assigned to you +ErrorTimeSpentIsEmpty=Time spent is empty +ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. +IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. +CloneProject=Clone project +CloneTasks=Clone tasks +CloneContacts=Clone contacts +CloneNotes=Clone notes +CloneProjectFiles=Clone project joined files +CloneTaskFiles=Clone task(s) joined files (if task(s) cloned) +CloneMoveDate=Update project/tasks dates from now ? +ConfirmCloneProject=Are you sure to clone this project ? +ProjectReportDate=Change task date according project start date +ErrorShiftTaskDate=Impossible to shift task date according to new project start date +ProjectsAndTasksLines=Projects and tasks +ProjectCreatedInDolibarr=Project %s created +TaskCreatedInDolibarr=Task %s created +TaskModifiedInDolibarr=Task %s modified +TaskDeletedInDolibarr=Task %s deleted +##### Types de contacts ##### +TypeContact_project_internal_PROJECTLEADER=Project leader +TypeContact_project_external_PROJECTLEADER=Project leader +TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_task_internal_TASKEXECUTIVE=Task executive +TypeContact_project_task_external_TASKEXECUTIVE=Task executive +TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor +TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor +SelectElement=Select element +AddElement=Link to element +UnlinkElement=Unlink element +# Documents models +DocumentModelBaleine=A complete project's report model (logo...) +PlannedWorkload = Planned workload +WorkloadOccupation= Workload affectation +ProjectReferers=Refering objects +SearchAProject=Search a project +ProjectMustBeValidatedFirst=Project must be validated first +ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/kn_IN/propal.lang b/htdocs/langs/kn_IN/propal.lang new file mode 100644 index 00000000000..2b6d12870a1 --- /dev/null +++ b/htdocs/langs/kn_IN/propal.lang @@ -0,0 +1,100 @@ +# Dolibarr language file - Source file is en_US - propal +Proposals=Commercial proposals +Proposal=Commercial proposal +ProposalShort=Proposal +ProposalsDraft=Draft commercial proposals +ProposalDraft=Draft commercial proposal +ProposalsOpened=Opened commercial proposals +Prop=Commercial proposals +CommercialProposal=Commercial proposal +CommercialProposals=Commercial proposals +ProposalCard=Proposal card +NewProp=New commercial proposal +NewProposal=New commercial proposal +NewPropal=New proposal +Prospect=Prospect +ProspectList=Prospect list +DeleteProp=Delete commercial proposal +ValidateProp=Validate commercial proposal +AddProp=Create proposal +ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ? +ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name %s ? +LastPropals=Last %s proposals +LastClosedProposals=Last %s closed proposals +LastModifiedProposals=Last %s modified proposals +AllPropals=All proposals +LastProposals=Last proposals +SearchAProposal=Search a proposal +ProposalsStatistics=Commercial proposal's statistics +NumberOfProposalsByMonth=Number by month +AmountOfProposalsByMonthHT=Amount by month (net of tax) +NbOfProposals=Number of commercial proposals +ShowPropal=Show proposal +PropalsDraft=Drafts +PropalsOpened=Opened +PropalsNotBilled=Closed not billed +PropalStatusDraft=Draft (needs to be validated) +PropalStatusValidated=Validated (proposal is open) +PropalStatusOpened=Validated (proposal is open) +PropalStatusClosed=Closed +PropalStatusSigned=Signed (needs billing) +PropalStatusNotSigned=Not signed (closed) +PropalStatusBilled=Billed +PropalStatusDraftShort=Draft +PropalStatusValidatedShort=Validated +PropalStatusOpenedShort=Opened +PropalStatusClosedShort=Closed +PropalStatusSignedShort=Signed +PropalStatusNotSignedShort=Not signed +PropalStatusBilledShort=Billed +PropalsToClose=Commercial proposals to close +PropalsToBill=Signed commercial proposals to bill +ListOfProposals=List of commercial proposals +ActionsOnPropal=Events on proposal +NoOpenedPropals=No opened commercial proposals +NoOtherOpenedPropals=No other opened commercial proposals +RefProposal=Commercial proposal ref +SendPropalByMail=Send commercial proposal by mail +AssociatedDocuments=Documents associated with the proposal: +ErrorCantOpenDir=Can't open directory +DatePropal=Date of proposal +DateEndPropal=Validity ending date +DateEndPropalShort=Date end +ValidityDuration=Validity duration +CloseAs=Close with status +ClassifyBilled=Classify billed +BuildBill=Build invoice +ErrorPropalNotFound=Propal %s not found +Estimate=Estimate : +EstimateShort=Estimate +OtherPropals=Other proposals +AddToDraftProposals=Add to draft proposal +NoDraftProposals=No draft proposals +CopyPropalFrom=Create commercial proposal by copying existing proposal +CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services +DefaultProposalDurationValidity=Default commercial proposal validity duration (in days) +UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address +ClonePropal=Clone commercial proposal +ConfirmClonePropal=Are you sure you want to clone the commercial proposal %s ? +ConfirmReOpenProp=Are you sure you want to open back the commercial proposal %s ? +ProposalsAndProposalsLines=Commercial proposal and lines +ProposalLine=Proposal line +AvailabilityPeriod=Availability delay +SetAvailability=Set availability delay +AfterOrder=after order +##### Availability ##### +AvailabilityTypeAV_NOW=Immediate +AvailabilityTypeAV_1W=1 week +AvailabilityTypeAV_2W=2 weeks +AvailabilityTypeAV_3W=3 weeks +AvailabilityTypeAV_1M=1 month +##### Types de contacts ##### +TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal +TypeContact_propal_external_BILLING=Customer invoice contact +TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal +# Document models +DocModelAzurDescription=A complete proposal model (logo...) +DocModelJauneDescription=Jaune proposal model +DefaultModelPropalCreate=Default model creation +DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) +DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) diff --git a/htdocs/langs/kn_IN/resource.lang b/htdocs/langs/kn_IN/resource.lang new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/kn_IN/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/kn_IN/salaries.lang b/htdocs/langs/kn_IN/salaries.lang new file mode 100644 index 00000000000..28c21adfad3 --- /dev/null +++ b/htdocs/langs/kn_IN/salaries.lang @@ -0,0 +1,13 @@ +# Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge +Salary=Salary +Salaries=Salaries +Employee=Employee +NewSalaryPayment=New salary payment +SalaryPayment=Salary payment +SalariesPayments=Salaries payments +ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/kn_IN/sendings.lang b/htdocs/langs/kn_IN/sendings.lang new file mode 100644 index 00000000000..b1ff55f71c1 --- /dev/null +++ b/htdocs/langs/kn_IN/sendings.lang @@ -0,0 +1,85 @@ +# Dolibarr language file - Source file is en_US - sendings +RefSending=Ref. shipment +Sending=Shipment +Sendings=Shipments +Shipment=Shipment +Shipments=Shipments +ShowSending=Show Sending +Receivings=Receipts +SendingsArea=Shipments area +ListOfSendings=List of shipments +SendingMethod=Shipping method +SendingReceipt=Shipping receipt +LastSendings=Last %s shipments +SearchASending=Search for shipment +StatisticsOfSendings=Statistics for shipments +NbOfSendings=Number of shipments +NumberOfShipmentsByMonth=Number of shipments by month +SendingCard=Shipment card +NewSending=New shipment +CreateASending=Create a shipment +CreateSending=Create shipment +QtyOrdered=Qty ordered +QtyShipped=Qty shipped +QtyToShip=Qty to ship +QtyReceived=Qty received +KeepToShip=Remain to ship +OtherSendingsForSameOrder=Other shipments for this order +DateSending=Date sending order +DateSendingShort=Date sending order +SendingsForSameOrder=Shipments for this order +SendingsAndReceivingForSameOrder=Shipments and receivings for this order +SendingsToValidate=Shipments to validate +StatusSendingCanceled=Canceled +StatusSendingDraft=Draft +StatusSendingValidated=Validated (products to ship or already shipped) +StatusSendingProcessed=Processed +StatusSendingCanceledShort=Canceled +StatusSendingDraftShort=Draft +StatusSendingValidatedShort=Validated +StatusSendingProcessedShort=Processed +SendingSheet=Shipment sheet +Carriers=Carriers +Carrier=Carrier +CarriersArea=Carriers area +NewCarrier=New carrier +ConfirmDeleteSending=Are you sure you want to delete this shipment ? +ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? +ConfirmCancelSending=Are you sure you want to cancel this shipment ? +GenericTransport=Generic transport +Enlevement=Gotten by customer +DocumentModelSimple=Simple document model +DocumentModelMerou=Merou A5 model +WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +DateDeliveryPlanned=Planed date of delivery +DateReceived=Date delivery received +SendShippingByEMail=Send shipment by EMail +SendShippingRef=Submission of shipment %s +ActionsOnShipping=Events on shipment +LinkToTrackYourPackage=Link to track your package +ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +RelatedShippings=Related shipments +ShipmentLine=Shipment line +CarrierList=List of transporters +SendingRunning=Product from ordered customer orders +SuppliersReceiptRunning=Product from ordered supplier orders +ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders +ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders +ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent +ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received + +# Sending methods +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo +# ModelDocument +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/kn_IN/sms.lang b/htdocs/langs/kn_IN/sms.lang new file mode 100644 index 00000000000..4e89bb24730 --- /dev/null +++ b/htdocs/langs/kn_IN/sms.lang @@ -0,0 +1,53 @@ +# Dolibarr language file - Source file is en_US - sms +Sms=Sms +SmsSetup=Sms setup +SmsDesc=This page allows you to define globals options on SMS features +SmsCard=SMS Card +AllSms=All SMS campains +SmsTargets=Targets +SmsRecipients=Targets +SmsRecipient=Target +SmsTitle=Description +SmsFrom=Sender +SmsTo=Target +SmsTopic=Topic of SMS +SmsText=Message +SmsMessage=SMS Message +ShowSms=Show Sms +ListOfSms=List SMS campains +NewSms=New SMS campain +EditSms=Edit Sms +ResetSms=New sending +DeleteSms=Delete Sms campain +DeleteASms=Remove a Sms campain +PreviewSms=Previuw Sms +PrepareSms=Prepare Sms +CreateSms=Create Sms +SmsResult=Result of Sms sending +TestSms=Test Sms +ValidSms=Validate Sms +ApproveSms=Approve Sms +SmsStatusDraft=Draft +SmsStatusValidated=Validated +SmsStatusApproved=Approved +SmsStatusSent=Sent +SmsStatusSentPartialy=Sent partially +SmsStatusSentCompletely=Sent completely +SmsStatusError=Error +SmsStatusNotSent=Not sent +SmsSuccessfulySent=Sms correctly sent (from %s to %s) +ErrorSmsRecipientIsEmpty=Number of target is empty +WarningNoSmsAdded=No new phone number to add to target list +ConfirmValidSms=Do you confirm validation of this campain ? +ConfirmResetMailing=Warning, if you make a reinit of Sms campain %s, you will allow to make a mass sending of it a second time. Is it really what you wan to do ? +ConfirmDeleteMailing=Do you confirm removing of campain ? +NbOfRecipients=Number of targets +NbOfUniqueSms=Nb dof unique phone numbers +NbOfSms=Nbre of phon numbers +ThisIsATestMessage=This is a test message +SendSms=Send SMS +SmsInfoCharRemain=Nb of remaining characters +SmsInfoNumero= (format international ie : +33899701761) +DelayBeforeSending=Delay before sending (minutes) +SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider. + diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang new file mode 100644 index 00000000000..29706d17615 --- /dev/null +++ b/htdocs/langs/kn_IN/stocks.lang @@ -0,0 +1,134 @@ +# Dolibarr language file - Source file is en_US - stocks +WarehouseCard=Warehouse card +Warehouse=Warehouse +Warehouses=Warehouses +NewWarehouse=New warehouse / Stock area +WarehouseEdit=Modify warehouse +MenuNewWarehouse=New warehouse +WarehouseOpened=Warehouse opened +WarehouseClosed=Warehouse closed +WarehouseSource=Source warehouse +WarehouseSourceNotDefined=No warehouse defined, +AddOne=Add one +WarehouseTarget=Target warehouse +ValidateSending=Delete sending +CancelSending=Cancel sending +DeleteSending=Delete sending +Stock=Stock +Stocks=Stocks +Movement=Movement +Movements=Movements +ErrorWarehouseRefRequired=Warehouse reference name is required +ErrorWarehouseLabelRequired=Warehouse label is required +CorrectStock=Correct stock +ListOfWarehouses=List of warehouses +ListOfStockMovements=List of stock movements +StocksArea=Warehouses area +Location=Location +LocationSummary=Short name location +NumberOfDifferentProducts=Number of different products +NumberOfProducts=Total number of products +LastMovement=Last movement +LastMovements=Last movements +Units=Units +Unit=Unit +StockCorrection=Correct stock +StockTransfer=Stock transfer +StockMovement=Transfer +StockMovements=Stock transfers +LabelMovement=Movement label +NumberOfUnit=Number of units +UnitPurchaseValue=Unit purchase price +TotalStock=Total in stock +StockTooLow=Stock too low +StockLowerThanLimit=Stock lower than alert limit +EnhancedValue=Value +PMPValue=Weighted average price +PMPValueShort=WAP +EnhancedValueOfWarehouses=Warehouses value +UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant +QtyDispatched=Quantity dispatched +QtyDispatchedShort=Qty dispatched +QtyToDispatchShort=Qty to dispatch +OrderDispatch=Stock dispatching +RuleForStockManagementDecrease=Rule for stock management decrease +RuleForStockManagementIncrease=Rule for stock management increase +DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation +DeStockOnValidateOrder=Decrease real stocks on customers orders validation +DeStockOnShipment=Decrease real stocks on shipment validation +ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation +ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation +ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving +ReStockOnDeleteInvoice=Increase real stocks on invoice deletion +OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses. +StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock +NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required. +DispatchVerb=Dispatch +StockLimitShort=Limit for alert +StockLimit=Stock limit for alert +PhysicalStock=Physical stock +RealStock=Real Stock +VirtualStock=Virtual stock +MininumStock=Minimum stock +StockUp=Stock up +MininumStockShort=Stock min +StockUpShort=Stock up +IdWarehouse=Id warehouse +DescWareHouse=Description warehouse +LieuWareHouse=Localisation warehouse +WarehousesAndProducts=Warehouses and products +AverageUnitPricePMPShort=Weighted average input price +AverageUnitPricePMP=Weighted average input price +SellPriceMin=Selling Unit Price +EstimatedStockValueSellShort=Value to sell +EstimatedStockValueSell=Value to Sell +EstimatedStockValueShort=Input stock value +EstimatedStockValue=Input stock value +DeleteAWarehouse=Delete a warehouse +ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse %s ? +PersonalStock=Personal stock %s +ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s +SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease +SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase +NoStockAction=No stock action +LastWaitingSupplierOrders=Orders waiting for receptions +DesiredStock=Desired stock +StockToBuy=To order +Replenishment=Replenishment +ReplenishmentOrders=Replenishment orders +VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs +UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature +UseVirtualStock=Use virtual stock +UsePhysicalStock=Use physical stock +CurentSelectionMode=Curent selection mode +CurentlyUsingVirtualStock=Virtual stock +CurentlyUsingPhysicalStock=Physical stock +RuleForStockReplenishment=Rule for stocks replenishment +SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier +AlertOnly= Alerts only +WarehouseForStockDecrease=The warehouse %s will be used for stock decrease +WarehouseForStockIncrease=The warehouse %s will be used for stock increase +ForThisWarehouse=For this warehouse +ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. +Replenishments=Replenishments +NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) +NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) +MassMovement=Mass movement +MassStockMovement=Mass stock movement +SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". +RecordMovement=Record transfert +ReceivingForSameOrder=Receipts for this order +StockMovementRecorded=Stock movements recorded +RuleForStockAvailability=Rules on stock requirements +StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice +StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order +StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment +MovementLabel=Label of movement +InventoryCode=Movement or inventory code +IsInPackage=Contained into package +ShowWarehouse=Show warehouse +MovementCorrectStock=Stock content correction for product %s +MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang new file mode 100644 index 00000000000..baf573c66ac --- /dev/null +++ b/htdocs/langs/kn_IN/suppliers.lang @@ -0,0 +1,45 @@ +# Dolibarr language file - Source file is en_US - suppliers +Suppliers=Suppliers +AddSupplier=Create a supplier +SupplierRemoved=Supplier removed +SuppliersInvoice=Suppliers invoice +NewSupplier=New supplier +History=History +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier +OrderDate=Order date +BuyingPrice=Buying price +BuyingPriceMin=Minimum buying price +BuyingPriceMinShort=Min buying price +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined +AddSupplierPrice=Add supplier price +ChangeSupplierPrice=Change supplier price +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s +NoRecordedSuppliers=No suppliers recorded +SupplierPayment=Supplier payment +SuppliersArea=Suppliers area +RefSupplierShort=Ref. supplier +Availability=Availability +ExportDataset_fournisseur_1=Supplier invoices list and invoice lines +ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_3=Supplier orders and order lines +ApproveThisOrder=Approve this order +ConfirmApproveThisOrder=Are you sure you want to approve order %s ? +DenyingThisOrder=Deny this order +ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? +ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? +AddCustomerOrder=Create customer order +AddCustomerInvoice=Create customer invoice +AddSupplierOrder=Create supplier order +AddSupplierInvoice=Create supplier invoice +ListOfSupplierProductForSupplier=List of products and prices for supplier %s +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice +NbDaysToDelivery=Delivery delay in days +DescNbDaysToDelivery=The biggest delay is display among order product list diff --git a/htdocs/langs/kn_IN/trips.lang b/htdocs/langs/kn_IN/trips.lang new file mode 100644 index 00000000000..ba36fc9b07b --- /dev/null +++ b/htdocs/langs/kn_IN/trips.lang @@ -0,0 +1,126 @@ +# Dolibarr language file - Source file is en_US - trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report +ListOfFees=List of fees +NewTrip=New expense report +CompanyVisited=Company/foundation visited +Kilometers=Kilometers +FeesKilometersOrAmout=Amount or kilometers +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report +ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang new file mode 100644 index 00000000000..baf209f9d1c --- /dev/null +++ b/htdocs/langs/kn_IN/users.lang @@ -0,0 +1,122 @@ +# Dolibarr language file - Source file is en_US - users +HRMArea=HRM area +UserCard=User card +ContactCard=Contact card +GroupCard=Group card +NoContactCard=No card among contacts +Permission=Permission +Permissions=Permissions +EditPassword=Edit password +SendNewPassword=Regenerate and send password +ReinitPassword=Regenerate password +PasswordChangedTo=Password changed to: %s +SubjectNewPassword=Your new password for Dolibarr +AvailableRights=Available permissions +OwnedRights=Owned permissions +GroupRights=Group permissions +UserRights=User permissions +UserGUISetup=User display setup +DisableUser=Disable +DisableAUser=Disable a user +DeleteUser=Delete +DeleteAUser=Delete a user +DisableGroup=Disable +DisableAGroup=Disable a group +EnableAUser=Enable a user +EnableAGroup=Enable a group +DeleteGroup=Delete +DeleteAGroup=Delete a group +ConfirmDisableUser=Are you sure you want to disable user %s ? +ConfirmDisableGroup=Are you sure you want to disable group %s ? +ConfirmDeleteUser=Are you sure you want to delete user %s ? +ConfirmDeleteGroup=Are you sure you want to delete group %s ? +ConfirmEnableUser=Are you sure you want to enable user %s ? +ConfirmEnableGroup=Are you sure you want to enable group %s ? +ConfirmReinitPassword=Are you sure you want to generate a new password for user %s ? +ConfirmSendNewPassword=Are you sure you want to generate and send new password for user %s ? +NewUser=New user +CreateUser=Create user +SearchAGroup=Search a group +SearchAUser=Search a user +LoginNotDefined=Login is not defined. +NameNotDefined=Name is not defined. +ListOfUsers=List of users +Administrator=Administrator +SuperAdministrator=Super Administrator +SuperAdministratorDesc=Global administrator +AdministratorDesc=Administrator's entity +DefaultRights=Default permissions +DefaultRightsDesc=Define here default permissions that are automatically granted to a new created user (Go on user card to change permission of an existing user). +DolibarrUsers=Dolibarr users +LastName=Name +FirstName=First name +ListOfGroups=List of groups +NewGroup=New group +CreateGroup=Create group +RemoveFromGroup=Remove from group +PasswordChangedAndSentTo=Password changed and sent to %s. +PasswordChangeRequestSent=Request to change password for %s sent to %s. +MenuUsersAndGroups=Users & Groups +LastGroupsCreated=Last %s created groups +LastUsersCreated=Last %s users created +ShowGroup=Show group +ShowUser=Show user +NonAffectedUsers=Non assigned users +UserModified=User modified successfully +PhotoFile=Photo file +UserWithDolibarrAccess=User with Dolibarr access +ListOfUsersInGroup=List of users in this group +ListOfGroupsForUser=List of groups for this user +UsersToAdd=Users to add to this group +GroupsToAdd=Groups to add to this user +NoLogin=No login +LinkToCompanyContact=Link to third party / contact +LinkedToDolibarrMember=Link to member +LinkedToDolibarrUser=Link to Dolibarr user +LinkedToDolibarrThirdParty=Link to Dolibarr third party +CreateDolibarrLogin=Create a user +CreateDolibarrThirdParty=Create a third party +LoginAccountDisable=Account disabled, put a new login to activate it. +LoginAccountDisableInDolibarr=Account disabled in Dolibarr. +LoginAccountDisableInLdap=Account disabled in the domain. +UsePersonalValue=Use personal value +GuiLanguage=Interface language +InternalUser=Internal user +MyInformations=My data +ExportDataset_user_1=Dolibarr's users and properties +DomainUser=Domain user %s +Reactivate=Reactivate +CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. +InternalExternalDesc=An internal user is a user that is part of your company/foundation.
An external user is a customer, supplier or other.

In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display) +PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group. +Inherited=Inherited +UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party) +UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party) +IdPhoneCaller=Id phone caller +UserLogged=User %s login +UserLogoff=User %s logout +NewUserCreated=User %s created +NewUserPassword=Password change for %s +EventUserModified=User %s modified +UserDisabled=User %s disabled +UserEnabled=User %s activated +UserDeleted=User %s removed +NewGroupCreated=Group %s created +GroupModified=Group %s modified +GroupDeleted=Group %s removed +ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? +ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? +ConfirmCreateThirdParty=Are you sure you want to create a third party for this member ? +LoginToCreate=Login to create +NameToCreate=Name of third party to create +YourRole=Your roles +YourQuotaOfUsersIsReached=Your quota of active users is reached ! +NbOfUsers=Nb of users +DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin +HierarchicalResponsible=Supervisor +HierarchicView=Hierarchical view +UseTypeFieldToChange=Use field Type to change +OpenIDURL=OpenID URL +LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang new file mode 100644 index 00000000000..c36ffbf025a --- /dev/null +++ b/htdocs/langs/kn_IN/withdrawals.lang @@ -0,0 +1,97 @@ +# Dolibarr language file - Source file is en_US - withdrawals +StandingOrdersArea=Standing orders area +CustomersStandingOrdersArea=Customers standing orders area +StandingOrders=Standing orders +StandingOrder=Standing orders +NewStandingOrder=New standing order +StandingOrderToProcess=To process +StandingOrderProcessed=Processed +Withdrawals=Withdrawals +Withdrawal=Withdrawal +WithdrawalsReceipts=Withdrawal receipts +WithdrawalReceipt=Withdrawal receipt +WithdrawalReceiptShort=Receipt +LastWithdrawalReceipts=Last %s withdrawal receipts +WithdrawedBills=Withdrawn invoices +WithdrawalsLines=Withdrawal lines +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. +CustomersStandingOrders=Customer standing orders +CustomerStandingOrder=Customer standing order +NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request +NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information +InvoiceWaitingWithdraw=Invoice waiting for withdraw +AmountToWithdraw=Amount to withdraw +WithdrawsRefused=Withdraws refused +NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request. +ResponsibleUser=Responsible user +WithdrawalsSetup=Withdrawal setup +WithdrawStatistics=Withdraw's statistics +WithdrawRejectStatistics=Withdraw reject's statistics +LastWithdrawalReceipt=Last %s withdrawing receipts +MakeWithdrawRequest=Make a withdraw request +ThirdPartyBankCode=Third party bank code +ThirdPartyDeskCode=Third party desk code +NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN. +ClassCredited=Classify credited +ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account? +TransData=Transmission date +TransMetod=Transmission method +Send=Send +Lines=Lines +StandingOrderReject=Issue a rejection +WithdrawalRefused=Withdrawal refused +WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society +RefusedData=Date of rejection +RefusedReason=Reason for rejection +RefusedInvoicing=Billing the rejection +NoInvoiceRefused=Do not charge the rejection +InvoiceRefused=Invoice refused (Charge the rejection to customer) +Status=Status +StatusUnknown=Unknown +StatusWaiting=Waiting +StatusTrans=Sent +StatusCredited=Credited +StatusRefused=Refused +StatusMotif0=Unspecified +StatusMotif1=Insufficient funds +StatusMotif2=Request contested +StatusMotif3=No Withdrawal order +StatusMotif4=Customer Order +StatusMotif5=RIB unusable +StatusMotif6=Account without balance +StatusMotif7=Judicial Decision +StatusMotif8=Other reason +CreateAll=Withdraw all +CreateGuichet=Only office +CreateBanque=Only bank +OrderWaiting=Waiting for treatment +NotifyTransmision=Withdrawal Transmission +NotifyEmision=Withdrawal Emission +NotifyCredit=Withdrawal Credit +NumeroNationalEmetter=National Transmitter Number +PleaseSelectCustomerBankBANToWithdraw=Select information about customer bank account to withdraw +WithBankUsingRIB=For bank accounts using RIB +WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT +BankToReceiveWithdraw=Bank account to receive withdraws +CreditDate=Credit on +WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) +ShowWithdraw=Show Withdraw +IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. +WithdrawalFile=Withdrawal file +SetToStatusSent=Set to status "File Sent" +ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines + +### Notifications +InfoCreditSubject=Payment of standing order %s by the bank +InfoCreditMessage=The standing order %s has been paid by the bank
Data of payment: %s +InfoTransSubject=Transmission of standing order %s to bank +InfoTransMessage=The standing order %s has been sent to bank by %s %s.

+InfoTransData=Amount: %s
Method: %s
Date: %s +InfoFoot=This is an automated message sent by Dolibarr +InfoRejectSubject=Standing order refused +InfoRejectMessage=Hello,

the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.

--
%s +ModeWarning=Option for real mode was not set, we stop after this simulation diff --git a/htdocs/langs/kn_IN/workflow.lang b/htdocs/langs/kn_IN/workflow.lang new file mode 100644 index 00000000000..17c8dd3aafa --- /dev/null +++ b/htdocs/langs/kn_IN/workflow.lang @@ -0,0 +1,11 @@ +# Dolibarr language file - Source file is en_US - admin +WorkflowSetup=Workflow module setup +WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in. +ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated. +descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed +descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed +descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated +descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang new file mode 100644 index 00000000000..0b715dc2929 --- /dev/null +++ b/htdocs/langs/lo_LA/accountancy.lang @@ -0,0 +1,160 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=ບັນ​ຊີ +Globalparameters=​ໂຕ​ຕັ້ງ​ຄ່າ​ທັງ​ໝົດ +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Export=Export +Modelcsv=Model of export +OptionsDeactivatedForThisExportModel=For this export model, options are deactivated +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Breakdown +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic breakdown + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTING_SEPARATORCSV=Column separator in export file + +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal + +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait + +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Breakdown card diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang new file mode 100644 index 00000000000..9782c2ea27f --- /dev/null +++ b/htdocs/langs/lo_LA/admin.lang @@ -0,0 +1,1603 @@ +# Dolibarr language file - Source file is en_US - admin +Foundation=Foundation +Version=Version +VersionProgram=Version program +VersionLastInstall=Version initial install +VersionLastUpgrade=Version last upgrade +VersionExperimental=Experimental +VersionDevelopment=Development +VersionUnknown=Unknown +VersionRecommanded=Recommended +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found +SessionId=Session ID +SessionSaveHandler=Handler to save sessions +SessionSavePath=Storage session localization +PurgeSessions=Purge of sessions +ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself). +NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions. +LockNewSessions=Lock new connections +ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user %s will be able to connect after that. +UnlockNewSessions=Remove connection lock +YourSession=Your session +Sessions=Users session +WebUserGroup=Web server user/group +NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (%s) might be protected (For example, by OS permissions or by PHP directive open_basedir). +HTMLCharset=Charset for generated HTML pages +DBStoringCharset=Database charset to store data +DBSortingCharset=Database charset to sort data +WarningModuleNotActive=Module %s must be enabled +WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page. +DolibarrSetup=Dolibarr install or upgrade +DolibarrUser=Dolibarr user +InternalUser=Internal user +ExternalUser=External user +InternalUsers=Internal users +ExternalUsers=External users +GlobalSetup=Global setup +GUISetup=Display +SetupArea=Setup area +FormToTestFileUploadForm=Form to test file upload (according to setup) +IfModuleEnabled=Note: yes is effective only if module %s is enabled +RemoveLock=Remove file %s if it exists to allow usage of the update tool. +RestoreLock=Restore file %s, with read permission only, to disable any usage of update tool. +SecuritySetup=Security setup +ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher +ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher +ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. +DictionarySetup=Dictionary setup +Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record +ErrorCodeCantContainZero=Code can't contain value 0 +DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +ConfirmAjax=Use Ajax confirmation popups +UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. +ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it +UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) +SearchFilter=Search filters options +NumberOfKeyToSearch=Nbr of characters to trigger search: %s +ViewFullDateActions=Show full dates events in the third sheet +NotAvailableWhenAjaxDisabled=Not available when Ajax disabled +JavascriptDisabled=JavaScript disabled +UsePopupCalendar=Use popup for dates input +UsePreviewTabs=Use preview tabs +ShowPreview=Show preview +PreviewNotAvailable=Preview not available +ThemeCurrentlyActive=Theme currently active +CurrentTimeZone=TimeZone PHP (server) +MySQLTimeZone=TimeZone MySql (database) +TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). +Space=Space +Table=Table +Fields=Fields +Index=Index +Mask=Mask +NextValue=Next value +NextValueForInvoices=Next value (invoices) +NextValueForCreditNotes=Next value (credit notes) +NextValueForDeposit=Next value (deposit) +NextValueForReplacements=Next value (replacements) +MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to %s %s, whatever this parameter's value is +NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration +MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload) +UseCaptchaCode=Use graphical code (CAPTCHA) on login page +UseAvToScanUploadedFiles=Use anti-virus to scan uploaded files +AntiVirusCommand= Full path to antivirus command +AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Example for ClamAv: /usr/bin/clamscan +AntiVirusParam= More parameters on command line +AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" +ComptaSetup=Accounting module setup +UserSetup=User management setup +MenuSetup=Menu management setup +MenuLimits=Limits and accuracy +MenuIdParent=Parent menu ID +DetailMenuIdParent=ID of parent menu (empty for a top menu) +DetailPosition=Sort number to define menu position +PersonalizedMenusNotSupported=Personalized menus not supported +AllMenus=All +NotConfigured=Module not configured +Setup=Setup +Activation=Activation +Active=Active +SetupShort=Setup +OtherOptions=Other options +OtherSetup=Other setup +CurrentValueSeparatorDecimal=Decimal separator +CurrentValueSeparatorThousand=Thousand separator +Destination=Destination +IdModule=Module ID +IdPermissions=Permissions ID +Modules=Modules +ModulesCommon=Main modules +ModulesOther=Other modules +ModulesInterfaces=Interfaces modules +ModulesSpecial=Modules very specific +ParameterInDolibarr=Parameter %s +LanguageParameter=Language parameter %s +LanguageBrowserParameter=Parameter %s +LocalisationDolibarrParameters=Localisation parameters +ClientTZ=Client Time Zone (user) +ClientHour=Client time (user) +OSTZ=Server OS Time Zone +PHPTZ=PHP server Time Zone +PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds) +ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds) +DaylingSavingTime=Daylight saving time +CurrentHour=PHP Time (server) +CompanyTZ=Company Time Zone (main company) +CompanyHour=Company Time (main company) +CurrentSessionTimeOut=Current session timeout +YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris" +OSEnv=OS Environment +Box=Box +Boxes=Boxes +MaxNbOfLinesForBoxes=Max number of lines for boxes +PositionByDefault=Default order +Position=Position +MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar). +MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.
Some modules add entries in the menus (in menu All in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module. +MenuForUsers=Menu for users +LangFile=.lang file +System=System +SystemInfo=System information +SystemTools=System tools +SystemToolsArea=System tools area +SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for. +Purge=Purge +PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in %s directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server. +PurgeDeleteLogFile=Delete log file %s defined for Syslog module (no risk to loose data) +PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data) +PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory %s. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted. +PurgeRunNow=Purge now +PurgeNothingToDelete=No directory or file to delete. +PurgeNDirectoriesDeleted=%s files or directories deleted. +PurgeAuditEvents=Purge all security events +ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed. +NewBackup=New backup +GenerateBackup=Generate backup +Backup=Backup +Restore=Restore +RunCommandSummary=Backup has been launched with the following command +RunCommandSummaryToLaunch=Backup can be launched with the following command +WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands +BackupResult=Backup result +BackupFileSuccessfullyCreated=Backup file successfully generated +YouCanDownloadBackupFile=Generated files can now be downloaded +NoBackupFileAvailable=No backup files available. +ExportMethod=Export method +ImportMethod=Import method +ToBuildBackupFileClickHere=To build a backup file, click here. +ImportMySqlDesc=To import a backup file, you must use mysql command from command line: +ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line: +ImportMySqlCommand=%s %s < mybackupfile.sql +ImportPostgreSqlCommand=%s %s mybackupfile.sql +FileNameToGenerate=File name to generate +Compression=Compression +CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import +CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later +ExportCompatibility=Compatibility of generated export file +MySqlExportParameters=MySQL export parameters +PostgreSqlExportParameters= PostgreSQL export parameters +UseTransactionnalMode=Use transactional mode +FullPathToMysqldumpCommand=Full path to mysqldump command +FullPathToPostgreSQLdumpCommand=Full path to pg_dump command +ExportOptions=Export Options +AddDropDatabase=Add DROP DATABASE command +AddDropTable=Add DROP TABLE command +ExportStructure=Structure +Datas=Data +NameColumn=Name columns +ExtendedInsert=Extended INSERT +NoLockBeforeInsert=No lock commands around INSERT +DelayedInsert=Delayed insert +EncodeBinariesInHexa=Encode binary data in hexadecimal +IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE) +Yes=Yes +No=No +AutoDetectLang=Autodetect (browser language) +FeatureDisabledInDemo=Feature disabled in demo +Rights=Permissions +BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. +OnlyActiveElementsAreShown=Only elements from enabled modules are shown. +ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature. +ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services. +ModulesSpecialDesc=Special modules are very specific or seldom used modules. +ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for a particular business. +ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... +ModulesMarketPlaces=More modules... +DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) +WebSiteDesc=Web site providers you can search to find more modules... +URL=Link +BoxesAvailable=Boxes available +BoxesActivated=Boxes activated +ActivateOn=Activate on +ActiveOn=Activated on +SourceFile=Source file +AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled +AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled +AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled +Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only +Security=Security +Passwords=Passwords +DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) +MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended) +InstrucToEncodePass=To have password encoded into the conf.php file, replace the line
$dolibarr_main_db_pass="..."
by
$dolibarr_main_db_pass="crypted:%s" +InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line
$dolibarr_main_db_pass="crypted:..."
by
$dolibarr_main_db_pass="%s" +ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation) +ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices). +Feature=Feature +DolibarrLicense=License +DolibarrProjectLeader=Project leader +Developpers=Developers/contributors +OtherDeveloppers=Other developers/contributors +OfficialWebSite=Dolibarr international official web site +OfficialWebSiteFr=French official web site +OfficialWiki=Dolibarr documentation on Wiki +OfficialDemo=Dolibarr online demo +OfficialMarketPlace=Official market place for external modules/addons +OfficialWebHostingService=Referenced web hosting services (Cloud hosting) +ReferencedPreferredPartners=Preferred Partners +OtherResources=Autres ressources +ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),
take a look at the Dolibarr Wiki:
%s +ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:
%s +HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr. +HelpCenterDesc2=Some part of this service are available in english only. +CurrentTopMenuHandler=Current top menu handler +CurrentLeftMenuHandler=Current left menu handler +CurrentMenuHandler=Current menu handler +CurrentSmartphoneMenuHandler=Current smartphone menu handler +MeasuringUnit=Measuring unit +Emails=E-mails +EMailsSetup=E-mails setup +EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. +MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: %s) +MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s) +MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems) +MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems) +MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: %s) +MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent +MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to +MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to +MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos) +MAIN_MAIL_SENDMODE=Method to use to send EMails +MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required +MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required +MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt +MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos) +MAIN_SMS_SENDMODE=Method to use to send SMS +MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending +FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally. +SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on www.dolibarr.org forum. +ModuleSetup=Module setup +ModulesSetup=Modules setup +ModuleFamilyBase=System +ModuleFamilyCrm=Customer Relation Management (CRM) +ModuleFamilyProducts=Products Management +ModuleFamilyHr=Human Resource Management +ModuleFamilyProjects=Projects/Collaborative work +ModuleFamilyOther=Other +ModuleFamilyTechnic=Multi-modules tools +ModuleFamilyExperimental=Experimental modules +ModuleFamilyFinancial=Financial Modules (Accounting/Treasury) +ModuleFamilyECM=Electronic Content Management (ECM) +MenuHandlers=Menu handlers +MenuAdmin=Menu editor +DoNotUseInProduction=Do not use in production +ThisIsProcessToFollow=This is setup to process: +StepNb=Step %s +FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s). +DownloadPackageFromWebSite=Download package %s. +UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory %s +SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component. +NotExistsDirect=The alternative root directory is not defined.
+InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).
+InfDirExample=
Then declare it in the file conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*These lines are commented with "#", to uncomment only remove the character. +YouCanSubmitFile=Select module: +CurrentVersion=Dolibarr current version +CallUpdatePage=Go to the page that updates the database structure and datas: %s. +LastStableVersion=Last stable version +UpdateServerOffline=Update server offline +GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask.
{000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s.
{000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required.
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
+GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
{tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
+GenericMaskCodes3=All other characters in the mask will remain intact.
Spaces are not allowed.
+GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany done 2007-01-31:
+GenericMaskCodes4b=Example on third party created on 2007-03-01:
+GenericMaskCodes4c=Example on product created on 2007-03-01:
+GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX +GenericNumRefModelDesc=Returns a customizable number according to a defined mask. +ServerAvailableOnIPOrPort=Server is available at address %s on port %s +ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s +DoTestServerAvailability=Test server connectivity +DoTestSend=Test sending +DoTestSendHTML=Test sending HTML +ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask. +ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask. +UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system. +UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).
It must be the octal value (for example, 0666 means read and write for everyone).
This parameter is useless on a Windows server. +SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation +UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache) +DisableLinkToHelpCenter=Hide link "Need help or support" on login page +DisableLinkToHelp=Hide link "%s Online help" on left menu +AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea. +ModuleDisabled=Module disabled +ModuleDisabledSoNoEvent=Module disabled so event never created +ConfirmPurge=Are you sure you want to execute this purge ?
This will delete definitely all your data files with no way to restore them (ECM files, attached files...). +MinLength=Minimum length +LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory +ExamplesWithCurrentSetup=Examples with current running setup +ListOfDirectories=List of OpenDocument templates directories +ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. +NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories +ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: +FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template +FirstnameNamePosition=Position of Name/Lastname +DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values: +KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices) +TestSubmitForm=Input test form +ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours. +ThemeDir=Skins directory +ConnectionTimeout=Connexion timeout +ResponseTimeout=Response timeout +SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__ +ModuleMustBeEnabledFirst=Module %s must be enabled first before using this feature. +SecurityToken=Key to secure URLs +NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s +PDF=PDF +PDFDesc=You can set each global options related to the PDF generation +PDFAddressForging=Rules to forge address boxes +HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF +HideDescOnPDF=Hide products description on generated PDF +HideRefOnPDF=Hide products ref. on generated PDF +HideDetailsOnPDF=Hide products lines details on generated PDF +Library=Library +UrlGenerationParameters=Parameters to secure URLs +SecurityTokenIsUnique=Use a unique securekey parameter for each URL +EnterRefToBuildUrl=Enter reference for object %s +GetSecuredUrl=Get calculated URL +ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons +OldVATRates=Old VAT rate +NewVATRates=New VAT rate +PriceBaseTypeToChange=Modify on prices with base reference value defined on +MassConvert=Launch mass convert +String=String +TextLong=Long text +Int=Integer +Float=Float +DateAndTime=Date and hour +Unique=Unique +Boolean=Boolean (Checkbox) +ExtrafieldPhone = Phone +ExtrafieldPrice = Price +ExtrafieldMail = Email +ExtrafieldSelect = Select list +ExtrafieldSelectList = Select from table +ExtrafieldSeparator=Separator +ExtrafieldCheckBox=Checkbox +ExtrafieldRadio=Radio button +ExtrafieldCheckBoxFromList= Checkbox from table +ExtrafieldParamHelpselect=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key +ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... +ExtrafieldParamHelpradio=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... +ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +LibraryToBuildPDF=Library used to build PDF +WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' +LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax) +SMS=SMS +LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s +RefreshPhoneLink=Refresh link +LinkToTest=Clickable link generated for user %s (click phone number to test) +KeepEmptyToUseDefault=Keep empty to use default value +DefaultLink=Default link +ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) +ExternalModule=External module - Installed into directory %s +BarcodeInitForThirdparties=Mass barcode init for thirdparties +BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services +CurrentlyNWithoutBarCode=Currently, you have %s records on %s %s without barcode defined. +InitEmptyBarCode=Init value for next %s empty records +EraseAllCurrentBarCode=Erase all current barcode values +ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ? +AllBarcodeReset=All barcode values have been removed +NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup. +NoRecordWithoutBarcodeDefined=No record with no barcode value defined. + +# Modules +Module0Name=Users & groups +Module0Desc=Users and groups management +Module1Name=Third parties +Module1Desc=Companies and contact management (customers, prospects...) +Module2Name=Commercial +Module2Desc=Commercial management +Module10Name=Accounting +Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching. +Module20Name=Proposals +Module20Desc=Commercial proposal management +Module22Name=Mass E-mailings +Module22Desc=Mass E-mailing management +Module23Name= Energy +Module23Desc= Monitoring the consumption of energies +Module25Name=Customer Orders +Module25Desc=Customer order management +Module30Name=Invoices +Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers +Module40Name=Suppliers +Module40Desc=Supplier management and buying (orders and invoices) +Module42Name=Logs +Module42Desc=Logging facilities (file, syslog, ...) +Module49Name=Editors +Module49Desc=Editor management +Module50Name=Products +Module50Desc=Product management +Module51Name=Mass mailings +Module51Desc=Mass paper mailing management +Module52Name=Stocks +Module52Desc=Stock management (products) +Module53Name=Services +Module53Desc=Service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) +Module55Name=Barcodes +Module55Desc=Barcode management +Module56Name=Telephony +Module56Desc=Telephony integration +Module57Name=Standing orders +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. +Module58Name=ClickToDial +Module58Desc=Integration of a ClickToDial system (Asterisk, ...) +Module59Name=Bookmark4u +Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account +Module70Name=Interventions +Module70Desc=Intervention management +Module75Name=Expense and trip notes +Module75Desc=Expense and trip notes management +Module80Name=Shipments +Module80Desc=Shipments and delivery order management +Module85Name=Banks and cash +Module85Desc=Management of bank or cash accounts +Module100Name=External site +Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame +Module105Name=Mailman and SPIP +Module105Desc=Mailman or SPIP interface for member module +Module200Name=LDAP +Module200Desc=LDAP directory synchronisation +Module210Name=PostNuke +Module210Desc=PostNuke integration +Module240Name=Data exports +Module240Desc=Tool to export Dolibarr datas (with assistants) +Module250Name=Data imports +Module250Desc=Tool to import datas in Dolibarr (with assistants) +Module310Name=Members +Module310Desc=Foundation members management +Module320Name=RSS Feed +Module320Desc=Add RSS feed inside Dolibarr screen pages +Module330Name=Bookmarks +Module330Desc=Bookmark management +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module410Name=Webcalendar +Module410Desc=Webcalendar integration +Module500Name=Special expenses (tax, social contributions, dividends) +Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries +Module510Name=Salaries +Module510Desc=Management of employees salaries and payments +Module600Name=Notifications +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) +Module700Name=Donations +Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices +Module1200Name=Mantis +Module1200Desc=Mantis integration +Module1400Name=Accounting +Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation +Module1780Name=Categories +Module1780Desc=Category management (products, suppliers and customers) +Module2000Name=WYSIWYG editor +Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices +Module2300Name=Cron +Module2300Desc=Scheduled task management +Module2400Name=Agenda +Module2400Desc=Events/tasks and agenda management +Module2500Name=Electronic Content Management +Module2500Desc=Save and share documents +Module2600Name=WebServices +Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) +Module2700Name=Gravatar +Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access +Module2800Desc=FTP Client +Module2900Name=GeoIPMaxmind +Module2900Desc=GeoIP Maxmind conversions capabilities +Module3100Name=Skype +Module3100Desc=Add a Skype button into card of adherents / third parties / contacts +Module5000Name=Multi-company +Module5000Desc=Allows you to manage multiple companies +Module6000Name=Workflow +Module6000Desc=Workflow management +Module20000Name=Leave Requests management +Module20000Desc=Declare and follow employees leaves requests +Module39000Name=Product batch +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products +Module50000Name=PayBox +Module50000Desc=Module to offer an online payment page by credit card with PayBox +Module50100Name=Point of sales +Module50100Desc=Point of sales module +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal +Module50400Name=Accounting (advanced) +Module50400Desc=Accounting management (double parties) +Module54000Name=PrintIPP +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). +Module55000Name=Open Poll +Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) +Module59000Name=Margins +Module59000Desc=Module to manage margins +Module60000Name=Commissions +Module60000Desc=Module to manage commissions +Module150010Name=Batch number, eat-by date and sell-by date +Module150010Desc=batch number, eat-by date and sell-by date management for product +Permission11=Read customer invoices +Permission12=Create/modify customer invoices +Permission13=Unvalidate customer invoices +Permission14=Validate customer invoices +Permission15=Send customer invoices by email +Permission16=Create payments for customer invoices +Permission19=Delete customer invoices +Permission21=Read commercial proposals +Permission22=Create/modify commercial proposals +Permission24=Validate commercial proposals +Permission25=Send commercial proposals +Permission26=Close commercial proposals +Permission27=Delete commercial proposals +Permission28=Export commercial proposals +Permission31=Read products +Permission32=Create/modify products +Permission34=Delete products +Permission36=See/manage hidden products +Permission38=Export products +Permission41=Read projects (shared project and projects i'm contact for) +Permission42=Create/modify projects (shared project and projects i'm contact for) +Permission44=Delete projects (shared project and projects i'm contact for) +Permission61=Read interventions +Permission62=Create/modify interventions +Permission64=Delete interventions +Permission67=Export interventions +Permission71=Read members +Permission72=Create/modify members +Permission74=Delete members +Permission75=Setup types of membership +Permission76=Export datas +Permission78=Read subscriptions +Permission79=Create/modify subscriptions +Permission81=Read customers orders +Permission82=Create/modify customers orders +Permission84=Validate customers orders +Permission86=Send customers orders +Permission87=Close customers orders +Permission88=Cancel customers orders +Permission89=Delete customers orders +Permission91=Read social contributions and vat +Permission92=Create/modify social contributions and vat +Permission93=Delete social contributions and vat +Permission94=Export social contributions +Permission95=Read reports +Permission101=Read sendings +Permission102=Create/modify sendings +Permission104=Validate sendings +Permission106=Export sendings +Permission109=Delete sendings +Permission111=Read financial accounts +Permission112=Create/modify/delete and compare transactions +Permission113=Setup financial accounts (create, manage categories) +Permission114=Reconciliate transactions +Permission115=Export transactions and account statements +Permission116=Transfers between accounts +Permission117=Manage cheques dispatching +Permission121=Read third parties linked to user +Permission122=Create/modify third parties linked to user +Permission125=Delete third parties linked to user +Permission126=Export third parties +Permission141=Read projects (also private i am not contact for) +Permission142=Create/modify projects (also private i am not contact for) +Permission144=Delete projects (also private i am not contact for) +Permission146=Read providers +Permission147=Read stats +Permission151=Read standing orders +Permission152=Create/modify a standing orders request +Permission153=Transmission standing orders receipts +Permission154=Credit/refuse standing orders receipts +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses +Permission180=Read suppliers +Permission181=Read supplier orders +Permission182=Create/modify supplier orders +Permission183=Validate supplier orders +Permission184=Approve supplier orders +Permission185=Order or cancel supplier orders +Permission186=Receive supplier orders +Permission187=Close supplier orders +Permission188=Cancel supplier orders +Permission192=Create lines +Permission193=Cancel lines +Permission194=Read the bandwith lines +Permission202=Create ADSL connections +Permission203=Order connections orders +Permission204=Order connections +Permission205=Manage connections +Permission206=Read connections +Permission211=Read Telephony +Permission212=Order lines +Permission213=Activate line +Permission214=Setup Telephony +Permission215=Setup providers +Permission221=Read emailings +Permission222=Create/modify emailings (topic, recipients...) +Permission223=Validate emailings (allows sending) +Permission229=Delete emailings +Permission237=View recipients and info +Permission238=Manually send mailings +Permission239=Delete mailings after validation or sent +Permission241=Read categories +Permission242=Create/modify categories +Permission243=Delete categories +Permission244=See the contents of the hidden categories +Permission251=Read other users and groups +PermissionAdvanced251=Read other users +Permission252=Read permissions of other users +Permission253=Create/modify other users, groups and permisssions +PermissionAdvanced253=Create/modify internal/external users and permissions +Permission254=Create/modify external users only +Permission255=Modify other users password +Permission256=Delete or disable other users +Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves). +Permission271=Read CA +Permission272=Read invoices +Permission273=Issue invoices +Permission281=Read contacts +Permission282=Create/modify contacts +Permission283=Delete contacts +Permission286=Export contacts +Permission291=Read tariffs +Permission292=Set permissions on the tariffs +Permission293=Modify costumers tariffs +Permission300=Read bar codes +Permission301=Create/modify bar codes +Permission302=Delete bar codes +Permission311=Read services +Permission312=Assign service/subscription to contract +Permission331=Read bookmarks +Permission332=Create/modify bookmarks +Permission333=Delete bookmarks +Permission341=Read its own permissions +Permission342=Create/modify his own user information +Permission343=Modify his own password +Permission344=Modify its own permissions +Permission351=Read groups +Permission352=Read groups permissions +Permission353=Create/modify groups +Permission354=Delete or disable groups +Permission358=Export users +Permission401=Read discounts +Permission402=Create/modify discounts +Permission403=Validate discounts +Permission404=Delete discounts +Permission510=Read Salaries +Permission512=Create/modify salaries +Permission514=Delete salaries +Permission517=Export salaries +Permission531=Read services +Permission532=Create/modify services +Permission534=Delete services +Permission536=See/manage hidden services +Permission538=Export services +Permission701=Read donations +Permission702=Create/modify donations +Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports +Permission1001=Read stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses +Permission1004=Read stock movements +Permission1005=Create/modify stock movements +Permission1101=Read delivery orders +Permission1102=Create/modify delivery orders +Permission1104=Validate delivery orders +Permission1109=Delete delivery orders +Permission1181=Read suppliers +Permission1182=Read supplier orders +Permission1183=Create/modify supplier orders +Permission1184=Validate supplier orders +Permission1185=Approve supplier orders +Permission1186=Order supplier orders +Permission1187=Acknowledge receipt of supplier orders +Permission1188=Delete supplier orders +Permission1201=Get result of an export +Permission1202=Create/Modify an export +Permission1231=Read supplier invoices +Permission1232=Create/modify supplier invoices +Permission1233=Validate supplier invoices +Permission1234=Delete supplier invoices +Permission1235=Send supplier invoices by email +Permission1236=Export supplier invoices, attributes and payments +Permission1237=Export supplier orders and their details +Permission1251=Run mass imports of external data into database (data load) +Permission1321=Export customer invoices, attributes and payments +Permission1421=Export customer orders and attributes +Permission23001 = Read Scheduled task +Permission23002 = Create/update Scheduled task +Permission23003 = Delete Scheduled task +Permission23004 = Execute Scheduled task +Permission2401=Read actions (events or tasks) linked to his account +Permission2402=Create/modify actions (events or tasks) linked to his account +Permission2403=Delete actions (events or tasks) linked to his account +Permission2411=Read actions (events or tasks) of others +Permission2412=Create/modify actions (events or tasks) of others +Permission2413=Delete actions (events or tasks) of others +Permission2501=Read/Download documents +Permission2502=Download documents +Permission2503=Submit or delete documents +Permission2515=Setup documents directories +Permission2801=Use FTP client in read mode (browse and download only) +Permission2802=Use FTP client in write mode (delete or upload files) +Permission50101=Use Point of sales +Permission50201=Read transactions +Permission50202=Import transactions +Permission54001=Print +Permission55001=Read polls +Permission55002=Create/modify polls +Permission59001=Read commercial margins +Permission59002=Define commercial margins +Permission59003=Read every user margin +DictionaryCompanyType=Thirdparties type +DictionaryCompanyJuridicalType=Juridical kinds of thirdparties +DictionaryProspectLevel=Prospect potential level +DictionaryCanton=State/Cantons +DictionaryRegion=Regions +DictionaryCountry=Countries +DictionaryCurrency=Currencies +DictionaryCivility=Civility title +DictionaryActions=Type of agenda events +DictionarySocialContributions=Social contributions types +DictionaryVAT=VAT Rates or Sales Tax Rates +DictionaryRevenueStamp=Amount of revenue stamps +DictionaryPaymentConditions=Payment terms +DictionaryPaymentModes=Payment modes +DictionaryTypeContact=Contact/Address types +DictionaryEcotaxe=Ecotax (WEEE) +DictionaryPaperFormat=Paper formats +DictionaryFees=Type of fees +DictionarySendingMethods=Shipping methods +DictionaryStaff=Staff +DictionaryAvailability=Delivery delay +DictionaryOrderMethods=Ordering methods +DictionarySource=Origin of proposals/orders +DictionaryAccountancyplan=Chart of accounts +DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates +SetupSaved=Setup saved +BackToModuleList=Back to modules list +BackToDictionaryList=Back to dictionaries list +VATReceivedOnly=Special rate not charged +VATManagement=VAT Management +VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to VAT, then VAT by default=0. End of rule.
If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule.
If seller and buyer in the European Community and goods are transport products (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.
If seller and buyer in the European Community and buyer is not a company, then the VAT by default=VAT of product sold. End of rule.
If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.
Else the proposed default VAT=0. End of rule. +VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies. +VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. +VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices. +##### Local Taxes ##### +LTRate=Rate +LocalTax1IsUsed=Use second tax +LocalTax1IsNotUsed=Do not use second tax +LocalTax1IsUsedDesc=Use a second type of tax (other than VAT) +LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT) +LocalTax1Management=Second type of tax +LocalTax1IsUsedExample= +LocalTax1IsNotUsedExample= +LocalTax2IsUsed=Use third tax +LocalTax2IsNotUsed=Do not use third tax +LocalTax2IsUsedDesc=Use a third type of tax (other than VAT) +LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT) +LocalTax2Management=Third type of tax +LocalTax2IsUsedExample= +LocalTax2IsNotUsedExample= +LocalTax1ManagementES= RE Management +LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If te buyer is not subjected to RE, RE by default=0. End of rule.
If the buyer is subjected to RE then the RE by default. End of rule.
+LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule. +LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE. +LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE. +LocalTax2ManagementES= IRPF Management +LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.
If the seller is subjected to IRPF then the IRPF by default. End of rule.
+LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule. +LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules. +LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules. +CalcLocaltax=Reports +CalcLocaltax1ES=Sales - Purchases +CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases +CalcLocaltax2ES=Purchases +CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases +CalcLocaltax3ES=Sales +CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales +LabelUsedByDefault=Label used by default if no translation can be found for code +LabelOnDocuments=Label on documents +NbOfDays=Nb of days +AtEndOfMonth=At end of month +Offset=Offset +AlwaysActive=Always active +UpdateRequired=Your system needs to be updated. To do this, click on Update now. +Upgrade=Upgrade +MenuUpgrade=Upgrade / Extend +AddExtensionThemeModuleOrOther=Add extension (theme, module, ...) +WebServer=Web server +DocumentRootServer=Web server's root directory +DataRootServer=Data files directory +IP=IP +Port=Port +VirtualServerName=Virtual server name +AllParameters=All parameters +OS=OS +PhpEnv=Env +PhpModules=Modules +PhpConf=Conf +PhpWebLink=Web-Php link +Pear=Pear +PearPackages=Pear Packages +Browser=Browser +Server=Server +Database=Database +DatabaseServer=Database host +DatabaseName=Database name +DatabasePort=Database port +DatabaseUser=Database user +DatabasePassword=Database password +DatabaseConfiguration=Database setup +Tables=Tables +TableName=Table name +TableLineFormat=Line format +NbOfRecord=Nb of records +Constraints=Constraints +ConstraintsType=Constraints type +ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry +AllMustBeOk=All of these must be checked +Host=Server +DriverType=Driver type +SummarySystem=System information summary +SummaryConst=List of all Dolibarr setup parameters +SystemUpdate=System update +SystemSuccessfulyUpdate=Your system has been updated successfuly +MenuCompanySetup=Company/Foundation +MenuNewUser=New user +MenuTopManager=Top menu manager +MenuLeftManager=Left menu manager +MenuManager=Menu manager +MenuSmartphoneManager=Smartphone menu manager +DefaultMenuTopManager=Top menu manager +DefaultMenuLeftManager=Left menu manager +DefaultMenuManager= Standard menu manager +DefaultMenuSmartphoneManager=Smartphone menu manager +Skin=Skin theme +DefaultSkin=Default skin theme +MaxSizeList=Max length for list +DefaultMaxSizeList=Default max length for list +MessageOfDay=Message of the day +MessageLogin=Login page message +PermanentLeftSearchForm=Permanent search form on left menu +DefaultLanguage=Default language to use (language code) +EnableMultilangInterface=Enable multilingual interface +EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) +SystemSuccessfulyUpdated=Your system has been updated successfully +CompanyInfo=Company/foundation information +CompanyIds=Company/foundation identities +CompanyName=Name +CompanyAddress=Address +CompanyZip=Zip +CompanyTown=Town +CompanyCountry=Country +CompanyCurrency=Main currency +Logo=Logo +DoNotShow=Do not show +DoNotSuggestPaymentMode=Do not suggest +NoActiveBankAccountDefined=No active bank account defined +OwnerOfBankAccount=Owner of bank account %s +BankModuleNotActive=Bank accounts module not enabled +ShowBugTrackLink=Show link "Report a bug" +ShowWorkBoard=Show "workbench" on homepage +Alerts=Alerts +Delays=Delays +DelayBeforeWarning=Delay before warning +DelaysBeforeWarning=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. +Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events not yet realised +Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not yet processed +Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not yet processed +Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close +Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed +Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate +Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services +Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices +Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices +Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation +Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee +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. +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 Setup -> Company/foundation are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country). +SetupDescription4=Parameters in menu Setup -> Modules are required because Dolibarr is not a fixed ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in menus. +SetupDescription5=Other menu entries manage optional parameters. +EventsSetup=Setup for events logs +LogEvents=Security audit events +Audit=Audit +InfoDolibarr=Infos Dolibarr +InfoBrowser=Infos Browser +InfoOS=Infos OS +InfoWebServer=Infos web server +InfoDatabase=Infos database +InfoPHP=Infos PHP +InfoPerf=Infos performances +BrowserName=Browser name +BrowserOS=Browser OS +ListEvents=Audit events +ListOfSecurityEvents=List of Dolibarr security events +SecurityEventsPurged=Security events purged +LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu System tools - Audit. Warning, this feature can consume a large amount of data in database. +AreaForAdminOnly=Those features can be used by administrator users only. +SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only. +SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit. +CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page) +DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here +AvailableModules=Available modules +ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules). +SessionTimeOut=Time out for session +SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every %s/%s access, but only during access made by other sessions.
Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default session.gc_maxlifetime, no matter what the value entered here. +TriggersAvailable=Available triggers +TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory htdocs/core/triggers. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...). +TriggerDisabledByName=Triggers in this file are disabled by the -NORUN suffix in their name. +TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module %s is disabled. +TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules. +TriggerActiveAsModuleActive=Triggers in this file are active as module %s is enabled. +GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password +DictionaryDesc=Define here all reference datas. You can complete predefined value with yours. +ConstDesc=This page allows you to edit all other parameters not available in previous pages. They are reserved parameters for advanced developers or for troubleshouting. +OnceSetupFinishedCreateUsers=Warning, you are a Dolibarr administrator user. Administrator users are used to setup Dolibarr. For a usual usage of Dolibarr, it is recommended to use a non administrator user created from Users & Groups menu. +MiscellaneousDesc=Define here all other parameters related to security. +LimitsSetup=Limits/Precision setup +LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here +MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices +MAIN_MAX_DECIMALS_TOT=Max decimals for total prices +MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add ... after this number if you want to see ... when number is truncated when shown on screen) +MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files. +MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10) +UnitPriceOfProduct=Net unit price of a product +TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding +ParameterActiveForNextInputOnly=Parameter effective for next input only +NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page. +NoEventFoundWithCriteria=No security event has been found for such search criterias. +SeeLocalSendMailSetup=See your local sendmail setup +BackupDesc=To make a complete backup of Dolibarr, you must: +BackupDesc2=* Save content of documents directory (%s) that contains all uploaded and generated files (you can make a zip for example). +BackupDesc3=* Save content of your database into a dump file. For this, you can use following assistant. +BackupDescX=Archived directory should be stored in a secure place. +BackupDescY=The generated dump file should be stored in a secure place. +BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one +RestoreDesc=To restore a Dolibarr backup, you must: +RestoreDesc2=* Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s). +RestoreDesc3=* Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation. Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant. +RestoreMySQL=MySQL import +ForcedToByAModule= This rule is forced to %s by an activated module +PreviousDumpFiles=Available database backup dump files +WeekStartOnDay=First day of week +RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s) +YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s or you must add -W option at end of command line to provide %s password. +YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP +DownloadMoreSkins=More skins to download +SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset +ShowProfIdInAddress=Show professionnal id with addresses on documents +ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents +TranslationUncomplete=Partial translation +SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/. +MenuUseLayout=Make vertical menu hidable (option javascript must not be disabled) +MAIN_DISABLE_METEO=Disable meteo view +TestLoginToAPI=Test login to API +ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it. +ExternalAccess=External access +MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet) +MAIN_PROXY_HOST=Name/Address of proxy server +MAIN_PROXY_PORT=Port of proxy server +MAIN_PROXY_USER=Login to use the proxy server +MAIN_PROXY_PASS=Password to use the proxy server +DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. +ExtraFields=Complementary attributes +ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) +ExtraFieldsThirdParties=Complementary attributes (thirdparty) +ExtraFieldsContacts=Complementary attributes (contact/address) +ExtraFieldsMember=Complementary attributes (member) +ExtraFieldsMemberType=Complementary attributes (member type) +ExtraFieldsCustomerOrders=Complementary attributes (orders) +ExtraFieldsCustomerInvoices=Complementary attributes (invoices) +ExtraFieldsSupplierOrders=Complementary attributes (orders) +ExtraFieldsSupplierInvoices=Complementary attributes (invoices) +ExtraFieldsProject=Complementary attributes (projects) +ExtraFieldsProjectTask=Complementary attributes (tasks) +ExtraFieldHasWrongValue=Attribute %s has a wrong value. +AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space +AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space +SendingMailSetup=Setup of sendings by email +SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba). +PathToDocuments=Path to documents +PathDirectory=Directory +SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages. +TranslationSetup=Configuration de la traduction +TranslationDesc=Choice of language visible on screen can be modified:
* Globally from menu Home - Setup - Display
* For user only from tab User display of user card (click on login on top of screen). +TotalNumberOfActivatedModules=Total number of activated feature modules: %s +YouMustEnableOneModule=You must at least enable 1 module +ClassNotFoundIntoPathWarning=Class %s not found into PHP path +YesInSummer=Yes in summer +OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): +SuhosinSessionEncrypt=Session storage encrypted by Suhosin +ConditionIsCurrently=Condition is currently %s +YouUseBestDriver=You use driver %s that is best driver available currently. +YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. +NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. +SearchOptim=Search optimization +YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response. +BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance. +BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari. +XDebugInstalled=XDebug is loaded. +XCacheInstalled=XCache is loaded. +AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp". +FieldEdition=Edition of field %s +FixTZ=TimeZone fix +FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) +GetBarCode=Get barcode +EmptyNumRefModelDesc=The code is free. This code can be modified at any time. +##### Module password generation +PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. +PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually. +##### Users setup ##### +UserGroupSetup=Users and groups module setup +GeneratePassword=Suggest a generated password +RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords +DoNotSuggest=Do not suggest any password +EncryptedPasswordInDatabase=To allow the encryption of the passwords in the database +DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page +UsersSetup=Users module setup +UserMailRequired=EMail required to create a new user +##### Company setup ##### +CompanySetup=Companies module setup +CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier) +AccountCodeManager=Module for accountancy code generation (customer or supplier) +ModuleCompanyCodeAquarium=Return an accountancy code built by:
%s followed by third party supplier code for a supplier accountancy code,
%s followed by third party customer code for a customer accountancy code. +ModuleCompanyCodePanicum=Return an empty accountancy code. +ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. +UseNotifications=Use notifications +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* or by setting a global target email address on module setup page. +ModelModules=Documents templates +DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) +WatermarkOnDraft=Watermark on draft document +JSOnPaimentBill=Activate feature to autofill payment lines on payment form +CompanyIdProfChecker=Rules on Professional Ids +MustBeUnique=Must be unique ? +MustBeMandatory=Mandatory to create third parties ? +MustBeInvoiceMandatory=Mandatory to validate invoices ? +Miscellaneous=Miscellaneous +##### Webcal setup ##### +WebCalSetup=Webcalendar link setup +WebCalSyncro=Add Dolibarr events to WebCalendar +WebCalAllways=Always, no asking +WebCalYesByDefault=On demand (yes by default) +WebCalNoByDefault=On demand (no by default) +WebCalNever=Never +WebCalURL=URL for calendar access +WebCalServer=Server hosting calendar database +WebCalDatabaseName=Database name +WebCalUser=User to access database +WebCalSetupSaved=Webcalendar setup saved successfully. +WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. +WebCalTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. +WebCalTestKo2=Connection to server '%s' with user '%s' failed. +WebCalErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Webcalendar database. +WebCalAddEventOnCreateActions=Add calendar event on actions create +WebCalAddEventOnCreateCompany=Add calendar event on companies create +WebCalAddEventOnStatusPropal=Add calendar event on commercial proposals status change +WebCalAddEventOnStatusContract=Add calendar event on contracts status change +WebCalAddEventOnStatusBill=Add calendar event on bills status change +WebCalAddEventOnStatusMember=Add calendar event on members status change +WebCalUrlForVCalExport=An export link to %s format is available at following link: %s +WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct. +##### Invoices ##### +BillsSetup=Invoices module setup +BillsDate=Invoices date +BillsNumberingModule=Invoices and credit notes numbering model +BillsPDFModules=Invoice documents models +CreditNoteSetup=Credit note module setup +CreditNotePDFModules=Credit note document models +CreditNote=Credit note +CreditNotes=Credit notes +ForceInvoiceDate=Force invoice date to validation date +DisableRepeatable=Disable repeatable invoices +SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice +EnableEditDeleteValidInvoice=Enable the possibility to edit/delete valid invoice with no payment +SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account +SuggestPaymentByChequeToAddress=Suggest payment by cheque to +FreeLegalTextOnInvoices=Free text on invoices +WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty) +##### Proposals ##### +PropalSetup=Commercial proposals module setup +CreateForm=Create forms +NumberOfProductLines=Number of product lines +ProposalsNumberingModules=Commercial proposal numbering models +ProposalsPDFModules=Commercial proposal documents models +ClassifiedInvoiced=Classified invoiced +HideTreadedPropal=Hide the treated commercial proposals in the list +AddShippingDateAbility=Add shipping date ability +AddDeliveryAddressAbility=Add delivery date ability +UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option +FreeLegalTextOnProposal=Free text on commercial proposals +WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### Orders ##### +OrdersSetup=Order management setup +OrdersNumberingModules=Orders numbering models +OrdersModelModule=Order documents models +HideTreadedOrders=Hide the treated or cancelled orders in the list +ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order +FreeLegalTextOnOrders=Free text on orders +WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable +BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order +##### Clicktodial ##### +ClickToDialSetup=Click To Dial module setup +ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
__PHONETO__ that will be replaced with the phone number of person to call
__PHONEFROM__ that will be replaced with phone number of calling person (yours)
__LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
__PASS__ that will be replaced with your clicktodial password (defined on your user card). +##### Bookmark4u ##### +Bookmark4uSetup=Bookmark4u module setup +##### Interventions ##### +InterventionsSetup=Interventions module setup +FreeLegalTextOnInterventions=Free text on intervention documents +FicheinterNumberingModules=Intervention numbering models +TemplatePDFInterventions=Intervention card documents models +WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) +##### Contracts ##### +ContractsSetup=Contracts/Subscriptions module setup +ContractsNumberingModules=Contracts numbering modules +TemplatePDFContracts=Contracts documents models +FreeLegalTextOnContracts=Free text on contracts +WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) +##### Members ##### +MembersSetup=Members module setup +MemberMainOptions=Main options +AddSubscriptionIntoAccount=Suggest by default to create a bank transaction, in bank module, when adding a new payed subscription +AdherentLoginRequired= Manage a Login for each member +AdherentMailRequired=EMail required to create a new member +MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default +##### LDAP setup ##### +LDAPSetup=LDAP Setup +LDAPGlobalParameters=Global parameters +LDAPUsersSynchro=Users +LDAPGroupsSynchro=Groups +LDAPContactsSynchro=Contacts +LDAPMembersSynchro=Members +LDAPSynchronization=LDAP synchronisation +LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP +LDAPToDolibarr=LDAP -> Dolibarr +DolibarrToLDAP=Dolibarr -> LDAP +LDAPNamingAttribute=Key in LDAP +LDAPSynchronizeUsers=Organization of users in LDAP +LDAPSynchronizeGroups=Organization of groups in LDAP +LDAPSynchronizeContacts=Organization of contacts in LDAP +LDAPSynchronizeMembers=Organization of foundation's members in LDAP +LDAPTypeExample=OpenLdap, Egroupware or Active Directory +LDAPPrimaryServer=Primary server +LDAPSecondaryServer=Secondary server +LDAPServerPort=Server port +LDAPServerPortExample=Default port : 389 +LDAPServerProtocolVersion=Protocol version +LDAPServerUseTLS=Use TLS +LDAPServerUseTLSExample=Your LDAP server use TLS +LDAPServerDn=Server DN +LDAPAdminDn=Administrator DN +LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com) +LDAPPassword=Administrator password +LDAPUserDn=Users' DN +LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com) +LDAPGroupDn=Groups' DN +LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com) +LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) +LDAPServerDnExample=Complete DN (ex: dc=example,dc=com) +LDAPPasswordExample=Admin password +LDAPDnSynchroActive=Users and groups synchronization +LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization +LDAPDnContactActive=Contacts' synchronization +LDAPDnContactActiveYes=Activated synchronization +LDAPDnContactActiveExample=Activated/Unactivated synchronization +LDAPDnMemberActive=Members' synchronization +LDAPDnMemberActiveExample=Activated/Unactivated synchronization +LDAPContactDn=Dolibarr contacts' DN +LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com) +LDAPMemberDn=Dolibarr members DN +LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com) +LDAPMemberObjectClassList=List of objectClass +LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPUserObjectClassList=List of objectClass +LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPGroupObjectClassList=List of objectClass +LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames) +LDAPContactObjectClassList=List of objectClass +LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPMemberTypeDn=Dolibarr members type DN +LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=example,dc=com) +LDAPTestConnect=Test LDAP connection +LDAPTestSynchroContact=Test contacts synchronization +LDAPTestSynchroUser=Test user synchronization +LDAPTestSynchroGroup=Test group synchronization +LDAPTestSynchroMember=Test member synchronization +LDAPTestSearch= Test a LDAP search +LDAPSynchroOK=Synchronization test successful +LDAPSynchroKO=Failed synchronization test +LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates +LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s) +LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s) +LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPUnbindSuccessfull=Disconnect successful +LDAPUnbindFailed=Disconnect failed +LDAPConnectToDNSuccessfull=Connection to DN (%s) successful +LDAPConnectToDNFailed=Connection to DN (%s) failed +LDAPSetupForVersion3=LDAP server configured for version 3 +LDAPSetupForVersion2=LDAP server configured for version 2 +LDAPDolibarrMapping=Dolibarr Mapping +LDAPLdapMapping=LDAP Mapping +LDAPFieldLoginUnix=Login (unix) +LDAPFieldLoginExample=Example : uid +LDAPFilterConnection=Search filter +LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson) +LDAPFieldLoginSamba=Login (samba, activedirectory) +LDAPFieldLoginSambaExample=Example : samaccountname +LDAPFieldFullname=Full name +LDAPFieldFullnameExample=Example : cn +LDAPFieldPassword=Password +LDAPFieldPasswordNotCrypted=Password not crypted +LDAPFieldPasswordCrypted=Password crypted +LDAPFieldPasswordExample=Example : userPassword +LDAPFieldCommonName=Common name +LDAPFieldCommonNameExample=Example : cn +LDAPFieldName=Name +LDAPFieldNameExample=Example : sn +LDAPFieldFirstName=First name +LDAPFieldFirstNameExample=Example : givenName +LDAPFieldMail=Email address +LDAPFieldMailExample=Example : mail +LDAPFieldPhone=Professional phone number +LDAPFieldPhoneExample=Example : telephonenumber +LDAPFieldHomePhone=Personal phone number +LDAPFieldHomePhoneExample=Example : homephone +LDAPFieldMobile=Cellular phone +LDAPFieldMobileExample=Example : mobile +LDAPFieldFax=Fax number +LDAPFieldFaxExample=Example : facsimiletelephonenumber +LDAPFieldAddress=Street +LDAPFieldAddressExample=Example : street +LDAPFieldZip=Zip +LDAPFieldZipExample=Example : postalcode +LDAPFieldTown=Town +LDAPFieldTownExample=Example : l +LDAPFieldCountry=Country +LDAPFieldCountryExample=Example : c +LDAPFieldDescription=Description +LDAPFieldDescriptionExample=Example : description +LDAPFieldGroupMembers= Group members +LDAPFieldGroupMembersExample= Example : uniqueMember +LDAPFieldBirthdate=Birthdate +LDAPFieldBirthdateExample=Example : +LDAPFieldCompany=Company +LDAPFieldCompanyExample=Example : o +LDAPFieldSid=SID +LDAPFieldSidExample=Example : objectsid +LDAPFieldEndLastSubscription=Date of subscription end +LDAPFieldTitle=Post/Function +LDAPFieldTitleExample=Example: title +LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPSetupNotComplete=LDAP setup not complete (go on others tabs) +LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode. +LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts. +LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users. +LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups. +LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module. +LDAPDescValues=Example values are designed for OpenLDAP with following loaded schemas: core.schema, cosine.schema, inetorgperson.schema). If you use thoose values and OpenLDAP, modify your LDAP config file slapd.conf to have all thoose schemas loaded. +ForANonAnonymousAccess=For an authenticated access (for a write access for example) +PerfDolibarr=Performance setup/optimizing report +YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance. +NotInstalled=Not installed, so your server is not slow down by this. +ApplicativeCache=Applicative cache +MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server. +MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete. +MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled. +OPCodeCache=OPCode cache +NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad). +HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript) +FilesOfTypeCached=Files of type %s are cached by HTTP server +FilesOfTypeNotCached=Files of type %s are not cached by HTTP server +FilesOfTypeCompressed=Files of type %s are compressed by HTTP server +FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server +CacheByServer=Cache by server +CacheByClient=Cache by browser +CompressionOfResources=Compression of HTTP responses +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +##### Products ##### +ProductSetup=Products module setup +ServiceSetup=Services module setup +ProductServiceSetup=Products and Services modules setup +NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit) +ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms +ModifyProductDescAbility=Personalization of product descriptions in forms +ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip) +ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language +UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). +UseEcoTaxeAbility=Support Eco-Taxe (WEEE) +SetDefaultBarcodeTypeProducts=Default barcode type to use for products +SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties +ProductCodeChecker= Module for product code generation and checking (product or service) +ProductOtherConf= Product / Service configuration +##### Syslog ##### +SyslogSetup=Logs module setup +SyslogOutput=Logs outputs +SyslogSyslog=Syslog +SyslogFacility=Facility +SyslogLevel=Level +SyslogSimpleFile=File +SyslogFilename=File name and path +YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file. +ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant +OnlyWindowsLOG_USER=Windows only supports LOG_USER +##### Donations ##### +DonationsSetup=Donation module setup +DonationsReceiptModel=Template of donation receipt +##### Barcode ##### +BarcodeSetup=Barcode setup +PaperFormatModule=Print format module +BarcodeEncodeModule=Barcode encoding type +UseBarcodeInProductModule=Use bar codes for products +CodeBarGenerator=Barcode generator +ChooseABarCode=No generator defined +FormatNotSupportedByGenerator=Format not supported by this generator +BarcodeDescEAN8=Barcode of type EAN8 +BarcodeDescEAN13=Barcode of type EAN13 +BarcodeDescUPC=Barcode of type UPC +BarcodeDescISBN=Barcode of type ISBN +BarcodeDescC39=Barcode of type C39 +BarcodeDescC128=Barcode of type C128 +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode +BarcodeInternalEngine=Internal engine +BarCodeNumberManager=Manager to auto define barcode numbers +##### Prelevements ##### +WithdrawalsSetup=Withdrawal module setup +##### ExternalRSS ##### +ExternalRSSSetup=External RSS imports setup +NewRSS=New RSS Feed +RSSUrl=RSS URL +RSSUrlExample=An interesting RSS feed +##### Mailing ##### +MailingSetup=EMailing module setup +MailingEMailFrom=Sender EMail (From) for emails sent by emailing module +MailingEMailError=Return EMail (Errors-to) for emails with errors +MailingDelay=Seconds to wait after sending next message +##### Notification ##### +NotificationSetup=EMail notification module setup +NotificationEMailFrom=Sender EMail (From) for emails sent for notifications +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target +##### Sendings ##### +SendingsSetup=Sending module setup +SendingsReceiptModel=Sending receipt model +SendingsNumberingModules=Sendings numbering modules +SendingsAbility=Support shipment sheets for customer deliveries +NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated. +FreeLegalTextOnShippings=Free text on shipments +##### Deliveries ##### +DeliveryOrderNumberingModules=Products deliveries receipt numbering module +DeliveryOrderModel=Products deliveries receipt model +DeliveriesOrderAbility=Support products deliveries receipts +FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts +##### FCKeditor ##### +AdvancedEditor=Advanced editor +ActivateFCKeditor=Activate advanced editor for: +FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) +FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files. +FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) +FCKeditorForUserSignature=WYSIWIG creation/edition of user signature +FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing) +##### OSCommerce 1 ##### +OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s). +OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull. +OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. +OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. +##### Stock ##### +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. +##### Menu ##### +MenuDeleted=Menu deleted +TreeMenu=Tree menus +Menus=Menus +TreeMenuPersonalized=Personalized menus +NewMenu=New menu +MenuConf=Menus setup +Menu=Selection of menu +MenuHandler=Menu handler +MenuModule=Source module +HideUnauthorizedMenu= Hide unauthorized menus (gray) +DetailId=Id menu +DetailMenuHandler=Menu handler where to show new menu +DetailMenuModule=Module name if menu entry come from a module +DetailType=Type of menu (top or left) +DetailTitre=Menu label or label code for translation +DetailMainmenu=Group for which it belongs (obsolete) +DetailUrl=URL where menu send you (Absolute URL link or external link with http://) +DetailLeftmenu=Display condition or not (obsolete) +DetailEnabled=Condition to show or not entry +DetailRight=Condition to display unauthorized grey menus +DetailLangs=Lang file name for label code translation +DetailUser=Intern / Extern / All +Target=Target +DetailTarget=Target for links (_blank top open a new window) +DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu) +ModifMenu=Menu change +DeleteMenu=Delete menu entry +ConfirmDeleteMenu=Are you sure you want to delete menu entry %s ? +DeleteLine=Delete line +ConfirmDeleteLine=Are you sure you want to delete this line ? +##### Tax ##### +TaxSetup=Taxes, social contributions and dividends module setup +OptionVatMode=VAT due +OptionVATDefault=Cash basis +OptionVATDebitOption=Accrual basis +OptionVatDefaultDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on payments for services +OptionVatDebitOptionDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on invoice (debit) for services +SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: +OnDelivery=On delivery +OnPayment=On payment +OnInvoice=On invoice +SupposedToBePaymentDate=Payment date used +SupposedToBeInvoiceDate=Invoice date used +Buy=Buy +Sell=Sell +InvoiceDateUsed=Invoice date used +YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup. +AccountancyCode=Accountancy Code +AccountancyCodeSell=Sale account. code +AccountancyCodeBuy=Purchase account. code +##### Agenda ##### +AgendaSetup=Events and agenda module setup +PasswordTogetVCalExport=Key to authorize export link +PastDelayVCalExport=Do not export event older than +AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) +AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view +AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view +AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda +##### ClickToDial ##### +ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example. +##### Point Of Sales (CashDesk) ##### +CashDesk=Point of sales +CashDeskSetup=Point of sales module setup +CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskBankAccountForSell=Default account to use to receive cash payments +CashDeskBankAccountForCheque= Default account to use to receive payments by cheque +CashDeskBankAccountForCB= Default account to use to receive payments by credit cards +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). +CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease +StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management +CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. +##### Bookmark ##### +BookmarkSetup=Bookmark module setup +BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. +NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu +##### WebServices ##### +WebServicesSetup=Webservices module setup +WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services. +WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here +EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url +##### Bank ##### +BankSetupModule=Bank module setup +FreeLegalTextOnChequeReceipts=Free text on cheque receipts +BankOrderShow=Display order of bank accounts for countries using "detailed bank number" +BankOrderGlobal=General +BankOrderGlobalDesc=General display order +BankOrderES=Spanish +BankOrderESDesc=Spanish display order +##### Multicompany ##### +MultiCompanySetup=Multi-company module setup +##### Suppliers ##### +SuppliersSetup=Supplier module setup +SuppliersCommandModel=Complete template of supplier order (logo...) +SuppliersInvoiceModel=Complete template of supplier invoice (logo...) +SuppliersInvoiceNumberingModel=Supplier invoices numbering models +##### GeoIPMaxmind ##### +GeoIPMaxmindSetup=GeoIP Maxmind module setup +PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat +NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions). +YouCanDownloadFreeDatFileTo=You can download a free demo version of the Maxmind GeoIP country file at %s. +YouCanDownloadAdvancedDatFileTo=You can also download a more complete version, with updates, of the Maxmind GeoIP country file at %s. +TestGeoIPResult=Test of a conversion IP -> country +##### Projects ##### +ProjectsNumberingModules=Projects numbering module +ProjectsSetup=Project module setup +ProjectsModelModule=Project reports document model +TasksNumberingModules=Tasks numbering module +TaskModelModule=Tasks reports document model +##### ECM (GED) ##### +ECMSetup = GED Setup +ECMAutoTree = Automatic tree folder and document +##### Fiscal Year ##### +FiscalYears=Fiscal years +FiscalYear=Fiscal year +FiscalYearCard=Fiscal year card +NewFiscalYear=New fiscal year +EditFiscalYear=Edit fiscal year +OpenFiscalYear=Open fiscal year +CloseFiscalYear=Close fiscal year +DeleteFiscalYear=Delete fiscal year +ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? +Opened=Opened +Closed=Closed +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order +Format=Format +TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/lo_LA/agenda.lang b/htdocs/langs/lo_LA/agenda.lang new file mode 100644 index 00000000000..04e2ae30de8 --- /dev/null +++ b/htdocs/langs/lo_LA/agenda.lang @@ -0,0 +1,93 @@ +# Dolibarr language file - Source file is en_US - agenda +IdAgenda=ID event +Actions=Events +ActionsArea=Events area (Actions and tasks) +Agenda=Agenda +Agendas=Agendas +Calendar=Calendar +Calendars=Calendars +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by +AffectedTo=Assigned to +DoneBy=Done by +Event=Event +Events=Events +EventsNb=Number of events +MyEvents=My events +OtherEvents=Other events +ListOfActions=List of events +Location=Location +EventOnFullDay=Event on all day(s) +SearchAnAction= Search an event/task +MenuToDoActions=All incomplete events +MenuDoneActions=All terminated events +MenuToDoMyActions=My incomplete events +MenuDoneMyActions=My terminated events +ListOfEvents=List of events (internal calendar) +ActionsAskedBy=Events reported by +ActionsToDoBy=Events assigned to +ActionsDoneBy=Events done by +ActionsForUser=Events for user +ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to +AllMyActions= All my events/tasks +AllActions= All events/tasks +ViewList=List view +ViewCal=Month view +ViewDay=Day view +ViewWeek=Week view +ViewPerUser=Per user view +ViewWithPredefinedFilters= View with predefined filters +AutoActions= Automatic filling +AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. +AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) +AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status +InvoiceDeleteDolibarr=Invoice %s deleted +OrderValidatedInDolibarr= Order %s validated +OrderApprovedInDolibarr=Order %s approved +OrderRefusedInDolibarr=Order %s refused +OrderBackToDraftInDolibarr=Order %s go back to draft status +OrderCanceledInDolibarr=Order %s canceled +ProposalSentByEMail=Commercial proposal %s sent by EMail +OrderSentByEMail=Customer order %s sent by EMail +InvoiceSentByEMail=Customer invoice %s sent by EMail +SupplierOrderSentByEMail=Supplier order %s sent by EMail +SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail +ShippingSentByEMail=Shipment %s sent by EMail +ShippingValidated= Shipment %s validated +InterventionSentByEMail=Intervention %s sent by EMail +NewCompanyToDolibarr= Third party created +DateActionPlannedStart= Planned start date +DateActionPlannedEnd= Planned end date +DateActionDoneStart= Real start date +DateActionDoneEnd= Real end date +DateActionStart= Start date +DateActionEnd= End date +AgendaUrlOptions1=You can also add following parameters to filter output: +AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. +AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. +AgendaShowBirthdayEvents=Show birthday's contacts +AgendaHideBirthdayEvents=Hide birthday's contacts +Busy=Busy +ExportDataset_event1=List of agenda events +DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) +DefaultWorkingHours=Default working hours in day (Example: 9-18) +# External Sites ical +ExportCal=Export calendar +ExtSites=Import external calendars +ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesNbOfAgenda=Number of calendars +AgendaExtNb=Calendar nb %s +ExtSiteUrlAgenda=URL to access .ical file +ExtSiteNoLabel=No Description +WorkingTimeRange=Working time range +WorkingDaysRange=Working days range +AddEvent=Create event +MyAvailability=My availability diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang new file mode 100644 index 00000000000..a2306950fb4 --- /dev/null +++ b/htdocs/langs/lo_LA/banks.lang @@ -0,0 +1,165 @@ +# Dolibarr language file - Source file is en_US - banks +Bank=Bank +Banks=Banks +MenuBankCash=Bank/Cash +MenuSetupBank=Bank/Cash setup +BankName=Bank name +FinancialAccount=Account +FinancialAccounts=Accounts +BankAccount=Bank account +BankAccounts=Bank accounts +ShowAccount=Show Account +AccountRef=Financial account ref +AccountLabel=Financial account label +CashAccount=Cash account +CashAccounts=Cash accounts +MainAccount=Main account +CurrentAccount=Current account +CurrentAccounts=Current accounts +SavingAccount=Savings account +SavingAccounts=Savings accounts +ErrorBankLabelAlreadyExists=Financial account label already exists +BankBalance=Balance +BankBalanceBefore=Balance before +BankBalanceAfter=Balance after +BalanceMinimalAllowed=Minimum allowed balance +BalanceMinimalDesired=Minimum desired balance +InitialBankBalance=Initial balance +EndBankBalance=End balance +CurrentBalance=Current balance +FutureBalance=Future balance +ShowAllTimeBalance=Show balance from start +AllTime=From start +Reconciliation=Reconciliation +RIB=Bank Account Number +IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid +BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid +StandingOrders=Standing orders +StandingOrder=Standing order +Withdrawals=Withdrawals +Withdrawal=Withdrawal +AccountStatement=Account statement +AccountStatementShort=Statement +AccountStatements=Account statements +LastAccountStatements=Last account statements +Rapprochement=Reconciliate +IOMonthlyReporting=Monthly reporting +BankAccountDomiciliation=Account address +BankAccountCountry=Account country +BankAccountOwner=Account owner name +BankAccountOwnerAddress=Account owner address +RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN). +CreateAccount=Create account +NewAccount=New account +NewBankAccount=New bank account +NewFinancialAccount=New financial account +MenuNewFinancialAccount=New financial account +NewCurrentAccount=New current account +NewSavingAccount=New savings account +NewCashAccount=New cash account +EditFinancialAccount=Edit account +AccountSetup=Financial accounts setup +SearchBankMovement=Search bank movement +Debts=Debts +LabelBankCashAccount=Bank or cash label +AccountType=Account type +BankType0=Savings account +BankType1=Current or credit card account +BankType2=Cash account +IfBankAccount=If bank account +AccountsArea=Accounts area +AccountCard=Account card +DeleteAccount=Delete account +ConfirmDeleteAccount=Are you sure you want to delete this account ? +Account=Account +ByCategories=By categories +ByRubriques=By categories +BankTransactionByCategories=Bank transactions by categories +BankTransactionForCategory=Bank transactions for category %s +RemoveFromRubrique=Remove link with category +RemoveFromRubriqueConfirm=Are you sure you want to remove link between the transaction and the category ? +ListBankTransactions=List of bank transactions +IdTransaction=Transaction ID +BankTransactions=Bank transactions +SearchTransaction=Search transaction +ListTransactions=List transactions +ListTransactionsByCategory=List transaction/category +TransactionsToConciliate=Transactions to reconcile +Conciliable=Can be reconciled +Conciliate=Reconcile +Conciliation=Reconciliation +ConciliationForAccount=Reconcile this account +IncludeClosedAccount=Include closed accounts +OnlyOpenedAccount=Only opened accounts +AccountToCredit=Account to credit +AccountToDebit=Account to debit +DisableConciliation=Disable reconciliation feature for this account +ConciliationDisabled=Reconciliation feature disabled +StatusAccountOpened=Opened +StatusAccountClosed=Closed +AccountIdShort=Number +EditBankRecord=Edit record +LineRecord=Transaction +AddBankRecord=Add transaction +AddBankRecordLong=Add transaction manually +ConciliatedBy=Reconciled by +DateConciliating=Reconcile date +BankLineConciliated=Transaction reconciled +CustomerInvoicePayment=Customer payment +CustomerInvoicePaymentBack=Customer payment back +SupplierInvoicePayment=Supplier payment +WithdrawalPayment=Withdrawal payment +SocialContributionPayment=Social contribution payment +FinancialAccountJournal=Financial account journal +BankTransfer=Bank transfer +BankTransfers=Bank transfers +TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction) +TransferFrom=From +TransferTo=To +TransferFromToDone=A transfer from %s to %s of %s %s has been recorded. +CheckTransmitter=Transmitter +ValidateCheckReceipt=Validate this check receipt ? +ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done ? +DeleteCheckReceipt=Delete this check receipt ? +ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt ? +BankChecks=Bank checks +BankChecksToReceipt=Checks waiting for deposit +ShowCheckReceipt=Show check deposit receipt +NumberOfCheques=Nb of check +DeleteTransaction=Delete transaction +ConfirmDeleteTransaction=Are you sure you want to delete this transaction ? +ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions +BankMovements=Movements +CashBudget=Cash budget +PlannedTransactions=Planned transactions +Graph=Graphics +ExportDataset_banque_1=Bank transactions and account statement +ExportDataset_banque_2=Deposit slip +TransactionOnTheOtherAccount=Transaction on the other account +TransactionWithOtherAccount=Account transfer +PaymentNumberUpdateSucceeded=Payment number updated succesfully +PaymentNumberUpdateFailed=Payment number could not be updated +PaymentDateUpdateSucceeded=Payment date update succesfully +PaymentDateUpdateFailed=Payment date could not be updated +Transactions=Transactions +BankTransactionLine=Bank transaction +AllAccounts=All bank/cash accounts +BackToAccount=Back to account +ShowAllAccounts=Show for all accounts +FutureTransaction=Transaction in futur. No way to conciliate. +SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD +EventualyAddCategory=Eventually, specify a category in which to classify the records +ToConciliate=To conciliate? +ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click +BankDashboard=Bank accounts summary +DefaultRIB=Default BAN +AllRIB=All BAN +LabelRIB=BAN Label +NoBANRecord=No BAN record +DeleteARib=Delete BAN record +ConfirmDeleteRib=Are you sure you want to delete this BAN record ? diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang new file mode 100644 index 00000000000..7232f00e91c --- /dev/null +++ b/htdocs/langs/lo_LA/bills.lang @@ -0,0 +1,430 @@ +# Dolibarr language file - Source file is en_US - bills +Bill=Invoice +Bills=Invoices +BillsCustomers=Customers invoices +BillsCustomer=Customers invoice +BillsSuppliers=Suppliers invoices +BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s +BillsSuppliersUnpaid=Unpaid supplier's invoices +BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s +BillsLate=Late payments +BillsStatistics=Customers invoices statistics +BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseNotErasable=Disabled because can not be erased +InvoiceStandard=Standard invoice +InvoiceStandardAsk=Standard invoice +InvoiceStandardDesc=This kind of invoice is the common invoice. +InvoiceDeposit=Deposit invoice +InvoiceDepositAsk=Deposit invoice +InvoiceDepositDesc=This kind of invoice is done when a deposit has been received. +InvoiceProForma=Proforma invoice +InvoiceProFormaAsk=Proforma invoice +InvoiceProFormaDesc=Proforma invoice is an image of a true invoice but has no accountancy value. +InvoiceReplacement=Replacement invoice +InvoiceReplacementAsk=Replacement invoice for invoice +InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'. +InvoiceAvoir=Credit note +InvoiceAvoirAsk=Credit note to correct invoice +InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). +invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount +ReplaceInvoice=Replace invoice %s +ReplacementInvoice=Replacement invoice +ReplacedByInvoice=Replaced by invoice %s +ReplacementByInvoice=Replaced by invoice +CorrectInvoice=Correct invoice %s +CorrectionInvoice=Correction invoice +UsedByInvoice=Used to pay invoice %s +ConsumedBy=Consumed by +NotConsumed=Not consumed +NoReplacableInvoice=No replacable invoices +NoInvoiceToCorrect=No invoice to correct +InvoiceHasAvoir=Corrected by one or several invoices +CardBill=Invoice card +PredefinedInvoices=Predefined Invoices +Invoice=Invoice +Invoices=Invoices +InvoiceLine=Invoice line +InvoiceCustomer=Customer invoice +CustomerInvoice=Customer invoice +CustomersInvoices=Customers invoices +SupplierInvoice=Supplier invoice +SuppliersInvoices=Suppliers invoices +SupplierBill=Supplier invoice +SupplierBills=suppliers invoices +Payment=Payment +PaymentBack=Payment back +Payments=Payments +PaymentsBack=Payments back +PaidBack=Paid back +DatePayment=Payment date +DeletePayment=Delete payment +ConfirmDeletePayment=Are you sure you want to delete this payment ? +ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?
The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer. +SupplierPayments=Suppliers payments +ReceivedPayments=Received payments +ReceivedCustomersPayments=Payments received from customers +PayedSuppliersPayments=Payments payed to suppliers +ReceivedCustomersPaymentsToValid=Received customers payments to validate +PaymentsReportsForYear=Payments reports for %s +PaymentsReports=Payments reports +PaymentsAlreadyDone=Payments already done +PaymentsBackAlreadyDone=Payments back already done +PaymentRule=Payment rule +PaymentMode=Payment type +PaymentConditions=Payment term +PaymentConditionsShort=Payment term +PaymentAmount=Payment amount +ValidatePayment=Validate payment +PaymentHigherThanReminderToPay=Payment higher than reminder to pay +HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices. +HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm. +ClassifyPaid=Classify 'Paid' +ClassifyPaidPartially=Classify 'Paid partially' +ClassifyCanceled=Classify 'Abandoned' +ClassifyClosed=Classify 'Closed' +ClassifyUnBilled=Classify 'Unbilled' +CreateBill=Create Invoice +AddBill=Create invoice or credit note +AddToDraftInvoices=Add to draft invoice +DeleteBill=Delete invoice +SearchACustomerInvoice=Search for a customer invoice +SearchASupplierInvoice=Search for a supplier invoice +CancelBill=Cancel an invoice +SendRemindByMail=Send reminder by EMail +DoPayment=Do payment +DoPaymentBack=Do payment back +ConvertToReduc=Convert into future discount +EnterPaymentReceivedFromCustomer=Enter payment received from customer +EnterPaymentDueToCustomer=Make payment due to customer +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero +Amount=Amount +PriceBase=Price base +BillStatus=Invoice status +BillStatusDraft=Draft (needs to be validated) +BillStatusPaid=Paid +BillStatusPaidBackOrConverted=Paid or converted into discount +BillStatusConverted=Paid (ready for final invoice) +BillStatusCanceled=Abandoned +BillStatusValidated=Validated (needs to be paid) +BillStatusStarted=Started +BillStatusNotPaid=Not paid +BillStatusClosedUnpaid=Closed (unpaid) +BillStatusClosedPaidPartially=Paid (partially) +BillShortStatusDraft=Draft +BillShortStatusPaid=Paid +BillShortStatusPaidBackOrConverted=Processed +BillShortStatusConverted=Processed +BillShortStatusCanceled=Abandoned +BillShortStatusValidated=Validated +BillShortStatusStarted=Started +BillShortStatusNotPaid=Not paid +BillShortStatusClosedUnpaid=Closed +BillShortStatusClosedPaidPartially=Paid (partially) +PaymentStatusToValidShort=To validate +ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined +ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this. +ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes +ErrorBillNotFound=Invoice %s does not exist +ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s. +ErrorDiscountAlreadyUsed=Error, discount already used +ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount +ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount +ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status +BillFrom=From +BillTo=To +ActionsOnBill=Actions on invoice +NewBill=New invoice +LastBills=Last %s invoices +LastCustomersBills=Last %s customers invoices +LastSuppliersBills=Last %s suppliers invoices +AllBills=All invoices +OtherBills=Other invoices +DraftBills=Draft invoices +CustomersDraftInvoices=Customers draft invoices +SuppliersDraftInvoices=Suppliers draft invoices +Unpaid=Unpaid +ConfirmDeleteBill=Are you sure you want to delete this invoice ? +ConfirmValidateBill=Are you sure you want to validate this invoice with reference %s ? +ConfirmUnvalidateBill=Are you sure you want to change invoice %s to draft status ? +ConfirmClassifyPaidBill=Are you sure you want to change invoice %s to status paid ? +ConfirmCancelBill=Are you sure you want to cancel invoice %s ? +ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? +ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? +ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer +ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned +ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason +ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction») +ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note. +ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit +ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A bad customer is a customer that refuse to pay his debt. +ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned +ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:
- payment not complete because some products were shipped back
- amount claimed too important because a discount was forgotten
In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note. +ConfirmClassifyAbandonReasonOther=Other +ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice. +ConfirmCustomerPayment=Do you confirm this payment input for %s %s ? +ConfirmSupplierPayment=Do you confirm this payment input for %s %s ? +ConfirmValidatePayment=Are you sure you want to validate this payment ? No change can be made once payment is validated. +ValidateBill=Validate invoice +UnvalidateBill=Unvalidate invoice +NumberOfBills=Nb of invoices +NumberOfBillsByMonth=Nb of invoices by month +AmountOfBills=Amount of invoices +AmountOfBillsByMonthHT=Amount of invoices by month (net of tax) +ShowSocialContribution=Show social contribution +ShowBill=Show invoice +ShowInvoice=Show invoice +ShowInvoiceReplace=Show replacing invoice +ShowInvoiceAvoir=Show credit note +ShowInvoiceDeposit=Show deposit invoice +ShowPayment=Show payment +File=File +AlreadyPaid=Already paid +AlreadyPaidBack=Already paid back +AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) +Abandoned=Abandoned +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back +Rest=Pending +AmountExpected=Amount claimed +ExcessReceived=Excess received +EscompteOffered=Discount offered (payment before term) +SendBillRef=Submission of invoice %s +SendReminderBillRef=Submission of invoice %s (reminder) +StandingOrders=Standing orders +StandingOrder=Standing order +NoDraftBills=No draft invoices +NoOtherDraftBills=No other draft invoices +NoDraftInvoices=No draft invoices +RefBill=Invoice ref +ToBill=To bill +RemainderToBill=Remainder to bill +SendBillByMail=Send invoice by email +SendReminderBillByMail=Send reminder by email +RelatedCommercialProposals=Related commercial proposals +MenuToValid=To valid +DateMaxPayment=Payment due before +DateEcheance=Due date limit +DateInvoice=Invoice date +NoInvoice=No invoice +ClassifyBill=Classify invoice +SupplierBillsToPay=Suppliers invoices to pay +CustomerBillsUnpaid=Unpaid customers invoices +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +NonPercuRecuperable=Non-recoverable +SetConditions=Set payment terms +SetMode=Set payment mode +Billed=Billed +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice +CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines +CustomersInvoicesAndPayments=Customer invoices and payments +ExportDataset_invoice_1=Customer invoices list and invoice's lines +ExportDataset_invoice_2=Customer invoices and payments +ProformaBill=Proforma Bill: +Reduction=Reduction +ReductionShort=Reduc. +Reductions=Reductions +ReductionsShort=Reduc. +Discount=Discount +Discounts=Discounts +AddDiscount=Create discount +AddRelativeDiscount=Create relative discount +EditRelativeDiscount=Edit relative discount +AddGlobalDiscount=Create absolute discount +EditGlobalDiscounts=Edit absolute discounts +AddCreditNote=Create credit note +ShowDiscount=Show discount +ShowReduc=Show the deduction +RelativeDiscount=Relative discount +GlobalDiscount=Global discount +CreditNote=Credit note +CreditNotes=Credit notes +Deposit=Deposit +Deposits=Deposits +DiscountFromCreditNote=Discount from credit note %s +DiscountFromDeposit=Payments from deposit invoice %s +AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation +CreditNoteDepositUse=Invoice must be validated to use this king of credits +NewGlobalDiscount=New absolute discount +NewRelativeDiscount=New relative discount +NoteReason=Note/Reason +ReasonDiscount=Reason +DiscountOfferedBy=Granted by +DiscountStillRemaining=Discounts still remaining +DiscountAlreadyCounted=Discounts already counted +BillAddress=Bill address +HelpEscompte=This discount is a discount granted to customer because its payment was made before term. +HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose. +HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example) +IdSocialContribution=Social contribution id +PaymentId=Payment id +InvoiceId=Invoice id +InvoiceRef=Invoice ref. +InvoiceDateCreation=Invoice creation date +InvoiceStatus=Invoice status +InvoiceNote=Invoice note +InvoicePaid=Invoice paid +PaymentNumber=Payment number +RemoveDiscount=Remove discount +WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty) +InvoiceNotChecked=No invoice selected +CloneInvoice=Clone invoice +ConfirmCloneInvoice=Are you sure you want to clone this invoice %s ? +DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced +DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here. +NbOfPayments=Nb of payments +SplitDiscount=Split discount in two +ConfirmSplitDiscount=Are you sure you want to split this discount of %s %s into 2 lower discounts ? +TypeAmountOfEachNewDiscount=Input amount for each of two parts : +TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount. +ConfirmRemoveDiscount=Are you sure you want to remove this discount ? +RelatedBill=Related invoice +RelatedBills=Related invoices +LatestRelatedBill=Latest related invoice +WarningBillExist=Warning, one or more invoice already exist + +# PaymentConditions +PaymentConditionShortRECEP=Immediate +PaymentConditionRECEP=Immediate +PaymentConditionShort30D=30 days +PaymentCondition30D=30 days +PaymentConditionShort30DENDMONTH=30 days end of month +PaymentCondition30DENDMONTH=30 days end of month +PaymentConditionShort60D=60 days +PaymentCondition60D=60 days +PaymentConditionShort60DENDMONTH=60 days end of month +PaymentCondition60DENDMONTH=60 days end of month +PaymentConditionShortPT_DELIVERY=Delivery +PaymentConditionPT_DELIVERY=On delivery +PaymentConditionShortPT_ORDER=On order +PaymentConditionPT_ORDER=On order +PaymentConditionShortPT_5050=50-50 +PaymentConditionPT_5050=50%% in advance, 50%% on delivery +FixAmount=Fix amount +VarAmount=Variable amount (%% tot.) +# PaymentType +PaymentTypeVIR=Bank deposit +PaymentTypeShortVIR=Bank deposit +PaymentTypePRE=Bank's order +PaymentTypeShortPRE=Bank's order +PaymentTypeLIQ=Cash +PaymentTypeShortLIQ=Cash +PaymentTypeCB=Credit card +PaymentTypeShortCB=Credit card +PaymentTypeCHQ=Check +PaymentTypeShortCHQ=Check +PaymentTypeTIP=TIP +PaymentTypeShortTIP=TIP +PaymentTypeVAD=On line payment +PaymentTypeShortVAD=On line payment +PaymentTypeTRA=Bill payment +PaymentTypeShortTRA=Bill +BankDetails=Bank details +BankCode=Bank code +DeskCode=Desk code +BankAccountNumber=Account number +BankAccountNumberKey=Key +Residence=Domiciliation +IBANNumber=IBAN number +IBAN=IBAN +BIC=BIC/SWIFT +BICNumber=BIC/SWIFT number +ExtraInfos=Extra infos +RegulatedOn=Regulated on +ChequeNumber=Check N° +ChequeOrTransferNumber=Check/Transfer N° +ChequeMaker=Check transmitter +ChequeBank=Bank of Check +CheckBank=Check +NetToBePaid=Net to be paid +PhoneNumber=Tel +FullPhoneNumber=Telephone +TeleFax=Fax +PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration. +IntracommunityVATNumber=Intracommunity number of VAT +PaymentByChequeOrderedTo=Check payment (including tax) are payable to %s send to +PaymentByChequeOrderedToShort=Check payment (including tax) are payable to +SendTo=sent to +PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank account +VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI +LawApplicationPart1=By application of the law 80.335 of 12/05/80 +LawApplicationPart2=the goods remain the property of +LawApplicationPart3=the seller until the complete cashing of +LawApplicationPart4=their price. +LimitedLiabilityCompanyCapital=SARL with Capital of +UseLine=Apply +UseDiscount=Use discount +UseCredit=Use credit +UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit +MenuChequeDeposits=Checks deposits +MenuCheques=Checks +MenuChequesReceipts=Checks receipts +NewChequeDeposit=New deposit +ChequesReceipts=Checks receipts +ChequesArea=Checks deposits area +ChequeDeposits=Checks deposits +Cheques=Checks +CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s +UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices +ShowUnpaidAll=Show all unpaid invoices +ShowUnpaidLateOnly=Show late unpaid invoices only +PaymentInvoiceRef=Payment invoice %s +ValidateInvoice=Validate invoice +Cash=Cash +Reported=Delayed +DisabledBecausePayments=Not possible since there are some payments +CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid +ExpectedToPay=Expected payment +PayedByThisPayment=Paid by this payment +ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid. +ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back. +AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid". +ToMakePayment=Pay +ToMakePaymentBack=Pay back +ListOfYourUnpaidInvoices=List of unpaid invoices +NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative. +RevenueStamp=Revenue stamp +YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty +PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template) +TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +##### Types de contacts ##### +TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice +TypeContact_facture_external_BILLING=Customer invoice contact +TypeContact_facture_external_SHIPPING=Customer shipping contact +TypeContact_facture_external_SERVICE=Customer service contact +TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice +TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact +TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_invoice_supplier_external_SERVICE=Supplier service contact +# Situation invoices +InvoiceFirstSituationAsk=First situation invoice +InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice. +InvoiceSituation=Situation invoice +InvoiceSituationAsk=Invoice following the situation +InvoiceSituationDesc=Create a new situation following an already existing one +SituationAmount=Situation invoice amount(net) +SituationDeduction=Situation subtraction +Progress=Progress +ModifyAllLines=Modify all lines +CreateNextSituationInvoice=Create next situation +NotLastInCycle=This invoice in not the last in cycle and must not be modified. +DisabledBecauseNotLastInCycle=The next situation already exists. +DisabledBecauseFinal=This situation is final. +CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. +NoSituations=No opened situations +InvoiceSituationLast=Final and general invoice diff --git a/htdocs/langs/lo_LA/bookmarks.lang b/htdocs/langs/lo_LA/bookmarks.lang new file mode 100644 index 00000000000..7acb946bb62 --- /dev/null +++ b/htdocs/langs/lo_LA/bookmarks.lang @@ -0,0 +1,19 @@ +# Dolibarr language file - Source file is en_US - marque pages +AddThisPageToBookmarks=Add this page to bookmarks +Bookmark=Bookmark +Bookmarks=Bookmarks +NewBookmark=New bookmark +ShowBookmark=Show bookmark +OpenANewWindow=Open a new window +ReplaceWindow=Replace current window +BookmarkTargetNewWindowShort=New window +BookmarkTargetReplaceWindowShort=Current window +BookmarkTitle=Bookmark title +UrlOrLink=URL +BehaviourOnClick=Behaviour when a URL is clicked +CreateBookmark=Create bookmark +SetHereATitleForLink=Set a title for the bookmark +UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL +ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window +BookmarksManagement=Bookmarks management +ListOfBookmarks=List of bookmarks diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang new file mode 100644 index 00000000000..bf118b9b88e --- /dev/null +++ b/htdocs/langs/lo_LA/boxes.lang @@ -0,0 +1,96 @@ +# Dolibarr language file - Source file is en_US - boxes +BoxLastRssInfos=Rss information +BoxLastProducts=Last %s products/services +BoxProductsAlertStock=Products in stock alert +BoxLastProductsInContract=Last %s contracted products/services +BoxLastSupplierBills=Last supplier's invoices +BoxLastCustomerBills=Last customer's invoices +BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices +BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices +BoxLastProposals=Last commercial proposals +BoxLastProspects=Last modified prospects +BoxLastCustomers=Last modified customers +BoxLastSuppliers=Last modified suppliers +BoxLastCustomerOrders=Last customer orders +BoxLastValidatedCustomerOrders=Last validated customer orders +BoxLastBooks=Last books +BoxLastActions=Last actions +BoxLastContracts=Last contracts +BoxLastContacts=Last contacts/addresses +BoxLastMembers=Last members +BoxFicheInter=Last interventions +BoxCurrentAccounts=Opened accounts balance +BoxSalesTurnover=Sales turnover +BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices +BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices +BoxTitleLastBooks=Last %s recorded books +BoxTitleNbOfCustomers=Number of clients +BoxTitleLastRssInfos=Last %s news from %s +BoxTitleLastProducts=Last %s modified products/services +BoxTitleProductsAlertStock=Products in stock alert +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders +BoxTitleLastSuppliers=Last %s recorded suppliers +BoxTitleLastCustomers=Last %s recorded customers +BoxTitleLastModifiedSuppliers=Last %s modified suppliers +BoxTitleLastModifiedCustomers=Last %s modified customers +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals +BoxTitleLastCustomerBills=Last %s customer's invoices +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices +BoxTitleLastSupplierBills=Last %s supplier's invoices +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices +BoxTitleLastModifiedProspects=Last %s modified prospects +BoxTitleLastProductsInContract=Last %s products/services in a contract +BoxTitleLastModifiedMembers=Last %s members +BoxTitleLastFicheInter=Last %s modified intervention +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices +BoxTitleCurrentAccounts=Opened account's balances +BoxTitleSalesTurnover=Sales turnover +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices +BoxTitleLastModifiedContacts=Last %s modified contacts/addresses +BoxMyLastBookmarks=My last %s bookmarks +BoxOldestExpiredServices=Oldest active expired services +BoxLastExpiredServices=Last %s oldest contacts with active expired services +BoxTitleLastActionsToDo=Last %s actions to do +BoxTitleLastContracts=Last %s contracts +BoxTitleLastModifiedDonations=Last %s modified donations +BoxTitleLastModifiedExpenses=Last %s modified expenses +BoxGlobalActivity=Global activity (invoices, proposals, orders) +FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s +LastRefreshDate=Last refresh date +NoRecordedBookmarks=No bookmarks defined. +ClickToAdd=Click here to add. +NoRecordedCustomers=No recorded customers +NoRecordedContacts=No recorded contacts +NoActionsToDo=No actions to do +NoRecordedOrders=No recorded customer's orders +NoRecordedProposals=No recorded proposals +NoRecordedInvoices=No recorded customer's invoices +NoUnpaidCustomerBills=No unpaid customer's invoices +NoRecordedSupplierInvoices=No recorded supplier's invoices +NoUnpaidSupplierBills=No unpaid supplier's invoices +NoModifiedSupplierBills=No recorded supplier's invoices +NoRecordedProducts=No recorded products/services +NoRecordedProspects=No recorded prospects +NoContractedProducts=No products/services contracted +NoRecordedContracts=No recorded contracts +NoRecordedInterventions=No recorded interventions +BoxLatestSupplierOrders=Latest supplier orders +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders +NoSupplierOrder=No recorded supplier order +BoxCustomersInvoicesPerMonth=Customer invoices per month +BoxSuppliersInvoicesPerMonth=Supplier invoices per month +BoxCustomersOrdersPerMonth=Customer orders per month +BoxSuppliersOrdersPerMonth=Supplier orders per month +BoxProposalsPerMonth=Proposals per month +NoTooLowStockProducts=No product under the low stock limit +BoxProductDistribution=Products/Services distribution +BoxProductDistributionFor=Distribution of %s for %s +ForCustomersInvoices=Customers invoices +ForCustomersOrders=Customers orders +ForProposals=Proposals diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang new file mode 100644 index 00000000000..d3dcfb68e64 --- /dev/null +++ b/htdocs/langs/lo_LA/cashdesk.lang @@ -0,0 +1,40 @@ +# Language file - Source file is en_US - cashdesk +CashDeskMenu=Point of sale +CashDesk=Point of sale +CashDesks=Point of sales +CashDeskBank=Bank account +CashDeskBankCash=Bank account (cash) +CashDeskBankCB=Bank account (card) +CashDeskBankCheque=Bank account (cheque) +CashDeskWarehouse=Warehouse +CashdeskShowServices=Selling services +CashDeskProducts=Products +CashDeskStock=Stock +CashDeskOn=on +CashDeskThirdParty=Third party +CashdeskDashboard=Point of sale access +ShoppingCart=Shopping cart +NewSell=New sell +BackOffice=Back office +AddThisArticle=Add this article +RestartSelling=Go back on sell +SellFinished=Sell finished +PrintTicket=Print ticket +NoProductFound=No article found +ProductFound=product found +ProductsFound=products found +NoArticle=No article +Identification=Identification +Article=Article +Difference=Difference +TotalTicket=Total ticket +NoVAT=No VAT for this sale +Change=Excess received +CalTip=Click to view the calendar +CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined
Change stock module setup, or choose a warehouse +BankToPay=Charge Account +ShowCompany=Show company +ShowStock=Show warehouse +DeleteArticle=Click to remove this article +FilterRefOrLabelOrBC=Search (Ref/Label) +UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock. diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang new file mode 100644 index 00000000000..22914931db1 --- /dev/null +++ b/htdocs/langs/lo_LA/categories.lang @@ -0,0 +1,112 @@ +# Dolibarr language file - Source file is en_US - categories +Category=Category +Categories=Categories +Rubrique=Category +Rubriques=Categories +categories=categories +TheCategorie=The category +NoCategoryYet=No category of this type created +In=In +AddIn=Add in +modify=modify +Classify=Classify +CategoriesArea=Categories area +ProductsCategoriesArea=Products/Services categories area +SuppliersCategoriesArea=Suppliers categories area +CustomersCategoriesArea=Customers categories area +ThirdPartyCategoriesArea=Third parties categories area +MembersCategoriesArea=Members categories area +ContactsCategoriesArea=Contacts categories area +MainCats=Main categories +SubCats=Subcategories +CatStatistics=Statistics +CatList=List of categories +AllCats=All categories +ViewCat=View category +NewCat=Add category +NewCategory=New category +ModifCat=Modify category +CatCreated=Category created +CreateCat=Create category +CreateThisCat=Create this category +ValidateFields=Validate the fields +NoSubCat=No subcategory. +SubCatOf=Subcategory +FoundCats=Found categories +FoundCatsForName=Categories found for the name : +FoundSubCatsIn=Subcategories found in the category +ErrSameCatSelected=You selected the same category several times +ErrForgotCat=You forgot to choose the category +ErrForgotField=You forgot to inform the fields +ErrCatAlreadyExists=This name is already used +AddProductToCat=Add this product to a category? +ImpossibleAddCat=Impossible to add the category +ImpossibleAssociateCategory=Impossible to associate the category to +WasAddedSuccessfully=%s was added successfully. +ObjectAlreadyLinkedToCategory=Element is already linked to this category. +CategorySuccessfullyCreated=This category %s has been added with success. +ProductIsInCategories=Product/service owns to following categories +SupplierIsInCategories=Third party owns to following suppliers categories +CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories +CompanyIsInSuppliersCategories=This third party owns to following suppliers categories +MemberIsInCategories=This member owns to following members categories +ContactIsInCategories=This contact owns to following contacts categories +ProductHasNoCategory=This product/service is not in any categories +SupplierHasNoCategory=This supplier is not in any categories +CompanyHasNoCategory=This company is not in any categories +MemberHasNoCategory=This member is not in any categories +ContactHasNoCategory=This contact is not in any categories +ClassifyInCategory=Classify in category +NoneCategory=None +NotCategorized=Without category +CategoryExistsAtSameLevel=This category already exists with this ref +ReturnInProduct=Back to product/service card +ReturnInSupplier=Back to supplier card +ReturnInCompany=Back to customer/prospect card +ContentsVisibleByAll=The contents will be visible by all +ContentsVisibleByAllShort=Contents visible by all +ContentsNotVisibleByAllShort=Contents not visible by all +CategoriesTree=Categories tree +DeleteCategory=Delete category +ConfirmDeleteCategory=Are you sure you want to delete this category ? +RemoveFromCategory=Remove link with categorie +RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? +NoCategoriesDefined=No category defined +SuppliersCategoryShort=Suppliers category +CustomersCategoryShort=Customers category +ProductsCategoryShort=Products category +MembersCategoryShort=Members category +SuppliersCategoriesShort=Suppliers categories +CustomersCategoriesShort=Customers categories +CustomersProspectsCategoriesShort=Custo./Prosp. categories +ProductsCategoriesShort=Products categories +MembersCategoriesShort=Members categories +ContactCategoriesShort=Contacts categories +ThisCategoryHasNoProduct=This category does not contain any product. +ThisCategoryHasNoSupplier=This category does not contain any supplier. +ThisCategoryHasNoCustomer=This category does not contain any customer. +ThisCategoryHasNoMember=This category does not contain any member. +ThisCategoryHasNoContact=This category does not contain any contact. +AssignedToCustomer=Assigned to a customer +AssignedToTheCustomer=Assigned to the customer +InternalCategory=Internal category +CategoryContents=Category contents +CategId=Category id +CatSupList=List of supplier categories +CatCusList=List of customer/prospect categories +CatProdList=List of products categories +CatMemberList=List of members categories +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/lo_LA/commercial.lang b/htdocs/langs/lo_LA/commercial.lang new file mode 100644 index 00000000000..7acdc7bd7e6 --- /dev/null +++ b/htdocs/langs/lo_LA/commercial.lang @@ -0,0 +1,96 @@ +# Dolibarr language file - Source file is en_US - commercial +Commercial=Commercial +CommercialArea=Commercial area +CommercialCard=Commercial card +CustomerArea=Customers area +Customer=Customer +Customers=Customers +Prospect=Prospect +Prospects=Prospects +DeleteAction=Delete an event/task +NewAction=New event/task +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event +Rendez-Vous=Rendezvous +ConfirmDeleteAction=Are you sure you want to delete this event/task ? +CardAction=Event card +PercentDone=Percentage complete +ActionOnCompany=Task about company +ActionOnContact=Task about contact +TaskRDV=Meetings +TaskRDVWith=Meeting with %s +ShowTask=Show task +ShowAction=Show event +ActionsReport=Events report +ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative +SalesRepresentative=Sales representative +SalesRepresentatives=Sales representatives +SalesRepresentativeFollowUp=Sales representative (follow-up) +SalesRepresentativeSignature=Sales representative (signature) +CommercialInterlocutor=Commercial interlocutor +ErrorWrongCode=Wrong code +NoSalesRepresentativeAffected=No particular sales representative assigned +ShowCustomer=Show customer +ShowProspect=Show prospect +ListOfProspects=List of prospects +ListOfCustomers=List of customers +LastDoneTasks=Last %s completed tasks +LastRecordedTasks=Last recorded tasks +LastActionsToDo=Last %s oldest actions not completed +DoneAndToDoActionsFor=Completed and To do events for %s +DoneAndToDoActions=Completed and To do events +DoneActions=Completed events +DoneActionsFor=Completed events for %s +ToDoActions=Incomplete events +ToDoActionsFor=Incomplete events for %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s +StatusNotApplicable=Not applicable +StatusActionToDo=To do +StatusActionDone=Complete +MyActionsAsked=Events I have recorded +MyActionsToDo=Events I have to do +MyActionsDone=Events assigned to me +StatusActionInProcess=In process +TasksHistoryForThisContact=Events for this contact +LastProspectDoNotContact=Do not contact +LastProspectNeverContacted=Never contacted +LastProspectToContact=To contact +LastProspectContactInProcess=Contact in process +LastProspectContactDone=Contact done +DateActionPlanned=Date event planned for +DateActionDone=Date event done +ActionAskedBy=Event reported by +ActionAffectedTo=Event assigned to +ActionDoneBy=Event done by +ActionUserAsk=Reported by +ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%. +ActionAC_TEL=Phone call +ActionAC_FAX=Send fax +ActionAC_PROP=Send proposal by mail +ActionAC_EMAIL=Send Email +ActionAC_RDV=Meetings +ActionAC_INT=Intervention on site +ActionAC_FAC=Send customer invoice by mail +ActionAC_REL=Send customer invoice by mail (reminder) +ActionAC_CLO=Close +ActionAC_EMAILING=Send mass email +ActionAC_COM=Send customer order by mail +ActionAC_SHIP=Send shipping by mail +ActionAC_SUP_ORD=Send supplier order by mail +ActionAC_SUP_INV=Send supplier invoice by mail +ActionAC_OTH=Other +ActionAC_OTH_AUTO=Other (automatically inserted events) +ActionAC_MANUAL=Manually inserted events +ActionAC_AUTO=Automatically inserted events +Stats=Sales statistics +CAOrder=Sales volume (validated orders) +FromTo=from %s to %s +MargeOrder=Margins (validated orders) +RecapAnnee=Summary of the year +NoData=There is no data +StatusProsp=Prospect status +DraftPropals=Draft commercial proposals +SearchPropal=Search a commercial proposal +CommercialDashboard=Commercial summary diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang new file mode 100644 index 00000000000..8abf1fd1c5a --- /dev/null +++ b/htdocs/langs/lo_LA/companies.lang @@ -0,0 +1,414 @@ +# Dolibarr language file - Source file is en_US - companies +ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one. +ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one. +ErrorSetACountryFirst=Set the country first +SelectThirdParty=Select a third party +DeleteThirdParty=Delete a third party +ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ? +DeleteContact=Delete a contact/address +ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ? +MenuNewThirdParty=New third party +MenuNewCompany=New company +MenuNewCustomer=New customer +MenuNewProspect=New prospect +MenuNewSupplier=New supplier +MenuNewPrivateIndividual=New private individual +MenuSocGroup=Groups +NewCompany=New company (prospect, customer, supplier) +NewThirdParty=New third party (prospect, customer, supplier) +NewSocGroup=New company group +NewPrivateIndividual=New private individual (prospect, customer, supplier) +CreateDolibarrThirdPartySupplier=Create a third party (supplier) +ProspectionArea=Prospection area +SocGroup=Group of companies +IdThirdParty=Id third party +IdCompany=Company Id +IdContact=Contact Id +Contacts=Contacts/Addresses +ThirdPartyContacts=Third party contacts +ThirdPartyContact=Third party contact/address +StatusContactValidated=Status of contact/address +Company=Company +CompanyName=Company name +Companies=Companies +CountryIsInEEC=Country is inside European Economic Community +ThirdPartyName=Third party name +ThirdParty=Third party +ThirdParties=Third parties +ThirdPartyAll=Third parties (all) +ThirdPartyProspects=Prospects +ThirdPartyProspectsStats=Prospects +ThirdPartyCustomers=Customers +ThirdPartyCustomersStats=Customers +ThirdPartyCustomersWithIdProf12=Customers with %s or %s +ThirdPartySuppliers=Suppliers +ThirdPartyType=Third party type +Company/Fundation=Company/Foundation +Individual=Private individual +ToCreateContactWithSameName=Will create automatically a physical contact with same informations +ParentCompany=Parent company +Subsidiary=Subsidiary +Subsidiaries=Subsidiaries +NoSubsidiary=No subsidiary +ReportByCustomers=Report by customers +ReportByQuarter=Report by rate +CivilityCode=Civility code +RegisteredOffice=Registered office +Name=Name +Lastname=Last name +Firstname=First name +PostOrFunction=Post/Function +UserTitle=Title +Surname=Surname/Pseudo +Address=Address +State=State/Province +Region=Region +Country=Country +CountryCode=Country code +CountryId=Country id +Phone=Phone +Skype=Skype +Call=Call +Chat=Chat +PhonePro=Prof. phone +PhonePerso=Pers. phone +PhoneMobile=Mobile +No_Email=Don't send mass e-mailings +Fax=Fax +Zip=Zip Code +Town=City +Web=Web +Poste= Position +DefaultLang=Language by default +VATIsUsed=VAT is used +VATIsNotUsed=VAT is not used +CopyAddressFromSoc=Fill address with thirdparty address +NoEmailDefined=There is no email defined +##### Local Taxes ##### +LocalTax1IsUsedES= RE is used +LocalTax1IsNotUsedES= RE is not used +LocalTax2IsUsedES= IRPF is used +LocalTax2IsNotUsedES= IRPF is not used +LocalTax1ES=RE +LocalTax2ES=IRPF +TypeLocaltax1ES=RE Type +TypeLocaltax2ES=IRPF Type +TypeES=Type +ThirdPartyEMail=%s +WrongCustomerCode=Customer code invalid +WrongSupplierCode=Supplier code invalid +CustomerCodeModel=Customer code model +SupplierCodeModel=Supplier code model +Gencod=Bar code +##### Professional ID ##### +ProfId1Short=Prof. id 1 +ProfId2Short=Prof. id 2 +ProfId3Short=Prof. id 3 +ProfId4Short=Prof. id 4 +ProfId5Short=Prof. id 5 +ProfId6Short=Prof. id 5 +ProfId1=Professional ID 1 +ProfId2=Professional ID 2 +ProfId3=Professional ID 3 +ProfId4=Professional ID 4 +ProfId5=Professional ID 5 +ProfId6=Professional ID 6 +ProfId1AR=Prof Id 1 (CUIT/CUIL) +ProfId2AR=Prof Id 2 (Revenu brutes) +ProfId3AR=- +ProfId4AR=- +ProfId5AR=- +ProfId6AR=- +ProfId1AU=Prof Id 1 (ABN) +ProfId2AU=- +ProfId3AU=- +ProfId4AU=- +ProfId5AU=- +ProfId6AU=- +ProfId1BE=Prof Id 1 (Professional number) +ProfId2BE=- +ProfId3BE=- +ProfId4BE=- +ProfId5BE=- +ProfId6BE=- +ProfId1BR=- +ProfId2BR=IE (Inscricao Estadual) +ProfId3BR=IM (Inscricao Municipal) +ProfId4BR=CPF +#ProfId5BR=CNAE +#ProfId6BR=INSS +ProfId1CH=- +ProfId2CH=- +ProfId3CH=Prof Id 1 (Federal number) +ProfId4CH=Prof Id 2 (Commercial Record number) +ProfId5CH=- +ProfId6CH=- +ProfId1CL=Prof Id 1 (R.U.T.) +ProfId2CL=- +ProfId3CL=- +ProfId4CL=- +ProfId5CL=- +ProfId6CL=- +ProfId1CO=Prof Id 1 (R.U.T.) +ProfId2CO=- +ProfId3CO=- +ProfId4CO=- +ProfId5CO=- +ProfId6CO=- +ProfId1DE=Prof Id 1 (USt.-IdNr) +ProfId2DE=Prof Id 2 (USt.-Nr) +ProfId3DE=Prof Id 3 (Handelsregister-Nr.) +ProfId4DE=- +ProfId5DE=- +ProfId6DE=- +ProfId1ES=Prof Id 1 (CIF/NIF) +ProfId2ES=Prof Id 2 (Social security number) +ProfId3ES=Prof Id 3 (CNAE) +ProfId4ES=Prof Id 4 (Collegiate number) +ProfId5ES=- +ProfId6ES=- +ProfId1FR=Prof Id 1 (SIREN) +ProfId2FR=Prof Id 2 (SIRET) +ProfId3FR=Prof Id 3 (NAF, old APE) +ProfId4FR=Prof Id 4 (RCS/RM) +ProfId5FR=- +ProfId6FR=- +ProfId1GB=Registration Number +ProfId2GB=- +ProfId3GB=SIC +ProfId4GB=- +ProfId5GB=- +ProfId6GB=- +ProfId1HN=Id prof. 1 (RTN) +ProfId2HN=- +ProfId3HN=- +ProfId4HN=- +ProfId5HN=- +ProfId6HN=- +ProfId1IN=Prof Id 1 (TIN) +ProfId2IN=Prof Id 2 (PAN) +ProfId3IN=Prof Id 3 (SRVC TAX) +ProfId4IN=Prof Id 4 +ProfId5IN=Prof Id 5 +ProfId6IN=- +ProfId1MA=Id prof. 1 (R.C.) +ProfId2MA=Id prof. 2 (Patente) +ProfId3MA=Id prof. 3 (I.F.) +ProfId4MA=Id prof. 4 (C.N.S.S.) +ProfId5MA=- +ProfId6MA=- +ProfId1MX=Prof Id 1 (R.F.C). +ProfId2MX=Prof Id 2 (R..P. IMSS) +ProfId3MX=Prof Id 3 (Profesional Charter) +ProfId4MX=- +ProfId5MX=- +ProfId6MX=- +ProfId1NL=KVK nummer +ProfId2NL=- +ProfId3NL=- +ProfId4NL=Burgerservicenummer (BSN) +ProfId5NL=- +ProfId6NL=- +ProfId1PT=Prof Id 1 (NIPC) +ProfId2PT=Prof Id 2 (Social security number) +ProfId3PT=Prof Id 3 (Commercial Record number) +ProfId4PT=Prof Id 4 (Conservatory) +ProfId5PT=- +ProfId6PT=- +ProfId1SN=RC +ProfId2SN=NINEA +ProfId3SN=- +ProfId4SN=- +ProfId5SN=- +ProfId6SN=- +ProfId1TN=Prof Id 1 (RC) +ProfId2TN=Prof Id 2 (Fiscal matricule) +ProfId3TN=Prof Id 3 (Douane code) +ProfId4TN=Prof Id 4 (BAN) +ProfId5TN=- +ProfId6TN=- +ProfId1RU=Prof Id 1 (OGRN) +ProfId2RU=Prof Id 2 (INN) +ProfId3RU=Prof Id 3 (KPP) +ProfId4RU=Prof Id 4 (OKPO) +ProfId5RU=- +ProfId6RU=- +VATIntra=VAT number +VATIntraShort=VAT number +VATIntraVeryShort=VAT +VATIntraSyntaxIsValid=Syntax is valid +VATIntraValueIsValid=Value is valid +ProspectCustomer=Prospect / Customer +Prospect=Prospect +CustomerCard=Customer Card +Customer=Customer +CustomerDiscount=Customer Discount +CustomerRelativeDiscount=Relative customer discount +CustomerAbsoluteDiscount=Absolute customer discount +CustomerRelativeDiscountShort=Relative discount +CustomerAbsoluteDiscountShort=Absolute discount +CompanyHasRelativeDiscount=This customer has a default discount of %s%% +CompanyHasNoRelativeDiscount=This customer has no relative discount by default +CompanyHasAbsoluteDiscount=This customer still has discount credits or deposits for %s %s +CompanyHasCreditNote=This customer still has credit notes for %s %s +CompanyHasNoAbsoluteDiscount=This customer has no discount credit available +CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users) +CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself) +DefaultDiscount=Default discount +AvailableGlobalDiscounts=Absolute discounts available +DiscountNone=None +Supplier=Supplier +CompanyList=Company's list +AddContact=Create contact +AddContactAddress=Create contact/address +EditContact=Edit contact +EditContactAddress=Edit contact/address +Contact=Contact +ContactsAddresses=Contacts/Addresses +NoContactDefinedForThirdParty=No contact defined for this third party +NoContactDefined=No contact defined +DefaultContact=Default contact/address +AddCompany=Create company +AddThirdParty=Create third party +DeleteACompany=Delete a company +PersonalInformations=Personal data +AccountancyCode=Accountancy code +CustomerCode=Customer code +SupplierCode=Supplier code +CustomerAccount=Customer account +SupplierAccount=Supplier account +CustomerCodeDesc=Customer code, unique for all customers +SupplierCodeDesc=Supplier code, unique for all suppliers +RequiredIfCustomer=Required if third party is a customer or prospect +RequiredIfSupplier=Required if third party is a supplier +ValidityControledByModule=Validity controled by module +ThisIsModuleRules=This is rules for this module +LastProspect=Last +ProspectToContact=Prospect to contact +CompanyDeleted=Company "%s" deleted from database. +ListOfContacts=List of contacts/addresses +ListOfContactsAddresses=List of contacts/adresses +ListOfProspectsContacts=List of prospect contacts +ListOfCustomersContacts=List of customer contacts +ListOfSuppliersContacts=List of supplier contacts +ListOfCompanies=List of companies +ListOfThirdParties=List of third parties +ShowCompany=Show company +ShowContact=Show contact +ContactsAllShort=All (No filter) +ContactType=Contact type +ContactForOrders=Order's contact +ContactForProposals=Proposal's contact +ContactForContracts=Contract's contact +ContactForInvoices=Invoice's contact +NoContactForAnyOrder=This contact is not a contact for any order +NoContactForAnyProposal=This contact is not a contact for any commercial proposal +NoContactForAnyContract=This contact is not a contact for any contract +NoContactForAnyInvoice=This contact is not a contact for any invoice +NewContact=New contact +NewContactAddress=New contact/address +LastContacts=Last contacts +MyContacts=My contacts +Phones=Phones +Capital=Capital +CapitalOf=Capital of %s +EditCompany=Edit company +EditDeliveryAddress=Edit delivery address +ThisUserIsNot=This user is not a prospect, customer nor supplier +VATIntraCheck=Check +VATIntraCheckDesc=The link %s allows to ask the european VAT checker service. An external internet access from server is required for this service to work. +VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do +VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site +VATIntraManualCheck=You can also check manually from european web site %s +ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). +NorProspectNorCustomer=Nor prospect, nor customer +JuridicalStatus=Juridical status +Staff=Staff +ProspectLevelShort=Potential +ProspectLevel=Prospect potential +ContactPrivate=Private +ContactPublic=Shared +ContactVisibility=Visibility +OthersNotLinkedToThirdParty=Others, not linked to a third party +ProspectStatus=Prospect status +PL_NONE=None +PL_UNKNOWN=Unknown +PL_LOW=Low +PL_MEDIUM=Medium +PL_HIGH=High +TE_UNKNOWN=- +TE_STARTUP=Startup +TE_GROUP=Large company +TE_MEDIUM=Medium company +TE_ADMIN=Governmental +TE_SMALL=Small company +TE_RETAIL=Retailer +TE_WHOLE=Wholetailer +TE_PRIVATE=Private individual +TE_OTHER=Other +StatusProspect-1=Do not contact +StatusProspect0=Never contacted +StatusProspect1=To contact +StatusProspect2=Contact in process +StatusProspect3=Contact done +ChangeDoNotContact=Change status to 'Do not contact' +ChangeNeverContacted=Change status to 'Never contacted' +ChangeToContact=Change status to 'To contact' +ChangeContactInProcess=Change status to 'Contact in process' +ChangeContactDone=Change status to 'Contact done' +ProspectsByStatus=Prospects by status +BillingContact=Billing contact +NbOfAttachedFiles=Number of attached files +AttachANewFile=Attach a new file +NoRIB=No BAN defined +NoParentCompany=None +ExportImport=Import-Export +ExportCardToFormat=Export card to format +ContactNotLinkedToCompany=Contact not linked to any third party +DolibarrLogin=Dolibarr login +NoDolibarrAccess=No Dolibarr access +ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ExportDataset_company_2=Contacts and properties +ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes +ImportDataset_company_3=Bank details +PriceLevel=Price level +DeliveriesAddress=Delivery addresses +DeliveryAddress=Delivery address +DeliveryAddressLabel=Delivery address label +DeleteDeliveryAddress=Delete a delivery address +ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address? +NewDeliveryAddress=New delivery address +AddDeliveryAddress=Create address +AddAddress=Create address +NoOtherDeliveryAddress=No alternative delivery address defined +SupplierCategory=Supplier category +JuridicalStatus200=Independant +DeleteFile=Delete file +ConfirmDeleteFile=Are you sure you want to delete this file? +AllocateCommercial=Assigned to sale representative +SelectCountry=Select a country +SelectCompany=Select a third party +Organization=Organization +AutomaticallyGenerated=Automatically generated +FiscalYearInformation=Information on the fiscal year +FiscalMonthStart=Starting month of the fiscal year +YouMustCreateContactFirst=You must create emails contacts for third party first to be able to add emails notifications. +ListSuppliersShort=List of suppliers +ListProspectsShort=List of prospects +ListCustomersShort=List of customers +ThirdPartiesArea=Third parties and contact area +LastModifiedThirdParties=Last %s modified third parties +UniqueThirdParties=Total of unique third parties +InActivity=Open +ActivityCeased=Closed +ActivityStateFilter=Activity status +ProductsIntoElements=List of products into %s +CurrentOutstandingBill=Current outstanding bill +OutstandingBill=Max. for outstanding bill +OutstandingBillReached=Reached max. for outstanding bill +MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. +LeopardNumRefModelDesc=The code is free. This code can be modified at any time. +ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang new file mode 100644 index 00000000000..0d579a06ff1 --- /dev/null +++ b/htdocs/langs/lo_LA/compta.lang @@ -0,0 +1,207 @@ +# Dolibarr language file - Source file is en_US - compta +Accountancy=Accountancy +AccountancyCard=Accountancy card +Treasury=Treasury +MenuFinancial=Financial +TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation +TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation +OptionMode=Option for accountancy +OptionModeTrue=Option Incomes-Expenses +OptionModeVirtual=Option Claims-Debts +OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices. +OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output. +FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration) +VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup. +LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. +Param=Setup +RemainingAmountPayment=Amount payment remaining : +AmountToBeCharged=Total amount to pay : +AccountsGeneral=Accounts +Account=Account +Accounts=Accounts +Accountparent=Account parent +Accountsparent=Accounts parent +BillsForSuppliers=Bills for suppliers +Income=Income +Outcome=Expense +ReportInOut=Income / Expense +ReportTurnover=Turnover +PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party +PaymentsNotLinkedToUser=Payments not linked to any user +Profit=Profit +AccountingResult=Accounting result +Balance=Balance +Debit=Debit +Credit=Credit +Piece=Accounting Doc. +Withdrawal=Withdrawal +Withdrawals=Withdrawals +AmountHTVATRealReceived=Net collected +AmountHTVATRealPaid=Net paid +VATToPay=VAT sells +VATReceived=VAT received +VATToCollect=VAT purchases +VATSummary=VAT Balance +LT2SummaryES=IRPF Balance +LT1SummaryES=RE Balance +VATPaid=VAT paid +SalaryPaid=Salary paid +LT2PaidES=IRPF Paid +LT1PaidES=RE Paid +LT2CustomerES=IRPF sales +LT2SupplierES=IRPF purchases +LT1CustomerES=RE sales +LT1SupplierES=RE purchases +VATCollected=VAT collected +ToPay=To pay +ToGet=To get back +SpecialExpensesArea=Area for all special payments +TaxAndDividendsArea=Tax, social contributions and dividends area +SocialContribution=Social contribution +SocialContributions=Social contributions +MenuSpecialExpenses=Special expenses +MenuTaxAndDividends=Taxes and dividends +MenuSalaries=Salaries +MenuSocialContributions=Social contributions +MenuNewSocialContribution=New contribution +NewSocialContribution=New social contribution +ContributionsToPay=Contributions to pay +AccountancyTreasuryArea=Accountancy/Treasury area +AccountancySetup=Accountancy setup +NewPayment=New payment +Payments=Payments +PaymentCustomerInvoice=Customer invoice payment +PaymentSupplierInvoice=Supplier invoice payment +PaymentSocialContribution=Social contribution payment +PaymentVat=VAT payment +PaymentSalary=Salary payment +ListPayment=List of payments +ListOfPayments=List of payments +ListOfCustomerPayments=List of customer payments +ListOfSupplierPayments=List of supplier payments +DatePayment=Payment date +DateStartPeriod=Date start period +DateEndPeriod=Date end period +NewVATPayment=New VAT payment +newLT2PaymentES=New IRPF payment +newLT1PaymentES=New RE payment +LT2PaymentES=IRPF Payment +LT2PaymentsES=IRPF Payments +LT1PaymentES=RE Payment +LT1PaymentsES=RE Payments +VATPayment=VAT Payment +VATPayments=VAT Payments +SocialContributionsPayments=Social contributions payments +ShowVatPayment=Show VAT payment +TotalToPay=Total to pay +TotalVATReceived=Total VAT received +CustomerAccountancyCode=Customer accountancy code +SupplierAccountancyCode=Supplier accountancy code +AccountNumberShort=Account number +AccountNumber=Account number +NewAccount=New account +SalesTurnover=Sales turnover +SalesTurnoverMinimum=Minimum sales turnover +ByThirdParties=By third parties +ByUserAuthorOfInvoice=By invoice author +AccountancyExport=Accountancy export +ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s +SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. +CheckReceipt=Check deposit +CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts +NewCheckReceipt=New discount +NewCheckDeposit=New check deposit +NewCheckDepositOn=Create receipt for deposit on account: %s +NoWaitingChecks=No checks waiting for deposit. +DateChequeReceived=Check reception date +NbOfCheques=Nb of checks +PaySocialContribution=Pay a social contribution +ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid? +DeleteSocialContribution=Delete a social contribution +ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution? +ExportDataset_tax_1=Social contributions and payments +CalcModeVATDebt=Mode %sVAT on commitment accounting%s. +CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s. +CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting. +CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting +CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s +CalcModeLT1Debt=Mode %sRE on customer invoices%s +CalcModeLT1Rec= Mode %sRE on suppliers invoices%s +CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s +CalcModeLT2Debt=Mode %sIRPF on customer invoices%s +CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s +AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary +AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary +AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode %sClaims-Debts%s said Commitment accounting. +AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode %sIncomes-Expenses%s said cash accounting. +SeeReportInInputOutputMode=See report %sIncomes-Expenses%s said cash accounting for a calculation on actual payments made +SeeReportInDueDebtMode=See report %sClaims-Debts%s said commitment accounting for a calculation on issued invoices +RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included +RulesResultDue=- It includes outstanding invoices, expenses and VAT whether they are paid or not.
- It is based on the validation date of invoices and VAT and on the due date for expenses. +RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT.
- It is based on the payment dates of the invoices, expenses and VAT. +RulesCADue=- It includes the client's due invoices whether they are paid or not.
- It is based on the validation date of these invoices.
+RulesCAIn=- It includes all the effective payments of invoices received from clients.
- It is based on the payment date of these invoices
+DepositsAreNotIncluded=- Deposit invoices are nor included +DepositsAreIncluded=- Deposit invoices are included +LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF +LT1ReportByCustomersInInputOutputModeES=Report by third party RE +VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid +VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid +VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid +LT1ReportByQuartersInInputOutputMode=Report by RE rate +LT2ReportByQuartersInInputOutputMode=Report by IRPF rate +VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid +LT1ReportByQuartersInDueDebtMode=Report by RE rate +LT2ReportByQuartersInDueDebtMode=Report by IRPF rate +SeeVATReportInInputOutputMode=See report %sVAT encasement%s for a standard calculation +SeeVATReportInDueDebtMode=See report %sVAT on flow%s for a calculation with an option on the flow +RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment. +RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date. +RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date. +RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date. +OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair. +PercentOfInvoice=%%/invoice +NotUsedForGoods=Not used on goods +ProposalStats=Statistics on proposals +OrderStats=Statistics on orders +InvoiceStats=Statistics on bills +Dispatch=Dispatching +Dispatched=Dispatched +ToDispatch=To dispatch +ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer +SellsJournal=Sales Journal +PurchasesJournal=Purchases Journal +DescSellsJournal=Sales Journal +DescPurchasesJournal=Purchases Journal +InvoiceRef=Invoice ref. +CodeNotDef=Not defined +AddRemind=Dispatch available amount +RemainToDivide= Remain to dispatch : +WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module. +DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date. +Pcg_version=Pcg version +Pcg_type=Pcg type +Pcg_subtype=Pcg subtype +InvoiceLinesToDispatch=Invoice lines to dispatch +InvoiceDispatched=Dispatched invoices +AccountancyDashboard=Accountancy summary +ByProductsAndServices=By products and services +RefExt=External ref +ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". +LinkedOrder=Link to order +ReCalculate=Recalculate +Mode1=Method 1 +Mode2=Method 2 +CalculationRuleDesc=To calculate total VAT, there is two methods:
Method 1 is rounding vat on each line, then summing them.
Method 2 is summing all vat on each line, then rounding result.
Final result may differs from few cents. Default mode is mode %s. +CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier. +TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). +CalculationMode=Calculation mode +AccountancyJournal=Accountancy code journal +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/lo_LA/contracts.lang b/htdocs/langs/lo_LA/contracts.lang new file mode 100644 index 00000000000..d1be0e6513f --- /dev/null +++ b/htdocs/langs/lo_LA/contracts.lang @@ -0,0 +1,103 @@ +# Dolibarr language file - Source file is en_US - contracts +ContractsArea=Contracts area +ListOfContracts=List of contracts +LastModifiedContracts=Last %s modified contracts +AllContracts=All contracts +ContractCard=Contract card +ContractStatus=Contract status +ContractStatusNotRunning=Not running +ContractStatusRunning=Running +ContractStatusDraft=Draft +ContractStatusValidated=Validated +ContractStatusClosed=Closed +ServiceStatusInitial=Not running +ServiceStatusRunning=Running +ServiceStatusNotLate=Running, not expired +ServiceStatusNotLateShort=Not expired +ServiceStatusLate=Running, expired +ServiceStatusLateShort=Expired +ServiceStatusClosed=Closed +ServicesLegend=Services legend +Contracts=Contracts +ContractsAndLine=Contracts and line of contracts +Contract=Contract +NoContracts=No contracts +MenuServices=Services +MenuInactiveServices=Services not active +MenuRunningServices=Running services +MenuExpiredServices=Expired services +MenuClosedServices=Closed services +NewContract=New contract +AddContract=Create contract +SearchAContract=Search a contract +DeleteAContract=Delete a contract +CloseAContract=Close a contract +ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ? +ConfirmValidateContract=Are you sure you want to validate this contract under name %s ? +ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract ? +ConfirmCloseService=Are you sure you want to close this service with date %s ? +ValidateAContract=Validate a contract +ActivateService=Activate service +ConfirmActivateService=Are you sure you want to activate this service with date %s ? +RefContract=Contract reference +DateContract=Contract date +DateServiceActivate=Service activation date +DateServiceUnactivate=Service deactivation date +DateServiceStart=Date for beginning of service +DateServiceEnd=Date for end of service +ShowContract=Show contract +ListOfServices=List of services +ListOfInactiveServices=List of not active services +ListOfExpiredServices=List of expired active services +ListOfClosedServices=List of closed services +ListOfRunningContractsLines=List of running contract lines +ListOfRunningServices=List of running services +NotActivatedServices=Inactive services (among validated contracts) +BoardNotActivatedServices=Services to activate among validated contracts +LastContracts=Last %s contracts +LastActivatedServices=Last %s activated services +LastModifiedServices=Last %s modified services +EditServiceLine=Edit service line +ContractStartDate=Start date +ContractEndDate=End date +DateStartPlanned=Planned start date +DateStartPlannedShort=Planned start date +DateEndPlanned=Planned end date +DateEndPlannedShort=Planned end date +DateStartReal=Real start date +DateStartRealShort=Real start date +DateEndReal=Real end date +DateEndRealShort=Real end date +NbOfServices=Nb of services +CloseService=Close service +ServicesNomberShort=%s service(s) +RunningServices=Running services +BoardRunningServices=Expired running services +ServiceStatus=Status of service +DraftContracts=Drafts contracts +CloseRefusedBecauseOneServiceActive=Contract can't be closed as ther is at least one open service on it +CloseAllContracts=Close all contract lines +DeleteContractLine=Delete a contract line +ConfirmDeleteContractLine=Are you sure you want to delete this contract line ? +MoveToAnotherContract=Move service into another contract. +ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract. +ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ? +PaymentRenewContractId=Renew contract line (number %s) +ExpiredSince=Expiration date +RelatedContracts=Related contracts +NoExpiredServices=No expired active services +ListOfServicesToExpireWithDuration=List of Services to expire in %s days +ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days +ListOfServicesToExpire=List of Services to expire +NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. +StandardContractsTemplate=Standard contracts template +ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. + +##### Types de contacts ##### +TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract +TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract +TypeContact_contrat_external_BILLING=Billing customer contact +TypeContact_contrat_external_CUSTOMER=Follow-up customer contact +TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact +Error_CONTRACT_ADDON_NotDefined=Constant CONTRACT_ADDON not defined diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang new file mode 100644 index 00000000000..28dfc7770b2 --- /dev/null +++ b/htdocs/langs/lo_LA/cron.lang @@ -0,0 +1,87 @@ +# Dolibarr language file - Source file is en_US - cron +# About page +About = About +CronAbout = About Cron +CronAboutPage = Cron about page +# Right +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task +# Admin +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes +CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes +# Menu +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs +# Page list +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job +CronNone= None +CronDtStart=Start date +CronDtEnd=End date +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe +CronMethod=Method +CronModule=Module +CronAction=Action +CronStatus=Status +CronStatusActive=Enabled +CronStatusInactive=Disabled +CronNoJobs=No jobs registered +CronPriority=Priority +CronLabel=Description +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished +#Page card +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create +CronArgs=Parameters +CronSaveSucess=Save succesfully +CronNote=Comment +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable +CronStatusInactiveBtn=Disable +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. +# Info +CronInfoPage=Information +# Common +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/lo_LA/deliveries.lang b/htdocs/langs/lo_LA/deliveries.lang new file mode 100644 index 00000000000..d711c3704b4 --- /dev/null +++ b/htdocs/langs/lo_LA/deliveries.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - deliveries +Delivery=Delivery +Deliveries=Deliveries +DeliveryCard=Delivery card +DeliveryOrder=Delivery order +DeliveryOrders=Delivery orders +DeliveryDate=Delivery date +DeliveryDateShort=Deliv. date +CreateDeliveryOrder=Generate delivery order +QtyDelivered=Qty delivered +SetDeliveryDate=Set shipping date +ValidateDeliveryReceipt=Validate delivery receipt +ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt ? +DeleteDeliveryReceipt=Delete delivery receipt +DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt %s ? +DeliveryMethod=Delivery method +TrackingNumber=Tracking number +DeliveryNotValidated=Delivery not validated +# merou PDF model +NameAndSignature=Name and Signature : +ToAndDate=To___________________________________ on ____/_____/__________ +GoodStatusDeclaration=Have received the goods above in good condition, +Deliverer=Deliverer : +Sender=Sender +Recipient=Recipient +ErrorStockIsNotEnough=There's not enough stock +Shippable=Shippable +NonShippable=Not Shippable diff --git a/htdocs/langs/lo_LA/dict.lang b/htdocs/langs/lo_LA/dict.lang new file mode 100644 index 00000000000..bef1f4821b4 --- /dev/null +++ b/htdocs/langs/lo_LA/dict.lang @@ -0,0 +1,327 @@ +# Dolibarr language file - Source file is en_US - dict +CountryFR=France +CountryBE=Belgium +CountryIT=Italy +CountryES=Spain +CountryDE=Germany +CountryCH=Switzerland +CountryGB=Great Britain +CountryUK=United Kingdom +CountryIE=Ireland +CountryCN=China +CountryTN=Tunisia +CountryUS=United States +CountryMA=Morocco +CountryDZ=Algeria +CountryCA=Canada +CountryTG=Togo +CountryGA=Gabon +CountryNL=Netherlands +CountryHU=Hungary +CountryRU=Russia +CountrySE=Sweden +CountryCI=Ivoiry Coast +CountrySN=Senegal +CountryAR=Argentina +CountryCM=Cameroon +CountryPT=Portugal +CountrySA=Saudi Arabia +CountryMC=Monaco +CountryAU=Australia +CountrySG=Singapore +CountryAF=Afghanistan +CountryAX=Åland Islands +CountryAL=Albania +CountryAS=American Samoa +CountryAD=Andorra +CountryAO=Angola +CountryAI=Anguilla +CountryAQ=Antarctica +CountryAG=Antigua and Barbuda +CountryAM=Armenia +CountryAW=Aruba +CountryAT=Austria +CountryAZ=Azerbaijan +CountryBS=Bahamas +CountryBH=Bahrain +CountryBD=Bangladesh +CountryBB=Barbados +CountryBY=Belarus +CountryBZ=Belize +CountryBJ=Benin +CountryBM=Bermuda +CountryBT=Bhutan +CountryBO=Bolivia +CountryBA=Bosnia and Herzegovina +CountryBW=Botswana +CountryBV=Bouvet Island +CountryBR=Brazil +CountryIO=British Indian Ocean Territory +CountryBN=Brunei Darussalam +CountryBG=Bulgaria +CountryBF=Burkina Faso +CountryBI=Burundi +CountryKH=Cambodia +CountryCV=Cape Verde +CountryKY=Cayman Islands +CountryCF=Central African Republic +CountryTD=Chad +CountryCL=Chile +CountryCX=Christmas Island +CountryCC=Cocos (Keeling) Islands +CountryCO=Colombia +CountryKM=Comoros +CountryCG=Congo +CountryCD=Congo, The Democratic Republic of the +CountryCK=Cook Islands +CountryCR=Costa Rica +CountryHR=Croatia +CountryCU=Cuba +CountryCY=Cyprus +CountryCZ=Czech Republic +CountryDK=Denmark +CountryDJ=Djibouti +CountryDM=Dominica +CountryDO=Dominican Republic +CountryEC=Ecuador +CountryEG=Egypt +CountrySV=El Salvador +CountryGQ=Equatorial Guinea +CountryER=Eritrea +CountryEE=Estonia +CountryET=Ethiopia +CountryFK=Falkland Islands +CountryFO=Faroe Islands +CountryFJ=Fiji Islands +CountryFI=Finland +CountryGF=French Guiana +CountryPF=French Polynesia +CountryTF=French Southern Territories +CountryGM=Gambia +CountryGE=Georgia +CountryGH=Ghana +CountryGI=Gibraltar +CountryGR=Greece +CountryGL=Greenland +CountryGD=Grenada +CountryGP=Guadeloupe +CountryGU=Guam +CountryGT=Guatemala +CountryGN=Guinea +CountryGW=Guinea-Bissau +CountryGY=Guyana +CountryHT=Haïti +CountryHM=Heard Island and McDonald +CountryVA=Holy See (Vatican City State) +CountryHN=Honduras +CountryHK=Hong Kong +CountryIS=Icelande +CountryIN=India +CountryID=Indonesia +CountryIR=Iran +CountryIQ=Iraq +CountryIL=Israel +CountryJM=Jamaica +CountryJP=Japan +CountryJO=Jordan +CountryKZ=Kazakhstan +CountryKE=Kenya +CountryKI=Kiribati +CountryKP=North Korea +CountryKR=South Korea +CountryKW=Kuwait +CountryKG=Kyrghyztan +CountryLA=Lao +CountryLV=Latvia +CountryLB=Lebanon +CountryLS=Lesotho +CountryLR=Liberia +CountryLY=Libyan +CountryLI=Liechtenstein +CountryLT=Lituania +CountryLU=Luxembourg +CountryMO=Macao +CountryMK=Macedonia, the former Yugoslav of +CountryMG=Madagascar +CountryMW=Malawi +CountryMY=Malaysia +CountryMV=Maldives +CountryML=Mali +CountryMT=Malta +CountryMH=Marshall Islands +CountryMQ=Martinique +CountryMR=Mauritania +CountryMU=Mauritius +CountryYT=Mayotte +CountryMX=Mexico +CountryFM=Micronesia +CountryMD=Moldova +CountryMN=Mongolia +CountryMS=Monserrat +CountryMZ=Mozambique +CountryMM=Birmania (Myanmar) +CountryNA=Namibia +CountryNR=Nauru +CountryNP=Nepal +CountryAN=Netherlands Antilles +CountryNC=New Caledonia +CountryNZ=New Zealand +CountryNI=Nicaragua +CountryNE=Niger +CountryNG=Nigeria +CountryNU=Niue +CountryNF=Norfolk Island +CountryMP=Northern Mariana Islands +CountryNO=Norway +CountryOM=Oman +CountryPK=Pakistan +CountryPW=Palau +CountryPS=Palestinian Territory, Occupied +CountryPA=Panama +CountryPG=Papua New Guinea +CountryPY=Paraguay +CountryPE=Peru +CountryPH=Philippines +CountryPN=Pitcairn Islands +CountryPL=Poland +CountryPR=Puerto Rico +CountryQA=Qatar +CountryRE=Reunion +CountryRO=Romania +CountryRW=Rwanda +CountrySH=Saint Helena +CountryKN=Saint Kitts and Nevis +CountryLC=Saint Lucia +CountryPM=Saint Pierre and Miquelon +CountryVC=Saint Vincent and Grenadines +CountryWS=Samoa +CountrySM=San Marino +CountryST=Sao Tome and Principe +CountryRS=Serbia +CountrySC=Seychelles +CountrySL=Sierra Leone +CountrySK=Slovakia +CountrySI=Slovenia +CountrySB=Solomon Islands +CountrySO=Somalia +CountryZA=South Africa +CountryGS=South Georgia and the South Sandwich Islands +CountryLK=Sri Lanka +CountrySD=Sudan +CountrySR=Suriname +CountrySJ=Svalbard and Jan Mayen +CountrySZ=Swaziland +CountrySY=Syrian +CountryTW=Taiwan +CountryTJ=Tajikistan +CountryTZ=Tanzania +CountryTH=Thailand +CountryTL=Timor-Leste +CountryTK=Tokelau +CountryTO=Tonga +CountryTT=Trinidad and Tobago +CountryTR=Turkey +CountryTM=Turkmenistan +CountryTC=Turks and Cailos Islands +CountryTV=Tuvalu +CountryUG=Uganda +CountryUA=Ukraine +CountryAE=United Arab Emirates +CountryUM=United States Minor Outlying Islands +CountryUY=Uruguay +CountryUZ=Uzbekistan +CountryVU=Vanuatu +CountryVE=Venezuela +CountryVN=Viet Nam +CountryVG=Virgin Islands, British +CountryVI=Virgin Islands, U.S. +CountryWF=Wallis and Futuna +CountryEH=Western Sahara +CountryYE=Yemen +CountryZM=Zambia +CountryZW=Zimbabwe +CountryGG=Guernsey +CountryIM=Isle of Man +CountryJE=Jersey +CountryME=Montenegro +CountryBL=Saint Barthelemy +CountryMF=Saint Martin + +##### Civilities ##### +CivilityMME=Mrs. +CivilityMR=Mr. +CivilityMLE=Ms. +CivilityMTRE=Master +CivilityDR=Doctor +##### Currencies ##### +Currencyeuros=Euros +CurrencyAUD=AU Dollars +CurrencySingAUD=AU Dollar +CurrencyCAD=CAN Dollars +CurrencySingCAD=CAN Dollar +CurrencyCHF=Swiss Francs +CurrencySingCHF=Swiss Franc +CurrencyEUR=Euros +CurrencySingEUR=Euro +CurrencyFRF=French Francs +CurrencySingFRF=French Franc +CurrencyGBP=GB Pounds +CurrencySingGBP=GB Pound +CurrencyINR=Indian rupees +CurrencySingINR=Indian rupee +CurrencyMAD=Dirham +CurrencySingMAD=Dirham +CurrencyMGA=Ariary +CurrencySingMGA=Ariary +CurrencyMUR=Mauritius rupees +CurrencySingMUR=Mauritius rupee +CurrencyNOK=Norwegian krones +CurrencySingNOK=Norwegian krone +CurrencyTND=Tunisian dinars +CurrencySingTND=Tunisian dinar +CurrencyUSD=US Dollars +CurrencySingUSD=US Dollar +CurrencyUAH=Hryvnia +CurrencySingUAH=Hryvnia +CurrencyXAF=CFA Francs BEAC +CurrencySingXAF=CFA Franc BEAC +CurrencyXOF=CFA Francs BCEAO +CurrencySingXOF=CFA Franc BCEAO +CurrencyXPF=CFP Francs +CurrencySingXPF=CFP Franc +CurrencyCentSingEUR=cent +CurrencyCentINR=paisa +CurrencyCentSingINR=paise +CurrencyThousandthSingTND=thousandth +#### Input reasons ##### +DemandReasonTypeSRC_INTE=Internet +DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign +DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign +DemandReasonTypeSRC_CAMP_PHO=Phone campaign +DemandReasonTypeSRC_CAMP_FAX=Fax campaign +DemandReasonTypeSRC_COMM=Commercial contact +DemandReasonTypeSRC_SHOP=Shop contact +DemandReasonTypeSRC_WOM=Word of mouth +DemandReasonTypeSRC_PARTNER=Partner +DemandReasonTypeSRC_EMPLOYEE=Employee +DemandReasonTypeSRC_SPONSORING=Sponsorship +#### Paper formats #### +PaperFormatEU4A0=Format 4A0 +PaperFormatEU2A0=Format 2A0 +PaperFormatEUA0=Format A0 +PaperFormatEUA1=Format A1 +PaperFormatEUA2=Format A2 +PaperFormatEUA3=Format A3 +PaperFormatEUA4=Format A4 +PaperFormatEUA5=Format A5 +PaperFormatEUA6=Format A6 +PaperFormatUSLETTER=Format Letter US +PaperFormatUSLEGAL=Format Legal US +PaperFormatUSEXECUTIVE=Format Executive US +PaperFormatUSLEDGER=Format Ledger/Tabloid +PaperFormatCAP1=Format P1 Canada +PaperFormatCAP2=Format P2 Canada +PaperFormatCAP3=Format P3 Canada +PaperFormatCAP4=Format P4 Canada +PaperFormatCAP5=Format P5 Canada +PaperFormatCAP6=Format P6 Canada diff --git a/htdocs/langs/lo_LA/donations.lang b/htdocs/langs/lo_LA/donations.lang new file mode 100644 index 00000000000..f7aed91cf81 --- /dev/null +++ b/htdocs/langs/lo_LA/donations.lang @@ -0,0 +1,38 @@ +# Dolibarr language file - Source file is en_US - donations +Donation=Donation +Donations=Donations +DonationRef=Donation ref. +Donor=Donor +Donors=Donors +AddDonation=Create a donation +NewDonation=New donation +ShowDonation=Show donation +DonationPromise=Gift promise +PromisesNotValid=Not validated promises +PromisesValid=Validated promises +DonationsPaid=Donations paid +DonationsReceived=Donations received +PublicDonation=Public donation +DonationsNumber=Donation number +DonationsArea=Donations area +DonationStatusPromiseNotValidated=Draft promise +DonationStatusPromiseValidated=Validated promise +DonationStatusPaid=Donation received +DonationStatusPromiseNotValidatedShort=Draft +DonationStatusPromiseValidatedShort=Validated +DonationStatusPaidShort=Received +ValidPromess=Validate promise +DonationReceipt=Donation receipt +BuildDonationReceipt=Build receipt +DonationsModels=Documents models for donation receipts +LastModifiedDonations=Last %s modified donations +SearchADonation=Search a donation +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/lo_LA/ecm.lang b/htdocs/langs/lo_LA/ecm.lang new file mode 100644 index 00000000000..4a1931a3217 --- /dev/null +++ b/htdocs/langs/lo_LA/ecm.lang @@ -0,0 +1,57 @@ +# Dolibarr language file - Source file is en_US - ecm +MenuECM=Documents +DocsMine=My documents +DocsGenerated=Generated documents +DocsElements=Elements documents +DocsThirdParties=Documents third parties +DocsContracts=Documents contracts +DocsProposals=Documents proposals +DocsOrders=Documents orders +DocsInvoices=Documents invoices +ECMNbOfDocs=Nb of documents in directory +ECMNbOfDocsSmall=Nb of doc. +ECMSection=Directory +ECMSectionManual=Manual directory +ECMSectionAuto=Automatic directory +ECMSectionsManual=Manual tree +ECMSectionsAuto=Automatic tree +ECMSections=Directories +ECMRoot=Root +ECMNewSection=New directory +ECMAddSection=Add directory +ECMNewDocument=New document +ECMCreationDate=Creation date +ECMNbOfFilesInDir=Number of files in directory +ECMNbOfSubDir=Number of sub-directories +ECMNbOfFilesInSubDir=Number of files in sub-directories +ECMCreationUser=Creator +ECMArea=EDM area +ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr. +ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.
* Manual directories can be used to save documents not linked to a particular element. +ECMSectionWasRemoved=Directory %s has been deleted. +ECMDocumentsSection=Document of directory +ECMSearchByKeywords=Search by keywords +ECMSearchByEntity=Search by object +ECMSectionOfDocuments=Directories of documents +ECMTypeManual=Manual +ECMTypeAuto=Automatic +ECMDocsBySocialContributions=Documents linked to social contributions +ECMDocsByThirdParties=Documents linked to third parties +ECMDocsByProposals=Documents linked to proposals +ECMDocsByOrders=Documents linked to customers orders +ECMDocsByContracts=Documents linked to contracts +ECMDocsByInvoices=Documents linked to customers invoices +ECMDocsByProducts=Documents linked to products +ECMDocsByProjects=Documents linked to projects +ECMDocsByUsers=Documents linked to users +ECMDocsByInterventions=Documents linked to interventions +ECMNoDirectoryYet=No directory created +ShowECMSection=Show directory +DeleteSection=Remove directory +ConfirmDeleteSection=Can you confirm you want to delete the directory %s ? +ECMDirectoryForFiles=Relative directory for files +CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files +ECMFileManager=File manager +ECMSelectASection=Select a directory on left tree... +DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory. + diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang new file mode 100644 index 00000000000..700e6344d7d --- /dev/null +++ b/htdocs/langs/lo_LA/errors.lang @@ -0,0 +1,183 @@ +# Dolibarr language file - Source file is en_US - errors + +# No errors +NoErrorCommitIsDone=No error, we commit +# Errors +Error=Error +Errors=Errors +ErrorButCommitIsDone=Errors found but we validate despite this +ErrorBadEMail=EMail %s is wrong +ErrorBadUrl=Url %s is wrong +ErrorLoginAlreadyExists=Login %s already exists. +ErrorGroupAlreadyExists=Group %s already exists. +ErrorRecordNotFound=Record not found. +ErrorFailToCopyFile=Failed to copy file '%s' into '%s'. +ErrorFailToRenameFile=Failed to rename file '%s' into '%s'. +ErrorFailToDeleteFile=Failed to remove file '%s'. +ErrorFailToCreateFile=Failed to create file '%s'. +ErrorFailToRenameDir=Failed to rename directory '%s' into '%s'. +ErrorFailToCreateDir=Failed to create directory '%s'. +ErrorFailToDeleteDir=Failed to delete directory '%s'. +ErrorFailedToDeleteJoinedFiles=Can not delete environment because there is some joined files. Remove join files first. +ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type. +ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only. +ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different. +ErrorBadThirdPartyName=Bad value for third party name +ErrorProdIdIsMandatory=The %s is mandatory +ErrorBadCustomerCodeSyntax=Bad syntax for customer code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. +ErrorCustomerCodeRequired=Customer code required +ErrorBarCodeRequired=Bar code required +ErrorCustomerCodeAlreadyUsed=Customer code already used +ErrorBarCodeAlreadyUsed=Bar code already used +ErrorPrefixRequired=Prefix required +ErrorUrlNotValid=The website address is incorrect +ErrorBadSupplierCodeSyntax=Bad syntax for supplier code +ErrorSupplierCodeRequired=Supplier code required +ErrorSupplierCodeAlreadyUsed=Supplier code already used +ErrorBadParameters=Bad parameters +ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) +ErrorBadDateFormat=Value '%s' has wrong date format +ErrorWrongDate=Date is not correct! +ErrorFailedToWriteInDir=Failed to write in directory %s +ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s) +ErrorUserCannotBeDelete=User can not be deleted. May be it is associated on Dolibarr entities. +ErrorFieldsRequired=Some required fields were not filled. +ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter safe_mode is enabled on this PHP, check that Dolibarr php files owns to web server user (or group). +ErrorNoMailDefinedForThisUser=No mail defined for this user +ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display. +ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'. +ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id. +ErrorFileNotFound=File %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) +ErrorDirNotFound=Directory %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) +ErrorFunctionNotAvailableInPHP=Function %s is required for this feature but is not available in this version/setup of PHP. +ErrorDirAlreadyExists=A directory with this name already exists. +ErrorFileAlreadyExists=A file with this name already exists. +ErrorPartialFile=File not received completely by server. +ErrorNoTmpDir=Temporary directy %s does not exists. +ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin. +ErrorFileSizeTooLarge=File size is too large. +ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum) +ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum) +ErrorNoValueForSelectType=Please fill value for select list +ErrorNoValueForCheckBoxType=Please fill value for checkbox list +ErrorNoValueForRadioType=Please fill value for radio list +ErrorBadFormatValueList=The list value cannot have more than one come : %s, but need at least one: llave,valores +ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters. +ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters. +ErrorNoAccountancyModuleLoaded=No accountancy module activated +ErrorExportDuplicateProfil=This profile name already exists for this export set. +ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete. +ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors. +ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled. +ErrorRefAlreadyExists=Ref used for creation already exists. +ErrorPleaseTypeBankTransactionReportName=Please type bank receipt name where transaction is reported (Format YYYYMM or YYYYMMDD) +ErrorRecordHasChildren=Failed to delete records since it has some childs. +ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object. +ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display. +ErrorPasswordsMustMatch=Both typed passwords must match each other +ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. +ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) +ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) +ErrorsOnXLines=Errors on %s source record(s) +ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) +ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s" +ErrorDatabaseParameterWrong=Database setup parameter '%s' has a value not compatible to use Dolibarr (must have value '%s'). +ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module. +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Setup - Modules to complete. +ErrorBadMask=Error on mask +ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number +ErrorBadMaskBadRazMonth=Error, bad reset value +ErrorMaxNumberReachForThisMask=Max number reach for this mask +ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits +ErrorSelectAtLeastOne=Error. Select at least one entry. +ErrorProductWithRefNotExist=Product with reference '%s' don't exist +ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated +ErrorProdIdAlreadyExist=%s is assigned to another third +ErrorFailedToSendPassword=Failed to send password +ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information. +ErrorPasswordDiffers=Passwords differs, please type them again. +ErrorForbidden=Access denied.
You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user. +ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s. +ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...). +ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display. +ErrorRecordAlreadyExists=Record already exists +ErrorCantReadFile=Failed to read file '%s' +ErrorCantReadDir=Failed to read directory '%s' +ErrorFailedToFindEntity=Failed to read environment '%s' +ErrorBadLoginPassword=Bad value for login or password +ErrorLoginDisabled=Your account has been disabled +ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP Safe Mode is enabled, check that command is inside a directory defined by parameter safe_mode_exec_dir. +ErrorFailedToChangePassword=Failed to change password +ErrorLoginDoesNotExists=User with login %s could not be found. +ErrorLoginHasNoEmail=This user has no email address. Process aborted. +ErrorBadValueForCode=Bad value for security code. Try again with new value... +ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative +ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that +ErrorNoActivatedBarcode=No barcode type activated +ErrUnzipFails=Failed to unzip %s with ZipArchive +ErrNoZipEngine=No engine to unzip %s file in this PHP +ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package +ErrorFileRequired=It takes a package Dolibarr file +ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal +ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base +ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base +ErrorNewValueCantMatchOldValue=New value can't be equal to old one +ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process. +ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start'). +ErrorFailedToAddContact=Failed to add contact +ErrorDateMustBeBeforeToday=The date can not be greater than today +ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode. +ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature. +ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s +ErrorWarehouseMustDiffers=Source and target warehouses must differs +ErrorBadFormat=Bad format! +ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. +ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' +ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action + +# Warnings +WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined +WarningSafeModeOnCheckExecDir=Warning, PHP option safe_mode is on so command must be stored inside a directory declared by php parameter safe_mode_exec_dir. +WarningAllowUrlFopenMustBeOn=Parameter allow_url_fopen must be set to on in filer php.ini for having this module working completely. You must modify this file manually. +WarningBuildScriptNotRunned=Script %s was not yet ran to build graphics, or there is no data to show. +WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists. +WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this. +WarningConfFileMustBeReadOnly=Warning, your config file (htdocs/conf/conf.php) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe. +WarningsOnXLines=Warnings on %s source record(s) +WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be choosed by default until you check your module setup. +WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file install.lock into directory %s. Missing this file is a security hole. +WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup). +WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution. +WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box. +WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). +WarningNotRelevant=Irrelevant operation for this dataset +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/lo_LA/exports.lang b/htdocs/langs/lo_LA/exports.lang new file mode 100644 index 00000000000..d79df485608 --- /dev/null +++ b/htdocs/langs/lo_LA/exports.lang @@ -0,0 +1,134 @@ +# Dolibarr language file - Source file is en_US - exports +ExportsArea=Exports area +ImportArea=Import area +NewExport=New export +NewImport=New import +ExportableDatas=Exportable dataset +ImportableDatas=Importable dataset +SelectExportDataSet=Choose dataset you want to export... +SelectImportDataSet=Choose dataset you want to import... +SelectExportFields=Choose fields you want to export, or select a predefined export profile +SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile: +NotImportedFields=Fields of source file not imported +SaveExportModel=Save this export profile if you plan to reuse it later... +SaveImportModel=Save this import profile if you plan to reuse it later... +ExportModelName=Export profile name +ExportModelSaved=Export profile saved under name %s. +ExportableFields=Exportable fields +ExportedFields=Exported fields +ImportModelName=Import profile name +ImportModelSaved=Import profile saved under name %s. +ImportableFields=Importable fields +ImportedFields=Imported fields +DatasetToExport=Dataset to export +DatasetToImport=Import file into dataset +NoDiscardedFields=No fields in source file are discarded +Dataset=Dataset +ChooseFieldsOrdersAndTitle=Choose fields order... +FieldsOrder=Fields order +FieldsTitle=Fields title +FieldOrder=Field order +FieldTitle=Field title +ChooseExportFormat=Choose export format +NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file... +AvailableFormats=Available formats +LibraryShort=Library +LibraryUsed=Library used +LibraryVersion=Version +Step=Step +FormatedImport=Import assistant +FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge. +FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load. +FormatedExport=Export assistant +FormatedExportDesc1=This area allows to export personalized data, using an assistant to help you in process without technical knowledge. +FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order. +FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to. +Sheet=Sheet +NoImportableData=No importable data (no module with definitions to allow data imports) +FileSuccessfullyBuilt=Export file generated +SQLUsedForExport=SQL Request used to build export file +LineId=Id of line +LineDescription=Description of line +LineUnitPrice=Unit price of line +LineVATRate=VAT Rate of line +LineQty=Quantity for line +LineTotalHT=Amount net of tax for line +LineTotalTTC=Amount with tax for line +LineTotalVAT=Amount of VAT for line +TypeOfLineServiceOrProduct=Type of line (0=product, 1=service) +FileWithDataToImport=File with data to import +FileToImport=Source file to import +FileMustHaveOneOfFollowingFormat=File to import must have one of following format +DownloadEmptyExample=Download example of empty source file +ChooseFormatOfFileToImport=Choose file format to use as import file format by clicking on picto %s to select it... +ChooseFileToImport=Upload file then click on picto %s to select file as source import file... +SourceFileFormat=Source file format +FieldsInSourceFile=Fields in source file +FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory) +Field=Field +NoFields=No fields +MoveField=Move field column number %s +ExampleOfImportFile=Example_of_import_file +SaveImportProfile=Save this import profile +ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name. +ImportSummary=Import setup summary +TablesTarget=Targeted tables +FieldsTarget=Targeted fields +TableTarget=Targeted table +FieldTarget=Targeted field +FieldSource=Source field +DoNotImportFirstLine=Do not import first line of source file +NbOfSourceLines=Number of lines in source file +NowClickToTestTheImport=Check import parameters you have defined. If they are correct, click on button "%s" to launch a simulation of import process (no data will be changed in your database, it's only a simulation for the moment)... +RunSimulateImportFile=Launch the import simulation +FieldNeedSource=This field requires data from the source file +SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file +InformationOnSourceFile=Information on source file +InformationOnTargetTables=Information on target fields +SelectAtLeastOneField=Switch at least one source field in the column of fields to export +SelectFormat=Choose this import file format +RunImportFile=Launch import file +NowClickToRunTheImport=Check result of import simulation. If everything is ok, launch the definitive import. +DataLoadedWithId=All data will be loaded with the following import id: %s +ErrorMissingMandatoryValue=Mandatory data is empty in source file for field %s. +TooMuchErrors=There is still %s other source lines with errors but output has been limited. +TooMuchWarnings=There is still %s other source lines with warnings but output has been limited. +EmptyLine=Empty line (will be discarded) +CorrectErrorBeforeRunningImport=You must first correct all errors before running definitive import. +FileWasImported=File was imported with number %s. +YouCanUseImportIdToFindRecord=You can find all imported records in your database by filtering on field import_key='%s'. +NbOfLinesOK=Number of lines with no errors and no warnings: %s. +NbOfLinesImported=Number of lines successfully imported: %s. +DataComeFromNoWhere=Value to insert comes from nowhere in source file. +DataComeFromFileFieldNb=Value to insert comes from field number %s in source file. +DataComeFromIdFoundFromRef=Value that comes from field number %s of source file will be used to find id of parent object to use (So the objet %s that has the ref. from source file must exists into Dolibarr). +DataComeFromIdFoundFromCodeId=Code that comes from field number %s of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary %s). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases. +DataIsInsertedInto=Data coming from source file will be inserted into the following field: +DataIDSourceIsInsertedInto=The id of parent object found using the data in source file, will be inserted into the following field: +DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field: +SourceRequired=Data value is mandatory +SourceExample=Example of possible data value +ExampleAnyRefFoundIntoElement=Any ref found for element %s +ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s +CSVFormatDesc=Comma Separated Value file format (.csv).
This is a text file format where fields are separated by separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ]. +Excel95FormatDesc=Excel file format (.xls)
This is native Excel 95 format (BIFF5). +Excel2007FormatDesc=Excel file format (.xlsx)
This is native Excel 2007 format (SpreadsheetML). +TsvFormatDesc=Tab Separated Value file format (.tsv)
This is a text file format where fields are separated by a tabulator [tab]. +ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ). +CsvOptions=Csv Options +Separator=Separator +Enclosure=Enclosure +SuppliersProducts=Suppliers Products +BankCode=Bank code +DeskCode=Desk code +BankAccountNumber=Account number +BankAccountNumberKey=Key +SpecialCode=Special code +ExportStringFilter=%% allows replacing one or more characters in the text +ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days +ExportNumericFilter='NNNNN' filters by one value
'NNNNN+NNNNN' filters over a range of values
'>NNNNN' filters by lower values
'>NNNNN' filters by higher values +## filters +SelectFilterFields=If you want to filter on some values, just input values here. +FilterableFields=Champs Filtrables +FilteredFields=Filtered fields +FilteredFieldsValues=Value for filter diff --git a/htdocs/langs/lo_LA/externalsite.lang b/htdocs/langs/lo_LA/externalsite.lang new file mode 100644 index 00000000000..da4853df0df --- /dev/null +++ b/htdocs/langs/lo_LA/externalsite.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - externalsite +ExternalSiteSetup=Setup link to external website +ExternalSiteURL=External Site URL +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/lo_LA/ftp.lang b/htdocs/langs/lo_LA/ftp.lang new file mode 100644 index 00000000000..9984ce689ee --- /dev/null +++ b/htdocs/langs/lo_LA/ftp.lang @@ -0,0 +1,12 @@ +# Dolibarr language file - Source file is en_US - ftp +FTPClientSetup=FTP Client module setup +NewFTPClient=New FTP connection setup +FTPArea=FTP Area +FTPAreaDesc=This screen show you content of a FTP server view +SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete +FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions +FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s) +FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password +FTPFailedToRemoveFile=Failed to remove file %s. +FTPFailedToRemoveDir=Failed to remove directory %s (Check permissions and that directory is empty). +FTPPassiveMode=Passive mode diff --git a/htdocs/langs/lo_LA/help.lang b/htdocs/langs/lo_LA/help.lang new file mode 100644 index 00000000000..1bbd6e94f03 --- /dev/null +++ b/htdocs/langs/lo_LA/help.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - help +CommunitySupport=Forum/Wiki support +EMailSupport=Emails support +RemoteControlSupport=Online real time / remote support +OtherSupport=Other support +ToSeeListOfAvailableRessources=To contact/see available resources: +ClickHere=Click here +HelpCenter=Help center +DolibarrHelpCenter=Dolibarr help and support center +ToGoBackToDolibarr=Otherwise, click here to use Dolibarr +TypeOfSupport=Source of support +TypeSupportCommunauty=Community (free) +TypeSupportCommercial=Commercial +TypeOfHelp=Type +NeedHelpCenter=Need help or support ? +Efficiency=Efficiency +TypeHelpOnly=Help only +TypeHelpDev=Help+Development +TypeHelpDevForm=Help+Development+Formation +ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on %s web site: +ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button +ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests. +BackToHelpCenter=Otherwise, click here to go back to help center home page. +LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated): +PossibleLanguages=Supported languages +MakeADonation=Help Dolibarr project, make a donation +SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation +SeeOfficalSupport=For official Dolibarr support in your language:
%s diff --git a/htdocs/langs/lo_LA/holiday.lang b/htdocs/langs/lo_LA/holiday.lang new file mode 100644 index 00000000000..f5b87fefb08 --- /dev/null +++ b/htdocs/langs/lo_LA/holiday.lang @@ -0,0 +1,148 @@ +# Dolibarr language file - Source file is en_US - holiday +HRM=HRM +Holidays=Leaves +CPTitreMenu=Leaves +MenuReportMonth=Monthly statement +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request +Employe=Employee +DateDebCP=Start date +DateFinCP=End date +DateCreateCP=Creation date +DraftCP=Draft +ToReviewCP=Awaiting approval +ApprovedCP=Approved +CancelCP=Canceled +RefuseCP=Refused +ValidatorCP=Approbator +ListeCP=List of leaves +ReviewedByCP=Will be reviewed by +DescCP=Description +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. +ErrorEndDateCP=You must select an end date greater than the start date. +ErrorSQLCreateCP=An SQL error occurred during the creation: +ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ReturnCP=Return to previous page +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request +InfosWorkflowCP=Information Workflow +RequestByCP=Requested by +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed +EditCP=Edit +DeleteCP=Delete +ActionValidCP=Validate +ActionRefuseCP=Refuse +ActionCancelCP=Cancel +StatutCP=Status +SendToValidationCP=Send to validation +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. +CantUpdate=You cannot update this leave request. +NoDateDebut=You must select a start date. +NoDateFin=You must select an end date. +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request +ConfirmValidCP=Are you sure you want to approve the leave request? +DateValidCP=Date approved +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? +TitleRefuseCP=Refuse the leave request +ConfirmRefuseCP=Are you sure you want to refuse the leave request? +NoMotifRefuseCP=You must choose a reason for refusing the request. +TitleCancelCP=Cancel the leave request +ConfirmCancelCP=Are you sure you want to cancel the leave request? +DetailRefusCP=Reason for refusal +DateRefusCP=Date of refusal +DateCancelCP=Date of cancellation +DefineEventUserCP=Assign an exceptional leave for a user +addEventToUserCP=Assign leave +MotifCP=Reason +UserCP=User +ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. +AddEventToUserOkCP=The addition of the exceptional leave has been completed. +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days +ActionByCP=Performed by +UserUpdateCP=For the user +PrevSoldeCP=Previous Balance +NewSoldeCP=New Balance +alreadyCPexist=A leave request has already been done on this period. +UserName=Name +Employee=Employee +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation +HolidaysMonthlyUpdate=Monthly update +ManualUpdate=Manual update +HolidaysCancelation=Leave request cancelation + +## Configuration du Module ## +ConfCP=Configuration of leave request module +DescOptionCP=Description of the option +ValueOptionCP=Value +GroupToValidateCP=Group with the ability to approve leave requests +ConfirmConfigCP=Validate the configuration +LastUpdateCP=Last automatic update of leaves allocation +UpdateConfCPOK=Updated successfully. +ErrorUpdateConfCP=An error occurred during the update, please try again. +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of leave request +TitleOptionEventCP=Settings of leave requets for events +ValidEventCP=Validate +UpdateEventCP=Update events +CreateEventCP=Create +NameEventCP=Event name +OkCreateEventCP=The addition of the event went well. +ErrorCreateEventCP=Error creating the event. +UpdateEventOkCP=The update of the event went well. +ErrorUpdateEventCP=Error while updating the event. +DeleteEventCP=Delete Event +DeleteEventOkCP=The event has been deleted. +ErrorDeleteEventCP=Error while deleting the event. +TitleDeleteEventCP=Delete a exceptional leave +TitleCreateEventCP=Create a exceptional leave +TitleUpdateEventCP=Edit or delete a exceptional leave +DeleteEventOptionCP=Delete +UpdateEventOptionCP=Update +ErrorMailNotSend=An error occurred while sending email: +NoCPforMonth=No leave this month. +nbJours=Number days +TitleAdminCP=Configuration of Leaves +#Messages +Hello=Hello +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/lo_LA/install.lang b/htdocs/langs/lo_LA/install.lang new file mode 100644 index 00000000000..dcd8df6e7db --- /dev/null +++ b/htdocs/langs/lo_LA/install.lang @@ -0,0 +1,214 @@ +# Dolibarr language file - Source file is en_US - install +InstallEasy=Just follow the instructions step by step. +MiscellaneousChecks=Prerequisites check +DolibarrWelcome=Welcome to Dolibarr +ConfFileExists=Configuration file %s exists. +ConfFileDoesNotExists=Configuration file %s does not exist ! +ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file %s does not exist and could not be created ! +ConfFileCouldBeCreated=Configuration file %s could be created. +ConfFileIsNotWritable=Configuration file %s is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS). +ConfFileIsWritable=Configuration file %s is writable. +ConfFileReload=Reload all information from configuration file. +PHPSupportSessions=This PHP supports sessions. +PHPSupportPOSTGETOk=This PHP supports variables POST and GET. +PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter variables_order in php.ini. +PHPSupportGD=This PHP support GD graphical functions. +PHPSupportUTF8=This PHP support UTF8 functions. +PHPMemoryOK=Your PHP max session memory is set to %s. This should be enough. +PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This should be too low. Change your php.ini to set memory_limit parameter to at least %s bytes. +Recheck=Click here for a more significative test +ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup. +ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available. +ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr. +ErrorDirDoesNotExists=Directory %s does not exist. +ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters. +ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'. +ErrorFailedToCreateDatabase=Failed to create database '%s'. +ErrorFailedToConnectToDatabase=Failed to connect to database '%s'. +ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required. +ErrorPHPVersionTooLow=PHP version too old. Version %s is required. +WarningPHPVersionTooLow=PHP version too old. Version %s or more is expected. This version should allow install but is not supported. +ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found. +ErrorDatabaseAlreadyExists=Database '%s' already exists. +IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database". +IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option. +WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded. +PHPVersion=PHP Version +YouCanContinue=You can continue... +PleaseBePatient=Please be patient... +License=Using license +ConfigurationFile=Configuration file +WebPagesDirectory=Directory where web pages are stored +DocumentsDirectory=Directory to store uploaded and generated documents +URLRoot=URL Root +ForceHttps=Force secure connections (https) +CheckToForceHttps=Check this option to force secure connections (https).
This requires that the web server is configured with an SSL certificate. +DolibarrDatabase=Dolibarr Database +DatabaseChoice=Database choice +DatabaseType=Database type +DriverType=Driver type +Server=Server +ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server +ServerPortDescription=Database server port. Keep empty if unknown. +DatabaseServer=Database server +DatabaseName=Database name +DatabasePrefix=Database prefix table +Login=Login +AdminLogin=Login for Dolibarr database owner. +Password=Password +PasswordAgain=Retype password a second time +AdminPassword=Password for Dolibarr database owner. +CreateDatabase=Create database +CreateUser=Create owner +DatabaseSuperUserAccess=Database server - Superuser access +CheckToCreateDatabase=Check box if database does not exist and must be created.
In this case, you must fill the login/password for superuser account at the bottom of this page. +CheckToCreateUser=Check box if database owner does not exist and must be created.
In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists. +Experimental=(experimental) +DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists. +KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this) +SaveConfigurationFile=Save values +ConfigurationSaving=Saving configuration file +ServerConnection=Server connection +DatabaseConnection=Database connection +DatabaseCreation=Database creation +UserCreation=User creation +CreateDatabaseObjects=Database objects creation +ReferenceDataLoading=Reference data loading +TablesAndPrimaryKeysCreation=Tables and Primary keys creation +CreateTableAndPrimaryKey=Create table %s +CreateOtherKeysForTable=Create foreign keys and indexes for table %s +OtherKeysCreation=Foreign keys and indexes creation +FunctionsCreation=Functions creation +AdminAccountCreation=Administrator login creation +PleaseTypePassword=Please type a password, empty passwords are not allowed ! +PleaseTypeALogin=Please type a login ! +PasswordsMismatch=Passwords differs, please try again ! +SetupEnd=End of setup +SystemIsInstalled=This installation is complete. +SystemIsUpgraded=Dolibarr has been upgraded successfully. +YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below: +AdminLoginCreatedSuccessfuly=Dolibarr administrator login '%s' created successfuly. +GoToDolibarr=Go to Dolibarr +GoToSetupArea=Go to Dolibarr (setup area) +MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again. +GoToUpgradePage=Go to upgrade page again +Examples=Examples +WithNoSlashAtTheEnd=Without the slash "/" at the end +DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages. +LoginAlreadyExists=Already exists +DolibarrAdminLogin=Dolibarr admin login +AdminLoginAlreadyExists=Dolibarr administrator account '%s' already exists. Go back, if you want to create another one. +WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called install.lock into Dolibarr document directory, in order to avoid malicious use of it. +ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to access database type %s +FunctionNotAvailableInThisPHP=Not available on this PHP +MigrateScript=Migration script +ChoosedMigrateScript=Choose migration script +DataMigration=Data migration +DatabaseMigration=Structure database migration +ProcessMigrateScript=Script processing +ChooseYourSetupMode=Choose your setup mode and click "Start"... +FreshInstall=Fresh install +FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode. +Upgrade=Upgrade +UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data. +Start=Start +InstallNotAllowed=Setup not allowed by conf.php permissions +NotAvailable=Not available +YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process. +CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page. +AlreadyDone=Already migrated +DatabaseVersion=Database version +ServerVersion=Database server version +YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it. +CharsetChoice=Character set choice +CharacterSetClient=Character set used for generated HTML web pages +CharacterSetClientComment=Choose character set for web display.
Default proposed character set is the one of your database. +DBSortingCollation=Character sorting order +DBSortingCollationComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.
This parameter can't be defined if database already exists. +CharacterSetDatabase=Character set for database +CharacterSetDatabaseComment=Choose character set wanted for database creation.
This parameter can't be defined if database already exists. +YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. +YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. +BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong. +OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s +RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue. +KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do. +KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do. +KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do. +KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do. +FieldRenamed=Field renamed +IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user" +ErrorConnection=Server "%s", database name "%s", login "%s", or database password may be wrong or PHP client version may be too old compared to database version. +InstallChoiceRecommanded=Recommended choice to install version %s from your current version %s +InstallChoiceSuggested=Install choice suggested by installer. +MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished. +CheckThatDatabasenameIsCorrect=Check that database name "%s" is correct. +IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database". +OpenBaseDir=PHP openbasedir parameter +YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form). +YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form). +NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing. +MigrationCustomerOrderShipping=Migrate shipping for customer orders storage +MigrationShippingDelivery=Upgrade storage of shipping +MigrationShippingDelivery2=Upgrade storage of shipping 2 +MigrationFinished=Migration finished +LastStepDesc=Last step: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others. +ActivateModule=Activate module %s +ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) +WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) + +######### +# upgrade +MigrationFixData=Fix for denormalized data +MigrationOrder=Data migration for customer's orders +MigrationSupplierOrder=Data migration for supplier's orders +MigrationProposal=Data migration for commercial proposals +MigrationInvoice=Data migration for customer's invoices +MigrationContract=Data migration for contracts +MigrationSuccessfullUpdate=Upgrade successful +MigrationUpdateFailed=Failed upgrade process +MigrationRelationshipTables=Data migration for relationship tables (%s) +MigrationPaymentsUpdate=Payment data correction +MigrationPaymentsNumberToUpdate=%s payment(s) to update +MigrationProcessPaymentUpdate=Update payment(s) %s +MigrationPaymentsNothingToUpdate=No more things to do +MigrationPaymentsNothingUpdatable=No more payments that can be corrected +MigrationContractsUpdate=Contract data correction +MigrationContractsNumberToUpdate=%s contract(s) to update +MigrationContractsLineCreation=Create contract line for contract ref %s +MigrationContractsNothingToUpdate=No more things to do +MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do. +MigrationContractsEmptyDatesUpdate=Contract empty date correction +MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfuly +MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct +MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct +MigrationContractsInvalidDatesUpdate=Bad value date contract correction +MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s) +MigrationContractsInvalidDatesNumber=%s contracts modified +MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct +MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction +MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done succesfuly +MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct +MigrationReopeningContracts=Open contract closed by error +MigrationReopenThisContract=Reopen contract %s +MigrationReopenedContractsNumber=%s contracts modified +MigrationReopeningContractsNothingToUpdate=No closed contract to open +MigrationBankTransfertsUpdate=Update links between bank transaction and a bank transfer +MigrationBankTransfertsNothingToUpdate=All links are up to date +MigrationShipmentOrderMatching=Sendings receipt update +MigrationDeliveryOrderMatching=Delivery receipt update +MigrationDeliveryDetail=Delivery update +MigrationStockDetail=Update stock value of products +MigrationMenusDetail=Update dynamic menus tables +MigrationDeliveryAddress=Update delivery address in shipments +MigrationProjectTaskActors=Data migration for llx_projet_task_actors table +MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact +MigrationProjectTaskTime=Update time spent in seconds +MigrationActioncommElement=Update data on actions +MigrationPaymentMode=Data migration for payment mode +MigrationCategorieAssociation=Migration of categories +MigrationEvents=Migration of events to add event owner into assignement table + +ShowNotAvailableOptions=Show not available options +HideNotAvailableOptions=Hide not available options diff --git a/htdocs/langs/lo_LA/interventions.lang b/htdocs/langs/lo_LA/interventions.lang new file mode 100644 index 00000000000..c79da05364e --- /dev/null +++ b/htdocs/langs/lo_LA/interventions.lang @@ -0,0 +1,53 @@ +# Dolibarr language file - Source file is en_US - interventions +Intervention=Intervention +Interventions=Interventions +InterventionCard=Intervention card +NewIntervention=New intervention +AddIntervention=Create intervention +ListOfInterventions=List of interventions +EditIntervention=Edit intervention +ActionsOnFicheInter=Actions on intervention +LastInterventions=Last %s interventions +AllInterventions=All interventions +CreateDraftIntervention=Create draft +CustomerDoesNotHavePrefix=Customer does not have a prefix +InterventionContact=Intervention contact +DeleteIntervention=Delete intervention +ValidateIntervention=Validate intervention +ModifyIntervention=Modify intervention +DeleteInterventionLine=Delete intervention line +ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? +ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? +ConfirmModifyIntervention=Are you sure you want to modify this intervention ? +ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? +NameAndSignatureOfInternalContact=Name and signature of intervening : +NameAndSignatureOfExternalContact=Name and signature of customer : +DocumentModelStandard=Standard document model for interventions +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Billed +RelatedInterventions=Related interventions +ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention +##### Types de contacts ##### +TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention +TypeContact_fichinter_internal_INTERVENING=Intervening +TypeContact_fichinter_external_BILLING=Billing customer contact +TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +# Modele numérotation +ArcticNumRefModelDesc1=Generic number model +ArcticNumRefModelError=Failed to activate +PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/lo_LA/languages.lang b/htdocs/langs/lo_LA/languages.lang new file mode 100644 index 00000000000..d20aab00146 --- /dev/null +++ b/htdocs/langs/lo_LA/languages.lang @@ -0,0 +1,72 @@ +# Dolibarr language file - Source file is en_US - languages + +Language_ar_AR=Arabic +Language_ar_SA=Arabic +Language_bg_BG=Bulgarian +Language_bs_BA=Bosnian +Language_ca_ES=Catalan +Language_cs_CZ=Czech +Language_da_DA=Danish +Language_da_DK=Danish +Language_de_DE=German +Language_de_AT=German (Austria) +Language_de_CH=German (Switzerland) +Language_el_GR=Greek +Language_en_AU=English (Australia) +Language_en_CA=English (Canada) +Language_en_GB=English (United Kingdom) +Language_en_IN=English (India) +Language_en_NZ=English (New Zealand) +Language_en_SA=English (Saudi Arabia) +Language_en_US=English (United States) +Language_en_ZA=English (South Africa) +Language_es_ES=Spanish +Language_es_DO=Spanish (Dominican Republic) +Language_es_AR=Spanish (Argentina) +Language_es_CL=Spanish (Chile) +Language_es_HN=Spanish (Honduras) +Language_es_MX=Spanish (Mexico) +Language_es_PY=Spanish (Paraguay) +Language_es_PE=Spanish (Peru) +Language_es_PR=Spanish (Puerto Rico) +Language_et_EE=Estonian +Language_eu_ES=Basque +Language_fa_IR=Persian +Language_fi_FI=Fins +Language_fr_BE=French (Belgium) +Language_fr_CA=French (Canada) +Language_fr_CH=French (Switzerland) +Language_fr_FR=French +Language_fr_NC=French (New Caledonia) +Language_he_IL=Hebrew +Language_hr_HR=Croatian +Language_hu_HU=Hungarian +Language_id_ID=Indonesian +Language_is_IS=Icelandic +Language_it_IT=Italian +Language_ja_JP=Japanese +Language_ko_KR=Korean +Language_lt_LT=Lithuanian +Language_lv_LV=Latvian +Language_mk_MK=Macedonian +Language_nb_NO=Norwegian (Bokmål) +Language_nl_BE=Dutch (Belgium) +Language_nl_NL=Dutch (Netherlands) +Language_pl_PL=Polish +Language_pt_BR=Portuguese (Brazil) +Language_pt_PT=Portuguese +Language_ro_RO=Romanian +Language_ru_RU=Russian +Language_ru_UA=Russian (Ukraine) +Language_tr_TR=Turkish +Language_sl_SI=Slovenian +Language_sv_SV=Swedish +Language_sv_SE=Swedish +Language_sq_AL=Albanian +Language_sk_SK=Slovakian +Language_th_TH=Thai +Language_uk_UA=Ukrainian +Language_uz_UZ=Uzbek +Language_vi_VN=Vietnamese +Language_zh_CN=Chinese +Language_zh_TW=Chinese (Traditional) diff --git a/htdocs/langs/lo_LA/ldap.lang b/htdocs/langs/lo_LA/ldap.lang new file mode 100644 index 00000000000..02e457446a6 --- /dev/null +++ b/htdocs/langs/lo_LA/ldap.lang @@ -0,0 +1,29 @@ +# Dolibarr language file - Source file is en_US - ldap +DomainPassword=Password for domain +YouMustChangePassNextLogon=Password for user %s on the domain %s must be changed. +UserMustChangePassNextLogon=User must change password on the domain %s +LdapUacf_NORMAL_ACCOUNT=User account +LdapUacf_DONT_EXPIRE_PASSWORD=Password never expires +LdapUacf_ACCOUNTDISABLE=Account is disabled in the domain %s +LDAPInformationsForThisContact=Information in LDAP database for this contact +LDAPInformationsForThisUser=Information in LDAP database for this user +LDAPInformationsForThisGroup=Information in LDAP database for this group +LDAPInformationsForThisMember=Information in LDAP database for this member +LDAPAttribute=LDAP attribute +LDAPAttributes=LDAP attributes +LDAPCard=LDAP card +LDAPRecordNotFound=Record not found in LDAP database +LDAPUsers=Users in LDAP database +LDAPGroups=Groups in LDAP database +LDAPFieldStatus=Status +LDAPFieldFirstSubscriptionDate=First subscription date +LDAPFieldFirstSubscriptionAmount=First subscription amount +LDAPFieldLastSubscriptionDate=Last subscription date +LDAPFieldLastSubscriptionAmount=Last subscription amount +SynchronizeDolibarr2Ldap=Synchronize user (Dolibarr -> LDAP) +UserSynchronized=User synchronized +GroupSynchronized=Group synchronized +MemberSynchronized=Member synchronized +ContactSynchronized=Contact synchronized +ForceSynchronize=Force synchronizing Dolibarr -> LDAP +ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility. diff --git a/htdocs/langs/lo_LA/link.lang b/htdocs/langs/lo_LA/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/lo_LA/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/lo_LA/mailmanspip.lang b/htdocs/langs/lo_LA/mailmanspip.lang new file mode 100644 index 00000000000..c85b3d60db2 --- /dev/null +++ b/htdocs/langs/lo_LA/mailmanspip.lang @@ -0,0 +1,27 @@ +# Dolibarr language file - Source file is en_US - mailmanspip +MailmanSpipSetup=Mailman and SPIP module Setup +MailmanTitle=Mailman mailing list system +TestSubscribe=To test subscription to Mailman lists +TestUnSubscribe=To test unsubscribe from Mailman lists +MailmanCreationSuccess=Subscription test was executed succesfully +MailmanDeletionSuccess=Unsubscription test was executed succesfully +SynchroMailManEnabled=A Mailman update will be performed +SynchroSpipEnabled=A Spip update will be performed +DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password +DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions +DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions +DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma) +SPIPTitle=SPIP Content Management System +DescADHERENT_SPIP_SERVEUR=SPIP Server +DescADHERENT_SPIP_DB=SPIP database name +DescADHERENT_SPIP_USER=SPIP database login +DescADHERENT_SPIP_PASS=SPIP database password +AddIntoSpip=Add into SPIP +AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP? +AddIntoSpipError=Failed to add the user in SPIP +DeleteIntoSpip=Remove from SPIP +DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP? +DeleteIntoSpipError=Failed to suppress the user from SPIP +SPIPConnectionFailed=Failed to connect to SPIP +SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done +SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang new file mode 100644 index 00000000000..7a211198822 --- /dev/null +++ b/htdocs/langs/lo_LA/mails.lang @@ -0,0 +1,141 @@ +# Dolibarr language file - Source file is en_US - mails +Mailing=EMailing +EMailing=EMailing +Mailings=EMailings +EMailings=EMailings +AllEMailings=All eMailings +MailCard=EMailing card +MailTargets=Targets +MailRecipients=Recipients +MailRecipient=Recipient +MailTitle=Description +MailFrom=Sender +MailErrorsTo=Errors to +MailReply=Reply to +MailTo=Receiver(s) +MailCC=Copy to +MailCCC=Cached copy to +MailTopic=EMail topic +MailText=Message +MailFile=Attached files +MailMessage=EMail body +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +DeleteMailing=Delete emailing +DeleteAMailing=Delete an emailing +PreviewMailing=Preview emailing +PrepareMailing=Prepare emailing +CreateMailing=Create emailing +MailingDesc=This page allows you to send emailings to a group of people. +MailingResult=Sending emails result +TestMailing=Test email +ValidMailing=Valid emailing +ApproveMailing=Approve emailing +MailingStatusDraft=Draft +MailingStatusValidated=Validated +MailingStatusApproved=Approved +MailingStatusSent=Sent +MailingStatusSentPartialy=Sent partialy +MailingStatusSentCompletely=Sent completely +MailingStatusError=Error +MailingStatusNotSent=Not sent +MailSuccessfulySent=Email successfully sent (from %s to %s) +MailingSuccessfullyValidated=EMailing successfully validated +MailUnsubcribe=Unsubscribe +Unsuscribe=Unsubscribe +MailingStatusNotContact=Don't contact anymore +ErrorMailRecipientIsEmpty=Email recipient is empty +WarningNoEMailsAdded=No new Email to add to recipient's list. +ConfirmValidMailing=Are you sure you want to validate this emailing ? +ConfirmResetMailing=Warning, by reinitializing emailing %s, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do ? +ConfirmDeleteMailing=Are you sure you want to delete this emailling ? +NbOfRecipients=Number of recipients +NbOfUniqueEMails=Nb of unique emails +NbOfEMails=Nb of EMails +TotalNbOfDistinctRecipients=Number of distinct recipients +NoTargetYet=No recipients defined yet (Go on tab 'Recipients') +AddRecipients=Add recipients +RemoveRecipient=Remove recipient +CommonSubstitutions=Common substitutions +YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README. +EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values +MailingAddFile=Attach this file +NoAttachedFiles=No attached files +BadEMail=Bad value for EMail +CloneEMailing=Clone Emailing +ConfirmCloneEMailing=Are you sure you want to clone this emailing ? +CloneContent=Clone message +CloneReceivers=Cloner recipients +DateLastSend=Date of last sending +DateSending=Date sending +SentTo=Sent to %s +MailingStatusRead=Read +CheckRead=Read Receipt +YourMailUnsubcribeOK=The email %s is correctly unsubcribe from mailing list +MailtoEMail=Hyper link to email +ActivateCheckRead=Allow to use the "Unsubcribe" link +ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature +EMailSentToNRecipients=EMail sent to %s recipients. +XTargetsAdded=%s recipients added into target list +EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email. +MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s) +SendRemind=Send reminder by EMails +RemindSent=%s reminder(s) sent +AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent) +NoRemindSent=No EMail reminder sent +ResultOfMassSending=Result of mass EMail reminders sending + +# Libelle des modules de liste de destinataires mailing +MailingModuleDescContactCompanies=Contacts/addresses of all third parties (customer, prospect, supplier, ...) +MailingModuleDescDolibarrUsers=Dolibarr users +MailingModuleDescFundationMembers=Foundation members with emails +MailingModuleDescEmailsFromFile=EMails from a text file (email;lastname;firstname;other) +MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other) +MailingModuleDescContactsCategories=Third parties (by category) +MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines +MailingModuleDescContactsByCompanyCategory=Contacts/addresses of third parties (by third parties category) +MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category +MailingModuleDescMembersCategories=Foundation members (by categories) +MailingModuleDescContactsByFunction=Contacts/addresses of third parties (by position/function) +LineInFile=Line %s in file +RecipientSelectionModules=Defined requests for recipient's selection +MailSelectedRecipients=Selected recipients +MailingArea=EMailings area +LastMailings=Last %s emailings +TargetsStatistics=Targets statistics +NbOfCompaniesContacts=Unique contacts/addresses +MailNoChangePossible=Recipients for validated emailing can't be changed +SearchAMailing=Search mailing +SendMailing=Send emailing +SendMail=Send email +SentBy=Sent by +MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: +MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. +ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +TargetsReset=Clear list +ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing +ToAddRecipientsChooseHere=Add recipients by choosing from the lists +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent +IdRecord=ID record +DeliveryReceipt=Delivery Receipt +YouCanUseCommaSeparatorForSeveralRecipients=You can use the comma separator to specify several recipients. +TagCheckMail=Track mail opening +TagUnsubscribe=Unsubscribe link +TagSignature=Signature sending user +TagMailtoEmail=Recipient EMail +# Module Notifications +Notifications=Notifications +NoNotificationsWillBeSent=No email notifications are planned for this event and company +ANotificationsWillBeSent=1 notification will be sent by email +SomeNotificationsWillBeSent=%s notifications will be sent by email +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets +ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang new file mode 100644 index 00000000000..d40e28cb776 --- /dev/null +++ b/htdocs/langs/lo_LA/main.lang @@ -0,0 +1,725 @@ +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +# Note for Chinese: +# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader) +# stsongstdlight or cid0cs are for simplified Chinese +# To read Chinese pdf with Linux: sudo apt-get install poppler-data +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 +SeparatorDecimal=. +SeparatorThousand=, +FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y +FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%I:%M %p +FormatHourShortDuration=%H:%M +FormatDateTextShort=%b %d, %Y +FormatDateText=%B %d, %Y +FormatDateHourShort=%m/%d/%Y %I:%M %p +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p +FormatDateHourTextShort=%b %d, %Y, %I:%M %p +FormatDateHourText=%B %d, %Y, %I:%M %p +DatabaseConnection=Database connection +NoTranslation=No translation +NoRecordFound=No record found +NoError=No error +Error=Error +ErrorFieldRequired=Field '%s' is required +ErrorFieldFormat=Field '%s' has a bad value +ErrorFileDoesNotExists=File %s does not exist +ErrorFailedToOpenFile=Failed to open file %s +ErrorCanNotCreateDir=Can not create dir %s +ErrorCanNotReadDir=Can not read dir %s +ErrorConstantNotDefined=Parameter %s not defined +ErrorUnknown=Unknown error +ErrorSQL=SQL Error +ErrorLogoFileNotFound=Logo file '%s' was not found +ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this +ErrorGoToModuleSetup=Go to Module setup to fix this +ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s) +ErrorAttachedFilesDisabled=File attaching is disabled on this server +ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory. +ErrorInternalErrorDetected=Error detected +ErrorNoRequestRan=No request ran +ErrorWrongHostParameter=Wrong host parameter +ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form. +ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records. +ErrorWrongValue=Wrong value +ErrorWrongValueForParameterX=Wrong value for parameter %s +ErrorNoRequestInError=No request in error +ErrorServiceUnavailableTryLater=Service not available for the moment. Try again later. +ErrorDuplicateField=Duplicate value in a unique field +ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback changes. +ErrorConfigParameterNotDefined=Parameter %s is not defined inside Dolibarr config file conf.php. +ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr database. +ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. +ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. +ErrorFailedToSaveFile=Error, failed to save file. +SetDate=Set date +SelectDate=Select a date +SeeAlso=See also %s +SeeHere=See here +BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded +FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. +NbOfEntries=Nb of entries +GoToWikiHelpPage=Read online help (need Internet access) +GoToHelpPage=Read help +RecordSaved=Record saved +RecordDeleted=Record deleted +LevelOfFeature=Level of features +NotDefined=Not defined +DefinedAndHasThisValue=Defined and value to +IsNotDefined=undefined +DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to %s in configuration file conf.php.
This means that password database is extern to Dolibarr, so changing this field may have no effects. +Administrator=Administrator +Undefined=Undefined +PasswordForgotten=Password forgotten ? +SeeAbove=See above +HomeArea=Home area +LastConnexion=Last connection +PreviousConnexion=Previous connection +ConnectedOnMultiCompany=Connected on environment +ConnectedSince=Connected since +AuthenticationMode=Authentification mode +RequestedUrl=Requested Url +DatabaseTypeManager=Database type manager +RequestLastAccess=Request for last database access +RequestLastAccessInError=Request for last database access in error +ReturnCodeLastAccessInError=Return code for last database access in error +InformationLastAccessInError=Information for last database access in error +DolibarrHasDetectedError=Dolibarr has detected a technical error +InformationToHelpDiagnose=This is information that can help diagnostic +MoreInformation=More information +TechnicalInformation=Technical information +NotePublic=Note (public) +NotePrivate=Note (private) +PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to %s decimals. +DoTest=Test +ToFilter=Filter +WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay. +yes=yes +Yes=Yes +no=no +No=No +All=All +Home=Home +Help=Help +OnlineHelp=Online help +PageWiki=Wiki page +Always=Always +Never=Never +Under=under +Period=Period +PeriodEndDate=End date for period +Activate=Activate +Activated=Activated +Closed=Closed +Closed2=Closed +Enabled=Enabled +Deprecated=Deprecated +Disable=Disable +Disabled=Disabled +Add=Add +AddLink=Add link +Update=Update +AddActionToDo=Add event to do +AddActionDone=Add event done +Close=Close +Close2=Close +Confirm=Confirm +ConfirmSendCardByMail=Do you really want to send content of this card by mail to %s ? +Delete=Delete +Remove=Remove +Resiliate=Resiliate +Cancel=Cancel +Modify=Modify +Edit=Edit +Validate=Validate +ValidateAndApprove=Validate and Approve +ToValidate=To validate +Save=Save +SaveAs=Save As +TestConnection=Test connection +ToClone=Clone +ConfirmClone=Choose data you want to clone : +NoCloneOptionsSpecified=No data to clone defined. +Of=of +Go=Go +Run=Run +CopyOf=Copy of +Show=Show +ShowCardHere=Show card +Search=Search +SearchOf=Search +Valid=Valid +Approve=Approve +Disapprove=Disapprove +ReOpen=Re-Open +Upload=Send file +ToLink=Link +Select=Select +Choose=Choose +ChooseLangage=Please choose your language +Resize=Resize +Recenter=Recenter +Author=Author +User=User +Users=Users +Group=Group +Groups=Groups +NoUserGroupDefined=No user group defined +Password=Password +PasswordRetype=Retype your password +NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration. +Name=Name +Person=Person +Parameter=Parameter +Parameters=Parameters +Value=Value +GlobalValue=Global value +PersonalValue=Personal value +NewValue=New value +CurrentValue=Current value +Code=Code +Type=Type +Language=Language +MultiLanguage=Multi-language +Note=Note +CurrentNote=Current note +Title=Title +Label=Label +RefOrLabel=Ref. or label +Info=Log +Family=Family +Description=Description +Designation=Description +Model=Model +DefaultModel=Default model +Action=Event +About=About +Number=Number +NumberByMonth=Number by month +AmountByMonth=Amount by month +Numero=Number +Limit=Limit +Limits=Limits +DevelopmentTeam=Development Team +Logout=Logout +NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s +Connection=Connection +Setup=Setup +Alert=Alert +Previous=Previous +Next=Next +Cards=Cards +Card=Card +Now=Now +Date=Date +DateAndHour=Date and hour +DateStart=Date start +DateEnd=Date end +DateCreation=Creation date +DateModification=Modification date +DateModificationShort=Modif. date +DateLastModification=Last modification date +DateValidation=Validation date +DateClosing=Closing date +DateDue=Due date +DateValue=Value date +DateValueShort=Value date +DateOperation=Operation date +DateOperationShort=Oper. Date +DateLimit=Limit date +DateRequest=Request date +DateProcess=Process date +DatePlanShort=Date planed +DateRealShort=Date real. +DateBuild=Report build date +DatePayment=Date of payment +DurationYear=year +DurationMonth=month +DurationWeek=week +DurationDay=day +DurationYears=years +DurationMonths=months +DurationWeeks=weeks +DurationDays=days +Year=Year +Month=Month +Week=Week +Day=Day +Hour=Hour +Minute=Minute +Second=Second +Years=Years +Months=Months +Days=Days +days=days +Hours=Hours +Minutes=Minutes +Seconds=Seconds +Weeks=Weeks +Today=Today +Yesterday=Yesterday +Tomorrow=Tomorrow +Morning=Morning +Afternoon=Afternoon +Quadri=Quadri +MonthOfDay=Month of the day +HourShort=H +MinuteShort=mn +Rate=Rate +UseLocalTax=Include tax +Bytes=Bytes +KiloBytes=Kilobytes +MegaBytes=Megabytes +GigaBytes=Gigabytes +TeraBytes=Terabytes +b=b. +Kb=Kb +Mb=Mb +Gb=Gb +Tb=Tb +Cut=Cut +Copy=Copy +Paste=Paste +Default=Default +DefaultValue=Default value +DefaultGlobalValue=Global value +Price=Price +UnitPrice=Unit price +UnitPriceHT=Unit price (net) +UnitPriceTTC=Unit price +PriceU=U.P. +PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested +PriceUTTC=U.P. +Amount=Amount +AmountInvoice=Invoice amount +AmountPayment=Payment amount +AmountHTShort=Amount (net) +AmountTTCShort=Amount (inc. tax) +AmountHT=Amount (net of tax) +AmountTTC=Amount (inc. tax) +AmountVAT=Amount tax +AmountLT1=Amount tax 2 +AmountLT2=Amount tax 3 +AmountLT1ES=Amount RE +AmountLT2ES=Amount IRPF +AmountTotal=Total amount +AmountAverage=Average amount +PriceQtyHT=Price for this quantity (net of tax) +PriceQtyMinHT=Price quantity min. (net of tax) +PriceQtyTTC=Price for this quantity (inc. tax) +PriceQtyMinTTC=Price quantity min. (inc. of tax) +Percentage=Percentage +Total=Total +SubTotal=Subtotal +TotalHTShort=Total (net) +TotalTTCShort=Total (inc. tax) +TotalHT=Total (net of tax) +TotalHTforthispage=Total (net of tax) for this page +TotalTTC=Total (inc. tax) +TotalTTCToYourCredit=Total (inc. tax) to your credit +TotalVAT=Total tax +TotalLT1=Total tax 2 +TotalLT2=Total tax 3 +TotalLT1ES=Total RE +TotalLT2ES=Total IRPF +IncludedVAT=Included tax +HT=Net of tax +TTC=Inc. tax +VAT=Sales tax +LT1ES=RE +LT2ES=IRPF +VATRate=Tax Rate +Average=Average +Sum=Sum +Delta=Delta +Module=Module +Option=Option +List=List +FullList=Full list +Statistics=Statistics +OtherStatistics=Other statistics +Status=Status +Favorite=Favorite +ShortInfo=Info. +Ref=Ref. +RefSupplier=Ref. supplier +RefPayment=Ref. payment +CommercialProposalsShort=Commercial proposals +Comment=Comment +Comments=Comments +ActionsToDo=Events to do +ActionsDone=Events done +ActionsToDoShort=To do +ActionsRunningshort=Started +ActionsDoneShort=Done +ActionNotApplicable=Not applicable +ActionRunningNotStarted=To start +ActionRunningShort=Started +ActionDoneShort=Finished +ActionUncomplete=Uncomplete +CompanyFoundation=Company/Foundation +ContactsForCompany=Contacts for this third party +ContactsAddressesForCompany=Contacts/addresses for this third party +AddressesForCompany=Addresses for this third party +ActionsOnCompany=Events about this third party +ActionsOnMember=Events about this member +NActions=%s events +NActionsLate=%s late +RequestAlreadyDone=Request already recorded +Filter=Filter +RemoveFilter=Remove filter +ChartGenerated=Chart generated +ChartNotGenerated=Chart not generated +GeneratedOn=Build on %s +Generate=Generate +Duration=Duration +TotalDuration=Total duration +Summary=Summary +MyBookmarks=My bookmarks +OtherInformationsBoxes=Other information boxes +DolibarrBoard=Dolibarr board +DolibarrStateBoard=Statistics +DolibarrWorkBoard=Work tasks board +Available=Available +NotYetAvailable=Not yet available +NotAvailable=Not available +Popularity=Popularity +Categories=Categories +Category=Category +By=By +From=From +to=to +and=and +or=or +Other=Other +Others=Others +OtherInformations=Other informations +Quantity=Quantity +Qty=Qty +ChangedBy=Changed by +ReCalculate=Recalculate +ResultOk=Success +ResultKo=Failure +Reporting=Reporting +Reportings=Reporting +Draft=Draft +Drafts=Drafts +Validated=Validated +Opened=Opened +New=New +Discount=Discount +Unknown=Unknown +General=General +Size=Size +Received=Received +Paid=Paid +Topic=Sujet +ByCompanies=By third parties +ByUsers=By users +Links=Links +Link=Link +Receipts=Receipts +Rejects=Rejects +Preview=Preview +NextStep=Next step +PreviousStep=Previous step +Datas=Data +None=None +NoneF=None +Late=Late +Photo=Picture +Photos=Pictures +AddPhoto=Add picture +Login=Login +CurrentLogin=Current login +January=January +February=February +March=March +April=April +May=May +June=June +July=July +August=August +September=September +October=October +November=November +December=December +JanuaryMin=Jan +FebruaryMin=Feb +MarchMin=Mar +AprilMin=Apr +MayMin=May +JuneMin=Jun +JulyMin=Jul +AugustMin=Aug +SeptemberMin=Sep +OctoberMin=Oct +NovemberMin=Nov +DecemberMin=Dec +Month01=January +Month02=February +Month03=March +Month04=April +Month05=May +Month06=June +Month07=July +Month08=August +Month09=September +Month10=October +Month11=November +Month12=December +MonthShort01=Jan +MonthShort02=Feb +MonthShort03=Mar +MonthShort04=Apr +MonthShort05=May +MonthShort06=Jun +MonthShort07=Jul +MonthShort08=Aug +MonthShort09=Sep +MonthShort10=Oct +MonthShort11=Nov +MonthShort12=Dec +AttachedFiles=Attached files and documents +FileTransferComplete=File was uploaded successfuly +DateFormatYYYYMM=YYYY-MM +DateFormatYYYYMMDD=YYYY-MM-DD +DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS +ReportName=Report name +ReportPeriod=Report period +ReportDescription=Description +Report=Report +Keyword=Mot clé +Legend=Legend +FillTownFromZip=Fill city from zip +Fill=Fill +Reset=Reset +ShowLog=Show log +File=File +Files=Files +NotAllowed=Not allowed +ReadPermissionNotAllowed=Read permission not allowed +AmountInCurrency=Amount in %s currency +Example=Example +Examples=Examples +NoExample=No example +FindBug=Report a bug +NbOfThirdParties=Number of third parties +NbOfCustomers=Number of customers +NbOfLines=Number of lines +NbOfObjects=Number of objects +NbOfReferers=Number of referrers +Referers=Refering objects +TotalQuantity=Total quantity +DateFromTo=From %s to %s +DateFrom=From %s +DateUntil=Until %s +Check=Check +Uncheck=Uncheck +Internal=Internal +External=External +Internals=Internal +Externals=External +Warning=Warning +Warnings=Warnings +BuildPDF=Build PDF +RebuildPDF=Rebuild PDF +BuildDoc=Build Doc +RebuildDoc=Rebuild Doc +Entity=Environment +Entities=Entities +EventLogs=Logs +CustomerPreview=Customer preview +SupplierPreview=Supplier preview +AccountancyPreview=Accountancy preview +ShowCustomerPreview=Show customer preview +ShowSupplierPreview=Show supplier preview +ShowAccountancyPreview=Show accountancy preview +ShowProspectPreview=Show prospect preview +RefCustomer=Ref. customer +Currency=Currency +InfoAdmin=Information for administrators +Undo=Undo +Redo=Redo +ExpandAll=Expand all +UndoExpandAll=Undo expand +Reason=Reason +FeatureNotYetSupported=Feature not yet supported +CloseWindow=Close window +Question=Question +Response=Response +Priority=Priority +SendByMail=Send by EMail +MailSentBy=Email sent by +TextUsedInTheMessageBody=Email body +SendAcknowledgementByMail=Send Ack. by email +NoEMail=No email +NoMobilePhone=No mobile phone +Owner=Owner +DetectedVersion=Detected version +FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value. +Refresh=Refresh +BackToList=Back to list +GoBack=Go back +CanBeModifiedIfOk=Can be modified if valid +CanBeModifiedIfKo=Can be modified if not valid +RecordModifiedSuccessfully=Record modified successfully +RecordsModified=%s records modified +AutomaticCode=Automatic code +NotManaged=Not managed +FeatureDisabled=Feature disabled +MoveBox=Move box %s +Offered=Offered +NotEnoughPermissions=You don't have permission for this action +SessionName=Session name +Method=Method +Receive=Receive +PartialWoman=Partial +PartialMan=Partial +TotalWoman=Total +TotalMan=Total +NeverReceived=Never received +Canceled=Canceled +YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary +Color=Color +Documents=Linked files +DocumentsNb=Linked files (%s) +Documents2=Documents +BuildDocuments=Generated documents +UploadDisabled=Upload disabled +MenuECM=Documents +MenuAWStats=AWStats +MenuMembers=Members +MenuAgendaGoogle=Google agenda +ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb +NoFileFound=No documents saved in this directory +CurrentUserLanguage=Current language +CurrentTheme=Current theme +CurrentMenuManager=Current menu manager +DisabledModules=Disabled modules +For=For +ForCustomer=For customer +Signature=Signature +HidePassword=Show command with password hidden +UnHidePassword=Show real command with clear password +Root=Root +Informations=Informations +Page=Page +Notes=Notes +AddNewLine=Add new line +AddFile=Add file +ListOfFiles=List of available files +FreeZone=Free entry +FreeLineOfType=Free entry of type +CloneMainAttributes=Clone object with its main attributes +PDFMerge=PDF Merge +Merge=Merge +PrintContentArea=Show page to print main content area +MenuManager=Menu manager +NoMenu=No sub-menu +WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login %s is allowed to use application at the moment. +CoreErrorTitle=System error +CoreErrorMessage=Sorry, an error occurred. Check the logs or contact your system administrator. +CreditCard=Credit card +FieldsWithAreMandatory=Fields with %s are mandatory +FieldsWithIsForPublic=Fields with %s are shown on public list of members. If you don't want this, check off the "public" box. +AccordingToGeoIPDatabase=(according to GeoIP convertion) +Line=Line +NotSupported=Not supported +RequiredField=Required field +Result=Result +ToTest=Test +ValidateBefore=Card must be validated before using this feature +Visibility=Visibility +Private=Private +Hidden=Hidden +Resources=Resources +Source=Source +Prefix=Prefix +Before=Before +After=After +IPAddress=IP address +Frequency=Frequency +IM=Instant messaging +NewAttribute=New attribute +AttributeCode=Attribute code +OptionalFieldsSetup=Extra attributes setup +URLPhoto=URL of photo/logo +SetLinkToThirdParty=Link to another third party +CreateDraft=Create draft +SetToDraft=Back to draft +ClickToEdit=Click to edit +ObjectDeleted=Object %s deleted +ByCountry=By country +ByTown=By town +ByDate=By date +ByMonthYear=By month/year +ByYear=By year +ByMonth=By month +ByDay=By day +BySalesRepresentative=By sales representative +LinkedToSpecificUsers=Linked to a particular user contact +DeleteAFile=Delete a file +ConfirmDeleteAFile=Are you sure you want to delete file +NoResults=No results +ModulesSystemTools=Modules tools +Test=Test +Element=Element +NoPhotoYet=No pictures available yet +HomeDashboard=Home summary +Deductible=Deductible +from=from +toward=toward +Access=Access +HelpCopyToClipboard=Use Ctrl+C to copy to clipboard +SaveUploadedFileWithMask=Save file on server with name "%s" (otherwise "%s") +OriginFileName=Original filename +SetDemandReason=Set source +SetBankAccount=Define Bank Account +AccountCurrency=Account Currency +ViewPrivateNote=View notes +XMoreLines=%s line(s) hidden +PublicUrl=Public URL +AddBox=Add box +SelectElementAndClickRefresh=Select an element and click Refresh +PrintFile=Print File %s +ShowTransaction=Show transaction +# Week day +Monday=Monday +Tuesday=Tuesday +Wednesday=Wednesday +Thursday=Thursday +Friday=Friday +Saturday=Saturday +Sunday=Sunday +MondayMin=Mo +TuesdayMin=Tu +WednesdayMin=We +ThursdayMin=Th +FridayMin=Fr +SaturdayMin=Sa +SundayMin=Su +Day1=Monday +Day2=Tuesday +Day3=Wednesday +Day4=Thursday +Day5=Friday +Day6=Saturday +Day0=Sunday +ShortMonday=M +ShortTuesday=T +ShortWednesday=W +ShortThursday=T +ShortFriday=F +ShortSaturday=S +ShortSunday=S diff --git a/htdocs/langs/lo_LA/margins.lang b/htdocs/langs/lo_LA/margins.lang new file mode 100644 index 00000000000..748b3c71f30 --- /dev/null +++ b/htdocs/langs/lo_LA/margins.lang @@ -0,0 +1,45 @@ +# Dolibarr language file - Source file is en_US - marges + +Margin=Margin +Margins=Margins +TotalMargin=Total Margin +MarginOnProducts=Margin / Products +MarginOnServices=Margin / Services +MarginRate=Margin rate +MarkRate=Mark rate +DisplayMarginRates=Display margin rates +DisplayMarkRates=Display mark rates +InputPrice=Input price +margin=Profit margins management +margesSetup=Profit margins management setup +MarginDetails=Margin details +ProductMargins=Product margins +CustomerMargins=Customer margins +SalesRepresentativeMargins=Sales representative margins +UserMargins=User margins +ProductService=Product or Service +AllProducts=All products and services +ChooseProduct/Service=Choose product or service +StartDate=Start date +EndDate=End date +Launch=Start +ForceBuyingPriceIfNull=Force buying price if null +ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) +MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts +UseDiscountAsProduct=As a product +UseDiscountAsService=As a service +UseDiscountOnTotal=On subtotal +MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. +MARGIN_TYPE=Margin type +MargeBrute=Raw margin +MargeNette=Net margin +MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
Net margin : Selling price - Cost price +CostPrice=Cost price +BuyingCost=Cost price +UnitCharges=Unit charges +Charges=Charges +AgentContactType=Commercial agent contact type +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang new file mode 100644 index 00000000000..40bca8e85fb --- /dev/null +++ b/htdocs/langs/lo_LA/members.lang @@ -0,0 +1,206 @@ +# Dolibarr language file - Source file is en_US - members +MembersArea=Members area +PublicMembersArea=Public members area +MemberCard=Member card +SubscriptionCard=Subscription card +Member=Member +Members=Members +MemberAccount=Member login +ShowMember=Show member card +UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member +MembersTickets=Members Tickets +FundationMembers=Foundation members +Attributs=Attributes +ErrorMemberTypeNotDefined=Member type not defined +ListOfPublicMembers=List of public members +ListOfValidatedPublicMembers=List of validated public members +ErrorThisMemberIsNotPublic=This member is not public +ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). +ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. +ThisIsContentOfYourCard=This is details of your card +CardContent=Content of your member card +SetLinkToUser=Link to a Dolibarr user +SetLinkToThirdParty=Link to a Dolibarr third party +MembersCards=Members business cards +MembersList=List of members +MembersListToValid=List of draft members (to be validated) +MembersListValid=List of valid members +MembersListUpToDate=List of valid members with up to date subscription +MembersListNotUpToDate=List of valid members with subscription out of date +MembersListResiliated=List of resiliated members +MembersListQualified=List of qualified members +MenuMembersToValidate=Draft members +MenuMembersValidated=Validated members +MenuMembersUpToDate=Up to date members +MenuMembersNotUpToDate=Out of date members +MenuMembersResiliated=Resiliated members +MembersWithSubscriptionToReceive=Members with subscription to receive +DateAbonment=Subscription date +DateSubscription=Subscription date +DateNextSubscription=Next subscription +DateEndSubscription=Subscription end date +EndSubscription=End subscription +SubscriptionId=Subscription id +MemberId=Member id +NewMember=New member +NewType=New member type +MemberType=Member type +MemberTypeId=Member type id +MemberTypeLabel=Member type label +MembersTypes=Members types +MembersAttributes=Members attributes +SearchAMember=Search a member +MemberStatusDraft=Draft (needs to be validated) +MemberStatusDraftShort=Draft +MemberStatusActive=Validated (waiting subscription) +MemberStatusActiveShort=Validated +MemberStatusActiveLate=subscription expired +MemberStatusActiveLateShort=Expired +MemberStatusPaid=Subscription up to date +MemberStatusPaidShort=Up to date +MemberStatusResiliated=Resiliated member +MemberStatusResiliatedShort=Resiliated +MembersStatusToValid=Draft members +MembersStatusToValidShort=Draft members +MembersStatusValidated=Validated members +MembersStatusPaid=Subscription up to date +MembersStatusPaidShort=Up to date +MembersStatusNotPaid=Subscription out of date +MembersStatusNotPaidShort=Out of date +MembersStatusResiliated=Resiliated members +MembersStatusResiliatedShort=Resiliated members +NewCotisation=New contribution +PaymentSubscription=New contribution payment +EditMember=Edit member +SubscriptionEndDate=Subscription's end date +MembersTypeSetup=Members type setup +NewSubscription=New subscription +NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. +Subscription=Subscription +Subscriptions=Subscriptions +SubscriptionLate=Late +SubscriptionNotReceived=Subscription never received +SubscriptionLateShort=Late +SubscriptionNotReceivedShort=Never received +ListOfSubscriptions=List of subscriptions +SendCardByMail=Send card by Email +AddMember=Create member +NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" +NewMemberType=New member type +WelcomeEMail=Welcome e-mail +SubscriptionRequired=Subscription required +EditType=Edit member type +DeleteType=Delete +VoteAllowed=Vote allowed +Physical=Physical +Moral=Moral +MorPhy=Moral/Physical +Reenable=Reenable +ResiliateMember=Resiliate a member +ConfirmResiliateMember=Are you sure you want to resiliate this member ? +DeleteMember=Delete a member +ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? +DeleteSubscription=Delete a subscription +ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? +Filehtpasswd=htpasswd file +ValidateMember=Validate a member +ConfirmValidateMember=Are you sure you want to validate this member ? +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +PublicMemberList=Public member list +BlankSubscriptionForm=Public auto-subscription form +BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. +EnablePublicSubscriptionForm=Enable the public auto-subscription form +MemberPublicLinks=Public links/pages +ExportDataset_member_1=Members and subscriptions +ImportDataset_member_1=Members +LastMembers=Last %s members +LastMembersModified=Last %s modified members +LastSubscriptionsModified=Last %s modified subscriptions +AttributeName=Attribute name +String=String +Text=Text +Int=Int +Date=Date +DateAndTime=Date and time +PublicMemberCard=Member public card +MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe +AddSubscription=Create subscription +ShowSubscription=Show subscription +MemberModifiedInDolibarr=Member modified in Dolibarr +SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation +DescADHERENT_MAIL_VALID=EMail for member validation +DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription +DescADHERENT_MAIL_COTIS=EMail for subscription +DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation +DescADHERENT_MAIL_RESIL=EMail for member resiliation +DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_ETIQUETTE_TYPE=Format of labels page +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_CARD_TYPE=Format of cards page +DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards +DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) +DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) +DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards +GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here +MayBeOverwrited=This text can be overwrited by value defined for member's type +ShowTypeCard=Show type '%s' +HTPasswordExport=htpassword file generation +NoThirdPartyAssociatedToMember=No third party associated to this member +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions= Members and Subscriptions +MoreActions=Complementary action on recording +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionBankDirect=Create a direct transaction record on account +MoreActionBankViaInvoice=Create an invoice and payment on account +MoreActionInvoiceOnly=Create an invoice with no payment +LinkToGeneratedPages=Generate visit cards +LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. +DocForAllMembersCards=Generate business cards for all members +DocForOneMemberCards=Generate business cards for a particular member +DocForLabels=Generate address sheets +SubscriptionPayment=Subscription payment +LastSubscriptionDate=Last subscription date +LastSubscriptionAmount=Last subscription amount +MembersStatisticsByCountries=Members statistics by country +MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region +NbOfMembers=Number of members +NoValidatedMemberYet=No validated members found +MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. +MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. +MembersStatisticsDesc=Choose statistics you want to read... +MenuMembersStats=Statistics +LastMemberDate=Last member date +Nature=Nature +Public=Information are public +Exports=Exports +NewMemberbyWeb=New member added. Awaiting approval +NewMemberForm=New member form +SubscriptionsStatistics=Statistics on subscriptions +NbOfSubscriptions=Number of subscriptions +AmountOfSubscriptions=Amount of subscriptions +TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) +DefaultAmount=Default amount of subscription +CanEditAmount=Visitor can choose/edit amount of its subscription +MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page +Associations=Foundations +Collectivités=Organizations +Particuliers=Personal +Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/lo_LA/opensurvey.lang b/htdocs/langs/lo_LA/opensurvey.lang new file mode 100644 index 00000000000..0b191e426ec --- /dev/null +++ b/htdocs/langs/lo_LA/opensurvey.lang @@ -0,0 +1,66 @@ +# Dolibarr language file - Source file is en_US - opensurvey +Survey=Poll +Surveys=Polls +OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... +NewSurvey=New poll +NoSurveysInDatabase=%s poll(s) into database. +OpenSurveyArea=Polls area +AddACommentForPoll=You can add a comment into poll... +AddComment=Add comment +CreatePoll=Create poll +PollTitle=Poll title +ToReceiveEMailForEachVote=Receive an email for each vote +TypeDate=Type date +TypeClassic=Type standard +OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it +RemoveAllDays=Remove all days +CopyHoursOfFirstDay=Copy hours of first day +RemoveAllHours=Remove all hours +SelectedDays=Selected days +TheBestChoice=The best choice currently is +TheBestChoices=The best choices currently are +with=with +OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. +CommentsOfVoters=Comments of voters +ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes) +RemovePoll=Remove poll +UrlForSurvey=URL to communicate to get a direct access to poll +PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: +CreateSurveyDate=Create a date poll +CreateSurveyStandard=Create a standard poll +CheckBox=Simple checkbox +YesNoList=List (empty/yes/no) +PourContreList=List (empty/for/against) +AddNewColumn=Add new column +TitleChoice=Choice label +ExportSpreadsheet=Export result spreadsheet +ExpireDate=Limit date +NbOfSurveys=Number of polls +NbOfVoters=Nb of voters +SurveyResults=Results +PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s. +5MoreChoices=5 more choices +Abstention=Abstention +Against=Against +YouAreInivitedToVote=You are invited to vote for this poll +VoteNameAlreadyExists=This name was already used for this poll +ErrorPollDoesNotExists=Error, poll %s does not exists. +OpenSurveyNothingToSetup=There is no specific setup to do. +PollWillExpire=Your poll will expire automatically %s days after the last date of your poll. +AddADate=Add a date +AddStartHour=Add start hour +AddEndHour=Add end hour +votes=vote(s) +NoCommentYet=No comments have been posted for this poll yet +CanEditVotes=Can change vote of others +CanComment=Voters can comment in the poll +CanSeeOthersVote=Voters can see other people's vote +SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. +BackToCurrentMonth=Back to current month +ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation +ErrorOpenSurveyOneChoice=Enter at least one choice +ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD +ErrorInsertingComment=There was an error while inserting your comment +MoreChoices=Enter more choices for the voters +SurveyExpiredInfo=The voting time of this poll has expired. +EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s diff --git a/htdocs/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang new file mode 100644 index 00000000000..8efafa5e94e --- /dev/null +++ b/htdocs/langs/lo_LA/orders.lang @@ -0,0 +1,166 @@ +# Dolibarr language file - Source file is en_US - orders +OrdersArea=Customers orders area +SuppliersOrdersArea=Suppliers orders area +OrderCard=Order card +OrderId=Order Id +Order=Order +Orders=Orders +OrderLine=Order line +OrderFollow=Follow up +OrderDate=Order date +OrderToProcess=Order to process +NewOrder=New order +ToOrder=Make order +MakeOrder=Make order +SupplierOrder=Supplier order +SuppliersOrders=Suppliers orders +SuppliersOrdersRunning=Current suppliers orders +CustomerOrder=Customer order +CustomersOrders=Customers orders +CustomersOrdersRunning=Current customer's orders +CustomersOrdersAndOrdersLines=Customer orders and order's lines +OrdersToValid=Customers orders to validate +OrdersToBill=Customers orders delivered +OrdersInProcess=Customers orders in process +OrdersToProcess=Customers orders to process +SuppliersOrdersToProcess=Supplier's orders to process +StatusOrderCanceledShort=Canceled +StatusOrderDraftShort=Draft +StatusOrderValidatedShort=Validated +StatusOrderSentShort=In process +StatusOrderSent=Shipment in process +StatusOrderOnProcessShort=Ordered +StatusOrderProcessedShort=Processed +StatusOrderToBillShort=Delivered +StatusOrderToBill2Short=To bill +StatusOrderApprovedShort=Approved +StatusOrderRefusedShort=Refused +StatusOrderToProcessShort=To process +StatusOrderReceivedPartiallyShort=Partially received +StatusOrderReceivedAllShort=Everything received +StatusOrderCanceled=Canceled +StatusOrderDraft=Draft (needs to be validated) +StatusOrderValidated=Validated +StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation +StatusOrderProcessed=Processed +StatusOrderToBill=Delivered +StatusOrderToBill2=To bill +StatusOrderApproved=Approved +StatusOrderRefused=Refused +StatusOrderReceivedPartially=Partially received +StatusOrderReceivedAll=Everything received +ShippingExist=A shipment exists +ProductQtyInDraft=Product quantity into draft orders +ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered +DraftOrWaitingApproved=Draft or approved not yet ordered +DraftOrWaitingShipped=Draft or validated not yet shipped +MenuOrdersToBill=Orders delivered +MenuOrdersToBill2=Billable orders +SearchOrder=Search order +SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order +ShipProduct=Ship product +Discount=Discount +CreateOrder=Create Order +RefuseOrder=Refuse order +ApproveOrder=Accept order +ValidateOrder=Validate order +UnvalidateOrder=Unvalidate order +DeleteOrder=Delete order +CancelOrder=Cancel order +AddOrder=Create order +AddToMyOrders=Add to my orders +AddToOtherOrders=Add to other orders +AddToDraftOrders=Add to draft order +ShowOrder=Show order +NoOpenedOrders=No opened orders +NoOtherOpenedOrders=No other opened orders +NoDraftOrders=No draft orders +OtherOrders=Other orders +LastOrders=Last %s orders +LastModifiedOrders=Last %s modified orders +LastClosedOrders=Last %s closed orders +AllOrders=All orders +NbOfOrders=Number of orders +OrdersStatistics=Order's statistics +OrdersStatisticsSuppliers=Supplier order's statistics +NumberOfOrdersByMonth=Number of orders by month +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +ListOfOrders=List of orders +CloseOrder=Close order +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. +ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. +ConfirmDeleteOrder=Are you sure you want to delete this order ? +ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? +ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? +ConfirmCancelOrder=Are you sure you want to cancel this order ? +ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? +GenerateBill=Generate invoice +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed +ComptaCard=Accountancy card +DraftOrders=Draft orders +RelatedOrders=Related orders +OnProcessOrders=In process orders +RefOrder=Ref. order +RefCustomerOrder=Ref. customer order +RefCustomerOrderShort=Ref. cust. order +SendOrderByMail=Send order by mail +ActionsOnOrder=Events on order +NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order +OrderMode=Order method +AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process +UserWithApproveOrderGrant=Users granted with "approve orders" permission. +PaymentOrderRef=Payment of order %s +CloneOrder=Clone order +ConfirmCloneOrder=Are you sure you want to clone this order %s ? +DispatchSupplierOrder=Receiving supplier order %s +##### Types de contacts ##### +TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order +TypeContact_commande_internal_SHIPPING=Representative following-up shipping +TypeContact_commande_external_BILLING=Customer invoice contact +TypeContact_commande_external_SHIPPING=Customer shipping contact +TypeContact_commande_external_CUSTOMER=Customer contact following-up order +TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order +TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping +TypeContact_order_supplier_external_BILLING=Supplier invoice contact +TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order + +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined +Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' +Error_OrderNotChecked=No orders to invoice selected +# Sources +OrderSource0=Commercial proposal +OrderSource1=Internet +OrderSource2=Mail campaign +OrderSource3=Phone compaign +OrderSource4=Fax campaign +OrderSource5=Commercial +OrderSource6=Store +QtyOrdered=Qty ordered +AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order +# Documents models +PDFEinsteinDescription=A complete order model (logo...) +PDFEdisonDescription=A simple order model +PDFProformaDescription=A complete proforma invoice (logo…) +# Orders modes +OrderByMail=Mail +OrderByFax=Fax +OrderByEMail=EMail +OrderByWWW=Online +OrderByPhone=Phone +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang new file mode 100644 index 00000000000..08747ea884b --- /dev/null +++ b/htdocs/langs/lo_LA/other.lang @@ -0,0 +1,238 @@ +# Dolibarr language file - Source file is en_US - other +SecurityCode=Security code +Calendar=Calendar +Tools=Tools +ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

Those tools can be reached from menu on the side. +Birthday=Birthday +BirthdayDate=Birthday +DateToBirth=Date of birth +BirthdayAlertOn= birthday alert active +BirthdayAlertOff= birthday alert inactive +Notify_FICHINTER_VALIDATE=Intervention validated +Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail +Notify_BILL_VALIDATE=Customer invoice validated +Notify_BILL_UNVALIDATE=Customer invoice unvalidated +Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved +Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused +Notify_ORDER_VALIDATE=Customer order validated +Notify_PROPAL_VALIDATE=Customer proposal validated +Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed +Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused +Notify_WITHDRAW_TRANSMIT=Transmission withdrawal +Notify_WITHDRAW_CREDIT=Credit withdrawal +Notify_WITHDRAW_EMIT=Perform withdrawal +Notify_ORDER_SENTBYMAIL=Customer order sent by mail +Notify_COMPANY_CREATE=Third party created +Notify_COMPANY_SENTBYMAIL=Mails sent from third party card +Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail +Notify_BILL_PAYED=Customer invoice payed +Notify_BILL_CANCEL=Customer invoice canceled +Notify_BILL_SENTBYMAIL=Customer invoice sent by mail +Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated +Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail +Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated +Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed +Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail +Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled +Notify_CONTRACT_VALIDATE=Contract validated +Notify_FICHEINTER_VALIDATE=Intervention validated +Notify_SHIPPING_VALIDATE=Shipping validated +Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail +Notify_MEMBER_VALIDATE=Member validated +Notify_MEMBER_MODIFY=Member modified +Notify_MEMBER_SUBSCRIPTION=Member subscribed +Notify_MEMBER_RESILIATE=Member resiliated +Notify_MEMBER_DELETE=Member deleted +Notify_PROJECT_CREATE=Project creation +Notify_TASK_CREATE=Task created +Notify_TASK_MODIFY=Task modified +Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup +NbOfAttachedFiles=Number of attached files/documents +TotalSizeOfAttachedFiles=Total size of attached files/documents +MaxSize=Maximum size +AttachANewFile=Attach a new file/document +LinkedObject=Linked object +Miscellaneous=Miscellaneous +NbOfActiveNotifications=Number of notifications (nb of recipient emails) +PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ +PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ +PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ +DemoDesc=Dolibarr is a compact ERP/CRM composed by several functional modules. A demo that includes all modules does not mean anything as this never occurs. So, several demo profiles are available. +ChooseYourDemoProfil=Choose the demo profile that match your activity... +DemoFundation=Manage members of a foundation +DemoFundation2=Manage members and bank account of a foundation +DemoCompanyServiceOnly=Manage a freelance activity selling service only +DemoCompanyShopWithCashDesk=Manage a shop with a cash desk +DemoCompanyProductAndStocks=Manage a small or medium company selling products +DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules) +GoToDemo=Go to demo +CreatedBy=Created by %s +ModifiedBy=Modified by %s +ValidatedBy=Validated by %s +CanceledBy=Canceled by %s +ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed +FileWasRemoved=File %s was removed +DirWasRemoved=Directory %s was removed +FeatureNotYetAvailableShort=Available in a next version +FeatureNotYetAvailable=Feature not yet available in this version +FeatureExperimental=Experimental feature. Not stable in this version +FeatureDevelopment=Development feature. Not stable in this version +FeaturesSupported=Features supported +Width=Width +Height=Height +Depth=Depth +Top=Top +Bottom=Bottom +Left=Left +Right=Right +CalculatedWeight=Calculated weight +CalculatedVolume=Calculated volume +Weight=Weight +TotalWeight=Total weight +WeightUnitton=tonnes +WeightUnitkg=kg +WeightUnitg=g +WeightUnitmg=mg +WeightUnitpound=pound +Length=Length +LengthUnitm=m +LengthUnitdm=dm +LengthUnitcm=cm +LengthUnitmm=mm +Surface=Area +SurfaceUnitm2=m2 +SurfaceUnitdm2=dm2 +SurfaceUnitcm2=cm2 +SurfaceUnitmm2=mm2 +SurfaceUnitfoot2=ft2 +SurfaceUnitinch2=in2 +Volume=Volume +TotalVolume=Total volume +VolumeUnitm3=m3 +VolumeUnitdm3=dm3 +VolumeUnitcm3=cm3 +VolumeUnitmm3=mm3 +VolumeUnitfoot3=ft3 +VolumeUnitinch3=in3 +VolumeUnitounce=ounce +VolumeUnitlitre=litre +VolumeUnitgallon=gallon +Size=size +SizeUnitm=m +SizeUnitdm=dm +SizeUnitcm=cm +SizeUnitmm=mm +SizeUnitinch=inch +SizeUnitfoot=foot +SizeUnitpoint=point +BugTracker=Bug tracker +SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.
Change will be effective only after clicking on confirmation link inside this email.
Check your email reader software. +BackToLoginPage=Back to login page +AuthenticationDoesNotAllowSendNewPassword=Authentication mode is %s.
In this mode, Dolibarr can't know nor change your password.
Contact your system administrator if you want to change your password. +EnableGDLibraryDesc=Install or enable GD library with your PHP for use this option. +EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib) +ProfIdShortDesc=Prof Id %s is an information depending on third party country.
For example, for country %s, it's code %s. +DolibarrDemo=Dolibarr ERP/CRM demo +StatsByNumberOfUnits=Statistics in number of products/services units +StatsByNumberOfEntities=Statistics in number of referring entities +NumberOfProposals=Number of proposals on last 12 month +NumberOfCustomerOrders=Number of customer orders on last 12 month +NumberOfCustomerInvoices=Number of customer invoices on last 12 month +NumberOfSupplierOrders=Number of supplier orders on last 12 month +NumberOfSupplierInvoices=Number of supplier invoices on last 12 month +NumberOfUnitsProposals=Number of units on proposals on last 12 month +NumberOfUnitsCustomerOrders=Number of units on customer orders on last 12 month +NumberOfUnitsCustomerInvoices=Number of units on customer invoices on last 12 month +NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month +NumberOfUnitsSupplierInvoices=Number of units on supplier invoices on last 12 month +EMailTextInterventionValidated=The intervention %s has been validated. +EMailTextInvoiceValidated=The invoice %s has been validated. +EMailTextProposalValidated=The proposal %s has been validated. +EMailTextOrderValidated=The order %s has been validated. +EMailTextOrderApproved=The order %s has been approved. +EMailTextOrderApprovedBy=The order %s has been approved by %s. +EMailTextOrderRefused=The order %s has been refused. +EMailTextOrderRefusedBy=The order %s has been refused by %s. +EMailTextExpeditionValidated=The shipping %s has been validated. +ImportedWithSet=Importation data set +DolibarrNotification=Automatic notification +ResizeDesc=Enter new width OR new height. Ratio will be kept during resizing... +NewLength=New width +NewHeight=New height +NewSizeAfterCropping=New size after cropping +DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner) +CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is informations on current edited image +ImageEditor=Image editor +YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s. +YouReceiveMailBecauseOfNotification2=This event is the following: +ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start". +ClickHere=Click here +UseAdvancedPerms=Use the advanced permissions of some modules +FileFormat=File format +SelectAColor=Choose a color +AddFiles=Add Files +StartUpload=Start upload +CancelUpload=Cancel upload +FileIsTooBig=Files is too big +PleaseBePatient=Please be patient... +RequestToResetPasswordReceived=A request to change your Dolibarr password has been received +NewKeyIs=This is your new keys to login +NewKeyWillBe=Your new key to login to software will be +ClickHereToGoTo=Click here to go to %s +YouMustClickToChange=You must however first click on the following link to validate this password change +ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe. + +##### Calendar common ##### +AddCalendarEntry=Add entry in calendar %s +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted +##### Export ##### +Export=Export +ExportsArea=Exports area +AvailableFormats=Available formats +LibraryUsed=Librairy used +LibraryVersion=Version +ExportableDatas=Exportable data +NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions) +ToExport=Export +NewExport=New export +##### External sites ##### +ExternalSites=External sites diff --git a/htdocs/langs/lo_LA/paybox.lang b/htdocs/langs/lo_LA/paybox.lang new file mode 100644 index 00000000000..aced32a4944 --- /dev/null +++ b/htdocs/langs/lo_LA/paybox.lang @@ -0,0 +1,40 @@ +# Dolibarr language file - Source file is en_US - paybox +PayBoxSetup=PayBox module setup +PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects +PaymentForm=Payment form +WelcomeOnPaymentPage=Welcome on our online payment service +ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. +ThisIsInformationOnPayment=This is information on payment to do +ToComplete=To complete +YourEMail=Email to receive payment confirmation +Creditor=Creditor +PaymentCode=Payment code +PayBoxDoPayment=Go on payment +YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information +PleaseBePatient=Please, be patient +Continue=Next +ToOfferALinkForOnlinePayment=URL for %s payment +ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order +ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice +ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line +ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. +YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. +AccountParameter=Account parameters +UsageParameter=Usage parameters +InformationToFindParameters=Help to find your %s account information +PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment +VendorName=Name of vendor +CSSUrlForPaymentForm=CSS style sheet url for payment form +MessageOK=Message on validated payment return page +MessageKO=Message on canceled payment return page +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/lo_LA/paypal.lang b/htdocs/langs/lo_LA/paypal.lang new file mode 100644 index 00000000000..65a3dc45a23 --- /dev/null +++ b/htdocs/langs/lo_LA/paypal.lang @@ -0,0 +1,25 @@ +# Dolibarr language file - Source file is en_US - paypal +PaypalSetup=PayPal module setup +PaypalDesc=This module offer pages to allow payment on PayPal by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +PaypalOrCBDoPayment=Pay with credit card or Paypal +PaypalDoPayment=Pay with Paypal +PaypalCBDoPayment=Pay with credit card +PAYPAL_API_SANDBOX=Mode test/sandbox +PAYPAL_API_USER=API username +PAYPAL_API_PASSWORD=API password +PAYPAL_API_SIGNATURE=API signature +PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only +PaypalModeIntegral=Integral +PaypalModeOnlyPaypal=PayPal only +PAYPAL_CSS_URL=Optionnal Url of CSS style sheet on payment page +ThisIsTransactionId=This is id of transaction: %s +PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail +PAYPAL_IPN_MAIL_ADDRESS=E-mail address for the instant notification of payment (IPN) +PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n +YouAreCurrentlyInSandboxMode=You are currently in the "sandbox" mode +NewPaypalPaymentReceived=New Paypal payment received +NewPaypalPaymentFailed=New Paypal payment tried but failed +PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not) +ReturnURLAfterPayment=Return URL after payment +ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed +PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed diff --git a/htdocs/langs/lo_LA/printipp.lang b/htdocs/langs/lo_LA/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/lo_LA/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/lo_LA/productbatch.lang b/htdocs/langs/lo_LA/productbatch.lang new file mode 100644 index 00000000000..45263681965 --- /dev/null +++ b/htdocs/langs/lo_LA/productbatch.lang @@ -0,0 +1,21 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Use batch/serial number +ProductStatusOnBatch=Yes (Batch/serial required) +ProductStatusNotOnBatch=No (Batch/serial not used) +ProductStatusOnBatchShort=Yes +ProductStatusNotOnBatchShort=No +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. +ProductDoesNotUseBatchSerial=This product does not use batch/serial number diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang new file mode 100644 index 00000000000..3a18cda69e7 --- /dev/null +++ b/htdocs/langs/lo_LA/products.lang @@ -0,0 +1,256 @@ +# Dolibarr language file - Source file is en_US - products +ProductRef=Product ref. +ProductLabel=Product label +ProductServiceCard=Products/Services card +Products=Products +Services=Services +Product=Product +Service=Service +ProductId=Product/service id +Create=Create +Reference=Reference +NewProduct=New product +NewService=New service +ProductCode=Product code +ServiceCode=Service code +ProductVatMassChange=Mass VAT change +ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database. +MassBarcodeInit=Mass barcode init +MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete. +ProductAccountancyBuyCode=Accountancy code (buy) +ProductAccountancySellCode=Accountancy code (sell) +ProductOrService=Product or Service +ProductsAndServices=Products and Services +ProductsOrServices=Products or Services +ProductsAndServicesOnSell=Products and Services for sale or for purchase +ProductsAndServicesNotOnSell=Products and Services out of sale +ProductsAndServicesStatistics=Products and Services statistics +ProductsStatistics=Products statistics +ProductsOnSell=Product for sale or for pruchase +ProductsNotOnSell=Product out of sale and out of purchase +ProductsOnSellAndOnBuy=Products for sale and for purchase +ServicesOnSell=Services for sale or for purchase +ServicesNotOnSell=Services out of sale +ServicesOnSellAndOnBuy=Services for sale and for purchase +InternalRef=Internal reference +LastRecorded=Last products/services on sell recorded +LastRecordedProductsAndServices=Last %s recorded products/services +LastModifiedProductsAndServices=Last %s modified products/services +LastRecordedProducts=Last %s products recorded +LastRecordedServices=Last %s services recorded +LastProducts=Last products +CardProduct0=Product card +CardProduct1=Service card +CardContract=Contract card +Warehouse=Warehouse +Warehouses=Warehouses +WarehouseOpened=Warehouse opened +WarehouseClosed=Warehouse closed +Stock=Stock +Stocks=Stocks +Movement=Movement +Movements=Movements +Sell=Sales +Buy=Purchases +OnSell=For sale +OnBuy=For purchase +NotOnSell=Not for sale +ProductStatusOnSell=For sale +ProductStatusNotOnSell=Not for sale +ProductStatusOnSellShort=For sale +ProductStatusNotOnSellShort=Not for sale +ProductStatusOnBuy=For purchase +ProductStatusNotOnBuy=Not for purchase +ProductStatusOnBuyShort=For purchase +ProductStatusNotOnBuyShort=Not for purchase +UpdatePrice=Update price +AppliedPricesFrom=Applied prices from +SellingPrice=Selling price +SellingPriceHT=Selling price (net of tax) +SellingPriceTTC=Selling price (inc. tax) +PublicPrice=Public price +CurrentPrice=Current price +NewPrice=New price +MinPrice=Minim. selling price +MinPriceHT=Minim. selling price (net of tax) +MinPriceTTC=Minim. selling price (inc. tax) +CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount. +ContractStatus=Contract status +ContractStatusClosed=Closed +ContractStatusRunning=Running +ContractStatusExpired=expired +ContractStatusOnHold=Not running +ContractStatusToRun=To get running +ContractNotRunning=This contract is not running +ErrorProductAlreadyExists=A product with reference %s already exists. +ErrorProductBadRefOrLabel=Wrong value for reference or label. +ErrorProductClone=There was a problem while trying to clone the product or service. +ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +Suppliers=Suppliers +SupplierRef=Supplier's product ref. +ShowProduct=Show product +ShowService=Show service +ProductsAndServicesArea=Product and Services area +ProductsArea=Product area +ServicesArea=Services area +AddToMyProposals=Add to my proposals +AddToOtherProposals=Add to other proposals +AddToMyBills=Add to my bills +AddToOtherBills=Add to other bills +CorrectStock=Correct stock +AddPhoto=Add photo +ListOfStockMovements=List of stock movements +BuyingPrice=Buying price +SupplierCard=Supplier card +CommercialCard=Commercial card +AllWays=Path to find your product in stock +NoCat=Your product is not in any category +PrimaryWay=Primary path +PriceRemoved=Price removed +BarCode=Barcode +BarcodeType=Barcode type +SetDefaultBarcodeType=Set barcode type +BarcodeValue=Barcode value +NoteNotVisibleOnBill=Note (not visible on invoices, proposals...) +CreateCopy=Create copy +ServiceLimitedDuration=If product is a service with limited duration: +MultiPricesAbility=Several level of prices per product/service +MultiPricesNumPrices=Number of prices +MultiPriceLevelsName=Price categories +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product +EditAssociate=Associate +Translation=Translation +KeywordFilter=Keyword filter +CategoryFilter=Category filter +ProductToAddSearch=Search product to add +AddDel=Add/Delete +Quantity=Quantity +NoMatchFound=No match found +ProductAssociationList=List of related products/services: name of product/service (quantity affected) +ProductParentList=List of package products/services with this product as a component +ErrorAssociationIsFatherOfThis=One of selected product is parent with current product +DeleteProduct=Delete a product/service +ConfirmDeleteProduct=Are you sure you want to delete this product/service? +ProductDeleted=Product/Service "%s" deleted from database. +DeletePicture=Delete a picture +ConfirmDeletePicture=Are you sure you want to delete this picture ? +ExportDataset_produit_1=Products +ExportDataset_service_1=Services +ImportDataset_produit_1=Products +ImportDataset_service_1=Services +DeleteProductLine=Delete product line +ConfirmDeleteProductLine=Are you sure you want to delete this product line? +NoProductMatching=No product/service match your criteria +MatchingProducts=Matching products/services +NoStockForThisProduct=No stock for this product +NoStock=No Stock +Restock=Restock +ProductSpecial=Special +QtyMin=Minimum Qty +PriceQty=Price for this quantity +PriceQtyMin=Price for this min. qty (w/o discount) +VATRateForSupplierProduct=VAT Rate (for this supplier/product) +DiscountQtyMin=Default discount for qty +NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product +NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product +RecordedProducts=Products recorded +RecordedServices=Services recorded +RecordedProductsAndServices=Products/services recorded +PredefinedProductsToSell=Predefined products to sell +PredefinedServicesToSell=Predefined services to sell +PredefinedProductsAndServicesToSell=Predefined products/services to sell +PredefinedProductsToPurchase=Predefined product to purchase +PredefinedServicesToPurchase=Predefined services to purchase +PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase +GenerateThumb=Generate thumb +ProductCanvasAbility=Use special "canvas" addons +ServiceNb=Service #%s +ListProductServiceByPopularity=List of products/services by popularity +ListProductByPopularity=List of products by popularity +ListServiceByPopularity=List of services by popularity +Finished=Manufactured product +RowMaterial=Raw Material +CloneProduct=Clone product or service +ConfirmCloneProduct=Are you sure you want to clone product or service %s ? +CloneContentProduct=Clone all main informations of product/service +ClonePricesProduct=Clone main informations and prices +CloneCompositionProduct=Clone packaged product/services +ProductIsUsed=This product is used +NewRefForClone=Ref. of new product/service +CustomerPrices=Customers prices +SuppliersPrices=Suppliers prices +SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services) +CustomCode=Customs code +CountryOrigin=Origin country +HiddenIntoCombo=Hidden into select lists +Nature=Nature +ProductCodeModel=Product ref template +ServiceCodeModel=Service ref template +AddThisProductCard=Create product card +HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist. +AddThisServiceCard=Create service card +HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist. +CurrentProductPrice=Current price +AlwaysUseNewPrice=Always use current price of product/service +AlwaysUseFixedPrice=Use the fixed price +PriceByQuantity=Different prices by quantity +PriceByQuantityRange=Quantity range +ProductsDashboard=Products/Services summary +UpdateOriginalProductLabel=Modify original label +HelpUpdateOriginalProductLabel=Allows to edit the name of the product +### composition fabrication +Building=Production and items dispatchment +Build=Produce +BuildIt=Produce & Dispatch +BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action) +QtyNeed=Qty +UnitPmp=Net unit VWAP +CostPmpHT=Net total VWAP +ProductUsedForBuild=Auto consumed by production +ProductBuilded=Production completed +ProductsMultiPrice=Product multi-price +ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) +ProductSellByQuarterHT=Products turnover quarterly VWAP +ServiceSellByQuarterHT=Services turnover quarterly VWAP +Quarter1=1st. Quarter +Quarter2=2nd. Quarter +Quarter3=3rd. Quarter +Quarter4=4th. Quarter +BarCodePrintsheet=Print bar code +PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s. +NumberOfStickers=Number of stickers to print on page +PrintsheetForOneBarCode=Print several stickers for one barcode +BuildPageToPrint=Generate page to print +FillBarCodeTypeAndValueManually=Fill barcode type and value manually. +FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product. +FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty. +DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s. +DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s. +BarCodeDataForProduct=Barcode information of product %s : +BarCodeDataForThirdparty=Barcode information of thirdparty %s : +ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values) +PriceByCustomer=Different price for each customer +PriceCatalogue=Unique price per product/service +PricingRule=Rules for customer prices +AddCustomerPrice=Add price by customers +ForceUpdateChildPriceSoc=Set same price on customer subsidiaries +PriceByCustomerLog=Price by customer log +MinimumPriceLimit=Minimum price can't be lower that %s +MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions +PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey# +PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# +PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# +PriceMode=Price mode +PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang new file mode 100644 index 00000000000..0a12f4c64b7 --- /dev/null +++ b/htdocs/langs/lo_LA/projects.lang @@ -0,0 +1,142 @@ +# Dolibarr language file - Source file is en_US - projects +RefProject=Ref. project +ProjectId=Project Id +Project=Project +Projects=Projects +ProjectStatus=Project status +SharedProject=Everybody +PrivateProject=Contacts of project +MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). +ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. +ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). +MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). +TasksPublicDesc=This view presents all projects and tasks you are allowed to read. +TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). +ProjectsArea=Projects area +NewProject=New project +AddProject=Create project +DeleteAProject=Delete a project +DeleteATask=Delete a task +ConfirmDeleteAProject=Are you sure you want to delete this project ? +ConfirmDeleteATask=Are you sure you want to delete this task ? +OfficerProject=Officer project +LastProjects=Last %s projects +AllProjects=All projects +ProjectsList=List of projects +ShowProject=Show project +SetProject=Set project +NoProject=No project defined or owned +NbOpenTasks=Nb of opened tasks +NbOfProjects=Nb of projects +TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user +TimesSpent=Time spent +RefTask=Ref. task +LabelTask=Label task +TaskTimeSpent=Time spent on tasks +TaskTimeUser=User +TaskTimeNote=Note +TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined +NewTimeSpent=New time spent +MyTimeSpent=My time spent +MyTasks=My tasks +Tasks=Tasks +Task=Task +TaskDateStart=Task start date +TaskDateEnd=Task end date +TaskDescription=Task description +NewTask=New task +AddTask=Create task +AddDuration=Add duration +Activity=Activity +Activities=Tasks/activities +MyActivity=My activity +MyActivities=My tasks/activities +MyProjects=My projects +DurationEffective=Effective duration +Progress=Progress +ProgressDeclared=Declared progress +ProgressCalculated=Calculated progress +Time=Time +ListProposalsAssociatedProject=List of the commercial proposals associated with the project +ListOrdersAssociatedProject=List of customer's orders associated with the project +ListInvoicesAssociatedProject=List of customer's invoices associated with the project +ListPredefinedInvoicesAssociatedProject=List of customer's predefined invoices associated with project +ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project +ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project +ListContractAssociatedProject=List of contracts associated with the project +ListFichinterAssociatedProject=List of interventions associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project +ListActionsAssociatedProject=List of events associated with the project +ActivityOnProjectThisWeek=Activity on project this week +ActivityOnProjectThisMonth=Activity on project this month +ActivityOnProjectThisYear=Activity on project this year +ChildOfTask=Child of project/task +NotOwnerOfProject=Not owner of this private project +AffectedTo=Allocated to +CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab. +ValidateProject=Validate projet +ConfirmValidateProject=Are you sure you want to validate this project ? +CloseAProject=Close project +ConfirmCloseAProject=Are you sure you want to close this project ? +ReOpenAProject=Open project +ConfirmReOpenAProject=Are you sure you want to re-open this project ? +ProjectContact=Project contacts +ActionsOnProject=Events on project +YouAreNotContactOfProject=You are not a contact of this private project +DeleteATimeSpent=Delete time spent +ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me +TaskRessourceLinks=Ressources +ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party +NoTasks=No tasks for this project +LinkedToAnotherCompany=Linked to other third party +TaskIsNotAffectedToYou=Task not assigned to you +ErrorTimeSpentIsEmpty=Time spent is empty +ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. +IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. +CloneProject=Clone project +CloneTasks=Clone tasks +CloneContacts=Clone contacts +CloneNotes=Clone notes +CloneProjectFiles=Clone project joined files +CloneTaskFiles=Clone task(s) joined files (if task(s) cloned) +CloneMoveDate=Update project/tasks dates from now ? +ConfirmCloneProject=Are you sure to clone this project ? +ProjectReportDate=Change task date according project start date +ErrorShiftTaskDate=Impossible to shift task date according to new project start date +ProjectsAndTasksLines=Projects and tasks +ProjectCreatedInDolibarr=Project %s created +TaskCreatedInDolibarr=Task %s created +TaskModifiedInDolibarr=Task %s modified +TaskDeletedInDolibarr=Task %s deleted +##### Types de contacts ##### +TypeContact_project_internal_PROJECTLEADER=Project leader +TypeContact_project_external_PROJECTLEADER=Project leader +TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_task_internal_TASKEXECUTIVE=Task executive +TypeContact_project_task_external_TASKEXECUTIVE=Task executive +TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor +TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor +SelectElement=Select element +AddElement=Link to element +UnlinkElement=Unlink element +# Documents models +DocumentModelBaleine=A complete project's report model (logo...) +PlannedWorkload = Planned workload +WorkloadOccupation= Workload affectation +ProjectReferers=Refering objects +SearchAProject=Search a project +ProjectMustBeValidatedFirst=Project must be validated first +ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/lo_LA/propal.lang b/htdocs/langs/lo_LA/propal.lang new file mode 100644 index 00000000000..2b6d12870a1 --- /dev/null +++ b/htdocs/langs/lo_LA/propal.lang @@ -0,0 +1,100 @@ +# Dolibarr language file - Source file is en_US - propal +Proposals=Commercial proposals +Proposal=Commercial proposal +ProposalShort=Proposal +ProposalsDraft=Draft commercial proposals +ProposalDraft=Draft commercial proposal +ProposalsOpened=Opened commercial proposals +Prop=Commercial proposals +CommercialProposal=Commercial proposal +CommercialProposals=Commercial proposals +ProposalCard=Proposal card +NewProp=New commercial proposal +NewProposal=New commercial proposal +NewPropal=New proposal +Prospect=Prospect +ProspectList=Prospect list +DeleteProp=Delete commercial proposal +ValidateProp=Validate commercial proposal +AddProp=Create proposal +ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ? +ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name %s ? +LastPropals=Last %s proposals +LastClosedProposals=Last %s closed proposals +LastModifiedProposals=Last %s modified proposals +AllPropals=All proposals +LastProposals=Last proposals +SearchAProposal=Search a proposal +ProposalsStatistics=Commercial proposal's statistics +NumberOfProposalsByMonth=Number by month +AmountOfProposalsByMonthHT=Amount by month (net of tax) +NbOfProposals=Number of commercial proposals +ShowPropal=Show proposal +PropalsDraft=Drafts +PropalsOpened=Opened +PropalsNotBilled=Closed not billed +PropalStatusDraft=Draft (needs to be validated) +PropalStatusValidated=Validated (proposal is open) +PropalStatusOpened=Validated (proposal is open) +PropalStatusClosed=Closed +PropalStatusSigned=Signed (needs billing) +PropalStatusNotSigned=Not signed (closed) +PropalStatusBilled=Billed +PropalStatusDraftShort=Draft +PropalStatusValidatedShort=Validated +PropalStatusOpenedShort=Opened +PropalStatusClosedShort=Closed +PropalStatusSignedShort=Signed +PropalStatusNotSignedShort=Not signed +PropalStatusBilledShort=Billed +PropalsToClose=Commercial proposals to close +PropalsToBill=Signed commercial proposals to bill +ListOfProposals=List of commercial proposals +ActionsOnPropal=Events on proposal +NoOpenedPropals=No opened commercial proposals +NoOtherOpenedPropals=No other opened commercial proposals +RefProposal=Commercial proposal ref +SendPropalByMail=Send commercial proposal by mail +AssociatedDocuments=Documents associated with the proposal: +ErrorCantOpenDir=Can't open directory +DatePropal=Date of proposal +DateEndPropal=Validity ending date +DateEndPropalShort=Date end +ValidityDuration=Validity duration +CloseAs=Close with status +ClassifyBilled=Classify billed +BuildBill=Build invoice +ErrorPropalNotFound=Propal %s not found +Estimate=Estimate : +EstimateShort=Estimate +OtherPropals=Other proposals +AddToDraftProposals=Add to draft proposal +NoDraftProposals=No draft proposals +CopyPropalFrom=Create commercial proposal by copying existing proposal +CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services +DefaultProposalDurationValidity=Default commercial proposal validity duration (in days) +UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address +ClonePropal=Clone commercial proposal +ConfirmClonePropal=Are you sure you want to clone the commercial proposal %s ? +ConfirmReOpenProp=Are you sure you want to open back the commercial proposal %s ? +ProposalsAndProposalsLines=Commercial proposal and lines +ProposalLine=Proposal line +AvailabilityPeriod=Availability delay +SetAvailability=Set availability delay +AfterOrder=after order +##### Availability ##### +AvailabilityTypeAV_NOW=Immediate +AvailabilityTypeAV_1W=1 week +AvailabilityTypeAV_2W=2 weeks +AvailabilityTypeAV_3W=3 weeks +AvailabilityTypeAV_1M=1 month +##### Types de contacts ##### +TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal +TypeContact_propal_external_BILLING=Customer invoice contact +TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal +# Document models +DocModelAzurDescription=A complete proposal model (logo...) +DocModelJauneDescription=Jaune proposal model +DefaultModelPropalCreate=Default model creation +DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) +DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) diff --git a/htdocs/langs/lo_LA/resource.lang b/htdocs/langs/lo_LA/resource.lang new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/lo_LA/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/lo_LA/salaries.lang b/htdocs/langs/lo_LA/salaries.lang new file mode 100644 index 00000000000..28c21adfad3 --- /dev/null +++ b/htdocs/langs/lo_LA/salaries.lang @@ -0,0 +1,13 @@ +# Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge +Salary=Salary +Salaries=Salaries +Employee=Employee +NewSalaryPayment=New salary payment +SalaryPayment=Salary payment +SalariesPayments=Salaries payments +ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/lo_LA/sendings.lang b/htdocs/langs/lo_LA/sendings.lang new file mode 100644 index 00000000000..b1ff55f71c1 --- /dev/null +++ b/htdocs/langs/lo_LA/sendings.lang @@ -0,0 +1,85 @@ +# Dolibarr language file - Source file is en_US - sendings +RefSending=Ref. shipment +Sending=Shipment +Sendings=Shipments +Shipment=Shipment +Shipments=Shipments +ShowSending=Show Sending +Receivings=Receipts +SendingsArea=Shipments area +ListOfSendings=List of shipments +SendingMethod=Shipping method +SendingReceipt=Shipping receipt +LastSendings=Last %s shipments +SearchASending=Search for shipment +StatisticsOfSendings=Statistics for shipments +NbOfSendings=Number of shipments +NumberOfShipmentsByMonth=Number of shipments by month +SendingCard=Shipment card +NewSending=New shipment +CreateASending=Create a shipment +CreateSending=Create shipment +QtyOrdered=Qty ordered +QtyShipped=Qty shipped +QtyToShip=Qty to ship +QtyReceived=Qty received +KeepToShip=Remain to ship +OtherSendingsForSameOrder=Other shipments for this order +DateSending=Date sending order +DateSendingShort=Date sending order +SendingsForSameOrder=Shipments for this order +SendingsAndReceivingForSameOrder=Shipments and receivings for this order +SendingsToValidate=Shipments to validate +StatusSendingCanceled=Canceled +StatusSendingDraft=Draft +StatusSendingValidated=Validated (products to ship or already shipped) +StatusSendingProcessed=Processed +StatusSendingCanceledShort=Canceled +StatusSendingDraftShort=Draft +StatusSendingValidatedShort=Validated +StatusSendingProcessedShort=Processed +SendingSheet=Shipment sheet +Carriers=Carriers +Carrier=Carrier +CarriersArea=Carriers area +NewCarrier=New carrier +ConfirmDeleteSending=Are you sure you want to delete this shipment ? +ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? +ConfirmCancelSending=Are you sure you want to cancel this shipment ? +GenericTransport=Generic transport +Enlevement=Gotten by customer +DocumentModelSimple=Simple document model +DocumentModelMerou=Merou A5 model +WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +DateDeliveryPlanned=Planed date of delivery +DateReceived=Date delivery received +SendShippingByEMail=Send shipment by EMail +SendShippingRef=Submission of shipment %s +ActionsOnShipping=Events on shipment +LinkToTrackYourPackage=Link to track your package +ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +RelatedShippings=Related shipments +ShipmentLine=Shipment line +CarrierList=List of transporters +SendingRunning=Product from ordered customer orders +SuppliersReceiptRunning=Product from ordered supplier orders +ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders +ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders +ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent +ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received + +# Sending methods +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo +# ModelDocument +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/lo_LA/sms.lang b/htdocs/langs/lo_LA/sms.lang new file mode 100644 index 00000000000..4e89bb24730 --- /dev/null +++ b/htdocs/langs/lo_LA/sms.lang @@ -0,0 +1,53 @@ +# Dolibarr language file - Source file is en_US - sms +Sms=Sms +SmsSetup=Sms setup +SmsDesc=This page allows you to define globals options on SMS features +SmsCard=SMS Card +AllSms=All SMS campains +SmsTargets=Targets +SmsRecipients=Targets +SmsRecipient=Target +SmsTitle=Description +SmsFrom=Sender +SmsTo=Target +SmsTopic=Topic of SMS +SmsText=Message +SmsMessage=SMS Message +ShowSms=Show Sms +ListOfSms=List SMS campains +NewSms=New SMS campain +EditSms=Edit Sms +ResetSms=New sending +DeleteSms=Delete Sms campain +DeleteASms=Remove a Sms campain +PreviewSms=Previuw Sms +PrepareSms=Prepare Sms +CreateSms=Create Sms +SmsResult=Result of Sms sending +TestSms=Test Sms +ValidSms=Validate Sms +ApproveSms=Approve Sms +SmsStatusDraft=Draft +SmsStatusValidated=Validated +SmsStatusApproved=Approved +SmsStatusSent=Sent +SmsStatusSentPartialy=Sent partially +SmsStatusSentCompletely=Sent completely +SmsStatusError=Error +SmsStatusNotSent=Not sent +SmsSuccessfulySent=Sms correctly sent (from %s to %s) +ErrorSmsRecipientIsEmpty=Number of target is empty +WarningNoSmsAdded=No new phone number to add to target list +ConfirmValidSms=Do you confirm validation of this campain ? +ConfirmResetMailing=Warning, if you make a reinit of Sms campain %s, you will allow to make a mass sending of it a second time. Is it really what you wan to do ? +ConfirmDeleteMailing=Do you confirm removing of campain ? +NbOfRecipients=Number of targets +NbOfUniqueSms=Nb dof unique phone numbers +NbOfSms=Nbre of phon numbers +ThisIsATestMessage=This is a test message +SendSms=Send SMS +SmsInfoCharRemain=Nb of remaining characters +SmsInfoNumero= (format international ie : +33899701761) +DelayBeforeSending=Delay before sending (minutes) +SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider. + diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang new file mode 100644 index 00000000000..29706d17615 --- /dev/null +++ b/htdocs/langs/lo_LA/stocks.lang @@ -0,0 +1,134 @@ +# Dolibarr language file - Source file is en_US - stocks +WarehouseCard=Warehouse card +Warehouse=Warehouse +Warehouses=Warehouses +NewWarehouse=New warehouse / Stock area +WarehouseEdit=Modify warehouse +MenuNewWarehouse=New warehouse +WarehouseOpened=Warehouse opened +WarehouseClosed=Warehouse closed +WarehouseSource=Source warehouse +WarehouseSourceNotDefined=No warehouse defined, +AddOne=Add one +WarehouseTarget=Target warehouse +ValidateSending=Delete sending +CancelSending=Cancel sending +DeleteSending=Delete sending +Stock=Stock +Stocks=Stocks +Movement=Movement +Movements=Movements +ErrorWarehouseRefRequired=Warehouse reference name is required +ErrorWarehouseLabelRequired=Warehouse label is required +CorrectStock=Correct stock +ListOfWarehouses=List of warehouses +ListOfStockMovements=List of stock movements +StocksArea=Warehouses area +Location=Location +LocationSummary=Short name location +NumberOfDifferentProducts=Number of different products +NumberOfProducts=Total number of products +LastMovement=Last movement +LastMovements=Last movements +Units=Units +Unit=Unit +StockCorrection=Correct stock +StockTransfer=Stock transfer +StockMovement=Transfer +StockMovements=Stock transfers +LabelMovement=Movement label +NumberOfUnit=Number of units +UnitPurchaseValue=Unit purchase price +TotalStock=Total in stock +StockTooLow=Stock too low +StockLowerThanLimit=Stock lower than alert limit +EnhancedValue=Value +PMPValue=Weighted average price +PMPValueShort=WAP +EnhancedValueOfWarehouses=Warehouses value +UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant +QtyDispatched=Quantity dispatched +QtyDispatchedShort=Qty dispatched +QtyToDispatchShort=Qty to dispatch +OrderDispatch=Stock dispatching +RuleForStockManagementDecrease=Rule for stock management decrease +RuleForStockManagementIncrease=Rule for stock management increase +DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation +DeStockOnValidateOrder=Decrease real stocks on customers orders validation +DeStockOnShipment=Decrease real stocks on shipment validation +ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation +ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation +ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving +ReStockOnDeleteInvoice=Increase real stocks on invoice deletion +OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses. +StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock +NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required. +DispatchVerb=Dispatch +StockLimitShort=Limit for alert +StockLimit=Stock limit for alert +PhysicalStock=Physical stock +RealStock=Real Stock +VirtualStock=Virtual stock +MininumStock=Minimum stock +StockUp=Stock up +MininumStockShort=Stock min +StockUpShort=Stock up +IdWarehouse=Id warehouse +DescWareHouse=Description warehouse +LieuWareHouse=Localisation warehouse +WarehousesAndProducts=Warehouses and products +AverageUnitPricePMPShort=Weighted average input price +AverageUnitPricePMP=Weighted average input price +SellPriceMin=Selling Unit Price +EstimatedStockValueSellShort=Value to sell +EstimatedStockValueSell=Value to Sell +EstimatedStockValueShort=Input stock value +EstimatedStockValue=Input stock value +DeleteAWarehouse=Delete a warehouse +ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse %s ? +PersonalStock=Personal stock %s +ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s +SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease +SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase +NoStockAction=No stock action +LastWaitingSupplierOrders=Orders waiting for receptions +DesiredStock=Desired stock +StockToBuy=To order +Replenishment=Replenishment +ReplenishmentOrders=Replenishment orders +VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs +UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature +UseVirtualStock=Use virtual stock +UsePhysicalStock=Use physical stock +CurentSelectionMode=Curent selection mode +CurentlyUsingVirtualStock=Virtual stock +CurentlyUsingPhysicalStock=Physical stock +RuleForStockReplenishment=Rule for stocks replenishment +SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier +AlertOnly= Alerts only +WarehouseForStockDecrease=The warehouse %s will be used for stock decrease +WarehouseForStockIncrease=The warehouse %s will be used for stock increase +ForThisWarehouse=For this warehouse +ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. +Replenishments=Replenishments +NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) +NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) +MassMovement=Mass movement +MassStockMovement=Mass stock movement +SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". +RecordMovement=Record transfert +ReceivingForSameOrder=Receipts for this order +StockMovementRecorded=Stock movements recorded +RuleForStockAvailability=Rules on stock requirements +StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice +StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order +StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment +MovementLabel=Label of movement +InventoryCode=Movement or inventory code +IsInPackage=Contained into package +ShowWarehouse=Show warehouse +MovementCorrectStock=Stock content correction for product %s +MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang new file mode 100644 index 00000000000..baf573c66ac --- /dev/null +++ b/htdocs/langs/lo_LA/suppliers.lang @@ -0,0 +1,45 @@ +# Dolibarr language file - Source file is en_US - suppliers +Suppliers=Suppliers +AddSupplier=Create a supplier +SupplierRemoved=Supplier removed +SuppliersInvoice=Suppliers invoice +NewSupplier=New supplier +History=History +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier +OrderDate=Order date +BuyingPrice=Buying price +BuyingPriceMin=Minimum buying price +BuyingPriceMinShort=Min buying price +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined +AddSupplierPrice=Add supplier price +ChangeSupplierPrice=Change supplier price +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s +NoRecordedSuppliers=No suppliers recorded +SupplierPayment=Supplier payment +SuppliersArea=Suppliers area +RefSupplierShort=Ref. supplier +Availability=Availability +ExportDataset_fournisseur_1=Supplier invoices list and invoice lines +ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_3=Supplier orders and order lines +ApproveThisOrder=Approve this order +ConfirmApproveThisOrder=Are you sure you want to approve order %s ? +DenyingThisOrder=Deny this order +ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? +ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? +AddCustomerOrder=Create customer order +AddCustomerInvoice=Create customer invoice +AddSupplierOrder=Create supplier order +AddSupplierInvoice=Create supplier invoice +ListOfSupplierProductForSupplier=List of products and prices for supplier %s +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice +NbDaysToDelivery=Delivery delay in days +DescNbDaysToDelivery=The biggest delay is display among order product list diff --git a/htdocs/langs/lo_LA/trips.lang b/htdocs/langs/lo_LA/trips.lang new file mode 100644 index 00000000000..ba36fc9b07b --- /dev/null +++ b/htdocs/langs/lo_LA/trips.lang @@ -0,0 +1,126 @@ +# Dolibarr language file - Source file is en_US - trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report +ListOfFees=List of fees +NewTrip=New expense report +CompanyVisited=Company/foundation visited +Kilometers=Kilometers +FeesKilometersOrAmout=Amount or kilometers +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report +ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang new file mode 100644 index 00000000000..baf209f9d1c --- /dev/null +++ b/htdocs/langs/lo_LA/users.lang @@ -0,0 +1,122 @@ +# Dolibarr language file - Source file is en_US - users +HRMArea=HRM area +UserCard=User card +ContactCard=Contact card +GroupCard=Group card +NoContactCard=No card among contacts +Permission=Permission +Permissions=Permissions +EditPassword=Edit password +SendNewPassword=Regenerate and send password +ReinitPassword=Regenerate password +PasswordChangedTo=Password changed to: %s +SubjectNewPassword=Your new password for Dolibarr +AvailableRights=Available permissions +OwnedRights=Owned permissions +GroupRights=Group permissions +UserRights=User permissions +UserGUISetup=User display setup +DisableUser=Disable +DisableAUser=Disable a user +DeleteUser=Delete +DeleteAUser=Delete a user +DisableGroup=Disable +DisableAGroup=Disable a group +EnableAUser=Enable a user +EnableAGroup=Enable a group +DeleteGroup=Delete +DeleteAGroup=Delete a group +ConfirmDisableUser=Are you sure you want to disable user %s ? +ConfirmDisableGroup=Are you sure you want to disable group %s ? +ConfirmDeleteUser=Are you sure you want to delete user %s ? +ConfirmDeleteGroup=Are you sure you want to delete group %s ? +ConfirmEnableUser=Are you sure you want to enable user %s ? +ConfirmEnableGroup=Are you sure you want to enable group %s ? +ConfirmReinitPassword=Are you sure you want to generate a new password for user %s ? +ConfirmSendNewPassword=Are you sure you want to generate and send new password for user %s ? +NewUser=New user +CreateUser=Create user +SearchAGroup=Search a group +SearchAUser=Search a user +LoginNotDefined=Login is not defined. +NameNotDefined=Name is not defined. +ListOfUsers=List of users +Administrator=Administrator +SuperAdministrator=Super Administrator +SuperAdministratorDesc=Global administrator +AdministratorDesc=Administrator's entity +DefaultRights=Default permissions +DefaultRightsDesc=Define here default permissions that are automatically granted to a new created user (Go on user card to change permission of an existing user). +DolibarrUsers=Dolibarr users +LastName=Name +FirstName=First name +ListOfGroups=List of groups +NewGroup=New group +CreateGroup=Create group +RemoveFromGroup=Remove from group +PasswordChangedAndSentTo=Password changed and sent to %s. +PasswordChangeRequestSent=Request to change password for %s sent to %s. +MenuUsersAndGroups=Users & Groups +LastGroupsCreated=Last %s created groups +LastUsersCreated=Last %s users created +ShowGroup=Show group +ShowUser=Show user +NonAffectedUsers=Non assigned users +UserModified=User modified successfully +PhotoFile=Photo file +UserWithDolibarrAccess=User with Dolibarr access +ListOfUsersInGroup=List of users in this group +ListOfGroupsForUser=List of groups for this user +UsersToAdd=Users to add to this group +GroupsToAdd=Groups to add to this user +NoLogin=No login +LinkToCompanyContact=Link to third party / contact +LinkedToDolibarrMember=Link to member +LinkedToDolibarrUser=Link to Dolibarr user +LinkedToDolibarrThirdParty=Link to Dolibarr third party +CreateDolibarrLogin=Create a user +CreateDolibarrThirdParty=Create a third party +LoginAccountDisable=Account disabled, put a new login to activate it. +LoginAccountDisableInDolibarr=Account disabled in Dolibarr. +LoginAccountDisableInLdap=Account disabled in the domain. +UsePersonalValue=Use personal value +GuiLanguage=Interface language +InternalUser=Internal user +MyInformations=My data +ExportDataset_user_1=Dolibarr's users and properties +DomainUser=Domain user %s +Reactivate=Reactivate +CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. +InternalExternalDesc=An internal user is a user that is part of your company/foundation.
An external user is a customer, supplier or other.

In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display) +PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group. +Inherited=Inherited +UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party) +UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party) +IdPhoneCaller=Id phone caller +UserLogged=User %s login +UserLogoff=User %s logout +NewUserCreated=User %s created +NewUserPassword=Password change for %s +EventUserModified=User %s modified +UserDisabled=User %s disabled +UserEnabled=User %s activated +UserDeleted=User %s removed +NewGroupCreated=Group %s created +GroupModified=Group %s modified +GroupDeleted=Group %s removed +ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? +ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? +ConfirmCreateThirdParty=Are you sure you want to create a third party for this member ? +LoginToCreate=Login to create +NameToCreate=Name of third party to create +YourRole=Your roles +YourQuotaOfUsersIsReached=Your quota of active users is reached ! +NbOfUsers=Nb of users +DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin +HierarchicalResponsible=Supervisor +HierarchicView=Hierarchical view +UseTypeFieldToChange=Use field Type to change +OpenIDURL=OpenID URL +LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang new file mode 100644 index 00000000000..c36ffbf025a --- /dev/null +++ b/htdocs/langs/lo_LA/withdrawals.lang @@ -0,0 +1,97 @@ +# Dolibarr language file - Source file is en_US - withdrawals +StandingOrdersArea=Standing orders area +CustomersStandingOrdersArea=Customers standing orders area +StandingOrders=Standing orders +StandingOrder=Standing orders +NewStandingOrder=New standing order +StandingOrderToProcess=To process +StandingOrderProcessed=Processed +Withdrawals=Withdrawals +Withdrawal=Withdrawal +WithdrawalsReceipts=Withdrawal receipts +WithdrawalReceipt=Withdrawal receipt +WithdrawalReceiptShort=Receipt +LastWithdrawalReceipts=Last %s withdrawal receipts +WithdrawedBills=Withdrawn invoices +WithdrawalsLines=Withdrawal lines +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. +CustomersStandingOrders=Customer standing orders +CustomerStandingOrder=Customer standing order +NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request +NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information +InvoiceWaitingWithdraw=Invoice waiting for withdraw +AmountToWithdraw=Amount to withdraw +WithdrawsRefused=Withdraws refused +NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request. +ResponsibleUser=Responsible user +WithdrawalsSetup=Withdrawal setup +WithdrawStatistics=Withdraw's statistics +WithdrawRejectStatistics=Withdraw reject's statistics +LastWithdrawalReceipt=Last %s withdrawing receipts +MakeWithdrawRequest=Make a withdraw request +ThirdPartyBankCode=Third party bank code +ThirdPartyDeskCode=Third party desk code +NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN. +ClassCredited=Classify credited +ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account? +TransData=Transmission date +TransMetod=Transmission method +Send=Send +Lines=Lines +StandingOrderReject=Issue a rejection +WithdrawalRefused=Withdrawal refused +WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society +RefusedData=Date of rejection +RefusedReason=Reason for rejection +RefusedInvoicing=Billing the rejection +NoInvoiceRefused=Do not charge the rejection +InvoiceRefused=Invoice refused (Charge the rejection to customer) +Status=Status +StatusUnknown=Unknown +StatusWaiting=Waiting +StatusTrans=Sent +StatusCredited=Credited +StatusRefused=Refused +StatusMotif0=Unspecified +StatusMotif1=Insufficient funds +StatusMotif2=Request contested +StatusMotif3=No Withdrawal order +StatusMotif4=Customer Order +StatusMotif5=RIB unusable +StatusMotif6=Account without balance +StatusMotif7=Judicial Decision +StatusMotif8=Other reason +CreateAll=Withdraw all +CreateGuichet=Only office +CreateBanque=Only bank +OrderWaiting=Waiting for treatment +NotifyTransmision=Withdrawal Transmission +NotifyEmision=Withdrawal Emission +NotifyCredit=Withdrawal Credit +NumeroNationalEmetter=National Transmitter Number +PleaseSelectCustomerBankBANToWithdraw=Select information about customer bank account to withdraw +WithBankUsingRIB=For bank accounts using RIB +WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT +BankToReceiveWithdraw=Bank account to receive withdraws +CreditDate=Credit on +WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) +ShowWithdraw=Show Withdraw +IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. +WithdrawalFile=Withdrawal file +SetToStatusSent=Set to status "File Sent" +ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines + +### Notifications +InfoCreditSubject=Payment of standing order %s by the bank +InfoCreditMessage=The standing order %s has been paid by the bank
Data of payment: %s +InfoTransSubject=Transmission of standing order %s to bank +InfoTransMessage=The standing order %s has been sent to bank by %s %s.

+InfoTransData=Amount: %s
Method: %s
Date: %s +InfoFoot=This is an automated message sent by Dolibarr +InfoRejectSubject=Standing order refused +InfoRejectMessage=Hello,

the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.

--
%s +ModeWarning=Option for real mode was not set, we stop after this simulation diff --git a/htdocs/langs/lo_LA/workflow.lang b/htdocs/langs/lo_LA/workflow.lang new file mode 100644 index 00000000000..17c8dd3aafa --- /dev/null +++ b/htdocs/langs/lo_LA/workflow.lang @@ -0,0 +1,11 @@ +# Dolibarr language file - Source file is en_US - admin +WorkflowSetup=Workflow module setup +WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in. +ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated. +descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed +descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed +descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated +descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated diff --git a/htdocs/langs/nl_BE/banks.lang b/htdocs/langs/nl_BE/banks.lang index 206daa7c5b7..ce439cc3084 100644 --- a/htdocs/langs/nl_BE/banks.lang +++ b/htdocs/langs/nl_BE/banks.lang @@ -10,10 +10,8 @@ BalanceMinimalDesired=Minimum gewenst saldo InitialBankBalance=Beginsaldo EndBankBalance=Eindsaldo ShowAllTimeBalance=Toon saldo van start -Reconciliation=Reconciliation AccountStatement=Rekeningoverzicht AccountStatementShort=Rekeningoverzicht -Rapprochement=Reconciliate BankAccountDomiciliation=Bank adres BankAccountOwner=Rekeninghouder naam BankAccountOwnerAddress=Rekeninghouder adres diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang index 26c513c1640..3e9c2a738d8 100644 --- a/htdocs/langs/nl_BE/bills.lang +++ b/htdocs/langs/nl_BE/bills.lang @@ -46,7 +46,6 @@ CancelBill=Annuleer een factuur SendRemindByMail=EMail herinnering DoPayment=Doe betaling EnterPaymentReceivedFromCustomer=Voeg betaling in ontvangen van klant -EnterPaymentDueToCustomer=Make payment due to customer Amount=Bedrag BillStatus=Status factuur BillStatusDraft=Klad (moet gevalideerd worden) @@ -130,17 +129,12 @@ PaymentConditionShort60DENDMONTH=60 D einde m. PaymentConditionShortPT_DELIVERY=Bij levering PaymentTypeVIR=Overschrijving PaymentTypeShortVIR=Overschrijving -PaymentTypePRE=Bank's order -PaymentTypeShortPRE=Bank's order PaymentTypeLIQ=Rembours PaymentTypeShortLIQ=Rembours PaymentTypeCB=Kredietkaart PaymentTypeShortCB=Kredietkaart PaymentTypeVAD=Online betaling PaymentTypeShortVAD=Online betaling -BankDetails=Bank details -BankCode=Bank code -DeskCode=Desk code Residence=Domiciliering IBANNumber=IBAN nummer BICNumber=BIC/SWIFT nummer diff --git a/htdocs/langs/nl_BE/boxes.lang b/htdocs/langs/nl_BE/boxes.lang index 13a57c33de0..d52993dfb45 100644 --- a/htdocs/langs/nl_BE/boxes.lang +++ b/htdocs/langs/nl_BE/boxes.lang @@ -22,7 +22,6 @@ BoxTitleLastCustomersOrProspects=Laatste %s geregistreerde klanten of potentiël BoxTitleLastPropals=Laatste %s opgenomen offertes BoxTitleLastCustomerBills=Laatste %s facturen klanten BoxTitleLastSupplierBills=Laatste %s facturen leveranciers -BoxTitleLastProspects=Laatste %s geregistreerde potentiële klanten BoxTitleLastProductsInContract=Laatste %s producten / diensten in contracten BoxTitleOldestUnpaidCustomerBills=Oudste %s onbetaalde facturen klanten BoxTitleOldestUnpaidSupplierBills=Oudste %s onbetaalde facturen leveranciers diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang deleted file mode 100644 index 70564679d5f..00000000000 --- a/htdocs/langs/nl_BE/companies.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - companies diff --git a/htdocs/langs/nl_BE/compta.lang b/htdocs/langs/nl_BE/compta.lang index 2021806501d..03fff05cd82 100644 --- a/htdocs/langs/nl_BE/compta.lang +++ b/htdocs/langs/nl_BE/compta.lang @@ -8,8 +8,6 @@ OptionModeTrue=Optie Input-Ouput OptionModeVirtual=Optie Credit-Debet OptionModeTrueDesc=In deze context is de omzet berekend op betalingen (datum van de betalingen). \n De geldigheid van de cijfers zijn slechts verzekerd wanneer de boekhouding wordt gecontroleerd door middel van de input / output op de rekeningen via facturen. OptionModeVirtualDesc=In deze context wordt de omzet berekend op de facturen (datum van validatie). Wanneer deze facturen verschuldigd zijn, ongeacht of zij betaald zijn of niet, ze zijn opgenomen in de omzet. -FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration) -Param=Setup BillsForSuppliers=Facturen van leveranciers Outcome=Uitgaven ReportInOut=Inkomsten / Uitgaven diff --git a/htdocs/langs/nl_BE/dict.lang b/htdocs/langs/nl_BE/dict.lang index e53a3016315..13dc5f202c1 100644 --- a/htdocs/langs/nl_BE/dict.lang +++ b/htdocs/langs/nl_BE/dict.lang @@ -4,21 +4,17 @@ CountryTN=Tunisië CountryCM=Cameroun CountrySA=Saudi Arabië CountryAX=Land Eilanden -CountryCX=Christmas Island CountryCD=Congo, de Democratische Republiek van de CountryFK=Falklandeilanden CountryLY=Libische CountryMK=Macedonië, de Voormalige Joegoslavische van CountryPG=Papoea-Nieuw-Guinea -CountryPN=Pitcairn Islands -CountryVN=Viet Nam CivilityMME=Meneer CivilityMR=Mevrouw CivilityMLE=Jufrrouw CurrencyAUD=Dollar AU CurrencyCAD=Dollar KAN CurrencyEUR=Euro -CurrencyGBP=GB Pounds CurrencyTND=TND CurrencyUSD=Dollar US CurrencyXAF=CFA Frank BEAC diff --git a/htdocs/langs/nl_BE/ecm.lang b/htdocs/langs/nl_BE/ecm.lang index e62bad3d98c..427b9712044 100644 --- a/htdocs/langs/nl_BE/ecm.lang +++ b/htdocs/langs/nl_BE/ecm.lang @@ -10,7 +10,6 @@ ECMSectionManual=Manuele directorie ECMSectionAuto=Automatische directorie ECMSectionsManual=Manuale directories ECMSectionsAuto=Automatische directories -ECMSections=Directories ECMNewSection=Nieuwe directorie ECMAddSection=Maak manueel een directorie aan ECMCreationDate=Aanmaakdatum diff --git a/htdocs/langs/nl_BE/errors.lang b/htdocs/langs/nl_BE/errors.lang index d168cb69550..77f035e2009 100644 --- a/htdocs/langs/nl_BE/errors.lang +++ b/htdocs/langs/nl_BE/errors.lang @@ -18,13 +18,9 @@ ErrorBadSupplierCodeSyntax=Slechte syntaxis voor Leverancierscode ErrorSupplierCodeRequired=Leverancierscode nodig ErrorBadParameters=Slechte parameters ErrorFailedToWriteInDir=Mislukt om in de map %s te schrijven -ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s) -ErrorUserCannotBeDelete=User can not be deleted. May be it is associated on Dolibarr entities. ErrorFailedToCreateDir=Mislukt om een directory te creëren. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter safe_mode is enabled on this PHP, check that Dolibarr php files owns to web server user (or group). ErrorNoMailDefinedForThisUser=Geen mail gedefinieerd voor deze gebruiker ErrorFeatureNeedJavascript=Javascript moet geactiveerd zijn voor deze functie. Verander dit in de setup - display. -ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'. -ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id. ErrorFileNotFound=Bestand niet gevonden (Slecht pad, verkeerde permissies of toegang geweigerd door openbasedir parameter) ErrorFunctionNotAvailableInPHP=Functie %s is vereist voor deze toepassing, maar is niet beschikbaar in deze versie / setup van PHP. ErrorDirAlreadyExists=Een map met deze naam bestaat al. @@ -32,7 +28,6 @@ ErrorNoAccountancyModuleLoaded=Geen "accountancy" module geactiveerd ErrorExportDuplicateProfil=Deze profielnaam bestaat al voor deze export set. ErrorLDAPSetupNotComplete=Dolibarr LDAP-matching is niet compleet. ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more informations on errors. -ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled. ErrorRefAlreadyExists=Ref gebruikt voor de oprichting bestaat al. ErrorPleaseTypeBankTransactionReportName=Vul bankontvangst naam in waar transactie wordt gemeld (Formaat YYYYMM of JJJJMMDD) ErrorRecordHasChildren=Mislukt om records te verwijderen omdat er nog gelinkte bestanden zijn. @@ -48,12 +43,10 @@ ErrorCantReadDir=Mislukt om directorie '%s' te lezen ErrorFailedToFindEntity=Mislukt om entiteit '%s' te lezen ErrorBadLoginPassword=Onjuiste waarde voor login of wachtwoord ErrorLoginDisabled=Uw account is uitgeschakeld -ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP Safe Mode is enabled, check that command is inside a directory defined by parameter safe_mode_exec_dir. ErrorFailedToChangePassword=Mislukt om wachtwoord te wijzigen ErrorLoginDoesNotExists=Gebruiker met login %s kon niet worden gevonden. ErrorBadValueForCode=Slechte waarde voor de input-code. Probeer het opnieuw met een nieuwe waarde ... WarningAllowUrlFopenMustBeOn=Parameter allow_url_fopen must be set to on in filer php.ini for having this module working completely. U moet dit bestand handmatig wijzigen. -WarningBuildScriptNotRunned=Script %s was not yet ran to build graphics, or there is no data to show. WarningBookmarkAlreadyExists=Een bladwijzer met deze titel of deze URL bestaat al. WarningPassIsEmpty=Waarschuwing, database wachtwoord is leeg. Dit is een gat in de beveiliging. You should add a password to your database and change your conf.php file to reflect this. WarningUntilDirRemoved=Deze waarschuwing zal actief blijven zolang deze map aanwezig is (alleen weergegeven voor admin-gebruikers).WarningInstallDirExists=Waarschuwing, install directorie (%s) bestaat nog steeds. Dit is een ernstig beveiligingslek. U moet deze zo spoedig mogelijk verwijderen. diff --git a/htdocs/langs/nl_BE/exports.lang b/htdocs/langs/nl_BE/exports.lang index 6dc7e5d6939..15ff2545d16 100644 --- a/htdocs/langs/nl_BE/exports.lang +++ b/htdocs/langs/nl_BE/exports.lang @@ -2,8 +2,6 @@ ExportsArea=Export gebied ImportArea=Import gebied NewExport=Nieuwe exportmogelijkheden -ExportableDatas=Exportable dataset -ImportableDatas=Importable dataset SelectExportDataSet=Kies dataset die u wilt exporteren ... SelectExportFields=Kies velden die u wilt exporteren, of selecteer een vooraf gedefinieerde uitvoer-profiel SaveExportModel=Bewaar dit uitvoer-profiel als u van plan bent om het later te hergebruiken ... @@ -11,7 +9,6 @@ ExportModelName=Export profielnaam ExportModelSaved=Export profiel opgeslagen onder de naam %s. ExportableFields=Exportable velden DatasetToExport=Dataset te exporteren -Dataset=Dataset ChooseFieldsOrdersAndTitle=Kies velden Om ... FieldsOrder=Velden bestelling FieldsTitle=Velden titel @@ -21,11 +18,8 @@ AvailableFormats=Formaten beschikbaar LibraryUsed=Librairie FormatedImport=Import-assistent FormatedImportDesc1=Dit gebied maakt het mogelijk om persoonlijke gegevens te importeren, met behulp van een assistent om u te helpen in het proces, zonder technische kennis. -FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load. FormatedExport=Export assistent FormatedExportDesc1=Dit gebied maakt het mogelijk om persoonlijke gegevens te exporteren, met behulp van een assistent om u te helpen in het proces, zonder technische kennis. -FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order. -FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to. Sheet=Blad NoImportableData=Geen importable gegevens (no module with definitions to allow data imports) FileSuccessfullyBuilt=Export bestand gegenereerd diff --git a/htdocs/langs/nl_BE/ftp.lang b/htdocs/langs/nl_BE/ftp.lang deleted file mode 100644 index 66407cca057..00000000000 --- a/htdocs/langs/nl_BE/ftp.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - ftp diff --git a/htdocs/langs/nl_BE/help.lang b/htdocs/langs/nl_BE/help.lang deleted file mode 100644 index 964027e2352..00000000000 --- a/htdocs/langs/nl_BE/help.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - help diff --git a/htdocs/langs/nl_BE/install.lang b/htdocs/langs/nl_BE/install.lang index e768ee17942..7967a9c12c8 100644 --- a/htdocs/langs/nl_BE/install.lang +++ b/htdocs/langs/nl_BE/install.lang @@ -68,7 +68,6 @@ GoToSetupArea=Ga naar Dolibarr (setup gebied) WithNoSlashAtTheEnd=Zonder de schuine streep "/" aan het eind DirectoryRecommendation=Het wordt aanbevolen deze directorie te plaatsen uit de directorie van de webpagina's. LoginAlreadyExists=login bestaat reeds -DolibarrAdminLogin=Dolibarr admin login AdminLoginAlreadyExists=Dolibarr administrator account '%s' bestaat reeds. WarningRemoveInstallDir=Waarschuwing, nadat de installatie of upgrade is voltooid, moet u om veiligheidsredenen de install directorie verwijderen of hernoemen naar install.lock om kwaadwillige gebruik te voorkomen. ThisPHPDoesNotSupportTypeBase=Dit PHP-systeem biedt geen ondersteuning voor enig interface om toegang te krijgen tot database type %s @@ -121,13 +120,8 @@ MigrationContractsFieldDontExist=Veld fk_facture bestaat niet meer. Niets te doe MigrationContractsEmptyDatesUpdateSuccess=Contract lege datum correctie succesvol gedaan MigrationContractsEmptyDatesNothingToUpdate=Geen contract lege datum te corrigeren MigrationContractsEmptyCreationDatesNothingToUpdate=Geen contract aanmaakdatum te corrigeren -MigrationContractsInvalidDatesUpdate=Bad value date contract correction -MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s) MigrationContractsInvalidDatesNumber=%s contracten gemodifieerd MigrationContractsInvalidDatesNothingToUpdate=Geen datum met slechte waarde te corrigeren -MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction -MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done succesfuly -MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct MigrationReopeningContracts=Open contract gesloten door fout MigrationReopenThisContract=Heropenen contract %s MigrationReopenedContractsNumber=%s contracten gemodifieerd diff --git a/htdocs/langs/nl_BE/languages.lang b/htdocs/langs/nl_BE/languages.lang deleted file mode 100644 index c939f301168..00000000000 --- a/htdocs/langs/nl_BE/languages.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - languages diff --git a/htdocs/langs/nl_BE/mails.lang b/htdocs/langs/nl_BE/mails.lang index 657a92a6732..3c7e836943e 100644 --- a/htdocs/langs/nl_BE/mails.lang +++ b/htdocs/langs/nl_BE/mails.lang @@ -32,7 +32,6 @@ ConfirmValidMailing=Weet u zeker dat u deze mailing wilt valideren om te verzend ConfirmDeleteMailing=Weet u zeker dat u deze mailing wilt verwijderen? NoTargetYet=Nog geen ontvangers gedefiniëerd (Ga op het tabblad "Ontvangers") RemoveRecipient=Verwijder ontvanger -CommonSubstitutions=Common substitutions YouCanAddYourOwnPredefindedListHere=Om uw email selector module te creëren, zie htdocs/core/modules/mailings/README. EMailTestSubstitutionReplacedByGenericValues=Bij het gebruik van test-modus, substituties variabelen worden vervangen door algemene waarden MailingAddFile=Bestand toevoegen diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang index f7c21052fa8..7b963e8acca 100644 --- a/htdocs/langs/nl_BE/main.lang +++ b/htdocs/langs/nl_BE/main.lang @@ -25,7 +25,6 @@ ErrorFailedToOpenFile=Gefaald om file %s te openen ErrorCanNotCreateDir=Kan dir %s niet creëren ErrorCanNotReadDir=Kan dircectory %s niet lezen ErrorUnknown=ONBEKENDE fout -ErrorSQL=SQL Error ErrorLogoFileNotFound=Logo bestand "%s" is niet gevonden ErrorGoToGlobalSetup=Ga naar "Bedrijf" setup om dit op te lossen ErrorGoToModuleSetup=Ga naar Module setup Om dit op te lossen @@ -47,21 +46,15 @@ ErrorFailedToSaveFile=Fout, mislukt om bestand op te slaan. RecordSaved=Record opgeslagen LevelOfFeature=Niveau van de functies DefinedAndHasThisValue=Omschreven en heeft waarde van -IsNotDefined=undefined -DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to %s in configuration file conf.php.
This means that password database is extern to Dolibarr, so changing this field may have no effects. -Undefined=Undefined HomeArea=Home gebied PreviousConnexion=Vorige verbinding RequestedUrl=Aangevraagd Url RequestLastAccess=Verzoek voor laatste database toegang RequestLastAccessInError=Verzoek voor laatste database toegang in fout -ReturnCodeLastAccessInError=Return code for last database access in error -InformationLastAccessInError=Information for last database access in error DolibarrHasDetectedError=Dolibarr heeft een technische fout InformationToHelpDiagnose=Informatie die kan helpen bij het vaststellen NotePublic=Nota (openbaar) NotePrivate=Nota (privé) -PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to %s decimals. WarningYouHaveAtLeastOneTaskLate=Waarschuwing, u hebt ten minste één element dat de tolerantie van vertraging heeft overschreden. Activate=Activeer Activated=Activeer @@ -86,12 +79,9 @@ Choose=Kiezen ChooseLangage=Selecteer alstublieft je taal Author=De auteur PasswordRetype=Voer opnieuw je wachtwoord in -Parameter=Parameter -Parameters=Parameters Note=Aantekening Label=Het etiket RefOrLabel=Ref. of etiket -Info=Log DefaultModel=Standaardmodel DevelopmentTeam=Ontwikkelingsteam Connection=Verbinding @@ -112,8 +102,6 @@ DatePlanShort=Datum geplant DateRealShort=Datum echt. Hour=uur Hours=Uren -Quadri=Quadri -HourShort=H Default=Standaardwaarde DefaultValue=Default waarde UnitPriceTTC=Eenheidsprijs @@ -131,7 +119,6 @@ IncludedVAT=Incl. BTW HT=Na aftrek van belastingen TTC=Incl. BTW VATRate=BTW tarief -Delta=Delta List=De lijst FullList=Volledige lijst Ref=Ref @@ -158,7 +145,6 @@ Others=Anderen Draft=Ontwerp Drafts=Ontwerpen Rejects=Verwerpen -Preview=Preview Late=Laat January=januari February=februari @@ -173,9 +159,6 @@ October=oktober November=november December=december FileTransferComplete=Bestand werd succesvol upgeload -DateFormatYYYYMM=YYYY-MM -DateFormatYYYYMMDD=YYYY-MM-DD -DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS ReportPeriod=Rapport periode ReportDescription=Beschrijving Keyword=Sleutelwoord @@ -199,7 +182,6 @@ Entity=Profiel Entities=Profielen CustomerPreview=Klanten preview SupplierPreview=Leverancier preview -AccountancyPreview=Accountancy preview ShowCustomerPreview=Toon klant preview ShowSupplierPreview=Toon leverancier preview ShowAccountancyPreview=Toon accountancy preview @@ -228,7 +210,6 @@ CurrentTheme=Huidig thema ForCustomer=Voor de klant HidePassword=Toon commando met het wachtwoord verborgen UnHidePassword=Toon echt commando met geen verborgen wachtwoord -Page=Page Notes=Nota's NewAttribute=Nieuw attribuut OptionalFieldsSetup=Optionele velden setup @@ -241,9 +222,7 @@ Day4=donderdag Day5=vrijdag Day6=zaterdag Day0=zondag -ShortMonday=M ShortTuesday=D -ShortWednesday=W ShortThursday=D ShortFriday=V ShortSaturday=Z diff --git a/htdocs/langs/nl_BE/orders.lang b/htdocs/langs/nl_BE/orders.lang index 771601f4e6f..8e18d502b6a 100644 --- a/htdocs/langs/nl_BE/orders.lang +++ b/htdocs/langs/nl_BE/orders.lang @@ -62,7 +62,6 @@ ConfirmValidateOrder=Bent u zeker dat u deze bestelling onder naam %ss wi ConfirmCancelOrder=Bent u zeker dat u deze bestelling wil annuleren? ConfirmMakeOrder=Bent u zeker dat u deze bestelling gemaakt op %ss wil bevestigen? ClassifyBilled=Classify "Billed" -ComptaCard=Accountancy card DraftOrders=Klad bestellingen RelatedOrders=Gerelateerde bestellingen OnProcessOrders=Bestellingen in uitvoering diff --git a/htdocs/langs/nl_BE/other.lang b/htdocs/langs/nl_BE/other.lang index 592c4f1547e..c1a1850e465 100644 --- a/htdocs/langs/nl_BE/other.lang +++ b/htdocs/langs/nl_BE/other.lang @@ -20,9 +20,6 @@ FeaturesSupported=Functies ondersteund SendNewPasswordDesc=Dit formulier laat u toe om een nieuwe wachtwoord aan te vragen. Het zal worden verstuurd naar uw e-mailadres.
Verandering van het wachtwoord zal enkel gebeuren na het klikken op de bevestigingslink van deze mail.
Controleer uw e-mail ontvanger. BackToLoginPage=Naar login pagina AuthenticationDoesNotAllowSendNewPassword=De verificatie van Dolibarr is ingesteld op %s.
In deze modus kan Dolibarr uw wachtwoord niet weten of wijzigen.
Neem contact op met uw systeembeheerder voor het wijzigen van uw wachtwoord. -EnableGDLibraryDesc=Install or enable GD library with your PHP for use this option. -EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib) -ProfIdShortDesc=Prof Id %s is an information depending on third party country.
For example, for country %s, it's code %s. DolibarrDemo=Dolibarr ERP / CRM demo StatsByNumberOfUnits=Statistieken van het aantal eenheden StatsByNumberOfEntities=Statistieken van het aantal verwezen entiteiten diff --git a/htdocs/langs/nl_BE/paybox.lang b/htdocs/langs/nl_BE/paybox.lang deleted file mode 100644 index 539f4f0d40e..00000000000 --- a/htdocs/langs/nl_BE/paybox.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - paybox diff --git a/htdocs/langs/nl_BE/products.lang b/htdocs/langs/nl_BE/products.lang index 74c92b41150..9e4761e9f41 100644 --- a/htdocs/langs/nl_BE/products.lang +++ b/htdocs/langs/nl_BE/products.lang @@ -2,7 +2,6 @@ ProductServiceCard=Producten/Diensten kaart ProductId=Product/dienst id Create=Maak -ServiceCode=Service code ProductsAndServicesOnSell=Producten en Diensten in verkoop ProductsAndServicesNotOnSell=Producten en diensten niet in verkoop ProductsAndServicesStatistics=Statistieken van producten en diensten @@ -41,8 +40,6 @@ AddToOtherProposals=Toevoegen aan andere voorstellen SupplierCard=Leverancierskaart AllWays=Pad naar het vinden van uw product in voorraad NoCat=Uw product is niet in elke categorie -BarCode=Barcode -BarcodeType=Barcode type SetDefaultBarcodeType=Stel barcode type BarcodeValue=Barcode waarde NoteNotVisibleOnBill=Nota (niet zichtbaar op facturen, voorstellen ...) @@ -65,7 +62,6 @@ ProductDeleted=Product / Dienst: %s geschrapt uit de database. ExportDataset_produit_1=Producten en diensten ConfirmDeleteProductLine=Weet u zeker dat u deze prodcutlijn wilt verwijderen? NoProductMatching=Geen product / dienst voldoen aan uw criteria -Restock=Restock ProductSpecial=Speciale QtyMin=Minimum hoeveelheid PriceQtyMin=Prijs hoeveelheid min. @@ -74,7 +70,6 @@ NoSupplierPriceDefinedForThisProduct=Geen enkele leverancier prijs / Qty gedefin RecordedProducts=Producten geregistreerd RecordedProductsAndServices=Producten / diensten opgenomen GenerateThumb=Genereer Thumb -ProductCanvasAbility=Use special "canvas" addons ServiceNb=Service # %s ListProductByPopularity=Lijst van producten / diensten op populariteit Finished=Afgewerkt product diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index 4cc0afc76c2..cec0f69b646 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -17,7 +17,7 @@ FormatDateShortJQueryInput=dd-mm-yy FormatHourShortJQuery=HH:MM FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M -FormatDateTextShort=%d %b %R +FormatDateTextShort=%d %b %Y FormatDateText=%B %d, %Y FormatDateHourShort=%m/%d/%Y %I:%M %p FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang index c64e3933a2b..eed90c5f694 100644 --- a/htdocs/langs/pt_BR/accountancy.lang +++ b/htdocs/langs/pt_BR/accountancy.lang @@ -6,90 +6,12 @@ ConfigAccountingExpert=Configuração do módulo especialista em contabilidade Journaux=Jornais JournalFinancial=Jornais financeiros Selectmodelcsv=Escolha um modelo de exportação -Modelcsv_CEGID=Export towards CEGID Expert -BackToChartofaccounts=Return chart of accounts -Back=Return -Definechartofaccounts=Define a chart of accounts -Selectchartofaccounts=Select a chart of accounts -Addanaccount=Add an accounting account -AccountAccounting=Accounting account -Ventilation=Breakdown -CustomersVentilation=Breakdown customers -SuppliersVentilation=Breakdown suppliers -TradeMargin=Trade margin -Reports=Reports -ByCustomerInvoice=By invoices customers -UpdateAccount=Modification of an accounting account -UpdateMvts=Modification of a movement -WriteBookKeeping=Record accounts in general ledger -Bookkeeping=General ledger -AccountBalanceByMonth=Account balance by month -AccountingVentilation=Breakdown accounting -AccountingVentilationSupplier=Breakdown accounting supplier -AccountingVentilationCustomer=Breakdown accounting customer -CAHTF=Total purchase supplier HT -InvoiceLines=Lines of invoice to be ventilated -InvoiceLinesDone=Ventilated lines of invoice -IntoAccount=In the accounting account -Ventilate=Ventilate -VentilationAuto=Automatic breakdown -EndProcessing=The end of processing -AnyLineVentilate=Any lines to ventilate SelectedLines=Linhas selecionadas -Lineofinvoice=Line of invoice -VentilatedinAccount=Ventilated successfully in the accounting account -NotVentilatedinAccount=Not ventilated in the accounting account ACCOUNTING_SEPARATORCSV=Separator CSV -ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) -ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements -ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements -AccountLength=Length of the accounting accounts shown in Dolibarr -AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. -ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts -ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts -ACCOUNTING_SELL_JOURNAL=Sell journal -ACCOUNTING_PURCHASE_JOURNAL=Purchase journal -ACCOUNTING_BANK_JOURNAL=Bank journal -ACCOUNTING_CASH_JOURNAL=Cash journal -ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal -ACCOUNTING_SOCIAL_JOURNAL=Social journal -ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer -ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait ACCOUNTING_PRODUCT_BUY_ACCOUNT=Codigo contavel padrao para compra de produtos ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Codigo contavel padrao para venda de produtos ACCOUNTING_SERVICE_BUY_ACCOUNT=Codigo contavel padrao para compra de servicos ACCOUNTING_SERVICE_SOLD_ACCOUNT=Codigo contavel padrao para venda de serviços Docref=Referência Code_tiers=Cliente/Fornecedor -Labelcompte=Label account -Sens=Sens -Codejournal=Journal -DelBookKeeping=Delete the records of the general ledger -BankJournal=Bank journal -DescBankJournal=Bank journal including all the types of payments other than cash -CashJournal=Cash journal -DescCashJournal=Cash journal including the type of payment cash -CashPayment=Cash Payment -ThirdPartyAccount=Thirdparty account NewAccountingMvt=Nova movimentação -NumMvts=Number of movement -ListeMvts=List of the movement -ErrorDebitCredit=Debit and Credit cannot have a value at the same time -ReportThirdParty=List thirdparty account -DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts -ListAccounts=List of the accounting accounts -Pcgversion=Version of the plan -Pcgtype=Class of account -Pcgsubtype=Under class of account -DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers -TotalVente=Total turnover HT -TotalMarge=Total sales margin -DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account -DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account -ChangeAccount=Change the accounting account for lines selected by the account: -DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers -DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account -DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account -ValidateHistory=Validate Automatically -ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used -FicheVentilation=Breakdown card diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang index 0a86251af87..511241d55c0 100644 --- a/htdocs/langs/pt_BR/admin.lang +++ b/htdocs/langs/pt_BR/admin.lang @@ -112,7 +112,6 @@ PurgeAuditEvents=Apagar os eventos de segurança ConfirmPurgeAuditEvents=Tem a certeza que pretende limpar a lista de eventos de auditoria de segurança? Todos os logs de seguranca serao apagaos, nenhum outro dado sera removido. NewBackup=Novo Backup GenerateBackup=Gerar Backup -Backup=Backup RunCommandSummary=A cópia será executada pelo seguinte comando RunCommandSummaryToLaunch=O backup pode ser executado com o seguinte comando WebServerMustHavePermissionForCommand=Seu servidor deve ter permissoes para executar esta ordem @@ -372,7 +371,6 @@ Module6000Desc=Gestão de fluxo de trabalho Module20000Name=Sair da configuração de pedidos Module39000Name=Lote de produto Module39000Desc=Número do lote, para gestão da data de validade para venda dos produtos -Module50000Name=PayBox Module50000Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com PayBox Module50100Desc=Caixa registradora Module50200Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com Paypal @@ -607,13 +605,11 @@ SetupDescription1=Todas as opções desta área de configuração são opções SetupDescription2=Os 2 Passos indispensáveis da configuração são as 2 primeiras do menu esquerdo: a configuração da empresa/Instituição e a configuração dos módulos: SetupDescription4=A configuração Módulos é indispensável já que Dolibarr não é um ERP/CRM monolítico, é um conjunto de módulos mais ou menos independente. Depois de ativar os módulos que lhe interessem verificar as suas funcionalidades nos menus de Dolibarr. SetupDescription5=Outros itens do menu gerenciar parâmetros opcionais. -InfoDolibarr=Infos Dolibarr InfoBrowser=Infos Navegador InfoOS=Informações do sistema operacional InfoWebServer=Informações do Web Server InfoDatabase=Informações da base de dados InfoPHP=Informações do PHP -InfoPerf=Infos performances BrowserName=Nome do navegador BrowserOS=Navegador OS ListOfSecurityEvents=Listado de eventos de segurança Dolibarr @@ -802,8 +798,6 @@ LDAPUsersSynchro=Usuário LDAPContactsSynchro=Contatos LDAPSynchronization=sincronização LDAP LDAPFunctionsNotAvailableOnPHP=as funções LDAP não estão disponíveis na sua PHP -LDAPToDolibarr=LDAP -> Dolibarr -DolibarrToLDAP=Dolibarr -> LDAP LDAPSynchronizeUsers=sincronização dos Usuários Dolibarr com LDAP LDAPSynchronizeGroups=sincronização dos grupos de Usuários Dolibarr com LDAP LDAPSynchronizeContacts=sincronização dos contatos Dolibarr com LDAP @@ -925,7 +919,6 @@ BarCodeNumberManager=Gerente de auto definir números de código de barras WithdrawalsSetup=configuração do módulo Débitos Diretos ExternalRSSSetup=configuração das importações do fluxos RSS NewRSS=Sindicação de um Novo fluxos RSS -RSSUrl=RSS URL MailingEMailError=Voltar E-mail (Erros-to) para e-mails com erros NotificationSetup=Configuração do módulo de notificações por e-mail SendingsSetup=configuração do módulos envios @@ -998,7 +991,6 @@ EndPointIs=Clientes SOAP devem enviar seus pedidos para o terminal Dolibarr Disp BankSetupModule=Configuração do módulo Banco FreeLegalTextOnChequeReceipts=Texto livre em recibos de verificação BankOrderShow=Ordem de apresentação das contas bancárias para os países usando o "número do banco detalhada" -BankOrderGlobal=General BankOrderES=Espanhol BankOrderESDesc=Ordem de exibição Espanhol MultiCompanySetup=Configuração do módulo Multi-empresa diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang index c730091cccb..3f5b2428e93 100644 --- a/htdocs/langs/pt_BR/companies.lang +++ b/htdocs/langs/pt_BR/companies.lang @@ -57,32 +57,14 @@ TypeLocaltax1ES=RE Tipo TypeLocaltax2ES=IRPF Tipo WrongCustomerCode=Código cliente incorreto WrongSupplierCode=Código do fornecedor incorreto -ProfId5Short=Prof. id 5 ProfId6Short=Prof. id 6 ProfId5=ID profesional 5 ProfId6=ID profesional 6 -ProfId1AR=Prof Id 1 (CUIT/CUIL) ProfId2AR=Prof Id 2 (Receitas brutas) ProfId1BE=Núm da Ordem -ProfId1CL=Prof Id 1 (R.U.T.) -ProfId1CO=Prof Id 1 (R.U.T.) -ProfId2DE=Prof Id 2 (USt.-Nr) -ProfId3DE=Prof Id 3 (Handelsregister-Nr.) -ProfId1ES=Prof Id 1 (CIF/NIF) ProfId2ES=Prof Id 2 (Número do seguro social) -ProfId3ES=Prof Id 3 (CNAE) -ProfId4ES=Prof Id 4 (Collegiate number) -ProfId5FR=- -ProfId2IN=Prof Id 2 (PAN) ProfId3IN=Prof Id 3 (Taxa de Serviço) -ProfId1MA=Id prof. 1 (R.C.) -ProfId3MA=Id prof. 3 (I.F.) -ProfId4MA=Id prof. 4 (C.N.S.S.) -ProfId1MX=Prof Id 1 (R.F.C). -ProfId2MX=Prof Id 2 (R..P. IMSS) ProfId3MX=Prof Id 3 (Carta Profissional) -ProfId1NL=KVK nummer -ProfId4NL=Burgerservicenummer (BSN) ProfId1RU=Id prof 1 (I.E.) ProfId2RU=Id prof 2 (I.M.) ProfId3RU=Id prof. 3 (CGC) @@ -146,7 +128,6 @@ ProspectLevel=Cliente em potencial ContactPublic=Compartilhado OthersNotLinkedToThirdParty=Outros, não associado à um cliente/fornecedor ProspectStatus=Estado do cliente em potencial -TE_UNKNOWN=- StatusProspect-1=Não contatar StatusProspect1=A contatar StatusProspect2=Contato em Curso diff --git a/htdocs/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang index 7586477f9e5..5286aa27371 100644 --- a/htdocs/langs/pt_BR/holiday.lang +++ b/htdocs/langs/pt_BR/holiday.lang @@ -1,57 +1,23 @@ # Dolibarr language file - Source file is en_US - holiday -HRM=HRM -Holidays=Leaves -CPTitreMenu=Leaves MenuReportMonth=Relatorio mensal -MenuAddCP=Make a leave request -NotActiveModCP=You must enable the module Leaves to view this page. -NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . -NoCPforUser=You don't have any available day. -AddCP=Make a leave request DateDebCP=Data inicio DateFinCP=Data fim DateCreateCP=Data criacão ToReviewCP=Aguardando aprovação RefuseCP=Negado ValidatorCP=Aprovador -ListeCP=List of leaves ReviewedByCP=Sera revisado por -SendRequestCP=Create leave request -DelayToRequestCP=Leave requests must be made at least %s day(s) before them. -MenuConfCP=Edit balance of leaves -UpdateAllCP=Update the leaves -SoldeCPUser=Leaves balance is %s days. ErrorEndDateCP=Você deve selecionar uma data final posterior à data inicial. ErrorSQLCreateCP=Ocorreu um erro no SQL durante a criação: -ErrorIDFicheCP=An error has occurred, the leave request does not exist. ReturnCP=Retorne à página anterior -ErrorUserViewCP=You are not authorized to read this leave request. -InfosCP=Information of the leave request InfosWorkflowCP=Fluxo de Trabalho de Informação RequestByCP=Requisitado por -TitreRequestCP=Leave request -NbUseDaysCP=Number of days of vacation consumed DeleteCP=Eliminar ActionValidCP=Confirmar ActionRefuseCP=Não autorizar -TitleDeleteCP=Delete the leave request -ConfirmDeleteCP=Confirm the deletion of this leave request? -ErrorCantDeleteCP=Error you don't have the right to delete this leave request. -CantCreateCP=You don't have the right to make leave requests. -InvalidValidatorCP=You must choose an approbator to your leave request. -CantUpdate=You cannot update this leave request. NoDateDebut=Você deve selecionar uma data inicial. NoDateFin=Você deve selecionar uma data final. -ErrorDureeCP=Your leave request does not contain working day. -TitleValidCP=Approve the leave request -ConfirmValidCP=Are you sure you want to approve the leave request? -TitleToValidCP=Send leave request -ConfirmToValidCP=Are you sure you want to send the leave request? -TitleRefuseCP=Refuse the leave request -ConfirmRefuseCP=Are you sure you want to refuse the leave request? NoMotifRefuseCP=Você deve selecionar uma razão para não autorizar a requisição. -TitleCancelCP=Cancel the leave request -ConfirmCancelCP=Are you sure you want to cancel the leave request? DetailRefusCP=Motivo da recusa DateRefusCP=Data da recusa DateCancelCP=Data do cancelamento @@ -61,23 +27,15 @@ MotifCP=Razão UserCP=Usuário ErrorAddEventToUserCP=Ocorreu um erro ao adicionar a licença excepcional. AddEventToUserOkCP=A adição da licença excepcional tenha sido concluída. -MenuLogCP=View logs of leave requests -LogCP=Log of updates of available vacation days ActionByCP=Interpretada por PrevSoldeCP=Balanço anterior NewSoldeCP=Novo Balanco -alreadyCPexist=A leave request has already been done on this period. UserName=Apelidos -FirstDayOfHoliday=First day of vacation -LastDayOfHoliday=Last day of vacation HolidaysMonthlyUpdate=A atualização mensal ManualUpdate=Atualização manual -ConfCP=Configuration of leave request module DescOptionCP=Descrição da opção ValueOptionCP=Valor -GroupToValidateCP=Group with the ability to approve leave requests ConfirmConfigCP=Validar a configuração -LastUpdateCP=Last automatic update of leaves allocation UpdateConfCPOK=Atualizado com sucesso. ErrorUpdateConfCP=Ocorreu um erro durante a atualização, por favor, tente novamente. ValidEventCP=Confirmar diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang index c312f8dc18d..2e2532dea8c 100644 --- a/htdocs/langs/pt_BR/install.lang +++ b/htdocs/langs/pt_BR/install.lang @@ -60,7 +60,6 @@ GoToSetupArea=Prosseguir para a área de configuração MigrationNotFinished=A versao do banco de dados nao e competamente atualizada, voce tera que aviar o processo de atualizacao novamente. GoToUpgradePage=Vai para a pagina de atualizaçao novamente DirectoryRecommendation=É recomendado que você ponha esta directry das páginas da web diretório. -DolibarrAdminLogin=Dolibarr admin login AdminLoginAlreadyExists=Dolibarr conta administrador ' %s' já existe. WarningRemoveInstallDir=Atenção, por razões de segurança, uma vez que a instalação ou atualização estiver completa, você deve remover o diretório de instalação ou renomeá-lo para install.lock a fim de evitar o seu uso malicioso. ThisPHPDoesNotSupportTypeBase=PHP Este sistema não suporta qualquer tipo de interface para acesso de dados %s @@ -71,7 +70,6 @@ InstallNotAllowed=Instalação não permitidas pela conf.php permissões YouMustCreateWithPermission=Você deve criar o arquivo %s e definir permissões escrever sobre ele para instalar o servidor web durante o processo. CorrectProblemAndReloadPage=Corrija o problema e pressione a tecla F5 para recarregar página. DatabaseVersion=Database versão -ServerVersion=Database server version YouMustCreateItAndAllowServerToWrite=Você deve criar este diretório e para permitir que o servidor da web para escrever nela. CharsetChoice=Conjunto de caracteres escolha KeepDefaultValuesDeb=Voce esta usando o assistente de configuração do Dolibarr do pacote Linux (Ubuntu, Debian, Fedora...), portanto os valores propostos aqui estao ja optimizados. O unico parametro a se completar e a senha do administrador de banco de dados. Mude outros parametros somente se voce sabe o que esta fazendo. diff --git a/htdocs/langs/pt_BR/languages.lang b/htdocs/langs/pt_BR/languages.lang index c922daac4f7..c724d9a49d9 100644 --- a/htdocs/langs/pt_BR/languages.lang +++ b/htdocs/langs/pt_BR/languages.lang @@ -33,6 +33,5 @@ Language_pl_PL=Polones Language_pt_BR=Portugues (Brasil) Language_pt_PT=Portugues Language_ru_UA=Russo (Ukrania) -Language_th_TH=Thai Language_zh_CN=Chines Language_zh_TW=Chines (Tradicional) diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang index 06cea34b38c..e7008da51cd 100644 --- a/htdocs/langs/pt_BR/main.lang +++ b/htdocs/langs/pt_BR/main.lang @@ -134,7 +134,6 @@ TotalTTC=Total TotalVAT=Total do ICMS TotalLT1=Total taxa 2 TotalLT2=Total taxa 3 -TotalLT1ES=Total RE IncludedVAT=ICMS incluido HT=Sem ICMS TTC=ICMS Incluido @@ -142,7 +141,6 @@ VAT=ICMS VATRate=Taxa ICMS OtherStatistics=Outras estatisticas Favorite=Favorito -ShortInfo=Info. RefSupplier=Ref. Fornecedor RefPayment=Ref. Pagamento Comment=Comentario @@ -164,32 +162,21 @@ GeneratedOn=Gerado a %s Available=Disponivel NotYetAvailable=Ainda não disponível to=para -Drafts=Drafts ByUsers=Por usuário -Preview=Preview CurrentLogin=Login atual -JanuaryMin=Jan FebruaryMin=Fev AprilMin=Abr MayMin=Mai -JuneMin=Jun -JulyMin=Jul AugustMin=Ago SeptemberMin=Set OctoberMin=Out -NovemberMin=Nov DecemberMin=Dez -MonthShort01=Jan MonthShort02=Fev -MonthShort03=Mar MonthShort04=Abr MonthShort05=Mai -MonthShort06=Jun -MonthShort07=Jul MonthShort08=Ago MonthShort09=Set MonthShort10=Out -MonthShort11=Nov MonthShort12=Dez AttachedFiles=Arquivos e Documentos Anexos FileTransferComplete=Foi transferido corretamente o Arquivo diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang index 49fd906d30b..6b81e85596e 100644 --- a/htdocs/langs/pt_BR/members.lang +++ b/htdocs/langs/pt_BR/members.lang @@ -54,7 +54,6 @@ AddMember=Criar membro NoTypeDefinedGoToSetup=nenhum tipo de membro definido. ir a configuração -> Tipos de Membros EditType=edição do tipo de membro Physical=Físico -Moral=Moral MorPhy=Moral/Físico Reenable=Reativar ResiliateMember=Baixar um membro diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang index ccf3c96b8bc..677d7eefba3 100644 --- a/htdocs/langs/pt_BR/orders.lang +++ b/htdocs/langs/pt_BR/orders.lang @@ -1,5 +1,4 @@ # Dolibarr language file - Source file is en_US - orders -OrdersArea=Área de Pedidos de Clientes OrderId=ID Pedido OrderLine=Linha de Comando OrderToProcess=Pedido a se processar @@ -58,7 +57,6 @@ PDFEinsteinDescription=Modelo de pedido completo (logo...) PDFEdisonDescription=O modelo simplificado do pedido PDFProformaDescription=A proforma fatura completa (logomarca...) OrderByEMail=E-mail -OrderByWWW=Online CreateInvoiceForThisCustomer=Faturar pedidos NoOrdersToInvoice=Nenhum pedido faturavel CloseProcessedOrdersAutomatically=Clasificar "processados" os pedidos selecionados. diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang index 3f9ba3156d5..010797bc380 100644 --- a/htdocs/langs/pt_BR/other.lang +++ b/htdocs/langs/pt_BR/other.lang @@ -83,9 +83,6 @@ FeatureExperimental=Funcionalidade experimental. não é estável nesta versão FeatureDevelopment=Funcionalidade em Desenvolvimento. não estável nesta versão Left=Esquerda Right=Direita -LengthUnitcm=cm -LengthUnitmm=mm -Surface=Area VolumeUnitgallon=gallão SizeUnitfoot=pe BugTracker=Incidências diff --git a/htdocs/langs/pt_BR/printipp.lang b/htdocs/langs/pt_BR/printipp.lang new file mode 100644 index 00000000000..bfa731b0a36 --- /dev/null +++ b/htdocs/langs/pt_BR/printipp.lang @@ -0,0 +1,10 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Configuração do módulo de Impressão Direta +PrintIPPDesc=Este módulo adiciona um botão de "Imprimir" para enviar documentos diretamente para impressora. Requer um sistema Linux com o CUPS instalado. +PRINTIPP_ENABLED=Mostrar ícone de "Impressão Direta" nas listas de documentos +PRINTIPP_PASSWORD=Senha +NoPrinterFound=Nenhuma impressora encontrada (verifique a configuração do CUPS) +FileWasSentToPrinter=Arquivo %s enviado para impressora +NoDefaultPrinterDefined=Nenhuma impressora padrão definida +DefaultPrinter=Impressora padrão +CupsServer=Servidor CUPS diff --git a/htdocs/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang new file mode 100644 index 00000000000..add07363813 --- /dev/null +++ b/htdocs/langs/pt_BR/productbatch.lang @@ -0,0 +1,3 @@ +# Dolibarr language file - Source file is en_US - productbatch +ProductStatusOnBatchShort=Sim +ProductStatusNotOnBatchShort=Não diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang index 31dde51f16a..8b26b315b94 100644 --- a/htdocs/langs/pt_PT/orders.lang +++ b/htdocs/langs/pt_PT/orders.lang @@ -1,5 +1,5 @@ # Dolibarr language file - Source file is en_US - orders -OrdersArea=Area de Pedidos de clientes +OrdersArea=Área de Pedidos de Clientes SuppliersOrdersArea=Área de Pedidos a Fornecedores OrderCard=Ficha Pedido OrderId=Id da Encomenda diff --git a/htdocs/langs/ru_UA/banks.lang b/htdocs/langs/ru_UA/banks.lang index 3486f939885..81b9d0d2a8e 100644 --- a/htdocs/langs/ru_UA/banks.lang +++ b/htdocs/langs/ru_UA/banks.lang @@ -29,7 +29,6 @@ DeleteAccount=Удалить аккаунт RemoveFromRubrique=Удалить связь с категорией RemoveFromRubriqueConfirm=Вы уверены, что хотите удалить связь между сделки и категории? ListBankTransactions=Список банковских операций -IdTransaction=Transaction ID SearchTransaction=Поиск сделку ListTransactionsByCategory=Список сделки / категории TransactionsToConciliate=Сделки примирить diff --git a/htdocs/langs/ru_UA/cron.lang b/htdocs/langs/ru_UA/cron.lang deleted file mode 100644 index a701909b5ed..00000000000 --- a/htdocs/langs/ru_UA/cron.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - cron diff --git a/htdocs/langs/ru_UA/holiday.lang b/htdocs/langs/ru_UA/holiday.lang deleted file mode 100644 index 3bbcb71f207..00000000000 --- a/htdocs/langs/ru_UA/holiday.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - holiday diff --git a/htdocs/langs/ru_UA/mailmanspip.lang b/htdocs/langs/ru_UA/mailmanspip.lang deleted file mode 100644 index d35aebc152e..00000000000 --- a/htdocs/langs/ru_UA/mailmanspip.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - mailmanspip diff --git a/htdocs/langs/ru_UA/margins.lang b/htdocs/langs/ru_UA/margins.lang deleted file mode 100644 index 8a6d3d95254..00000000000 --- a/htdocs/langs/ru_UA/margins.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - margins diff --git a/htdocs/langs/ru_UA/opensurvey.lang b/htdocs/langs/ru_UA/opensurvey.lang deleted file mode 100644 index 5e9ce15eab2..00000000000 --- a/htdocs/langs/ru_UA/opensurvey.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - opensurvey diff --git a/htdocs/langs/ru_UA/users.lang b/htdocs/langs/ru_UA/users.lang deleted file mode 100644 index f1dd83c193b..00000000000 --- a/htdocs/langs/ru_UA/users.lang +++ /dev/null @@ -1 +0,0 @@ -# Dolibarr language file - Source file is en_US - users diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang new file mode 100644 index 00000000000..bb9b358c045 --- /dev/null +++ b/htdocs/langs/sw_SW/accountancy.lang @@ -0,0 +1,160 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Export=Export +Modelcsv=Model of export +OptionsDeactivatedForThisExportModel=For this export model, options are deactivated +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Breakdown +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic breakdown + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTING_SEPARATORCSV=Column separator in export file + +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal + +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait + +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Breakdown card diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang new file mode 100644 index 00000000000..9782c2ea27f --- /dev/null +++ b/htdocs/langs/sw_SW/admin.lang @@ -0,0 +1,1603 @@ +# Dolibarr language file - Source file is en_US - admin +Foundation=Foundation +Version=Version +VersionProgram=Version program +VersionLastInstall=Version initial install +VersionLastUpgrade=Version last upgrade +VersionExperimental=Experimental +VersionDevelopment=Development +VersionUnknown=Unknown +VersionRecommanded=Recommended +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found +SessionId=Session ID +SessionSaveHandler=Handler to save sessions +SessionSavePath=Storage session localization +PurgeSessions=Purge of sessions +ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself). +NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions. +LockNewSessions=Lock new connections +ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user %s will be able to connect after that. +UnlockNewSessions=Remove connection lock +YourSession=Your session +Sessions=Users session +WebUserGroup=Web server user/group +NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (%s) might be protected (For example, by OS permissions or by PHP directive open_basedir). +HTMLCharset=Charset for generated HTML pages +DBStoringCharset=Database charset to store data +DBSortingCharset=Database charset to sort data +WarningModuleNotActive=Module %s must be enabled +WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page. +DolibarrSetup=Dolibarr install or upgrade +DolibarrUser=Dolibarr user +InternalUser=Internal user +ExternalUser=External user +InternalUsers=Internal users +ExternalUsers=External users +GlobalSetup=Global setup +GUISetup=Display +SetupArea=Setup area +FormToTestFileUploadForm=Form to test file upload (according to setup) +IfModuleEnabled=Note: yes is effective only if module %s is enabled +RemoveLock=Remove file %s if it exists to allow usage of the update tool. +RestoreLock=Restore file %s, with read permission only, to disable any usage of update tool. +SecuritySetup=Security setup +ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher +ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher +ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. +DictionarySetup=Dictionary setup +Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record +ErrorCodeCantContainZero=Code can't contain value 0 +DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +ConfirmAjax=Use Ajax confirmation popups +UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. +ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it +UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) +SearchFilter=Search filters options +NumberOfKeyToSearch=Nbr of characters to trigger search: %s +ViewFullDateActions=Show full dates events in the third sheet +NotAvailableWhenAjaxDisabled=Not available when Ajax disabled +JavascriptDisabled=JavaScript disabled +UsePopupCalendar=Use popup for dates input +UsePreviewTabs=Use preview tabs +ShowPreview=Show preview +PreviewNotAvailable=Preview not available +ThemeCurrentlyActive=Theme currently active +CurrentTimeZone=TimeZone PHP (server) +MySQLTimeZone=TimeZone MySql (database) +TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). +Space=Space +Table=Table +Fields=Fields +Index=Index +Mask=Mask +NextValue=Next value +NextValueForInvoices=Next value (invoices) +NextValueForCreditNotes=Next value (credit notes) +NextValueForDeposit=Next value (deposit) +NextValueForReplacements=Next value (replacements) +MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to %s %s, whatever this parameter's value is +NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration +MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload) +UseCaptchaCode=Use graphical code (CAPTCHA) on login page +UseAvToScanUploadedFiles=Use anti-virus to scan uploaded files +AntiVirusCommand= Full path to antivirus command +AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Example for ClamAv: /usr/bin/clamscan +AntiVirusParam= More parameters on command line +AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" +ComptaSetup=Accounting module setup +UserSetup=User management setup +MenuSetup=Menu management setup +MenuLimits=Limits and accuracy +MenuIdParent=Parent menu ID +DetailMenuIdParent=ID of parent menu (empty for a top menu) +DetailPosition=Sort number to define menu position +PersonalizedMenusNotSupported=Personalized menus not supported +AllMenus=All +NotConfigured=Module not configured +Setup=Setup +Activation=Activation +Active=Active +SetupShort=Setup +OtherOptions=Other options +OtherSetup=Other setup +CurrentValueSeparatorDecimal=Decimal separator +CurrentValueSeparatorThousand=Thousand separator +Destination=Destination +IdModule=Module ID +IdPermissions=Permissions ID +Modules=Modules +ModulesCommon=Main modules +ModulesOther=Other modules +ModulesInterfaces=Interfaces modules +ModulesSpecial=Modules very specific +ParameterInDolibarr=Parameter %s +LanguageParameter=Language parameter %s +LanguageBrowserParameter=Parameter %s +LocalisationDolibarrParameters=Localisation parameters +ClientTZ=Client Time Zone (user) +ClientHour=Client time (user) +OSTZ=Server OS Time Zone +PHPTZ=PHP server Time Zone +PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds) +ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds) +DaylingSavingTime=Daylight saving time +CurrentHour=PHP Time (server) +CompanyTZ=Company Time Zone (main company) +CompanyHour=Company Time (main company) +CurrentSessionTimeOut=Current session timeout +YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris" +OSEnv=OS Environment +Box=Box +Boxes=Boxes +MaxNbOfLinesForBoxes=Max number of lines for boxes +PositionByDefault=Default order +Position=Position +MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar). +MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.
Some modules add entries in the menus (in menu All in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module. +MenuForUsers=Menu for users +LangFile=.lang file +System=System +SystemInfo=System information +SystemTools=System tools +SystemToolsArea=System tools area +SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for. +Purge=Purge +PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in %s directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server. +PurgeDeleteLogFile=Delete log file %s defined for Syslog module (no risk to loose data) +PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data) +PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory %s. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted. +PurgeRunNow=Purge now +PurgeNothingToDelete=No directory or file to delete. +PurgeNDirectoriesDeleted=%s files or directories deleted. +PurgeAuditEvents=Purge all security events +ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed. +NewBackup=New backup +GenerateBackup=Generate backup +Backup=Backup +Restore=Restore +RunCommandSummary=Backup has been launched with the following command +RunCommandSummaryToLaunch=Backup can be launched with the following command +WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands +BackupResult=Backup result +BackupFileSuccessfullyCreated=Backup file successfully generated +YouCanDownloadBackupFile=Generated files can now be downloaded +NoBackupFileAvailable=No backup files available. +ExportMethod=Export method +ImportMethod=Import method +ToBuildBackupFileClickHere=To build a backup file, click here. +ImportMySqlDesc=To import a backup file, you must use mysql command from command line: +ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line: +ImportMySqlCommand=%s %s < mybackupfile.sql +ImportPostgreSqlCommand=%s %s mybackupfile.sql +FileNameToGenerate=File name to generate +Compression=Compression +CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import +CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later +ExportCompatibility=Compatibility of generated export file +MySqlExportParameters=MySQL export parameters +PostgreSqlExportParameters= PostgreSQL export parameters +UseTransactionnalMode=Use transactional mode +FullPathToMysqldumpCommand=Full path to mysqldump command +FullPathToPostgreSQLdumpCommand=Full path to pg_dump command +ExportOptions=Export Options +AddDropDatabase=Add DROP DATABASE command +AddDropTable=Add DROP TABLE command +ExportStructure=Structure +Datas=Data +NameColumn=Name columns +ExtendedInsert=Extended INSERT +NoLockBeforeInsert=No lock commands around INSERT +DelayedInsert=Delayed insert +EncodeBinariesInHexa=Encode binary data in hexadecimal +IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE) +Yes=Yes +No=No +AutoDetectLang=Autodetect (browser language) +FeatureDisabledInDemo=Feature disabled in demo +Rights=Permissions +BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. +OnlyActiveElementsAreShown=Only elements from enabled modules are shown. +ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature. +ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services. +ModulesSpecialDesc=Special modules are very specific or seldom used modules. +ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for a particular business. +ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... +ModulesMarketPlaces=More modules... +DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) +WebSiteDesc=Web site providers you can search to find more modules... +URL=Link +BoxesAvailable=Boxes available +BoxesActivated=Boxes activated +ActivateOn=Activate on +ActiveOn=Activated on +SourceFile=Source file +AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled +AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled +AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled +Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only +Security=Security +Passwords=Passwords +DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) +MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended) +InstrucToEncodePass=To have password encoded into the conf.php file, replace the line
$dolibarr_main_db_pass="..."
by
$dolibarr_main_db_pass="crypted:%s" +InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line
$dolibarr_main_db_pass="crypted:..."
by
$dolibarr_main_db_pass="%s" +ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation) +ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices). +Feature=Feature +DolibarrLicense=License +DolibarrProjectLeader=Project leader +Developpers=Developers/contributors +OtherDeveloppers=Other developers/contributors +OfficialWebSite=Dolibarr international official web site +OfficialWebSiteFr=French official web site +OfficialWiki=Dolibarr documentation on Wiki +OfficialDemo=Dolibarr online demo +OfficialMarketPlace=Official market place for external modules/addons +OfficialWebHostingService=Referenced web hosting services (Cloud hosting) +ReferencedPreferredPartners=Preferred Partners +OtherResources=Autres ressources +ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),
take a look at the Dolibarr Wiki:
%s +ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:
%s +HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr. +HelpCenterDesc2=Some part of this service are available in english only. +CurrentTopMenuHandler=Current top menu handler +CurrentLeftMenuHandler=Current left menu handler +CurrentMenuHandler=Current menu handler +CurrentSmartphoneMenuHandler=Current smartphone menu handler +MeasuringUnit=Measuring unit +Emails=E-mails +EMailsSetup=E-mails setup +EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. +MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: %s) +MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s) +MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems) +MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems) +MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: %s) +MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent +MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to +MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to +MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos) +MAIN_MAIL_SENDMODE=Method to use to send EMails +MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required +MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required +MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt +MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos) +MAIN_SMS_SENDMODE=Method to use to send SMS +MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending +FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally. +SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on www.dolibarr.org forum. +ModuleSetup=Module setup +ModulesSetup=Modules setup +ModuleFamilyBase=System +ModuleFamilyCrm=Customer Relation Management (CRM) +ModuleFamilyProducts=Products Management +ModuleFamilyHr=Human Resource Management +ModuleFamilyProjects=Projects/Collaborative work +ModuleFamilyOther=Other +ModuleFamilyTechnic=Multi-modules tools +ModuleFamilyExperimental=Experimental modules +ModuleFamilyFinancial=Financial Modules (Accounting/Treasury) +ModuleFamilyECM=Electronic Content Management (ECM) +MenuHandlers=Menu handlers +MenuAdmin=Menu editor +DoNotUseInProduction=Do not use in production +ThisIsProcessToFollow=This is setup to process: +StepNb=Step %s +FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s). +DownloadPackageFromWebSite=Download package %s. +UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory %s +SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component. +NotExistsDirect=The alternative root directory is not defined.
+InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).
+InfDirExample=
Then declare it in the file conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*These lines are commented with "#", to uncomment only remove the character. +YouCanSubmitFile=Select module: +CurrentVersion=Dolibarr current version +CallUpdatePage=Go to the page that updates the database structure and datas: %s. +LastStableVersion=Last stable version +UpdateServerOffline=Update server offline +GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask.
{000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s.
{000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required.
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
+GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
{tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
+GenericMaskCodes3=All other characters in the mask will remain intact.
Spaces are not allowed.
+GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany done 2007-01-31:
+GenericMaskCodes4b=Example on third party created on 2007-03-01:
+GenericMaskCodes4c=Example on product created on 2007-03-01:
+GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX +GenericNumRefModelDesc=Returns a customizable number according to a defined mask. +ServerAvailableOnIPOrPort=Server is available at address %s on port %s +ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s +DoTestServerAvailability=Test server connectivity +DoTestSend=Test sending +DoTestSendHTML=Test sending HTML +ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask. +ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask. +UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system. +UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).
It must be the octal value (for example, 0666 means read and write for everyone).
This parameter is useless on a Windows server. +SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation +UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache) +DisableLinkToHelpCenter=Hide link "Need help or support" on login page +DisableLinkToHelp=Hide link "%s Online help" on left menu +AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea. +ModuleDisabled=Module disabled +ModuleDisabledSoNoEvent=Module disabled so event never created +ConfirmPurge=Are you sure you want to execute this purge ?
This will delete definitely all your data files with no way to restore them (ECM files, attached files...). +MinLength=Minimum length +LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory +ExamplesWithCurrentSetup=Examples with current running setup +ListOfDirectories=List of OpenDocument templates directories +ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. +NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories +ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: +FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template +FirstnameNamePosition=Position of Name/Lastname +DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values: +KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices) +TestSubmitForm=Input test form +ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours. +ThemeDir=Skins directory +ConnectionTimeout=Connexion timeout +ResponseTimeout=Response timeout +SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__ +ModuleMustBeEnabledFirst=Module %s must be enabled first before using this feature. +SecurityToken=Key to secure URLs +NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s +PDF=PDF +PDFDesc=You can set each global options related to the PDF generation +PDFAddressForging=Rules to forge address boxes +HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF +HideDescOnPDF=Hide products description on generated PDF +HideRefOnPDF=Hide products ref. on generated PDF +HideDetailsOnPDF=Hide products lines details on generated PDF +Library=Library +UrlGenerationParameters=Parameters to secure URLs +SecurityTokenIsUnique=Use a unique securekey parameter for each URL +EnterRefToBuildUrl=Enter reference for object %s +GetSecuredUrl=Get calculated URL +ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons +OldVATRates=Old VAT rate +NewVATRates=New VAT rate +PriceBaseTypeToChange=Modify on prices with base reference value defined on +MassConvert=Launch mass convert +String=String +TextLong=Long text +Int=Integer +Float=Float +DateAndTime=Date and hour +Unique=Unique +Boolean=Boolean (Checkbox) +ExtrafieldPhone = Phone +ExtrafieldPrice = Price +ExtrafieldMail = Email +ExtrafieldSelect = Select list +ExtrafieldSelectList = Select from table +ExtrafieldSeparator=Separator +ExtrafieldCheckBox=Checkbox +ExtrafieldRadio=Radio button +ExtrafieldCheckBoxFromList= Checkbox from table +ExtrafieldParamHelpselect=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key +ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... +ExtrafieldParamHelpradio=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... +ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +LibraryToBuildPDF=Library used to build PDF +WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' +LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax) +SMS=SMS +LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s +RefreshPhoneLink=Refresh link +LinkToTest=Clickable link generated for user %s (click phone number to test) +KeepEmptyToUseDefault=Keep empty to use default value +DefaultLink=Default link +ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) +ExternalModule=External module - Installed into directory %s +BarcodeInitForThirdparties=Mass barcode init for thirdparties +BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services +CurrentlyNWithoutBarCode=Currently, you have %s records on %s %s without barcode defined. +InitEmptyBarCode=Init value for next %s empty records +EraseAllCurrentBarCode=Erase all current barcode values +ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ? +AllBarcodeReset=All barcode values have been removed +NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup. +NoRecordWithoutBarcodeDefined=No record with no barcode value defined. + +# Modules +Module0Name=Users & groups +Module0Desc=Users and groups management +Module1Name=Third parties +Module1Desc=Companies and contact management (customers, prospects...) +Module2Name=Commercial +Module2Desc=Commercial management +Module10Name=Accounting +Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching. +Module20Name=Proposals +Module20Desc=Commercial proposal management +Module22Name=Mass E-mailings +Module22Desc=Mass E-mailing management +Module23Name= Energy +Module23Desc= Monitoring the consumption of energies +Module25Name=Customer Orders +Module25Desc=Customer order management +Module30Name=Invoices +Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers +Module40Name=Suppliers +Module40Desc=Supplier management and buying (orders and invoices) +Module42Name=Logs +Module42Desc=Logging facilities (file, syslog, ...) +Module49Name=Editors +Module49Desc=Editor management +Module50Name=Products +Module50Desc=Product management +Module51Name=Mass mailings +Module51Desc=Mass paper mailing management +Module52Name=Stocks +Module52Desc=Stock management (products) +Module53Name=Services +Module53Desc=Service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) +Module55Name=Barcodes +Module55Desc=Barcode management +Module56Name=Telephony +Module56Desc=Telephony integration +Module57Name=Standing orders +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. +Module58Name=ClickToDial +Module58Desc=Integration of a ClickToDial system (Asterisk, ...) +Module59Name=Bookmark4u +Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account +Module70Name=Interventions +Module70Desc=Intervention management +Module75Name=Expense and trip notes +Module75Desc=Expense and trip notes management +Module80Name=Shipments +Module80Desc=Shipments and delivery order management +Module85Name=Banks and cash +Module85Desc=Management of bank or cash accounts +Module100Name=External site +Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame +Module105Name=Mailman and SPIP +Module105Desc=Mailman or SPIP interface for member module +Module200Name=LDAP +Module200Desc=LDAP directory synchronisation +Module210Name=PostNuke +Module210Desc=PostNuke integration +Module240Name=Data exports +Module240Desc=Tool to export Dolibarr datas (with assistants) +Module250Name=Data imports +Module250Desc=Tool to import datas in Dolibarr (with assistants) +Module310Name=Members +Module310Desc=Foundation members management +Module320Name=RSS Feed +Module320Desc=Add RSS feed inside Dolibarr screen pages +Module330Name=Bookmarks +Module330Desc=Bookmark management +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module410Name=Webcalendar +Module410Desc=Webcalendar integration +Module500Name=Special expenses (tax, social contributions, dividends) +Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries +Module510Name=Salaries +Module510Desc=Management of employees salaries and payments +Module600Name=Notifications +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) +Module700Name=Donations +Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices +Module1200Name=Mantis +Module1200Desc=Mantis integration +Module1400Name=Accounting +Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation +Module1780Name=Categories +Module1780Desc=Category management (products, suppliers and customers) +Module2000Name=WYSIWYG editor +Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices +Module2300Name=Cron +Module2300Desc=Scheduled task management +Module2400Name=Agenda +Module2400Desc=Events/tasks and agenda management +Module2500Name=Electronic Content Management +Module2500Desc=Save and share documents +Module2600Name=WebServices +Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) +Module2700Name=Gravatar +Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access +Module2800Desc=FTP Client +Module2900Name=GeoIPMaxmind +Module2900Desc=GeoIP Maxmind conversions capabilities +Module3100Name=Skype +Module3100Desc=Add a Skype button into card of adherents / third parties / contacts +Module5000Name=Multi-company +Module5000Desc=Allows you to manage multiple companies +Module6000Name=Workflow +Module6000Desc=Workflow management +Module20000Name=Leave Requests management +Module20000Desc=Declare and follow employees leaves requests +Module39000Name=Product batch +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products +Module50000Name=PayBox +Module50000Desc=Module to offer an online payment page by credit card with PayBox +Module50100Name=Point of sales +Module50100Desc=Point of sales module +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal +Module50400Name=Accounting (advanced) +Module50400Desc=Accounting management (double parties) +Module54000Name=PrintIPP +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). +Module55000Name=Open Poll +Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) +Module59000Name=Margins +Module59000Desc=Module to manage margins +Module60000Name=Commissions +Module60000Desc=Module to manage commissions +Module150010Name=Batch number, eat-by date and sell-by date +Module150010Desc=batch number, eat-by date and sell-by date management for product +Permission11=Read customer invoices +Permission12=Create/modify customer invoices +Permission13=Unvalidate customer invoices +Permission14=Validate customer invoices +Permission15=Send customer invoices by email +Permission16=Create payments for customer invoices +Permission19=Delete customer invoices +Permission21=Read commercial proposals +Permission22=Create/modify commercial proposals +Permission24=Validate commercial proposals +Permission25=Send commercial proposals +Permission26=Close commercial proposals +Permission27=Delete commercial proposals +Permission28=Export commercial proposals +Permission31=Read products +Permission32=Create/modify products +Permission34=Delete products +Permission36=See/manage hidden products +Permission38=Export products +Permission41=Read projects (shared project and projects i'm contact for) +Permission42=Create/modify projects (shared project and projects i'm contact for) +Permission44=Delete projects (shared project and projects i'm contact for) +Permission61=Read interventions +Permission62=Create/modify interventions +Permission64=Delete interventions +Permission67=Export interventions +Permission71=Read members +Permission72=Create/modify members +Permission74=Delete members +Permission75=Setup types of membership +Permission76=Export datas +Permission78=Read subscriptions +Permission79=Create/modify subscriptions +Permission81=Read customers orders +Permission82=Create/modify customers orders +Permission84=Validate customers orders +Permission86=Send customers orders +Permission87=Close customers orders +Permission88=Cancel customers orders +Permission89=Delete customers orders +Permission91=Read social contributions and vat +Permission92=Create/modify social contributions and vat +Permission93=Delete social contributions and vat +Permission94=Export social contributions +Permission95=Read reports +Permission101=Read sendings +Permission102=Create/modify sendings +Permission104=Validate sendings +Permission106=Export sendings +Permission109=Delete sendings +Permission111=Read financial accounts +Permission112=Create/modify/delete and compare transactions +Permission113=Setup financial accounts (create, manage categories) +Permission114=Reconciliate transactions +Permission115=Export transactions and account statements +Permission116=Transfers between accounts +Permission117=Manage cheques dispatching +Permission121=Read third parties linked to user +Permission122=Create/modify third parties linked to user +Permission125=Delete third parties linked to user +Permission126=Export third parties +Permission141=Read projects (also private i am not contact for) +Permission142=Create/modify projects (also private i am not contact for) +Permission144=Delete projects (also private i am not contact for) +Permission146=Read providers +Permission147=Read stats +Permission151=Read standing orders +Permission152=Create/modify a standing orders request +Permission153=Transmission standing orders receipts +Permission154=Credit/refuse standing orders receipts +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses +Permission180=Read suppliers +Permission181=Read supplier orders +Permission182=Create/modify supplier orders +Permission183=Validate supplier orders +Permission184=Approve supplier orders +Permission185=Order or cancel supplier orders +Permission186=Receive supplier orders +Permission187=Close supplier orders +Permission188=Cancel supplier orders +Permission192=Create lines +Permission193=Cancel lines +Permission194=Read the bandwith lines +Permission202=Create ADSL connections +Permission203=Order connections orders +Permission204=Order connections +Permission205=Manage connections +Permission206=Read connections +Permission211=Read Telephony +Permission212=Order lines +Permission213=Activate line +Permission214=Setup Telephony +Permission215=Setup providers +Permission221=Read emailings +Permission222=Create/modify emailings (topic, recipients...) +Permission223=Validate emailings (allows sending) +Permission229=Delete emailings +Permission237=View recipients and info +Permission238=Manually send mailings +Permission239=Delete mailings after validation or sent +Permission241=Read categories +Permission242=Create/modify categories +Permission243=Delete categories +Permission244=See the contents of the hidden categories +Permission251=Read other users and groups +PermissionAdvanced251=Read other users +Permission252=Read permissions of other users +Permission253=Create/modify other users, groups and permisssions +PermissionAdvanced253=Create/modify internal/external users and permissions +Permission254=Create/modify external users only +Permission255=Modify other users password +Permission256=Delete or disable other users +Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves). +Permission271=Read CA +Permission272=Read invoices +Permission273=Issue invoices +Permission281=Read contacts +Permission282=Create/modify contacts +Permission283=Delete contacts +Permission286=Export contacts +Permission291=Read tariffs +Permission292=Set permissions on the tariffs +Permission293=Modify costumers tariffs +Permission300=Read bar codes +Permission301=Create/modify bar codes +Permission302=Delete bar codes +Permission311=Read services +Permission312=Assign service/subscription to contract +Permission331=Read bookmarks +Permission332=Create/modify bookmarks +Permission333=Delete bookmarks +Permission341=Read its own permissions +Permission342=Create/modify his own user information +Permission343=Modify his own password +Permission344=Modify its own permissions +Permission351=Read groups +Permission352=Read groups permissions +Permission353=Create/modify groups +Permission354=Delete or disable groups +Permission358=Export users +Permission401=Read discounts +Permission402=Create/modify discounts +Permission403=Validate discounts +Permission404=Delete discounts +Permission510=Read Salaries +Permission512=Create/modify salaries +Permission514=Delete salaries +Permission517=Export salaries +Permission531=Read services +Permission532=Create/modify services +Permission534=Delete services +Permission536=See/manage hidden services +Permission538=Export services +Permission701=Read donations +Permission702=Create/modify donations +Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports +Permission1001=Read stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses +Permission1004=Read stock movements +Permission1005=Create/modify stock movements +Permission1101=Read delivery orders +Permission1102=Create/modify delivery orders +Permission1104=Validate delivery orders +Permission1109=Delete delivery orders +Permission1181=Read suppliers +Permission1182=Read supplier orders +Permission1183=Create/modify supplier orders +Permission1184=Validate supplier orders +Permission1185=Approve supplier orders +Permission1186=Order supplier orders +Permission1187=Acknowledge receipt of supplier orders +Permission1188=Delete supplier orders +Permission1201=Get result of an export +Permission1202=Create/Modify an export +Permission1231=Read supplier invoices +Permission1232=Create/modify supplier invoices +Permission1233=Validate supplier invoices +Permission1234=Delete supplier invoices +Permission1235=Send supplier invoices by email +Permission1236=Export supplier invoices, attributes and payments +Permission1237=Export supplier orders and their details +Permission1251=Run mass imports of external data into database (data load) +Permission1321=Export customer invoices, attributes and payments +Permission1421=Export customer orders and attributes +Permission23001 = Read Scheduled task +Permission23002 = Create/update Scheduled task +Permission23003 = Delete Scheduled task +Permission23004 = Execute Scheduled task +Permission2401=Read actions (events or tasks) linked to his account +Permission2402=Create/modify actions (events or tasks) linked to his account +Permission2403=Delete actions (events or tasks) linked to his account +Permission2411=Read actions (events or tasks) of others +Permission2412=Create/modify actions (events or tasks) of others +Permission2413=Delete actions (events or tasks) of others +Permission2501=Read/Download documents +Permission2502=Download documents +Permission2503=Submit or delete documents +Permission2515=Setup documents directories +Permission2801=Use FTP client in read mode (browse and download only) +Permission2802=Use FTP client in write mode (delete or upload files) +Permission50101=Use Point of sales +Permission50201=Read transactions +Permission50202=Import transactions +Permission54001=Print +Permission55001=Read polls +Permission55002=Create/modify polls +Permission59001=Read commercial margins +Permission59002=Define commercial margins +Permission59003=Read every user margin +DictionaryCompanyType=Thirdparties type +DictionaryCompanyJuridicalType=Juridical kinds of thirdparties +DictionaryProspectLevel=Prospect potential level +DictionaryCanton=State/Cantons +DictionaryRegion=Regions +DictionaryCountry=Countries +DictionaryCurrency=Currencies +DictionaryCivility=Civility title +DictionaryActions=Type of agenda events +DictionarySocialContributions=Social contributions types +DictionaryVAT=VAT Rates or Sales Tax Rates +DictionaryRevenueStamp=Amount of revenue stamps +DictionaryPaymentConditions=Payment terms +DictionaryPaymentModes=Payment modes +DictionaryTypeContact=Contact/Address types +DictionaryEcotaxe=Ecotax (WEEE) +DictionaryPaperFormat=Paper formats +DictionaryFees=Type of fees +DictionarySendingMethods=Shipping methods +DictionaryStaff=Staff +DictionaryAvailability=Delivery delay +DictionaryOrderMethods=Ordering methods +DictionarySource=Origin of proposals/orders +DictionaryAccountancyplan=Chart of accounts +DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates +SetupSaved=Setup saved +BackToModuleList=Back to modules list +BackToDictionaryList=Back to dictionaries list +VATReceivedOnly=Special rate not charged +VATManagement=VAT Management +VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to VAT, then VAT by default=0. End of rule.
If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule.
If seller and buyer in the European Community and goods are transport products (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.
If seller and buyer in the European Community and buyer is not a company, then the VAT by default=VAT of product sold. End of rule.
If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.
Else the proposed default VAT=0. End of rule. +VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies. +VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. +VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices. +##### Local Taxes ##### +LTRate=Rate +LocalTax1IsUsed=Use second tax +LocalTax1IsNotUsed=Do not use second tax +LocalTax1IsUsedDesc=Use a second type of tax (other than VAT) +LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT) +LocalTax1Management=Second type of tax +LocalTax1IsUsedExample= +LocalTax1IsNotUsedExample= +LocalTax2IsUsed=Use third tax +LocalTax2IsNotUsed=Do not use third tax +LocalTax2IsUsedDesc=Use a third type of tax (other than VAT) +LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT) +LocalTax2Management=Third type of tax +LocalTax2IsUsedExample= +LocalTax2IsNotUsedExample= +LocalTax1ManagementES= RE Management +LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If te buyer is not subjected to RE, RE by default=0. End of rule.
If the buyer is subjected to RE then the RE by default. End of rule.
+LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule. +LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE. +LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE. +LocalTax2ManagementES= IRPF Management +LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.
If the seller is subjected to IRPF then the IRPF by default. End of rule.
+LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule. +LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules. +LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules. +CalcLocaltax=Reports +CalcLocaltax1ES=Sales - Purchases +CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases +CalcLocaltax2ES=Purchases +CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases +CalcLocaltax3ES=Sales +CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales +LabelUsedByDefault=Label used by default if no translation can be found for code +LabelOnDocuments=Label on documents +NbOfDays=Nb of days +AtEndOfMonth=At end of month +Offset=Offset +AlwaysActive=Always active +UpdateRequired=Your system needs to be updated. To do this, click on Update now. +Upgrade=Upgrade +MenuUpgrade=Upgrade / Extend +AddExtensionThemeModuleOrOther=Add extension (theme, module, ...) +WebServer=Web server +DocumentRootServer=Web server's root directory +DataRootServer=Data files directory +IP=IP +Port=Port +VirtualServerName=Virtual server name +AllParameters=All parameters +OS=OS +PhpEnv=Env +PhpModules=Modules +PhpConf=Conf +PhpWebLink=Web-Php link +Pear=Pear +PearPackages=Pear Packages +Browser=Browser +Server=Server +Database=Database +DatabaseServer=Database host +DatabaseName=Database name +DatabasePort=Database port +DatabaseUser=Database user +DatabasePassword=Database password +DatabaseConfiguration=Database setup +Tables=Tables +TableName=Table name +TableLineFormat=Line format +NbOfRecord=Nb of records +Constraints=Constraints +ConstraintsType=Constraints type +ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry +AllMustBeOk=All of these must be checked +Host=Server +DriverType=Driver type +SummarySystem=System information summary +SummaryConst=List of all Dolibarr setup parameters +SystemUpdate=System update +SystemSuccessfulyUpdate=Your system has been updated successfuly +MenuCompanySetup=Company/Foundation +MenuNewUser=New user +MenuTopManager=Top menu manager +MenuLeftManager=Left menu manager +MenuManager=Menu manager +MenuSmartphoneManager=Smartphone menu manager +DefaultMenuTopManager=Top menu manager +DefaultMenuLeftManager=Left menu manager +DefaultMenuManager= Standard menu manager +DefaultMenuSmartphoneManager=Smartphone menu manager +Skin=Skin theme +DefaultSkin=Default skin theme +MaxSizeList=Max length for list +DefaultMaxSizeList=Default max length for list +MessageOfDay=Message of the day +MessageLogin=Login page message +PermanentLeftSearchForm=Permanent search form on left menu +DefaultLanguage=Default language to use (language code) +EnableMultilangInterface=Enable multilingual interface +EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) +SystemSuccessfulyUpdated=Your system has been updated successfully +CompanyInfo=Company/foundation information +CompanyIds=Company/foundation identities +CompanyName=Name +CompanyAddress=Address +CompanyZip=Zip +CompanyTown=Town +CompanyCountry=Country +CompanyCurrency=Main currency +Logo=Logo +DoNotShow=Do not show +DoNotSuggestPaymentMode=Do not suggest +NoActiveBankAccountDefined=No active bank account defined +OwnerOfBankAccount=Owner of bank account %s +BankModuleNotActive=Bank accounts module not enabled +ShowBugTrackLink=Show link "Report a bug" +ShowWorkBoard=Show "workbench" on homepage +Alerts=Alerts +Delays=Delays +DelayBeforeWarning=Delay before warning +DelaysBeforeWarning=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. +Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events not yet realised +Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not yet processed +Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not yet processed +Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close +Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed +Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate +Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services +Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices +Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices +Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation +Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee +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. +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 Setup -> Company/foundation are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country). +SetupDescription4=Parameters in menu Setup -> Modules are required because Dolibarr is not a fixed ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in menus. +SetupDescription5=Other menu entries manage optional parameters. +EventsSetup=Setup for events logs +LogEvents=Security audit events +Audit=Audit +InfoDolibarr=Infos Dolibarr +InfoBrowser=Infos Browser +InfoOS=Infos OS +InfoWebServer=Infos web server +InfoDatabase=Infos database +InfoPHP=Infos PHP +InfoPerf=Infos performances +BrowserName=Browser name +BrowserOS=Browser OS +ListEvents=Audit events +ListOfSecurityEvents=List of Dolibarr security events +SecurityEventsPurged=Security events purged +LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu System tools - Audit. Warning, this feature can consume a large amount of data in database. +AreaForAdminOnly=Those features can be used by administrator users only. +SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only. +SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit. +CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page) +DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here +AvailableModules=Available modules +ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules). +SessionTimeOut=Time out for session +SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every %s/%s access, but only during access made by other sessions.
Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default session.gc_maxlifetime, no matter what the value entered here. +TriggersAvailable=Available triggers +TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory htdocs/core/triggers. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...). +TriggerDisabledByName=Triggers in this file are disabled by the -NORUN suffix in their name. +TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module %s is disabled. +TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules. +TriggerActiveAsModuleActive=Triggers in this file are active as module %s is enabled. +GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password +DictionaryDesc=Define here all reference datas. You can complete predefined value with yours. +ConstDesc=This page allows you to edit all other parameters not available in previous pages. They are reserved parameters for advanced developers or for troubleshouting. +OnceSetupFinishedCreateUsers=Warning, you are a Dolibarr administrator user. Administrator users are used to setup Dolibarr. For a usual usage of Dolibarr, it is recommended to use a non administrator user created from Users & Groups menu. +MiscellaneousDesc=Define here all other parameters related to security. +LimitsSetup=Limits/Precision setup +LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here +MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices +MAIN_MAX_DECIMALS_TOT=Max decimals for total prices +MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add ... after this number if you want to see ... when number is truncated when shown on screen) +MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files. +MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10) +UnitPriceOfProduct=Net unit price of a product +TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding +ParameterActiveForNextInputOnly=Parameter effective for next input only +NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page. +NoEventFoundWithCriteria=No security event has been found for such search criterias. +SeeLocalSendMailSetup=See your local sendmail setup +BackupDesc=To make a complete backup of Dolibarr, you must: +BackupDesc2=* Save content of documents directory (%s) that contains all uploaded and generated files (you can make a zip for example). +BackupDesc3=* Save content of your database into a dump file. For this, you can use following assistant. +BackupDescX=Archived directory should be stored in a secure place. +BackupDescY=The generated dump file should be stored in a secure place. +BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one +RestoreDesc=To restore a Dolibarr backup, you must: +RestoreDesc2=* Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s). +RestoreDesc3=* Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation. Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant. +RestoreMySQL=MySQL import +ForcedToByAModule= This rule is forced to %s by an activated module +PreviousDumpFiles=Available database backup dump files +WeekStartOnDay=First day of week +RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s) +YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s or you must add -W option at end of command line to provide %s password. +YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP +DownloadMoreSkins=More skins to download +SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset +ShowProfIdInAddress=Show professionnal id with addresses on documents +ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents +TranslationUncomplete=Partial translation +SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/. +MenuUseLayout=Make vertical menu hidable (option javascript must not be disabled) +MAIN_DISABLE_METEO=Disable meteo view +TestLoginToAPI=Test login to API +ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it. +ExternalAccess=External access +MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet) +MAIN_PROXY_HOST=Name/Address of proxy server +MAIN_PROXY_PORT=Port of proxy server +MAIN_PROXY_USER=Login to use the proxy server +MAIN_PROXY_PASS=Password to use the proxy server +DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. +ExtraFields=Complementary attributes +ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) +ExtraFieldsThirdParties=Complementary attributes (thirdparty) +ExtraFieldsContacts=Complementary attributes (contact/address) +ExtraFieldsMember=Complementary attributes (member) +ExtraFieldsMemberType=Complementary attributes (member type) +ExtraFieldsCustomerOrders=Complementary attributes (orders) +ExtraFieldsCustomerInvoices=Complementary attributes (invoices) +ExtraFieldsSupplierOrders=Complementary attributes (orders) +ExtraFieldsSupplierInvoices=Complementary attributes (invoices) +ExtraFieldsProject=Complementary attributes (projects) +ExtraFieldsProjectTask=Complementary attributes (tasks) +ExtraFieldHasWrongValue=Attribute %s has a wrong value. +AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space +AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space +SendingMailSetup=Setup of sendings by email +SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba). +PathToDocuments=Path to documents +PathDirectory=Directory +SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages. +TranslationSetup=Configuration de la traduction +TranslationDesc=Choice of language visible on screen can be modified:
* Globally from menu Home - Setup - Display
* For user only from tab User display of user card (click on login on top of screen). +TotalNumberOfActivatedModules=Total number of activated feature modules: %s +YouMustEnableOneModule=You must at least enable 1 module +ClassNotFoundIntoPathWarning=Class %s not found into PHP path +YesInSummer=Yes in summer +OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): +SuhosinSessionEncrypt=Session storage encrypted by Suhosin +ConditionIsCurrently=Condition is currently %s +YouUseBestDriver=You use driver %s that is best driver available currently. +YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. +NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. +SearchOptim=Search optimization +YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response. +BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance. +BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari. +XDebugInstalled=XDebug is loaded. +XCacheInstalled=XCache is loaded. +AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp". +FieldEdition=Edition of field %s +FixTZ=TimeZone fix +FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) +GetBarCode=Get barcode +EmptyNumRefModelDesc=The code is free. This code can be modified at any time. +##### Module password generation +PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. +PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually. +##### Users setup ##### +UserGroupSetup=Users and groups module setup +GeneratePassword=Suggest a generated password +RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords +DoNotSuggest=Do not suggest any password +EncryptedPasswordInDatabase=To allow the encryption of the passwords in the database +DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page +UsersSetup=Users module setup +UserMailRequired=EMail required to create a new user +##### Company setup ##### +CompanySetup=Companies module setup +CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier) +AccountCodeManager=Module for accountancy code generation (customer or supplier) +ModuleCompanyCodeAquarium=Return an accountancy code built by:
%s followed by third party supplier code for a supplier accountancy code,
%s followed by third party customer code for a customer accountancy code. +ModuleCompanyCodePanicum=Return an empty accountancy code. +ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. +UseNotifications=Use notifications +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* or by setting a global target email address on module setup page. +ModelModules=Documents templates +DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) +WatermarkOnDraft=Watermark on draft document +JSOnPaimentBill=Activate feature to autofill payment lines on payment form +CompanyIdProfChecker=Rules on Professional Ids +MustBeUnique=Must be unique ? +MustBeMandatory=Mandatory to create third parties ? +MustBeInvoiceMandatory=Mandatory to validate invoices ? +Miscellaneous=Miscellaneous +##### Webcal setup ##### +WebCalSetup=Webcalendar link setup +WebCalSyncro=Add Dolibarr events to WebCalendar +WebCalAllways=Always, no asking +WebCalYesByDefault=On demand (yes by default) +WebCalNoByDefault=On demand (no by default) +WebCalNever=Never +WebCalURL=URL for calendar access +WebCalServer=Server hosting calendar database +WebCalDatabaseName=Database name +WebCalUser=User to access database +WebCalSetupSaved=Webcalendar setup saved successfully. +WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. +WebCalTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. +WebCalTestKo2=Connection to server '%s' with user '%s' failed. +WebCalErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Webcalendar database. +WebCalAddEventOnCreateActions=Add calendar event on actions create +WebCalAddEventOnCreateCompany=Add calendar event on companies create +WebCalAddEventOnStatusPropal=Add calendar event on commercial proposals status change +WebCalAddEventOnStatusContract=Add calendar event on contracts status change +WebCalAddEventOnStatusBill=Add calendar event on bills status change +WebCalAddEventOnStatusMember=Add calendar event on members status change +WebCalUrlForVCalExport=An export link to %s format is available at following link: %s +WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct. +##### Invoices ##### +BillsSetup=Invoices module setup +BillsDate=Invoices date +BillsNumberingModule=Invoices and credit notes numbering model +BillsPDFModules=Invoice documents models +CreditNoteSetup=Credit note module setup +CreditNotePDFModules=Credit note document models +CreditNote=Credit note +CreditNotes=Credit notes +ForceInvoiceDate=Force invoice date to validation date +DisableRepeatable=Disable repeatable invoices +SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice +EnableEditDeleteValidInvoice=Enable the possibility to edit/delete valid invoice with no payment +SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account +SuggestPaymentByChequeToAddress=Suggest payment by cheque to +FreeLegalTextOnInvoices=Free text on invoices +WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty) +##### Proposals ##### +PropalSetup=Commercial proposals module setup +CreateForm=Create forms +NumberOfProductLines=Number of product lines +ProposalsNumberingModules=Commercial proposal numbering models +ProposalsPDFModules=Commercial proposal documents models +ClassifiedInvoiced=Classified invoiced +HideTreadedPropal=Hide the treated commercial proposals in the list +AddShippingDateAbility=Add shipping date ability +AddDeliveryAddressAbility=Add delivery date ability +UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option +FreeLegalTextOnProposal=Free text on commercial proposals +WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### Orders ##### +OrdersSetup=Order management setup +OrdersNumberingModules=Orders numbering models +OrdersModelModule=Order documents models +HideTreadedOrders=Hide the treated or cancelled orders in the list +ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order +FreeLegalTextOnOrders=Free text on orders +WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable +BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order +##### Clicktodial ##### +ClickToDialSetup=Click To Dial module setup +ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
__PHONETO__ that will be replaced with the phone number of person to call
__PHONEFROM__ that will be replaced with phone number of calling person (yours)
__LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
__PASS__ that will be replaced with your clicktodial password (defined on your user card). +##### Bookmark4u ##### +Bookmark4uSetup=Bookmark4u module setup +##### Interventions ##### +InterventionsSetup=Interventions module setup +FreeLegalTextOnInterventions=Free text on intervention documents +FicheinterNumberingModules=Intervention numbering models +TemplatePDFInterventions=Intervention card documents models +WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) +##### Contracts ##### +ContractsSetup=Contracts/Subscriptions module setup +ContractsNumberingModules=Contracts numbering modules +TemplatePDFContracts=Contracts documents models +FreeLegalTextOnContracts=Free text on contracts +WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) +##### Members ##### +MembersSetup=Members module setup +MemberMainOptions=Main options +AddSubscriptionIntoAccount=Suggest by default to create a bank transaction, in bank module, when adding a new payed subscription +AdherentLoginRequired= Manage a Login for each member +AdherentMailRequired=EMail required to create a new member +MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default +##### LDAP setup ##### +LDAPSetup=LDAP Setup +LDAPGlobalParameters=Global parameters +LDAPUsersSynchro=Users +LDAPGroupsSynchro=Groups +LDAPContactsSynchro=Contacts +LDAPMembersSynchro=Members +LDAPSynchronization=LDAP synchronisation +LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP +LDAPToDolibarr=LDAP -> Dolibarr +DolibarrToLDAP=Dolibarr -> LDAP +LDAPNamingAttribute=Key in LDAP +LDAPSynchronizeUsers=Organization of users in LDAP +LDAPSynchronizeGroups=Organization of groups in LDAP +LDAPSynchronizeContacts=Organization of contacts in LDAP +LDAPSynchronizeMembers=Organization of foundation's members in LDAP +LDAPTypeExample=OpenLdap, Egroupware or Active Directory +LDAPPrimaryServer=Primary server +LDAPSecondaryServer=Secondary server +LDAPServerPort=Server port +LDAPServerPortExample=Default port : 389 +LDAPServerProtocolVersion=Protocol version +LDAPServerUseTLS=Use TLS +LDAPServerUseTLSExample=Your LDAP server use TLS +LDAPServerDn=Server DN +LDAPAdminDn=Administrator DN +LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com) +LDAPPassword=Administrator password +LDAPUserDn=Users' DN +LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com) +LDAPGroupDn=Groups' DN +LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com) +LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) +LDAPServerDnExample=Complete DN (ex: dc=example,dc=com) +LDAPPasswordExample=Admin password +LDAPDnSynchroActive=Users and groups synchronization +LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization +LDAPDnContactActive=Contacts' synchronization +LDAPDnContactActiveYes=Activated synchronization +LDAPDnContactActiveExample=Activated/Unactivated synchronization +LDAPDnMemberActive=Members' synchronization +LDAPDnMemberActiveExample=Activated/Unactivated synchronization +LDAPContactDn=Dolibarr contacts' DN +LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com) +LDAPMemberDn=Dolibarr members DN +LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com) +LDAPMemberObjectClassList=List of objectClass +LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPUserObjectClassList=List of objectClass +LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPGroupObjectClassList=List of objectClass +LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames) +LDAPContactObjectClassList=List of objectClass +LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPMemberTypeDn=Dolibarr members type DN +LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=example,dc=com) +LDAPTestConnect=Test LDAP connection +LDAPTestSynchroContact=Test contacts synchronization +LDAPTestSynchroUser=Test user synchronization +LDAPTestSynchroGroup=Test group synchronization +LDAPTestSynchroMember=Test member synchronization +LDAPTestSearch= Test a LDAP search +LDAPSynchroOK=Synchronization test successful +LDAPSynchroKO=Failed synchronization test +LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates +LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s) +LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s) +LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPUnbindSuccessfull=Disconnect successful +LDAPUnbindFailed=Disconnect failed +LDAPConnectToDNSuccessfull=Connection to DN (%s) successful +LDAPConnectToDNFailed=Connection to DN (%s) failed +LDAPSetupForVersion3=LDAP server configured for version 3 +LDAPSetupForVersion2=LDAP server configured for version 2 +LDAPDolibarrMapping=Dolibarr Mapping +LDAPLdapMapping=LDAP Mapping +LDAPFieldLoginUnix=Login (unix) +LDAPFieldLoginExample=Example : uid +LDAPFilterConnection=Search filter +LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson) +LDAPFieldLoginSamba=Login (samba, activedirectory) +LDAPFieldLoginSambaExample=Example : samaccountname +LDAPFieldFullname=Full name +LDAPFieldFullnameExample=Example : cn +LDAPFieldPassword=Password +LDAPFieldPasswordNotCrypted=Password not crypted +LDAPFieldPasswordCrypted=Password crypted +LDAPFieldPasswordExample=Example : userPassword +LDAPFieldCommonName=Common name +LDAPFieldCommonNameExample=Example : cn +LDAPFieldName=Name +LDAPFieldNameExample=Example : sn +LDAPFieldFirstName=First name +LDAPFieldFirstNameExample=Example : givenName +LDAPFieldMail=Email address +LDAPFieldMailExample=Example : mail +LDAPFieldPhone=Professional phone number +LDAPFieldPhoneExample=Example : telephonenumber +LDAPFieldHomePhone=Personal phone number +LDAPFieldHomePhoneExample=Example : homephone +LDAPFieldMobile=Cellular phone +LDAPFieldMobileExample=Example : mobile +LDAPFieldFax=Fax number +LDAPFieldFaxExample=Example : facsimiletelephonenumber +LDAPFieldAddress=Street +LDAPFieldAddressExample=Example : street +LDAPFieldZip=Zip +LDAPFieldZipExample=Example : postalcode +LDAPFieldTown=Town +LDAPFieldTownExample=Example : l +LDAPFieldCountry=Country +LDAPFieldCountryExample=Example : c +LDAPFieldDescription=Description +LDAPFieldDescriptionExample=Example : description +LDAPFieldGroupMembers= Group members +LDAPFieldGroupMembersExample= Example : uniqueMember +LDAPFieldBirthdate=Birthdate +LDAPFieldBirthdateExample=Example : +LDAPFieldCompany=Company +LDAPFieldCompanyExample=Example : o +LDAPFieldSid=SID +LDAPFieldSidExample=Example : objectsid +LDAPFieldEndLastSubscription=Date of subscription end +LDAPFieldTitle=Post/Function +LDAPFieldTitleExample=Example: title +LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPSetupNotComplete=LDAP setup not complete (go on others tabs) +LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode. +LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts. +LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users. +LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups. +LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module. +LDAPDescValues=Example values are designed for OpenLDAP with following loaded schemas: core.schema, cosine.schema, inetorgperson.schema). If you use thoose values and OpenLDAP, modify your LDAP config file slapd.conf to have all thoose schemas loaded. +ForANonAnonymousAccess=For an authenticated access (for a write access for example) +PerfDolibarr=Performance setup/optimizing report +YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance. +NotInstalled=Not installed, so your server is not slow down by this. +ApplicativeCache=Applicative cache +MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server. +MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete. +MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled. +OPCodeCache=OPCode cache +NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad). +HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript) +FilesOfTypeCached=Files of type %s are cached by HTTP server +FilesOfTypeNotCached=Files of type %s are not cached by HTTP server +FilesOfTypeCompressed=Files of type %s are compressed by HTTP server +FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server +CacheByServer=Cache by server +CacheByClient=Cache by browser +CompressionOfResources=Compression of HTTP responses +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +##### Products ##### +ProductSetup=Products module setup +ServiceSetup=Services module setup +ProductServiceSetup=Products and Services modules setup +NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit) +ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms +ModifyProductDescAbility=Personalization of product descriptions in forms +ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip) +ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language +UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). +UseEcoTaxeAbility=Support Eco-Taxe (WEEE) +SetDefaultBarcodeTypeProducts=Default barcode type to use for products +SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties +ProductCodeChecker= Module for product code generation and checking (product or service) +ProductOtherConf= Product / Service configuration +##### Syslog ##### +SyslogSetup=Logs module setup +SyslogOutput=Logs outputs +SyslogSyslog=Syslog +SyslogFacility=Facility +SyslogLevel=Level +SyslogSimpleFile=File +SyslogFilename=File name and path +YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file. +ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant +OnlyWindowsLOG_USER=Windows only supports LOG_USER +##### Donations ##### +DonationsSetup=Donation module setup +DonationsReceiptModel=Template of donation receipt +##### Barcode ##### +BarcodeSetup=Barcode setup +PaperFormatModule=Print format module +BarcodeEncodeModule=Barcode encoding type +UseBarcodeInProductModule=Use bar codes for products +CodeBarGenerator=Barcode generator +ChooseABarCode=No generator defined +FormatNotSupportedByGenerator=Format not supported by this generator +BarcodeDescEAN8=Barcode of type EAN8 +BarcodeDescEAN13=Barcode of type EAN13 +BarcodeDescUPC=Barcode of type UPC +BarcodeDescISBN=Barcode of type ISBN +BarcodeDescC39=Barcode of type C39 +BarcodeDescC128=Barcode of type C128 +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode +BarcodeInternalEngine=Internal engine +BarCodeNumberManager=Manager to auto define barcode numbers +##### Prelevements ##### +WithdrawalsSetup=Withdrawal module setup +##### ExternalRSS ##### +ExternalRSSSetup=External RSS imports setup +NewRSS=New RSS Feed +RSSUrl=RSS URL +RSSUrlExample=An interesting RSS feed +##### Mailing ##### +MailingSetup=EMailing module setup +MailingEMailFrom=Sender EMail (From) for emails sent by emailing module +MailingEMailError=Return EMail (Errors-to) for emails with errors +MailingDelay=Seconds to wait after sending next message +##### Notification ##### +NotificationSetup=EMail notification module setup +NotificationEMailFrom=Sender EMail (From) for emails sent for notifications +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target +##### Sendings ##### +SendingsSetup=Sending module setup +SendingsReceiptModel=Sending receipt model +SendingsNumberingModules=Sendings numbering modules +SendingsAbility=Support shipment sheets for customer deliveries +NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated. +FreeLegalTextOnShippings=Free text on shipments +##### Deliveries ##### +DeliveryOrderNumberingModules=Products deliveries receipt numbering module +DeliveryOrderModel=Products deliveries receipt model +DeliveriesOrderAbility=Support products deliveries receipts +FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts +##### FCKeditor ##### +AdvancedEditor=Advanced editor +ActivateFCKeditor=Activate advanced editor for: +FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) +FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files. +FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) +FCKeditorForUserSignature=WYSIWIG creation/edition of user signature +FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing) +##### OSCommerce 1 ##### +OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s). +OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull. +OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. +OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. +##### Stock ##### +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. +##### Menu ##### +MenuDeleted=Menu deleted +TreeMenu=Tree menus +Menus=Menus +TreeMenuPersonalized=Personalized menus +NewMenu=New menu +MenuConf=Menus setup +Menu=Selection of menu +MenuHandler=Menu handler +MenuModule=Source module +HideUnauthorizedMenu= Hide unauthorized menus (gray) +DetailId=Id menu +DetailMenuHandler=Menu handler where to show new menu +DetailMenuModule=Module name if menu entry come from a module +DetailType=Type of menu (top or left) +DetailTitre=Menu label or label code for translation +DetailMainmenu=Group for which it belongs (obsolete) +DetailUrl=URL where menu send you (Absolute URL link or external link with http://) +DetailLeftmenu=Display condition or not (obsolete) +DetailEnabled=Condition to show or not entry +DetailRight=Condition to display unauthorized grey menus +DetailLangs=Lang file name for label code translation +DetailUser=Intern / Extern / All +Target=Target +DetailTarget=Target for links (_blank top open a new window) +DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu) +ModifMenu=Menu change +DeleteMenu=Delete menu entry +ConfirmDeleteMenu=Are you sure you want to delete menu entry %s ? +DeleteLine=Delete line +ConfirmDeleteLine=Are you sure you want to delete this line ? +##### Tax ##### +TaxSetup=Taxes, social contributions and dividends module setup +OptionVatMode=VAT due +OptionVATDefault=Cash basis +OptionVATDebitOption=Accrual basis +OptionVatDefaultDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on payments for services +OptionVatDebitOptionDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on invoice (debit) for services +SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: +OnDelivery=On delivery +OnPayment=On payment +OnInvoice=On invoice +SupposedToBePaymentDate=Payment date used +SupposedToBeInvoiceDate=Invoice date used +Buy=Buy +Sell=Sell +InvoiceDateUsed=Invoice date used +YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup. +AccountancyCode=Accountancy Code +AccountancyCodeSell=Sale account. code +AccountancyCodeBuy=Purchase account. code +##### Agenda ##### +AgendaSetup=Events and agenda module setup +PasswordTogetVCalExport=Key to authorize export link +PastDelayVCalExport=Do not export event older than +AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) +AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view +AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view +AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda +##### ClickToDial ##### +ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example. +##### Point Of Sales (CashDesk) ##### +CashDesk=Point of sales +CashDeskSetup=Point of sales module setup +CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskBankAccountForSell=Default account to use to receive cash payments +CashDeskBankAccountForCheque= Default account to use to receive payments by cheque +CashDeskBankAccountForCB= Default account to use to receive payments by credit cards +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). +CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease +StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management +CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. +##### Bookmark ##### +BookmarkSetup=Bookmark module setup +BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. +NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu +##### WebServices ##### +WebServicesSetup=Webservices module setup +WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services. +WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here +EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url +##### Bank ##### +BankSetupModule=Bank module setup +FreeLegalTextOnChequeReceipts=Free text on cheque receipts +BankOrderShow=Display order of bank accounts for countries using "detailed bank number" +BankOrderGlobal=General +BankOrderGlobalDesc=General display order +BankOrderES=Spanish +BankOrderESDesc=Spanish display order +##### Multicompany ##### +MultiCompanySetup=Multi-company module setup +##### Suppliers ##### +SuppliersSetup=Supplier module setup +SuppliersCommandModel=Complete template of supplier order (logo...) +SuppliersInvoiceModel=Complete template of supplier invoice (logo...) +SuppliersInvoiceNumberingModel=Supplier invoices numbering models +##### GeoIPMaxmind ##### +GeoIPMaxmindSetup=GeoIP Maxmind module setup +PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat +NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions). +YouCanDownloadFreeDatFileTo=You can download a free demo version of the Maxmind GeoIP country file at %s. +YouCanDownloadAdvancedDatFileTo=You can also download a more complete version, with updates, of the Maxmind GeoIP country file at %s. +TestGeoIPResult=Test of a conversion IP -> country +##### Projects ##### +ProjectsNumberingModules=Projects numbering module +ProjectsSetup=Project module setup +ProjectsModelModule=Project reports document model +TasksNumberingModules=Tasks numbering module +TaskModelModule=Tasks reports document model +##### ECM (GED) ##### +ECMSetup = GED Setup +ECMAutoTree = Automatic tree folder and document +##### Fiscal Year ##### +FiscalYears=Fiscal years +FiscalYear=Fiscal year +FiscalYearCard=Fiscal year card +NewFiscalYear=New fiscal year +EditFiscalYear=Edit fiscal year +OpenFiscalYear=Open fiscal year +CloseFiscalYear=Close fiscal year +DeleteFiscalYear=Delete fiscal year +ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? +Opened=Opened +Closed=Closed +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order +Format=Format +TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/sw_SW/agenda.lang b/htdocs/langs/sw_SW/agenda.lang new file mode 100644 index 00000000000..04e2ae30de8 --- /dev/null +++ b/htdocs/langs/sw_SW/agenda.lang @@ -0,0 +1,93 @@ +# Dolibarr language file - Source file is en_US - agenda +IdAgenda=ID event +Actions=Events +ActionsArea=Events area (Actions and tasks) +Agenda=Agenda +Agendas=Agendas +Calendar=Calendar +Calendars=Calendars +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by +AffectedTo=Assigned to +DoneBy=Done by +Event=Event +Events=Events +EventsNb=Number of events +MyEvents=My events +OtherEvents=Other events +ListOfActions=List of events +Location=Location +EventOnFullDay=Event on all day(s) +SearchAnAction= Search an event/task +MenuToDoActions=All incomplete events +MenuDoneActions=All terminated events +MenuToDoMyActions=My incomplete events +MenuDoneMyActions=My terminated events +ListOfEvents=List of events (internal calendar) +ActionsAskedBy=Events reported by +ActionsToDoBy=Events assigned to +ActionsDoneBy=Events done by +ActionsForUser=Events for user +ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to +AllMyActions= All my events/tasks +AllActions= All events/tasks +ViewList=List view +ViewCal=Month view +ViewDay=Day view +ViewWeek=Week view +ViewPerUser=Per user view +ViewWithPredefinedFilters= View with predefined filters +AutoActions= Automatic filling +AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. +AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) +AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status +InvoiceDeleteDolibarr=Invoice %s deleted +OrderValidatedInDolibarr= Order %s validated +OrderApprovedInDolibarr=Order %s approved +OrderRefusedInDolibarr=Order %s refused +OrderBackToDraftInDolibarr=Order %s go back to draft status +OrderCanceledInDolibarr=Order %s canceled +ProposalSentByEMail=Commercial proposal %s sent by EMail +OrderSentByEMail=Customer order %s sent by EMail +InvoiceSentByEMail=Customer invoice %s sent by EMail +SupplierOrderSentByEMail=Supplier order %s sent by EMail +SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail +ShippingSentByEMail=Shipment %s sent by EMail +ShippingValidated= Shipment %s validated +InterventionSentByEMail=Intervention %s sent by EMail +NewCompanyToDolibarr= Third party created +DateActionPlannedStart= Planned start date +DateActionPlannedEnd= Planned end date +DateActionDoneStart= Real start date +DateActionDoneEnd= Real end date +DateActionStart= Start date +DateActionEnd= End date +AgendaUrlOptions1=You can also add following parameters to filter output: +AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. +AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. +AgendaShowBirthdayEvents=Show birthday's contacts +AgendaHideBirthdayEvents=Hide birthday's contacts +Busy=Busy +ExportDataset_event1=List of agenda events +DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) +DefaultWorkingHours=Default working hours in day (Example: 9-18) +# External Sites ical +ExportCal=Export calendar +ExtSites=Import external calendars +ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesNbOfAgenda=Number of calendars +AgendaExtNb=Calendar nb %s +ExtSiteUrlAgenda=URL to access .ical file +ExtSiteNoLabel=No Description +WorkingTimeRange=Working time range +WorkingDaysRange=Working days range +AddEvent=Create event +MyAvailability=My availability diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang new file mode 100644 index 00000000000..a2306950fb4 --- /dev/null +++ b/htdocs/langs/sw_SW/banks.lang @@ -0,0 +1,165 @@ +# Dolibarr language file - Source file is en_US - banks +Bank=Bank +Banks=Banks +MenuBankCash=Bank/Cash +MenuSetupBank=Bank/Cash setup +BankName=Bank name +FinancialAccount=Account +FinancialAccounts=Accounts +BankAccount=Bank account +BankAccounts=Bank accounts +ShowAccount=Show Account +AccountRef=Financial account ref +AccountLabel=Financial account label +CashAccount=Cash account +CashAccounts=Cash accounts +MainAccount=Main account +CurrentAccount=Current account +CurrentAccounts=Current accounts +SavingAccount=Savings account +SavingAccounts=Savings accounts +ErrorBankLabelAlreadyExists=Financial account label already exists +BankBalance=Balance +BankBalanceBefore=Balance before +BankBalanceAfter=Balance after +BalanceMinimalAllowed=Minimum allowed balance +BalanceMinimalDesired=Minimum desired balance +InitialBankBalance=Initial balance +EndBankBalance=End balance +CurrentBalance=Current balance +FutureBalance=Future balance +ShowAllTimeBalance=Show balance from start +AllTime=From start +Reconciliation=Reconciliation +RIB=Bank Account Number +IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid +BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid +StandingOrders=Standing orders +StandingOrder=Standing order +Withdrawals=Withdrawals +Withdrawal=Withdrawal +AccountStatement=Account statement +AccountStatementShort=Statement +AccountStatements=Account statements +LastAccountStatements=Last account statements +Rapprochement=Reconciliate +IOMonthlyReporting=Monthly reporting +BankAccountDomiciliation=Account address +BankAccountCountry=Account country +BankAccountOwner=Account owner name +BankAccountOwnerAddress=Account owner address +RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN). +CreateAccount=Create account +NewAccount=New account +NewBankAccount=New bank account +NewFinancialAccount=New financial account +MenuNewFinancialAccount=New financial account +NewCurrentAccount=New current account +NewSavingAccount=New savings account +NewCashAccount=New cash account +EditFinancialAccount=Edit account +AccountSetup=Financial accounts setup +SearchBankMovement=Search bank movement +Debts=Debts +LabelBankCashAccount=Bank or cash label +AccountType=Account type +BankType0=Savings account +BankType1=Current or credit card account +BankType2=Cash account +IfBankAccount=If bank account +AccountsArea=Accounts area +AccountCard=Account card +DeleteAccount=Delete account +ConfirmDeleteAccount=Are you sure you want to delete this account ? +Account=Account +ByCategories=By categories +ByRubriques=By categories +BankTransactionByCategories=Bank transactions by categories +BankTransactionForCategory=Bank transactions for category %s +RemoveFromRubrique=Remove link with category +RemoveFromRubriqueConfirm=Are you sure you want to remove link between the transaction and the category ? +ListBankTransactions=List of bank transactions +IdTransaction=Transaction ID +BankTransactions=Bank transactions +SearchTransaction=Search transaction +ListTransactions=List transactions +ListTransactionsByCategory=List transaction/category +TransactionsToConciliate=Transactions to reconcile +Conciliable=Can be reconciled +Conciliate=Reconcile +Conciliation=Reconciliation +ConciliationForAccount=Reconcile this account +IncludeClosedAccount=Include closed accounts +OnlyOpenedAccount=Only opened accounts +AccountToCredit=Account to credit +AccountToDebit=Account to debit +DisableConciliation=Disable reconciliation feature for this account +ConciliationDisabled=Reconciliation feature disabled +StatusAccountOpened=Opened +StatusAccountClosed=Closed +AccountIdShort=Number +EditBankRecord=Edit record +LineRecord=Transaction +AddBankRecord=Add transaction +AddBankRecordLong=Add transaction manually +ConciliatedBy=Reconciled by +DateConciliating=Reconcile date +BankLineConciliated=Transaction reconciled +CustomerInvoicePayment=Customer payment +CustomerInvoicePaymentBack=Customer payment back +SupplierInvoicePayment=Supplier payment +WithdrawalPayment=Withdrawal payment +SocialContributionPayment=Social contribution payment +FinancialAccountJournal=Financial account journal +BankTransfer=Bank transfer +BankTransfers=Bank transfers +TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction) +TransferFrom=From +TransferTo=To +TransferFromToDone=A transfer from %s to %s of %s %s has been recorded. +CheckTransmitter=Transmitter +ValidateCheckReceipt=Validate this check receipt ? +ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done ? +DeleteCheckReceipt=Delete this check receipt ? +ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt ? +BankChecks=Bank checks +BankChecksToReceipt=Checks waiting for deposit +ShowCheckReceipt=Show check deposit receipt +NumberOfCheques=Nb of check +DeleteTransaction=Delete transaction +ConfirmDeleteTransaction=Are you sure you want to delete this transaction ? +ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions +BankMovements=Movements +CashBudget=Cash budget +PlannedTransactions=Planned transactions +Graph=Graphics +ExportDataset_banque_1=Bank transactions and account statement +ExportDataset_banque_2=Deposit slip +TransactionOnTheOtherAccount=Transaction on the other account +TransactionWithOtherAccount=Account transfer +PaymentNumberUpdateSucceeded=Payment number updated succesfully +PaymentNumberUpdateFailed=Payment number could not be updated +PaymentDateUpdateSucceeded=Payment date update succesfully +PaymentDateUpdateFailed=Payment date could not be updated +Transactions=Transactions +BankTransactionLine=Bank transaction +AllAccounts=All bank/cash accounts +BackToAccount=Back to account +ShowAllAccounts=Show for all accounts +FutureTransaction=Transaction in futur. No way to conciliate. +SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD +EventualyAddCategory=Eventually, specify a category in which to classify the records +ToConciliate=To conciliate? +ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click +BankDashboard=Bank accounts summary +DefaultRIB=Default BAN +AllRIB=All BAN +LabelRIB=BAN Label +NoBANRecord=No BAN record +DeleteARib=Delete BAN record +ConfirmDeleteRib=Are you sure you want to delete this BAN record ? diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang new file mode 100644 index 00000000000..7232f00e91c --- /dev/null +++ b/htdocs/langs/sw_SW/bills.lang @@ -0,0 +1,430 @@ +# Dolibarr language file - Source file is en_US - bills +Bill=Invoice +Bills=Invoices +BillsCustomers=Customers invoices +BillsCustomer=Customers invoice +BillsSuppliers=Suppliers invoices +BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s +BillsSuppliersUnpaid=Unpaid supplier's invoices +BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s +BillsLate=Late payments +BillsStatistics=Customers invoices statistics +BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseNotErasable=Disabled because can not be erased +InvoiceStandard=Standard invoice +InvoiceStandardAsk=Standard invoice +InvoiceStandardDesc=This kind of invoice is the common invoice. +InvoiceDeposit=Deposit invoice +InvoiceDepositAsk=Deposit invoice +InvoiceDepositDesc=This kind of invoice is done when a deposit has been received. +InvoiceProForma=Proforma invoice +InvoiceProFormaAsk=Proforma invoice +InvoiceProFormaDesc=Proforma invoice is an image of a true invoice but has no accountancy value. +InvoiceReplacement=Replacement invoice +InvoiceReplacementAsk=Replacement invoice for invoice +InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'. +InvoiceAvoir=Credit note +InvoiceAvoirAsk=Credit note to correct invoice +InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). +invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount +ReplaceInvoice=Replace invoice %s +ReplacementInvoice=Replacement invoice +ReplacedByInvoice=Replaced by invoice %s +ReplacementByInvoice=Replaced by invoice +CorrectInvoice=Correct invoice %s +CorrectionInvoice=Correction invoice +UsedByInvoice=Used to pay invoice %s +ConsumedBy=Consumed by +NotConsumed=Not consumed +NoReplacableInvoice=No replacable invoices +NoInvoiceToCorrect=No invoice to correct +InvoiceHasAvoir=Corrected by one or several invoices +CardBill=Invoice card +PredefinedInvoices=Predefined Invoices +Invoice=Invoice +Invoices=Invoices +InvoiceLine=Invoice line +InvoiceCustomer=Customer invoice +CustomerInvoice=Customer invoice +CustomersInvoices=Customers invoices +SupplierInvoice=Supplier invoice +SuppliersInvoices=Suppliers invoices +SupplierBill=Supplier invoice +SupplierBills=suppliers invoices +Payment=Payment +PaymentBack=Payment back +Payments=Payments +PaymentsBack=Payments back +PaidBack=Paid back +DatePayment=Payment date +DeletePayment=Delete payment +ConfirmDeletePayment=Are you sure you want to delete this payment ? +ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?
The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer. +SupplierPayments=Suppliers payments +ReceivedPayments=Received payments +ReceivedCustomersPayments=Payments received from customers +PayedSuppliersPayments=Payments payed to suppliers +ReceivedCustomersPaymentsToValid=Received customers payments to validate +PaymentsReportsForYear=Payments reports for %s +PaymentsReports=Payments reports +PaymentsAlreadyDone=Payments already done +PaymentsBackAlreadyDone=Payments back already done +PaymentRule=Payment rule +PaymentMode=Payment type +PaymentConditions=Payment term +PaymentConditionsShort=Payment term +PaymentAmount=Payment amount +ValidatePayment=Validate payment +PaymentHigherThanReminderToPay=Payment higher than reminder to pay +HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices. +HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm. +ClassifyPaid=Classify 'Paid' +ClassifyPaidPartially=Classify 'Paid partially' +ClassifyCanceled=Classify 'Abandoned' +ClassifyClosed=Classify 'Closed' +ClassifyUnBilled=Classify 'Unbilled' +CreateBill=Create Invoice +AddBill=Create invoice or credit note +AddToDraftInvoices=Add to draft invoice +DeleteBill=Delete invoice +SearchACustomerInvoice=Search for a customer invoice +SearchASupplierInvoice=Search for a supplier invoice +CancelBill=Cancel an invoice +SendRemindByMail=Send reminder by EMail +DoPayment=Do payment +DoPaymentBack=Do payment back +ConvertToReduc=Convert into future discount +EnterPaymentReceivedFromCustomer=Enter payment received from customer +EnterPaymentDueToCustomer=Make payment due to customer +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero +Amount=Amount +PriceBase=Price base +BillStatus=Invoice status +BillStatusDraft=Draft (needs to be validated) +BillStatusPaid=Paid +BillStatusPaidBackOrConverted=Paid or converted into discount +BillStatusConverted=Paid (ready for final invoice) +BillStatusCanceled=Abandoned +BillStatusValidated=Validated (needs to be paid) +BillStatusStarted=Started +BillStatusNotPaid=Not paid +BillStatusClosedUnpaid=Closed (unpaid) +BillStatusClosedPaidPartially=Paid (partially) +BillShortStatusDraft=Draft +BillShortStatusPaid=Paid +BillShortStatusPaidBackOrConverted=Processed +BillShortStatusConverted=Processed +BillShortStatusCanceled=Abandoned +BillShortStatusValidated=Validated +BillShortStatusStarted=Started +BillShortStatusNotPaid=Not paid +BillShortStatusClosedUnpaid=Closed +BillShortStatusClosedPaidPartially=Paid (partially) +PaymentStatusToValidShort=To validate +ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined +ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this. +ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes +ErrorBillNotFound=Invoice %s does not exist +ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s. +ErrorDiscountAlreadyUsed=Error, discount already used +ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount +ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount +ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status +BillFrom=From +BillTo=To +ActionsOnBill=Actions on invoice +NewBill=New invoice +LastBills=Last %s invoices +LastCustomersBills=Last %s customers invoices +LastSuppliersBills=Last %s suppliers invoices +AllBills=All invoices +OtherBills=Other invoices +DraftBills=Draft invoices +CustomersDraftInvoices=Customers draft invoices +SuppliersDraftInvoices=Suppliers draft invoices +Unpaid=Unpaid +ConfirmDeleteBill=Are you sure you want to delete this invoice ? +ConfirmValidateBill=Are you sure you want to validate this invoice with reference %s ? +ConfirmUnvalidateBill=Are you sure you want to change invoice %s to draft status ? +ConfirmClassifyPaidBill=Are you sure you want to change invoice %s to status paid ? +ConfirmCancelBill=Are you sure you want to cancel invoice %s ? +ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? +ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? +ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer +ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned +ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason +ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction») +ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note. +ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit +ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A bad customer is a customer that refuse to pay his debt. +ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned +ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:
- payment not complete because some products were shipped back
- amount claimed too important because a discount was forgotten
In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note. +ConfirmClassifyAbandonReasonOther=Other +ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice. +ConfirmCustomerPayment=Do you confirm this payment input for %s %s ? +ConfirmSupplierPayment=Do you confirm this payment input for %s %s ? +ConfirmValidatePayment=Are you sure you want to validate this payment ? No change can be made once payment is validated. +ValidateBill=Validate invoice +UnvalidateBill=Unvalidate invoice +NumberOfBills=Nb of invoices +NumberOfBillsByMonth=Nb of invoices by month +AmountOfBills=Amount of invoices +AmountOfBillsByMonthHT=Amount of invoices by month (net of tax) +ShowSocialContribution=Show social contribution +ShowBill=Show invoice +ShowInvoice=Show invoice +ShowInvoiceReplace=Show replacing invoice +ShowInvoiceAvoir=Show credit note +ShowInvoiceDeposit=Show deposit invoice +ShowPayment=Show payment +File=File +AlreadyPaid=Already paid +AlreadyPaidBack=Already paid back +AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) +Abandoned=Abandoned +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back +Rest=Pending +AmountExpected=Amount claimed +ExcessReceived=Excess received +EscompteOffered=Discount offered (payment before term) +SendBillRef=Submission of invoice %s +SendReminderBillRef=Submission of invoice %s (reminder) +StandingOrders=Standing orders +StandingOrder=Standing order +NoDraftBills=No draft invoices +NoOtherDraftBills=No other draft invoices +NoDraftInvoices=No draft invoices +RefBill=Invoice ref +ToBill=To bill +RemainderToBill=Remainder to bill +SendBillByMail=Send invoice by email +SendReminderBillByMail=Send reminder by email +RelatedCommercialProposals=Related commercial proposals +MenuToValid=To valid +DateMaxPayment=Payment due before +DateEcheance=Due date limit +DateInvoice=Invoice date +NoInvoice=No invoice +ClassifyBill=Classify invoice +SupplierBillsToPay=Suppliers invoices to pay +CustomerBillsUnpaid=Unpaid customers invoices +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +NonPercuRecuperable=Non-recoverable +SetConditions=Set payment terms +SetMode=Set payment mode +Billed=Billed +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice +CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines +CustomersInvoicesAndPayments=Customer invoices and payments +ExportDataset_invoice_1=Customer invoices list and invoice's lines +ExportDataset_invoice_2=Customer invoices and payments +ProformaBill=Proforma Bill: +Reduction=Reduction +ReductionShort=Reduc. +Reductions=Reductions +ReductionsShort=Reduc. +Discount=Discount +Discounts=Discounts +AddDiscount=Create discount +AddRelativeDiscount=Create relative discount +EditRelativeDiscount=Edit relative discount +AddGlobalDiscount=Create absolute discount +EditGlobalDiscounts=Edit absolute discounts +AddCreditNote=Create credit note +ShowDiscount=Show discount +ShowReduc=Show the deduction +RelativeDiscount=Relative discount +GlobalDiscount=Global discount +CreditNote=Credit note +CreditNotes=Credit notes +Deposit=Deposit +Deposits=Deposits +DiscountFromCreditNote=Discount from credit note %s +DiscountFromDeposit=Payments from deposit invoice %s +AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation +CreditNoteDepositUse=Invoice must be validated to use this king of credits +NewGlobalDiscount=New absolute discount +NewRelativeDiscount=New relative discount +NoteReason=Note/Reason +ReasonDiscount=Reason +DiscountOfferedBy=Granted by +DiscountStillRemaining=Discounts still remaining +DiscountAlreadyCounted=Discounts already counted +BillAddress=Bill address +HelpEscompte=This discount is a discount granted to customer because its payment was made before term. +HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose. +HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example) +IdSocialContribution=Social contribution id +PaymentId=Payment id +InvoiceId=Invoice id +InvoiceRef=Invoice ref. +InvoiceDateCreation=Invoice creation date +InvoiceStatus=Invoice status +InvoiceNote=Invoice note +InvoicePaid=Invoice paid +PaymentNumber=Payment number +RemoveDiscount=Remove discount +WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty) +InvoiceNotChecked=No invoice selected +CloneInvoice=Clone invoice +ConfirmCloneInvoice=Are you sure you want to clone this invoice %s ? +DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced +DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here. +NbOfPayments=Nb of payments +SplitDiscount=Split discount in two +ConfirmSplitDiscount=Are you sure you want to split this discount of %s %s into 2 lower discounts ? +TypeAmountOfEachNewDiscount=Input amount for each of two parts : +TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount. +ConfirmRemoveDiscount=Are you sure you want to remove this discount ? +RelatedBill=Related invoice +RelatedBills=Related invoices +LatestRelatedBill=Latest related invoice +WarningBillExist=Warning, one or more invoice already exist + +# PaymentConditions +PaymentConditionShortRECEP=Immediate +PaymentConditionRECEP=Immediate +PaymentConditionShort30D=30 days +PaymentCondition30D=30 days +PaymentConditionShort30DENDMONTH=30 days end of month +PaymentCondition30DENDMONTH=30 days end of month +PaymentConditionShort60D=60 days +PaymentCondition60D=60 days +PaymentConditionShort60DENDMONTH=60 days end of month +PaymentCondition60DENDMONTH=60 days end of month +PaymentConditionShortPT_DELIVERY=Delivery +PaymentConditionPT_DELIVERY=On delivery +PaymentConditionShortPT_ORDER=On order +PaymentConditionPT_ORDER=On order +PaymentConditionShortPT_5050=50-50 +PaymentConditionPT_5050=50%% in advance, 50%% on delivery +FixAmount=Fix amount +VarAmount=Variable amount (%% tot.) +# PaymentType +PaymentTypeVIR=Bank deposit +PaymentTypeShortVIR=Bank deposit +PaymentTypePRE=Bank's order +PaymentTypeShortPRE=Bank's order +PaymentTypeLIQ=Cash +PaymentTypeShortLIQ=Cash +PaymentTypeCB=Credit card +PaymentTypeShortCB=Credit card +PaymentTypeCHQ=Check +PaymentTypeShortCHQ=Check +PaymentTypeTIP=TIP +PaymentTypeShortTIP=TIP +PaymentTypeVAD=On line payment +PaymentTypeShortVAD=On line payment +PaymentTypeTRA=Bill payment +PaymentTypeShortTRA=Bill +BankDetails=Bank details +BankCode=Bank code +DeskCode=Desk code +BankAccountNumber=Account number +BankAccountNumberKey=Key +Residence=Domiciliation +IBANNumber=IBAN number +IBAN=IBAN +BIC=BIC/SWIFT +BICNumber=BIC/SWIFT number +ExtraInfos=Extra infos +RegulatedOn=Regulated on +ChequeNumber=Check N° +ChequeOrTransferNumber=Check/Transfer N° +ChequeMaker=Check transmitter +ChequeBank=Bank of Check +CheckBank=Check +NetToBePaid=Net to be paid +PhoneNumber=Tel +FullPhoneNumber=Telephone +TeleFax=Fax +PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration. +IntracommunityVATNumber=Intracommunity number of VAT +PaymentByChequeOrderedTo=Check payment (including tax) are payable to %s send to +PaymentByChequeOrderedToShort=Check payment (including tax) are payable to +SendTo=sent to +PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank account +VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI +LawApplicationPart1=By application of the law 80.335 of 12/05/80 +LawApplicationPart2=the goods remain the property of +LawApplicationPart3=the seller until the complete cashing of +LawApplicationPart4=their price. +LimitedLiabilityCompanyCapital=SARL with Capital of +UseLine=Apply +UseDiscount=Use discount +UseCredit=Use credit +UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit +MenuChequeDeposits=Checks deposits +MenuCheques=Checks +MenuChequesReceipts=Checks receipts +NewChequeDeposit=New deposit +ChequesReceipts=Checks receipts +ChequesArea=Checks deposits area +ChequeDeposits=Checks deposits +Cheques=Checks +CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s +UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices +ShowUnpaidAll=Show all unpaid invoices +ShowUnpaidLateOnly=Show late unpaid invoices only +PaymentInvoiceRef=Payment invoice %s +ValidateInvoice=Validate invoice +Cash=Cash +Reported=Delayed +DisabledBecausePayments=Not possible since there are some payments +CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid +ExpectedToPay=Expected payment +PayedByThisPayment=Paid by this payment +ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid. +ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back. +AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid". +ToMakePayment=Pay +ToMakePaymentBack=Pay back +ListOfYourUnpaidInvoices=List of unpaid invoices +NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative. +RevenueStamp=Revenue stamp +YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty +PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template) +TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +##### Types de contacts ##### +TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice +TypeContact_facture_external_BILLING=Customer invoice contact +TypeContact_facture_external_SHIPPING=Customer shipping contact +TypeContact_facture_external_SERVICE=Customer service contact +TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice +TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact +TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_invoice_supplier_external_SERVICE=Supplier service contact +# Situation invoices +InvoiceFirstSituationAsk=First situation invoice +InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice. +InvoiceSituation=Situation invoice +InvoiceSituationAsk=Invoice following the situation +InvoiceSituationDesc=Create a new situation following an already existing one +SituationAmount=Situation invoice amount(net) +SituationDeduction=Situation subtraction +Progress=Progress +ModifyAllLines=Modify all lines +CreateNextSituationInvoice=Create next situation +NotLastInCycle=This invoice in not the last in cycle and must not be modified. +DisabledBecauseNotLastInCycle=The next situation already exists. +DisabledBecauseFinal=This situation is final. +CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. +NoSituations=No opened situations +InvoiceSituationLast=Final and general invoice diff --git a/htdocs/langs/sw_SW/bookmarks.lang b/htdocs/langs/sw_SW/bookmarks.lang new file mode 100644 index 00000000000..7acb946bb62 --- /dev/null +++ b/htdocs/langs/sw_SW/bookmarks.lang @@ -0,0 +1,19 @@ +# Dolibarr language file - Source file is en_US - marque pages +AddThisPageToBookmarks=Add this page to bookmarks +Bookmark=Bookmark +Bookmarks=Bookmarks +NewBookmark=New bookmark +ShowBookmark=Show bookmark +OpenANewWindow=Open a new window +ReplaceWindow=Replace current window +BookmarkTargetNewWindowShort=New window +BookmarkTargetReplaceWindowShort=Current window +BookmarkTitle=Bookmark title +UrlOrLink=URL +BehaviourOnClick=Behaviour when a URL is clicked +CreateBookmark=Create bookmark +SetHereATitleForLink=Set a title for the bookmark +UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL +ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window +BookmarksManagement=Bookmarks management +ListOfBookmarks=List of bookmarks diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang new file mode 100644 index 00000000000..bf118b9b88e --- /dev/null +++ b/htdocs/langs/sw_SW/boxes.lang @@ -0,0 +1,96 @@ +# Dolibarr language file - Source file is en_US - boxes +BoxLastRssInfos=Rss information +BoxLastProducts=Last %s products/services +BoxProductsAlertStock=Products in stock alert +BoxLastProductsInContract=Last %s contracted products/services +BoxLastSupplierBills=Last supplier's invoices +BoxLastCustomerBills=Last customer's invoices +BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices +BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices +BoxLastProposals=Last commercial proposals +BoxLastProspects=Last modified prospects +BoxLastCustomers=Last modified customers +BoxLastSuppliers=Last modified suppliers +BoxLastCustomerOrders=Last customer orders +BoxLastValidatedCustomerOrders=Last validated customer orders +BoxLastBooks=Last books +BoxLastActions=Last actions +BoxLastContracts=Last contracts +BoxLastContacts=Last contacts/addresses +BoxLastMembers=Last members +BoxFicheInter=Last interventions +BoxCurrentAccounts=Opened accounts balance +BoxSalesTurnover=Sales turnover +BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices +BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices +BoxTitleLastBooks=Last %s recorded books +BoxTitleNbOfCustomers=Number of clients +BoxTitleLastRssInfos=Last %s news from %s +BoxTitleLastProducts=Last %s modified products/services +BoxTitleProductsAlertStock=Products in stock alert +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders +BoxTitleLastSuppliers=Last %s recorded suppliers +BoxTitleLastCustomers=Last %s recorded customers +BoxTitleLastModifiedSuppliers=Last %s modified suppliers +BoxTitleLastModifiedCustomers=Last %s modified customers +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals +BoxTitleLastCustomerBills=Last %s customer's invoices +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices +BoxTitleLastSupplierBills=Last %s supplier's invoices +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices +BoxTitleLastModifiedProspects=Last %s modified prospects +BoxTitleLastProductsInContract=Last %s products/services in a contract +BoxTitleLastModifiedMembers=Last %s members +BoxTitleLastFicheInter=Last %s modified intervention +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices +BoxTitleCurrentAccounts=Opened account's balances +BoxTitleSalesTurnover=Sales turnover +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices +BoxTitleLastModifiedContacts=Last %s modified contacts/addresses +BoxMyLastBookmarks=My last %s bookmarks +BoxOldestExpiredServices=Oldest active expired services +BoxLastExpiredServices=Last %s oldest contacts with active expired services +BoxTitleLastActionsToDo=Last %s actions to do +BoxTitleLastContracts=Last %s contracts +BoxTitleLastModifiedDonations=Last %s modified donations +BoxTitleLastModifiedExpenses=Last %s modified expenses +BoxGlobalActivity=Global activity (invoices, proposals, orders) +FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s +LastRefreshDate=Last refresh date +NoRecordedBookmarks=No bookmarks defined. +ClickToAdd=Click here to add. +NoRecordedCustomers=No recorded customers +NoRecordedContacts=No recorded contacts +NoActionsToDo=No actions to do +NoRecordedOrders=No recorded customer's orders +NoRecordedProposals=No recorded proposals +NoRecordedInvoices=No recorded customer's invoices +NoUnpaidCustomerBills=No unpaid customer's invoices +NoRecordedSupplierInvoices=No recorded supplier's invoices +NoUnpaidSupplierBills=No unpaid supplier's invoices +NoModifiedSupplierBills=No recorded supplier's invoices +NoRecordedProducts=No recorded products/services +NoRecordedProspects=No recorded prospects +NoContractedProducts=No products/services contracted +NoRecordedContracts=No recorded contracts +NoRecordedInterventions=No recorded interventions +BoxLatestSupplierOrders=Latest supplier orders +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders +NoSupplierOrder=No recorded supplier order +BoxCustomersInvoicesPerMonth=Customer invoices per month +BoxSuppliersInvoicesPerMonth=Supplier invoices per month +BoxCustomersOrdersPerMonth=Customer orders per month +BoxSuppliersOrdersPerMonth=Supplier orders per month +BoxProposalsPerMonth=Proposals per month +NoTooLowStockProducts=No product under the low stock limit +BoxProductDistribution=Products/Services distribution +BoxProductDistributionFor=Distribution of %s for %s +ForCustomersInvoices=Customers invoices +ForCustomersOrders=Customers orders +ForProposals=Proposals diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang new file mode 100644 index 00000000000..d3dcfb68e64 --- /dev/null +++ b/htdocs/langs/sw_SW/cashdesk.lang @@ -0,0 +1,40 @@ +# Language file - Source file is en_US - cashdesk +CashDeskMenu=Point of sale +CashDesk=Point of sale +CashDesks=Point of sales +CashDeskBank=Bank account +CashDeskBankCash=Bank account (cash) +CashDeskBankCB=Bank account (card) +CashDeskBankCheque=Bank account (cheque) +CashDeskWarehouse=Warehouse +CashdeskShowServices=Selling services +CashDeskProducts=Products +CashDeskStock=Stock +CashDeskOn=on +CashDeskThirdParty=Third party +CashdeskDashboard=Point of sale access +ShoppingCart=Shopping cart +NewSell=New sell +BackOffice=Back office +AddThisArticle=Add this article +RestartSelling=Go back on sell +SellFinished=Sell finished +PrintTicket=Print ticket +NoProductFound=No article found +ProductFound=product found +ProductsFound=products found +NoArticle=No article +Identification=Identification +Article=Article +Difference=Difference +TotalTicket=Total ticket +NoVAT=No VAT for this sale +Change=Excess received +CalTip=Click to view the calendar +CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined
Change stock module setup, or choose a warehouse +BankToPay=Charge Account +ShowCompany=Show company +ShowStock=Show warehouse +DeleteArticle=Click to remove this article +FilterRefOrLabelOrBC=Search (Ref/Label) +UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock. diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang new file mode 100644 index 00000000000..22914931db1 --- /dev/null +++ b/htdocs/langs/sw_SW/categories.lang @@ -0,0 +1,112 @@ +# Dolibarr language file - Source file is en_US - categories +Category=Category +Categories=Categories +Rubrique=Category +Rubriques=Categories +categories=categories +TheCategorie=The category +NoCategoryYet=No category of this type created +In=In +AddIn=Add in +modify=modify +Classify=Classify +CategoriesArea=Categories area +ProductsCategoriesArea=Products/Services categories area +SuppliersCategoriesArea=Suppliers categories area +CustomersCategoriesArea=Customers categories area +ThirdPartyCategoriesArea=Third parties categories area +MembersCategoriesArea=Members categories area +ContactsCategoriesArea=Contacts categories area +MainCats=Main categories +SubCats=Subcategories +CatStatistics=Statistics +CatList=List of categories +AllCats=All categories +ViewCat=View category +NewCat=Add category +NewCategory=New category +ModifCat=Modify category +CatCreated=Category created +CreateCat=Create category +CreateThisCat=Create this category +ValidateFields=Validate the fields +NoSubCat=No subcategory. +SubCatOf=Subcategory +FoundCats=Found categories +FoundCatsForName=Categories found for the name : +FoundSubCatsIn=Subcategories found in the category +ErrSameCatSelected=You selected the same category several times +ErrForgotCat=You forgot to choose the category +ErrForgotField=You forgot to inform the fields +ErrCatAlreadyExists=This name is already used +AddProductToCat=Add this product to a category? +ImpossibleAddCat=Impossible to add the category +ImpossibleAssociateCategory=Impossible to associate the category to +WasAddedSuccessfully=%s was added successfully. +ObjectAlreadyLinkedToCategory=Element is already linked to this category. +CategorySuccessfullyCreated=This category %s has been added with success. +ProductIsInCategories=Product/service owns to following categories +SupplierIsInCategories=Third party owns to following suppliers categories +CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories +CompanyIsInSuppliersCategories=This third party owns to following suppliers categories +MemberIsInCategories=This member owns to following members categories +ContactIsInCategories=This contact owns to following contacts categories +ProductHasNoCategory=This product/service is not in any categories +SupplierHasNoCategory=This supplier is not in any categories +CompanyHasNoCategory=This company is not in any categories +MemberHasNoCategory=This member is not in any categories +ContactHasNoCategory=This contact is not in any categories +ClassifyInCategory=Classify in category +NoneCategory=None +NotCategorized=Without category +CategoryExistsAtSameLevel=This category already exists with this ref +ReturnInProduct=Back to product/service card +ReturnInSupplier=Back to supplier card +ReturnInCompany=Back to customer/prospect card +ContentsVisibleByAll=The contents will be visible by all +ContentsVisibleByAllShort=Contents visible by all +ContentsNotVisibleByAllShort=Contents not visible by all +CategoriesTree=Categories tree +DeleteCategory=Delete category +ConfirmDeleteCategory=Are you sure you want to delete this category ? +RemoveFromCategory=Remove link with categorie +RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? +NoCategoriesDefined=No category defined +SuppliersCategoryShort=Suppliers category +CustomersCategoryShort=Customers category +ProductsCategoryShort=Products category +MembersCategoryShort=Members category +SuppliersCategoriesShort=Suppliers categories +CustomersCategoriesShort=Customers categories +CustomersProspectsCategoriesShort=Custo./Prosp. categories +ProductsCategoriesShort=Products categories +MembersCategoriesShort=Members categories +ContactCategoriesShort=Contacts categories +ThisCategoryHasNoProduct=This category does not contain any product. +ThisCategoryHasNoSupplier=This category does not contain any supplier. +ThisCategoryHasNoCustomer=This category does not contain any customer. +ThisCategoryHasNoMember=This category does not contain any member. +ThisCategoryHasNoContact=This category does not contain any contact. +AssignedToCustomer=Assigned to a customer +AssignedToTheCustomer=Assigned to the customer +InternalCategory=Internal category +CategoryContents=Category contents +CategId=Category id +CatSupList=List of supplier categories +CatCusList=List of customer/prospect categories +CatProdList=List of products categories +CatMemberList=List of members categories +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/sw_SW/commercial.lang b/htdocs/langs/sw_SW/commercial.lang new file mode 100644 index 00000000000..7acdc7bd7e6 --- /dev/null +++ b/htdocs/langs/sw_SW/commercial.lang @@ -0,0 +1,96 @@ +# Dolibarr language file - Source file is en_US - commercial +Commercial=Commercial +CommercialArea=Commercial area +CommercialCard=Commercial card +CustomerArea=Customers area +Customer=Customer +Customers=Customers +Prospect=Prospect +Prospects=Prospects +DeleteAction=Delete an event/task +NewAction=New event/task +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event +Rendez-Vous=Rendezvous +ConfirmDeleteAction=Are you sure you want to delete this event/task ? +CardAction=Event card +PercentDone=Percentage complete +ActionOnCompany=Task about company +ActionOnContact=Task about contact +TaskRDV=Meetings +TaskRDVWith=Meeting with %s +ShowTask=Show task +ShowAction=Show event +ActionsReport=Events report +ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative +SalesRepresentative=Sales representative +SalesRepresentatives=Sales representatives +SalesRepresentativeFollowUp=Sales representative (follow-up) +SalesRepresentativeSignature=Sales representative (signature) +CommercialInterlocutor=Commercial interlocutor +ErrorWrongCode=Wrong code +NoSalesRepresentativeAffected=No particular sales representative assigned +ShowCustomer=Show customer +ShowProspect=Show prospect +ListOfProspects=List of prospects +ListOfCustomers=List of customers +LastDoneTasks=Last %s completed tasks +LastRecordedTasks=Last recorded tasks +LastActionsToDo=Last %s oldest actions not completed +DoneAndToDoActionsFor=Completed and To do events for %s +DoneAndToDoActions=Completed and To do events +DoneActions=Completed events +DoneActionsFor=Completed events for %s +ToDoActions=Incomplete events +ToDoActionsFor=Incomplete events for %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s +StatusNotApplicable=Not applicable +StatusActionToDo=To do +StatusActionDone=Complete +MyActionsAsked=Events I have recorded +MyActionsToDo=Events I have to do +MyActionsDone=Events assigned to me +StatusActionInProcess=In process +TasksHistoryForThisContact=Events for this contact +LastProspectDoNotContact=Do not contact +LastProspectNeverContacted=Never contacted +LastProspectToContact=To contact +LastProspectContactInProcess=Contact in process +LastProspectContactDone=Contact done +DateActionPlanned=Date event planned for +DateActionDone=Date event done +ActionAskedBy=Event reported by +ActionAffectedTo=Event assigned to +ActionDoneBy=Event done by +ActionUserAsk=Reported by +ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%. +ActionAC_TEL=Phone call +ActionAC_FAX=Send fax +ActionAC_PROP=Send proposal by mail +ActionAC_EMAIL=Send Email +ActionAC_RDV=Meetings +ActionAC_INT=Intervention on site +ActionAC_FAC=Send customer invoice by mail +ActionAC_REL=Send customer invoice by mail (reminder) +ActionAC_CLO=Close +ActionAC_EMAILING=Send mass email +ActionAC_COM=Send customer order by mail +ActionAC_SHIP=Send shipping by mail +ActionAC_SUP_ORD=Send supplier order by mail +ActionAC_SUP_INV=Send supplier invoice by mail +ActionAC_OTH=Other +ActionAC_OTH_AUTO=Other (automatically inserted events) +ActionAC_MANUAL=Manually inserted events +ActionAC_AUTO=Automatically inserted events +Stats=Sales statistics +CAOrder=Sales volume (validated orders) +FromTo=from %s to %s +MargeOrder=Margins (validated orders) +RecapAnnee=Summary of the year +NoData=There is no data +StatusProsp=Prospect status +DraftPropals=Draft commercial proposals +SearchPropal=Search a commercial proposal +CommercialDashboard=Commercial summary diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang new file mode 100644 index 00000000000..8abf1fd1c5a --- /dev/null +++ b/htdocs/langs/sw_SW/companies.lang @@ -0,0 +1,414 @@ +# Dolibarr language file - Source file is en_US - companies +ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one. +ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one. +ErrorSetACountryFirst=Set the country first +SelectThirdParty=Select a third party +DeleteThirdParty=Delete a third party +ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ? +DeleteContact=Delete a contact/address +ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ? +MenuNewThirdParty=New third party +MenuNewCompany=New company +MenuNewCustomer=New customer +MenuNewProspect=New prospect +MenuNewSupplier=New supplier +MenuNewPrivateIndividual=New private individual +MenuSocGroup=Groups +NewCompany=New company (prospect, customer, supplier) +NewThirdParty=New third party (prospect, customer, supplier) +NewSocGroup=New company group +NewPrivateIndividual=New private individual (prospect, customer, supplier) +CreateDolibarrThirdPartySupplier=Create a third party (supplier) +ProspectionArea=Prospection area +SocGroup=Group of companies +IdThirdParty=Id third party +IdCompany=Company Id +IdContact=Contact Id +Contacts=Contacts/Addresses +ThirdPartyContacts=Third party contacts +ThirdPartyContact=Third party contact/address +StatusContactValidated=Status of contact/address +Company=Company +CompanyName=Company name +Companies=Companies +CountryIsInEEC=Country is inside European Economic Community +ThirdPartyName=Third party name +ThirdParty=Third party +ThirdParties=Third parties +ThirdPartyAll=Third parties (all) +ThirdPartyProspects=Prospects +ThirdPartyProspectsStats=Prospects +ThirdPartyCustomers=Customers +ThirdPartyCustomersStats=Customers +ThirdPartyCustomersWithIdProf12=Customers with %s or %s +ThirdPartySuppliers=Suppliers +ThirdPartyType=Third party type +Company/Fundation=Company/Foundation +Individual=Private individual +ToCreateContactWithSameName=Will create automatically a physical contact with same informations +ParentCompany=Parent company +Subsidiary=Subsidiary +Subsidiaries=Subsidiaries +NoSubsidiary=No subsidiary +ReportByCustomers=Report by customers +ReportByQuarter=Report by rate +CivilityCode=Civility code +RegisteredOffice=Registered office +Name=Name +Lastname=Last name +Firstname=First name +PostOrFunction=Post/Function +UserTitle=Title +Surname=Surname/Pseudo +Address=Address +State=State/Province +Region=Region +Country=Country +CountryCode=Country code +CountryId=Country id +Phone=Phone +Skype=Skype +Call=Call +Chat=Chat +PhonePro=Prof. phone +PhonePerso=Pers. phone +PhoneMobile=Mobile +No_Email=Don't send mass e-mailings +Fax=Fax +Zip=Zip Code +Town=City +Web=Web +Poste= Position +DefaultLang=Language by default +VATIsUsed=VAT is used +VATIsNotUsed=VAT is not used +CopyAddressFromSoc=Fill address with thirdparty address +NoEmailDefined=There is no email defined +##### Local Taxes ##### +LocalTax1IsUsedES= RE is used +LocalTax1IsNotUsedES= RE is not used +LocalTax2IsUsedES= IRPF is used +LocalTax2IsNotUsedES= IRPF is not used +LocalTax1ES=RE +LocalTax2ES=IRPF +TypeLocaltax1ES=RE Type +TypeLocaltax2ES=IRPF Type +TypeES=Type +ThirdPartyEMail=%s +WrongCustomerCode=Customer code invalid +WrongSupplierCode=Supplier code invalid +CustomerCodeModel=Customer code model +SupplierCodeModel=Supplier code model +Gencod=Bar code +##### Professional ID ##### +ProfId1Short=Prof. id 1 +ProfId2Short=Prof. id 2 +ProfId3Short=Prof. id 3 +ProfId4Short=Prof. id 4 +ProfId5Short=Prof. id 5 +ProfId6Short=Prof. id 5 +ProfId1=Professional ID 1 +ProfId2=Professional ID 2 +ProfId3=Professional ID 3 +ProfId4=Professional ID 4 +ProfId5=Professional ID 5 +ProfId6=Professional ID 6 +ProfId1AR=Prof Id 1 (CUIT/CUIL) +ProfId2AR=Prof Id 2 (Revenu brutes) +ProfId3AR=- +ProfId4AR=- +ProfId5AR=- +ProfId6AR=- +ProfId1AU=Prof Id 1 (ABN) +ProfId2AU=- +ProfId3AU=- +ProfId4AU=- +ProfId5AU=- +ProfId6AU=- +ProfId1BE=Prof Id 1 (Professional number) +ProfId2BE=- +ProfId3BE=- +ProfId4BE=- +ProfId5BE=- +ProfId6BE=- +ProfId1BR=- +ProfId2BR=IE (Inscricao Estadual) +ProfId3BR=IM (Inscricao Municipal) +ProfId4BR=CPF +#ProfId5BR=CNAE +#ProfId6BR=INSS +ProfId1CH=- +ProfId2CH=- +ProfId3CH=Prof Id 1 (Federal number) +ProfId4CH=Prof Id 2 (Commercial Record number) +ProfId5CH=- +ProfId6CH=- +ProfId1CL=Prof Id 1 (R.U.T.) +ProfId2CL=- +ProfId3CL=- +ProfId4CL=- +ProfId5CL=- +ProfId6CL=- +ProfId1CO=Prof Id 1 (R.U.T.) +ProfId2CO=- +ProfId3CO=- +ProfId4CO=- +ProfId5CO=- +ProfId6CO=- +ProfId1DE=Prof Id 1 (USt.-IdNr) +ProfId2DE=Prof Id 2 (USt.-Nr) +ProfId3DE=Prof Id 3 (Handelsregister-Nr.) +ProfId4DE=- +ProfId5DE=- +ProfId6DE=- +ProfId1ES=Prof Id 1 (CIF/NIF) +ProfId2ES=Prof Id 2 (Social security number) +ProfId3ES=Prof Id 3 (CNAE) +ProfId4ES=Prof Id 4 (Collegiate number) +ProfId5ES=- +ProfId6ES=- +ProfId1FR=Prof Id 1 (SIREN) +ProfId2FR=Prof Id 2 (SIRET) +ProfId3FR=Prof Id 3 (NAF, old APE) +ProfId4FR=Prof Id 4 (RCS/RM) +ProfId5FR=- +ProfId6FR=- +ProfId1GB=Registration Number +ProfId2GB=- +ProfId3GB=SIC +ProfId4GB=- +ProfId5GB=- +ProfId6GB=- +ProfId1HN=Id prof. 1 (RTN) +ProfId2HN=- +ProfId3HN=- +ProfId4HN=- +ProfId5HN=- +ProfId6HN=- +ProfId1IN=Prof Id 1 (TIN) +ProfId2IN=Prof Id 2 (PAN) +ProfId3IN=Prof Id 3 (SRVC TAX) +ProfId4IN=Prof Id 4 +ProfId5IN=Prof Id 5 +ProfId6IN=- +ProfId1MA=Id prof. 1 (R.C.) +ProfId2MA=Id prof. 2 (Patente) +ProfId3MA=Id prof. 3 (I.F.) +ProfId4MA=Id prof. 4 (C.N.S.S.) +ProfId5MA=- +ProfId6MA=- +ProfId1MX=Prof Id 1 (R.F.C). +ProfId2MX=Prof Id 2 (R..P. IMSS) +ProfId3MX=Prof Id 3 (Profesional Charter) +ProfId4MX=- +ProfId5MX=- +ProfId6MX=- +ProfId1NL=KVK nummer +ProfId2NL=- +ProfId3NL=- +ProfId4NL=Burgerservicenummer (BSN) +ProfId5NL=- +ProfId6NL=- +ProfId1PT=Prof Id 1 (NIPC) +ProfId2PT=Prof Id 2 (Social security number) +ProfId3PT=Prof Id 3 (Commercial Record number) +ProfId4PT=Prof Id 4 (Conservatory) +ProfId5PT=- +ProfId6PT=- +ProfId1SN=RC +ProfId2SN=NINEA +ProfId3SN=- +ProfId4SN=- +ProfId5SN=- +ProfId6SN=- +ProfId1TN=Prof Id 1 (RC) +ProfId2TN=Prof Id 2 (Fiscal matricule) +ProfId3TN=Prof Id 3 (Douane code) +ProfId4TN=Prof Id 4 (BAN) +ProfId5TN=- +ProfId6TN=- +ProfId1RU=Prof Id 1 (OGRN) +ProfId2RU=Prof Id 2 (INN) +ProfId3RU=Prof Id 3 (KPP) +ProfId4RU=Prof Id 4 (OKPO) +ProfId5RU=- +ProfId6RU=- +VATIntra=VAT number +VATIntraShort=VAT number +VATIntraVeryShort=VAT +VATIntraSyntaxIsValid=Syntax is valid +VATIntraValueIsValid=Value is valid +ProspectCustomer=Prospect / Customer +Prospect=Prospect +CustomerCard=Customer Card +Customer=Customer +CustomerDiscount=Customer Discount +CustomerRelativeDiscount=Relative customer discount +CustomerAbsoluteDiscount=Absolute customer discount +CustomerRelativeDiscountShort=Relative discount +CustomerAbsoluteDiscountShort=Absolute discount +CompanyHasRelativeDiscount=This customer has a default discount of %s%% +CompanyHasNoRelativeDiscount=This customer has no relative discount by default +CompanyHasAbsoluteDiscount=This customer still has discount credits or deposits for %s %s +CompanyHasCreditNote=This customer still has credit notes for %s %s +CompanyHasNoAbsoluteDiscount=This customer has no discount credit available +CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users) +CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself) +DefaultDiscount=Default discount +AvailableGlobalDiscounts=Absolute discounts available +DiscountNone=None +Supplier=Supplier +CompanyList=Company's list +AddContact=Create contact +AddContactAddress=Create contact/address +EditContact=Edit contact +EditContactAddress=Edit contact/address +Contact=Contact +ContactsAddresses=Contacts/Addresses +NoContactDefinedForThirdParty=No contact defined for this third party +NoContactDefined=No contact defined +DefaultContact=Default contact/address +AddCompany=Create company +AddThirdParty=Create third party +DeleteACompany=Delete a company +PersonalInformations=Personal data +AccountancyCode=Accountancy code +CustomerCode=Customer code +SupplierCode=Supplier code +CustomerAccount=Customer account +SupplierAccount=Supplier account +CustomerCodeDesc=Customer code, unique for all customers +SupplierCodeDesc=Supplier code, unique for all suppliers +RequiredIfCustomer=Required if third party is a customer or prospect +RequiredIfSupplier=Required if third party is a supplier +ValidityControledByModule=Validity controled by module +ThisIsModuleRules=This is rules for this module +LastProspect=Last +ProspectToContact=Prospect to contact +CompanyDeleted=Company "%s" deleted from database. +ListOfContacts=List of contacts/addresses +ListOfContactsAddresses=List of contacts/adresses +ListOfProspectsContacts=List of prospect contacts +ListOfCustomersContacts=List of customer contacts +ListOfSuppliersContacts=List of supplier contacts +ListOfCompanies=List of companies +ListOfThirdParties=List of third parties +ShowCompany=Show company +ShowContact=Show contact +ContactsAllShort=All (No filter) +ContactType=Contact type +ContactForOrders=Order's contact +ContactForProposals=Proposal's contact +ContactForContracts=Contract's contact +ContactForInvoices=Invoice's contact +NoContactForAnyOrder=This contact is not a contact for any order +NoContactForAnyProposal=This contact is not a contact for any commercial proposal +NoContactForAnyContract=This contact is not a contact for any contract +NoContactForAnyInvoice=This contact is not a contact for any invoice +NewContact=New contact +NewContactAddress=New contact/address +LastContacts=Last contacts +MyContacts=My contacts +Phones=Phones +Capital=Capital +CapitalOf=Capital of %s +EditCompany=Edit company +EditDeliveryAddress=Edit delivery address +ThisUserIsNot=This user is not a prospect, customer nor supplier +VATIntraCheck=Check +VATIntraCheckDesc=The link %s allows to ask the european VAT checker service. An external internet access from server is required for this service to work. +VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do +VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site +VATIntraManualCheck=You can also check manually from european web site %s +ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). +NorProspectNorCustomer=Nor prospect, nor customer +JuridicalStatus=Juridical status +Staff=Staff +ProspectLevelShort=Potential +ProspectLevel=Prospect potential +ContactPrivate=Private +ContactPublic=Shared +ContactVisibility=Visibility +OthersNotLinkedToThirdParty=Others, not linked to a third party +ProspectStatus=Prospect status +PL_NONE=None +PL_UNKNOWN=Unknown +PL_LOW=Low +PL_MEDIUM=Medium +PL_HIGH=High +TE_UNKNOWN=- +TE_STARTUP=Startup +TE_GROUP=Large company +TE_MEDIUM=Medium company +TE_ADMIN=Governmental +TE_SMALL=Small company +TE_RETAIL=Retailer +TE_WHOLE=Wholetailer +TE_PRIVATE=Private individual +TE_OTHER=Other +StatusProspect-1=Do not contact +StatusProspect0=Never contacted +StatusProspect1=To contact +StatusProspect2=Contact in process +StatusProspect3=Contact done +ChangeDoNotContact=Change status to 'Do not contact' +ChangeNeverContacted=Change status to 'Never contacted' +ChangeToContact=Change status to 'To contact' +ChangeContactInProcess=Change status to 'Contact in process' +ChangeContactDone=Change status to 'Contact done' +ProspectsByStatus=Prospects by status +BillingContact=Billing contact +NbOfAttachedFiles=Number of attached files +AttachANewFile=Attach a new file +NoRIB=No BAN defined +NoParentCompany=None +ExportImport=Import-Export +ExportCardToFormat=Export card to format +ContactNotLinkedToCompany=Contact not linked to any third party +DolibarrLogin=Dolibarr login +NoDolibarrAccess=No Dolibarr access +ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ExportDataset_company_2=Contacts and properties +ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes +ImportDataset_company_3=Bank details +PriceLevel=Price level +DeliveriesAddress=Delivery addresses +DeliveryAddress=Delivery address +DeliveryAddressLabel=Delivery address label +DeleteDeliveryAddress=Delete a delivery address +ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address? +NewDeliveryAddress=New delivery address +AddDeliveryAddress=Create address +AddAddress=Create address +NoOtherDeliveryAddress=No alternative delivery address defined +SupplierCategory=Supplier category +JuridicalStatus200=Independant +DeleteFile=Delete file +ConfirmDeleteFile=Are you sure you want to delete this file? +AllocateCommercial=Assigned to sale representative +SelectCountry=Select a country +SelectCompany=Select a third party +Organization=Organization +AutomaticallyGenerated=Automatically generated +FiscalYearInformation=Information on the fiscal year +FiscalMonthStart=Starting month of the fiscal year +YouMustCreateContactFirst=You must create emails contacts for third party first to be able to add emails notifications. +ListSuppliersShort=List of suppliers +ListProspectsShort=List of prospects +ListCustomersShort=List of customers +ThirdPartiesArea=Third parties and contact area +LastModifiedThirdParties=Last %s modified third parties +UniqueThirdParties=Total of unique third parties +InActivity=Open +ActivityCeased=Closed +ActivityStateFilter=Activity status +ProductsIntoElements=List of products into %s +CurrentOutstandingBill=Current outstanding bill +OutstandingBill=Max. for outstanding bill +OutstandingBillReached=Reached max. for outstanding bill +MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. +LeopardNumRefModelDesc=The code is free. This code can be modified at any time. +ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang new file mode 100644 index 00000000000..0d579a06ff1 --- /dev/null +++ b/htdocs/langs/sw_SW/compta.lang @@ -0,0 +1,207 @@ +# Dolibarr language file - Source file is en_US - compta +Accountancy=Accountancy +AccountancyCard=Accountancy card +Treasury=Treasury +MenuFinancial=Financial +TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation +TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation +OptionMode=Option for accountancy +OptionModeTrue=Option Incomes-Expenses +OptionModeVirtual=Option Claims-Debts +OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices. +OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output. +FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration) +VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup. +LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. +Param=Setup +RemainingAmountPayment=Amount payment remaining : +AmountToBeCharged=Total amount to pay : +AccountsGeneral=Accounts +Account=Account +Accounts=Accounts +Accountparent=Account parent +Accountsparent=Accounts parent +BillsForSuppliers=Bills for suppliers +Income=Income +Outcome=Expense +ReportInOut=Income / Expense +ReportTurnover=Turnover +PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party +PaymentsNotLinkedToUser=Payments not linked to any user +Profit=Profit +AccountingResult=Accounting result +Balance=Balance +Debit=Debit +Credit=Credit +Piece=Accounting Doc. +Withdrawal=Withdrawal +Withdrawals=Withdrawals +AmountHTVATRealReceived=Net collected +AmountHTVATRealPaid=Net paid +VATToPay=VAT sells +VATReceived=VAT received +VATToCollect=VAT purchases +VATSummary=VAT Balance +LT2SummaryES=IRPF Balance +LT1SummaryES=RE Balance +VATPaid=VAT paid +SalaryPaid=Salary paid +LT2PaidES=IRPF Paid +LT1PaidES=RE Paid +LT2CustomerES=IRPF sales +LT2SupplierES=IRPF purchases +LT1CustomerES=RE sales +LT1SupplierES=RE purchases +VATCollected=VAT collected +ToPay=To pay +ToGet=To get back +SpecialExpensesArea=Area for all special payments +TaxAndDividendsArea=Tax, social contributions and dividends area +SocialContribution=Social contribution +SocialContributions=Social contributions +MenuSpecialExpenses=Special expenses +MenuTaxAndDividends=Taxes and dividends +MenuSalaries=Salaries +MenuSocialContributions=Social contributions +MenuNewSocialContribution=New contribution +NewSocialContribution=New social contribution +ContributionsToPay=Contributions to pay +AccountancyTreasuryArea=Accountancy/Treasury area +AccountancySetup=Accountancy setup +NewPayment=New payment +Payments=Payments +PaymentCustomerInvoice=Customer invoice payment +PaymentSupplierInvoice=Supplier invoice payment +PaymentSocialContribution=Social contribution payment +PaymentVat=VAT payment +PaymentSalary=Salary payment +ListPayment=List of payments +ListOfPayments=List of payments +ListOfCustomerPayments=List of customer payments +ListOfSupplierPayments=List of supplier payments +DatePayment=Payment date +DateStartPeriod=Date start period +DateEndPeriod=Date end period +NewVATPayment=New VAT payment +newLT2PaymentES=New IRPF payment +newLT1PaymentES=New RE payment +LT2PaymentES=IRPF Payment +LT2PaymentsES=IRPF Payments +LT1PaymentES=RE Payment +LT1PaymentsES=RE Payments +VATPayment=VAT Payment +VATPayments=VAT Payments +SocialContributionsPayments=Social contributions payments +ShowVatPayment=Show VAT payment +TotalToPay=Total to pay +TotalVATReceived=Total VAT received +CustomerAccountancyCode=Customer accountancy code +SupplierAccountancyCode=Supplier accountancy code +AccountNumberShort=Account number +AccountNumber=Account number +NewAccount=New account +SalesTurnover=Sales turnover +SalesTurnoverMinimum=Minimum sales turnover +ByThirdParties=By third parties +ByUserAuthorOfInvoice=By invoice author +AccountancyExport=Accountancy export +ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s +SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. +CheckReceipt=Check deposit +CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts +NewCheckReceipt=New discount +NewCheckDeposit=New check deposit +NewCheckDepositOn=Create receipt for deposit on account: %s +NoWaitingChecks=No checks waiting for deposit. +DateChequeReceived=Check reception date +NbOfCheques=Nb of checks +PaySocialContribution=Pay a social contribution +ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid? +DeleteSocialContribution=Delete a social contribution +ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution? +ExportDataset_tax_1=Social contributions and payments +CalcModeVATDebt=Mode %sVAT on commitment accounting%s. +CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s. +CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting. +CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting +CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s +CalcModeLT1Debt=Mode %sRE on customer invoices%s +CalcModeLT1Rec= Mode %sRE on suppliers invoices%s +CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s +CalcModeLT2Debt=Mode %sIRPF on customer invoices%s +CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s +AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary +AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary +AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode %sClaims-Debts%s said Commitment accounting. +AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode %sIncomes-Expenses%s said cash accounting. +SeeReportInInputOutputMode=See report %sIncomes-Expenses%s said cash accounting for a calculation on actual payments made +SeeReportInDueDebtMode=See report %sClaims-Debts%s said commitment accounting for a calculation on issued invoices +RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included +RulesResultDue=- It includes outstanding invoices, expenses and VAT whether they are paid or not.
- It is based on the validation date of invoices and VAT and on the due date for expenses. +RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT.
- It is based on the payment dates of the invoices, expenses and VAT. +RulesCADue=- It includes the client's due invoices whether they are paid or not.
- It is based on the validation date of these invoices.
+RulesCAIn=- It includes all the effective payments of invoices received from clients.
- It is based on the payment date of these invoices
+DepositsAreNotIncluded=- Deposit invoices are nor included +DepositsAreIncluded=- Deposit invoices are included +LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF +LT1ReportByCustomersInInputOutputModeES=Report by third party RE +VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid +VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid +VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid +LT1ReportByQuartersInInputOutputMode=Report by RE rate +LT2ReportByQuartersInInputOutputMode=Report by IRPF rate +VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid +LT1ReportByQuartersInDueDebtMode=Report by RE rate +LT2ReportByQuartersInDueDebtMode=Report by IRPF rate +SeeVATReportInInputOutputMode=See report %sVAT encasement%s for a standard calculation +SeeVATReportInDueDebtMode=See report %sVAT on flow%s for a calculation with an option on the flow +RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment. +RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date. +RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date. +RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date. +OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair. +PercentOfInvoice=%%/invoice +NotUsedForGoods=Not used on goods +ProposalStats=Statistics on proposals +OrderStats=Statistics on orders +InvoiceStats=Statistics on bills +Dispatch=Dispatching +Dispatched=Dispatched +ToDispatch=To dispatch +ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer +SellsJournal=Sales Journal +PurchasesJournal=Purchases Journal +DescSellsJournal=Sales Journal +DescPurchasesJournal=Purchases Journal +InvoiceRef=Invoice ref. +CodeNotDef=Not defined +AddRemind=Dispatch available amount +RemainToDivide= Remain to dispatch : +WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module. +DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date. +Pcg_version=Pcg version +Pcg_type=Pcg type +Pcg_subtype=Pcg subtype +InvoiceLinesToDispatch=Invoice lines to dispatch +InvoiceDispatched=Dispatched invoices +AccountancyDashboard=Accountancy summary +ByProductsAndServices=By products and services +RefExt=External ref +ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". +LinkedOrder=Link to order +ReCalculate=Recalculate +Mode1=Method 1 +Mode2=Method 2 +CalculationRuleDesc=To calculate total VAT, there is two methods:
Method 1 is rounding vat on each line, then summing them.
Method 2 is summing all vat on each line, then rounding result.
Final result may differs from few cents. Default mode is mode %s. +CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier. +TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). +CalculationMode=Calculation mode +AccountancyJournal=Accountancy code journal +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/sw_SW/contracts.lang b/htdocs/langs/sw_SW/contracts.lang new file mode 100644 index 00000000000..d1be0e6513f --- /dev/null +++ b/htdocs/langs/sw_SW/contracts.lang @@ -0,0 +1,103 @@ +# Dolibarr language file - Source file is en_US - contracts +ContractsArea=Contracts area +ListOfContracts=List of contracts +LastModifiedContracts=Last %s modified contracts +AllContracts=All contracts +ContractCard=Contract card +ContractStatus=Contract status +ContractStatusNotRunning=Not running +ContractStatusRunning=Running +ContractStatusDraft=Draft +ContractStatusValidated=Validated +ContractStatusClosed=Closed +ServiceStatusInitial=Not running +ServiceStatusRunning=Running +ServiceStatusNotLate=Running, not expired +ServiceStatusNotLateShort=Not expired +ServiceStatusLate=Running, expired +ServiceStatusLateShort=Expired +ServiceStatusClosed=Closed +ServicesLegend=Services legend +Contracts=Contracts +ContractsAndLine=Contracts and line of contracts +Contract=Contract +NoContracts=No contracts +MenuServices=Services +MenuInactiveServices=Services not active +MenuRunningServices=Running services +MenuExpiredServices=Expired services +MenuClosedServices=Closed services +NewContract=New contract +AddContract=Create contract +SearchAContract=Search a contract +DeleteAContract=Delete a contract +CloseAContract=Close a contract +ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ? +ConfirmValidateContract=Are you sure you want to validate this contract under name %s ? +ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract ? +ConfirmCloseService=Are you sure you want to close this service with date %s ? +ValidateAContract=Validate a contract +ActivateService=Activate service +ConfirmActivateService=Are you sure you want to activate this service with date %s ? +RefContract=Contract reference +DateContract=Contract date +DateServiceActivate=Service activation date +DateServiceUnactivate=Service deactivation date +DateServiceStart=Date for beginning of service +DateServiceEnd=Date for end of service +ShowContract=Show contract +ListOfServices=List of services +ListOfInactiveServices=List of not active services +ListOfExpiredServices=List of expired active services +ListOfClosedServices=List of closed services +ListOfRunningContractsLines=List of running contract lines +ListOfRunningServices=List of running services +NotActivatedServices=Inactive services (among validated contracts) +BoardNotActivatedServices=Services to activate among validated contracts +LastContracts=Last %s contracts +LastActivatedServices=Last %s activated services +LastModifiedServices=Last %s modified services +EditServiceLine=Edit service line +ContractStartDate=Start date +ContractEndDate=End date +DateStartPlanned=Planned start date +DateStartPlannedShort=Planned start date +DateEndPlanned=Planned end date +DateEndPlannedShort=Planned end date +DateStartReal=Real start date +DateStartRealShort=Real start date +DateEndReal=Real end date +DateEndRealShort=Real end date +NbOfServices=Nb of services +CloseService=Close service +ServicesNomberShort=%s service(s) +RunningServices=Running services +BoardRunningServices=Expired running services +ServiceStatus=Status of service +DraftContracts=Drafts contracts +CloseRefusedBecauseOneServiceActive=Contract can't be closed as ther is at least one open service on it +CloseAllContracts=Close all contract lines +DeleteContractLine=Delete a contract line +ConfirmDeleteContractLine=Are you sure you want to delete this contract line ? +MoveToAnotherContract=Move service into another contract. +ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract. +ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ? +PaymentRenewContractId=Renew contract line (number %s) +ExpiredSince=Expiration date +RelatedContracts=Related contracts +NoExpiredServices=No expired active services +ListOfServicesToExpireWithDuration=List of Services to expire in %s days +ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days +ListOfServicesToExpire=List of Services to expire +NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. +StandardContractsTemplate=Standard contracts template +ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. + +##### Types de contacts ##### +TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract +TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract +TypeContact_contrat_external_BILLING=Billing customer contact +TypeContact_contrat_external_CUSTOMER=Follow-up customer contact +TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact +Error_CONTRACT_ADDON_NotDefined=Constant CONTRACT_ADDON not defined diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang new file mode 100644 index 00000000000..28dfc7770b2 --- /dev/null +++ b/htdocs/langs/sw_SW/cron.lang @@ -0,0 +1,87 @@ +# Dolibarr language file - Source file is en_US - cron +# About page +About = About +CronAbout = About Cron +CronAboutPage = Cron about page +# Right +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task +# Admin +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes +CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes +# Menu +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs +# Page list +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job +CronNone= None +CronDtStart=Start date +CronDtEnd=End date +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe +CronMethod=Method +CronModule=Module +CronAction=Action +CronStatus=Status +CronStatusActive=Enabled +CronStatusInactive=Disabled +CronNoJobs=No jobs registered +CronPriority=Priority +CronLabel=Description +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished +#Page card +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create +CronArgs=Parameters +CronSaveSucess=Save succesfully +CronNote=Comment +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable +CronStatusInactiveBtn=Disable +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. +# Info +CronInfoPage=Information +# Common +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/sw_SW/deliveries.lang b/htdocs/langs/sw_SW/deliveries.lang new file mode 100644 index 00000000000..d711c3704b4 --- /dev/null +++ b/htdocs/langs/sw_SW/deliveries.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - deliveries +Delivery=Delivery +Deliveries=Deliveries +DeliveryCard=Delivery card +DeliveryOrder=Delivery order +DeliveryOrders=Delivery orders +DeliveryDate=Delivery date +DeliveryDateShort=Deliv. date +CreateDeliveryOrder=Generate delivery order +QtyDelivered=Qty delivered +SetDeliveryDate=Set shipping date +ValidateDeliveryReceipt=Validate delivery receipt +ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt ? +DeleteDeliveryReceipt=Delete delivery receipt +DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt %s ? +DeliveryMethod=Delivery method +TrackingNumber=Tracking number +DeliveryNotValidated=Delivery not validated +# merou PDF model +NameAndSignature=Name and Signature : +ToAndDate=To___________________________________ on ____/_____/__________ +GoodStatusDeclaration=Have received the goods above in good condition, +Deliverer=Deliverer : +Sender=Sender +Recipient=Recipient +ErrorStockIsNotEnough=There's not enough stock +Shippable=Shippable +NonShippable=Not Shippable diff --git a/htdocs/langs/sw_SW/dict.lang b/htdocs/langs/sw_SW/dict.lang new file mode 100644 index 00000000000..bef1f4821b4 --- /dev/null +++ b/htdocs/langs/sw_SW/dict.lang @@ -0,0 +1,327 @@ +# Dolibarr language file - Source file is en_US - dict +CountryFR=France +CountryBE=Belgium +CountryIT=Italy +CountryES=Spain +CountryDE=Germany +CountryCH=Switzerland +CountryGB=Great Britain +CountryUK=United Kingdom +CountryIE=Ireland +CountryCN=China +CountryTN=Tunisia +CountryUS=United States +CountryMA=Morocco +CountryDZ=Algeria +CountryCA=Canada +CountryTG=Togo +CountryGA=Gabon +CountryNL=Netherlands +CountryHU=Hungary +CountryRU=Russia +CountrySE=Sweden +CountryCI=Ivoiry Coast +CountrySN=Senegal +CountryAR=Argentina +CountryCM=Cameroon +CountryPT=Portugal +CountrySA=Saudi Arabia +CountryMC=Monaco +CountryAU=Australia +CountrySG=Singapore +CountryAF=Afghanistan +CountryAX=Åland Islands +CountryAL=Albania +CountryAS=American Samoa +CountryAD=Andorra +CountryAO=Angola +CountryAI=Anguilla +CountryAQ=Antarctica +CountryAG=Antigua and Barbuda +CountryAM=Armenia +CountryAW=Aruba +CountryAT=Austria +CountryAZ=Azerbaijan +CountryBS=Bahamas +CountryBH=Bahrain +CountryBD=Bangladesh +CountryBB=Barbados +CountryBY=Belarus +CountryBZ=Belize +CountryBJ=Benin +CountryBM=Bermuda +CountryBT=Bhutan +CountryBO=Bolivia +CountryBA=Bosnia and Herzegovina +CountryBW=Botswana +CountryBV=Bouvet Island +CountryBR=Brazil +CountryIO=British Indian Ocean Territory +CountryBN=Brunei Darussalam +CountryBG=Bulgaria +CountryBF=Burkina Faso +CountryBI=Burundi +CountryKH=Cambodia +CountryCV=Cape Verde +CountryKY=Cayman Islands +CountryCF=Central African Republic +CountryTD=Chad +CountryCL=Chile +CountryCX=Christmas Island +CountryCC=Cocos (Keeling) Islands +CountryCO=Colombia +CountryKM=Comoros +CountryCG=Congo +CountryCD=Congo, The Democratic Republic of the +CountryCK=Cook Islands +CountryCR=Costa Rica +CountryHR=Croatia +CountryCU=Cuba +CountryCY=Cyprus +CountryCZ=Czech Republic +CountryDK=Denmark +CountryDJ=Djibouti +CountryDM=Dominica +CountryDO=Dominican Republic +CountryEC=Ecuador +CountryEG=Egypt +CountrySV=El Salvador +CountryGQ=Equatorial Guinea +CountryER=Eritrea +CountryEE=Estonia +CountryET=Ethiopia +CountryFK=Falkland Islands +CountryFO=Faroe Islands +CountryFJ=Fiji Islands +CountryFI=Finland +CountryGF=French Guiana +CountryPF=French Polynesia +CountryTF=French Southern Territories +CountryGM=Gambia +CountryGE=Georgia +CountryGH=Ghana +CountryGI=Gibraltar +CountryGR=Greece +CountryGL=Greenland +CountryGD=Grenada +CountryGP=Guadeloupe +CountryGU=Guam +CountryGT=Guatemala +CountryGN=Guinea +CountryGW=Guinea-Bissau +CountryGY=Guyana +CountryHT=Haïti +CountryHM=Heard Island and McDonald +CountryVA=Holy See (Vatican City State) +CountryHN=Honduras +CountryHK=Hong Kong +CountryIS=Icelande +CountryIN=India +CountryID=Indonesia +CountryIR=Iran +CountryIQ=Iraq +CountryIL=Israel +CountryJM=Jamaica +CountryJP=Japan +CountryJO=Jordan +CountryKZ=Kazakhstan +CountryKE=Kenya +CountryKI=Kiribati +CountryKP=North Korea +CountryKR=South Korea +CountryKW=Kuwait +CountryKG=Kyrghyztan +CountryLA=Lao +CountryLV=Latvia +CountryLB=Lebanon +CountryLS=Lesotho +CountryLR=Liberia +CountryLY=Libyan +CountryLI=Liechtenstein +CountryLT=Lituania +CountryLU=Luxembourg +CountryMO=Macao +CountryMK=Macedonia, the former Yugoslav of +CountryMG=Madagascar +CountryMW=Malawi +CountryMY=Malaysia +CountryMV=Maldives +CountryML=Mali +CountryMT=Malta +CountryMH=Marshall Islands +CountryMQ=Martinique +CountryMR=Mauritania +CountryMU=Mauritius +CountryYT=Mayotte +CountryMX=Mexico +CountryFM=Micronesia +CountryMD=Moldova +CountryMN=Mongolia +CountryMS=Monserrat +CountryMZ=Mozambique +CountryMM=Birmania (Myanmar) +CountryNA=Namibia +CountryNR=Nauru +CountryNP=Nepal +CountryAN=Netherlands Antilles +CountryNC=New Caledonia +CountryNZ=New Zealand +CountryNI=Nicaragua +CountryNE=Niger +CountryNG=Nigeria +CountryNU=Niue +CountryNF=Norfolk Island +CountryMP=Northern Mariana Islands +CountryNO=Norway +CountryOM=Oman +CountryPK=Pakistan +CountryPW=Palau +CountryPS=Palestinian Territory, Occupied +CountryPA=Panama +CountryPG=Papua New Guinea +CountryPY=Paraguay +CountryPE=Peru +CountryPH=Philippines +CountryPN=Pitcairn Islands +CountryPL=Poland +CountryPR=Puerto Rico +CountryQA=Qatar +CountryRE=Reunion +CountryRO=Romania +CountryRW=Rwanda +CountrySH=Saint Helena +CountryKN=Saint Kitts and Nevis +CountryLC=Saint Lucia +CountryPM=Saint Pierre and Miquelon +CountryVC=Saint Vincent and Grenadines +CountryWS=Samoa +CountrySM=San Marino +CountryST=Sao Tome and Principe +CountryRS=Serbia +CountrySC=Seychelles +CountrySL=Sierra Leone +CountrySK=Slovakia +CountrySI=Slovenia +CountrySB=Solomon Islands +CountrySO=Somalia +CountryZA=South Africa +CountryGS=South Georgia and the South Sandwich Islands +CountryLK=Sri Lanka +CountrySD=Sudan +CountrySR=Suriname +CountrySJ=Svalbard and Jan Mayen +CountrySZ=Swaziland +CountrySY=Syrian +CountryTW=Taiwan +CountryTJ=Tajikistan +CountryTZ=Tanzania +CountryTH=Thailand +CountryTL=Timor-Leste +CountryTK=Tokelau +CountryTO=Tonga +CountryTT=Trinidad and Tobago +CountryTR=Turkey +CountryTM=Turkmenistan +CountryTC=Turks and Cailos Islands +CountryTV=Tuvalu +CountryUG=Uganda +CountryUA=Ukraine +CountryAE=United Arab Emirates +CountryUM=United States Minor Outlying Islands +CountryUY=Uruguay +CountryUZ=Uzbekistan +CountryVU=Vanuatu +CountryVE=Venezuela +CountryVN=Viet Nam +CountryVG=Virgin Islands, British +CountryVI=Virgin Islands, U.S. +CountryWF=Wallis and Futuna +CountryEH=Western Sahara +CountryYE=Yemen +CountryZM=Zambia +CountryZW=Zimbabwe +CountryGG=Guernsey +CountryIM=Isle of Man +CountryJE=Jersey +CountryME=Montenegro +CountryBL=Saint Barthelemy +CountryMF=Saint Martin + +##### Civilities ##### +CivilityMME=Mrs. +CivilityMR=Mr. +CivilityMLE=Ms. +CivilityMTRE=Master +CivilityDR=Doctor +##### Currencies ##### +Currencyeuros=Euros +CurrencyAUD=AU Dollars +CurrencySingAUD=AU Dollar +CurrencyCAD=CAN Dollars +CurrencySingCAD=CAN Dollar +CurrencyCHF=Swiss Francs +CurrencySingCHF=Swiss Franc +CurrencyEUR=Euros +CurrencySingEUR=Euro +CurrencyFRF=French Francs +CurrencySingFRF=French Franc +CurrencyGBP=GB Pounds +CurrencySingGBP=GB Pound +CurrencyINR=Indian rupees +CurrencySingINR=Indian rupee +CurrencyMAD=Dirham +CurrencySingMAD=Dirham +CurrencyMGA=Ariary +CurrencySingMGA=Ariary +CurrencyMUR=Mauritius rupees +CurrencySingMUR=Mauritius rupee +CurrencyNOK=Norwegian krones +CurrencySingNOK=Norwegian krone +CurrencyTND=Tunisian dinars +CurrencySingTND=Tunisian dinar +CurrencyUSD=US Dollars +CurrencySingUSD=US Dollar +CurrencyUAH=Hryvnia +CurrencySingUAH=Hryvnia +CurrencyXAF=CFA Francs BEAC +CurrencySingXAF=CFA Franc BEAC +CurrencyXOF=CFA Francs BCEAO +CurrencySingXOF=CFA Franc BCEAO +CurrencyXPF=CFP Francs +CurrencySingXPF=CFP Franc +CurrencyCentSingEUR=cent +CurrencyCentINR=paisa +CurrencyCentSingINR=paise +CurrencyThousandthSingTND=thousandth +#### Input reasons ##### +DemandReasonTypeSRC_INTE=Internet +DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign +DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign +DemandReasonTypeSRC_CAMP_PHO=Phone campaign +DemandReasonTypeSRC_CAMP_FAX=Fax campaign +DemandReasonTypeSRC_COMM=Commercial contact +DemandReasonTypeSRC_SHOP=Shop contact +DemandReasonTypeSRC_WOM=Word of mouth +DemandReasonTypeSRC_PARTNER=Partner +DemandReasonTypeSRC_EMPLOYEE=Employee +DemandReasonTypeSRC_SPONSORING=Sponsorship +#### Paper formats #### +PaperFormatEU4A0=Format 4A0 +PaperFormatEU2A0=Format 2A0 +PaperFormatEUA0=Format A0 +PaperFormatEUA1=Format A1 +PaperFormatEUA2=Format A2 +PaperFormatEUA3=Format A3 +PaperFormatEUA4=Format A4 +PaperFormatEUA5=Format A5 +PaperFormatEUA6=Format A6 +PaperFormatUSLETTER=Format Letter US +PaperFormatUSLEGAL=Format Legal US +PaperFormatUSEXECUTIVE=Format Executive US +PaperFormatUSLEDGER=Format Ledger/Tabloid +PaperFormatCAP1=Format P1 Canada +PaperFormatCAP2=Format P2 Canada +PaperFormatCAP3=Format P3 Canada +PaperFormatCAP4=Format P4 Canada +PaperFormatCAP5=Format P5 Canada +PaperFormatCAP6=Format P6 Canada diff --git a/htdocs/langs/sw_SW/donations.lang b/htdocs/langs/sw_SW/donations.lang new file mode 100644 index 00000000000..f7aed91cf81 --- /dev/null +++ b/htdocs/langs/sw_SW/donations.lang @@ -0,0 +1,38 @@ +# Dolibarr language file - Source file is en_US - donations +Donation=Donation +Donations=Donations +DonationRef=Donation ref. +Donor=Donor +Donors=Donors +AddDonation=Create a donation +NewDonation=New donation +ShowDonation=Show donation +DonationPromise=Gift promise +PromisesNotValid=Not validated promises +PromisesValid=Validated promises +DonationsPaid=Donations paid +DonationsReceived=Donations received +PublicDonation=Public donation +DonationsNumber=Donation number +DonationsArea=Donations area +DonationStatusPromiseNotValidated=Draft promise +DonationStatusPromiseValidated=Validated promise +DonationStatusPaid=Donation received +DonationStatusPromiseNotValidatedShort=Draft +DonationStatusPromiseValidatedShort=Validated +DonationStatusPaidShort=Received +ValidPromess=Validate promise +DonationReceipt=Donation receipt +BuildDonationReceipt=Build receipt +DonationsModels=Documents models for donation receipts +LastModifiedDonations=Last %s modified donations +SearchADonation=Search a donation +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/sw_SW/ecm.lang b/htdocs/langs/sw_SW/ecm.lang new file mode 100644 index 00000000000..4a1931a3217 --- /dev/null +++ b/htdocs/langs/sw_SW/ecm.lang @@ -0,0 +1,57 @@ +# Dolibarr language file - Source file is en_US - ecm +MenuECM=Documents +DocsMine=My documents +DocsGenerated=Generated documents +DocsElements=Elements documents +DocsThirdParties=Documents third parties +DocsContracts=Documents contracts +DocsProposals=Documents proposals +DocsOrders=Documents orders +DocsInvoices=Documents invoices +ECMNbOfDocs=Nb of documents in directory +ECMNbOfDocsSmall=Nb of doc. +ECMSection=Directory +ECMSectionManual=Manual directory +ECMSectionAuto=Automatic directory +ECMSectionsManual=Manual tree +ECMSectionsAuto=Automatic tree +ECMSections=Directories +ECMRoot=Root +ECMNewSection=New directory +ECMAddSection=Add directory +ECMNewDocument=New document +ECMCreationDate=Creation date +ECMNbOfFilesInDir=Number of files in directory +ECMNbOfSubDir=Number of sub-directories +ECMNbOfFilesInSubDir=Number of files in sub-directories +ECMCreationUser=Creator +ECMArea=EDM area +ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr. +ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.
* Manual directories can be used to save documents not linked to a particular element. +ECMSectionWasRemoved=Directory %s has been deleted. +ECMDocumentsSection=Document of directory +ECMSearchByKeywords=Search by keywords +ECMSearchByEntity=Search by object +ECMSectionOfDocuments=Directories of documents +ECMTypeManual=Manual +ECMTypeAuto=Automatic +ECMDocsBySocialContributions=Documents linked to social contributions +ECMDocsByThirdParties=Documents linked to third parties +ECMDocsByProposals=Documents linked to proposals +ECMDocsByOrders=Documents linked to customers orders +ECMDocsByContracts=Documents linked to contracts +ECMDocsByInvoices=Documents linked to customers invoices +ECMDocsByProducts=Documents linked to products +ECMDocsByProjects=Documents linked to projects +ECMDocsByUsers=Documents linked to users +ECMDocsByInterventions=Documents linked to interventions +ECMNoDirectoryYet=No directory created +ShowECMSection=Show directory +DeleteSection=Remove directory +ConfirmDeleteSection=Can you confirm you want to delete the directory %s ? +ECMDirectoryForFiles=Relative directory for files +CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files +ECMFileManager=File manager +ECMSelectASection=Select a directory on left tree... +DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory. + diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang new file mode 100644 index 00000000000..700e6344d7d --- /dev/null +++ b/htdocs/langs/sw_SW/errors.lang @@ -0,0 +1,183 @@ +# Dolibarr language file - Source file is en_US - errors + +# No errors +NoErrorCommitIsDone=No error, we commit +# Errors +Error=Error +Errors=Errors +ErrorButCommitIsDone=Errors found but we validate despite this +ErrorBadEMail=EMail %s is wrong +ErrorBadUrl=Url %s is wrong +ErrorLoginAlreadyExists=Login %s already exists. +ErrorGroupAlreadyExists=Group %s already exists. +ErrorRecordNotFound=Record not found. +ErrorFailToCopyFile=Failed to copy file '%s' into '%s'. +ErrorFailToRenameFile=Failed to rename file '%s' into '%s'. +ErrorFailToDeleteFile=Failed to remove file '%s'. +ErrorFailToCreateFile=Failed to create file '%s'. +ErrorFailToRenameDir=Failed to rename directory '%s' into '%s'. +ErrorFailToCreateDir=Failed to create directory '%s'. +ErrorFailToDeleteDir=Failed to delete directory '%s'. +ErrorFailedToDeleteJoinedFiles=Can not delete environment because there is some joined files. Remove join files first. +ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type. +ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only. +ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different. +ErrorBadThirdPartyName=Bad value for third party name +ErrorProdIdIsMandatory=The %s is mandatory +ErrorBadCustomerCodeSyntax=Bad syntax for customer code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. +ErrorCustomerCodeRequired=Customer code required +ErrorBarCodeRequired=Bar code required +ErrorCustomerCodeAlreadyUsed=Customer code already used +ErrorBarCodeAlreadyUsed=Bar code already used +ErrorPrefixRequired=Prefix required +ErrorUrlNotValid=The website address is incorrect +ErrorBadSupplierCodeSyntax=Bad syntax for supplier code +ErrorSupplierCodeRequired=Supplier code required +ErrorSupplierCodeAlreadyUsed=Supplier code already used +ErrorBadParameters=Bad parameters +ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) +ErrorBadDateFormat=Value '%s' has wrong date format +ErrorWrongDate=Date is not correct! +ErrorFailedToWriteInDir=Failed to write in directory %s +ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s) +ErrorUserCannotBeDelete=User can not be deleted. May be it is associated on Dolibarr entities. +ErrorFieldsRequired=Some required fields were not filled. +ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter safe_mode is enabled on this PHP, check that Dolibarr php files owns to web server user (or group). +ErrorNoMailDefinedForThisUser=No mail defined for this user +ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display. +ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'. +ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id. +ErrorFileNotFound=File %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) +ErrorDirNotFound=Directory %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) +ErrorFunctionNotAvailableInPHP=Function %s is required for this feature but is not available in this version/setup of PHP. +ErrorDirAlreadyExists=A directory with this name already exists. +ErrorFileAlreadyExists=A file with this name already exists. +ErrorPartialFile=File not received completely by server. +ErrorNoTmpDir=Temporary directy %s does not exists. +ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin. +ErrorFileSizeTooLarge=File size is too large. +ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum) +ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum) +ErrorNoValueForSelectType=Please fill value for select list +ErrorNoValueForCheckBoxType=Please fill value for checkbox list +ErrorNoValueForRadioType=Please fill value for radio list +ErrorBadFormatValueList=The list value cannot have more than one come : %s, but need at least one: llave,valores +ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters. +ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters. +ErrorNoAccountancyModuleLoaded=No accountancy module activated +ErrorExportDuplicateProfil=This profile name already exists for this export set. +ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete. +ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors. +ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled. +ErrorRefAlreadyExists=Ref used for creation already exists. +ErrorPleaseTypeBankTransactionReportName=Please type bank receipt name where transaction is reported (Format YYYYMM or YYYYMMDD) +ErrorRecordHasChildren=Failed to delete records since it has some childs. +ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object. +ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display. +ErrorPasswordsMustMatch=Both typed passwords must match each other +ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. +ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) +ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) +ErrorsOnXLines=Errors on %s source record(s) +ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) +ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s" +ErrorDatabaseParameterWrong=Database setup parameter '%s' has a value not compatible to use Dolibarr (must have value '%s'). +ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module. +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Setup - Modules to complete. +ErrorBadMask=Error on mask +ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number +ErrorBadMaskBadRazMonth=Error, bad reset value +ErrorMaxNumberReachForThisMask=Max number reach for this mask +ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits +ErrorSelectAtLeastOne=Error. Select at least one entry. +ErrorProductWithRefNotExist=Product with reference '%s' don't exist +ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated +ErrorProdIdAlreadyExist=%s is assigned to another third +ErrorFailedToSendPassword=Failed to send password +ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information. +ErrorPasswordDiffers=Passwords differs, please type them again. +ErrorForbidden=Access denied.
You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user. +ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s. +ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...). +ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display. +ErrorRecordAlreadyExists=Record already exists +ErrorCantReadFile=Failed to read file '%s' +ErrorCantReadDir=Failed to read directory '%s' +ErrorFailedToFindEntity=Failed to read environment '%s' +ErrorBadLoginPassword=Bad value for login or password +ErrorLoginDisabled=Your account has been disabled +ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP Safe Mode is enabled, check that command is inside a directory defined by parameter safe_mode_exec_dir. +ErrorFailedToChangePassword=Failed to change password +ErrorLoginDoesNotExists=User with login %s could not be found. +ErrorLoginHasNoEmail=This user has no email address. Process aborted. +ErrorBadValueForCode=Bad value for security code. Try again with new value... +ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative +ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that +ErrorNoActivatedBarcode=No barcode type activated +ErrUnzipFails=Failed to unzip %s with ZipArchive +ErrNoZipEngine=No engine to unzip %s file in this PHP +ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package +ErrorFileRequired=It takes a package Dolibarr file +ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal +ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base +ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base +ErrorNewValueCantMatchOldValue=New value can't be equal to old one +ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process. +ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start'). +ErrorFailedToAddContact=Failed to add contact +ErrorDateMustBeBeforeToday=The date can not be greater than today +ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode. +ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature. +ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s +ErrorWarehouseMustDiffers=Source and target warehouses must differs +ErrorBadFormat=Bad format! +ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. +ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' +ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action + +# Warnings +WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined +WarningSafeModeOnCheckExecDir=Warning, PHP option safe_mode is on so command must be stored inside a directory declared by php parameter safe_mode_exec_dir. +WarningAllowUrlFopenMustBeOn=Parameter allow_url_fopen must be set to on in filer php.ini for having this module working completely. You must modify this file manually. +WarningBuildScriptNotRunned=Script %s was not yet ran to build graphics, or there is no data to show. +WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists. +WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this. +WarningConfFileMustBeReadOnly=Warning, your config file (htdocs/conf/conf.php) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe. +WarningsOnXLines=Warnings on %s source record(s) +WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be choosed by default until you check your module setup. +WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file install.lock into directory %s. Missing this file is a security hole. +WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup). +WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution. +WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box. +WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). +WarningNotRelevant=Irrelevant operation for this dataset +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/sw_SW/exports.lang b/htdocs/langs/sw_SW/exports.lang new file mode 100644 index 00000000000..d79df485608 --- /dev/null +++ b/htdocs/langs/sw_SW/exports.lang @@ -0,0 +1,134 @@ +# Dolibarr language file - Source file is en_US - exports +ExportsArea=Exports area +ImportArea=Import area +NewExport=New export +NewImport=New import +ExportableDatas=Exportable dataset +ImportableDatas=Importable dataset +SelectExportDataSet=Choose dataset you want to export... +SelectImportDataSet=Choose dataset you want to import... +SelectExportFields=Choose fields you want to export, or select a predefined export profile +SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile: +NotImportedFields=Fields of source file not imported +SaveExportModel=Save this export profile if you plan to reuse it later... +SaveImportModel=Save this import profile if you plan to reuse it later... +ExportModelName=Export profile name +ExportModelSaved=Export profile saved under name %s. +ExportableFields=Exportable fields +ExportedFields=Exported fields +ImportModelName=Import profile name +ImportModelSaved=Import profile saved under name %s. +ImportableFields=Importable fields +ImportedFields=Imported fields +DatasetToExport=Dataset to export +DatasetToImport=Import file into dataset +NoDiscardedFields=No fields in source file are discarded +Dataset=Dataset +ChooseFieldsOrdersAndTitle=Choose fields order... +FieldsOrder=Fields order +FieldsTitle=Fields title +FieldOrder=Field order +FieldTitle=Field title +ChooseExportFormat=Choose export format +NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file... +AvailableFormats=Available formats +LibraryShort=Library +LibraryUsed=Library used +LibraryVersion=Version +Step=Step +FormatedImport=Import assistant +FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge. +FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load. +FormatedExport=Export assistant +FormatedExportDesc1=This area allows to export personalized data, using an assistant to help you in process without technical knowledge. +FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order. +FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to. +Sheet=Sheet +NoImportableData=No importable data (no module with definitions to allow data imports) +FileSuccessfullyBuilt=Export file generated +SQLUsedForExport=SQL Request used to build export file +LineId=Id of line +LineDescription=Description of line +LineUnitPrice=Unit price of line +LineVATRate=VAT Rate of line +LineQty=Quantity for line +LineTotalHT=Amount net of tax for line +LineTotalTTC=Amount with tax for line +LineTotalVAT=Amount of VAT for line +TypeOfLineServiceOrProduct=Type of line (0=product, 1=service) +FileWithDataToImport=File with data to import +FileToImport=Source file to import +FileMustHaveOneOfFollowingFormat=File to import must have one of following format +DownloadEmptyExample=Download example of empty source file +ChooseFormatOfFileToImport=Choose file format to use as import file format by clicking on picto %s to select it... +ChooseFileToImport=Upload file then click on picto %s to select file as source import file... +SourceFileFormat=Source file format +FieldsInSourceFile=Fields in source file +FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory) +Field=Field +NoFields=No fields +MoveField=Move field column number %s +ExampleOfImportFile=Example_of_import_file +SaveImportProfile=Save this import profile +ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name. +ImportSummary=Import setup summary +TablesTarget=Targeted tables +FieldsTarget=Targeted fields +TableTarget=Targeted table +FieldTarget=Targeted field +FieldSource=Source field +DoNotImportFirstLine=Do not import first line of source file +NbOfSourceLines=Number of lines in source file +NowClickToTestTheImport=Check import parameters you have defined. If they are correct, click on button "%s" to launch a simulation of import process (no data will be changed in your database, it's only a simulation for the moment)... +RunSimulateImportFile=Launch the import simulation +FieldNeedSource=This field requires data from the source file +SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file +InformationOnSourceFile=Information on source file +InformationOnTargetTables=Information on target fields +SelectAtLeastOneField=Switch at least one source field in the column of fields to export +SelectFormat=Choose this import file format +RunImportFile=Launch import file +NowClickToRunTheImport=Check result of import simulation. If everything is ok, launch the definitive import. +DataLoadedWithId=All data will be loaded with the following import id: %s +ErrorMissingMandatoryValue=Mandatory data is empty in source file for field %s. +TooMuchErrors=There is still %s other source lines with errors but output has been limited. +TooMuchWarnings=There is still %s other source lines with warnings but output has been limited. +EmptyLine=Empty line (will be discarded) +CorrectErrorBeforeRunningImport=You must first correct all errors before running definitive import. +FileWasImported=File was imported with number %s. +YouCanUseImportIdToFindRecord=You can find all imported records in your database by filtering on field import_key='%s'. +NbOfLinesOK=Number of lines with no errors and no warnings: %s. +NbOfLinesImported=Number of lines successfully imported: %s. +DataComeFromNoWhere=Value to insert comes from nowhere in source file. +DataComeFromFileFieldNb=Value to insert comes from field number %s in source file. +DataComeFromIdFoundFromRef=Value that comes from field number %s of source file will be used to find id of parent object to use (So the objet %s that has the ref. from source file must exists into Dolibarr). +DataComeFromIdFoundFromCodeId=Code that comes from field number %s of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary %s). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases. +DataIsInsertedInto=Data coming from source file will be inserted into the following field: +DataIDSourceIsInsertedInto=The id of parent object found using the data in source file, will be inserted into the following field: +DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field: +SourceRequired=Data value is mandatory +SourceExample=Example of possible data value +ExampleAnyRefFoundIntoElement=Any ref found for element %s +ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s +CSVFormatDesc=Comma Separated Value file format (.csv).
This is a text file format where fields are separated by separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ]. +Excel95FormatDesc=Excel file format (.xls)
This is native Excel 95 format (BIFF5). +Excel2007FormatDesc=Excel file format (.xlsx)
This is native Excel 2007 format (SpreadsheetML). +TsvFormatDesc=Tab Separated Value file format (.tsv)
This is a text file format where fields are separated by a tabulator [tab]. +ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ). +CsvOptions=Csv Options +Separator=Separator +Enclosure=Enclosure +SuppliersProducts=Suppliers Products +BankCode=Bank code +DeskCode=Desk code +BankAccountNumber=Account number +BankAccountNumberKey=Key +SpecialCode=Special code +ExportStringFilter=%% allows replacing one or more characters in the text +ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days +ExportNumericFilter='NNNNN' filters by one value
'NNNNN+NNNNN' filters over a range of values
'>NNNNN' filters by lower values
'>NNNNN' filters by higher values +## filters +SelectFilterFields=If you want to filter on some values, just input values here. +FilterableFields=Champs Filtrables +FilteredFields=Filtered fields +FilteredFieldsValues=Value for filter diff --git a/htdocs/langs/sw_SW/externalsite.lang b/htdocs/langs/sw_SW/externalsite.lang new file mode 100644 index 00000000000..da4853df0df --- /dev/null +++ b/htdocs/langs/sw_SW/externalsite.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - externalsite +ExternalSiteSetup=Setup link to external website +ExternalSiteURL=External Site URL +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/sw_SW/ftp.lang b/htdocs/langs/sw_SW/ftp.lang new file mode 100644 index 00000000000..9984ce689ee --- /dev/null +++ b/htdocs/langs/sw_SW/ftp.lang @@ -0,0 +1,12 @@ +# Dolibarr language file - Source file is en_US - ftp +FTPClientSetup=FTP Client module setup +NewFTPClient=New FTP connection setup +FTPArea=FTP Area +FTPAreaDesc=This screen show you content of a FTP server view +SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete +FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions +FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s) +FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password +FTPFailedToRemoveFile=Failed to remove file %s. +FTPFailedToRemoveDir=Failed to remove directory %s (Check permissions and that directory is empty). +FTPPassiveMode=Passive mode diff --git a/htdocs/langs/sw_SW/help.lang b/htdocs/langs/sw_SW/help.lang new file mode 100644 index 00000000000..1bbd6e94f03 --- /dev/null +++ b/htdocs/langs/sw_SW/help.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - help +CommunitySupport=Forum/Wiki support +EMailSupport=Emails support +RemoteControlSupport=Online real time / remote support +OtherSupport=Other support +ToSeeListOfAvailableRessources=To contact/see available resources: +ClickHere=Click here +HelpCenter=Help center +DolibarrHelpCenter=Dolibarr help and support center +ToGoBackToDolibarr=Otherwise, click here to use Dolibarr +TypeOfSupport=Source of support +TypeSupportCommunauty=Community (free) +TypeSupportCommercial=Commercial +TypeOfHelp=Type +NeedHelpCenter=Need help or support ? +Efficiency=Efficiency +TypeHelpOnly=Help only +TypeHelpDev=Help+Development +TypeHelpDevForm=Help+Development+Formation +ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on %s web site: +ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button +ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests. +BackToHelpCenter=Otherwise, click here to go back to help center home page. +LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated): +PossibleLanguages=Supported languages +MakeADonation=Help Dolibarr project, make a donation +SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation +SeeOfficalSupport=For official Dolibarr support in your language:
%s diff --git a/htdocs/langs/sw_SW/holiday.lang b/htdocs/langs/sw_SW/holiday.lang new file mode 100644 index 00000000000..f5b87fefb08 --- /dev/null +++ b/htdocs/langs/sw_SW/holiday.lang @@ -0,0 +1,148 @@ +# Dolibarr language file - Source file is en_US - holiday +HRM=HRM +Holidays=Leaves +CPTitreMenu=Leaves +MenuReportMonth=Monthly statement +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request +Employe=Employee +DateDebCP=Start date +DateFinCP=End date +DateCreateCP=Creation date +DraftCP=Draft +ToReviewCP=Awaiting approval +ApprovedCP=Approved +CancelCP=Canceled +RefuseCP=Refused +ValidatorCP=Approbator +ListeCP=List of leaves +ReviewedByCP=Will be reviewed by +DescCP=Description +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. +ErrorEndDateCP=You must select an end date greater than the start date. +ErrorSQLCreateCP=An SQL error occurred during the creation: +ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ReturnCP=Return to previous page +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request +InfosWorkflowCP=Information Workflow +RequestByCP=Requested by +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed +EditCP=Edit +DeleteCP=Delete +ActionValidCP=Validate +ActionRefuseCP=Refuse +ActionCancelCP=Cancel +StatutCP=Status +SendToValidationCP=Send to validation +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. +CantUpdate=You cannot update this leave request. +NoDateDebut=You must select a start date. +NoDateFin=You must select an end date. +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request +ConfirmValidCP=Are you sure you want to approve the leave request? +DateValidCP=Date approved +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? +TitleRefuseCP=Refuse the leave request +ConfirmRefuseCP=Are you sure you want to refuse the leave request? +NoMotifRefuseCP=You must choose a reason for refusing the request. +TitleCancelCP=Cancel the leave request +ConfirmCancelCP=Are you sure you want to cancel the leave request? +DetailRefusCP=Reason for refusal +DateRefusCP=Date of refusal +DateCancelCP=Date of cancellation +DefineEventUserCP=Assign an exceptional leave for a user +addEventToUserCP=Assign leave +MotifCP=Reason +UserCP=User +ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. +AddEventToUserOkCP=The addition of the exceptional leave has been completed. +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days +ActionByCP=Performed by +UserUpdateCP=For the user +PrevSoldeCP=Previous Balance +NewSoldeCP=New Balance +alreadyCPexist=A leave request has already been done on this period. +UserName=Name +Employee=Employee +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation +HolidaysMonthlyUpdate=Monthly update +ManualUpdate=Manual update +HolidaysCancelation=Leave request cancelation + +## Configuration du Module ## +ConfCP=Configuration of leave request module +DescOptionCP=Description of the option +ValueOptionCP=Value +GroupToValidateCP=Group with the ability to approve leave requests +ConfirmConfigCP=Validate the configuration +LastUpdateCP=Last automatic update of leaves allocation +UpdateConfCPOK=Updated successfully. +ErrorUpdateConfCP=An error occurred during the update, please try again. +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of leave request +TitleOptionEventCP=Settings of leave requets for events +ValidEventCP=Validate +UpdateEventCP=Update events +CreateEventCP=Create +NameEventCP=Event name +OkCreateEventCP=The addition of the event went well. +ErrorCreateEventCP=Error creating the event. +UpdateEventOkCP=The update of the event went well. +ErrorUpdateEventCP=Error while updating the event. +DeleteEventCP=Delete Event +DeleteEventOkCP=The event has been deleted. +ErrorDeleteEventCP=Error while deleting the event. +TitleDeleteEventCP=Delete a exceptional leave +TitleCreateEventCP=Create a exceptional leave +TitleUpdateEventCP=Edit or delete a exceptional leave +DeleteEventOptionCP=Delete +UpdateEventOptionCP=Update +ErrorMailNotSend=An error occurred while sending email: +NoCPforMonth=No leave this month. +nbJours=Number days +TitleAdminCP=Configuration of Leaves +#Messages +Hello=Hello +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang new file mode 100644 index 00000000000..dcd8df6e7db --- /dev/null +++ b/htdocs/langs/sw_SW/install.lang @@ -0,0 +1,214 @@ +# Dolibarr language file - Source file is en_US - install +InstallEasy=Just follow the instructions step by step. +MiscellaneousChecks=Prerequisites check +DolibarrWelcome=Welcome to Dolibarr +ConfFileExists=Configuration file %s exists. +ConfFileDoesNotExists=Configuration file %s does not exist ! +ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file %s does not exist and could not be created ! +ConfFileCouldBeCreated=Configuration file %s could be created. +ConfFileIsNotWritable=Configuration file %s is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS). +ConfFileIsWritable=Configuration file %s is writable. +ConfFileReload=Reload all information from configuration file. +PHPSupportSessions=This PHP supports sessions. +PHPSupportPOSTGETOk=This PHP supports variables POST and GET. +PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter variables_order in php.ini. +PHPSupportGD=This PHP support GD graphical functions. +PHPSupportUTF8=This PHP support UTF8 functions. +PHPMemoryOK=Your PHP max session memory is set to %s. This should be enough. +PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This should be too low. Change your php.ini to set memory_limit parameter to at least %s bytes. +Recheck=Click here for a more significative test +ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup. +ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available. +ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr. +ErrorDirDoesNotExists=Directory %s does not exist. +ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters. +ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'. +ErrorFailedToCreateDatabase=Failed to create database '%s'. +ErrorFailedToConnectToDatabase=Failed to connect to database '%s'. +ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required. +ErrorPHPVersionTooLow=PHP version too old. Version %s is required. +WarningPHPVersionTooLow=PHP version too old. Version %s or more is expected. This version should allow install but is not supported. +ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found. +ErrorDatabaseAlreadyExists=Database '%s' already exists. +IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database". +IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option. +WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded. +PHPVersion=PHP Version +YouCanContinue=You can continue... +PleaseBePatient=Please be patient... +License=Using license +ConfigurationFile=Configuration file +WebPagesDirectory=Directory where web pages are stored +DocumentsDirectory=Directory to store uploaded and generated documents +URLRoot=URL Root +ForceHttps=Force secure connections (https) +CheckToForceHttps=Check this option to force secure connections (https).
This requires that the web server is configured with an SSL certificate. +DolibarrDatabase=Dolibarr Database +DatabaseChoice=Database choice +DatabaseType=Database type +DriverType=Driver type +Server=Server +ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server +ServerPortDescription=Database server port. Keep empty if unknown. +DatabaseServer=Database server +DatabaseName=Database name +DatabasePrefix=Database prefix table +Login=Login +AdminLogin=Login for Dolibarr database owner. +Password=Password +PasswordAgain=Retype password a second time +AdminPassword=Password for Dolibarr database owner. +CreateDatabase=Create database +CreateUser=Create owner +DatabaseSuperUserAccess=Database server - Superuser access +CheckToCreateDatabase=Check box if database does not exist and must be created.
In this case, you must fill the login/password for superuser account at the bottom of this page. +CheckToCreateUser=Check box if database owner does not exist and must be created.
In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists. +Experimental=(experimental) +DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists. +KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this) +SaveConfigurationFile=Save values +ConfigurationSaving=Saving configuration file +ServerConnection=Server connection +DatabaseConnection=Database connection +DatabaseCreation=Database creation +UserCreation=User creation +CreateDatabaseObjects=Database objects creation +ReferenceDataLoading=Reference data loading +TablesAndPrimaryKeysCreation=Tables and Primary keys creation +CreateTableAndPrimaryKey=Create table %s +CreateOtherKeysForTable=Create foreign keys and indexes for table %s +OtherKeysCreation=Foreign keys and indexes creation +FunctionsCreation=Functions creation +AdminAccountCreation=Administrator login creation +PleaseTypePassword=Please type a password, empty passwords are not allowed ! +PleaseTypeALogin=Please type a login ! +PasswordsMismatch=Passwords differs, please try again ! +SetupEnd=End of setup +SystemIsInstalled=This installation is complete. +SystemIsUpgraded=Dolibarr has been upgraded successfully. +YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below: +AdminLoginCreatedSuccessfuly=Dolibarr administrator login '%s' created successfuly. +GoToDolibarr=Go to Dolibarr +GoToSetupArea=Go to Dolibarr (setup area) +MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again. +GoToUpgradePage=Go to upgrade page again +Examples=Examples +WithNoSlashAtTheEnd=Without the slash "/" at the end +DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages. +LoginAlreadyExists=Already exists +DolibarrAdminLogin=Dolibarr admin login +AdminLoginAlreadyExists=Dolibarr administrator account '%s' already exists. Go back, if you want to create another one. +WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called install.lock into Dolibarr document directory, in order to avoid malicious use of it. +ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to access database type %s +FunctionNotAvailableInThisPHP=Not available on this PHP +MigrateScript=Migration script +ChoosedMigrateScript=Choose migration script +DataMigration=Data migration +DatabaseMigration=Structure database migration +ProcessMigrateScript=Script processing +ChooseYourSetupMode=Choose your setup mode and click "Start"... +FreshInstall=Fresh install +FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode. +Upgrade=Upgrade +UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data. +Start=Start +InstallNotAllowed=Setup not allowed by conf.php permissions +NotAvailable=Not available +YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process. +CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page. +AlreadyDone=Already migrated +DatabaseVersion=Database version +ServerVersion=Database server version +YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it. +CharsetChoice=Character set choice +CharacterSetClient=Character set used for generated HTML web pages +CharacterSetClientComment=Choose character set for web display.
Default proposed character set is the one of your database. +DBSortingCollation=Character sorting order +DBSortingCollationComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.
This parameter can't be defined if database already exists. +CharacterSetDatabase=Character set for database +CharacterSetDatabaseComment=Choose character set wanted for database creation.
This parameter can't be defined if database already exists. +YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. +YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. +BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong. +OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s +RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue. +KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do. +KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do. +KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do. +KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do. +FieldRenamed=Field renamed +IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user" +ErrorConnection=Server "%s", database name "%s", login "%s", or database password may be wrong or PHP client version may be too old compared to database version. +InstallChoiceRecommanded=Recommended choice to install version %s from your current version %s +InstallChoiceSuggested=Install choice suggested by installer. +MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished. +CheckThatDatabasenameIsCorrect=Check that database name "%s" is correct. +IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database". +OpenBaseDir=PHP openbasedir parameter +YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form). +YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form). +NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing. +MigrationCustomerOrderShipping=Migrate shipping for customer orders storage +MigrationShippingDelivery=Upgrade storage of shipping +MigrationShippingDelivery2=Upgrade storage of shipping 2 +MigrationFinished=Migration finished +LastStepDesc=Last step: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others. +ActivateModule=Activate module %s +ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) +WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) + +######### +# upgrade +MigrationFixData=Fix for denormalized data +MigrationOrder=Data migration for customer's orders +MigrationSupplierOrder=Data migration for supplier's orders +MigrationProposal=Data migration for commercial proposals +MigrationInvoice=Data migration for customer's invoices +MigrationContract=Data migration for contracts +MigrationSuccessfullUpdate=Upgrade successful +MigrationUpdateFailed=Failed upgrade process +MigrationRelationshipTables=Data migration for relationship tables (%s) +MigrationPaymentsUpdate=Payment data correction +MigrationPaymentsNumberToUpdate=%s payment(s) to update +MigrationProcessPaymentUpdate=Update payment(s) %s +MigrationPaymentsNothingToUpdate=No more things to do +MigrationPaymentsNothingUpdatable=No more payments that can be corrected +MigrationContractsUpdate=Contract data correction +MigrationContractsNumberToUpdate=%s contract(s) to update +MigrationContractsLineCreation=Create contract line for contract ref %s +MigrationContractsNothingToUpdate=No more things to do +MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do. +MigrationContractsEmptyDatesUpdate=Contract empty date correction +MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfuly +MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct +MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct +MigrationContractsInvalidDatesUpdate=Bad value date contract correction +MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s) +MigrationContractsInvalidDatesNumber=%s contracts modified +MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct +MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction +MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done succesfuly +MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct +MigrationReopeningContracts=Open contract closed by error +MigrationReopenThisContract=Reopen contract %s +MigrationReopenedContractsNumber=%s contracts modified +MigrationReopeningContractsNothingToUpdate=No closed contract to open +MigrationBankTransfertsUpdate=Update links between bank transaction and a bank transfer +MigrationBankTransfertsNothingToUpdate=All links are up to date +MigrationShipmentOrderMatching=Sendings receipt update +MigrationDeliveryOrderMatching=Delivery receipt update +MigrationDeliveryDetail=Delivery update +MigrationStockDetail=Update stock value of products +MigrationMenusDetail=Update dynamic menus tables +MigrationDeliveryAddress=Update delivery address in shipments +MigrationProjectTaskActors=Data migration for llx_projet_task_actors table +MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact +MigrationProjectTaskTime=Update time spent in seconds +MigrationActioncommElement=Update data on actions +MigrationPaymentMode=Data migration for payment mode +MigrationCategorieAssociation=Migration of categories +MigrationEvents=Migration of events to add event owner into assignement table + +ShowNotAvailableOptions=Show not available options +HideNotAvailableOptions=Hide not available options diff --git a/htdocs/langs/sw_SW/interventions.lang b/htdocs/langs/sw_SW/interventions.lang new file mode 100644 index 00000000000..c79da05364e --- /dev/null +++ b/htdocs/langs/sw_SW/interventions.lang @@ -0,0 +1,53 @@ +# Dolibarr language file - Source file is en_US - interventions +Intervention=Intervention +Interventions=Interventions +InterventionCard=Intervention card +NewIntervention=New intervention +AddIntervention=Create intervention +ListOfInterventions=List of interventions +EditIntervention=Edit intervention +ActionsOnFicheInter=Actions on intervention +LastInterventions=Last %s interventions +AllInterventions=All interventions +CreateDraftIntervention=Create draft +CustomerDoesNotHavePrefix=Customer does not have a prefix +InterventionContact=Intervention contact +DeleteIntervention=Delete intervention +ValidateIntervention=Validate intervention +ModifyIntervention=Modify intervention +DeleteInterventionLine=Delete intervention line +ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? +ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? +ConfirmModifyIntervention=Are you sure you want to modify this intervention ? +ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? +NameAndSignatureOfInternalContact=Name and signature of intervening : +NameAndSignatureOfExternalContact=Name and signature of customer : +DocumentModelStandard=Standard document model for interventions +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Billed +RelatedInterventions=Related interventions +ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention +##### Types de contacts ##### +TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention +TypeContact_fichinter_internal_INTERVENING=Intervening +TypeContact_fichinter_external_BILLING=Billing customer contact +TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +# Modele numérotation +ArcticNumRefModelDesc1=Generic number model +ArcticNumRefModelError=Failed to activate +PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/sw_SW/languages.lang b/htdocs/langs/sw_SW/languages.lang new file mode 100644 index 00000000000..acd737c3711 --- /dev/null +++ b/htdocs/langs/sw_SW/languages.lang @@ -0,0 +1,72 @@ +# Dolibarr language file - Source file is en_US - languages + +Language_ar_AR=Kiarabu +Language_ar_SA=Kiarabu +Language_bg_BG=Bulgarian +Language_bs_BA=Bosnian +Language_ca_ES=Kikatalani +Language_cs_CZ=Czech +Language_da_DA=Denmark +Language_da_DK=Denmark +Language_de_DE=Ujerumani +Language_de_AT=Ujerumani (Austria) +Language_de_CH=German (Switzerland) +Language_el_GR=Kigiriki +Language_en_AU=Kiingereza (Australia) +Language_en_CA=English (Canada) +Language_en_GB=English (United Kingdom) +Language_en_IN=English (India) +Language_en_NZ=English (New Zealand) +Language_en_SA=English (Saudi Arabia) +Language_en_US=English (United States) +Language_en_ZA=English (Afrika Kusini) +Language_es_ES=Spanish +Language_es_DO=Spanish (Dominican Republic) +Language_es_AR=Kihispania (Argentina) +Language_es_CL=Spanish (Chile) +Language_es_HN=Spanish (Honduras) +Language_es_MX=Kihispania (Mexico) +Language_es_PY=Kihispania (Paraguay) +Language_es_PE=Spanish (Peru) +Language_es_PR=Kihispania (Puerto Rico) +Language_et_EE=Estonian +Language_eu_ES=Basque +Language_fa_IR=Kiajemi +Language_fi_FI=Mapezi +Language_fr_BE=Kifaransa (Ubelgiji) +Language_fr_CA=Kifaransa (Canada) +Language_fr_CH=Kifaransa (Switzerland) +Language_fr_FR=Kifaransa +Language_fr_NC=Kifaransa (New Caledonia) +Language_he_IL=Kiebrania +Language_hr_HR=Croatian +Language_hu_HU=Hungarian +Language_id_ID=Indonesian +Language_is_IS=Kiaislandi +Language_it_IT=Italia +Language_ja_JP=Japan +Language_ko_KR=Korea +Language_lt_LT=Kilithuania +Language_lv_LV=Latvian +Language_mk_MK=Macedonian +Language_nb_NO=Norway (Bokmål) +Language_nl_BE=Uholanzi (Ubelgiji) +Language_nl_NL=Kiholanzi (Uholanzi) +Language_pl_PL=Polish +Language_pt_BR=Kireno (Brazil) +Language_pt_PT=Kireno +Language_ro_RO=Romanian +Language_ru_RU=Urusi +Language_ru_UA=Urusi (Ukraine) +Language_tr_TR=Kituruki +Language_sl_SI=Kislovenia +Language_sv_SV=Swedish +Language_sv_SE=Swedish +Language_sq_AL=Albanian +Language_sk_SK=Slovakiska +Language_th_TH=Thai +Language_uk_UA=Kiukreni +Language_uz_UZ=Uzbek +Language_vi_VN=Kivietinamu +Language_zh_CN=Kichina +Language_zh_TW=Kichina (cha Jadi) diff --git a/htdocs/langs/sw_SW/ldap.lang b/htdocs/langs/sw_SW/ldap.lang new file mode 100644 index 00000000000..02e457446a6 --- /dev/null +++ b/htdocs/langs/sw_SW/ldap.lang @@ -0,0 +1,29 @@ +# Dolibarr language file - Source file is en_US - ldap +DomainPassword=Password for domain +YouMustChangePassNextLogon=Password for user %s on the domain %s must be changed. +UserMustChangePassNextLogon=User must change password on the domain %s +LdapUacf_NORMAL_ACCOUNT=User account +LdapUacf_DONT_EXPIRE_PASSWORD=Password never expires +LdapUacf_ACCOUNTDISABLE=Account is disabled in the domain %s +LDAPInformationsForThisContact=Information in LDAP database for this contact +LDAPInformationsForThisUser=Information in LDAP database for this user +LDAPInformationsForThisGroup=Information in LDAP database for this group +LDAPInformationsForThisMember=Information in LDAP database for this member +LDAPAttribute=LDAP attribute +LDAPAttributes=LDAP attributes +LDAPCard=LDAP card +LDAPRecordNotFound=Record not found in LDAP database +LDAPUsers=Users in LDAP database +LDAPGroups=Groups in LDAP database +LDAPFieldStatus=Status +LDAPFieldFirstSubscriptionDate=First subscription date +LDAPFieldFirstSubscriptionAmount=First subscription amount +LDAPFieldLastSubscriptionDate=Last subscription date +LDAPFieldLastSubscriptionAmount=Last subscription amount +SynchronizeDolibarr2Ldap=Synchronize user (Dolibarr -> LDAP) +UserSynchronized=User synchronized +GroupSynchronized=Group synchronized +MemberSynchronized=Member synchronized +ContactSynchronized=Contact synchronized +ForceSynchronize=Force synchronizing Dolibarr -> LDAP +ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility. diff --git a/htdocs/langs/sw_SW/link.lang b/htdocs/langs/sw_SW/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/sw_SW/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/sw_SW/mailmanspip.lang b/htdocs/langs/sw_SW/mailmanspip.lang new file mode 100644 index 00000000000..c85b3d60db2 --- /dev/null +++ b/htdocs/langs/sw_SW/mailmanspip.lang @@ -0,0 +1,27 @@ +# Dolibarr language file - Source file is en_US - mailmanspip +MailmanSpipSetup=Mailman and SPIP module Setup +MailmanTitle=Mailman mailing list system +TestSubscribe=To test subscription to Mailman lists +TestUnSubscribe=To test unsubscribe from Mailman lists +MailmanCreationSuccess=Subscription test was executed succesfully +MailmanDeletionSuccess=Unsubscription test was executed succesfully +SynchroMailManEnabled=A Mailman update will be performed +SynchroSpipEnabled=A Spip update will be performed +DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password +DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions +DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions +DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma) +SPIPTitle=SPIP Content Management System +DescADHERENT_SPIP_SERVEUR=SPIP Server +DescADHERENT_SPIP_DB=SPIP database name +DescADHERENT_SPIP_USER=SPIP database login +DescADHERENT_SPIP_PASS=SPIP database password +AddIntoSpip=Add into SPIP +AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP? +AddIntoSpipError=Failed to add the user in SPIP +DeleteIntoSpip=Remove from SPIP +DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP? +DeleteIntoSpipError=Failed to suppress the user from SPIP +SPIPConnectionFailed=Failed to connect to SPIP +SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done +SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang new file mode 100644 index 00000000000..7a211198822 --- /dev/null +++ b/htdocs/langs/sw_SW/mails.lang @@ -0,0 +1,141 @@ +# Dolibarr language file - Source file is en_US - mails +Mailing=EMailing +EMailing=EMailing +Mailings=EMailings +EMailings=EMailings +AllEMailings=All eMailings +MailCard=EMailing card +MailTargets=Targets +MailRecipients=Recipients +MailRecipient=Recipient +MailTitle=Description +MailFrom=Sender +MailErrorsTo=Errors to +MailReply=Reply to +MailTo=Receiver(s) +MailCC=Copy to +MailCCC=Cached copy to +MailTopic=EMail topic +MailText=Message +MailFile=Attached files +MailMessage=EMail body +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +DeleteMailing=Delete emailing +DeleteAMailing=Delete an emailing +PreviewMailing=Preview emailing +PrepareMailing=Prepare emailing +CreateMailing=Create emailing +MailingDesc=This page allows you to send emailings to a group of people. +MailingResult=Sending emails result +TestMailing=Test email +ValidMailing=Valid emailing +ApproveMailing=Approve emailing +MailingStatusDraft=Draft +MailingStatusValidated=Validated +MailingStatusApproved=Approved +MailingStatusSent=Sent +MailingStatusSentPartialy=Sent partialy +MailingStatusSentCompletely=Sent completely +MailingStatusError=Error +MailingStatusNotSent=Not sent +MailSuccessfulySent=Email successfully sent (from %s to %s) +MailingSuccessfullyValidated=EMailing successfully validated +MailUnsubcribe=Unsubscribe +Unsuscribe=Unsubscribe +MailingStatusNotContact=Don't contact anymore +ErrorMailRecipientIsEmpty=Email recipient is empty +WarningNoEMailsAdded=No new Email to add to recipient's list. +ConfirmValidMailing=Are you sure you want to validate this emailing ? +ConfirmResetMailing=Warning, by reinitializing emailing %s, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do ? +ConfirmDeleteMailing=Are you sure you want to delete this emailling ? +NbOfRecipients=Number of recipients +NbOfUniqueEMails=Nb of unique emails +NbOfEMails=Nb of EMails +TotalNbOfDistinctRecipients=Number of distinct recipients +NoTargetYet=No recipients defined yet (Go on tab 'Recipients') +AddRecipients=Add recipients +RemoveRecipient=Remove recipient +CommonSubstitutions=Common substitutions +YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README. +EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values +MailingAddFile=Attach this file +NoAttachedFiles=No attached files +BadEMail=Bad value for EMail +CloneEMailing=Clone Emailing +ConfirmCloneEMailing=Are you sure you want to clone this emailing ? +CloneContent=Clone message +CloneReceivers=Cloner recipients +DateLastSend=Date of last sending +DateSending=Date sending +SentTo=Sent to %s +MailingStatusRead=Read +CheckRead=Read Receipt +YourMailUnsubcribeOK=The email %s is correctly unsubcribe from mailing list +MailtoEMail=Hyper link to email +ActivateCheckRead=Allow to use the "Unsubcribe" link +ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature +EMailSentToNRecipients=EMail sent to %s recipients. +XTargetsAdded=%s recipients added into target list +EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email. +MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s) +SendRemind=Send reminder by EMails +RemindSent=%s reminder(s) sent +AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent) +NoRemindSent=No EMail reminder sent +ResultOfMassSending=Result of mass EMail reminders sending + +# Libelle des modules de liste de destinataires mailing +MailingModuleDescContactCompanies=Contacts/addresses of all third parties (customer, prospect, supplier, ...) +MailingModuleDescDolibarrUsers=Dolibarr users +MailingModuleDescFundationMembers=Foundation members with emails +MailingModuleDescEmailsFromFile=EMails from a text file (email;lastname;firstname;other) +MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other) +MailingModuleDescContactsCategories=Third parties (by category) +MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines +MailingModuleDescContactsByCompanyCategory=Contacts/addresses of third parties (by third parties category) +MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category +MailingModuleDescMembersCategories=Foundation members (by categories) +MailingModuleDescContactsByFunction=Contacts/addresses of third parties (by position/function) +LineInFile=Line %s in file +RecipientSelectionModules=Defined requests for recipient's selection +MailSelectedRecipients=Selected recipients +MailingArea=EMailings area +LastMailings=Last %s emailings +TargetsStatistics=Targets statistics +NbOfCompaniesContacts=Unique contacts/addresses +MailNoChangePossible=Recipients for validated emailing can't be changed +SearchAMailing=Search mailing +SendMailing=Send emailing +SendMail=Send email +SentBy=Sent by +MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: +MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. +ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +TargetsReset=Clear list +ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing +ToAddRecipientsChooseHere=Add recipients by choosing from the lists +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent +IdRecord=ID record +DeliveryReceipt=Delivery Receipt +YouCanUseCommaSeparatorForSeveralRecipients=You can use the comma separator to specify several recipients. +TagCheckMail=Track mail opening +TagUnsubscribe=Unsubscribe link +TagSignature=Signature sending user +TagMailtoEmail=Recipient EMail +# Module Notifications +Notifications=Notifications +NoNotificationsWillBeSent=No email notifications are planned for this event and company +ANotificationsWillBeSent=1 notification will be sent by email +SomeNotificationsWillBeSent=%s notifications will be sent by email +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets +ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang new file mode 100644 index 00000000000..d40e28cb776 --- /dev/null +++ b/htdocs/langs/sw_SW/main.lang @@ -0,0 +1,725 @@ +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +# Note for Chinese: +# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader) +# stsongstdlight or cid0cs are for simplified Chinese +# To read Chinese pdf with Linux: sudo apt-get install poppler-data +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 +SeparatorDecimal=. +SeparatorThousand=, +FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y +FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%I:%M %p +FormatHourShortDuration=%H:%M +FormatDateTextShort=%b %d, %Y +FormatDateText=%B %d, %Y +FormatDateHourShort=%m/%d/%Y %I:%M %p +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p +FormatDateHourTextShort=%b %d, %Y, %I:%M %p +FormatDateHourText=%B %d, %Y, %I:%M %p +DatabaseConnection=Database connection +NoTranslation=No translation +NoRecordFound=No record found +NoError=No error +Error=Error +ErrorFieldRequired=Field '%s' is required +ErrorFieldFormat=Field '%s' has a bad value +ErrorFileDoesNotExists=File %s does not exist +ErrorFailedToOpenFile=Failed to open file %s +ErrorCanNotCreateDir=Can not create dir %s +ErrorCanNotReadDir=Can not read dir %s +ErrorConstantNotDefined=Parameter %s not defined +ErrorUnknown=Unknown error +ErrorSQL=SQL Error +ErrorLogoFileNotFound=Logo file '%s' was not found +ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this +ErrorGoToModuleSetup=Go to Module setup to fix this +ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s) +ErrorAttachedFilesDisabled=File attaching is disabled on this server +ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory. +ErrorInternalErrorDetected=Error detected +ErrorNoRequestRan=No request ran +ErrorWrongHostParameter=Wrong host parameter +ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form. +ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records. +ErrorWrongValue=Wrong value +ErrorWrongValueForParameterX=Wrong value for parameter %s +ErrorNoRequestInError=No request in error +ErrorServiceUnavailableTryLater=Service not available for the moment. Try again later. +ErrorDuplicateField=Duplicate value in a unique field +ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback changes. +ErrorConfigParameterNotDefined=Parameter %s is not defined inside Dolibarr config file conf.php. +ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr database. +ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. +ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. +ErrorFailedToSaveFile=Error, failed to save file. +SetDate=Set date +SelectDate=Select a date +SeeAlso=See also %s +SeeHere=See here +BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded +FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. +NbOfEntries=Nb of entries +GoToWikiHelpPage=Read online help (need Internet access) +GoToHelpPage=Read help +RecordSaved=Record saved +RecordDeleted=Record deleted +LevelOfFeature=Level of features +NotDefined=Not defined +DefinedAndHasThisValue=Defined and value to +IsNotDefined=undefined +DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to %s in configuration file conf.php.
This means that password database is extern to Dolibarr, so changing this field may have no effects. +Administrator=Administrator +Undefined=Undefined +PasswordForgotten=Password forgotten ? +SeeAbove=See above +HomeArea=Home area +LastConnexion=Last connection +PreviousConnexion=Previous connection +ConnectedOnMultiCompany=Connected on environment +ConnectedSince=Connected since +AuthenticationMode=Authentification mode +RequestedUrl=Requested Url +DatabaseTypeManager=Database type manager +RequestLastAccess=Request for last database access +RequestLastAccessInError=Request for last database access in error +ReturnCodeLastAccessInError=Return code for last database access in error +InformationLastAccessInError=Information for last database access in error +DolibarrHasDetectedError=Dolibarr has detected a technical error +InformationToHelpDiagnose=This is information that can help diagnostic +MoreInformation=More information +TechnicalInformation=Technical information +NotePublic=Note (public) +NotePrivate=Note (private) +PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to %s decimals. +DoTest=Test +ToFilter=Filter +WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay. +yes=yes +Yes=Yes +no=no +No=No +All=All +Home=Home +Help=Help +OnlineHelp=Online help +PageWiki=Wiki page +Always=Always +Never=Never +Under=under +Period=Period +PeriodEndDate=End date for period +Activate=Activate +Activated=Activated +Closed=Closed +Closed2=Closed +Enabled=Enabled +Deprecated=Deprecated +Disable=Disable +Disabled=Disabled +Add=Add +AddLink=Add link +Update=Update +AddActionToDo=Add event to do +AddActionDone=Add event done +Close=Close +Close2=Close +Confirm=Confirm +ConfirmSendCardByMail=Do you really want to send content of this card by mail to %s ? +Delete=Delete +Remove=Remove +Resiliate=Resiliate +Cancel=Cancel +Modify=Modify +Edit=Edit +Validate=Validate +ValidateAndApprove=Validate and Approve +ToValidate=To validate +Save=Save +SaveAs=Save As +TestConnection=Test connection +ToClone=Clone +ConfirmClone=Choose data you want to clone : +NoCloneOptionsSpecified=No data to clone defined. +Of=of +Go=Go +Run=Run +CopyOf=Copy of +Show=Show +ShowCardHere=Show card +Search=Search +SearchOf=Search +Valid=Valid +Approve=Approve +Disapprove=Disapprove +ReOpen=Re-Open +Upload=Send file +ToLink=Link +Select=Select +Choose=Choose +ChooseLangage=Please choose your language +Resize=Resize +Recenter=Recenter +Author=Author +User=User +Users=Users +Group=Group +Groups=Groups +NoUserGroupDefined=No user group defined +Password=Password +PasswordRetype=Retype your password +NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration. +Name=Name +Person=Person +Parameter=Parameter +Parameters=Parameters +Value=Value +GlobalValue=Global value +PersonalValue=Personal value +NewValue=New value +CurrentValue=Current value +Code=Code +Type=Type +Language=Language +MultiLanguage=Multi-language +Note=Note +CurrentNote=Current note +Title=Title +Label=Label +RefOrLabel=Ref. or label +Info=Log +Family=Family +Description=Description +Designation=Description +Model=Model +DefaultModel=Default model +Action=Event +About=About +Number=Number +NumberByMonth=Number by month +AmountByMonth=Amount by month +Numero=Number +Limit=Limit +Limits=Limits +DevelopmentTeam=Development Team +Logout=Logout +NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s +Connection=Connection +Setup=Setup +Alert=Alert +Previous=Previous +Next=Next +Cards=Cards +Card=Card +Now=Now +Date=Date +DateAndHour=Date and hour +DateStart=Date start +DateEnd=Date end +DateCreation=Creation date +DateModification=Modification date +DateModificationShort=Modif. date +DateLastModification=Last modification date +DateValidation=Validation date +DateClosing=Closing date +DateDue=Due date +DateValue=Value date +DateValueShort=Value date +DateOperation=Operation date +DateOperationShort=Oper. Date +DateLimit=Limit date +DateRequest=Request date +DateProcess=Process date +DatePlanShort=Date planed +DateRealShort=Date real. +DateBuild=Report build date +DatePayment=Date of payment +DurationYear=year +DurationMonth=month +DurationWeek=week +DurationDay=day +DurationYears=years +DurationMonths=months +DurationWeeks=weeks +DurationDays=days +Year=Year +Month=Month +Week=Week +Day=Day +Hour=Hour +Minute=Minute +Second=Second +Years=Years +Months=Months +Days=Days +days=days +Hours=Hours +Minutes=Minutes +Seconds=Seconds +Weeks=Weeks +Today=Today +Yesterday=Yesterday +Tomorrow=Tomorrow +Morning=Morning +Afternoon=Afternoon +Quadri=Quadri +MonthOfDay=Month of the day +HourShort=H +MinuteShort=mn +Rate=Rate +UseLocalTax=Include tax +Bytes=Bytes +KiloBytes=Kilobytes +MegaBytes=Megabytes +GigaBytes=Gigabytes +TeraBytes=Terabytes +b=b. +Kb=Kb +Mb=Mb +Gb=Gb +Tb=Tb +Cut=Cut +Copy=Copy +Paste=Paste +Default=Default +DefaultValue=Default value +DefaultGlobalValue=Global value +Price=Price +UnitPrice=Unit price +UnitPriceHT=Unit price (net) +UnitPriceTTC=Unit price +PriceU=U.P. +PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested +PriceUTTC=U.P. +Amount=Amount +AmountInvoice=Invoice amount +AmountPayment=Payment amount +AmountHTShort=Amount (net) +AmountTTCShort=Amount (inc. tax) +AmountHT=Amount (net of tax) +AmountTTC=Amount (inc. tax) +AmountVAT=Amount tax +AmountLT1=Amount tax 2 +AmountLT2=Amount tax 3 +AmountLT1ES=Amount RE +AmountLT2ES=Amount IRPF +AmountTotal=Total amount +AmountAverage=Average amount +PriceQtyHT=Price for this quantity (net of tax) +PriceQtyMinHT=Price quantity min. (net of tax) +PriceQtyTTC=Price for this quantity (inc. tax) +PriceQtyMinTTC=Price quantity min. (inc. of tax) +Percentage=Percentage +Total=Total +SubTotal=Subtotal +TotalHTShort=Total (net) +TotalTTCShort=Total (inc. tax) +TotalHT=Total (net of tax) +TotalHTforthispage=Total (net of tax) for this page +TotalTTC=Total (inc. tax) +TotalTTCToYourCredit=Total (inc. tax) to your credit +TotalVAT=Total tax +TotalLT1=Total tax 2 +TotalLT2=Total tax 3 +TotalLT1ES=Total RE +TotalLT2ES=Total IRPF +IncludedVAT=Included tax +HT=Net of tax +TTC=Inc. tax +VAT=Sales tax +LT1ES=RE +LT2ES=IRPF +VATRate=Tax Rate +Average=Average +Sum=Sum +Delta=Delta +Module=Module +Option=Option +List=List +FullList=Full list +Statistics=Statistics +OtherStatistics=Other statistics +Status=Status +Favorite=Favorite +ShortInfo=Info. +Ref=Ref. +RefSupplier=Ref. supplier +RefPayment=Ref. payment +CommercialProposalsShort=Commercial proposals +Comment=Comment +Comments=Comments +ActionsToDo=Events to do +ActionsDone=Events done +ActionsToDoShort=To do +ActionsRunningshort=Started +ActionsDoneShort=Done +ActionNotApplicable=Not applicable +ActionRunningNotStarted=To start +ActionRunningShort=Started +ActionDoneShort=Finished +ActionUncomplete=Uncomplete +CompanyFoundation=Company/Foundation +ContactsForCompany=Contacts for this third party +ContactsAddressesForCompany=Contacts/addresses for this third party +AddressesForCompany=Addresses for this third party +ActionsOnCompany=Events about this third party +ActionsOnMember=Events about this member +NActions=%s events +NActionsLate=%s late +RequestAlreadyDone=Request already recorded +Filter=Filter +RemoveFilter=Remove filter +ChartGenerated=Chart generated +ChartNotGenerated=Chart not generated +GeneratedOn=Build on %s +Generate=Generate +Duration=Duration +TotalDuration=Total duration +Summary=Summary +MyBookmarks=My bookmarks +OtherInformationsBoxes=Other information boxes +DolibarrBoard=Dolibarr board +DolibarrStateBoard=Statistics +DolibarrWorkBoard=Work tasks board +Available=Available +NotYetAvailable=Not yet available +NotAvailable=Not available +Popularity=Popularity +Categories=Categories +Category=Category +By=By +From=From +to=to +and=and +or=or +Other=Other +Others=Others +OtherInformations=Other informations +Quantity=Quantity +Qty=Qty +ChangedBy=Changed by +ReCalculate=Recalculate +ResultOk=Success +ResultKo=Failure +Reporting=Reporting +Reportings=Reporting +Draft=Draft +Drafts=Drafts +Validated=Validated +Opened=Opened +New=New +Discount=Discount +Unknown=Unknown +General=General +Size=Size +Received=Received +Paid=Paid +Topic=Sujet +ByCompanies=By third parties +ByUsers=By users +Links=Links +Link=Link +Receipts=Receipts +Rejects=Rejects +Preview=Preview +NextStep=Next step +PreviousStep=Previous step +Datas=Data +None=None +NoneF=None +Late=Late +Photo=Picture +Photos=Pictures +AddPhoto=Add picture +Login=Login +CurrentLogin=Current login +January=January +February=February +March=March +April=April +May=May +June=June +July=July +August=August +September=September +October=October +November=November +December=December +JanuaryMin=Jan +FebruaryMin=Feb +MarchMin=Mar +AprilMin=Apr +MayMin=May +JuneMin=Jun +JulyMin=Jul +AugustMin=Aug +SeptemberMin=Sep +OctoberMin=Oct +NovemberMin=Nov +DecemberMin=Dec +Month01=January +Month02=February +Month03=March +Month04=April +Month05=May +Month06=June +Month07=July +Month08=August +Month09=September +Month10=October +Month11=November +Month12=December +MonthShort01=Jan +MonthShort02=Feb +MonthShort03=Mar +MonthShort04=Apr +MonthShort05=May +MonthShort06=Jun +MonthShort07=Jul +MonthShort08=Aug +MonthShort09=Sep +MonthShort10=Oct +MonthShort11=Nov +MonthShort12=Dec +AttachedFiles=Attached files and documents +FileTransferComplete=File was uploaded successfuly +DateFormatYYYYMM=YYYY-MM +DateFormatYYYYMMDD=YYYY-MM-DD +DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS +ReportName=Report name +ReportPeriod=Report period +ReportDescription=Description +Report=Report +Keyword=Mot clé +Legend=Legend +FillTownFromZip=Fill city from zip +Fill=Fill +Reset=Reset +ShowLog=Show log +File=File +Files=Files +NotAllowed=Not allowed +ReadPermissionNotAllowed=Read permission not allowed +AmountInCurrency=Amount in %s currency +Example=Example +Examples=Examples +NoExample=No example +FindBug=Report a bug +NbOfThirdParties=Number of third parties +NbOfCustomers=Number of customers +NbOfLines=Number of lines +NbOfObjects=Number of objects +NbOfReferers=Number of referrers +Referers=Refering objects +TotalQuantity=Total quantity +DateFromTo=From %s to %s +DateFrom=From %s +DateUntil=Until %s +Check=Check +Uncheck=Uncheck +Internal=Internal +External=External +Internals=Internal +Externals=External +Warning=Warning +Warnings=Warnings +BuildPDF=Build PDF +RebuildPDF=Rebuild PDF +BuildDoc=Build Doc +RebuildDoc=Rebuild Doc +Entity=Environment +Entities=Entities +EventLogs=Logs +CustomerPreview=Customer preview +SupplierPreview=Supplier preview +AccountancyPreview=Accountancy preview +ShowCustomerPreview=Show customer preview +ShowSupplierPreview=Show supplier preview +ShowAccountancyPreview=Show accountancy preview +ShowProspectPreview=Show prospect preview +RefCustomer=Ref. customer +Currency=Currency +InfoAdmin=Information for administrators +Undo=Undo +Redo=Redo +ExpandAll=Expand all +UndoExpandAll=Undo expand +Reason=Reason +FeatureNotYetSupported=Feature not yet supported +CloseWindow=Close window +Question=Question +Response=Response +Priority=Priority +SendByMail=Send by EMail +MailSentBy=Email sent by +TextUsedInTheMessageBody=Email body +SendAcknowledgementByMail=Send Ack. by email +NoEMail=No email +NoMobilePhone=No mobile phone +Owner=Owner +DetectedVersion=Detected version +FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value. +Refresh=Refresh +BackToList=Back to list +GoBack=Go back +CanBeModifiedIfOk=Can be modified if valid +CanBeModifiedIfKo=Can be modified if not valid +RecordModifiedSuccessfully=Record modified successfully +RecordsModified=%s records modified +AutomaticCode=Automatic code +NotManaged=Not managed +FeatureDisabled=Feature disabled +MoveBox=Move box %s +Offered=Offered +NotEnoughPermissions=You don't have permission for this action +SessionName=Session name +Method=Method +Receive=Receive +PartialWoman=Partial +PartialMan=Partial +TotalWoman=Total +TotalMan=Total +NeverReceived=Never received +Canceled=Canceled +YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary +Color=Color +Documents=Linked files +DocumentsNb=Linked files (%s) +Documents2=Documents +BuildDocuments=Generated documents +UploadDisabled=Upload disabled +MenuECM=Documents +MenuAWStats=AWStats +MenuMembers=Members +MenuAgendaGoogle=Google agenda +ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb +NoFileFound=No documents saved in this directory +CurrentUserLanguage=Current language +CurrentTheme=Current theme +CurrentMenuManager=Current menu manager +DisabledModules=Disabled modules +For=For +ForCustomer=For customer +Signature=Signature +HidePassword=Show command with password hidden +UnHidePassword=Show real command with clear password +Root=Root +Informations=Informations +Page=Page +Notes=Notes +AddNewLine=Add new line +AddFile=Add file +ListOfFiles=List of available files +FreeZone=Free entry +FreeLineOfType=Free entry of type +CloneMainAttributes=Clone object with its main attributes +PDFMerge=PDF Merge +Merge=Merge +PrintContentArea=Show page to print main content area +MenuManager=Menu manager +NoMenu=No sub-menu +WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login %s is allowed to use application at the moment. +CoreErrorTitle=System error +CoreErrorMessage=Sorry, an error occurred. Check the logs or contact your system administrator. +CreditCard=Credit card +FieldsWithAreMandatory=Fields with %s are mandatory +FieldsWithIsForPublic=Fields with %s are shown on public list of members. If you don't want this, check off the "public" box. +AccordingToGeoIPDatabase=(according to GeoIP convertion) +Line=Line +NotSupported=Not supported +RequiredField=Required field +Result=Result +ToTest=Test +ValidateBefore=Card must be validated before using this feature +Visibility=Visibility +Private=Private +Hidden=Hidden +Resources=Resources +Source=Source +Prefix=Prefix +Before=Before +After=After +IPAddress=IP address +Frequency=Frequency +IM=Instant messaging +NewAttribute=New attribute +AttributeCode=Attribute code +OptionalFieldsSetup=Extra attributes setup +URLPhoto=URL of photo/logo +SetLinkToThirdParty=Link to another third party +CreateDraft=Create draft +SetToDraft=Back to draft +ClickToEdit=Click to edit +ObjectDeleted=Object %s deleted +ByCountry=By country +ByTown=By town +ByDate=By date +ByMonthYear=By month/year +ByYear=By year +ByMonth=By month +ByDay=By day +BySalesRepresentative=By sales representative +LinkedToSpecificUsers=Linked to a particular user contact +DeleteAFile=Delete a file +ConfirmDeleteAFile=Are you sure you want to delete file +NoResults=No results +ModulesSystemTools=Modules tools +Test=Test +Element=Element +NoPhotoYet=No pictures available yet +HomeDashboard=Home summary +Deductible=Deductible +from=from +toward=toward +Access=Access +HelpCopyToClipboard=Use Ctrl+C to copy to clipboard +SaveUploadedFileWithMask=Save file on server with name "%s" (otherwise "%s") +OriginFileName=Original filename +SetDemandReason=Set source +SetBankAccount=Define Bank Account +AccountCurrency=Account Currency +ViewPrivateNote=View notes +XMoreLines=%s line(s) hidden +PublicUrl=Public URL +AddBox=Add box +SelectElementAndClickRefresh=Select an element and click Refresh +PrintFile=Print File %s +ShowTransaction=Show transaction +# Week day +Monday=Monday +Tuesday=Tuesday +Wednesday=Wednesday +Thursday=Thursday +Friday=Friday +Saturday=Saturday +Sunday=Sunday +MondayMin=Mo +TuesdayMin=Tu +WednesdayMin=We +ThursdayMin=Th +FridayMin=Fr +SaturdayMin=Sa +SundayMin=Su +Day1=Monday +Day2=Tuesday +Day3=Wednesday +Day4=Thursday +Day5=Friday +Day6=Saturday +Day0=Sunday +ShortMonday=M +ShortTuesday=T +ShortWednesday=W +ShortThursday=T +ShortFriday=F +ShortSaturday=S +ShortSunday=S diff --git a/htdocs/langs/sw_SW/margins.lang b/htdocs/langs/sw_SW/margins.lang new file mode 100644 index 00000000000..748b3c71f30 --- /dev/null +++ b/htdocs/langs/sw_SW/margins.lang @@ -0,0 +1,45 @@ +# Dolibarr language file - Source file is en_US - marges + +Margin=Margin +Margins=Margins +TotalMargin=Total Margin +MarginOnProducts=Margin / Products +MarginOnServices=Margin / Services +MarginRate=Margin rate +MarkRate=Mark rate +DisplayMarginRates=Display margin rates +DisplayMarkRates=Display mark rates +InputPrice=Input price +margin=Profit margins management +margesSetup=Profit margins management setup +MarginDetails=Margin details +ProductMargins=Product margins +CustomerMargins=Customer margins +SalesRepresentativeMargins=Sales representative margins +UserMargins=User margins +ProductService=Product or Service +AllProducts=All products and services +ChooseProduct/Service=Choose product or service +StartDate=Start date +EndDate=End date +Launch=Start +ForceBuyingPriceIfNull=Force buying price if null +ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) +MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts +UseDiscountAsProduct=As a product +UseDiscountAsService=As a service +UseDiscountOnTotal=On subtotal +MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. +MARGIN_TYPE=Margin type +MargeBrute=Raw margin +MargeNette=Net margin +MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
Net margin : Selling price - Cost price +CostPrice=Cost price +BuyingCost=Cost price +UnitCharges=Unit charges +Charges=Charges +AgentContactType=Commercial agent contact type +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/sw_SW/members.lang b/htdocs/langs/sw_SW/members.lang new file mode 100644 index 00000000000..40bca8e85fb --- /dev/null +++ b/htdocs/langs/sw_SW/members.lang @@ -0,0 +1,206 @@ +# Dolibarr language file - Source file is en_US - members +MembersArea=Members area +PublicMembersArea=Public members area +MemberCard=Member card +SubscriptionCard=Subscription card +Member=Member +Members=Members +MemberAccount=Member login +ShowMember=Show member card +UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member +MembersTickets=Members Tickets +FundationMembers=Foundation members +Attributs=Attributes +ErrorMemberTypeNotDefined=Member type not defined +ListOfPublicMembers=List of public members +ListOfValidatedPublicMembers=List of validated public members +ErrorThisMemberIsNotPublic=This member is not public +ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). +ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. +ThisIsContentOfYourCard=This is details of your card +CardContent=Content of your member card +SetLinkToUser=Link to a Dolibarr user +SetLinkToThirdParty=Link to a Dolibarr third party +MembersCards=Members business cards +MembersList=List of members +MembersListToValid=List of draft members (to be validated) +MembersListValid=List of valid members +MembersListUpToDate=List of valid members with up to date subscription +MembersListNotUpToDate=List of valid members with subscription out of date +MembersListResiliated=List of resiliated members +MembersListQualified=List of qualified members +MenuMembersToValidate=Draft members +MenuMembersValidated=Validated members +MenuMembersUpToDate=Up to date members +MenuMembersNotUpToDate=Out of date members +MenuMembersResiliated=Resiliated members +MembersWithSubscriptionToReceive=Members with subscription to receive +DateAbonment=Subscription date +DateSubscription=Subscription date +DateNextSubscription=Next subscription +DateEndSubscription=Subscription end date +EndSubscription=End subscription +SubscriptionId=Subscription id +MemberId=Member id +NewMember=New member +NewType=New member type +MemberType=Member type +MemberTypeId=Member type id +MemberTypeLabel=Member type label +MembersTypes=Members types +MembersAttributes=Members attributes +SearchAMember=Search a member +MemberStatusDraft=Draft (needs to be validated) +MemberStatusDraftShort=Draft +MemberStatusActive=Validated (waiting subscription) +MemberStatusActiveShort=Validated +MemberStatusActiveLate=subscription expired +MemberStatusActiveLateShort=Expired +MemberStatusPaid=Subscription up to date +MemberStatusPaidShort=Up to date +MemberStatusResiliated=Resiliated member +MemberStatusResiliatedShort=Resiliated +MembersStatusToValid=Draft members +MembersStatusToValidShort=Draft members +MembersStatusValidated=Validated members +MembersStatusPaid=Subscription up to date +MembersStatusPaidShort=Up to date +MembersStatusNotPaid=Subscription out of date +MembersStatusNotPaidShort=Out of date +MembersStatusResiliated=Resiliated members +MembersStatusResiliatedShort=Resiliated members +NewCotisation=New contribution +PaymentSubscription=New contribution payment +EditMember=Edit member +SubscriptionEndDate=Subscription's end date +MembersTypeSetup=Members type setup +NewSubscription=New subscription +NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. +Subscription=Subscription +Subscriptions=Subscriptions +SubscriptionLate=Late +SubscriptionNotReceived=Subscription never received +SubscriptionLateShort=Late +SubscriptionNotReceivedShort=Never received +ListOfSubscriptions=List of subscriptions +SendCardByMail=Send card by Email +AddMember=Create member +NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" +NewMemberType=New member type +WelcomeEMail=Welcome e-mail +SubscriptionRequired=Subscription required +EditType=Edit member type +DeleteType=Delete +VoteAllowed=Vote allowed +Physical=Physical +Moral=Moral +MorPhy=Moral/Physical +Reenable=Reenable +ResiliateMember=Resiliate a member +ConfirmResiliateMember=Are you sure you want to resiliate this member ? +DeleteMember=Delete a member +ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? +DeleteSubscription=Delete a subscription +ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? +Filehtpasswd=htpasswd file +ValidateMember=Validate a member +ConfirmValidateMember=Are you sure you want to validate this member ? +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +PublicMemberList=Public member list +BlankSubscriptionForm=Public auto-subscription form +BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. +EnablePublicSubscriptionForm=Enable the public auto-subscription form +MemberPublicLinks=Public links/pages +ExportDataset_member_1=Members and subscriptions +ImportDataset_member_1=Members +LastMembers=Last %s members +LastMembersModified=Last %s modified members +LastSubscriptionsModified=Last %s modified subscriptions +AttributeName=Attribute name +String=String +Text=Text +Int=Int +Date=Date +DateAndTime=Date and time +PublicMemberCard=Member public card +MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe +AddSubscription=Create subscription +ShowSubscription=Show subscription +MemberModifiedInDolibarr=Member modified in Dolibarr +SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation +DescADHERENT_MAIL_VALID=EMail for member validation +DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription +DescADHERENT_MAIL_COTIS=EMail for subscription +DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation +DescADHERENT_MAIL_RESIL=EMail for member resiliation +DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_ETIQUETTE_TYPE=Format of labels page +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_CARD_TYPE=Format of cards page +DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards +DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) +DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) +DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards +GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here +MayBeOverwrited=This text can be overwrited by value defined for member's type +ShowTypeCard=Show type '%s' +HTPasswordExport=htpassword file generation +NoThirdPartyAssociatedToMember=No third party associated to this member +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions= Members and Subscriptions +MoreActions=Complementary action on recording +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionBankDirect=Create a direct transaction record on account +MoreActionBankViaInvoice=Create an invoice and payment on account +MoreActionInvoiceOnly=Create an invoice with no payment +LinkToGeneratedPages=Generate visit cards +LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. +DocForAllMembersCards=Generate business cards for all members +DocForOneMemberCards=Generate business cards for a particular member +DocForLabels=Generate address sheets +SubscriptionPayment=Subscription payment +LastSubscriptionDate=Last subscription date +LastSubscriptionAmount=Last subscription amount +MembersStatisticsByCountries=Members statistics by country +MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region +NbOfMembers=Number of members +NoValidatedMemberYet=No validated members found +MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. +MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. +MembersStatisticsDesc=Choose statistics you want to read... +MenuMembersStats=Statistics +LastMemberDate=Last member date +Nature=Nature +Public=Information are public +Exports=Exports +NewMemberbyWeb=New member added. Awaiting approval +NewMemberForm=New member form +SubscriptionsStatistics=Statistics on subscriptions +NbOfSubscriptions=Number of subscriptions +AmountOfSubscriptions=Amount of subscriptions +TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) +DefaultAmount=Default amount of subscription +CanEditAmount=Visitor can choose/edit amount of its subscription +MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page +Associations=Foundations +Collectivités=Organizations +Particuliers=Personal +Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/sw_SW/opensurvey.lang b/htdocs/langs/sw_SW/opensurvey.lang new file mode 100644 index 00000000000..0b191e426ec --- /dev/null +++ b/htdocs/langs/sw_SW/opensurvey.lang @@ -0,0 +1,66 @@ +# Dolibarr language file - Source file is en_US - opensurvey +Survey=Poll +Surveys=Polls +OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... +NewSurvey=New poll +NoSurveysInDatabase=%s poll(s) into database. +OpenSurveyArea=Polls area +AddACommentForPoll=You can add a comment into poll... +AddComment=Add comment +CreatePoll=Create poll +PollTitle=Poll title +ToReceiveEMailForEachVote=Receive an email for each vote +TypeDate=Type date +TypeClassic=Type standard +OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it +RemoveAllDays=Remove all days +CopyHoursOfFirstDay=Copy hours of first day +RemoveAllHours=Remove all hours +SelectedDays=Selected days +TheBestChoice=The best choice currently is +TheBestChoices=The best choices currently are +with=with +OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. +CommentsOfVoters=Comments of voters +ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes) +RemovePoll=Remove poll +UrlForSurvey=URL to communicate to get a direct access to poll +PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: +CreateSurveyDate=Create a date poll +CreateSurveyStandard=Create a standard poll +CheckBox=Simple checkbox +YesNoList=List (empty/yes/no) +PourContreList=List (empty/for/against) +AddNewColumn=Add new column +TitleChoice=Choice label +ExportSpreadsheet=Export result spreadsheet +ExpireDate=Limit date +NbOfSurveys=Number of polls +NbOfVoters=Nb of voters +SurveyResults=Results +PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s. +5MoreChoices=5 more choices +Abstention=Abstention +Against=Against +YouAreInivitedToVote=You are invited to vote for this poll +VoteNameAlreadyExists=This name was already used for this poll +ErrorPollDoesNotExists=Error, poll %s does not exists. +OpenSurveyNothingToSetup=There is no specific setup to do. +PollWillExpire=Your poll will expire automatically %s days after the last date of your poll. +AddADate=Add a date +AddStartHour=Add start hour +AddEndHour=Add end hour +votes=vote(s) +NoCommentYet=No comments have been posted for this poll yet +CanEditVotes=Can change vote of others +CanComment=Voters can comment in the poll +CanSeeOthersVote=Voters can see other people's vote +SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. +BackToCurrentMonth=Back to current month +ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation +ErrorOpenSurveyOneChoice=Enter at least one choice +ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD +ErrorInsertingComment=There was an error while inserting your comment +MoreChoices=Enter more choices for the voters +SurveyExpiredInfo=The voting time of this poll has expired. +EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang new file mode 100644 index 00000000000..8efafa5e94e --- /dev/null +++ b/htdocs/langs/sw_SW/orders.lang @@ -0,0 +1,166 @@ +# Dolibarr language file - Source file is en_US - orders +OrdersArea=Customers orders area +SuppliersOrdersArea=Suppliers orders area +OrderCard=Order card +OrderId=Order Id +Order=Order +Orders=Orders +OrderLine=Order line +OrderFollow=Follow up +OrderDate=Order date +OrderToProcess=Order to process +NewOrder=New order +ToOrder=Make order +MakeOrder=Make order +SupplierOrder=Supplier order +SuppliersOrders=Suppliers orders +SuppliersOrdersRunning=Current suppliers orders +CustomerOrder=Customer order +CustomersOrders=Customers orders +CustomersOrdersRunning=Current customer's orders +CustomersOrdersAndOrdersLines=Customer orders and order's lines +OrdersToValid=Customers orders to validate +OrdersToBill=Customers orders delivered +OrdersInProcess=Customers orders in process +OrdersToProcess=Customers orders to process +SuppliersOrdersToProcess=Supplier's orders to process +StatusOrderCanceledShort=Canceled +StatusOrderDraftShort=Draft +StatusOrderValidatedShort=Validated +StatusOrderSentShort=In process +StatusOrderSent=Shipment in process +StatusOrderOnProcessShort=Ordered +StatusOrderProcessedShort=Processed +StatusOrderToBillShort=Delivered +StatusOrderToBill2Short=To bill +StatusOrderApprovedShort=Approved +StatusOrderRefusedShort=Refused +StatusOrderToProcessShort=To process +StatusOrderReceivedPartiallyShort=Partially received +StatusOrderReceivedAllShort=Everything received +StatusOrderCanceled=Canceled +StatusOrderDraft=Draft (needs to be validated) +StatusOrderValidated=Validated +StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation +StatusOrderProcessed=Processed +StatusOrderToBill=Delivered +StatusOrderToBill2=To bill +StatusOrderApproved=Approved +StatusOrderRefused=Refused +StatusOrderReceivedPartially=Partially received +StatusOrderReceivedAll=Everything received +ShippingExist=A shipment exists +ProductQtyInDraft=Product quantity into draft orders +ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered +DraftOrWaitingApproved=Draft or approved not yet ordered +DraftOrWaitingShipped=Draft or validated not yet shipped +MenuOrdersToBill=Orders delivered +MenuOrdersToBill2=Billable orders +SearchOrder=Search order +SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order +ShipProduct=Ship product +Discount=Discount +CreateOrder=Create Order +RefuseOrder=Refuse order +ApproveOrder=Accept order +ValidateOrder=Validate order +UnvalidateOrder=Unvalidate order +DeleteOrder=Delete order +CancelOrder=Cancel order +AddOrder=Create order +AddToMyOrders=Add to my orders +AddToOtherOrders=Add to other orders +AddToDraftOrders=Add to draft order +ShowOrder=Show order +NoOpenedOrders=No opened orders +NoOtherOpenedOrders=No other opened orders +NoDraftOrders=No draft orders +OtherOrders=Other orders +LastOrders=Last %s orders +LastModifiedOrders=Last %s modified orders +LastClosedOrders=Last %s closed orders +AllOrders=All orders +NbOfOrders=Number of orders +OrdersStatistics=Order's statistics +OrdersStatisticsSuppliers=Supplier order's statistics +NumberOfOrdersByMonth=Number of orders by month +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +ListOfOrders=List of orders +CloseOrder=Close order +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. +ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. +ConfirmDeleteOrder=Are you sure you want to delete this order ? +ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? +ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? +ConfirmCancelOrder=Are you sure you want to cancel this order ? +ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? +GenerateBill=Generate invoice +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed +ComptaCard=Accountancy card +DraftOrders=Draft orders +RelatedOrders=Related orders +OnProcessOrders=In process orders +RefOrder=Ref. order +RefCustomerOrder=Ref. customer order +RefCustomerOrderShort=Ref. cust. order +SendOrderByMail=Send order by mail +ActionsOnOrder=Events on order +NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order +OrderMode=Order method +AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process +UserWithApproveOrderGrant=Users granted with "approve orders" permission. +PaymentOrderRef=Payment of order %s +CloneOrder=Clone order +ConfirmCloneOrder=Are you sure you want to clone this order %s ? +DispatchSupplierOrder=Receiving supplier order %s +##### Types de contacts ##### +TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order +TypeContact_commande_internal_SHIPPING=Representative following-up shipping +TypeContact_commande_external_BILLING=Customer invoice contact +TypeContact_commande_external_SHIPPING=Customer shipping contact +TypeContact_commande_external_CUSTOMER=Customer contact following-up order +TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order +TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping +TypeContact_order_supplier_external_BILLING=Supplier invoice contact +TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order + +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined +Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' +Error_OrderNotChecked=No orders to invoice selected +# Sources +OrderSource0=Commercial proposal +OrderSource1=Internet +OrderSource2=Mail campaign +OrderSource3=Phone compaign +OrderSource4=Fax campaign +OrderSource5=Commercial +OrderSource6=Store +QtyOrdered=Qty ordered +AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order +# Documents models +PDFEinsteinDescription=A complete order model (logo...) +PDFEdisonDescription=A simple order model +PDFProformaDescription=A complete proforma invoice (logo…) +# Orders modes +OrderByMail=Mail +OrderByFax=Fax +OrderByEMail=EMail +OrderByWWW=Online +OrderByPhone=Phone +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang new file mode 100644 index 00000000000..08747ea884b --- /dev/null +++ b/htdocs/langs/sw_SW/other.lang @@ -0,0 +1,238 @@ +# Dolibarr language file - Source file is en_US - other +SecurityCode=Security code +Calendar=Calendar +Tools=Tools +ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

Those tools can be reached from menu on the side. +Birthday=Birthday +BirthdayDate=Birthday +DateToBirth=Date of birth +BirthdayAlertOn= birthday alert active +BirthdayAlertOff= birthday alert inactive +Notify_FICHINTER_VALIDATE=Intervention validated +Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail +Notify_BILL_VALIDATE=Customer invoice validated +Notify_BILL_UNVALIDATE=Customer invoice unvalidated +Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved +Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused +Notify_ORDER_VALIDATE=Customer order validated +Notify_PROPAL_VALIDATE=Customer proposal validated +Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed +Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused +Notify_WITHDRAW_TRANSMIT=Transmission withdrawal +Notify_WITHDRAW_CREDIT=Credit withdrawal +Notify_WITHDRAW_EMIT=Perform withdrawal +Notify_ORDER_SENTBYMAIL=Customer order sent by mail +Notify_COMPANY_CREATE=Third party created +Notify_COMPANY_SENTBYMAIL=Mails sent from third party card +Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail +Notify_BILL_PAYED=Customer invoice payed +Notify_BILL_CANCEL=Customer invoice canceled +Notify_BILL_SENTBYMAIL=Customer invoice sent by mail +Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated +Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail +Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated +Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed +Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail +Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled +Notify_CONTRACT_VALIDATE=Contract validated +Notify_FICHEINTER_VALIDATE=Intervention validated +Notify_SHIPPING_VALIDATE=Shipping validated +Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail +Notify_MEMBER_VALIDATE=Member validated +Notify_MEMBER_MODIFY=Member modified +Notify_MEMBER_SUBSCRIPTION=Member subscribed +Notify_MEMBER_RESILIATE=Member resiliated +Notify_MEMBER_DELETE=Member deleted +Notify_PROJECT_CREATE=Project creation +Notify_TASK_CREATE=Task created +Notify_TASK_MODIFY=Task modified +Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup +NbOfAttachedFiles=Number of attached files/documents +TotalSizeOfAttachedFiles=Total size of attached files/documents +MaxSize=Maximum size +AttachANewFile=Attach a new file/document +LinkedObject=Linked object +Miscellaneous=Miscellaneous +NbOfActiveNotifications=Number of notifications (nb of recipient emails) +PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ +PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ +PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ +DemoDesc=Dolibarr is a compact ERP/CRM composed by several functional modules. A demo that includes all modules does not mean anything as this never occurs. So, several demo profiles are available. +ChooseYourDemoProfil=Choose the demo profile that match your activity... +DemoFundation=Manage members of a foundation +DemoFundation2=Manage members and bank account of a foundation +DemoCompanyServiceOnly=Manage a freelance activity selling service only +DemoCompanyShopWithCashDesk=Manage a shop with a cash desk +DemoCompanyProductAndStocks=Manage a small or medium company selling products +DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules) +GoToDemo=Go to demo +CreatedBy=Created by %s +ModifiedBy=Modified by %s +ValidatedBy=Validated by %s +CanceledBy=Canceled by %s +ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed +FileWasRemoved=File %s was removed +DirWasRemoved=Directory %s was removed +FeatureNotYetAvailableShort=Available in a next version +FeatureNotYetAvailable=Feature not yet available in this version +FeatureExperimental=Experimental feature. Not stable in this version +FeatureDevelopment=Development feature. Not stable in this version +FeaturesSupported=Features supported +Width=Width +Height=Height +Depth=Depth +Top=Top +Bottom=Bottom +Left=Left +Right=Right +CalculatedWeight=Calculated weight +CalculatedVolume=Calculated volume +Weight=Weight +TotalWeight=Total weight +WeightUnitton=tonnes +WeightUnitkg=kg +WeightUnitg=g +WeightUnitmg=mg +WeightUnitpound=pound +Length=Length +LengthUnitm=m +LengthUnitdm=dm +LengthUnitcm=cm +LengthUnitmm=mm +Surface=Area +SurfaceUnitm2=m2 +SurfaceUnitdm2=dm2 +SurfaceUnitcm2=cm2 +SurfaceUnitmm2=mm2 +SurfaceUnitfoot2=ft2 +SurfaceUnitinch2=in2 +Volume=Volume +TotalVolume=Total volume +VolumeUnitm3=m3 +VolumeUnitdm3=dm3 +VolumeUnitcm3=cm3 +VolumeUnitmm3=mm3 +VolumeUnitfoot3=ft3 +VolumeUnitinch3=in3 +VolumeUnitounce=ounce +VolumeUnitlitre=litre +VolumeUnitgallon=gallon +Size=size +SizeUnitm=m +SizeUnitdm=dm +SizeUnitcm=cm +SizeUnitmm=mm +SizeUnitinch=inch +SizeUnitfoot=foot +SizeUnitpoint=point +BugTracker=Bug tracker +SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.
Change will be effective only after clicking on confirmation link inside this email.
Check your email reader software. +BackToLoginPage=Back to login page +AuthenticationDoesNotAllowSendNewPassword=Authentication mode is %s.
In this mode, Dolibarr can't know nor change your password.
Contact your system administrator if you want to change your password. +EnableGDLibraryDesc=Install or enable GD library with your PHP for use this option. +EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib) +ProfIdShortDesc=Prof Id %s is an information depending on third party country.
For example, for country %s, it's code %s. +DolibarrDemo=Dolibarr ERP/CRM demo +StatsByNumberOfUnits=Statistics in number of products/services units +StatsByNumberOfEntities=Statistics in number of referring entities +NumberOfProposals=Number of proposals on last 12 month +NumberOfCustomerOrders=Number of customer orders on last 12 month +NumberOfCustomerInvoices=Number of customer invoices on last 12 month +NumberOfSupplierOrders=Number of supplier orders on last 12 month +NumberOfSupplierInvoices=Number of supplier invoices on last 12 month +NumberOfUnitsProposals=Number of units on proposals on last 12 month +NumberOfUnitsCustomerOrders=Number of units on customer orders on last 12 month +NumberOfUnitsCustomerInvoices=Number of units on customer invoices on last 12 month +NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month +NumberOfUnitsSupplierInvoices=Number of units on supplier invoices on last 12 month +EMailTextInterventionValidated=The intervention %s has been validated. +EMailTextInvoiceValidated=The invoice %s has been validated. +EMailTextProposalValidated=The proposal %s has been validated. +EMailTextOrderValidated=The order %s has been validated. +EMailTextOrderApproved=The order %s has been approved. +EMailTextOrderApprovedBy=The order %s has been approved by %s. +EMailTextOrderRefused=The order %s has been refused. +EMailTextOrderRefusedBy=The order %s has been refused by %s. +EMailTextExpeditionValidated=The shipping %s has been validated. +ImportedWithSet=Importation data set +DolibarrNotification=Automatic notification +ResizeDesc=Enter new width OR new height. Ratio will be kept during resizing... +NewLength=New width +NewHeight=New height +NewSizeAfterCropping=New size after cropping +DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner) +CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is informations on current edited image +ImageEditor=Image editor +YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s. +YouReceiveMailBecauseOfNotification2=This event is the following: +ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start". +ClickHere=Click here +UseAdvancedPerms=Use the advanced permissions of some modules +FileFormat=File format +SelectAColor=Choose a color +AddFiles=Add Files +StartUpload=Start upload +CancelUpload=Cancel upload +FileIsTooBig=Files is too big +PleaseBePatient=Please be patient... +RequestToResetPasswordReceived=A request to change your Dolibarr password has been received +NewKeyIs=This is your new keys to login +NewKeyWillBe=Your new key to login to software will be +ClickHereToGoTo=Click here to go to %s +YouMustClickToChange=You must however first click on the following link to validate this password change +ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe. + +##### Calendar common ##### +AddCalendarEntry=Add entry in calendar %s +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted +##### Export ##### +Export=Export +ExportsArea=Exports area +AvailableFormats=Available formats +LibraryUsed=Librairy used +LibraryVersion=Version +ExportableDatas=Exportable data +NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions) +ToExport=Export +NewExport=New export +##### External sites ##### +ExternalSites=External sites diff --git a/htdocs/langs/sw_SW/paybox.lang b/htdocs/langs/sw_SW/paybox.lang new file mode 100644 index 00000000000..aced32a4944 --- /dev/null +++ b/htdocs/langs/sw_SW/paybox.lang @@ -0,0 +1,40 @@ +# Dolibarr language file - Source file is en_US - paybox +PayBoxSetup=PayBox module setup +PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects +PaymentForm=Payment form +WelcomeOnPaymentPage=Welcome on our online payment service +ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. +ThisIsInformationOnPayment=This is information on payment to do +ToComplete=To complete +YourEMail=Email to receive payment confirmation +Creditor=Creditor +PaymentCode=Payment code +PayBoxDoPayment=Go on payment +YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information +PleaseBePatient=Please, be patient +Continue=Next +ToOfferALinkForOnlinePayment=URL for %s payment +ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order +ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice +ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line +ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. +YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. +AccountParameter=Account parameters +UsageParameter=Usage parameters +InformationToFindParameters=Help to find your %s account information +PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment +VendorName=Name of vendor +CSSUrlForPaymentForm=CSS style sheet url for payment form +MessageOK=Message on validated payment return page +MessageKO=Message on canceled payment return page +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/sw_SW/paypal.lang b/htdocs/langs/sw_SW/paypal.lang new file mode 100644 index 00000000000..65a3dc45a23 --- /dev/null +++ b/htdocs/langs/sw_SW/paypal.lang @@ -0,0 +1,25 @@ +# Dolibarr language file - Source file is en_US - paypal +PaypalSetup=PayPal module setup +PaypalDesc=This module offer pages to allow payment on PayPal by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +PaypalOrCBDoPayment=Pay with credit card or Paypal +PaypalDoPayment=Pay with Paypal +PaypalCBDoPayment=Pay with credit card +PAYPAL_API_SANDBOX=Mode test/sandbox +PAYPAL_API_USER=API username +PAYPAL_API_PASSWORD=API password +PAYPAL_API_SIGNATURE=API signature +PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only +PaypalModeIntegral=Integral +PaypalModeOnlyPaypal=PayPal only +PAYPAL_CSS_URL=Optionnal Url of CSS style sheet on payment page +ThisIsTransactionId=This is id of transaction: %s +PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail +PAYPAL_IPN_MAIL_ADDRESS=E-mail address for the instant notification of payment (IPN) +PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n +YouAreCurrentlyInSandboxMode=You are currently in the "sandbox" mode +NewPaypalPaymentReceived=New Paypal payment received +NewPaypalPaymentFailed=New Paypal payment tried but failed +PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not) +ReturnURLAfterPayment=Return URL after payment +ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed +PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed diff --git a/htdocs/langs/sw_SW/printipp.lang b/htdocs/langs/sw_SW/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/sw_SW/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang new file mode 100644 index 00000000000..45263681965 --- /dev/null +++ b/htdocs/langs/sw_SW/productbatch.lang @@ -0,0 +1,21 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Use batch/serial number +ProductStatusOnBatch=Yes (Batch/serial required) +ProductStatusNotOnBatch=No (Batch/serial not used) +ProductStatusOnBatchShort=Yes +ProductStatusNotOnBatchShort=No +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. +ProductDoesNotUseBatchSerial=This product does not use batch/serial number diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang new file mode 100644 index 00000000000..3a18cda69e7 --- /dev/null +++ b/htdocs/langs/sw_SW/products.lang @@ -0,0 +1,256 @@ +# Dolibarr language file - Source file is en_US - products +ProductRef=Product ref. +ProductLabel=Product label +ProductServiceCard=Products/Services card +Products=Products +Services=Services +Product=Product +Service=Service +ProductId=Product/service id +Create=Create +Reference=Reference +NewProduct=New product +NewService=New service +ProductCode=Product code +ServiceCode=Service code +ProductVatMassChange=Mass VAT change +ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database. +MassBarcodeInit=Mass barcode init +MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete. +ProductAccountancyBuyCode=Accountancy code (buy) +ProductAccountancySellCode=Accountancy code (sell) +ProductOrService=Product or Service +ProductsAndServices=Products and Services +ProductsOrServices=Products or Services +ProductsAndServicesOnSell=Products and Services for sale or for purchase +ProductsAndServicesNotOnSell=Products and Services out of sale +ProductsAndServicesStatistics=Products and Services statistics +ProductsStatistics=Products statistics +ProductsOnSell=Product for sale or for pruchase +ProductsNotOnSell=Product out of sale and out of purchase +ProductsOnSellAndOnBuy=Products for sale and for purchase +ServicesOnSell=Services for sale or for purchase +ServicesNotOnSell=Services out of sale +ServicesOnSellAndOnBuy=Services for sale and for purchase +InternalRef=Internal reference +LastRecorded=Last products/services on sell recorded +LastRecordedProductsAndServices=Last %s recorded products/services +LastModifiedProductsAndServices=Last %s modified products/services +LastRecordedProducts=Last %s products recorded +LastRecordedServices=Last %s services recorded +LastProducts=Last products +CardProduct0=Product card +CardProduct1=Service card +CardContract=Contract card +Warehouse=Warehouse +Warehouses=Warehouses +WarehouseOpened=Warehouse opened +WarehouseClosed=Warehouse closed +Stock=Stock +Stocks=Stocks +Movement=Movement +Movements=Movements +Sell=Sales +Buy=Purchases +OnSell=For sale +OnBuy=For purchase +NotOnSell=Not for sale +ProductStatusOnSell=For sale +ProductStatusNotOnSell=Not for sale +ProductStatusOnSellShort=For sale +ProductStatusNotOnSellShort=Not for sale +ProductStatusOnBuy=For purchase +ProductStatusNotOnBuy=Not for purchase +ProductStatusOnBuyShort=For purchase +ProductStatusNotOnBuyShort=Not for purchase +UpdatePrice=Update price +AppliedPricesFrom=Applied prices from +SellingPrice=Selling price +SellingPriceHT=Selling price (net of tax) +SellingPriceTTC=Selling price (inc. tax) +PublicPrice=Public price +CurrentPrice=Current price +NewPrice=New price +MinPrice=Minim. selling price +MinPriceHT=Minim. selling price (net of tax) +MinPriceTTC=Minim. selling price (inc. tax) +CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount. +ContractStatus=Contract status +ContractStatusClosed=Closed +ContractStatusRunning=Running +ContractStatusExpired=expired +ContractStatusOnHold=Not running +ContractStatusToRun=To get running +ContractNotRunning=This contract is not running +ErrorProductAlreadyExists=A product with reference %s already exists. +ErrorProductBadRefOrLabel=Wrong value for reference or label. +ErrorProductClone=There was a problem while trying to clone the product or service. +ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +Suppliers=Suppliers +SupplierRef=Supplier's product ref. +ShowProduct=Show product +ShowService=Show service +ProductsAndServicesArea=Product and Services area +ProductsArea=Product area +ServicesArea=Services area +AddToMyProposals=Add to my proposals +AddToOtherProposals=Add to other proposals +AddToMyBills=Add to my bills +AddToOtherBills=Add to other bills +CorrectStock=Correct stock +AddPhoto=Add photo +ListOfStockMovements=List of stock movements +BuyingPrice=Buying price +SupplierCard=Supplier card +CommercialCard=Commercial card +AllWays=Path to find your product in stock +NoCat=Your product is not in any category +PrimaryWay=Primary path +PriceRemoved=Price removed +BarCode=Barcode +BarcodeType=Barcode type +SetDefaultBarcodeType=Set barcode type +BarcodeValue=Barcode value +NoteNotVisibleOnBill=Note (not visible on invoices, proposals...) +CreateCopy=Create copy +ServiceLimitedDuration=If product is a service with limited duration: +MultiPricesAbility=Several level of prices per product/service +MultiPricesNumPrices=Number of prices +MultiPriceLevelsName=Price categories +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product +EditAssociate=Associate +Translation=Translation +KeywordFilter=Keyword filter +CategoryFilter=Category filter +ProductToAddSearch=Search product to add +AddDel=Add/Delete +Quantity=Quantity +NoMatchFound=No match found +ProductAssociationList=List of related products/services: name of product/service (quantity affected) +ProductParentList=List of package products/services with this product as a component +ErrorAssociationIsFatherOfThis=One of selected product is parent with current product +DeleteProduct=Delete a product/service +ConfirmDeleteProduct=Are you sure you want to delete this product/service? +ProductDeleted=Product/Service "%s" deleted from database. +DeletePicture=Delete a picture +ConfirmDeletePicture=Are you sure you want to delete this picture ? +ExportDataset_produit_1=Products +ExportDataset_service_1=Services +ImportDataset_produit_1=Products +ImportDataset_service_1=Services +DeleteProductLine=Delete product line +ConfirmDeleteProductLine=Are you sure you want to delete this product line? +NoProductMatching=No product/service match your criteria +MatchingProducts=Matching products/services +NoStockForThisProduct=No stock for this product +NoStock=No Stock +Restock=Restock +ProductSpecial=Special +QtyMin=Minimum Qty +PriceQty=Price for this quantity +PriceQtyMin=Price for this min. qty (w/o discount) +VATRateForSupplierProduct=VAT Rate (for this supplier/product) +DiscountQtyMin=Default discount for qty +NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product +NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product +RecordedProducts=Products recorded +RecordedServices=Services recorded +RecordedProductsAndServices=Products/services recorded +PredefinedProductsToSell=Predefined products to sell +PredefinedServicesToSell=Predefined services to sell +PredefinedProductsAndServicesToSell=Predefined products/services to sell +PredefinedProductsToPurchase=Predefined product to purchase +PredefinedServicesToPurchase=Predefined services to purchase +PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase +GenerateThumb=Generate thumb +ProductCanvasAbility=Use special "canvas" addons +ServiceNb=Service #%s +ListProductServiceByPopularity=List of products/services by popularity +ListProductByPopularity=List of products by popularity +ListServiceByPopularity=List of services by popularity +Finished=Manufactured product +RowMaterial=Raw Material +CloneProduct=Clone product or service +ConfirmCloneProduct=Are you sure you want to clone product or service %s ? +CloneContentProduct=Clone all main informations of product/service +ClonePricesProduct=Clone main informations and prices +CloneCompositionProduct=Clone packaged product/services +ProductIsUsed=This product is used +NewRefForClone=Ref. of new product/service +CustomerPrices=Customers prices +SuppliersPrices=Suppliers prices +SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services) +CustomCode=Customs code +CountryOrigin=Origin country +HiddenIntoCombo=Hidden into select lists +Nature=Nature +ProductCodeModel=Product ref template +ServiceCodeModel=Service ref template +AddThisProductCard=Create product card +HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist. +AddThisServiceCard=Create service card +HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist. +CurrentProductPrice=Current price +AlwaysUseNewPrice=Always use current price of product/service +AlwaysUseFixedPrice=Use the fixed price +PriceByQuantity=Different prices by quantity +PriceByQuantityRange=Quantity range +ProductsDashboard=Products/Services summary +UpdateOriginalProductLabel=Modify original label +HelpUpdateOriginalProductLabel=Allows to edit the name of the product +### composition fabrication +Building=Production and items dispatchment +Build=Produce +BuildIt=Produce & Dispatch +BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action) +QtyNeed=Qty +UnitPmp=Net unit VWAP +CostPmpHT=Net total VWAP +ProductUsedForBuild=Auto consumed by production +ProductBuilded=Production completed +ProductsMultiPrice=Product multi-price +ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) +ProductSellByQuarterHT=Products turnover quarterly VWAP +ServiceSellByQuarterHT=Services turnover quarterly VWAP +Quarter1=1st. Quarter +Quarter2=2nd. Quarter +Quarter3=3rd. Quarter +Quarter4=4th. Quarter +BarCodePrintsheet=Print bar code +PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s. +NumberOfStickers=Number of stickers to print on page +PrintsheetForOneBarCode=Print several stickers for one barcode +BuildPageToPrint=Generate page to print +FillBarCodeTypeAndValueManually=Fill barcode type and value manually. +FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product. +FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty. +DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s. +DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s. +BarCodeDataForProduct=Barcode information of product %s : +BarCodeDataForThirdparty=Barcode information of thirdparty %s : +ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values) +PriceByCustomer=Different price for each customer +PriceCatalogue=Unique price per product/service +PricingRule=Rules for customer prices +AddCustomerPrice=Add price by customers +ForceUpdateChildPriceSoc=Set same price on customer subsidiaries +PriceByCustomerLog=Price by customer log +MinimumPriceLimit=Minimum price can't be lower that %s +MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions +PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey# +PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# +PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# +PriceMode=Price mode +PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang new file mode 100644 index 00000000000..0a12f4c64b7 --- /dev/null +++ b/htdocs/langs/sw_SW/projects.lang @@ -0,0 +1,142 @@ +# Dolibarr language file - Source file is en_US - projects +RefProject=Ref. project +ProjectId=Project Id +Project=Project +Projects=Projects +ProjectStatus=Project status +SharedProject=Everybody +PrivateProject=Contacts of project +MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). +ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. +ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). +MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). +TasksPublicDesc=This view presents all projects and tasks you are allowed to read. +TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). +ProjectsArea=Projects area +NewProject=New project +AddProject=Create project +DeleteAProject=Delete a project +DeleteATask=Delete a task +ConfirmDeleteAProject=Are you sure you want to delete this project ? +ConfirmDeleteATask=Are you sure you want to delete this task ? +OfficerProject=Officer project +LastProjects=Last %s projects +AllProjects=All projects +ProjectsList=List of projects +ShowProject=Show project +SetProject=Set project +NoProject=No project defined or owned +NbOpenTasks=Nb of opened tasks +NbOfProjects=Nb of projects +TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user +TimesSpent=Time spent +RefTask=Ref. task +LabelTask=Label task +TaskTimeSpent=Time spent on tasks +TaskTimeUser=User +TaskTimeNote=Note +TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined +NewTimeSpent=New time spent +MyTimeSpent=My time spent +MyTasks=My tasks +Tasks=Tasks +Task=Task +TaskDateStart=Task start date +TaskDateEnd=Task end date +TaskDescription=Task description +NewTask=New task +AddTask=Create task +AddDuration=Add duration +Activity=Activity +Activities=Tasks/activities +MyActivity=My activity +MyActivities=My tasks/activities +MyProjects=My projects +DurationEffective=Effective duration +Progress=Progress +ProgressDeclared=Declared progress +ProgressCalculated=Calculated progress +Time=Time +ListProposalsAssociatedProject=List of the commercial proposals associated with the project +ListOrdersAssociatedProject=List of customer's orders associated with the project +ListInvoicesAssociatedProject=List of customer's invoices associated with the project +ListPredefinedInvoicesAssociatedProject=List of customer's predefined invoices associated with project +ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project +ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project +ListContractAssociatedProject=List of contracts associated with the project +ListFichinterAssociatedProject=List of interventions associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project +ListActionsAssociatedProject=List of events associated with the project +ActivityOnProjectThisWeek=Activity on project this week +ActivityOnProjectThisMonth=Activity on project this month +ActivityOnProjectThisYear=Activity on project this year +ChildOfTask=Child of project/task +NotOwnerOfProject=Not owner of this private project +AffectedTo=Allocated to +CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab. +ValidateProject=Validate projet +ConfirmValidateProject=Are you sure you want to validate this project ? +CloseAProject=Close project +ConfirmCloseAProject=Are you sure you want to close this project ? +ReOpenAProject=Open project +ConfirmReOpenAProject=Are you sure you want to re-open this project ? +ProjectContact=Project contacts +ActionsOnProject=Events on project +YouAreNotContactOfProject=You are not a contact of this private project +DeleteATimeSpent=Delete time spent +ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me +TaskRessourceLinks=Ressources +ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party +NoTasks=No tasks for this project +LinkedToAnotherCompany=Linked to other third party +TaskIsNotAffectedToYou=Task not assigned to you +ErrorTimeSpentIsEmpty=Time spent is empty +ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. +IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. +CloneProject=Clone project +CloneTasks=Clone tasks +CloneContacts=Clone contacts +CloneNotes=Clone notes +CloneProjectFiles=Clone project joined files +CloneTaskFiles=Clone task(s) joined files (if task(s) cloned) +CloneMoveDate=Update project/tasks dates from now ? +ConfirmCloneProject=Are you sure to clone this project ? +ProjectReportDate=Change task date according project start date +ErrorShiftTaskDate=Impossible to shift task date according to new project start date +ProjectsAndTasksLines=Projects and tasks +ProjectCreatedInDolibarr=Project %s created +TaskCreatedInDolibarr=Task %s created +TaskModifiedInDolibarr=Task %s modified +TaskDeletedInDolibarr=Task %s deleted +##### Types de contacts ##### +TypeContact_project_internal_PROJECTLEADER=Project leader +TypeContact_project_external_PROJECTLEADER=Project leader +TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_task_internal_TASKEXECUTIVE=Task executive +TypeContact_project_task_external_TASKEXECUTIVE=Task executive +TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor +TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor +SelectElement=Select element +AddElement=Link to element +UnlinkElement=Unlink element +# Documents models +DocumentModelBaleine=A complete project's report model (logo...) +PlannedWorkload = Planned workload +WorkloadOccupation= Workload affectation +ProjectReferers=Refering objects +SearchAProject=Search a project +ProjectMustBeValidatedFirst=Project must be validated first +ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerTime=Input per time +InputPerDay=Input per day +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/sw_SW/propal.lang b/htdocs/langs/sw_SW/propal.lang new file mode 100644 index 00000000000..2b6d12870a1 --- /dev/null +++ b/htdocs/langs/sw_SW/propal.lang @@ -0,0 +1,100 @@ +# Dolibarr language file - Source file is en_US - propal +Proposals=Commercial proposals +Proposal=Commercial proposal +ProposalShort=Proposal +ProposalsDraft=Draft commercial proposals +ProposalDraft=Draft commercial proposal +ProposalsOpened=Opened commercial proposals +Prop=Commercial proposals +CommercialProposal=Commercial proposal +CommercialProposals=Commercial proposals +ProposalCard=Proposal card +NewProp=New commercial proposal +NewProposal=New commercial proposal +NewPropal=New proposal +Prospect=Prospect +ProspectList=Prospect list +DeleteProp=Delete commercial proposal +ValidateProp=Validate commercial proposal +AddProp=Create proposal +ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ? +ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name %s ? +LastPropals=Last %s proposals +LastClosedProposals=Last %s closed proposals +LastModifiedProposals=Last %s modified proposals +AllPropals=All proposals +LastProposals=Last proposals +SearchAProposal=Search a proposal +ProposalsStatistics=Commercial proposal's statistics +NumberOfProposalsByMonth=Number by month +AmountOfProposalsByMonthHT=Amount by month (net of tax) +NbOfProposals=Number of commercial proposals +ShowPropal=Show proposal +PropalsDraft=Drafts +PropalsOpened=Opened +PropalsNotBilled=Closed not billed +PropalStatusDraft=Draft (needs to be validated) +PropalStatusValidated=Validated (proposal is open) +PropalStatusOpened=Validated (proposal is open) +PropalStatusClosed=Closed +PropalStatusSigned=Signed (needs billing) +PropalStatusNotSigned=Not signed (closed) +PropalStatusBilled=Billed +PropalStatusDraftShort=Draft +PropalStatusValidatedShort=Validated +PropalStatusOpenedShort=Opened +PropalStatusClosedShort=Closed +PropalStatusSignedShort=Signed +PropalStatusNotSignedShort=Not signed +PropalStatusBilledShort=Billed +PropalsToClose=Commercial proposals to close +PropalsToBill=Signed commercial proposals to bill +ListOfProposals=List of commercial proposals +ActionsOnPropal=Events on proposal +NoOpenedPropals=No opened commercial proposals +NoOtherOpenedPropals=No other opened commercial proposals +RefProposal=Commercial proposal ref +SendPropalByMail=Send commercial proposal by mail +AssociatedDocuments=Documents associated with the proposal: +ErrorCantOpenDir=Can't open directory +DatePropal=Date of proposal +DateEndPropal=Validity ending date +DateEndPropalShort=Date end +ValidityDuration=Validity duration +CloseAs=Close with status +ClassifyBilled=Classify billed +BuildBill=Build invoice +ErrorPropalNotFound=Propal %s not found +Estimate=Estimate : +EstimateShort=Estimate +OtherPropals=Other proposals +AddToDraftProposals=Add to draft proposal +NoDraftProposals=No draft proposals +CopyPropalFrom=Create commercial proposal by copying existing proposal +CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services +DefaultProposalDurationValidity=Default commercial proposal validity duration (in days) +UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address +ClonePropal=Clone commercial proposal +ConfirmClonePropal=Are you sure you want to clone the commercial proposal %s ? +ConfirmReOpenProp=Are you sure you want to open back the commercial proposal %s ? +ProposalsAndProposalsLines=Commercial proposal and lines +ProposalLine=Proposal line +AvailabilityPeriod=Availability delay +SetAvailability=Set availability delay +AfterOrder=after order +##### Availability ##### +AvailabilityTypeAV_NOW=Immediate +AvailabilityTypeAV_1W=1 week +AvailabilityTypeAV_2W=2 weeks +AvailabilityTypeAV_3W=3 weeks +AvailabilityTypeAV_1M=1 month +##### Types de contacts ##### +TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal +TypeContact_propal_external_BILLING=Customer invoice contact +TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal +# Document models +DocModelAzurDescription=A complete proposal model (logo...) +DocModelJauneDescription=Jaune proposal model +DefaultModelPropalCreate=Default model creation +DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) +DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) diff --git a/htdocs/langs/sw_SW/resource.lang b/htdocs/langs/sw_SW/resource.lang new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/sw_SW/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/sw_SW/salaries.lang b/htdocs/langs/sw_SW/salaries.lang new file mode 100644 index 00000000000..28c21adfad3 --- /dev/null +++ b/htdocs/langs/sw_SW/salaries.lang @@ -0,0 +1,13 @@ +# Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge +Salary=Salary +Salaries=Salaries +Employee=Employee +NewSalaryPayment=New salary payment +SalaryPayment=Salary payment +SalariesPayments=Salaries payments +ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/sw_SW/sendings.lang b/htdocs/langs/sw_SW/sendings.lang new file mode 100644 index 00000000000..b1ff55f71c1 --- /dev/null +++ b/htdocs/langs/sw_SW/sendings.lang @@ -0,0 +1,85 @@ +# Dolibarr language file - Source file is en_US - sendings +RefSending=Ref. shipment +Sending=Shipment +Sendings=Shipments +Shipment=Shipment +Shipments=Shipments +ShowSending=Show Sending +Receivings=Receipts +SendingsArea=Shipments area +ListOfSendings=List of shipments +SendingMethod=Shipping method +SendingReceipt=Shipping receipt +LastSendings=Last %s shipments +SearchASending=Search for shipment +StatisticsOfSendings=Statistics for shipments +NbOfSendings=Number of shipments +NumberOfShipmentsByMonth=Number of shipments by month +SendingCard=Shipment card +NewSending=New shipment +CreateASending=Create a shipment +CreateSending=Create shipment +QtyOrdered=Qty ordered +QtyShipped=Qty shipped +QtyToShip=Qty to ship +QtyReceived=Qty received +KeepToShip=Remain to ship +OtherSendingsForSameOrder=Other shipments for this order +DateSending=Date sending order +DateSendingShort=Date sending order +SendingsForSameOrder=Shipments for this order +SendingsAndReceivingForSameOrder=Shipments and receivings for this order +SendingsToValidate=Shipments to validate +StatusSendingCanceled=Canceled +StatusSendingDraft=Draft +StatusSendingValidated=Validated (products to ship or already shipped) +StatusSendingProcessed=Processed +StatusSendingCanceledShort=Canceled +StatusSendingDraftShort=Draft +StatusSendingValidatedShort=Validated +StatusSendingProcessedShort=Processed +SendingSheet=Shipment sheet +Carriers=Carriers +Carrier=Carrier +CarriersArea=Carriers area +NewCarrier=New carrier +ConfirmDeleteSending=Are you sure you want to delete this shipment ? +ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? +ConfirmCancelSending=Are you sure you want to cancel this shipment ? +GenericTransport=Generic transport +Enlevement=Gotten by customer +DocumentModelSimple=Simple document model +DocumentModelMerou=Merou A5 model +WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +DateDeliveryPlanned=Planed date of delivery +DateReceived=Date delivery received +SendShippingByEMail=Send shipment by EMail +SendShippingRef=Submission of shipment %s +ActionsOnShipping=Events on shipment +LinkToTrackYourPackage=Link to track your package +ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +RelatedShippings=Related shipments +ShipmentLine=Shipment line +CarrierList=List of transporters +SendingRunning=Product from ordered customer orders +SuppliersReceiptRunning=Product from ordered supplier orders +ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders +ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders +ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent +ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received + +# Sending methods +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo +# ModelDocument +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/sw_SW/sms.lang b/htdocs/langs/sw_SW/sms.lang new file mode 100644 index 00000000000..4e89bb24730 --- /dev/null +++ b/htdocs/langs/sw_SW/sms.lang @@ -0,0 +1,53 @@ +# Dolibarr language file - Source file is en_US - sms +Sms=Sms +SmsSetup=Sms setup +SmsDesc=This page allows you to define globals options on SMS features +SmsCard=SMS Card +AllSms=All SMS campains +SmsTargets=Targets +SmsRecipients=Targets +SmsRecipient=Target +SmsTitle=Description +SmsFrom=Sender +SmsTo=Target +SmsTopic=Topic of SMS +SmsText=Message +SmsMessage=SMS Message +ShowSms=Show Sms +ListOfSms=List SMS campains +NewSms=New SMS campain +EditSms=Edit Sms +ResetSms=New sending +DeleteSms=Delete Sms campain +DeleteASms=Remove a Sms campain +PreviewSms=Previuw Sms +PrepareSms=Prepare Sms +CreateSms=Create Sms +SmsResult=Result of Sms sending +TestSms=Test Sms +ValidSms=Validate Sms +ApproveSms=Approve Sms +SmsStatusDraft=Draft +SmsStatusValidated=Validated +SmsStatusApproved=Approved +SmsStatusSent=Sent +SmsStatusSentPartialy=Sent partially +SmsStatusSentCompletely=Sent completely +SmsStatusError=Error +SmsStatusNotSent=Not sent +SmsSuccessfulySent=Sms correctly sent (from %s to %s) +ErrorSmsRecipientIsEmpty=Number of target is empty +WarningNoSmsAdded=No new phone number to add to target list +ConfirmValidSms=Do you confirm validation of this campain ? +ConfirmResetMailing=Warning, if you make a reinit of Sms campain %s, you will allow to make a mass sending of it a second time. Is it really what you wan to do ? +ConfirmDeleteMailing=Do you confirm removing of campain ? +NbOfRecipients=Number of targets +NbOfUniqueSms=Nb dof unique phone numbers +NbOfSms=Nbre of phon numbers +ThisIsATestMessage=This is a test message +SendSms=Send SMS +SmsInfoCharRemain=Nb of remaining characters +SmsInfoNumero= (format international ie : +33899701761) +DelayBeforeSending=Delay before sending (minutes) +SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider. + diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang new file mode 100644 index 00000000000..29706d17615 --- /dev/null +++ b/htdocs/langs/sw_SW/stocks.lang @@ -0,0 +1,134 @@ +# Dolibarr language file - Source file is en_US - stocks +WarehouseCard=Warehouse card +Warehouse=Warehouse +Warehouses=Warehouses +NewWarehouse=New warehouse / Stock area +WarehouseEdit=Modify warehouse +MenuNewWarehouse=New warehouse +WarehouseOpened=Warehouse opened +WarehouseClosed=Warehouse closed +WarehouseSource=Source warehouse +WarehouseSourceNotDefined=No warehouse defined, +AddOne=Add one +WarehouseTarget=Target warehouse +ValidateSending=Delete sending +CancelSending=Cancel sending +DeleteSending=Delete sending +Stock=Stock +Stocks=Stocks +Movement=Movement +Movements=Movements +ErrorWarehouseRefRequired=Warehouse reference name is required +ErrorWarehouseLabelRequired=Warehouse label is required +CorrectStock=Correct stock +ListOfWarehouses=List of warehouses +ListOfStockMovements=List of stock movements +StocksArea=Warehouses area +Location=Location +LocationSummary=Short name location +NumberOfDifferentProducts=Number of different products +NumberOfProducts=Total number of products +LastMovement=Last movement +LastMovements=Last movements +Units=Units +Unit=Unit +StockCorrection=Correct stock +StockTransfer=Stock transfer +StockMovement=Transfer +StockMovements=Stock transfers +LabelMovement=Movement label +NumberOfUnit=Number of units +UnitPurchaseValue=Unit purchase price +TotalStock=Total in stock +StockTooLow=Stock too low +StockLowerThanLimit=Stock lower than alert limit +EnhancedValue=Value +PMPValue=Weighted average price +PMPValueShort=WAP +EnhancedValueOfWarehouses=Warehouses value +UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant +QtyDispatched=Quantity dispatched +QtyDispatchedShort=Qty dispatched +QtyToDispatchShort=Qty to dispatch +OrderDispatch=Stock dispatching +RuleForStockManagementDecrease=Rule for stock management decrease +RuleForStockManagementIncrease=Rule for stock management increase +DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation +DeStockOnValidateOrder=Decrease real stocks on customers orders validation +DeStockOnShipment=Decrease real stocks on shipment validation +ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation +ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation +ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving +ReStockOnDeleteInvoice=Increase real stocks on invoice deletion +OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses. +StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock +NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required. +DispatchVerb=Dispatch +StockLimitShort=Limit for alert +StockLimit=Stock limit for alert +PhysicalStock=Physical stock +RealStock=Real Stock +VirtualStock=Virtual stock +MininumStock=Minimum stock +StockUp=Stock up +MininumStockShort=Stock min +StockUpShort=Stock up +IdWarehouse=Id warehouse +DescWareHouse=Description warehouse +LieuWareHouse=Localisation warehouse +WarehousesAndProducts=Warehouses and products +AverageUnitPricePMPShort=Weighted average input price +AverageUnitPricePMP=Weighted average input price +SellPriceMin=Selling Unit Price +EstimatedStockValueSellShort=Value to sell +EstimatedStockValueSell=Value to Sell +EstimatedStockValueShort=Input stock value +EstimatedStockValue=Input stock value +DeleteAWarehouse=Delete a warehouse +ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse %s ? +PersonalStock=Personal stock %s +ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s +SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease +SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase +NoStockAction=No stock action +LastWaitingSupplierOrders=Orders waiting for receptions +DesiredStock=Desired stock +StockToBuy=To order +Replenishment=Replenishment +ReplenishmentOrders=Replenishment orders +VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs +UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature +UseVirtualStock=Use virtual stock +UsePhysicalStock=Use physical stock +CurentSelectionMode=Curent selection mode +CurentlyUsingVirtualStock=Virtual stock +CurentlyUsingPhysicalStock=Physical stock +RuleForStockReplenishment=Rule for stocks replenishment +SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier +AlertOnly= Alerts only +WarehouseForStockDecrease=The warehouse %s will be used for stock decrease +WarehouseForStockIncrease=The warehouse %s will be used for stock increase +ForThisWarehouse=For this warehouse +ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. +Replenishments=Replenishments +NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) +NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) +MassMovement=Mass movement +MassStockMovement=Mass stock movement +SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". +RecordMovement=Record transfert +ReceivingForSameOrder=Receipts for this order +StockMovementRecorded=Stock movements recorded +RuleForStockAvailability=Rules on stock requirements +StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice +StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order +StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment +MovementLabel=Label of movement +InventoryCode=Movement or inventory code +IsInPackage=Contained into package +ShowWarehouse=Show warehouse +MovementCorrectStock=Stock content correction for product %s +MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang new file mode 100644 index 00000000000..baf573c66ac --- /dev/null +++ b/htdocs/langs/sw_SW/suppliers.lang @@ -0,0 +1,45 @@ +# Dolibarr language file - Source file is en_US - suppliers +Suppliers=Suppliers +AddSupplier=Create a supplier +SupplierRemoved=Supplier removed +SuppliersInvoice=Suppliers invoice +NewSupplier=New supplier +History=History +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier +OrderDate=Order date +BuyingPrice=Buying price +BuyingPriceMin=Minimum buying price +BuyingPriceMinShort=Min buying price +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined +AddSupplierPrice=Add supplier price +ChangeSupplierPrice=Change supplier price +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s +NoRecordedSuppliers=No suppliers recorded +SupplierPayment=Supplier payment +SuppliersArea=Suppliers area +RefSupplierShort=Ref. supplier +Availability=Availability +ExportDataset_fournisseur_1=Supplier invoices list and invoice lines +ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_3=Supplier orders and order lines +ApproveThisOrder=Approve this order +ConfirmApproveThisOrder=Are you sure you want to approve order %s ? +DenyingThisOrder=Deny this order +ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? +ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? +AddCustomerOrder=Create customer order +AddCustomerInvoice=Create customer invoice +AddSupplierOrder=Create supplier order +AddSupplierInvoice=Create supplier invoice +ListOfSupplierProductForSupplier=List of products and prices for supplier %s +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice +NbDaysToDelivery=Delivery delay in days +DescNbDaysToDelivery=The biggest delay is display among order product list diff --git a/htdocs/langs/sw_SW/trips.lang b/htdocs/langs/sw_SW/trips.lang new file mode 100644 index 00000000000..ba36fc9b07b --- /dev/null +++ b/htdocs/langs/sw_SW/trips.lang @@ -0,0 +1,126 @@ +# Dolibarr language file - Source file is en_US - trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report +ListOfFees=List of fees +NewTrip=New expense report +CompanyVisited=Company/foundation visited +Kilometers=Kilometers +FeesKilometersOrAmout=Amount or kilometers +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report +ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang new file mode 100644 index 00000000000..baf209f9d1c --- /dev/null +++ b/htdocs/langs/sw_SW/users.lang @@ -0,0 +1,122 @@ +# Dolibarr language file - Source file is en_US - users +HRMArea=HRM area +UserCard=User card +ContactCard=Contact card +GroupCard=Group card +NoContactCard=No card among contacts +Permission=Permission +Permissions=Permissions +EditPassword=Edit password +SendNewPassword=Regenerate and send password +ReinitPassword=Regenerate password +PasswordChangedTo=Password changed to: %s +SubjectNewPassword=Your new password for Dolibarr +AvailableRights=Available permissions +OwnedRights=Owned permissions +GroupRights=Group permissions +UserRights=User permissions +UserGUISetup=User display setup +DisableUser=Disable +DisableAUser=Disable a user +DeleteUser=Delete +DeleteAUser=Delete a user +DisableGroup=Disable +DisableAGroup=Disable a group +EnableAUser=Enable a user +EnableAGroup=Enable a group +DeleteGroup=Delete +DeleteAGroup=Delete a group +ConfirmDisableUser=Are you sure you want to disable user %s ? +ConfirmDisableGroup=Are you sure you want to disable group %s ? +ConfirmDeleteUser=Are you sure you want to delete user %s ? +ConfirmDeleteGroup=Are you sure you want to delete group %s ? +ConfirmEnableUser=Are you sure you want to enable user %s ? +ConfirmEnableGroup=Are you sure you want to enable group %s ? +ConfirmReinitPassword=Are you sure you want to generate a new password for user %s ? +ConfirmSendNewPassword=Are you sure you want to generate and send new password for user %s ? +NewUser=New user +CreateUser=Create user +SearchAGroup=Search a group +SearchAUser=Search a user +LoginNotDefined=Login is not defined. +NameNotDefined=Name is not defined. +ListOfUsers=List of users +Administrator=Administrator +SuperAdministrator=Super Administrator +SuperAdministratorDesc=Global administrator +AdministratorDesc=Administrator's entity +DefaultRights=Default permissions +DefaultRightsDesc=Define here default permissions that are automatically granted to a new created user (Go on user card to change permission of an existing user). +DolibarrUsers=Dolibarr users +LastName=Name +FirstName=First name +ListOfGroups=List of groups +NewGroup=New group +CreateGroup=Create group +RemoveFromGroup=Remove from group +PasswordChangedAndSentTo=Password changed and sent to %s. +PasswordChangeRequestSent=Request to change password for %s sent to %s. +MenuUsersAndGroups=Users & Groups +LastGroupsCreated=Last %s created groups +LastUsersCreated=Last %s users created +ShowGroup=Show group +ShowUser=Show user +NonAffectedUsers=Non assigned users +UserModified=User modified successfully +PhotoFile=Photo file +UserWithDolibarrAccess=User with Dolibarr access +ListOfUsersInGroup=List of users in this group +ListOfGroupsForUser=List of groups for this user +UsersToAdd=Users to add to this group +GroupsToAdd=Groups to add to this user +NoLogin=No login +LinkToCompanyContact=Link to third party / contact +LinkedToDolibarrMember=Link to member +LinkedToDolibarrUser=Link to Dolibarr user +LinkedToDolibarrThirdParty=Link to Dolibarr third party +CreateDolibarrLogin=Create a user +CreateDolibarrThirdParty=Create a third party +LoginAccountDisable=Account disabled, put a new login to activate it. +LoginAccountDisableInDolibarr=Account disabled in Dolibarr. +LoginAccountDisableInLdap=Account disabled in the domain. +UsePersonalValue=Use personal value +GuiLanguage=Interface language +InternalUser=Internal user +MyInformations=My data +ExportDataset_user_1=Dolibarr's users and properties +DomainUser=Domain user %s +Reactivate=Reactivate +CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. +InternalExternalDesc=An internal user is a user that is part of your company/foundation.
An external user is a customer, supplier or other.

In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display) +PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group. +Inherited=Inherited +UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party) +UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party) +IdPhoneCaller=Id phone caller +UserLogged=User %s login +UserLogoff=User %s logout +NewUserCreated=User %s created +NewUserPassword=Password change for %s +EventUserModified=User %s modified +UserDisabled=User %s disabled +UserEnabled=User %s activated +UserDeleted=User %s removed +NewGroupCreated=Group %s created +GroupModified=Group %s modified +GroupDeleted=Group %s removed +ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? +ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? +ConfirmCreateThirdParty=Are you sure you want to create a third party for this member ? +LoginToCreate=Login to create +NameToCreate=Name of third party to create +YourRole=Your roles +YourQuotaOfUsersIsReached=Your quota of active users is reached ! +NbOfUsers=Nb of users +DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin +HierarchicalResponsible=Supervisor +HierarchicView=Hierarchical view +UseTypeFieldToChange=Use field Type to change +OpenIDURL=OpenID URL +LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang new file mode 100644 index 00000000000..c36ffbf025a --- /dev/null +++ b/htdocs/langs/sw_SW/withdrawals.lang @@ -0,0 +1,97 @@ +# Dolibarr language file - Source file is en_US - withdrawals +StandingOrdersArea=Standing orders area +CustomersStandingOrdersArea=Customers standing orders area +StandingOrders=Standing orders +StandingOrder=Standing orders +NewStandingOrder=New standing order +StandingOrderToProcess=To process +StandingOrderProcessed=Processed +Withdrawals=Withdrawals +Withdrawal=Withdrawal +WithdrawalsReceipts=Withdrawal receipts +WithdrawalReceipt=Withdrawal receipt +WithdrawalReceiptShort=Receipt +LastWithdrawalReceipts=Last %s withdrawal receipts +WithdrawedBills=Withdrawn invoices +WithdrawalsLines=Withdrawal lines +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. +CustomersStandingOrders=Customer standing orders +CustomerStandingOrder=Customer standing order +NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request +NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information +InvoiceWaitingWithdraw=Invoice waiting for withdraw +AmountToWithdraw=Amount to withdraw +WithdrawsRefused=Withdraws refused +NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request. +ResponsibleUser=Responsible user +WithdrawalsSetup=Withdrawal setup +WithdrawStatistics=Withdraw's statistics +WithdrawRejectStatistics=Withdraw reject's statistics +LastWithdrawalReceipt=Last %s withdrawing receipts +MakeWithdrawRequest=Make a withdraw request +ThirdPartyBankCode=Third party bank code +ThirdPartyDeskCode=Third party desk code +NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN. +ClassCredited=Classify credited +ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account? +TransData=Transmission date +TransMetod=Transmission method +Send=Send +Lines=Lines +StandingOrderReject=Issue a rejection +WithdrawalRefused=Withdrawal refused +WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society +RefusedData=Date of rejection +RefusedReason=Reason for rejection +RefusedInvoicing=Billing the rejection +NoInvoiceRefused=Do not charge the rejection +InvoiceRefused=Invoice refused (Charge the rejection to customer) +Status=Status +StatusUnknown=Unknown +StatusWaiting=Waiting +StatusTrans=Sent +StatusCredited=Credited +StatusRefused=Refused +StatusMotif0=Unspecified +StatusMotif1=Insufficient funds +StatusMotif2=Request contested +StatusMotif3=No Withdrawal order +StatusMotif4=Customer Order +StatusMotif5=RIB unusable +StatusMotif6=Account without balance +StatusMotif7=Judicial Decision +StatusMotif8=Other reason +CreateAll=Withdraw all +CreateGuichet=Only office +CreateBanque=Only bank +OrderWaiting=Waiting for treatment +NotifyTransmision=Withdrawal Transmission +NotifyEmision=Withdrawal Emission +NotifyCredit=Withdrawal Credit +NumeroNationalEmetter=National Transmitter Number +PleaseSelectCustomerBankBANToWithdraw=Select information about customer bank account to withdraw +WithBankUsingRIB=For bank accounts using RIB +WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT +BankToReceiveWithdraw=Bank account to receive withdraws +CreditDate=Credit on +WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) +ShowWithdraw=Show Withdraw +IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. +WithdrawalFile=Withdrawal file +SetToStatusSent=Set to status "File Sent" +ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines + +### Notifications +InfoCreditSubject=Payment of standing order %s by the bank +InfoCreditMessage=The standing order %s has been paid by the bank
Data of payment: %s +InfoTransSubject=Transmission of standing order %s to bank +InfoTransMessage=The standing order %s has been sent to bank by %s %s.

+InfoTransData=Amount: %s
Method: %s
Date: %s +InfoFoot=This is an automated message sent by Dolibarr +InfoRejectSubject=Standing order refused +InfoRejectMessage=Hello,

the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.

--
%s +ModeWarning=Option for real mode was not set, we stop after this simulation diff --git a/htdocs/langs/sw_SW/workflow.lang b/htdocs/langs/sw_SW/workflow.lang new file mode 100644 index 00000000000..17c8dd3aafa --- /dev/null +++ b/htdocs/langs/sw_SW/workflow.lang @@ -0,0 +1,11 @@ +# Dolibarr language file - Source file is en_US - admin +WorkflowSetup=Workflow module setup +WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in. +ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated. +descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed +descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed +descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated +descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang new file mode 100644 index 00000000000..bb9b358c045 --- /dev/null +++ b/htdocs/langs/uz_UZ/accountancy.lang @@ -0,0 +1,160 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Export=Export +Modelcsv=Model of export +OptionsDeactivatedForThisExportModel=For this export model, options are deactivated +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Breakdown +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic breakdown + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTING_SEPARATORCSV=Column separator in export file + +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal + +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait + +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Breakdown card diff --git a/htdocs/langs/uz_UZ/link.lang b/htdocs/langs/uz_UZ/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/uz_UZ/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/uz_UZ/printipp.lang b/htdocs/langs/uz_UZ/printipp.lang new file mode 100644 index 00000000000..835e6827f12 --- /dev/null +++ b/htdocs/langs/uz_UZ/printipp.lang @@ -0,0 +1,14 @@ +# Dolibarr language file - Source file is en_US - printipp +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang new file mode 100644 index 00000000000..45263681965 --- /dev/null +++ b/htdocs/langs/uz_UZ/productbatch.lang @@ -0,0 +1,21 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Use batch/serial number +ProductStatusOnBatch=Yes (Batch/serial required) +ProductStatusNotOnBatch=No (Batch/serial not used) +ProductStatusOnBatchShort=Yes +ProductStatusNotOnBatchShort=No +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. +ProductDoesNotUseBatchSerial=This product does not use batch/serial number diff --git a/htdocs/langs/uz_UZ/resource.lang b/htdocs/langs/uz_UZ/resource.lang new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/uz_UZ/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang new file mode 100644 index 00000000000..28c21adfad3 --- /dev/null +++ b/htdocs/langs/uz_UZ/salaries.lang @@ -0,0 +1,13 @@ +# Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge +Salary=Salary +Salaries=Salaries +Employee=Employee +NewSalaryPayment=New salary payment +SalaryPayment=Salary payment +SalariesPayments=Salaries payments +ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary From 7cab558ed2f9076dddebfc616591b90f8f72cfb0 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Sat, 14 Mar 2015 09:44:58 +0100 Subject: [PATCH 071/412] Fix: Showing system error if not enough stock of product into orders creation with lines --- ChangeLog | 1 + htdocs/commande/class/commande.class.php | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0664bda856d..2bcf02febf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ English Dolibarr ChangeLog - Fix: [ bug #1790 ] Email form behaves in an unexpected way when pressing Enter key - Fix: Bad SEPA xml file creation - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment +- Fix: Showing system error if not enough stock of product into orders creation with lines ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 573778e808c..cac43ced746 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2010-2013 Juanjo Menent + * Copyright (C) 2010-2015 Juanjo Menent * Copyright (C) 2011 Jean Heimburger * Copyright (C) 2012-2014 Christophe Battarel * Copyright (C) 2013 Florian Henry @@ -100,6 +100,11 @@ class Commande extends CommonOrder // Pour board var $nbtodo; var $nbtodolate; + + /** + * ERR Not engouch stock + */ + const STOCK_NOT_ENOUGH_FOR_ORDER = -3; /** @@ -734,8 +739,11 @@ class Commande extends CommonOrder ); if ($result < 0) { - $this->error=$this->db->lasterror(); - dol_print_error($this->db); + if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER) + { + $this->error=$this->db->lasterror(); + dol_print_error($this->db); + } $this->db->rollback(); return -1; } @@ -1169,10 +1177,12 @@ class Commande extends CommonOrder $result=$product->fetch($fk_product); $product_type=$product->type; - if($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER && $product_type == 0 && $product->stock_reel < $qty) { + if($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER && $product_type == 0 && $product->stock_reel < $qty) + { $this->error=$langs->trans('ErrorStockIsNotEnough'); + dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR); $this->db->rollback(); - return -3; + return self::STOCK_NOT_ENOUGH_FOR_ORDER; } } From 4ae1106ffb1b31bc286d72a32c31ba7c66fc1b6d Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Sat, 14 Mar 2015 09:50:38 +0100 Subject: [PATCH 072/412] Fix: Showing system error if not enough stock of product into orders creation with lines Conflicts: htdocs/commande/class/commande.class.php --- ChangeLog | 1 + htdocs/commande/class/commande.class.php | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64cd43f7030..2d8c32c7986 100644 --- a/ChangeLog +++ b/ChangeLog @@ -202,6 +202,7 @@ Dolibarr better: - Fix: [ bug #1790 ] Email form behaves in an unexpected way when pressing Enter key - Fix: Bad SEPA xml file creation - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment +- Fix: Showing system error if not enough stock of product into orders creation with lines ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 1cdd57b1b6a..519ba8cd43f 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2010-2014 Juanjo Menent + * Copyright (C) 2010-2015 Juanjo Menent * Copyright (C) 2011 Jean Heimburger * Copyright (C) 2012-2014 Christophe Battarel * Copyright (C) 2013 Florian Henry @@ -109,6 +109,11 @@ class Commande extends CommonOrder // Pour board var $nbtodo; var $nbtodolate; + + /** + * ERR Not engouch stock + */ + const STOCK_NOT_ENOUGH_FOR_ORDER = -3; /** @@ -745,8 +750,11 @@ class Commande extends CommonOrder ); if ($result < 0) { - $this->error=$this->db->lasterror(); - dol_print_error($this->db); + if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER) + { + $this->error=$this->db->lasterror(); + dol_print_error($this->db); + } $this->db->rollback(); return -1; } @@ -1185,10 +1193,12 @@ class Commande extends CommonOrder $result=$product->fetch($fk_product); $product_type=$product->type; - if($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER && $product_type == 0 && $product->stock_reel < $qty) { + if($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER && $product_type == 0 && $product->stock_reel < $qty) + { $this->error=$langs->trans('ErrorStockIsNotEnough'); + dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR); $this->db->rollback(); - return -3; + return self::STOCK_NOT_ENOUGH_FOR_ORDER; } } From a63b1cf4c30c2fa124fc5f227a250c5726ee0c55 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Sat, 14 Mar 2015 09:57:28 +0100 Subject: [PATCH 073/412] Fix: Showing system error if not enough stock of product into orders creation with lines Conflicts: htdocs/commande/class/commande.class.php --- ChangeLog | 1 + htdocs/commande/class/commande.class.php | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e250846ffe1..60521f04c81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -234,6 +234,7 @@ Dolibarr better: - Fix: [ bug #1790 ] Email form behaves in an unexpected way when pressing Enter key - Fix: Bad SEPA xml file creation - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment +- Fix: Showing system error if not enough stock of product into orders creation with lines ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 3402999b350..8dcaca59a97 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3,7 +3,7 @@ * Copyright (C) 2004-2012 Laurent Destailleur * Copyright (C) 2005-2014 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2010-2014 Juanjo Menent + * Copyright (C) 2010-2015 Juanjo Menent * Copyright (C) 2011 Jean Heimburger * Copyright (C) 2012-2014 Christophe Battarel * Copyright (C) 2013 Florian Henry @@ -110,6 +110,11 @@ class Commande extends CommonOrder var $fk_incoterms; var $location_incoterms; var $libelle_incoterms; //Used into tooltip + + /** + * ERR Not engouch stock + */ + const STOCK_NOT_ENOUGH_FOR_ORDER = -3; /** @@ -752,8 +757,11 @@ class Commande extends CommonOrder ); if ($result < 0) { - $this->error=$this->db->lasterror(); - dol_print_error($this->db); + if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER) + { + $this->error=$this->db->lasterror(); + dol_print_error($this->db); + } $this->db->rollback(); return -1; } @@ -1192,10 +1200,12 @@ class Commande extends CommonOrder $result=$product->fetch($fk_product); $product_type=$product->type; - if($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER && $product_type == 0 && $product->stock_reel < $qty) { + if($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER && $product_type == 0 && $product->stock_reel < $qty) + { $this->error=$langs->trans('ErrorStockIsNotEnough'); + dol_syslog(get_class($this)."::addline error=Product ".$product->ref.": ".$this->error, LOG_ERR); $this->db->rollback(); - return -3; + return self::STOCK_NOT_ENOUGH_FOR_ORDER; } } From 851cae80a26b0cc8c5aa73f2d98d3c015fd18d6e Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Sat, 14 Mar 2015 10:16:50 +0100 Subject: [PATCH 074/412] Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line 159 --- htdocs/compta/prelevement/class/rejetprelevement.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php index 176a561378b..2ef37c29e18 100644 --- a/htdocs/compta/prelevement/class/rejetprelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -156,7 +156,7 @@ class RejetPrelevement } else { - $result=$pai->addPaymentToBank($user,'payment','(InvoiceRefused)',$bankaccount); + $result=$pai->addPaymentToBank($user,'payment','(InvoiceRefused)',$bankaccount,'',''); if ($result < 0) { dol_syslog("RejetPrelevement::Create AddPaymentToBan Error"); From a2adeb28073d06f6963e4b187d408b974ef95d1f Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Sat, 14 Mar 2015 10:16:50 +0100 Subject: [PATCH 075/412] Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line 159 --- htdocs/compta/prelevement/class/rejetprelevement.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php index 176a561378b..2ef37c29e18 100644 --- a/htdocs/compta/prelevement/class/rejetprelevement.class.php +++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php @@ -156,7 +156,7 @@ class RejetPrelevement } else { - $result=$pai->addPaymentToBank($user,'payment','(InvoiceRefused)',$bankaccount); + $result=$pai->addPaymentToBank($user,'payment','(InvoiceRefused)',$bankaccount,'',''); if ($result < 0) { dol_syslog("RejetPrelevement::Create AddPaymentToBan Error"); From 605a7dee0e0253b3c85c465dae6e0f919977d779 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2015 11:56:28 +0100 Subject: [PATCH 076/412] Fix: Deleting task do not return to correct page --- htdocs/projet/tasks/task.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index a9cd64e33b5..4bd361d452b 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -110,17 +110,14 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer) if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->supprimer) { - if ($object->fetch($id,$ref) >= 0 ) + if ($object->fetch($id,$ref) >= 0) { - $result=$projectstatic->fetch($object->fk_projet); - if (! empty($projectstatic->socid)) - { - $projectstatic->societe->fetch($projectstatic->socid); - } + $result=$projectstatic->fetch($object->fk_project); + $projectstatic->fetch_thirdparty(); if ($object->delete($user) > 0) { - header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id); + header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?id='.$projectstatic->id.($withproject?'&withproject=1':'')); exit; } else From 41a05bc4bad8260d01796beecadeae92e80cc40a Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sat, 14 Mar 2015 12:04:00 +0100 Subject: [PATCH 077/412] Update actions_extrafields.inc.php add new type of extrafields "link" : linked to dolibarr element --- htdocs/core/actions_extrafields.inc.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php index d5f8ea7c18c..03d724b9bba 100644 --- a/htdocs/core/actions_extrafields.inc.php +++ b/htdocs/core/actions_extrafields.inc.php @@ -80,6 +80,13 @@ if ($action == 'add') $mesg[]=$langs->trans("ErrorNoValueForCheckBoxType"); $action = 'create'; } + if (GETPOST('type')=='link' && !GETPOST('param')) + { + $error++; + $langs->load("errors"); + $mesg[]=$langs->trans("ErrorNoValueForLinkType"); + $action = 'create'; + } if (GETPOST('type')=='radio' && !GETPOST('param')) { $error++; From df9f822a705968e57349ad487eab910dfeabfa16 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sat, 14 Mar 2015 12:25:17 +0100 Subject: [PATCH 078/412] Update commonobject.class.php new extafields type --- htdocs/core/class/commonobject.class.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 36101e4b081..a316c3cd511 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3624,6 +3624,7 @@ abstract class CommonObject $attributeType = $extrafields->attribute_type[$attributeKey]; $attributeSize = $extrafields->attribute_size[$attributeKey]; $attributeLabel = $extrafields->attribute_label[$attributeKey]; + $attributeParam = $extrafields->attribute_param[$attributeKey]; switch ($attributeType) { case 'int': @@ -3646,6 +3647,19 @@ abstract class CommonObject case 'datetime': $this->array_options[$key]=$this->db->idate($this->array_options[$key]); break; + case 'link': + $param_list=array_keys($attributeParam ['options']); + // 0 : ObjectName + // 1 : classPath + $InfoFieldList = explode(":", $param_list[0]); + dol_include_once($InfoFieldList[1]); + $object = new $InfoFieldList[0]($this->db); + if ($value) + { + $object->fetch(0,$value); + $this->array_options[$key]=$object->id; + } + break; } } $this->db->begin(); From 0aa236069193adc9e0704153ed25edaafd80c7f2 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sat, 14 Mar 2015 12:31:22 +0100 Subject: [PATCH 079/412] Update extrafields.class.php add new extrafields type 'link' --- htdocs/core/class/extrafields.class.php | 36 +++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 7bebeb0b660..361c14319eb 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -6,6 +6,7 @@ * Copyright (C) 2009-2012 Laurent Destailleur * Copyright (C) 2009-2012 Regis Houssin * Copyright (C) 2013 Florian Henry + * Copyright (C) 2015 Charles-Fr BENKE * * 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 @@ -77,6 +78,7 @@ class ExtraFields 'checkbox' => 'ExtrafieldCheckBox', 'radio' => 'ExtrafieldRadio', 'chkbxlst' => 'ExtrafieldCheckBoxFromList', + 'link' => 'ExtrafieldLink', ); /** @@ -187,6 +189,9 @@ class ExtraFields } elseif (($type=='select') || ($type=='sellist') || ($type=='radio') ||($type=='checkbox') ||($type=='chkbxlst')){ $typedb='text'; $lengthdb=''; + } elseif ($type=='link') { + $typedb='int'; + $lengthdb='11'; } else { $typedb=$type; $lengthdb=$length; @@ -404,6 +409,9 @@ class ExtraFields } elseif (($type=='select') || ($type=='sellist') || ($type=='radio') || ($type=='checkbox') || ($type=='chkbxlst')) { $typedb='text'; $lengthdb=''; + } elseif ($type=='link') { + $typedb='int'; + $lengthdb='11'; } else { $typedb=$type; $lengthdb=$length; @@ -1043,6 +1051,19 @@ class ExtraFields } $out .= ''; } + elseif ($type == 'link') + { + $out=''; + $param_list=array_keys($param['options']); + // 0 : ObjectName + // 1 : classPath + $InfoFieldList = explode(":", $param_list[0]); + dol_include_once($InfoFieldList[1]); + $object = new $InfoFieldList[0]($this->db); + $object->fetch($value); + $out=''; + + } /* Add comments if ($type == 'date') $out.=' (YYYY-MM-DD)'; elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)'; @@ -1268,6 +1289,21 @@ class ExtraFields } else dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING); } + elseif ($type == 'link') + { + $out=''; + $param_list=array_keys($params['options']); + // 0 : ObjectName + // 1 : classPath + $InfoFieldList = explode(":", $param_list[0]); + dol_include_once($InfoFieldList[1]); + $object = new $InfoFieldList[0]($this->db); + if ($value) + { + $object->fetch($value); + $value=$object->getNomUrl(3); + } + } else { $showsize=round($size); From 5670e928427acb729abcdc54b6713beb4fee5e60 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2015 12:35:03 +0100 Subject: [PATCH 080/412] Position of field into pdf baleine --- .../project/doc/pdf_baleine.modules.php | 35 ++++++++++++++----- htdocs/langs/en_US/projects.lang | 5 +-- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php index 6ce839daf99..db0017a2e98 100644 --- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php +++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php @@ -28,6 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; /** @@ -77,6 +78,7 @@ class pdf_baleine extends ModelePDFProjects // Defini position des colonnes $this->posxref=$this->marge_gauche+1; $this->posxlabel=$this->marge_gauche+25; + $this->posxworkload=$this->marge_gauche+100; $this->posxprogress=$this->marge_gauche+140; $this->posxdatestart=$this->marge_gauche+150; $this->posxdateend=$this->marge_gauche+170; @@ -216,20 +218,22 @@ class pdf_baleine extends ModelePDFProjects $progress=$object->lines[$i]->progress.'%'; $datestart=dol_print_date($object->lines[$i]->date_start,'day'); $dateend=dol_print_date($object->lines[$i]->date_end,'day'); - + $planned_workload=convertSecondToTime($object->lines[$i]->planned_workload,'allhourmin'); $pdf->SetFont('','', $default_font_size - 1); // Dans boucle pour gerer multi-page $pdf->SetXY($this->posxref, $curY); - $pdf->MultiCell(60, 3, $outputlangs->convToOutputCharset($ref), 0, 'L'); + $pdf->MultiCell($this->posxlabel-$this->posxref, 3, $outputlangs->convToOutputCharset($ref), 0, 'L'); $pdf->SetXY($this->posxlabel, $curY); - $pdf->MultiCell(108, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L'); + $pdf->MultiCell($this->posxworkload-$this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L'); + $pdf->SetXY($this->posxworkload, $curY); + $pdf->MultiCell($this->posxprogress-$this->posxworkload, 3, $planned_workload, 0, 'R'); $pdf->SetXY($this->posxprogress, $curY); - $pdf->MultiCell(16, 3, $progress, 0, 'L'); + $pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, $progress, 0, 'R'); $pdf->SetXY($this->posxdatestart, $curY); - $pdf->MultiCell(20, 3, $datestart, 0, 'L'); + $pdf->MultiCell($this->posxdateend-$this->posxdatestart, 3, $datestart, 0, 'C'); $pdf->SetXY($this->posxdateend, $curY); - $pdf->MultiCell(20, 3, $dateend, 0, 'L'); + $pdf->MultiCell($this->page_largeur-$this->marge_droite-$this->posxdateend, 3, $dateend, 0, 'C'); $pageposafter=$pdf->getPage(); @@ -362,8 +366,23 @@ class pdf_baleine extends ModelePDFProjects $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', $default_font_size); - $pdf->SetXY($this->posxref-1, $tab_top+2); - $pdf->MultiCell(80,2, $outputlangs->transnoentities("Tasks"),'','L'); + $pdf->SetXY($this->posxref, $tab_top+1); + $pdf->MultiCell($this->posxlabel-$this->posxref,3, $outputlangs->transnoentities("Tasks"),'','L'); + + $pdf->SetXY($this->posxlabel, $tab_top+1); + $pdf->MultiCell($this->posxworkload-$this->posxlabel, 3, $outputlangs->transnoentities("Description"), 0, 'L'); + + $pdf->SetXY($this->posxworkload, $tab_top+1); + $pdf->MultiCell($this->posxprogress-$this->posxworkload, 3, $outputlangs->transnoentities("PlannedWorkloadShort"), 0, 'R'); + + $pdf->SetXY($this->posxprogress, $tab_top+1); + $pdf->MultiCell($this->posxdatestart-$this->posxprogress, 3, '%', 0, 'R'); + + $pdf->SetXY($this->posxdatestart, $tab_top+1); + $pdf->MultiCell($this->posxdateend-$this->posxdatestart, 3, '', 0, 'C'); + + $pdf->SetXY($this->posxdateend, $tab_top+1); + $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C'); } diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 52f4376d57b..5b73527b0f4 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -127,8 +127,9 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first From 4783db82ac034eba9d7a13e004a89197d5d497d2 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sat, 14 Mar 2015 12:42:52 +0100 Subject: [PATCH 081/412] Update admin_extrafields_add.tpl.php new type of extrafield : link --- htdocs/core/tpl/admin_extrafields_add.tpl.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php index 1f61064183b..72eddc012d2 100644 --- a/htdocs/core/tpl/admin_extrafields_add.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php @@ -48,6 +48,7 @@ else if (type == 'boolean') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();} else if (type == 'price') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();} else if (type == 'select') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();} + else if (type == 'link') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();} else if (type == 'sellist') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").show();jQuery("#helpselect").hide();jQuery("#helpsellist").show();jQuery("#helpchkbxlst").hide();} else if (type == 'checkbox') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();} else if (type == 'radio') { size.val('').attr('disabled','disabled'); unique.attr('disabled','disabled'); jQuery("#value_choice").show();jQuery("#helpselect").show();jQuery("#helpsellist").hide();jQuery("#helpchkbxlst").hide();} From 9e62013bcadddec54ef66ed8c779fe03f6be3aa1 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sat, 14 Mar 2015 12:44:26 +0100 Subject: [PATCH 082/412] Update admin_extrafields_edit.tpl.php add new type of extrafields : link --- htdocs/core/tpl/admin_extrafields_edit.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php index 13a6486aa4f..76713be57df 100644 --- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php @@ -68,7 +68,7 @@ if((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_ar } } } -elseif (($type== 'sellist') || ($type == 'chkbxlst')) +elseif (($type== 'sellist') || ($type == 'chkbxlst') || ($type == 'link') ) { $paramlist=array_keys($param['options']); $param_chain = $paramlist[0]; From 2a09e34bdf068e793be9b86ab2f4f6eeec22c484 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2015 13:05:28 +0100 Subject: [PATCH 083/412] Uniformize etrafields visibility for thirdparties card --- htdocs/comm/card.php | 20 +++++++++++++++++--- htdocs/fourn/card.php | 15 ++++++++++++++- htdocs/societe/soc.php | 20 +++++++++++--------- 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 78b786d2366..9b7c3150c71 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -68,10 +68,15 @@ if (! $sortorder) $sortorder="ASC"; if (! $sortfield) $sortfield="nom"; $cancelbutton = GETPOST('cancel'); +$object = new Client($db); +$extrafields = new ExtraFields($db); + +// fetch optionals attributes and labels +$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); + // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('commcard','globalcard')); -$object = new Societe($db); /* * Actions @@ -425,9 +430,9 @@ if ($id > 0) print ''; } - // Level of prospect if ($object->client == 2 || $object->client == 3) { + // Level of prospect print ''; print ''; } - // Sales representative + // Other attributes + $parameters=array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3'); + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + print $object->showOptionals($extrafields); + } + + // Sales representative include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php'; // Module Adherent diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 1d4c144a098..1825349e83b 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -52,9 +52,13 @@ $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe'); $object = new Fournisseur($db); $extrafields = new ExtraFields($db); +// fetch optionals attributes and labels +$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); + // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('suppliercard','globalcard')); + /* * Action */ @@ -253,7 +257,16 @@ if ($object->id > 0) print ""; print ''; - // Module Adherent + // Other attributes + $parameters=array('socid'=>$object->id, 'colspan' => ' colspan="3"', 'colspanvalue' => '3'); + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + print $object->showOptionals($extrafields); + } + + // Module Adherent if (! empty($conf->adherent->enabled)) { $langs->load("members"); diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 0f17851b89e..84b47983d5c 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -63,6 +63,10 @@ $extrafields = new ExtraFields($db); // fetch optionals attributes and labels $extralabels=$extrafields->fetch_name_optionals_label($object->table_element); +// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array +$hookmanager->initHooks(array('thirdpartycard','globalcard')); + + // Get object canvas (By default, this is not defined, so standard usage of dolibarr) $object->getCanvas($socid); $canvas = $object->canvas?$object->canvas:GETPOST("canvas"); @@ -77,8 +81,6 @@ if (! empty($canvas)) // Security check $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', $objcanvas); -// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array -$hookmanager->initHooks(array('thirdpartycard','globalcard')); /* @@ -1091,7 +1093,7 @@ else $form->select_users((! empty($object->commercial_id)?$object->commercial_id:$user->id),'commercial_id',1); // Add current user by default print ''; } - + // Incoterms if (!empty($conf->incoterm->enabled)) { @@ -1101,7 +1103,7 @@ else print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:'')); print ''; } - + // Other attributes $parameters=array('colspan' => ' colspan="3"', 'colspanvalue' => '3'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -1226,11 +1228,11 @@ else //Incoterms if (!empty($conf->incoterm->enabled)) - { + { $object->fk_incoterms = GETPOST('incoterm_id', 'int'); $object->location_incoterms = GETPOST('lcoation_incoterms', 'alpha'); } - + //Local Taxes $object->localtax1_assuj = GETPOST('localtax1assuj_value'); $object->localtax2_assuj = GETPOST('localtax2assuj_value'); @@ -1627,7 +1629,7 @@ else print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:'')); print ''; } - + // Logo print ''; print ''; @@ -2016,7 +2018,7 @@ else // Incoterms if (!empty($conf->incoterm->enabled)) - { + { print ''; + //Parameters + print ''; + $help = $langs->trans("GlobalVariableUpdaterHelp".$type).'
'.$langs->trans("GlobalVariableUpdaterHelpFormat".$type).''; + print ''; + print ''; + //Interval + print ''; + print ''; + print ''; + print ''; + print '
'; print $langs->trans('ProspectLevel'); @@ -453,7 +458,16 @@ if ($id > 0) print '
'; print ''; +//Help text +$help_text = $langs->trans("PriceExpressionEditorHelp1"); +$help_text.= '

'.$langs->trans("PriceExpressionEditorHelp2"); +$help_text.= '

'.$langs->trans("PriceExpressionEditorHelp3"); +$help_text.= '

'.$langs->trans("PriceExpressionEditorHelp4"); +$help_text.= '

'.$langs->trans("PriceExpressionEditorHelp5"); +foreach ($price_globals->listGlobalVariables() as $entry) { + $help_text.= '
#globals_'.$entry->code.'# '.$entry->description.' = '.$entry->value; +} + //Price expression editor -$help_text = $langs->trans("PriceExpressionEditorHelp1").'

'.$langs->trans("PriceExpressionEditorHelp2").'

'.$langs->trans("PriceExpressionEditorHelp3").'

'.$langs->trans("PriceExpressionEditorHelp4"); print ''; print '
'; print $langs->trans('IncotermLabel'); @@ -2030,7 +2032,7 @@ else { print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1); } - else + else { print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?socid='.$object->id); } From 306eff62ad4c8a03d0b3572ae768a321e5493b04 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2015 13:23:36 +0100 Subject: [PATCH 084/412] NEW: Show last official stable version into system - update page. --- htdocs/admin/tools/update.php | 54 +++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index e12ef58cebf..7c85f820eab 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -24,6 +24,7 @@ require '../../main.inc.php'; include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; +include_once DOL_DOCUMENT_ROOT . '/core/lib/geturl.lib.php'; $langs->load("admin"); $langs->load("other"); @@ -105,28 +106,39 @@ llxHeader('',$langs->trans("Upgrade"),$wikihelp); print_fiche_titre($langs->trans("Upgrade"),'','setup'); print $langs->trans("CurrentVersion").' : '.DOL_VERSION.'
'; -if ($sfurl = simplexml_load_file('http://sourceforge.net/projects/dolibarr/rss')) { - $title=$sfurl->channel[0]->item[0]->title; -function word_limiter( $text, $limit = 30, $chars = '0123456789.' ) { - if( strlen( $text ) > $limit ) { - $words = str_word_count( $text, 2, $chars ); - $words = array_reverse( $words, TRUE ); - foreach( $words as $length => $word ) { - if( $length + strlen( $word ) >= $limit ) { - array_shift( $words ); - } else { - break; - } - } - $words = array_reverse( $words ); - $text = implode( " ", $words ) . ''; - } - return $text; -} -$str = $title; -print $langs->trans("LastStableVersion").' : '. word_limiter( $str ).'
'; -} else { +$result = getURLContent('http://sourceforge.net/projects/dolibarr/rss'); +//var_dump($result['content']); +$sfurl = simplexml_load_string($result['content']); +if ($sfurl) +{ + $title=$sfurl->channel[0]->item[0]->title; + + function word_limiter($text, $limit = 30, $chars = '0123456789.') + { + if (strlen( $text ) > $limit) + { + $words = str_word_count($text, 2, $chars); + $words = array_reverse($words, TRUE); + foreach($words as $length => $word) { + if ($length + strlen( $word ) >= $limit) + { + array_shift($words); + } else { + break; + } + } + $words = array_reverse($words); + $text = implode(" ", $words) . ''; + } + return $text; + } + + $str = $title; + print $langs->trans("LastStableVersion").' : '. word_limiter( $str ).'
'; +} +else +{ print $langs->trans("LastStableVersion").' : ' .$langs->trans("UpdateServerOffline").'
'; } print '
'; From ca34575df447e312a0b2416c248fa2bf39780764 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2015 13:42:00 +0100 Subject: [PATCH 085/412] FIXED: Allowed 0 to be used as an account mask. Required by CEGID. --- htdocs/core/modules/societe/mod_codecompta_aquarium.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index 1efc062ab2c..c8e005c79c7 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -45,8 +45,8 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode function __construct() { global $conf; - if (empty($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411'; - if (empty($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER)) $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401'; + if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411'; + if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401'; $this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER; $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER; } From 4a9a3ab04ba396128ed392a83fb9b9916186781b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2015 13:42:58 +0100 Subject: [PATCH 086/412] Revert "FIXED Allowed 0 to be used as an account mask" --- htdocs/core/modules/societe/mod_codecompta_aquarium.php | 4 ++-- htdocs/societe/admin/societe.php | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index 65a1f6192b5..1cc70aa009e 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -44,8 +44,8 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode function __construct() { global $conf; - if (is_null($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411'; - if (is_null($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER)) $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401'; + if (empty($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411'; + if (empty($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER)) $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401'; $this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER; $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER; } diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 65728435910..9834959273c 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -114,11 +114,7 @@ if ($action == 'setModuleOptions') { $param=GETPOST("param".$i,'alpha'); $value=GETPOST("value".$i,'alpha'); - // Use the default values if the field is not set - if ($param == '') { - $param = null; - } - $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity); + if ($param) $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity); if (! $res > 0) $error++; } } From 89b22be063b2c1f2b032e3e9a7b416cfa3c11859 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2015 13:44:26 +0100 Subject: [PATCH 087/412] FIXED: Allowed 0 to be used as an account mask. Required by CEGID. --- htdocs/core/modules/societe/mod_codecompta_aquarium.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php index 1cc70aa009e..a4514efbce4 100644 --- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php +++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php @@ -44,8 +44,8 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode function __construct() { global $conf; - if (empty($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER)) $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411'; - if (empty($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER)) $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401'; + if (! isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER='411'; + if (! isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER='401'; $this->prefixcustomeraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER; $this->prefixsupplieraccountancycode=$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER; } From 44d6bdb1c5fb354adfea96f2a0911e72c31ed176 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2015 14:27:45 +0100 Subject: [PATCH 088/412] Doc --- htdocs/install/mysql/tables/llx_commande.sql | 4 ++-- htdocs/install/mysql/tables/llx_commande_fournisseur.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 90e8fd7af71..7bf22df1a1d 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -40,7 +40,7 @@ create table llx_commande fk_user_modif integer, -- user making last change fk_user_valid integer, -- user validating fk_user_cloture integer, -- user closing - source smallint, + source smallint, -- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ? fk_statut smallint default 0, amount_ht real default 0, remise_percent real default 0, @@ -64,7 +64,7 @@ create table llx_commande date_livraison date default NULL, fk_shipping_method integer, -- shipping method id fk_availability integer NULL, - fk_input_reason integer, + fk_input_reason integer, -- id coming from c_input_reason, '0' if no defined fk_delivery_address integer, -- delivery address (deprecated) import_key varchar(14), extraparams varchar(255) -- for stock other parameters with json format diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index f9f440d0db4..17027e16960 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -41,7 +41,7 @@ create table llx_commande_fournisseur fk_user_modif integer, -- user making last change fk_user_valid integer, -- user validating fk_user_approve integer, -- user approving - source smallint NOT NULL, + source smallint NOT NULL, -- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ? fk_statut smallint default 0, amount_ht real default 0, remise_percent real default 0, @@ -59,7 +59,7 @@ create table llx_commande_fournisseur fk_account integer, -- bank account fk_cond_reglement integer, -- condition de reglement fk_mode_reglement integer, -- mode de reglement - fk_input_method integer default 0, + fk_input_method integer default 0, -- id coming from c_input_reason, '0' if no defined import_key varchar(14), extraparams varchar(255) -- for stock other parameters with json format From cbacfa313731665b5676c1f79207cd61915e9643 Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Sat, 14 Mar 2015 13:30:19 +0000 Subject: [PATCH 089/412] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- htdocs/categories/class/categorie.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index e4ff0e4e0d1..63aab39f6f8 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1000,7 +1000,7 @@ class Categorie extends CommonObject /** * Check if no category with same label already exists for this cat's parent or root and for this cat's type * - * @return boolean 1 if already exist, 0 otherwise, -1 if error + * @return integer 1 if already exist, 0 otherwise, -1 if error */ function already_exists() { From 10bbf463e7c91df3deb44207e186475ef04f9401 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 14 Mar 2015 14:55:41 +0100 Subject: [PATCH 090/412] Several bug fixes from scrutinizer --- htdocs/admin/system/dolibarr.php | 2 +- htdocs/categories/class/categorie.class.php | 31 ++------------------- htdocs/commande/list.php | 6 ++-- htdocs/core/class/commonobject.class.php | 27 +++++++++++++++++- htdocs/core/lib/date.lib.php | 1 + htdocs/core/lib/functions.lib.php | 2 +- htdocs/product/class/product.class.php | 27 ++---------------- 7 files changed, 36 insertions(+), 60 deletions(-) diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php index 96700ba1e16..4ec093dfafc 100644 --- a/htdocs/admin/system/dolibarr.php +++ b/htdocs/admin/system/dolibarr.php @@ -179,7 +179,7 @@ $c=getServerTimeZoneInt('summer'); $daylight=(is_numeric($c) && is_numeric($b))?round($c-$b):'unknown'; //print $a." ".$b." ".$c." ".$daylight; $val=($a>=0?'+':'').$a; -$val.=' ('.($a==='unknown'?'unknown':($a>=0?'+':'').($a*3600)).')'; +$val.=' ('.($a=='unknown'?'unknown':($a>=0?'+':'').($a*3600)).')'; $val.='       '.getServerTimeZoneString(); $val.='       '.$langs->trans("DaylingSavingTime").': '.($daylight==='unknown'?'unknown':($a==$c?yn($daylight):yn(0).($daylight?'     ('.$langs->trans('YesInSummer').')':''))); print $form->textwithtooltip($val,$txt,2,1,img_info('')); diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index e4ff0e4e0d1..5d64b7d9327 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1295,11 +1295,9 @@ class Categorie extends CommonObject * * @param string $sdir Repertoire destination finale * @param string $file Nom du fichier uploade - * @param int $maxWidth Largeur maximum que dois faire la miniature (160 par defaut) - * @param int $maxHeight Hauteur maximum que dois faire la miniature (120 par defaut) * @return void */ - function add_photo($sdir, $file, $maxWidth = 160, $maxHeight = 120) + function add_photo($sdir, $file) { require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -1321,36 +1319,11 @@ class Categorie extends CommonObject if (file_exists($originImage)) { // Cree fichier en taille vignette - $this->add_thumb($originImage,$maxWidth,$maxHeight); + $this->add_thumb($originImage); } } } - /** - * Build thumb - * - * @param string $file Chemin du fichier d'origine - * @return void - */ - function add_thumb($file) - { - global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality; - - require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ... - - if (file_exists($file)) - { - // Create small thumbs for company (Ratio is near 16/9) - // Used on logon for example - $imgThumbSmall = vignette($file, $maxwidthsmall, $maxheightsmall, '_small', $quality); - - // Create mini thumbs for company (Ratio is near 16/9) - // Used on menu or for setup page for example - $imgThumbMini = vignette($file, $maxwidthmini, $maxheightmini, '_mini', $quality); - } - } - - /** * Return tableau de toutes les photos de la categorie * diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index c38b1a8e34f..e51ded5e297 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -259,7 +259,7 @@ if ($resql) if ($search_user > 0) $param.='&search_user='.$search_user; if ($search_sale > 0) $param.='&search_sale='.$search_sale; if ($search_total_ht != '') $param.='&search_total_ht='.$search_total_ht; - + $num = $db->num_rows($resql); print_barre_liste($title, $page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords); $i = 0; @@ -337,7 +337,7 @@ if ($resql) $generic_commande = new Commande($db); $generic_product = new Product($db); - while ($i < min($num,$limit)) + while ($i < min($num,$limit)) { $objp = $db->fetch_object($resql); $var=!$var; @@ -368,7 +368,7 @@ if ($resql) $nbprod++; // order contains real products $generic_product->id = $generic_commande->lines[$lig]->fk_product; if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product])) { - $generic_product->load_stock(true); + $generic_product->load_stock(); $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_reel; } else { $generic_product->stock_reel = $productstat_cache[$generic_commande->lines[$lig]->fk_product]['stock_reel']; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index a316c3cd511..fe9cfd24013 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -3458,6 +3458,31 @@ abstract class CommonObject } } + /** + * Build thumb + * + * @param string $file Path file in UTF8 to original file to create thumbs from. + * @return void + */ + function add_thumb($file) + { + global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality; + + require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ... + + $file_osencoded=dol_osencode($file); + if (file_exists($file_osencoded)) + { + // Create small thumbs for company (Ratio is near 16/9) + // Used on logon for example + $imgThumbSmall = vignette($file_osencoded, $maxwidthsmall, $maxheightsmall, '_small', $quality); + + // Create mini thumbs for company (Ratio is near 16/9) + // Used on menu or for setup page for example + $imgThumbMini = vignette($file_osencoded, $maxwidthmini, $maxheightmini, '_mini', $quality); + } + } + /* Functions common to commonobject and commonobjectline */ @@ -3624,7 +3649,7 @@ abstract class CommonObject $attributeType = $extrafields->attribute_type[$attributeKey]; $attributeSize = $extrafields->attribute_size[$attributeKey]; $attributeLabel = $extrafields->attribute_label[$attributeKey]; - $attributeParam = $extrafields->attribute_param[$attributeKey]; + $attributeParam = $extrafields->attribute_param[$attributeKey]; switch ($attributeType) { case 'int': diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index 777b3633cb5..e5b60f4094c 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -95,6 +95,7 @@ function getServerTimeZoneInt($refgmtdate='now') } else { + $tmp=0; dol_print_error('','PHP version must be 5.3+'); /* // Method 2 (does not include daylight, not supported by adodb) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 63c0f6ce433..c1845482eaf 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4542,7 +4542,7 @@ function utf8_check($str) /** - * Return an UTF-8 string encoded into OS filesystem encoding. This function is used to define + * Return a string encoded into OS filesystem encoding. This function is used to define * value to pass to filesystem PHP functions. * * @param string $str String to encode (UTF-8) diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 02686a94f03..4c341e58906 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -138,6 +138,8 @@ class Product extends CommonObject var $stats_commande=array(); var $stats_contrat=array(); var $stats_facture=array(); + var $stats_commande_fournisseur=array(); + var $multilangs=array(); //! Taille de l'image @@ -3311,31 +3313,6 @@ class Product extends CommonObject else return -1; } - /** - * Build thumb - * - * @param string $file Chemin du fichier d'origine - * @return void - */ - function add_thumb($file) - { - global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini, $quality; - - require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ... - - $file_osencoded=dol_osencode($file); - if (file_exists($file_osencoded)) - { - // Create small thumbs for company (Ratio is near 16/9) - // Used on logon for example - $imgThumbSmall = vignette($file, $maxwidthsmall, $maxheightsmall, '_small', $quality); - - // Create mini thumbs for company (Ratio is near 16/9) - // Used on menu or for setup page for example - $imgThumbMini = vignette($file, $maxwidthmini, $maxheightmini, '_mini', $quality); - } - } - /** * Affiche la premiere photo du produit * From fc5899174be30836c958bda923f43851ec4d919b Mon Sep 17 00:00:00 2001 From: Ion Agorria Date: Sat, 14 Mar 2015 16:48:56 +0100 Subject: [PATCH 091/412] Relocation of expression files --- .../class/price_expression.class.php} | 25 ++--- .../class/price_parser.class.php} | 93 +++++++++++-------- .../editor.php} | 29 ++++-- 3 files changed, 88 insertions(+), 59 deletions(-) rename htdocs/product/{class/priceexpression.class.php => dynamic_price/class/price_expression.class.php} (92%) rename htdocs/product/{class/priceparser.class.php => dynamic_price/class/price_parser.class.php} (78%) rename htdocs/product/{expression.php => dynamic_price/editor.php} (85%) diff --git a/htdocs/product/class/priceexpression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php similarity index 92% rename from htdocs/product/class/priceexpression.class.php rename to htdocs/product/dynamic_price/class/price_expression.class.php index c5e24d3a228..babf86235c0 100644 --- a/htdocs/product/class/priceexpression.class.php +++ b/htdocs/product/dynamic_price/class/price_expression.class.php @@ -1,7 +1,7 @@ * Copyright (C) 2014 Juanjo Menent -/* Copyright (C) 2014 Ion Agorria +/* Copyright (C) 2015 Ion Agorria * * 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 @@ -18,7 +18,7 @@ */ /** - * \file htdocs/product/class/priceexpression.class.php + * \file htdocs/product/expression/class/price_expression.class.php * \ingroup product * \brief Class for accessing price expression table */ @@ -35,6 +35,7 @@ class PriceExpression var $id; var $title; var $expression; + public $table_element = "c_price_expression"; /** * Constructor @@ -57,14 +58,14 @@ class PriceExpression */ function create($user, $notrigger=0) { - $error=0; + $error=0; // Clean parameters if (isset($this->title)) $this->title=trim($this->title); if (isset($this->expression)) $this->expression=trim($this->expression); // Insert request - $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_price_expression ("; + $sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element." ("; $sql.= "title, expression"; $sql.= ") VALUES ("; $sql.= " ".(isset($this->title)?"'".$this->db->escape($this->title)."'":"''").","; @@ -121,7 +122,7 @@ class PriceExpression function fetch($id) { $sql = "SELECT title, expression"; - $sql.= " FROM ".MAIN_DB_PREFIX."c_price_expression"; + $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element; $sql.= " WHERE rowid = ".$id; dol_syslog(get_class($this)."::fetch"); @@ -133,8 +134,8 @@ class PriceExpression { $this->id = $id; $this->title = $obj->title; - $this->expression = $obj->expression; - return 1; + $this->expression = $obj->expression; + return 1; } else { @@ -156,10 +157,10 @@ class PriceExpression function list_price_expression() { $sql = "SELECT rowid, title, expression"; - $sql.= " FROM ".MAIN_DB_PREFIX."c_price_expression"; + $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element; $sql.= " ORDER BY title"; - dol_syslog(get_class($this)."::list_price_expression"); + dol_syslog(get_class($this)."::list_price_expression"); $resql=$this->db->query($sql); if ($resql) { @@ -194,7 +195,7 @@ class PriceExpression function find_title($title) { $sql = "SELECT rowid"; - $sql.= " FROM ".MAIN_DB_PREFIX."c_price_expression"; + $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element; $sql.= " WHERE title = '".$this->db->escape($title)."'"; dol_syslog(get_class($this)."::find_title"); @@ -235,7 +236,7 @@ class PriceExpression if (isset($this->expression)) $this->expression=trim($this->expression); // Update request - $sql = "UPDATE ".MAIN_DB_PREFIX."c_price_expression SET"; + $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET"; $sql.= " title = ".(isset($this->title)?"'".$this->db->escape($this->title)."'":"''").","; $sql.= " expression = ".(isset($this->expression)?"'".$this->db->escape($this->expression)."'":"''").""; $sql.= " WHERE rowid = ".$this->id; @@ -309,7 +310,7 @@ class PriceExpression if (! $error) { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."c_price_expression"; + $sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element; $sql.= " WHERE rowid = ".$rowid; dol_syslog(get_class($this)."::delete"); diff --git a/htdocs/product/class/priceparser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php similarity index 78% rename from htdocs/product/class/priceparser.class.php rename to htdocs/product/dynamic_price/class/price_parser.class.php index c2b047a7ae1..68367d8ba5f 100644 --- a/htdocs/product/class/priceparser.class.php +++ b/htdocs/product/dynamic_price/class/price_parser.class.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2015 Ion Agorria * * 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 @@ -16,13 +16,15 @@ */ /** - * \file htdocs/product/class/priceparser.class.php + * \file htdocs/product/expression/class/price_parser.class.php * \ingroup product * \brief File of class to calculate prices using expression */ require_once DOL_DOCUMENT_ROOT.'/includes/evalmath/evalmath.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/priceexpression.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_expression.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_global_variable.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_global_variable_updater.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; /** @@ -30,17 +32,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; */ class PriceParser { - protected $db; - // Limit of expressions per price - public $limit = 100; - // The error that ocurred when parsing price - public $error; - // The expression that caused the error - public $error_expr; - //The special char - public $special_chr = "#"; - //The separator char - public $separator_chr = ";"; + protected $db; + // Limit of expressions per price + public $limit = 100; + // The error that occurred when parsing price + public $error; + // The expression that caused the error + public $error_expr; + //The special char + public $special_chr = "#"; + //The separator char + public $separator_chr = ";"; /** * Constructor @@ -104,7 +106,7 @@ class PriceParser { return $langs->trans("ErrorPriceExpression".$code, $info); } - else if (in_array($code, array(6))) //Errors which have 2 args + else if (in_array($code, array(6, 23))) //Errors which have 2 args { return $langs->trans("ErrorPriceExpression".$code, $info[0], $info[1]); } @@ -128,6 +130,7 @@ class PriceParser */ public function parseExpression($product, $expression, $values) { + global $user; //Accessible product values by expressions $values = array_merge($values, array( "tva_tx" => $product->tva_tx, @@ -139,13 +142,31 @@ class PriceParser "price_min" => $product->price_min, )); - //Retreive all extrafield for product and add it to values + //Retrieve all extrafield for product and add it to values $extrafields = new ExtraFields($this->db); $extralabels = $extrafields->fetch_name_optionals_label('product', true); $product->fetch_optionals($product->id, $extralabels); foreach ($extrafields->attribute_label as $key=>$label) { - $values['options_'.$key] = $product->array_options['options_'.$key]; + $values["extrafield_".$key] = $product->array_options['options_'.$key]; + } + + //Process any pending updaters + $price_updaters = new PriceGlobalVariableUpdater($this->db); + foreach ($price_updaters->listPendingUpdaters() as $entry) { + //Schedule the next update by adding current timestamp (secs) + interval (mins) + $entry->update_next_update(dol_now() + ($entry->update_interval * 60), $user); + //Do processing + $res = $entry->process(); + //Store any error or clear status if OK + $entry->update_status($res < 1?$entry->error:'', $user); + } + + //Get all global values + $price_globals = new PriceGlobalVariable($this->db); + foreach ($price_globals->listGlobalVariables() as $entry) + { + $values["global_".$entry->code] = $entry->value; } //Check if empty @@ -153,36 +174,32 @@ class PriceParser if (empty($expression)) { $this->error = array(20, null); - return -1; + return -2; } //Prepare the lib, parameters and values $em = new EvalMath(); $em->suppress_errors = true; //Don't print errors on page $this->error_expr = null; - $search = array(); - $replace = array(); - foreach ($values as $key => $value) { - if ($value !== null) { - $search[] = $this->special_chr.$key.$this->special_chr; - $replace[] = $value; - } - } + $last_result = null; //Iterate over each expression splitted by $separator_chr $expression = str_replace("\n", $this->separator_chr, $expression); + foreach ($values as $key => $value) + { + $expression = str_replace($this->special_chr.$key.$this->special_chr, "$value", $expression); + } $expressions = explode($this->separator_chr, $expression); - $expressions = array_slice($expressions, 0, $limit); + $expressions = array_slice($expressions, 0, $this->limit); foreach ($expressions as $expr) { $expr = trim($expr); if (!empty($expr)) { - $expr = str_ireplace($search, $replace, $expr); $last_result = $em->evaluate($expr); $this->error = $em->last_error_code; if ($this->error !== null) { //$em->last_error is null if no error happened, so just check if error is not null $this->error_expr = $expr; - return -2; + return -3; } } } @@ -190,15 +207,15 @@ class PriceParser if (empty($vars["price"])) { $vars["price"] = $last_result; } - if ($vars["price"] === null) + if (!isset($vars["price"])) { $this->error = array(21, $expression); - return -3; + return -4; } if ($vars["price"] < 0) { $this->error = array(22, $expression); - return -4; + return -5; } return $vars["price"]; } @@ -209,13 +226,13 @@ class PriceParser * @param Product $product The Product object to get information * @param string $expression The expression to parse * @param array $extra_values Any aditional values for expression - * @return int > 0 if OK, < 1 if KO + * @return int > 0 if OK, < 1 if KO */ public function parseProductExpression($product, $expression, $extra_values = array()) { //Get the supplier min - $productFournisseur = new ProductFournisseur($this->db); - $supplier_min_price = $productFournisseur->find_min_price_product_fournisseur($product->id); + $productFournisseur = new ProductFournisseur($this->db); + $supplier_min_price = $productFournisseur->find_min_price_product_fournisseur($product->id); //Accessible values by expressions $extra_values = array_merge($extra_values, array( @@ -237,7 +254,7 @@ class PriceParser * * @param Product $product The Product object to get information * @param array $extra_values Any aditional values for expression - * @return int > 0 if OK, < 1 if KO + * @return int > 0 if OK, < 1 if KO */ public function parseProduct($product, $extra_values = array()) { @@ -261,7 +278,7 @@ class PriceParser * @param int $quantity Supplier Min quantity * @param int $tva_tx Supplier VAT rate * @param array $extra_values Any aditional values for expression - * @return int > 0 if OK, < 1 if KO + * @return int > 0 if OK, < 1 if KO */ public function parseProductSupplierExpression($product_id, $expression, $quantity = null, $tva_tx = null, $extra_values = array()) { @@ -285,7 +302,7 @@ class PriceParser * @param int $quantity Min quantity * @param int $tva_tx VAT rate * @param array $extra_values Any aditional values for expression - * @return int > 0 if OK, < 1 if KO + * @return int > 0 if OK, < 1 if KO */ public function parseProductSupplier($product_id, $expression_id, $quantity = null, $tva_tx = null, $extra_values = array()) { diff --git a/htdocs/product/expression.php b/htdocs/product/dynamic_price/editor.php similarity index 85% rename from htdocs/product/expression.php rename to htdocs/product/dynamic_price/editor.php index be3e5401789..1fc7df3b731 100644 --- a/htdocs/product/expression.php +++ b/htdocs/product/dynamic_price/editor.php @@ -16,16 +16,17 @@ */ /** - * \file htdocs/product/expression.php + * \file htdocs/product/expression/editor.php * \ingroup product * \brief Page for editing expression */ -require '../main.inc.php'; +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/priceexpression.class.php'; -require_once DOL_DOCUMENT_ROOT.'/product/class/priceparser.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_expression.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_global_variable.class.php'; +require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php'; $langs->load("products"); $langs->load("accountancy"); //"Back" translation is on this file @@ -47,6 +48,7 @@ $product = new Product($db); $product->fetch($id, ''); $price_expression = new PriceExpression($db); +$price_globals = new PriceGlobalVariable($db); //Fetch expression data if (empty($eid)) //This also disables fetch when eid == 0 @@ -184,8 +186,17 @@ print '
'.$langs->trans("Name").''; print ''; print '
'.$form->textwithpicto($langs->trans("PriceExpressionEditor"),$help_text,1).''; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor=new DolEditor('expression',isset($price_expression->expression)?$price_expression->expression:'','',300,'','',false,false,false,4,80); @@ -194,7 +205,7 @@ print '
'; //Buttons -print '
'; +print '
'; print ''; print ''.$langs->trans("Back").''; if ($eid == 0) @@ -205,9 +216,9 @@ else { print '
'.$langs->trans("Delete").'
'; } -print '
'; +print ''; -print ''; +print ''; // This code reloads the page depending of selected option, goes to page selected by tab when back is pressed print ''; + print '
'.$form->textwithpicto($langs->trans("Parameters"),$help,1).''; + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; + $doleditor=new DolEditor('parameters',empty($price_updaters->parameters)?'':$price_updaters->parameters,'',300,'','',false,false,false,10,80); + $doleditor->Create(); + print '
'.$langs->trans("UpdateInterval").'
'; + + //Form Buttons + print '
'; + print '  '; + print ''; + print '
'; + print ''; +} else { + //Action Buttons + print '
'; + print ''.$langs->trans("Add").''; + print '
'; +} + +llxFooter(); +$db->close(); From 2d09d8196f85e56b970de315e9f5fa686782cc28 Mon Sep 17 00:00:00 2001 From: Ion Agorria Date: Sat, 14 Mar 2015 16:51:50 +0100 Subject: [PATCH 095/412] Language additions --- htdocs/langs/en_US/errors.lang | 6 ++++++ htdocs/langs/en_US/products.lang | 17 +++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 3d83901194b..37670b7f003 100755 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action +ErrorGlobalVariableUpdater0=HTTP request failed with error '%s' +ErrorGlobalVariableUpdater1=Invalid JSON format '%s' +ErrorGlobalVariableUpdater2=Missing parameter '%s' +ErrorGlobalVariableUpdater3=The requested data was not found in result +ErrorGlobalVariableUpdater4=SOAP client failed with error '%s' +ErrorGlobalVariableUpdater5=No global variable selected # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index eb7261ab613..1b9a49b559d 100755 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s PriceExpressionEditor=Price expression editor PriceExpressionSelected=Selected price expression PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions -PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey# +PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode# PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# +PriceExpressionEditorHelp5=Available global values: PriceMode=Price mode PriceNumeric=Number DefaultPrice=Default price ComposedProductIncDecStock=Increase/Decrease stock on parent change ComposedProduct=Sub-product -MinSupplierPrice=Minimun supplier price +MinSupplierPrice=Minimum supplier price +DynamicPriceConfiguration=Dynamic price configuration +GlobalVariables=Global variables +GlobalVariableUpdaters=Global variable updaters +GlobalVariableUpdaterType0=JSON data +GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value, +GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"} +GlobalVariableUpdaterType1=WebService data +GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method +GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}} +UpdateInterval=Update interval (minutes) +LastUpdated=Last updated +CorrectlyUpdated=Correctly updated \ No newline at end of file From e76b6e740f442e865939303134488f821f709c46 Mon Sep 17 00:00:00 2001 From: Ion Agorria Date: Sat, 14 Mar 2015 16:52:01 +0100 Subject: [PATCH 096/412] SQL additions --- .../install/mysql/migration/3.7.0-3.8.0.sql | 20 +++++++++++++ .../tables/llx_c_price_global_variable.sql | 25 ++++++++++++++++ .../llx_c_price_global_variable_updater.sql | 29 +++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 htdocs/install/mysql/tables/llx_c_price_global_variable.sql create mode 100644 htdocs/install/mysql/tables/llx_c_price_global_variable_updater.sql diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index b7475d88f91..12d6cce2022 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -370,3 +370,23 @@ INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DDP', 'Delivered Du -- Extrafields fk_object must be unique (1-1 relation) ALTER TABLE llx_societe_extrafields DROP INDEX idx_societe_extrafields; ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_object); + +create table llx_c_price_global_variable +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + code varchar(20) NOT NULL, + description text DEFAULT NULL, + value double(24,8) DEFAULT 0 +)ENGINE=innodb; + +create table llx_c_price_global_variable_updater +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + type integer NOT NULL, + description text DEFAULT NULL, + parameters text DEFAULT NULL, + fk_variable integer NOT NULL, + update_interval integer DEFAULT 0, + next_update integer DEFAULT 0, + last_status text DEFAULT NULL +)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_c_price_global_variable.sql b/htdocs/install/mysql/tables/llx_c_price_global_variable.sql new file mode 100644 index 00000000000..0f5630ed193 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_c_price_global_variable.sql @@ -0,0 +1,25 @@ +-- ============================================================================ +-- Copyright (C) 2015 Ion agorria +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ============================================================================ + +create table llx_c_price_global_variable +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + code varchar(20) NOT NULL, + description text DEFAULT NULL, + value double(24,8) DEFAULT 0 +)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_c_price_global_variable_updater.sql b/htdocs/install/mysql/tables/llx_c_price_global_variable_updater.sql new file mode 100644 index 00000000000..0c1dcfba701 --- /dev/null +++ b/htdocs/install/mysql/tables/llx_c_price_global_variable_updater.sql @@ -0,0 +1,29 @@ +-- ============================================================================ +-- Copyright (C) 2015 Ion agorria +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- ============================================================================ + +create table llx_c_price_global_variable_updater +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + type integer NOT NULL, + description text DEFAULT NULL, + parameters text DEFAULT NULL, + fk_variable integer NOT NULL, + update_interval integer DEFAULT 0, + next_update integer DEFAULT 0, + last_status text DEFAULT NULL +)ENGINE=innodb; From 8f0e514f8364a98ebcc25c4a9639e90a598a4543 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sun, 15 Mar 2015 10:49:16 +0100 Subject: [PATCH 097/412] Update pdf_paiement.class.php Add bank account on detail line (usefull when you have many bank account) Add society name in the header (usefull when you nanage many society) --- .../modules/rapport/pdf_paiement.class.php | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php index f9726eedbed..b7aea75836f 100644 --- a/htdocs/core/modules/rapport/pdf_paiement.class.php +++ b/htdocs/core/modules/rapport/pdf_paiement.class.php @@ -1,6 +1,7 @@ * Copyright (C) 2006-2014 Laurent Destailleur + * Copyright (C) 2015 Charles-Fr BENKE * * 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 @@ -65,7 +66,8 @@ class pdf_paiement $this->posxdate=$this->marge_gauche+2; $this->posxpaymenttype=42; $this->posxinvoice=82; - $this->posxinvoiceamount=122; + $this->posxbankaccount=110; + $this->posxinvoiceamount=132; $this->posxpaymentamount=162; if ($this->page_largeur < 210) // To work with US executive format { @@ -147,16 +149,18 @@ class pdf_paiement //$sql .= ", c.libelle as paiement_type, p.num_paiement"; $sql.= ", c.code as paiement_code, p.num_paiement"; $sql.= ", p.amount as paiement_amount, f.total_ttc as facture_amount "; - $sql.= ", pf.amount as pf_amount "; + $sql.= ", pf.amount as pf_amount , ba.ref as bankaccount "; $sql.= ", p.rowid as prowid"; $sql.= " FROM ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."facture as f,"; $sql.= " ".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement_facture as pf,"; + $sql.= " ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba,"; $sql.= " ".MAIN_DB_PREFIX."societe as s"; if (! $user->rights->societe->client->voir && ! $socid) { $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; } $sql.= " WHERE f.fk_soc = s.rowid AND pf.fk_facture = f.rowid AND pf.fk_paiement = p.rowid"; + $sql.= " AND p.fk_bank = b.rowid AND b.fk_account = ba.rowid "; $sql.= " AND f.entity = ".$conf->entity; $sql.= " AND p.fk_paiement = c.id "; $sql.= " AND p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year,$month))."' AND '".$this->db->idate(dol_get_last_day($year,$month))."'"; @@ -188,6 +192,7 @@ class pdf_paiement $lines[$i][5] = price($objp->facture_amount); $lines[$i][6] = price($objp->pf_amount); $lines[$i][7] = $objp->prowid; + $lines[$i][8] = $objp->bankaccount; $i++; } } @@ -275,7 +280,8 @@ class pdf_paiement $default_font_size = pdf_getPDFFontSize($outputlangs); - $title=$outputlangs->transnoentities("ListOfCustomerPayments"); + $title=$conf->global->MAIN_INFO_SOCIETE_NOM; + $title.=' - '.$outputlangs->transnoentities("ListOfCustomerPayments"); $title.=' - '.dol_print_date(dol_mktime(0,0,0,$this->month,1,$this->year),"%B %Y",false,$outputlangs,true); $pdf->SetFont('','B',$default_font_size + 1); $pdf->SetXY($this->marge_gauche,10); @@ -300,7 +306,12 @@ class pdf_paiement $pdf->line($this->posxinvoice - 1, $this->tab_top, $this->posxinvoice - 1, $this->tab_top + $this->tab_height + 10); $pdf->SetXY($this->posxinvoice, $this->tab_top+2); - $pdf->MultiCell($this->posxinvoiceamount - $this->posxinvoice, 2, $outputlangs->transnoentities("Invoice"), 0, 'L'); + $pdf->MultiCell($this->posxbankaccount - $this->posxinvoice, 2, $outputlangs->transnoentities("Invoice"), 0, 'L'); + + $pdf->line($this->posxbankaccount - 1, $this->tab_top, $this->posxbankaccount - 1, $this->tab_top + $this->tab_height + 10); + $pdf->SetXY($this->posxbankaccount, $this->tab_top+2); + $pdf->MultiCell($this->posxinvoiceamount - $this->posxbankaccount, 2, $outputlangs->transnoentities("Account"), 0, 'L'); + $pdf->line($this->posxinvoiceamount - 1, $this->tab_top, $this->posxinvoiceamount - 1, $this->tab_top + $this->tab_height + 10); $pdf->SetXY($this->posxinvoiceamount, $this->tab_top+2); @@ -364,8 +375,12 @@ class pdf_paiement // Invoice number $pdf->SetXY($this->posxinvoice, $this->tab_top + 10 + $yp); - $pdf->MultiCell($this->posxinvoiceamount - $this->posxdate, $this->line_height, $lines[$j][0], 0, 'L', 0); + $pdf->MultiCell($this->posxinvoiceamount - $this->posxbankaccount, $this->line_height, $lines[$j][0], 0, 'L', 0); + // BankAccount + $pdf->SetXY($this->posxbankaccount, $this->tab_top + 10 + $yp); + $pdf->MultiCell($this->posxbankaccount - $this->posxdate, $this->line_height, $lines[$j][8], 0, 'L', 0); + // Invoice amount $pdf->SetXY($this->posxinvoiceamount, $this->tab_top + 10 + $yp); $pdf->MultiCell($this->posxpaymentamount- $this->posxinvoiceamount - 1, $this->line_height, $lines[$j][5], 0, 'R', 0); @@ -381,6 +396,5 @@ class pdf_paiement } } } - } From 094538c07b140b5900020006eaa4d28b0170525b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 15 Mar 2015 11:48:57 +0100 Subject: [PATCH 098/412] Implemented constants in Commande, Facture and Propal --- htdocs/commande/card.php | 30 ++-- htdocs/commande/class/commande.class.php | 163 +++++++++++------- htdocs/compta/facture/apercu.php | 14 +- .../facture/class/facture-rec.class.php | 2 +- htdocs/compta/facture/class/facture.class.php | 86 ++++++--- htdocs/compta/facture/fiche-rec.php | 4 +- htdocs/compta/facture/impayees.php | 2 +- htdocs/compta/facture/prelevement.php | 16 +- htdocs/compta/recap-compta.php | 2 +- .../modules/facture/doc/pdf_crabe.modules.php | 2 +- htdocs/expedition/shipment.php | 6 +- htdocs/societe/class/societe.class.php | 1 - htdocs/webservices/server_invoice.php | 2 +- htdocs/webservices/server_order.php | 2 +- 14 files changed, 199 insertions(+), 133 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 9d17d65910d..bf0e8dc2bc5 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -146,7 +146,7 @@ if (empty($reshook)) // Reopen a closed order else if ($action == 'reopen' && $user->rights->commande->creer) { - if ($object->statut == 3) + if ($object->statut == Commande::STATUS_CLOSED) { $result = $object->set_reopen($user); if ($result > 0) @@ -1793,7 +1793,7 @@ if ($action == 'create' && $user->rights->commande->creer) $absolute_discount = price2num($absolute_discount, 'MT'); $absolute_creditnote = price2num($absolute_creditnote, 'MT'); if ($absolute_discount) { - if ($object->statut > 0) { + if ($object->statut > Commande::STATUS_DRAFT) { print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->transnoentities("Currency" . $conf->currency)); } else { // Remise dispo de type remise fixe (not credit note) @@ -2065,7 +2065,7 @@ if ($action == 'create' && $user->rights->commande->creer) '; - if (! empty($conf->use_javascript_ajax) && $object->statut == 0) { + if (! empty($conf->use_javascript_ajax) && $object->statut == Commande::STATUS_DRAFT) { include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php'; } @@ -2080,7 +2080,7 @@ if ($action == 'create' && $user->rights->commande->creer) /* * Form to add new line */ - if ($object->statut == 0 && $user->rights->commande->creer) + if ($object->statut == Commande::STATUS_DRAFT && $user->rights->commande->creer) { if ($action != 'editline') { @@ -2110,7 +2110,7 @@ if ($action == 'create' && $user->rights->commande->creer) // modified by hook if (empty($reshook)) { // Valid - if ($object->statut == 0 && $object->total_ttc >= 0 && $numlines > 0 && + if ($object->statut == Commande::STATUS_DRAFT && $object->total_ttc >= 0 && $numlines > 0 && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->creer)) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->validate))) ) @@ -2118,7 +2118,7 @@ if ($action == 'create' && $user->rights->commande->creer) print '
' . $langs->trans('Validate') . '
'; } // Edit - if ($object->statut == 1 && $user->rights->commande->creer) { + if ($object->statut == Commande::STATUS_VALIDATED && $user->rights->commande->creer) { print '
' . $langs->trans('Modify') . '
'; } // Create event @@ -2129,7 +2129,7 @@ if ($action == 'create' && $user->rights->commande->creer) print '' . $langs->trans("AddAction") . ''; } // Send - if ($object->statut > 0) { + if ($object->statut > Commande::STATUS_DRAFT) { if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) { print '
' . $langs->trans('SendByMail') . '
'; } else @@ -2141,7 +2141,7 @@ if ($action == 'create' && $user->rights->commande->creer) if (! empty($conf->expedition->enabled)) { $numshipping = $object->nb_expedition(); - if ($object->statut > 0 && $object->statut < 3 && $object->getNbOfProductsLines() > 0) { + if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfProductsLines() > 0) { if (($conf->expedition_bon->enabled && $user->rights->expedition->creer) || ($conf->livraison_bon->enabled && $user->rights->expedition->livraison->creer)) { if ($user->rights->expedition->creer) { print '
' . $langs->trans('ShipProduct') . '
'; @@ -2159,7 +2159,7 @@ if ($action == 'create' && $user->rights->commande->creer) if ($conf->ficheinter->enabled) { $langs->load("interventions"); - if ($object->statut > 0 && $object->statut < 3 && $object->getNbOfServicesLines() > 0) { + if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0) { if ($user->rights->ficheinter->creer) { print '
' . $langs->trans('AddIntervention') . '
'; } else { @@ -2169,12 +2169,12 @@ if ($action == 'create' && $user->rights->commande->creer) } // Reopen a closed order - if ($object->statut == 3 && $user->rights->commande->creer) { + if ($object->statut == Commande::STATUS_CLOSED && $user->rights->commande->creer) { print '
' . $langs->trans('ReOpen') . '
'; } // Create contract - if ($conf->contrat->enabled && ($object->statut == 1 || $object->statut == 2)) { + if ($conf->contrat->enabled && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_ACCEPTED)) { $langs->load("contracts"); if ($user->rights->contrat->creer) { @@ -2184,17 +2184,17 @@ if ($action == 'create' && $user->rights->commande->creer) // Create bill and Classify billed // Note: Even if module invoice is not enabled, we should be able to use button "Classified billed" - if ($object->statut > 0 && ! $object->billed) { + if ($object->statut > Commande::STATUS_DRAFT && ! $object->billed) { if (! empty($conf->facture->enabled) && $user->rights->facture->creer && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) { print '
' . $langs->trans("CreateBill") . '
'; } - if ($user->rights->commande->creer && $object->statut > 2 && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) { + if ($user->rights->commande->creer && $object->statut > Commande::STATUS_ACCEPTED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) { print '
' . $langs->trans("ClassifyBilled") . '
'; } } // Set to shipped - if (($object->statut == 1 || $object->statut == 2) && $user->rights->commande->cloturer) { + if (($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_ACCEPTED) && $user->rights->commande->cloturer) { print '
' . $langs->trans('ClassifyShipped') . '
'; } @@ -2204,7 +2204,7 @@ if ($action == 'create' && $user->rights->commande->creer) } // Cancel order - if ($object->statut == 1 && $user->rights->commande->annuler) { + if ($object->statut == Commande::STATUS_VALIDATED && $user->rights->commande->annuler) { print '
' . $langs->trans('Cancel') . '
'; } diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index c1c0fa9ec4e..fea16f7c7c3 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -60,10 +60,39 @@ class Commande extends CommonOrder var $ref_int; var $contactid; var $fk_project; - var $statut; // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not) + /** + * Status of the commande. Check the following constants: + * - STATUS_CANCELED + * - STATUS_DRAFT + * - STATUS_ACCEPTED + * - STATUS_CLOSED + * @var int + */ + var $statut; var $facturee; // deprecated var $billed; // billed or not + /** + * Canceled status + */ + const STATUS_CANCELED = -1; + /** + * Draft status + */ + const STATUS_DRAFT = 0; + /** + * Validated status + */ + const STATUS_VALIDATED = 1; + /** + * Accepted/On process not managed for customer orders + */ + const STATUS_ACCEPTED = 2; + /** + * Closed (Sent/Received, billed or not) + */ + const STATUS_CLOSED = 3; + var $brouillon; var $cond_reglement_id; var $cond_reglement_code; @@ -194,7 +223,7 @@ class Commande extends CommonOrder $error=0; // Protection - if ($this->statut == 1) + if ($this->statut == self::STATUS_VALIDATED) { dol_syslog(get_class($this)."::valid no draft status", LOG_WARNING); return 0; @@ -233,7 +262,7 @@ class Commande extends CommonOrder // Validate $sql = "UPDATE ".MAIN_DB_PREFIX."commande"; $sql.= " SET ref = '".$num."',"; - $sql.= " fk_statut = 1,"; + $sql.= " fk_statut = ".self::STATUS_VALIDATED.","; $sql.= " date_valid='".$this->db->idate($now)."',"; $sql.= " fk_user_valid = ".$user->id; $sql.= " WHERE rowid = ".$this->id; @@ -323,7 +352,7 @@ class Commande extends CommonOrder if (! $error) { $this->ref = $num; - $this->statut = 1; + $this->statut = self::STATUS_VALIDATED; } if (! $error) @@ -352,7 +381,7 @@ class Commande extends CommonOrder $error=0; // Protection - if ($this->statut <= 0) + if ($this->statut <= self::STATUS_DRAFT) { return 0; } @@ -367,7 +396,7 @@ class Commande extends CommonOrder $this->db->begin(); $sql = "UPDATE ".MAIN_DB_PREFIX."commande"; - $sql.= " SET fk_statut = 0"; + $sql.= " SET fk_statut = ".self::STATUS_DRAFT; $sql.= " WHERE rowid = ".$this->id; dol_syslog(get_class($this)."::set_draft", LOG_DEBUG); @@ -393,7 +422,7 @@ class Commande extends CommonOrder if (!$error) { - $this->statut=0; + $this->statut=self::STATUS_DRAFT; $this->db->commit(); return $result; } @@ -405,7 +434,7 @@ class Commande extends CommonOrder } } - $this->statut=0; + $this->statut=self::STATUS_DRAFT; $this->db->commit(); return 1; } @@ -430,7 +459,7 @@ class Commande extends CommonOrder global $conf,$langs; $error=0; - if ($this->statut != 3) + if ($this->statut != self::STATUS_CLOSED) { dol_syslog(get_class($this)."::set_reopen order has not status closed", LOG_WARNING); return 0; @@ -439,7 +468,7 @@ class Commande extends CommonOrder $this->db->begin(); $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande'; - $sql.= ' SET fk_statut=1, facture=0'; + $sql.= ' SET fk_statut='.self::STATUS_VALIDATED.', facture=0'; $sql.= ' WHERE rowid = '.$this->id; dol_syslog(get_class($this)."::set_reopen", LOG_DEBUG); @@ -460,7 +489,7 @@ class Commande extends CommonOrder if (! $error) { - $this->statut = 1; + $this->statut = self::STATUS_VALIDATED; $this->billed = 0; $this->facturee = 0; // deprecated @@ -499,10 +528,10 @@ class Commande extends CommonOrder $now=dol_now(); $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande'; - $sql.= ' SET fk_statut = 3,'; + $sql.= ' SET fk_statut = '.self::STATUS_CLOSED.','; $sql.= ' fk_user_cloture = '.$user->id.','; $sql.= " date_cloture = '".$this->db->idate($now)."'"; - $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > 0'; + $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT; if ($this->db->query($sql)) { @@ -513,7 +542,7 @@ class Commande extends CommonOrder if (! $error) { - $this->statut=3; + $this->statut=self::STATUS_CLOSED; $this->db->commit(); return 1; @@ -550,9 +579,9 @@ class Commande extends CommonOrder $this->db->begin(); $sql = "UPDATE ".MAIN_DB_PREFIX."commande"; - $sql.= " SET fk_statut = -1"; + $sql.= " SET fk_statut = ".self::STATUS_CANCELED; $sql.= " WHERE rowid = ".$this->id; - $sql.= " AND fk_statut = 1"; + $sql.= " AND fk_statut = ".self::STATUS_VALIDATED; dol_syslog(get_class($this)."::cancel", LOG_DEBUG); if ($this->db->query($sql)) @@ -591,7 +620,7 @@ class Commande extends CommonOrder if (! $error) { - $this->statut=-1; + $this->statut=self::STATUS_CANCELED; $this->db->commit(); return 1; } @@ -906,7 +935,7 @@ class Commande extends CommonOrder } $this->id=0; - $this->statut=0; + $this->statut=self::STATUS_DRAFT; // Clear fields $this->user_author_id = $user->id; @@ -1151,7 +1180,7 @@ class Commande extends CommonOrder // Check parameters if ($type < 0) return -1; - if ($this->statut == 0) + if ($this->statut == self::STATUS_DRAFT) { $this->db->begin(); @@ -1457,7 +1486,7 @@ class Commande extends CommonOrder $this->lines = array(); - if ($this->statut == 0) $this->brouillon = 1; + if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1; // Retreive all extrafield for invoice // fetch optionals attributes and labels @@ -1769,7 +1798,7 @@ class Commande extends CommonOrder * * TODO deprecated, move to Shipping class */ - function livraison_array($filtre_statut=-1) + function livraison_array($filtre_statut=self::STATUS_CANCELED) { $delivery = new Livraison($this->db); $deliveryArray = $delivery->livraison_array($filtre_statut); @@ -1784,7 +1813,7 @@ class Commande extends CommonOrder * * TODO FONCTION NON FINIE A FINIR */ - function stock_array($filtre_statut=-1) + function stock_array($filtre_statut=self::STATUS_CANCELED) { $this->stocks = array(); @@ -1826,7 +1855,7 @@ class Commande extends CommonOrder { global $user; - if ($this->statut == 0) + if ($this->statut == self::STATUS_DRAFT) { $this->db->begin(); @@ -1909,7 +1938,7 @@ class Commande extends CommonOrder $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande'; $sql.= ' SET remise_percent = '.$remise; - $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = 0 ;'; + $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;'; if ($this->db->query($sql)) { @@ -1943,7 +1972,7 @@ class Commande extends CommonOrder $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande'; $sql.= ' SET remise_absolue = '.$remise; - $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = 0 ;'; + $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut = '.self::STATUS_DRAFT.' ;'; dol_syslog(get_class($this)."::set_remise_absolue", LOG_DEBUG); @@ -1975,7 +2004,7 @@ class Commande extends CommonOrder { $sql = "UPDATE ".MAIN_DB_PREFIX."commande"; $sql.= " SET date_commande = ".($date ? $this->db->idate($date) : 'null'); - $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; + $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT; dol_syslog(get_class($this)."::set_date",LOG_DEBUG); $resql=$this->db->query($sql); @@ -2119,7 +2148,7 @@ class Commande extends CommonOrder $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; } if ($socid) $sql.= " AND s.rowid = ".$socid; - if ($draft) $sql.= " AND c.fk_statut = 0"; + if ($draft) $sql.= " AND c.fk_statut = ".self::STATUS_DRAFT; if (is_object($excluser)) $sql.= " AND c.fk_user_author <> ".$excluser->id; $sql.= $this->db->order($sortfield,$sortorder); $sql.= $this->db->plimit($limit,$offset); @@ -2170,7 +2199,7 @@ class Commande extends CommonOrder function availability($availability_id) { dol_syslog('Commande::availability('.$availability_id.')'); - if ($this->statut >= 0) + if ($this->statut >= self::STATUS_DRAFT) { $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande'; $sql .= ' SET fk_availability = '.$availability_id; @@ -2204,7 +2233,7 @@ class Commande extends CommonOrder function demand_reason($demand_reason_id) { dol_syslog('Commande::demand_reason('.$demand_reason_id.')'); - if ($this->statut >= 0) + if ($this->statut >= self::STATUS_DRAFT) { $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande'; $sql .= ' SET fk_input_reason = '.$demand_reason_id; @@ -2275,7 +2304,7 @@ class Commande extends CommonOrder $this->db->begin(); $sql = 'UPDATE '.MAIN_DB_PREFIX.'commande SET facture = 1'; - $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > 0'; + $sql.= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT; dol_syslog(get_class($this)."::classifyBilled", LOG_DEBUG); if ($this->db->query($sql)) @@ -2753,7 +2782,7 @@ class Commande extends CommonOrder } $sql.= $clause." c.entity = ".$conf->entity; //$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0"; - $sql.= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected + $sql.= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_ACCEPTED.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected if ($user->societe_id) $sql.=" AND c.fk_soc = ".$user->societe_id; $resql=$this->db->query($sql); @@ -2827,57 +2856,57 @@ class Commande extends CommonOrder //print 'x'.$statut.'-'.$billed; if ($mode == 0) { - if ($statut==-1) return $langs->trans('StatusOrderCanceled'); - if ($statut==0) return $langs->trans('StatusOrderDraft'); - if ($statut==1) return $langs->trans('StatusOrderValidated'); - if ($statut==2) return $langs->trans('StatusOrderSentShort'); - if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill'); - if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed'); + if ($statut==self::STATUS_CANCELED-1) return $langs->trans('StatusOrderCanceled'); + if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraft'); + if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidated'); + if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort'); + if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBill'); + if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed'); } elseif ($mode == 1) { - if ($statut==-1) return $langs->trans('StatusOrderCanceledShort'); - if ($statut==0) return $langs->trans('StatusOrderDraftShort'); - if ($statut==1) return $langs->trans('StatusOrderValidatedShort'); - if ($statut==2) return $langs->trans('StatusOrderSentShort'); - if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort'); - if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed'); + if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceledShort'); + if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraftShort'); + if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidatedShort'); + if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort'); + if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderToBillShort'); + if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return $langs->trans('StatusOrderProcessed'); } elseif ($mode == 2) { - if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort'); - if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort'); - if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort'); - if ($statut==2) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort'); - if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort'); - if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessedShort'); + if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceledShort'); + if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraftShort'); + if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidatedShort'); + if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSent'),'statut3').' '.$langs->trans('StatusOrderSentShort'); + if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBillShort'); + if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessedShort'); } elseif ($mode == 3) { - if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5'); - if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0'); - if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1'); - if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3'); - if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7'); - if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6'); + if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5'); + if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0'); + if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1'); + if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort'),'statut3'); + if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7'); + if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6'); } elseif ($mode == 4) { - if ($statut==-1) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled'); - if ($statut==0) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft'); - if ($statut==1) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidated'); - if ($statut==2) return img_picto($langs->trans('StatusOrderSentShort'),'statut3').' '.$langs->trans('StatusOrderSent'); - if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill'); - if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed'); + if ($statut==self::STATUS_CANCELED) return img_picto($langs->trans('StatusOrderCanceled'),'statut5').' '.$langs->trans('StatusOrderCanceled'); + if ($statut==self::STATUS_DRAFT) return img_picto($langs->trans('StatusOrderDraft'),'statut0').' '.$langs->trans('StatusOrderDraft'); + if ($statut==self::STATUS_VALIDATED) return img_picto($langs->trans('StatusOrderValidated'),'statut1').' '.$langs->trans('StatusOrderValidated'); + if ($statut==self::STATUS_ACCEPTED) return img_picto($langs->trans('StatusOrderSentShort'),'statut3').' '.$langs->trans('StatusOrderSent'); + if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderToBill'),'statut7').' '.$langs->trans('StatusOrderToBill'); + if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return img_picto($langs->trans('StatusOrderProcessed'),'statut6').' '.$langs->trans('StatusOrderProcessed'); } elseif ($mode == 5) { - if ($statut==-1) return ''.$langs->trans('StatusOrderCanceledShort').' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5'); - if ($statut==0) return ''.$langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0'); - if ($statut==1) return ''.$langs->trans('StatusOrderValidatedShort').' '.img_picto($langs->trans('StatusOrderValidated'),'statut1'); - if ($statut==2) return ''.$langs->trans('StatusOrderSentShort').' '.img_picto($langs->trans('StatusOrderSent'),'statut3'); - if ($statut==3 && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut7'); - if ($statut==3 && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessedShort').' '.img_picto($langs->trans('StatusOrderProcessed'),'statut6'); + if ($statut==self::STATUS_CANCELED) return ''.$langs->trans('StatusOrderCanceledShort').' '.img_picto($langs->trans('StatusOrderCanceled'),'statut5'); + if ($statut==self::STATUS_DRAFT) return ''.$langs->trans('StatusOrderDraftShort').' '.img_picto($langs->trans('StatusOrderDraft'),'statut0'); + if ($statut==self::STATUS_VALIDATED) return ''.$langs->trans('StatusOrderValidatedShort').' '.img_picto($langs->trans('StatusOrderValidated'),'statut1'); + if ($statut==self::STATUS_ACCEPTED) return ''.$langs->trans('StatusOrderSentShort').' '.img_picto($langs->trans('StatusOrderSent'),'statut3'); + if ($statut==self::STATUS_CLOSED && (! $billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderToBillShort').' '.img_picto($langs->trans('StatusOrderToBill'),'statut7'); + if ($statut==self::STATUS_CLOSED && ($billed || ! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) return ''.$langs->trans('StatusOrderProcessedShort').' '.img_picto($langs->trans('StatusOrderProcessed'),'statut6'); } } diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index 8f03e33bb03..340df8172dc 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -147,16 +147,16 @@ if ($id > 0 || ! empty($ref)) if ($absolute_discount > 0) { print '. '; - if ($object->statut > 0 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) + if ($object->statut > Facture::STATUS_DRAFT || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) { - if ($object->statut == 0) + if ($object->statut == Facture::STATUS_DRAFT) { print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); print '. '; } else { - if ($object->statut < 1 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) + if ($object->statut < Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) { $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); print '
'.$text.'.
'; @@ -181,7 +181,7 @@ if ($id > 0 || ! empty($ref)) { if ($absolute_creditnote > 0) // If not linked will be added later { - if ($object->statut == 0 && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT) print ' - '.$addabsolutediscount.'
'; + if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT) print ' - '.$addabsolutediscount.'
'; else print '.'; } else print '. '; @@ -189,9 +189,9 @@ if ($id > 0 || ! empty($ref)) if ($absolute_creditnote > 0) { // If validated, we show link "add credit note to payment" - if ($object->statut != 1 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) + if ($object->statut != Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) { - if ($object->statut == 0 && $object->type != Facture::TYPE_DEPOSIT) + if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_DEPOSIT) { $text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)); print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse")); @@ -212,7 +212,7 @@ if ($id > 0 || ! empty($ref)) if (! $absolute_discount && ! $absolute_creditnote) { print $langs->trans("CompanyHasNoAbsoluteDiscount"); - if ($object->statut == 0 && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT) print ' - '.$addabsolutediscount.'
'; + if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT) print ' - '.$addabsolutediscount.'
'; else print '. '; } /*if ($object->statut == 0 && $object->type != 2 && $object->type != 3) diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 40ab9119998..999be3bb67b 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -260,7 +260,7 @@ class FactureRec extends Facture $this->rang = $obj->rang; $this->special_code = $obj->special_code; - if ($this->statut == 0) $this->brouillon = 1; + if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1; /* * Lines diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 4fbdddd5703..23a6c309900 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -95,10 +95,15 @@ class Facture extends CommonInvoice var $note; var $note_private; var $note_public; - //! 0=draft, - //! 1=validated (need to be paid), - //! 2=classified paid partially (close_code='discount_vat','badcustomer') or completely (close_code=null), - //! 3=classified abandoned and no payment done (close_code='badcustomer','abandon' or 'replaced') + + /** + * Check constants for more info: + * - STATUS_DRAFT + * - STATUS_VALIDATED + * - STATUS_PAID + * - STATUS_ABANDONED + * @var int + */ var $statut; //! Fermeture apres paiement partiel: discount_vat, badcustomer, abandon //! Fermeture alors que aucun paiement: replaced (si remplace), abandon @@ -177,6 +182,39 @@ class Facture extends CommonInvoice */ const TYPE_SITUATION = 5; + /** + * Draft + */ + const STATUS_DRAFT = 0; + + /** + * Validated (need to be paid) + */ + const STATUS_VALIDATED = 1; + + /** + * Classified paid. + * If paid partially, $this->close_code can be: + * - CLOSECODE_DISCOUNTVAT + * - CLOSECODE_BADDEBT + * If paid completelly, this->close_code will be null + */ + const STATUS_CLOSED = 2; + + /** + * Classified abandoned and no payment done. + * $this->close_code can be: + * - CLOSECODE_BADDEBT + * - CLOSECODE_ABANDONED + * - CLOSECODE_REPLACED + */ + const STATUS_ABANDONED = 3; + + const CLOSECODE_DISCOUNTVAT = 'discount_vat'; + const CLOSECODE_BADDEBT = 'badcustomer'; + const CLOSECODE_ABANDONED = 'abandon'; + const CLOSECODE_REPLACED = 'replaced'; + /** * Constructor * @@ -670,7 +708,7 @@ class Facture extends CommonInvoice } $this->id=0; - $this->statut=0; + $this->statut= self::STATUS_DRAFT; // Clear fields $this->date = dol_now(); // Date of invoice is set to current date when cloning. // TODO Best is to ask date into confirm box @@ -987,7 +1025,7 @@ class Facture extends CommonInvoice $this->situation_final = $obj->situation_final; $this->extraparams = (array) json_decode($obj->extraparams, true); - if ($this->statut == 0) $this->brouillon = 1; + if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1; // Retreive all extrafield for invoice // fetch optionals attributes and labels @@ -1524,7 +1562,7 @@ class Facture extends CommonInvoice dol_syslog(get_class($this)."::set_paid rowid=".$this->id, LOG_DEBUG); $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET'; - $sql.= ' fk_statut=2'; + $sql.= ' fk_statut='.self::STATUS_CLOSED; if (! $close_code) $sql.= ', paye=1'; if ($close_code) $sql.= ", close_code='".$this->db->escape($close_code)."'"; if ($close_note) $sql.= ", close_note='".$this->db->escape($close_note)."'"; @@ -1579,7 +1617,7 @@ class Facture extends CommonInvoice $this->db->begin(); $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture'; - $sql.= ' SET paye=0, fk_statut=1, close_code=null, close_note=null'; + $sql.= ' SET paye=0, fk_statut='.self::STATUS_VALIDATED.', close_code=null, close_note=null'; $sql.= ' WHERE rowid = '.$this->id; dol_syslog(get_class($this)."::set_unpaid", LOG_DEBUG); @@ -1632,7 +1670,7 @@ class Facture extends CommonInvoice $this->db->begin(); $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET'; - $sql.= ' fk_statut=3'; + $sql.= ' fk_statut='.self::STATUS_ABANDONED; if ($close_code) $sql.= ", close_code='".$this->db->escape($close_code)."'"; if ($close_note) $sql.= ", close_note='".$this->db->escape($close_note)."'"; $sql.= ' WHERE rowid = '.$this->id; @@ -1783,7 +1821,7 @@ class Facture extends CommonInvoice // Validate $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture'; - $sql.= " SET facnumber='".$num."', fk_statut = 1, fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'"; + $sql.= " SET facnumber='".$num."', fk_statut = ".self::STATUS_VALIDATED.", fk_user_valid = ".$user->id.", date_valid = '".$this->db->idate($now)."'"; if (! empty($conf->global->FAC_FORCE_DATE_VALIDATION)) // If option enabled, we force invoice date { $sql.= ", datef='".$this->db->idate($this->date)."'"; @@ -1884,7 +1922,7 @@ class Facture extends CommonInvoice { $this->ref = $num; $this->facnumber=$num; - $this->statut=1; + $this->statut= self::STATUS_VALIDATED; $this->brouillon=0; $this->date_validation=$now; $i = 0; @@ -1928,7 +1966,7 @@ class Facture extends CommonInvoice $error=0; - if ($this->statut == 0) + if ($this->statut == self::STATUS_DRAFT) { dol_syslog(get_class($this)."::set_draft already draft status", LOG_WARNING); return 0; @@ -1937,7 +1975,7 @@ class Facture extends CommonInvoice $this->db->begin(); $sql = "UPDATE ".MAIN_DB_PREFIX."facture"; - $sql.= " SET fk_statut = 0"; + $sql.= " SET fk_statut = ".self::STATUS_DRAFT; $sql.= " WHERE rowid = ".$this->id; dol_syslog(get_class($this)."::set_draft", LOG_DEBUG); @@ -1968,7 +2006,7 @@ class Facture extends CommonInvoice { $old_statut=$this->statut; $this->brouillon = 1; - $this->statut = 0; + $this->statut = self::STATUS_DRAFT; // Call trigger $result=$this->call_trigger('BILL_UNVALIDATE',$user); if ($result < 0) @@ -2460,7 +2498,7 @@ class Facture extends CommonInvoice $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture'; $sql.= ' SET remise_percent = '.$remise; $sql.= ' WHERE rowid = '.$this->id; - $sql.= ' AND fk_statut = 0'; + $sql.= ' AND fk_statut = '.self::STATUS_DRAFT; if ($this->db->query($sql)) { @@ -2495,7 +2533,7 @@ class Facture extends CommonInvoice $sql = 'UPDATE '.MAIN_DB_PREFIX.'facture'; $sql.= ' SET remise_absolue = '.$remise; $sql.= ' WHERE rowid = '.$this->id; - $sql.= ' AND fk_statut = 0'; + $sql.= ' AND fk_statut = '.self::STATUS_DRAFT; dol_syslog(get_class($this)."::set_remise_absolue", LOG_DEBUG); @@ -2795,7 +2833,7 @@ class Facture extends CommonInvoice return $last; } } - else if ($this->statut == 0 && $facref == 'PROV') // Si facture brouillon et provisoire + else if ($this->statut == self::STATUS_DRAFT && $facref == 'PROV') // Si facture brouillon et provisoire { return 1; } @@ -2835,7 +2873,7 @@ class Facture extends CommonInvoice $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; } if ($socid) $sql.= " AND s.rowid = ".$socid; - if ($draft) $sql.= " AND f.fk_statut = 0"; + if ($draft) $sql.= " AND f.fk_statut = ".self::STATUS_DRAFT; if (is_object($excluser)) $sql.= " AND f.fk_user_author <> ".$excluser->id; $sql.= $this->db->order($sortfield,$sortorder); $sql.= $this->db->plimit($limit,$offset); @@ -2896,7 +2934,7 @@ class Facture extends CommonInvoice $sql.= " FROM ".MAIN_DB_PREFIX."facture as f"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as ff ON f.rowid = ff.fk_facture_source"; - $sql.= " WHERE (f.fk_statut = 1 OR (f.fk_statut = 3 AND f.close_code = 'abandon'))"; + $sql.= " WHERE (f.fk_statut = ".self::STATUS_VALIDATED." OR (f.fk_statut = ".self::STATUS_ABANDONED." AND f.close_code = '".self::CLOSECODE_ABANDONED."'))"; $sql.= " AND f.entity = ".$conf->entity; $sql.= " AND f.paye = 0"; // Pas classee payee completement $sql.= " AND pf.fk_paiement IS NULL"; // Aucun paiement deja fait @@ -2944,7 +2982,7 @@ class Facture extends CommonInvoice $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as ff ON (f.rowid = ff.fk_facture_source AND ff.type=".self::TYPE_REPLACEMENT.")"; $sql.= " WHERE f.entity = ".$conf->entity; - $sql.= " AND f.fk_statut in (1,2)"; + $sql.= " AND f.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")"; // $sql.= " WHERE f.fk_statut >= 1"; // $sql.= " AND (f.paye = 1"; // Classee payee completement // $sql.= " OR f.close_code IS NOT NULL)"; // Classee payee partiellement @@ -2960,8 +2998,8 @@ class Facture extends CommonInvoice while ($obj=$this->db->fetch_object($resql)) { $qualified=0; - if ($obj->fk_statut == 1) $qualified=1; - if ($obj->fk_statut == 2) $qualified=1; + if ($obj->fk_statut == self::STATUS_VALIDATED) $qualified=1; + if ($obj->fk_statut == self::STATUS_CLOSED) $qualified=1; if ($qualified) { //$ref=$obj->facnumber; @@ -2992,7 +3030,7 @@ class Facture extends CommonInvoice dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG); - if ($this->statut > 0 && $this->paye == 0) + if ($this->statut > self::STATUS_DRAFT && $this->paye == 0) { require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php'; $bac = new CompanyBankAccount($this->db); @@ -3125,7 +3163,7 @@ class Facture extends CommonInvoice } $sql.= $clause." f.paye=0"; $sql.= " AND f.entity = ".$conf->entity; - $sql.= " AND f.fk_statut = 1"; + $sql.= " AND f.fk_statut = ".self::STATUS_VALIDATED; if ($user->societe_id) $sql.= " AND f.fk_soc = ".$user->societe_id; $resql=$this->db->query($sql); diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 1fd4d2c80fc..836b65a2454 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -523,12 +523,12 @@ else */ print '
'; - if ($object->statut == 0 && $user->rights->facture->creer) + if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->creer) { echo '
'.$langs->trans("CreateBill").'
'; } - if ($object->statut == 0 && $user->rights->facture->supprimer) + if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer) { print '
'.$langs->trans('Delete').'
'; } diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index ea945940492..d91b52b2166 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -95,7 +95,7 @@ if ($action == 'presend' && GETPOST('sendmail')) if ($result > 0) // Invoice was found { - if ($object->statut != 1) + if ($object->statut != Facture::STATUS_VALIDATED) { continue; // Payment done or started or canceled } diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 1b4f440b461..9d8b9123b68 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -229,15 +229,15 @@ if ($object->id > 0) print '. '; if ($absolute_discount > 0) { - if ($object->statut > 0 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) + if ($object->statut > Facture::STATUS_DRAFT || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) { - if ($object->statut == 0) + if ($object->statut == Facture::STATUS_DRAFT) { print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)).'. '; } else { - if ($object->statut < 1 || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) + if ($object->statut < Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) { $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); print '
'.$text.'.
'; @@ -261,9 +261,9 @@ if ($object->id > 0) if ($absolute_creditnote > 0) { // If validated, we show link "add credit note to payment" - if ($object->statut != 1 || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_CREDIT_NOTE) + if ($object->statut != Facture::STATUS_VALIDATED || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_CREDIT_NOTE) { - if ($object->statut == 0 && $object->type != Facture::TYPE_DEPOSIT) + if ($object->statut == Facture::STATUS_DRAFT && $object->type != Facture::TYPE_DEPOSIT) { $text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)); print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse")); @@ -350,7 +350,7 @@ if ($object->id > 0) else { print dol_print_date($object->date_lim_reglement,'daytext'); - if ($object->date_lim_reglement < ($now - $conf->facture->client->warning_delay) && ! $object->paye && $object->statut == 1 && ! isset($object->am)) print img_warning($langs->trans('Late')); + if ($object->date_lim_reglement < ($now - $conf->facture->client->warning_delay) && ! $object->paye && $object->statut == Facture::STATUS_VALIDATED && ! isset($object->am)) print img_warning($langs->trans('Late')); } } else @@ -473,7 +473,7 @@ if ($object->id > 0) print "\n
\n"; // Add a withdraw request - if ($object->statut > 0 && $object->paye == 0 && $num == 0) + if ($object->statut > Facture::STATUS_DRAFT && $object->paye == 0 && $num == 0) { if ($user->rights->prelevement->bons->creer) { @@ -488,7 +488,7 @@ if ($object->id > 0) { if ($num == 0) { - if ($object->statut > 0) print ''.$langs->trans("MakeWithdrawRequest").''; + if ($object->statut > Facture::STATUS_DRAFT) print ''.$langs->trans("MakeWithdrawRequest").''; else print ''.$langs->trans("MakeWithdrawRequest").''; } else print ''.$langs->trans("MakeWithdrawRequest").''; diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 59599e93dc6..0375297316b 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -142,7 +142,7 @@ if ($socid > 0) print ''.$fac->getLibStatut(2,$totalpaye).''; print ''.price($fac->total_ttc)."\n"; - if (($fac->statut == 3 ) || ($fac->statut == 2 && ! $fact->close_code) ) $solde = $solde = $solde + $totalpaye; + if (($fac->statut == Facture::STATUS_ABANDONED ) || ($fac->statut == Facture::STATUS_CLOSED && ! $fact->close_code) ) $solde = $solde = $solde + $totalpaye; else $solde = $solde + $fac->total_ttc; print ' '; diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 4c340a12cfa..8bfffac2635 100644 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1193,7 +1193,7 @@ class pdf_crabe extends ModelePDFFactures } // Escompte - if ($object->close_code == 'discount_vat') + if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT) { $index++; $pdf->SetFillColor(255,255,255); diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index d5d82f2baa3..5712f64eba7 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -216,7 +216,7 @@ if ($id > 0 || ! empty($ref)) $absolute_creditnote=price2num($absolute_creditnote,'MT'); if ($absolute_discount) { - if ($commande->statut > 0) + if ($commande->statut > Commande::STATUS_DRAFT) { print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); } @@ -606,7 +606,7 @@ if ($id > 0 || ! empty($ref)) print '
'; // Bouton expedier sans gestion des stocks - if (empty($conf->stock->enabled) && ($commande->statut > 0 && $commande->statut < 3)) + if (empty($conf->stock->enabled) && ($commande->statut > Commande::STATUS_DRAFT && $commande->statut < Commande::STATUS_CLOSED)) { if ($user->rights->expedition->creer) { @@ -626,7 +626,7 @@ if ($id > 0 || ! empty($ref)) // Bouton expedier avec gestion des stocks - if (! empty($conf->stock->enabled) && ($commande->statut > 0 && $commande->statut < 3)) + if (! empty($conf->stock->enabled) && ($commande->statut > Commande::STATUS_DRAFT && $commande->statut < Commande::STATUS_CLOSED)) { if ($user->rights->expedition->creer) { diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 77673b82ed3..7ce7ab44f13 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -241,7 +241,6 @@ class Societe extends CommonObject var $specimen; - /** * 0=no customer, 1=customer, 2=prospect, 3=customer and prospect * @var int diff --git a/htdocs/webservices/server_invoice.php b/htdocs/webservices/server_invoice.php index 9c5bd24b463..3c1a122fa6f 100644 --- a/htdocs/webservices/server_invoice.php +++ b/htdocs/webservices/server_invoice.php @@ -522,7 +522,7 @@ function createInvoice($authentication,$invoice) $newobject->date=dol_stringtotime($invoice['date'],'dayrfc'); $newobject->note_private=$invoice['note_private']; $newobject->note_public=$invoice['note_public']; - $newobject->statut=0; // We start with status draft + $newobject->statut= Facture::STATUS_DRAFT; // We start with status draft $newobject->fk_project=$invoice['project_id']; $newobject->date_creation=$now; diff --git a/htdocs/webservices/server_order.php b/htdocs/webservices/server_order.php index f089a86aeb6..2f5955d8ec1 100644 --- a/htdocs/webservices/server_order.php +++ b/htdocs/webservices/server_order.php @@ -687,7 +687,7 @@ function createOrder($authentication,$order) $newobject->date_lim_reglement=dol_stringtotime($order['date_due'],'dayrfc'); $newobject->note_private=$order['note_private']; $newobject->note_public=$order['note_public']; - $newobject->statut=0; // We start with status draft + $newobject->statut=Commande::STATUS_DRAFT; // We start with status draft $newobject->billed=$order['billed']; $newobject->fk_project=$order['project_id']; $newobject->fk_delivery_address=$order['fk_delivery_address']; From d69f066735eb8f056a08fdbe7c78e246f710e777 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 15 Mar 2015 14:04:07 +0100 Subject: [PATCH 099/412] QUAL: Traduce terms + remove
--- htdocs/adherents/class/adherent.class.php | 20 ++++++------- .../adherents/class/adherent_type.class.php | 12 ++++---- htdocs/adherents/class/cotisation.class.php | 12 ++++---- htdocs/admin/mailman.php | 22 +++++++-------- htdocs/admin/spip.php | 22 +++++++-------- htdocs/bookmarks/list.php | 18 ++++++------ htdocs/categories/class/categorie.class.php | 10 +++---- htdocs/comm/action/class/actioncomm.class.php | 12 ++++---- .../class/askpricesupplier.class.php | 10 +++---- htdocs/comm/propal/class/propal.class.php | 14 +++++----- htdocs/commande/customer.php | 10 +++---- htdocs/compta/bank/annuel.php | 4 +-- htdocs/compta/bank/class/account.class.php | 28 +++++++++---------- htdocs/compta/bank/graph.php | 8 +++--- .../deplacement/class/deplacement.class.php | 10 +++---- htdocs/compta/dons/class/don.class.php | 10 +++---- .../facture/class/facture-rec.class.php | 12 ++++---- .../compta/localtax/class/localtax.class.php | 8 +++--- .../cheque/class/remisecheque.class.php | 12 ++++---- .../compta/paiement/class/paiement.class.php | 12 ++++---- .../class/bonprelevement.class.php | 12 ++++---- .../salaries/class/paymentsalary.class.php | 8 +++--- .../sociales/class/chargesociales.class.php | 12 ++++---- .../class/paymentsocialcontribution.class.php | 12 ++++---- htdocs/compta/tva/class/tva.class.php | 8 +++--- htdocs/contact/class/contact.class.php | 12 ++++---- htdocs/contrat/card.php | 2 +- htdocs/contrat/class/contrat.class.php | 24 ++++++++-------- htdocs/core/class/discount.class.php | 12 ++++---- htdocs/core/tpl/login.tpl.php | 4 +-- htdocs/core/tpl/passwordforgotten.tpl.php | 4 +-- htdocs/ecm/class/ecmdirectory.class.php | 16 +++++------ .../class/expensereport.class.php | 10 +++---- htdocs/fichinter/class/fichinter.class.php | 8 +++--- .../class/fournisseur.commande.class.php | 12 ++++---- .../fourn/class/fournisseur.facture.class.php | 16 +++++------ htdocs/fourn/class/paiementfourn.class.php | 12 ++++---- htdocs/holiday/class/holiday.class.php | 8 +++--- htdocs/livraison/class/livraison.class.php | 12 ++++---- htdocs/product/class/product.class.php | 24 ++++++++-------- htdocs/product/expression.php | 4 +-- htdocs/product/stock/class/entrepot.class.php | 8 +++--- htdocs/projet/class/project.class.php | 20 ++++++------- htdocs/projet/class/task.class.php | 12 ++++---- htdocs/resource/class/resource.class.php | 8 +++--- htdocs/societe/class/address.class.php | 8 +++--- htdocs/societe/class/societe.class.php | 28 +++++++++---------- htdocs/user/class/user.class.php | 28 +++++++++---------- 48 files changed, 305 insertions(+), 305 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 78195bfa868..c8c4f9b9ad4 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1548,9 +1548,9 @@ class Adherent extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlen length max libelle * @param string $option Page lien * @return string Chaine avec URL @@ -1568,25 +1568,25 @@ class Adherent extends CommonObject if ($option == 'card') { - $lien = ''; } if ($option == 'subscription') { - $lien = ''; } if ($option == 'category') { - $lien = 'ref,$maxlen):$this->ref).$lienfin; + $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend; return $result; } diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index 5fc2d7c4bd8..cbf5b428cc0 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -266,9 +266,9 @@ class AdherentType extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlen length max libelle * @return string String with URL */ @@ -279,14 +279,14 @@ class AdherentType extends CommonObject $result=''; $label=$langs->trans("ShowTypeCard",$this->libelle); - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='group'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.($maxlen?dol_trunc($this->libelle,$maxlen):$this->libelle).$lienfin; + $result.=$link.($maxlen?dol_trunc($this->libelle,$maxlen):$this->libelle).$linkend; return $result; } diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index c7faf97e748..2e1966c371e 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -254,9 +254,9 @@ class Cotisation extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @return string Chaine avec URL */ function getNomUrl($withpicto=0) @@ -266,14 +266,14 @@ class Cotisation extends CommonObject $result=''; $label=$langs->trans("ShowSubscription").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='payment'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.$this->ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/admin/mailman.php b/htdocs/admin/mailman.php index 3e4a2c14a98..384400b8597 100644 --- a/htdocs/admin/mailman.php +++ b/htdocs/admin/mailman.php @@ -162,11 +162,11 @@ $var=true; if (! empty($conf->global->ADHERENT_USE_MAILMAN)) { - //$lien=img_picto($langs->trans("Active"),'tick').' '; - $lien=''; - //$lien.=$langs->trans("Disable"); - $lien.=img_picto($langs->trans("Activated"),'switch_on'); - $lien.=''; + //$link=img_picto($langs->trans("Active"),'tick').' '; + $link=''; + //$link.=$langs->trans("Disable"); + $link.=img_picto($langs->trans("Activated"),'switch_on'); + $link.=''; // Edition des varibales globales $constantes=array( 'ADHERENT_MAILMAN_ADMINPW', @@ -175,7 +175,7 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN)) 'ADHERENT_MAILMAN_LISTS' ); - print_fiche_titre($langs->trans('MailmanTitle'), $lien,''); + print_fiche_titre($langs->trans('MailmanTitle'), $link,''); print '
'; @@ -207,11 +207,11 @@ if (! empty($conf->global->ADHERENT_USE_MAILMAN)) } else { - $lien=''; - //$lien.=img_$langs->trans("Activate") - $lien.=img_picto($langs->trans("Disabled"),'switch_off'); - $lien.=''; - print_fiche_titre($langs->trans('MailmanTitle'), $lien,''); + $link=''; + //$link.=img_$langs->trans("Activate") + $link.=img_picto($langs->trans("Disabled"),'switch_off'); + $link.=''; + print_fiche_titre($langs->trans('MailmanTitle'), $link,''); } dol_fiche_end(); diff --git a/htdocs/admin/spip.php b/htdocs/admin/spip.php index 9c81338562e..76f66d4e96b 100644 --- a/htdocs/admin/spip.php +++ b/htdocs/admin/spip.php @@ -124,11 +124,11 @@ $var=true; */ if (! empty($conf->global->ADHERENT_USE_SPIP)) { - //$lien=img_picto($langs->trans("Active"),'tick').' '; - $lien=''; - //$lien.=$langs->trans("Disable"); - $lien.=img_picto($langs->trans("Activated"),'switch_on'); - $lien.=''; + //$link=img_picto($langs->trans("Active"),'tick').' '; + $link=''; + //$link.=$langs->trans("Disable"); + $link.=img_picto($langs->trans("Activated"),'switch_on'); + $link.=''; // Edition des varibales globales $constantes=array( 'ADHERENT_SPIP_SERVEUR', @@ -137,18 +137,18 @@ if (! empty($conf->global->ADHERENT_USE_SPIP)) 'ADHERENT_SPIP_PASS' ); - print_fiche_titre($langs->trans('SPIPTitle'), $lien, ''); + print_fiche_titre($langs->trans('SPIPTitle'), $link, ''); print '
'; form_constantes($constantes); print '
'; } else { - $lien=''; - //$lien.=$langs->trans("Activate"); - $lien.=img_picto($langs->trans("Disabled"),'switch_off'); - $lien.=''; - print_fiche_titre($langs->trans('SPIPTitle'), $lien, ''); + $link=''; + //$link.=$langs->trans("Activate"); + $link.=img_picto($langs->trans("Disabled"),'switch_off'); + $link.=''; + print_fiche_titre($langs->trans('SPIPTitle'), $link, ''); } diff --git a/htdocs/bookmarks/list.php b/htdocs/bookmarks/list.php index e00772a0af5..be821f72af9 100644 --- a/htdocs/bookmarks/list.php +++ b/htdocs/bookmarks/list.php @@ -119,17 +119,17 @@ if ($resql) print "bid."\">".img_object($langs->trans("ShowBookmark"),"bookmark").' '.$obj->bid.""; print ''; - $lieninterne=0; + $linkintern=0; $title=dol_trunc($obj->title,24); - $lien=dol_trunc($obj->url,24); + $link=dol_trunc($obj->url,24); // Title print ""; if ($obj->rowid) { // Lien interne societe - $lieninterne=1; - $lien="Dolibarr"; + $linkintern=1; + $link="Dolibarr"; if (! $obj->title) { // For compatibility with old Dolibarr bookmarks @@ -140,16 +140,16 @@ if ($resql) } $title=img_object($langs->trans("ShowCompany"),"company").' '.$obj->title; } - if ($lieninterne) print "url."\">"; + if ($linkintern) print "url."\">"; print $title; - if ($lieninterne) print ""; + if ($linkintern) print ""; print "\n"; // Url print ""; - if (! $lieninterne) print 'target?' target="newlink"':'').'>'; - print $lien; - if (! $lieninterne) print ''; + if (! $linkintern) print 'target?' target="newlink"':'').'>'; + print $link; + if (! $linkintern) print ''; print "\n"; // Target diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php index 7f75e6f580b..9a76211b828 100644 --- a/htdocs/categories/class/categorie.class.php +++ b/htdocs/categories/class/categorie.class.php @@ -1265,7 +1265,7 @@ class Categorie extends CommonObject /** * Return name and link of category (with picto) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien ('', 'xyz') * @param int $maxlength Max length of text * @return string Chaine avec URL @@ -1277,15 +1277,15 @@ class Categorie extends CommonObject $result=''; $label=$langs->trans("ShowCategory").': '. ($this->ref?$this->ref:$this->label); - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='category'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.dol_trunc(($this->ref?$this->ref:$this->label),$maxlength).$lienfin; + if ($withpicto != 2) $result.=$link.dol_trunc(($this->ref?$this->ref:$this->label),$maxlength).$linkend; return $result; } diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 5be0df34371..37758eea2ab 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -957,7 +957,7 @@ class ActionComm extends CommonObject * Return URL of event * Use $this->id, $this->type_code, $this->label and $this->type_label * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlength Nombre de caracteres max dans libelle * @param string $classname Force style class on a link * @param string $option ''=Link to action,'birthday'=Link to contact @@ -974,9 +974,9 @@ class ActionComm extends CommonObject $label = $this->label; if (empty($label)) $label=$this->libelle; // For backward compatibility $linkclose = '" title="'.dol_escape_htmltag($tooltip, 1).'" class="classfortooltip">'; - if ($option=='birthday') $lien = 'type_code) && $langs->transnoentities("Action".$this->type_code)!="Action".$this->type_code)?' ('.$langs->transnoentities("Action".$this->type_code).')':''); } - $result.=$lien.img_object($langs->trans("ShowAction").': '.$libelle, ($overwritepicto?$overwritepicto:'action'), 'class="classfortooltip"').$lienfin; + $result.=$link.img_object($langs->trans("ShowAction").': '.$libelle, ($overwritepicto?$overwritepicto:'action'), 'class="classfortooltip"').$linkend; } if ($withpicto==1) $result.=' '; - $result.=$lien.$libelleshort.$lienfin; + $result.=$link.$libelleshort.$linkend; return $result; } diff --git a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php index 8740e139235..ee0ad10d2e3 100644 --- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php +++ b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php @@ -2240,21 +2240,21 @@ class AskPriceSupplier extends CommonObject $label=$langs->trans("ShowAskpricesupplier").': '.$this->ref; $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; if ($option == '') { - $lien = 'ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index b0997cb9943..8909441b9c1 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2658,27 +2658,27 @@ class Propal extends CommonObject $label.= '
' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency); $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; if ($option == '') { - $lien = 'ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php index 333ce5f7908..e4662cc7ee8 100644 --- a/htdocs/commande/customer.php +++ b/htdocs/commande/customer.php @@ -158,12 +158,12 @@ if ($resql) print ''; $result=''; - $lien=$lienfin=''; - $lien = ''; - $lienfin=''; + $link=$linkend=''; + $link = ''; + $linkend=''; $name=$obj->name; - $result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin); - $result.=$lien.(dol_trunc($name,$maxlen)).$lienfin; + $result.=($link.img_object($langs->trans("ShowCompany").': '.$name,'company').$linkend); + $result.=$link.(dol_trunc($name,$maxlen)).$linkend; print $result; print ''; diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php index e5bafe8fed6..0a9cfc79b10 100644 --- a/htdocs/compta/bank/annuel.php +++ b/htdocs/compta/bank/annuel.php @@ -137,7 +137,7 @@ $head=bank_prepare_head($acct); dol_fiche_head($head,'annual',$langs->trans("FinancialAccount"),0,'account'); $title=$langs->trans("FinancialAccount")." : ".$acct->label; -$lien=($year_start?"".img_previous()." ".$langs->trans("Year")." ".img_next()."":""); +$link=($year_start?"".img_previous()." ".$langs->trans("Year")." ".img_next()."":""); print ''; @@ -191,7 +191,7 @@ print '
'; // Affiche tableau print '
'; -print ''; +print ''; print ''; for ($annee = $year_start ; $annee <= $year_end ; $annee++) diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 80262babbbf..c0704ef8f7a 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -968,9 +968,9 @@ class Account extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto Inclut le picto dans le lien + * @param int $withpicto Include picto into link * @param string $mode ''=Link to card, 'transactions'=Link to transactions card * @return string Chaine avec URL */ @@ -988,17 +988,17 @@ class Account extends CommonObject if (empty($mode)) { - $lien = ''; } else if ($mode == 'transactions') { - $lien = ''; } - if ($withpicto) $result.=($lien.img_object($label, 'account', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.$this->label.$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'account', 'class="classfortooltip"').$linkend.' '); + $result.=$link.$this->label.$linkend; return $result; } @@ -1521,9 +1521,9 @@ class AccountLine extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlen Longueur max libelle * @param string $option Option ('showall') * @return string Chaine avec URL @@ -1534,11 +1534,11 @@ class AccountLine extends CommonObject $result=''; $label=$langs->trans("ShowTransaction").': '.$this->rowid; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, 'account', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.$this->rowid.$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'account', 'class="classfortooltip"').$linkend.' '); + $result.=$link.$this->rowid.$linkend; if ($option == 'showall' || $option == 'showconciliated') $result.=' ('; if ($option == 'showall') diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php index 9351cc5fa9a..60592085b35 100644 --- a/htdocs/compta/bank/graph.php +++ b/htdocs/compta/bank/graph.php @@ -841,8 +841,8 @@ if ($mode == 'standard') if ($nextmonth > 12) { $nextmonth=1; $nextyear++; } // For month - $lien="".img_previous()." ".$langs->trans("Month")." ".img_next().""; - print ''; + $link="".img_previous()." ".$langs->trans("Month")." ".img_next().""; + print ''; print ''; + $link="".img_previous()." ".$langs->trans("Year")." ".img_next().""; + print ''; print '
'.$lien.'
'.$link.'
'.$langs->trans("Month").'
'.$lien.'
'.$link.'
'; $file = "movement".$account."-".$year.$month.".png"; @@ -855,8 +855,8 @@ if ($mode == 'standard') // For year $prevyear=$year-1;$nextyear=$year+1; - $lien="".img_previous()." ".$langs->trans("Year")." ".img_next().""; - print '
'.$lien.'
'.$link.'
'; print $show5; diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php index 6e424d9b49c..dc2d281e2a1 100644 --- a/htdocs/compta/deplacement/class/deplacement.class.php +++ b/htdocs/compta/deplacement/class/deplacement.class.php @@ -349,7 +349,7 @@ class Deplacement extends CommonObject /** * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @return string Chaine avec URL */ function getNomUrl($withpicto=0) @@ -359,15 +359,15 @@ class Deplacement extends CommonObject $result=''; $label=$langs->trans("Show").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='trip'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index e5d64eb0d9d..c018570a3b0 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -703,7 +703,7 @@ class Don extends CommonObject /** * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @return string Chaine avec URL */ function getNomUrl($withpicto=0) @@ -713,15 +713,15 @@ class Don extends CommonObject $result=''; $label=$langs->trans("ShowDonation").': '.$this->id; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='generic'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->id.$lienfin; + if ($withpicto != 2) $result.=$link.$this->id.$linkend; return $result; } diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php index 40ab9119998..c87ddb8abfc 100644 --- a/htdocs/compta/facture/class/facture-rec.class.php +++ b/htdocs/compta/facture/class/facture-rec.class.php @@ -547,9 +547,9 @@ class FactureRec extends Facture } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien ('', 'withdraw') * @return string Chaine avec URL */ @@ -560,15 +560,15 @@ class FactureRec extends Facture $result=''; $label=$langs->trans("ShowInvoice").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='bill'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php index c14c117bfbe..994e3cca40c 100644 --- a/htdocs/compta/localtax/class/localtax.class.php +++ b/htdocs/compta/localtax/class/localtax.class.php @@ -582,14 +582,14 @@ class Localtax extends CommonObject $result=''; $label=$langs->trans("ShowVatPayment").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='payment'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php index 23b19c50a6e..a3fb835f194 100644 --- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php +++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php @@ -768,9 +768,9 @@ class RemiseCheque extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @return string Chaine avec URL */ @@ -781,12 +781,12 @@ class RemiseCheque extends CommonObject $result=''; $label = $langs->trans("ShowCheckReceipt").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, 'payment', 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 01b65c0dd47..883110e9d5b 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -737,9 +737,9 @@ class Paiement extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @return string Chaine avec URL */ @@ -750,12 +750,12 @@ class Paiement extends CommonObject $result=''; $label = $langs->trans("ShowPayment").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php index e977712ab39..755e88a57b8 100644 --- a/htdocs/compta/prelevement/class/bonprelevement.class.php +++ b/htdocs/compta/prelevement/class/bonprelevement.class.php @@ -1113,17 +1113,17 @@ class BonPrelevement extends CommonObject $result=''; $label = $langs->trans("ShowWithdraw").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; if ($option == 'xxx') { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; } - if ($withpicto) $result.=($lien.img_object($label, 'payment', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.$this->ref.$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' '); + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/salaries/class/paymentsalary.class.php b/htdocs/compta/salaries/class/paymentsalary.class.php index f566123809c..0db00c10c7f 100644 --- a/htdocs/compta/salaries/class/paymentsalary.class.php +++ b/htdocs/compta/salaries/class/paymentsalary.class.php @@ -490,14 +490,14 @@ class PaymentSalary extends CommonObject $result=''; $label=$langs->trans("ShowSalaryPayment").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='payment'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php index 6f68e76303c..dc70126ab9e 100644 --- a/htdocs/compta/sociales/class/chargesociales.class.php +++ b/htdocs/compta/sociales/class/chargesociales.class.php @@ -408,9 +408,9 @@ class ChargeSociales extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlen Longueur max libelle * @return string Chaine avec URL */ @@ -423,12 +423,12 @@ class ChargeSociales extends CommonObject if (empty($this->ref)) $this->ref=$this->lib; $label = $langs->trans("ShowSocialContribution").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, 'bill', 'class="classfortooltip"').$lienfin.' '); + if ($withpicto) $result.=($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' '); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin; + if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend; return $result; } diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php index e736cb2a5a3..08f9380c905 100644 --- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php +++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php @@ -576,9 +576,9 @@ class PaymentSocialContribution extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlen Longueur max libelle * @return string Chaine avec URL */ @@ -593,12 +593,12 @@ class PaymentSocialContribution extends CommonObject if (!empty($this->id)) { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, 'payment', 'class="classfortooltip"').$lienfin.' '); + if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' '); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$lienfin; + if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend; } return $result; diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php index c32297a7e12..948b5096fa3 100644 --- a/htdocs/compta/tva/class/tva.class.php +++ b/htdocs/compta/tva/class/tva.class.php @@ -640,14 +640,14 @@ class Tva extends CommonObject $result=''; $label=$langs->trans("ShowVatPayment").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='payment'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php index 94147a2904d..19ea13f6a39 100644 --- a/htdocs/contact/class/contact.class.php +++ b/htdocs/contact/class/contact.class.php @@ -895,17 +895,17 @@ class Contact extends CommonObject $label = '' . $langs->trans("ShowContact") . ''; $label.= '
' . $langs->trans("Name") . ': '.$this->getFullName($langs); - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; if ($option == 'xxx') { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; } - if ($withpicto) $result.=($lien.img_object($label, 'contact', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'contact', 'class="classfortooltip"').$linkend.' '); + $result.=$link.($maxlen?dol_trunc($this->getFullName($langs),$maxlen):$this->getFullName($langs)).$linkend; return $result; } diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php index 82563549675..232df30e280 100644 --- a/htdocs/contrat/card.php +++ b/htdocs/contrat/card.php @@ -1053,7 +1053,7 @@ if ($action == 'create') print "
\n"; - print '
'; + print '
'; if (is_object($objectsrc)) { diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index 65db3144bb0..daac348e920 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1742,9 +1742,9 @@ class Contrat extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlength Max length of ref * @return string Chaine avec URL */ @@ -1755,15 +1755,15 @@ class Contrat extends CommonObject $result=''; $label=$langs->trans("ShowContract").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='contract'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.($maxlength?dol_trunc($this->ref,$maxlength):$this->ref).$lienfin; + if ($withpicto != 2) $result.=$link.($maxlength?dol_trunc($this->ref,$maxlength):$this->ref).$linkend; return $result; } @@ -2290,9 +2290,9 @@ class ContratLigne extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $maxlength Max length * @return string Chaine avec URL */ @@ -2303,15 +2303,15 @@ class ContratLigne extends CommonObject $result=''; $label=$langs->trans("ShowContractOfService").': '.$this->label; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='contract'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->label.$lienfin; + if ($withpicto != 2) $result.=$link.$this->label.$linkend; return $result; } diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php index a8862ab5ed2..3542b8eb1a9 100644 --- a/htdocs/core/class/discount.class.php +++ b/htdocs/core/class/discount.class.php @@ -435,23 +435,23 @@ class DiscountAbsolute if ($option == 'invoice') { $label=$langs->trans("ShowDiscount").': '.$this->ref_facture_source; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $ref=$this->ref_facture_source; $picto='bill'; } if ($option == 'discount') { $label=$langs->trans("Discount"); - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $ref=$langs->trans("Discount"); $picto='generic'; } - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.$ref.$lienfin; + $result.=$link.$ref.$linkend; return $result; } diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index bf5456a7d8d..be422c218e2 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -46,7 +46,7 @@ $(document).ready(function () { -
+
-
+
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index c517ec611d1..662bf997aa9 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -44,7 +44,7 @@ $(document).ready(function () { -
+
-
+
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php index 63fe3d477e4..99b1441e658 100644 --- a/htdocs/ecm/class/ecmdirectory.class.php +++ b/htdocs/ecm/class/ecmdirectory.class.php @@ -400,7 +400,7 @@ class EcmDirectory // extends CommonObject /** * Return directory name you can click (and picto) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=Pas de picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @param int $max Max length * @param string $more Add more param on a link @@ -416,19 +416,19 @@ class EcmDirectory // extends CommonObject $newlabel=$langs->trans("ShowECMSection").': '.$newref; $linkclose='"'.($more?' '.$more:'').' title="'.dol_escape_htmltag($newlabel, 1).'" class="classfortooltip">'; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='trip'; $label=$langs->trans("Show").': '.$this->ref; - if ($withpicto) $result.=($lien.img_object($label,$picto).$lienfin); + if ($withpicto) $result.=($link.img_object($label,$picto).$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 7be3b0bf3bd..51d37dcc8ae 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -551,15 +551,15 @@ class Fichinter extends CommonObject if (! empty($this->ref)) $label .= '
' . $langs->trans('Ref') . ': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='intervention'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index b9477d0adc8..8b7d81fdda0 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -547,9 +547,9 @@ class CommandeFournisseur extends CommonOrder /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @return string Chaine avec URL */ @@ -570,14 +570,14 @@ class CommandeFournisseur extends CommonOrder if (! empty($this->total_ttc)) $label.= '
' . $langs->trans('AmountTTC') . ': ' . price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency); - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='order'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.$this->ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 98d49fa5ff3..9cc6b237c41 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -1513,9 +1513,9 @@ class FactureFournisseur extends CommonInvoice /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @param int $max Max length of shown ref * @return string Chaine avec URL @@ -1539,20 +1539,20 @@ class FactureFournisseur extends CommonInvoice if ($option == 'document') { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; } else { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; } $ref=$this->ref; if (empty($ref)) $ref=$this->id; - if ($withpicto) $result.=($lien.img_object($label, 'bill', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.($max?dol_trunc($ref,$max):$ref).$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' '); + $result.=$link.($max?dol_trunc($ref,$max):$ref).$linkend; return $result; } diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php index 3cd3ec0496c..dc66e5abf9a 100644 --- a/htdocs/fourn/class/paiementfourn.class.php +++ b/htdocs/fourn/class/paiementfourn.class.php @@ -476,9 +476,9 @@ class PaiementFourn extends Paiement /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Sur quoi pointe le lien * @return string Chaine avec URL */ @@ -495,13 +495,13 @@ class PaiementFourn extends Paiement } $label = $langs->trans("ShowPayment").': '.$text; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($langs->trans("ShowPayment"), 'payment', 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$text.$lienfin; + if ($withpicto != 2) $result.=$link.$text.$linkend; return $result; } } diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 280efd4addc..f9624946531 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -660,14 +660,14 @@ class Holiday extends CommonObject $result=''; $label=$langs->trans("Show").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='holiday'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien.$this->ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/livraison/class/livraison.class.php b/htdocs/livraison/class/livraison.class.php index f1e9e3d6ca6..027f7ab3b89 100644 --- a/htdocs/livraison/class/livraison.class.php +++ b/htdocs/livraison/class/livraison.class.php @@ -668,9 +668,9 @@ class Livraison extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @return string Chaine avec URL */ function getNomUrl($withpicto=0) @@ -682,14 +682,14 @@ class Livraison extends CommonObject $label=$langs->trans("ShowReceiving").': '.$this->ref; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; $picto='sending'; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.$this->ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 4c341e58906..3f66a5f51fd 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2941,26 +2941,26 @@ class Product extends CommonObject $linkclose = '" title="'.str_replace('\n', '', dol_escape_htmltag($label, 1)).'" class="classfortooltip">'; if ($option == 'supplier') { - $lien = ''; } else if ($option == 'stock') { - $lien = ''; } else if ($option == 'composition') { - $lien = ''; } else if ($option == 'category') { - $lien = ''; + $link = 'label, 'product', 'class="classfortooltip"').$lienfin.' '); - if ($this->type == 1) $result.=($lien.img_object($langs->trans("ShowService").' '.$this->label, 'service', 'class="classfortooltip"').$lienfin.' '); + if ($this->type == 0) $result.=($link.img_object($langs->trans("ShowProduct").' '.$this->label, 'product', 'class="classfortooltip"').$linkend.' '); + if ($this->type == 1) $result.=($link.img_object($langs->trans("ShowService").' '.$this->label, 'service', 'class="classfortooltip"').$linkend.' '); } - $result.=$lien.$newref.$lienfin; + $result.=$link.$newref.$linkend; return $result; } diff --git a/htdocs/product/expression.php b/htdocs/product/expression.php index be3e5401789..cb612359bd5 100644 --- a/htdocs/product/expression.php +++ b/htdocs/product/expression.php @@ -194,7 +194,7 @@ print ''; print ''; //Buttons -print '
'; +print '
'; +print '
'; print ''; diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php index 09c7c21a0d5..271da598b6b 100644 --- a/htdocs/product/stock/class/entrepot.class.php +++ b/htdocs/product/stock/class/entrepot.class.php @@ -518,11 +518,11 @@ class Entrepot extends CommonObject if (! empty($this->lieu)) $label.= '
' . $langs->trans('LocationSummary').': '.$this->lieu; - $lien=''; - $lienfin=''; + $link=''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, 'stock', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.$this->libelle.$lienfin; + if ($withpicto) $result.=($link.img_object($label, 'stock', 'class="classfortooltip"').$linkend.' '); + $result.=$link.$this->libelle.$linkend; return $result; } diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index bc9e6bd37b5..0cb72355bb0 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -810,9 +810,9 @@ class Project extends CommonObject } /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Variant ('', 'nolink') * @param int $addlabel 0=Default, 1=Add label into string, >1=Add first chars into string * @return string Chaine avec URL @@ -822,8 +822,8 @@ class Project extends CommonObject global $langs; $result = ''; - $lien = ''; - $lienfin = ''; + $link = ''; + $linkend = ''; $label = '' . $langs->trans("ShowProject") . ''; if (! empty($this->ref)) $label .= '
' . $langs->trans('Ref') . ': ' . $this->ref; @@ -833,11 +833,11 @@ class Project extends CommonObject if ($option != 'nolink') { if (preg_match('/\.php$/',$option)) { - $lien = ''; } else { - $lien = ''; } } @@ -845,9 +845,9 @@ class Project extends CommonObject if (!$this->public) $picto = 'project'; - if ($withpicto) $result.=($lien . img_object($label, $picto, 'class="classfortooltip"') . $lienfin); + if ($withpicto) $result.=($link . img_object($label, $picto, 'class="classfortooltip"') . $linkend); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$lien . $this->ref . $lienfin . (($addlabel && $this->title) ? ' - ' . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : ''); + if ($withpicto != 2) $result.=$link . $this->ref . $linkend . (($addlabel && $this->title) ? ' - ' . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : ''); return $result; } diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index c322e0be3cc..84888484d2c 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -494,9 +494,9 @@ class Task extends CommonObject /** - * Renvoie nom clicable (avec eventuellement le picto) + * Return clicable name (with picto eventually) * - * @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param int $option Sur quoi pointe le lien * @param int $mode Mode 'task', 'time', 'contact', 'note', document' define page to link to. * @return string Chaine avec URL @@ -517,15 +517,15 @@ class Task extends CommonObject } $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; - $lien = 'ref.$lienfin; + if ($withpicto != 2) $result.=$link.$this->ref.$linkend; return $result; } diff --git a/htdocs/resource/class/resource.class.php b/htdocs/resource/class/resource.class.php index 498291c1cc1..33df80fc095 100644 --- a/htdocs/resource/class/resource.class.php +++ b/htdocs/resource/class/resource.class.php @@ -873,18 +873,18 @@ class Resource extends CommonObject if ($option == '') { - $lien = ''; + $link = ''; $picto='resource@resource'; $label=$langs->trans("ShowResource").': '.$this->ref; } - $lienfin=''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($label, $picto, 'class="classfortooltip"').$lienfin); + if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.$this->ref.$lienfin; + $result.=$link.$this->ref.$linkend; return $result; } } diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php index 68f58e41c34..db981834760 100644 --- a/htdocs/societe/class/address.class.php +++ b/htdocs/societe/class/address.class.php @@ -430,11 +430,11 @@ class Address $result=''; $label = $langs->trans("ShowAddress").': '.$this->label; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$lienfin.' '); - $result.=$lien.$this->label.$lienfin; + if ($withpicto) $result.=($link.img_object($langs->trans("ShowAddress").': '.$this->label, 'address', 'class="classfortooltip"').$linkend.' '); + $result.=$link.$this->label.$linkend; return $result; } diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index ee81df97889..9af32e0756f 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1751,41 +1751,41 @@ class Societe extends CommonObject } $result=''; $label=''; - $lien=''; $lienfin=''; + $link=''; $linkend=''; $label.= '
'; if ($option == 'customer' || $option == 'compta') { $label.= '' . $langs->trans("ShowCustomer") . ''; - $lien = 'global->SOCIETE_DISABLE_PROSPECTS)) { $label.= '' . $langs->trans("ShowProspect") . ''; - $lien = 'trans("ShowSupplier") . ''; - $lien = 'trans("ShowCategory") . ''; - $lien = 'trans("ShowCategorySupplier") . ''; - $lien = 'trans("ShowCompany") . ''; - $lien = ''; // Add type of canvas - $lien.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'"'; - $lien.=($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip"'); - $lien.='>'; - $lienfin=''; + $link.=(!empty($this->canvas)?'&canvas='.$this->canvas:'').'"'; + $link.=($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip"'); + $link.='>'; + $linkend=''; - if ($withpicto) $result.=($lien.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip"')).$lienfin); + if ($withpicto) $result.=($link.img_object(($notooltip?'':$label), 'company', ($notooltip?'':'class="classfortooltip"')).$linkend); if ($withpicto && $withpicto != 2) $result.=' '; - $result.=$lien.($maxlen?dol_trunc($name,$maxlen):$name).$lienfin; + $result.=$link.($maxlen?dol_trunc($name,$maxlen):$name).$linkend; return $result; } diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index babac9c33ba..4ced71a7022 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1775,7 +1775,7 @@ class User extends CommonObject * Return a link to the user card (with optionaly the picto) * Use this->id,this->lastname, this->firstname * - * @param int $withpicto Include picto in link (0=No picto, 1=Inclut le picto dans le lien, 2=Picto seul) + * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @param string $option On what the link point to * @param boolean $infologin Add connection info to the tooltip * @param string $notooltip 1=Disable tooltip @@ -1836,24 +1836,24 @@ class User extends CommonObject } - $lien = 'getFullName($langs,'','',$maxlen) . $companylink . $lienfin; + $result.= $link . $this->getFullName($langs,'','',$maxlen) . $companylink . $linkend; return $result; } /** * Renvoie login clicable (avec eventuellement le picto) * - * @param int $withpicto Inclut le picto dans le lien + * @param int $withpicto Include picto into link * @param string $option Sur quoi pointe le lien * @return string Chaine avec URL */ @@ -1863,17 +1863,17 @@ class User extends CommonObject $result=''; - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; if ($option == 'xxx') { - $lien = ''; - $lienfin=''; + $link = ''; + $linkend=''; } - if ($withpicto) $result.=($lien.img_object($langs->trans("ShowUser"),'user').$lienfin.' '); - $result.=$lien.$this->login.$lienfin; + if ($withpicto) $result.=($link.img_object($langs->trans("ShowUser"),'user').$linkend.' '); + $result.=$link.$this->login.$linkend; return $result; } From bcdf3407c7c1d7bbb50090bc2bf3f2215c3d7ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 15 Mar 2015 18:01:21 +0100 Subject: [PATCH 100/412] Fixed line endings --- htdocs/includes/tcpdi/fpdf_tpl.php | 920 ++++++++++++++--------------- 1 file changed, 460 insertions(+), 460 deletions(-) diff --git a/htdocs/includes/tcpdi/fpdf_tpl.php b/htdocs/includes/tcpdi/fpdf_tpl.php index 86e38b71641..8482ba336ed 100644 --- a/htdocs/includes/tcpdi/fpdf_tpl.php +++ b/htdocs/includes/tcpdi/fpdf_tpl.php @@ -1,460 +1,460 @@ -Error('This method is only usable with FPDF. Use TCPDF methods startTemplate() instead.'); - return; - } - - if ($this->page <= 0) - $this->error("You have to add a page to fpdf first!"); - - if ($x == null) - $x = 0; - if ($y == null) - $y = 0; - if ($w == null) - $w = $this->w; - if ($h == null) - $h = $this->h; - - // Save settings - $this->tpl++; - $tpl =& $this->tpls[$this->tpl]; - $tpl = array( - 'o_x' => $this->x, - 'o_y' => $this->y, - 'o_AutoPageBreak' => $this->AutoPageBreak, - 'o_bMargin' => $this->bMargin, - 'o_tMargin' => $this->tMargin, - 'o_lMargin' => $this->lMargin, - 'o_rMargin' => $this->rMargin, - 'o_h' => $this->h, - 'o_w' => $this->w, - 'o_FontFamily' => $this->FontFamily, - 'o_FontStyle' => $this->FontStyle, - 'o_FontSizePt' => $this->FontSizePt, - 'o_FontSize' => $this->FontSize, - 'buffer' => '', - 'x' => $x, - 'y' => $y, - 'w' => $w, - 'h' => $h - ); - - $this->SetAutoPageBreak(false); - - // Define own high and width to calculate possitions correct - $this->h = $h; - $this->w = $w; - - $this->_intpl = true; - $this->SetXY($x + $this->lMargin, $y + $this->tMargin); - $this->SetRightMargin($this->w - $w + $this->rMargin); - - if ($this->CurrentFont) { - $fontkey = $this->FontFamily . $this->FontStyle; - $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey]; - - $this->_out(sprintf('BT /F%d %.2f Tf ET', $this->CurrentFont['i'], $this->FontSizePt)); - } - - return $this->tpl; - } - - /** - * End Template - * - * This method ends a template and reset initiated variables on beginTemplate. - * - * @return mixed If a template is opened, the ID is returned. If not a false is returned. - */ - function endTemplate() { - if (is_subclass_of($this, 'TCPDF')) { - $args = func_get_args(); - return call_user_func_array(array($this, 'TCPDF::endTemplate'), $args); - } - - if ($this->_intpl) { - $this->_intpl = false; - $tpl =& $this->tpls[$this->tpl]; - $this->SetXY($tpl['o_x'], $tpl['o_y']); - $this->tMargin = $tpl['o_tMargin']; - $this->lMargin = $tpl['o_lMargin']; - $this->rMargin = $tpl['o_rMargin']; - $this->h = $tpl['o_h']; - $this->w = $tpl['o_w']; - $this->SetAutoPageBreak($tpl['o_AutoPageBreak'], $tpl['o_bMargin']); - - $this->FontFamily = $tpl['o_FontFamily']; - $this->FontStyle = $tpl['o_FontStyle']; - $this->FontSizePt = $tpl['o_FontSizePt']; - $this->FontSize = $tpl['o_FontSize']; - - $fontkey = $this->FontFamily . $this->FontStyle; - if ($fontkey) - $this->CurrentFont =& $this->fonts[$fontkey]; - - return $this->tpl; - } else { - return false; - } - } - - /** - * Use a Template in current Page or other Template - * - * You can use a template in a page or in another template. - * You can give the used template a new size like you use the Image()-method. - * All parameters are optional. The width or height is calculated automaticaly - * if one is given. If no parameter is given the origin size as defined in - * beginTemplate() is used. - * The calculated or used width and height are returned as an array. - * - * @param int $tplidx A valid template-Id - * @param int $_x The x-position - * @param int $_y The y-position - * @param int $_w The new width of the template - * @param int $_h The new height of the template - * @retrun array The height and width of the template - */ - function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0) { - if ($this->page <= 0) - $this->error('You have to add a page first!'); - - if (!isset($this->tpls[$tplidx])) - $this->error('Template does not exist!'); - - if ($this->_intpl) { - $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] =& $this->tpls[$tplidx]; - } - - $tpl =& $this->tpls[$tplidx]; - $w = $tpl['w']; - $h = $tpl['h']; - - if ($_x == null) - $_x = 0; - if ($_y == null) - $_y = 0; - - $_x += $tpl['x']; - $_y += $tpl['y']; - - $wh = $this->getTemplateSize($tplidx, $_w, $_h); - $_w = $wh['w']; - $_h = $wh['h']; - - $tData = array( - 'x' => $this->x, - 'y' => $this->y, - 'w' => $_w, - 'h' => $_h, - 'scaleX' => ($_w / $w), - 'scaleY' => ($_h / $h), - 'tx' => $_x, - 'ty' => ($this->h - $_y - $_h), - 'lty' => ($this->h - $_y - $_h) - ($this->h - $h) * ($_h / $h) - ); - - $this->_out(sprintf('q %.4F 0 0 %.4F %.4F %.4F cm', $tData['scaleX'], $tData['scaleY'], $tData['tx'] * $this->k, $tData['ty'] * $this->k)); // Translate - $this->_out(sprintf('%s%d Do Q', $this->tplprefix, $tplidx)); - - $this->lastUsedTemplateData = $tData; - - return array('w' => $_w, 'h' => $_h); - } - - /** - * Get The calculated Size of a Template - * - * If one size is given, this method calculates the other one. - * - * @param int $tplidx A valid template-Id - * @param int $_w The width of the template - * @param int $_h The height of the template - * @return array The height and width of the template - */ - function getTemplateSize($tplidx, $_w = 0, $_h = 0) { - if (!isset($this->tpls[$tplidx])) - return false; - - $tpl =& $this->tpls[$tplidx]; - $w = $tpl['w']; - $h = $tpl['h']; - - if ($_w == 0 and $_h == 0) { - $_w = $w; - $_h = $h; - } - - if($_w == 0) - $_w = $_h * $w / $h; - if($_h == 0) - $_h = $_w * $h / $w; - - return array("w" => $_w, "h" => $_h); - } - - /** - * See FPDF/TCPDF-Documentation ;-) - */ - public function SetFont($family, $style = '', $size = 0) { - if (is_subclass_of($this, 'TCPDF')) { - $args = func_get_args(); - return call_user_func_array(array($this, 'TCPDF::SetFont'), $args); - } - - parent::SetFont($family, $style, $size); - - $fontkey = $this->FontFamily . $this->FontStyle; - - if ($this->_intpl) { - $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey]; - } else { - $this->_res['page'][$this->page]['fonts'][$fontkey] =& $this->fonts[$fontkey]; - } - } - - /** - * See FPDF/TCPDF-Documentation ;-) - */ - function Image( - $file, $x = '', $y = '', $w = 0, $h = 0, $type = '', $link = '', $align = '', $resize = false, - $dpi = 300, $palign = '', $ismask = false, $imgmask = false, $border = 0, $fitbox = false, - $hidden = false, $fitonpage = false, $alt = false, $altimgs = array() - ) { - if (is_subclass_of($this, 'TCPDF')) { - $args = func_get_args(); - return call_user_func_array(array($this, 'TCPDF::Image'), $args); - } - - $ret = parent::Image($file, $x, $y, $w, $h, $type, $link); - if ($this->_intpl) { - $this->_res['tpl'][$this->tpl]['images'][$file] =& $this->images[$file]; - } else { - $this->_res['page'][$this->page]['images'][$file] =& $this->images[$file]; - } - - return $ret; - } - - /** - * See FPDF-Documentation ;-) - * - * AddPage is not available when you're "in" a template. - */ - function AddPage($orientation = '', $format = '', $keepmargins = false, $tocpage = false) { - if (is_subclass_of($this, 'TCPDF')) { - $args = func_get_args(); - return call_user_func_array(array($this, 'TCPDF::AddPage'), $args); - } - - if ($this->_intpl) - $this->Error('Adding pages in templates isn\'t possible!'); - - parent::AddPage($orientation, $format); - } - - /** - * Preserve adding Links in Templates ...won't work - */ - function Link($x, $y, $w, $h, $link, $spaces = 0) { - if (is_subclass_of($this, 'TCPDF')) { - $args = func_get_args(); - return call_user_func_array(array($this, 'TCPDF::Link'), $args); - } - - if ($this->_intpl) - $this->Error('Using links in templates aren\'t possible!'); - - parent::Link($x, $y, $w, $h, $link); - } - - function AddLink() { - if (is_subclass_of($this, 'TCPDF')) { - $args = func_get_args(); - return call_user_func_array(array($this, 'TCPDF::AddLink'), $args); - } - - if ($this->_intpl) - $this->Error('Adding links in templates aren\'t possible!'); - return parent::AddLink(); - } - - function SetLink($link, $y = 0, $page = -1) { - if (is_subclass_of($this, 'TCPDF')) { - $args = func_get_args(); - return call_user_func_array(array($this, 'TCPDF::SetLink'), $args); - } - - if ($this->_intpl) - $this->Error('Setting links in templates aren\'t possible!'); - parent::SetLink($link, $y, $page); - } - - /** - * Private Method that writes the form xobjects - */ - function _putformxobjects() { - $filter=($this->compress) ? '/Filter /FlateDecode ' : ''; - reset($this->tpls); - foreach($this->tpls AS $tplidx => $tpl) { - - $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer']; - $this->_newobj(); - $this->tpls[$tplidx]['n'] = $this->n; - $this->_out('<<'.$filter.'/Type /XObject'); - $this->_out('/Subtype /Form'); - $this->_out('/FormType 1'); - $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]', - // llx - $tpl['x'] * $this->k, - // lly - -$tpl['y'] * $this->k, - // urx - ($tpl['w'] + $tpl['x']) * $this->k, - // ury - ($tpl['h'] - $tpl['y']) * $this->k - )); - - if ($tpl['x'] != 0 || $tpl['y'] != 0) { - $this->_out(sprintf('/Matrix [1 0 0 1 %.5F %.5F]', - -$tpl['x'] * $this->k * 2, $tpl['y'] * $this->k * 2 - )); - } - - $this->_out('/Resources '); - - $this->_out('<_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) { - $this->_out('/Font <<'); - foreach($this->_res['tpl'][$tplidx]['fonts'] as $font) - $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R'); - $this->_out('>>'); - } - if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) || - isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) - { - $this->_out('/XObject <<'); - if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) { - foreach($this->_res['tpl'][$tplidx]['images'] as $image) - $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R'); - } - if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) { - foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl) - $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R'); - } - $this->_out('>>'); - } - $this->_out('>>'); - - $this->_out('/Length ' . strlen($p) . ' >>'); - $this->_putstream($p); - $this->_out('endobj'); - } - } - - /** - * Overwritten to add _putformxobjects() after _putimages() - * - */ - function _putimages() { - parent::_putimages(); - $this->_putformxobjects(); - } - - function _putxobjectdict() { - parent::_putxobjectdict(); - - if (count($this->tpls)) { - foreach($this->tpls as $tplidx => $tpl) { - $this->_out(sprintf('%s%d %d 0 R', $this->tplprefix, $tplidx, $tpl['n'])); - } - } - } - - /** - * Private Method - */ - function _out($s) { - if ($this->state == 2 && $this->_intpl) { - $this->tpls[$this->tpl]['buffer'] .= $s . "\n"; - } else { - parent::_out($s); - } - } -} +Error('This method is only usable with FPDF. Use TCPDF methods startTemplate() instead.'); + return; + } + + if ($this->page <= 0) + $this->error("You have to add a page to fpdf first!"); + + if ($x == null) + $x = 0; + if ($y == null) + $y = 0; + if ($w == null) + $w = $this->w; + if ($h == null) + $h = $this->h; + + // Save settings + $this->tpl++; + $tpl =& $this->tpls[$this->tpl]; + $tpl = array( + 'o_x' => $this->x, + 'o_y' => $this->y, + 'o_AutoPageBreak' => $this->AutoPageBreak, + 'o_bMargin' => $this->bMargin, + 'o_tMargin' => $this->tMargin, + 'o_lMargin' => $this->lMargin, + 'o_rMargin' => $this->rMargin, + 'o_h' => $this->h, + 'o_w' => $this->w, + 'o_FontFamily' => $this->FontFamily, + 'o_FontStyle' => $this->FontStyle, + 'o_FontSizePt' => $this->FontSizePt, + 'o_FontSize' => $this->FontSize, + 'buffer' => '', + 'x' => $x, + 'y' => $y, + 'w' => $w, + 'h' => $h + ); + + $this->SetAutoPageBreak(false); + + // Define own high and width to calculate possitions correct + $this->h = $h; + $this->w = $w; + + $this->_intpl = true; + $this->SetXY($x + $this->lMargin, $y + $this->tMargin); + $this->SetRightMargin($this->w - $w + $this->rMargin); + + if ($this->CurrentFont) { + $fontkey = $this->FontFamily . $this->FontStyle; + $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey]; + + $this->_out(sprintf('BT /F%d %.2f Tf ET', $this->CurrentFont['i'], $this->FontSizePt)); + } + + return $this->tpl; + } + + /** + * End Template + * + * This method ends a template and reset initiated variables on beginTemplate. + * + * @return mixed If a template is opened, the ID is returned. If not a false is returned. + */ + function endTemplate() { + if (is_subclass_of($this, 'TCPDF')) { + $args = func_get_args(); + return call_user_func_array(array($this, 'TCPDF::endTemplate'), $args); + } + + if ($this->_intpl) { + $this->_intpl = false; + $tpl =& $this->tpls[$this->tpl]; + $this->SetXY($tpl['o_x'], $tpl['o_y']); + $this->tMargin = $tpl['o_tMargin']; + $this->lMargin = $tpl['o_lMargin']; + $this->rMargin = $tpl['o_rMargin']; + $this->h = $tpl['o_h']; + $this->w = $tpl['o_w']; + $this->SetAutoPageBreak($tpl['o_AutoPageBreak'], $tpl['o_bMargin']); + + $this->FontFamily = $tpl['o_FontFamily']; + $this->FontStyle = $tpl['o_FontStyle']; + $this->FontSizePt = $tpl['o_FontSizePt']; + $this->FontSize = $tpl['o_FontSize']; + + $fontkey = $this->FontFamily . $this->FontStyle; + if ($fontkey) + $this->CurrentFont =& $this->fonts[$fontkey]; + + return $this->tpl; + } else { + return false; + } + } + + /** + * Use a Template in current Page or other Template + * + * You can use a template in a page or in another template. + * You can give the used template a new size like you use the Image()-method. + * All parameters are optional. The width or height is calculated automaticaly + * if one is given. If no parameter is given the origin size as defined in + * beginTemplate() is used. + * The calculated or used width and height are returned as an array. + * + * @param int $tplidx A valid template-Id + * @param int $_x The x-position + * @param int $_y The y-position + * @param int $_w The new width of the template + * @param int $_h The new height of the template + * @retrun array The height and width of the template + */ + function useTemplate($tplidx, $_x = null, $_y = null, $_w = 0, $_h = 0) { + if ($this->page <= 0) + $this->error('You have to add a page first!'); + + if (!isset($this->tpls[$tplidx])) + $this->error('Template does not exist!'); + + if ($this->_intpl) { + $this->_res['tpl'][$this->tpl]['tpls'][$tplidx] =& $this->tpls[$tplidx]; + } + + $tpl =& $this->tpls[$tplidx]; + $w = $tpl['w']; + $h = $tpl['h']; + + if ($_x == null) + $_x = 0; + if ($_y == null) + $_y = 0; + + $_x += $tpl['x']; + $_y += $tpl['y']; + + $wh = $this->getTemplateSize($tplidx, $_w, $_h); + $_w = $wh['w']; + $_h = $wh['h']; + + $tData = array( + 'x' => $this->x, + 'y' => $this->y, + 'w' => $_w, + 'h' => $_h, + 'scaleX' => ($_w / $w), + 'scaleY' => ($_h / $h), + 'tx' => $_x, + 'ty' => ($this->h - $_y - $_h), + 'lty' => ($this->h - $_y - $_h) - ($this->h - $h) * ($_h / $h) + ); + + $this->_out(sprintf('q %.4F 0 0 %.4F %.4F %.4F cm', $tData['scaleX'], $tData['scaleY'], $tData['tx'] * $this->k, $tData['ty'] * $this->k)); // Translate + $this->_out(sprintf('%s%d Do Q', $this->tplprefix, $tplidx)); + + $this->lastUsedTemplateData = $tData; + + return array('w' => $_w, 'h' => $_h); + } + + /** + * Get The calculated Size of a Template + * + * If one size is given, this method calculates the other one. + * + * @param int $tplidx A valid template-Id + * @param int $_w The width of the template + * @param int $_h The height of the template + * @return array The height and width of the template + */ + function getTemplateSize($tplidx, $_w = 0, $_h = 0) { + if (!isset($this->tpls[$tplidx])) + return false; + + $tpl =& $this->tpls[$tplidx]; + $w = $tpl['w']; + $h = $tpl['h']; + + if ($_w == 0 and $_h == 0) { + $_w = $w; + $_h = $h; + } + + if($_w == 0) + $_w = $_h * $w / $h; + if($_h == 0) + $_h = $_w * $h / $w; + + return array("w" => $_w, "h" => $_h); + } + + /** + * See FPDF/TCPDF-Documentation ;-) + */ + public function SetFont($family, $style = '', $size = 0) { + if (is_subclass_of($this, 'TCPDF')) { + $args = func_get_args(); + return call_user_func_array(array($this, 'TCPDF::SetFont'), $args); + } + + parent::SetFont($family, $style, $size); + + $fontkey = $this->FontFamily . $this->FontStyle; + + if ($this->_intpl) { + $this->_res['tpl'][$this->tpl]['fonts'][$fontkey] =& $this->fonts[$fontkey]; + } else { + $this->_res['page'][$this->page]['fonts'][$fontkey] =& $this->fonts[$fontkey]; + } + } + + /** + * See FPDF/TCPDF-Documentation ;-) + */ + function Image( + $file, $x = '', $y = '', $w = 0, $h = 0, $type = '', $link = '', $align = '', $resize = false, + $dpi = 300, $palign = '', $ismask = false, $imgmask = false, $border = 0, $fitbox = false, + $hidden = false, $fitonpage = false, $alt = false, $altimgs = array() + ) { + if (is_subclass_of($this, 'TCPDF')) { + $args = func_get_args(); + return call_user_func_array(array($this, 'TCPDF::Image'), $args); + } + + $ret = parent::Image($file, $x, $y, $w, $h, $type, $link); + if ($this->_intpl) { + $this->_res['tpl'][$this->tpl]['images'][$file] =& $this->images[$file]; + } else { + $this->_res['page'][$this->page]['images'][$file] =& $this->images[$file]; + } + + return $ret; + } + + /** + * See FPDF-Documentation ;-) + * + * AddPage is not available when you're "in" a template. + */ + function AddPage($orientation = '', $format = '', $keepmargins = false, $tocpage = false) { + if (is_subclass_of($this, 'TCPDF')) { + $args = func_get_args(); + return call_user_func_array(array($this, 'TCPDF::AddPage'), $args); + } + + if ($this->_intpl) + $this->Error('Adding pages in templates isn\'t possible!'); + + parent::AddPage($orientation, $format); + } + + /** + * Preserve adding Links in Templates ...won't work + */ + function Link($x, $y, $w, $h, $link, $spaces = 0) { + if (is_subclass_of($this, 'TCPDF')) { + $args = func_get_args(); + return call_user_func_array(array($this, 'TCPDF::Link'), $args); + } + + if ($this->_intpl) + $this->Error('Using links in templates aren\'t possible!'); + + parent::Link($x, $y, $w, $h, $link); + } + + function AddLink() { + if (is_subclass_of($this, 'TCPDF')) { + $args = func_get_args(); + return call_user_func_array(array($this, 'TCPDF::AddLink'), $args); + } + + if ($this->_intpl) + $this->Error('Adding links in templates aren\'t possible!'); + return parent::AddLink(); + } + + function SetLink($link, $y = 0, $page = -1) { + if (is_subclass_of($this, 'TCPDF')) { + $args = func_get_args(); + return call_user_func_array(array($this, 'TCPDF::SetLink'), $args); + } + + if ($this->_intpl) + $this->Error('Setting links in templates aren\'t possible!'); + parent::SetLink($link, $y, $page); + } + + /** + * Private Method that writes the form xobjects + */ + function _putformxobjects() { + $filter=($this->compress) ? '/Filter /FlateDecode ' : ''; + reset($this->tpls); + foreach($this->tpls AS $tplidx => $tpl) { + + $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer']; + $this->_newobj(); + $this->tpls[$tplidx]['n'] = $this->n; + $this->_out('<<'.$filter.'/Type /XObject'); + $this->_out('/Subtype /Form'); + $this->_out('/FormType 1'); + $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]', + // llx + $tpl['x'] * $this->k, + // lly + -$tpl['y'] * $this->k, + // urx + ($tpl['w'] + $tpl['x']) * $this->k, + // ury + ($tpl['h'] - $tpl['y']) * $this->k + )); + + if ($tpl['x'] != 0 || $tpl['y'] != 0) { + $this->_out(sprintf('/Matrix [1 0 0 1 %.5F %.5F]', + -$tpl['x'] * $this->k * 2, $tpl['y'] * $this->k * 2 + )); + } + + $this->_out('/Resources '); + + $this->_out('<_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) { + $this->_out('/Font <<'); + foreach($this->_res['tpl'][$tplidx]['fonts'] as $font) + $this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R'); + $this->_out('>>'); + } + if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) || + isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) + { + $this->_out('/XObject <<'); + if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) { + foreach($this->_res['tpl'][$tplidx]['images'] as $image) + $this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R'); + } + if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) { + foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl) + $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R'); + } + $this->_out('>>'); + } + $this->_out('>>'); + + $this->_out('/Length ' . strlen($p) . ' >>'); + $this->_putstream($p); + $this->_out('endobj'); + } + } + + /** + * Overwritten to add _putformxobjects() after _putimages() + * + */ + function _putimages() { + parent::_putimages(); + $this->_putformxobjects(); + } + + function _putxobjectdict() { + parent::_putxobjectdict(); + + if (count($this->tpls)) { + foreach($this->tpls as $tplidx => $tpl) { + $this->_out(sprintf('%s%d %d 0 R', $this->tplprefix, $tplidx, $tpl['n'])); + } + } + } + + /** + * Private Method + */ + function _out($s) { + if ($this->state == 2 && $this->_intpl) { + $this->tpls[$this->tpl]['buffer'] .= $s . "\n"; + } else { + parent::_out($s); + } + } +} From 79ca1fe1476c2cb7988faaee0118f9b4b1e63c85 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 15 Mar 2015 23:32:43 +0100 Subject: [PATCH 101/412] Clean code. --- htdocs/comm/card.php | 2 +- htdocs/fourn/card.php | 1 - htdocs/fourn/class/fournisseur.class.php | 3 +++ htdocs/societe/class/client.class.php | 9 ++++++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 9b7c3150c71..3ea63caf256 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -31,6 +31,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; @@ -220,7 +221,6 @@ if ($id > 0) print ''; print ''; diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 1825349e83b..b9957c12134 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -134,7 +134,6 @@ if ($object->id > 0) print '
'.$langs->trans("ThirdPartyName").''; - $object->next_prev_filter="te.client in (1,2,3)"; print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','',''); print '
'; print ''; diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php index 35620bf91fb..5fc0b3e43dd 100644 --- a/htdocs/fourn/class/fournisseur.class.php +++ b/htdocs/fourn/class/fournisseur.class.php @@ -35,6 +35,9 @@ class Fournisseur extends Societe { var $db; + var $next_prev_filter="te.fournisseur = 1"; // Used to add a filter in Form::showrefnav method + + /** * Constructor * diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php index 27209c05abd..d5ac33227c5 100644 --- a/htdocs/societe/class/client.class.php +++ b/htdocs/societe/class/client.class.php @@ -29,9 +29,12 @@ include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; */ class Client extends Societe { - var $nb; - - /** + var $db; + + var $next_prev_filter="te.client in (1,2,3)"; // Used to add a filter in Form::showrefnav method + + + /** * Constructor * * @param DoliDB $db Database handler From 60c72e13b3a4b72aa707d47cd0516b212778e896 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 15 Mar 2015 23:39:53 +0100 Subject: [PATCH 102/412] Some fixes into export and translation --- htdocs/exports/class/export.class.php | 32 ++++++++++++++++------ htdocs/install/mysql/data/llx_c_stcomm.sql | 10 +++---- htdocs/langs/en_US/bills.lang | 5 ++-- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index d332592da6d..33c4b415f0b 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -337,13 +337,15 @@ class Export /** * Build an input field used to filter the query * - * @param string $TypeField Type of Field to filter + * @param string $TypeField Type of Field to filter. Example: Text, List:c_country:label:rowid, List:c_stcom:label:code, Number, Boolean * @param string $NameField Name of the field to filter * @param string $ValueField Initial value of the field to filter * @return string html string of the input field ex : "" */ function build_filterField($TypeField, $NameField, $ValueField) { + global $langs; + $szFilterField=''; $InfoFieldList = explode(":", $TypeField); @@ -354,7 +356,7 @@ class Export case 'Date': case 'Duree': case 'Numeric': - $szFilterField='"; + $szFilterField=''; break; case 'Boolean': $szFilterField='"; - $this->db->free(); + $this->db->free($resql); } + else dol_print_error($this->db); break; } diff --git a/htdocs/install/mysql/data/llx_c_stcomm.sql b/htdocs/install/mysql/data/llx_c_stcomm.sql index 65516a27476..e1bf526d489 100644 --- a/htdocs/install/mysql/data/llx_c_stcomm.sql +++ b/htdocs/install/mysql/data/llx_c_stcomm.sql @@ -31,8 +31,8 @@ -- delete from llx_c_stcomm; -insert into llx_c_stcomm (id,code,libelle) values (-1, 'ST_NO', 'Ne pas contacter'); -insert into llx_c_stcomm (id,code,libelle) values ( 0, 'ST_NEVER', 'Jamais contacté'); -insert into llx_c_stcomm (id,code,libelle) values ( 1, 'ST_TODO', 'A contacter'); -insert into llx_c_stcomm (id,code,libelle) values ( 2, 'ST_PEND', 'Contact en cours'); -insert into llx_c_stcomm (id,code,libelle) values ( 3, 'ST_DONE', 'Contactée'); +insert into llx_c_stcomm (id,code,libelle) values (-1, 'ST_NO', 'Do not contact'); +insert into llx_c_stcomm (id,code,libelle) values ( 0, 'ST_NEVER', 'Never contacted'); +insert into llx_c_stcomm (id,code,libelle) values ( 1, 'ST_TODO', 'To contact'); +insert into llx_c_stcomm (id,code,libelle) values ( 2, 'ST_PEND', 'Contact in progress'); +insert into llx_c_stcomm (id,code,libelle) values ( 3, 'ST_DONE', 'Contacted'); diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 5a805f4f6a1..10a8c5fecc4 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay From 6ba3b900b7aed1b8298c4f287b73c694d2a876f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sun, 15 Mar 2015 23:42:11 +0100 Subject: [PATCH 103/412] PHPCS Fix --- htdocs/core/class/commonobject.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 0a682415b94..e781405344b 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2662,7 +2662,6 @@ abstract class CommonObject * @param string $buyer Object of buyer third party * @param string $selected Object line selected * @param int $dateSelector 1=Show also date range input fields - * @param int $permtoedit Permission to edit line * @return void */ function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0) From 1cd81f0e81c2dc779b30c58baed8d824386d93a7 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 16 Mar 2015 06:29:15 +0100 Subject: [PATCH 104/412] Work on module donations --- htdocs/compta/dons/card.php | 282 +++++++++--------- htdocs/compta/dons/class/don.class.php | 85 +++++- htdocs/compta/dons/document.php | 125 ++++++++ htdocs/compta/dons/info.php | 62 ++++ htdocs/core/lib/donation.lib.php | 61 ++++ .../install/mysql/migration/3.7.0-3.8.0.sql | 3 + htdocs/install/mysql/tables/llx_don.sql | 3 +- 7 files changed, 469 insertions(+), 152 deletions(-) create mode 100644 htdocs/compta/dons/document.php create mode 100644 htdocs/compta/dons/info.php create mode 100644 htdocs/core/lib/donation.lib.php diff --git a/htdocs/compta/dons/card.php b/htdocs/compta/dons/card.php index 71e96f60f49..a4e68fbc4de 100644 --- a/htdocs/compta/dons/card.php +++ b/htdocs/compta/dons/card.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2013 Florian Henry + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -26,6 +27,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; @@ -33,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; if (! empty($conf->projet->enabled)) { require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; } +require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $langs->load("companies"); $langs->load("donations"); @@ -43,7 +46,7 @@ $action=GETPOST('action','alpha'); $cancel=GETPOST('cancel'); $amount=GETPOST('amount'); -$don = new Don($db); +$object = new Don($db); $donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); // Security check @@ -83,28 +86,26 @@ if ($action == 'update') if (! $error) { - $don->fetch($id); + $object->fetch($id); - $don->firstname = $_POST["firstname"]; - $don->lastname = $_POST["lastname"]; - $don->societe = $_POST["societe"]; - $don->address = $_POST["address"]; - $don->amount = price2num($_POST["amount"]); - $don->town = $_POST["town"]; - $don->zip = $_POST["zipcode"]; - $don->country = $_POST["country"]; - $don->email = $_POST["email"]; - $don->date = $donation_date; - $don->note = $_POST["note"]; - $don->public = $_POST["public"]; - $don->fk_project = $_POST["projectid"]; - $don->note_private= GETPOST("note_private"); - $don->note_public = GETPOST("note_public"); - $don->modepaiementid = $_POST["modepaiement"]; + $object->firstname = GETPOST("firstname"); + $object->lastname = GETPOST("lastname"); + $object->societe = GETPOST("societe"); + $object->address = GETPOST("address"); + $object->amount = price2num(GETPOST("amount")); + $object->town = GETPOST("town"); + $object->zip = GETPOST("zipcode"); + $object->country_id = GETPOST('country_id', 'int'); + $object->email = GETPOST("email"); + $object->date = $donation_date; + $object->public = GETPOST("public"); + $object->fk_project = GETPOST("projectid"); + $object->note_private= GETPOST("note_private"); + $object->note_public = GETPOST("note_public"); - if ($don->update($user) > 0) + if ($object->update($user) > 0) { - header("Location: ".$_SERVER['PHP_SELF']."?id=".$don->id); + header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id); exit; } } @@ -136,24 +137,23 @@ if ($action == 'add') if (! $error) { - $don->firstname = $_POST["firstname"]; - $don->lastname = $_POST["lastname"]; - $don->societe = $_POST["societe"]; - $don->address = $_POST["address"]; - $don->amount = price2num($_POST["amount"]); - $don->town = $_POST["town"]; - $don->zip = $_POST["zipcode"]; - $don->town = $_POST["town"]; - $don->country = $_POST["country"]; - $don->email = $_POST["email"]; - $don->date = $donation_date; - $don->note_private= GETPOST("note_private"); - $don->note_public = GETPOST("note_public"); - $don->public = $_POST["public"]; - $don->fk_project = $_POST["projectid"]; - $don->modepaiementid = $_POST["modepaiement"]; + $object->firstname = GETPOST("firstname"); + $object->lastname = GETPOST("lastname"); + $object->societe = GETPOST("societe"); + $object->address = GETPOST("address"); + $object->amount = price2num(GETPOST("amount")); + $object->town = GETPOST("town"); + $object->zip = GETPOST("zipcode"); + $object->town = GETPOST("town"); + $object->country_id = GETPOST('country_id', 'int'); + $object->email = GETPOST("email"); + $object->date = $donation_date; + $object->note_private= GETPOST("note_private"); + $object->note_public = GETPOST("note_public"); + $object->public = GETPOST("public"); + $object->fk_project = GETPOST("projectid"); - if ($don->create($user) > 0) + if ($object->create($user) > 0) { header("Location: index.php"); exit; @@ -163,57 +163,57 @@ if ($action == 'add') if ($action == 'delete') { - $don->delete($id); + $object->delete($id); header("Location: list.php"); exit; } if ($action == 'commentaire') { - $don->fetch($id); - $don->update_note($_POST["commentaire"]); + $object->fetch($id); + $object->update_note(GETPOST("commentaire")); } if ($action == 'valid_promesse') { - if ($don->valid_promesse($id, $user->id) >= 0) + if ($object->valid_promesse($id, $user->id) >= 0) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); exit; } else { - setEventMessage($don->error, 'errors'); + setEventMessage($object->error, 'errors'); } } if ($action == 'set_cancel') { - if ($don->set_cancel($id) >= 0) + if ($object->set_cancel($id) >= 0) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); exit; } else { - setEventMessage($don->error, 'errors'); + setEventMessage($object->error, 'errors'); } } if ($action == 'set_paid') { - if ($don->set_paye($id, $modepaiement) >= 0) + if ($object->set_paye($id, $modepaiement) >= 0) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); exit; } else { - setEventMessage($don->error, 'errors'); + setEventMessage($object->error, 'errors'); } } if ($action == 'set_encaisse') { - if ($don->set_encaisse($id) >= 0) + if ($object->set_encaisse($id) >= 0) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); exit; } else { - setEventMessage($don->error, 'errors'); + setEventMessage($object->error, 'errors'); } } @@ -268,7 +268,7 @@ if ($action == 'create') { print_fiche_titre($langs->trans("AddDonation")); - print '
'; + print ''; print ''; print '
'.$langs->trans("ThirdPartyName").''; - $object->next_prev_filter="te.fournisseur = 1"; print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom','',''); print '
'; @@ -278,40 +278,57 @@ if ($action == 'create') if (! empty($conf->projet->enabled)) $nbrows++; // Date - print ''; - print '"; - print ""; - // Amount - print "".''; + print "".''; print '\n"; - print "".''; - print "".''; - print "".''; + print "".''; + print "".''; + print "".''; print "".''; + print ''; // Zip / Town print ''; - print "".''; - print "".''; + // Country + print ''; + + print "".''; - print "\n"; + // Public note + print ''; + print ''; + print ''; + + // Private note + if (empty($user->societe_id)) { + print ''; + print ''; + print ''; + } if (! empty($conf->projet->enabled)) { @@ -320,13 +337,13 @@ if ($action == 'create') // Si module projet actif print "\n"; } // Other attributes $parameters=array('colspan' => ' colspan="1"'); - $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$don,$action); // Note that $action and $object may have been modified by hook + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook print "
'.$langs->trans("Date").''; + print '
'.$langs->trans("Date").''; $form->select_date($donation_date?$donation_date:-1,'','','','',"add",1,1); print ''.$langs->trans("Comments").' :
'; - print "
'.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->currency).'
'.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->currency).'
'.$langs->trans("PublicDonation").""; print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1); print "
'.$langs->trans("Company").'
'.$langs->trans("Firstname").'
'.$langs->trans("Lastname").'
'.$langs->trans("Company").'
'.$langs->trans("Lastname").'
'.$langs->trans("Firstname").'
'.$langs->trans("Address").''; - print '
'.$langs->trans("Zip").' / '.$langs->trans("Town").''; - print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectcountry_id','state_id'),6); + print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6); print ' '; - print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectcountry_id','state_id')); + print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id')); print '
'.$langs->trans("Country").'
'.$langs->trans("EMail").'
'; + print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id); + if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); + print '
'.$langs->trans("EMail").'
".$langs->trans("PaymentMode")."\n"; - $form->select_types_paiements('', 'modepaiement', 'CRDT', 0, 1); - print "
' . $langs->trans('NotePublic') . ''; + + $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); + print $doleditor->Create(1); + print '
' . $langs->trans('NotePrivate') . ''; + + $doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); + print $doleditor->Create(1); + print '
".$langs->trans("Project").""; - $formproject->select_projects('',$_POST["projectid"],"projectid"); + $formproject->select_projects('',GETPOST("projectid"),"projectid"); print "
\n"; print '
   
'; @@ -342,26 +359,21 @@ if ($action == 'create') if (! empty($id) && $action == 'edit') { - $don->fetch($id); - - $h=0; - $head[$h][0] = $_SERVER['PHP_SELF']."?id=".$don->id; - $head[$h][1] = $langs->trans("Card"); - $hselected=$h; - $h++; + $object->fetch($id); + $head = donation_prepare_head($object); dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic'); - print ''; + print ''; print ''; print ''; print ''; - print ''; + print ''; // Ref print "".''; print ''; @@ -370,15 +382,11 @@ if (! empty($id) && $action == 'edit') // Date print "".''; - print '"; - print ""; - // Amount - print "".''; + print "".''; print '\n"; $langs->load("companies"); - print "".''; - print "".''; - print "".''; + print "".''; + print "".''; + print "".''; print "".''; + print ''; // Zip / Town print ''; - print "".''; - print "".''; + // Country + print ''; + + print "".''; print "\n"; - print "".''; + print "".''; // Project if (! empty($conf->projet->enabled)) @@ -419,13 +432,13 @@ if (! empty($id) && $action == 'edit') $langs->load('projects'); print ''; } // Other attributes $parameters=array('colspan' => ' colspan="1"'); - $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$don,$action); // Note that $action and $object may have been modified by hook + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook print "
'.$langs->trans("Ref").''; - print $don->getNomUrl(); + print $object->getNomUrl(); print '
'.$langs->trans("Date").''; - $form->select_date($don->date,'','','','',"update"); + $form->select_date($object->date,'','','','',"update"); print ''.$langs->trans("Comments").' :
'; - print "
'.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->currency).'
'.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->currency).'
'.$langs->trans("PublicDonation").""; print $form->selectyesno("public",1,1); @@ -386,31 +394,36 @@ if (! empty($id) && $action == 'edit') print "
'.$langs->trans("Company").'
'.$langs->trans("Firstname").'
'.$langs->trans("Lastname").'
'.$langs->trans("Company").'
'.$langs->trans("Lastname").'
'.$langs->trans("Firstname").'
'.$langs->trans("Address").''; - print '
'.$langs->trans("Zip").' / '.$langs->trans("Town").''; - print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$don->zip),'zipcode',array('town','selectcountry_id','state_id'),6); + print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6); print ' '; - print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$don->town),'town',array('zipcode','selectcountry_id','state_id')); + print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id')); print '
'.$langs->trans("Country").'
'.$langs->trans("EMail").'
'.$langs->trans('Country').''; + print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id'); + if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); + print '
'.$langs->trans("EMail").'
".$langs->trans("PaymentMode")."\n"; - if ($don->modepaiementid) $selected = $don->modepaiementid; + if ($object->modepaiementid) $selected = $object->modepaiementid; else $selected = ''; $form->select_types_paiements($selected, 'modepaiement', 'CRDT', 0, 1); print "
'.$langs->trans("Status").''.$don->getLibStatut(4).'
'.$langs->trans("Status").''.$object->getLibStatut(4).'
'.$langs->trans('Project').''; - $formproject->select_projects(-1, (isset($_POST["projectid"])?$_POST["projectid"]:$don->fk_project), 'projectid'); + $formproject->select_projects(-1, (isset($_POST["projectid"])?$_POST["projectid"]:$don->fk_project), 'projectid'); print '
\n"; @@ -445,17 +458,12 @@ if (! empty($id) && $action == 'edit') /* ************************************************************ */ if (! empty($id) && $action != 'edit') { - $result=$don->fetch($id); - - $h=0; - $head[$h][0] = $_SERVER['PHP_SELF']."?id=".$don->id; - $head[$h][1] = $langs->trans("Card"); - $hselected=$h; - $h++; - + $result=$object->fetch($id); + + $head = donation_prepare_head($object); dol_fiche_head($head, $hselected, $langs->trans("Donation"), 0, 'generic'); - print ""; + print ''; print ''; print ''; @@ -466,54 +474,58 @@ if (! empty($id) && $action != 'edit') // Ref print "".''; print ''; // Date print '"; - print ''; - - print "".''; + print "".''; print "\n"; - print "".''; - print "".''; - print "".''; - print "".''; + print "".''; + print "".''; + print "".''; + print "".''; // Zip / Town - print "".''; + print "".''; // Country - print "".''; + print ''; // EMail - print "".''; + print "".''; // Payment mode print "\n"; - print "".''; + print "".''; // Project if (! empty($conf->projet->enabled)) { - print "".''; + print "".''; } // Other attributes $parameters=array('colspan' => ' colspan="1"'); - $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$don,$action); // Note that $action and $object may have been modified by hook + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook print "
'.$langs->trans("Ref").''; - print $form->showrefnav($don, 'rowid', $linkback, 1, 'rowid', 'ref', ''); + print $form->showrefnav($object, 'rowid', $linkback, 1, 'rowid', 'ref', ''); print '
'.$langs->trans("Date").''; - print dol_print_date($don->date,"day"); + print dol_print_date($object->date,"day"); print "'.$langs->trans("Comments").' :
'; - print nl2br($don->note_private).'
'.$langs->trans("Amount").''.price($don->amount,0,$langs,0,0,-1,$conf->currency).'
'.$langs->trans("Amount").''.price($object->amount,0,$langs,0,0,-1,$conf->currency).'
".$langs->trans("PublicDonation").""; - print yn($don->public); + print yn($object->public); print "
'.$langs->trans("Company").''.$don->societe.'
'.$langs->trans("Firstname").''.$don->firstname.'
'.$langs->trans("Lastname").''.$don->lastname.'
'.$langs->trans("Address").''.dol_nl2br($don->address).'
'.$langs->trans("Company").''.$object->societe.'
'.$langs->trans("Lastname").''.$object->lastname.'
'.$langs->trans("Firstname").''.$object->firstname.'
'.$langs->trans("Address").''.dol_nl2br($object->address).'
'.$langs->trans("Zip").' / '.$langs->trans("Town").''.$don->zip.($don->zip && $don->town?' / ':'').$don->town.'
'.$langs->trans("Zip").' / '.$langs->trans("Town").''.$object->zip.($object->zip && $object->town?' / ':'').$object->town.'
'.$langs->trans("Country").''.$don->country.'
'.$langs->trans('Country').''; + if (! empty($object->country_code)) + { + $img=picto_from_langcode($object->country_code); + print ($img?$img.' ':''); + } + print $object->country; + print '
'.$langs->trans("EMail").''.dol_print_email($don->email).'
'.$langs->trans("EMail").''.dol_print_email($object->email).'
".$langs->trans("PaymentMode").""; - $form->form_modes_reglement(null, $don->modepaiementid,'none'); + $form->form_modes_reglement(null, $object->modepaiementid,'none'); print "
'.$langs->trans("Status").''.$don->getLibStatut(4).'
'.$langs->trans("Status").''.$object->getLibStatut(4).'
'.$langs->trans("Project").''.$don->projet.'
'.$langs->trans("Project").''.$object->projet.'
\n"; print "\n"; @@ -529,32 +541,32 @@ if (! empty($id) && $action != 'edit') */ print '
'; - print '
'.$langs->trans('Modify').'
'; + print '
'.$langs->trans('Modify').'
'; - if ($don->statut == 0) + if ($object->statut == 0) { - print '
'.$langs->trans("ValidPromess").'
'; + print '
'.$langs->trans("ValidPromess").'
'; } - if (($don->statut == 0 || $don->statut == 1) && $resteapayer == 0 && $don->paye == 0) + if (($object->statut == 0 || $object->statut == 1) && $resteapayer == 0 && $object->paye == 0) { - print '
'.$langs->trans("ClassifyCanceled")."
"; + print '
'.$langs->trans("ClassifyCanceled")."
"; } // TODO Gerer action emettre paiement - if ($don->statut == 1 && $resteapayer > 0) + if ($object->statut == 1 && $resteapayer > 0) { - print '
'.$langs->trans("DoPayment")."
"; + print '
'.$langs->trans("DoPayment")."
"; } - if ($don->statut == 1 && $resteapayer == 0 && $don->paye == 0) + if ($object->statut == 1 && $resteapayer == 0 && $object->paye == 0) { - print '
'.$langs->trans("ClassifyPaid")."
"; + print '
'.$langs->trans("ClassifyPaid")."
"; } if ($user->rights->don->supprimer) { - print '
'.$langs->trans("Delete")."
"; + print '
'.$langs->trans("Delete")."
"; } else { @@ -569,9 +581,9 @@ if (! empty($id) && $action != 'edit') /* * Documents generes */ - $filename=dol_sanitizeFileName($don->id); + $filename=dol_sanitizeFileName($object->id); $filedir=$conf->don->dir_output . '/' . get_exdir($filename,2); - $urlsource=$_SERVER['PHP_SELF'].'?rowid='.$don->id; + $urlsource=$_SERVER['PHP_SELF'].'?rowid='.$object->id; // $genallowed=($fac->statut == 1 && ($fac->paye == 0 || $user->admin) && $user->rights->facture->creer); // $delallowed=$user->rights->facture->supprimer; $genallowed=1; diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index e5d64eb0d9d..6435e82ed8c 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -2,7 +2,8 @@ /* Copyright (C) 2002 Rodolphe Quiedeville * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2009 Regis Houssin - * Copyright (C) 2014 Florian Henry + * Copyright (C) 2014 Florian Henry + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -20,8 +21,8 @@ /** * \file htdocs/compta/dons/class/don.class.php - * \ingroup don - * \brief Fichier de la classe des dons + * \ingroup Donation + * \brief File of class to manage donations */ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; @@ -46,6 +47,8 @@ class Don extends CommonObject var $address; var $zip; var $town; + var $country_id; + var $country_code; var $country; var $email; var $public; @@ -326,7 +329,8 @@ class Don extends CommonObject $sql.= ", address"; $sql.= ", zip"; $sql.= ", town"; - $sql.= ", country"; + // $sql.= ", country"; -- Deprecated + $sql.= ", fk_pays"; $sql.= ", public"; $sql.= ", fk_don_projet"; $sql.= ", note_private"; @@ -348,7 +352,7 @@ class Don extends CommonObject $sql.= ", '".$this->db->escape($this->address)."'"; $sql.= ", '".$this->db->escape($this->zip)."'"; $sql.= ", '".$this->db->escape($this->town)."'"; - $sql.= ", '".$this->db->escape($this->country)."'"; // TODO use country_id + $sql.= ", ".$this->country_id; $sql.= ", ".$this->public; $sql.= ", ".($this->fk_project > 0?$this->fk_project:"null"); $sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL"); @@ -409,7 +413,7 @@ class Don extends CommonObject $sql .= ",address='".$this->db->escape($this->address)."'"; $sql .= ",zip='".$this->db->escape($this->zip)."'"; $sql .= ",town='".$this->db->escape($this->town)."'"; - $sql .= ",country='".$this->db->escape($this->country)."'"; // TODO use country_id + $sql .= ",fk_pays = ".$this->country_id; $sql .= ",public=".$this->public; $sql .= ",fk_don_projet=".($this->fk_project>0?$this->fk_project:'null'); $sql .= ",note_private=".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL"); @@ -493,12 +497,14 @@ class Don extends CommonObject $sql = "SELECT d.rowid, d.datec, d.tms as datem, d.datedon,"; $sql.= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, "; - $sql.= " d.country, d.public, d.amount, d.fk_paiement, d.note_private, d.note_public, cp.libelle, d.email, d.phone, "; - $sql.= " d.phone_mobile, d.fk_don_projet,"; - $sql.= " p.title as project_label"; + $sql.= " d.fk_pays, d.public, d.amount, d.fk_paiement, d.note_private, d.note_public, cp.libelle, d.email, d.phone, "; + $sql.= " d.phone_mobile, d.fk_don_projet,"; + $sql.= " p.title as project_label,"; + $sql.= " c.code as country_code, c.label as country"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_don_projet"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_paiement"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_pays = c.rowid"; $sql.= " WHERE d.rowid = ".$rowid." AND d.entity = ".$conf->entity; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); @@ -522,7 +528,9 @@ class Don extends CommonObject $this->town = $obj->town; $this->zip = $obj->zip; $this->town = $obj->town; - $this->country = $obj->country; + $this->country_id = $obj->country_id; + $this->country_code = $obj->country_code; + $this->country = $obj->country; $this->email = $obj->email; $this->phone = $obj->phone; $this->phone_mobile = $obj->phone_mobile; @@ -547,10 +555,10 @@ class Don extends CommonObject } /** - * Valide une promesse de don + * Validate a promise of donation * - * @param int $rowid id du don a modifier - * @param int $userid utilisateur qui valide la promesse + * @param int $rowid id of donation + * @param int $userid User who validate the promise * @return int <0 if KO, >0 if OK */ function valid_promesse($rowid, $userid) @@ -644,9 +652,9 @@ class Don extends CommonObject } /** - * Set donation sto status canceled + * Set donation to status canceled * - * @param int $rowid id du don a modifier + * @param int $rowid id of donation * @return int <0 if KO, >0 if OK */ function set_cancel($rowid) @@ -673,7 +681,7 @@ class Don extends CommonObject } /** - * Somme des dons + * Sum of donations * * @param string $param 1=promesses de dons validees , 2=xxx, 3=encaisses * @return int Summ of donations @@ -724,5 +732,50 @@ class Don extends CommonObject if ($withpicto != 2) $result.=$lien.$this->id.$lienfin; return $result; } + + /** + * Information on record + * + * @param int $id Id of record + * @return void + */ + function info($id) + { + $sql = 'SELECT d.rowid, d.datec, d.fk_user_author, d.fk_user_valid,'; + $sql.= ' d.tms'; + $sql.= ' FROM '.MAIN_DB_PREFIX.'don as d'; + $sql.= ' WHERE d.rowid = '.$id; + + dol_syslog(get_class($this).'::info', LOG_DEBUG); + $result = $this->db->query($sql); + + if ($result) + { + if ($this->db->num_rows($result)) + { + $obj = $this->db->fetch_object($result); + $this->id = $obj->rowid; + if ($obj->fk_user_author) + { + $cuser = new User($this->db); + $cuser->fetch($obj->fk_user_author); + $this->user_creation = $cuser; + } + if ($obj->fk_user_valid) + { + $vuser = new User($this->db); + $vuser->fetch($obj->fk_user_valid); + $this->user_modification = $vuser; + } + $this->date_creation = $this->db->jdate($obj->datec); + $this->date_modification = $this->db->jdate($obj->tms); + } + $this->db->free($result); + } + else + { + dol_print_error($this->db); + } + } } diff --git a/htdocs/compta/dons/document.php b/htdocs/compta/dons/document.php new file mode 100644 index 00000000000..d4671097fad --- /dev/null +++ b/htdocs/compta/dons/document.php @@ -0,0 +1,125 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/dons/document.php + * \ingroup Donation + * \brief Page of linked files into donations + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; + +$langs->load("other"); +$langs->load("donations"); +$langs->load("companies"); +$langs->load("interventions"); + +$id = GETPOST('id','int'); +$ref = GETPOST('ref', 'alpha'); +$action = GETPOST('action','alpha'); +$confirm = GETPOST('confirm','alpha'); + +// Security check +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'don', $id, ''); + +// Get parameters +$sortfield = GETPOST('sortfield','alpha'); +$sortorder = GETPOST('sortorder','alpha'); +$page = GETPOST('page','int'); +if ($page == -1) { $page = 0; } +$offset = $conf->liste_limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; +if (! $sortorder) $sortorder="ASC"; +if (! $sortfield) $sortfield="name"; + +$object = new Don($db); +$object->fetch($id, $ref); + +$upload_dir = $conf->dons->dir_output.'/'.dol_sanitizeFileName($object->ref); +$modulepart='don'; + + +/* + * Actions + */ + +include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; + + +/* + * View + */ + +$form = new Form($db); + +llxHeader("","",$langs->trans("Don")); + + +if ($object->id) +{ + $object->fetch_thirdparty(); + + $head=donation_prepare_head($object); + + dol_fiche_head($head, 'documents', $langs->trans("Don"), 0, 'bill'); + + + // Built files list + $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); + $totalsize=0; + foreach($filearray as $key => $file) + { + $totalsize+=$file['size']; + } + + + print ''; + + $linkback = ''.$langs->trans("BackToList").''; + + // Ref + print ''; + + print ''; + print ''; + print '
'.$langs->trans("Ref").''; + print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', ''); + print '
'.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
'; + + print '
'; + + $modulepart = 'don'; + $permission = $user->rights->don->creer; + $param = '&id=' . $object->id; + include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; + +} +else +{ + print $langs->trans("ErrorUnknown"); +} + +llxFooter(); + +$db->close(); diff --git a/htdocs/compta/dons/info.php b/htdocs/compta/dons/info.php new file mode 100644 index 00000000000..ca2c03878d6 --- /dev/null +++ b/htdocs/compta/dons/info.php @@ -0,0 +1,62 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/dons/info.php + * \ingroup Donation + * \brief Page to show a donation information + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; + +$langs->load("donations"); + +// Security check +$id = GETPOST('id','int'); +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'don', $id, ''); + + +/* + * View + */ + +llxHeader(); + +if ($id) +{ + $object = new Don($db); + $object->fetch($id); + $object->info($id); + + $head = donation_prepare_head($object); + + dol_fiche_head($head, 'info', $langs->trans("Donation"), 0, 'bill'); + + print '
'; + dol_print_object_info($object); + print '
'; + + print '
'; +} + +$db->close(); + +llxFooter(); diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php new file mode 100644 index 00000000000..dcbe2d30e84 --- /dev/null +++ b/htdocs/core/lib/donation.lib.php @@ -0,0 +1,61 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/core/lib/donation.lib.php + * \ingroup Donation + * \brief Library of donation functions + */ + +/** + * Prepare array with list of tabs + * + * @param Donation $object Donation + * @return array Array of tabs to show + */ +function donation_prepare_head($object) +{ + global $langs, $conf; + + $h = 0; + $head = array (); + + $head[$h][0] = DOL_URL_ROOT . '/compta/dons/card.php?id=' . $object->id; + $head[$h][1] = $langs->trans("Card"); + $head[$h][2] = 'card'; + $h ++; + + // Show more tabs from modules + // Entries must be declared in modules descriptor with line + // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab + // $this->tabs = array('entity:-tabname); to remove a tab + complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation'); + + $head[$h][0] = DOL_URL_ROOT . '/compta/dons/document.php?id='.$object->id; + $head[$h][1] = $langs->trans("Documents"); + $head[$h][2] = 'documents'; + $h++; + + $head[$h][0] = DOL_URL_ROOT . '/compta/dons/info.php?id=' . $object->id; + $head[$h][1] = $langs->trans("Info"); + $head[$h][2] = 'info'; + $h++; + + complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation', 'remove'); + + return $head; +} diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index b7475d88f91..d2520973275 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -370,3 +370,6 @@ INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DDP', 'Delivered Du -- Extrafields fk_object must be unique (1-1 relation) ALTER TABLE llx_societe_extrafields DROP INDEX idx_societe_extrafields; ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_object); + +-- Module Donation +ALTER TABLE llx_don ADD COLUMN fk_pays integer NOT NULL after country; diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index 259cac22966..bf434e11518 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -36,7 +36,8 @@ create table llx_don address text, zip varchar(30), town varchar(50), - country varchar(50), + country varchar(50), -- Deprecated - Replace with fk_pays + fk_pays integer NOT NULL, email varchar(255), phone varchar(24), phone_mobile varchar(24), From 88d9f7f0f1a3f1139868ac6f8bfeb0f6f5305819 Mon Sep 17 00:00:00 2001 From: Sof Date: Mon, 16 Mar 2015 12:23:25 +0100 Subject: [PATCH 105/412] FIX : Force ref Even if you set ref in object class Commande, ref will be set to '(PROVid)' until you call 'valid' function --- htdocs/commande/class/commande.class.php | 44 +++++++++++++----------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 8dcaca59a97..229b88d656c 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -629,8 +629,8 @@ class Commande extends CommonOrder * Note that this->ref can be set or empty. If empty, we will use "(PROV)" * * @param User $user Objet user that make creation - * @param int $notrigger Disable all triggers - * @return int <0 if KO, >0 if OK + * @param int $notrigger Disable all triggers + * @return int <0 if KO, >0 if OK */ function create($user, $notrigger=0) { @@ -638,22 +638,22 @@ class Commande extends CommonOrder $error=0; // Clean parameters - $this->brouillon = 1; // On positionne en mode brouillon la commande + $this->brouillon = 1; // set command as draft dol_syslog(get_class($this)."::create user=".$user->id); // Check parameters if (! empty($this->ref)) // We check that ref is not already used - { - $result=self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used - if ($result > 0) - { - $this->error='ErrorRefAlreadyExists'; - dol_syslog(get_class($this)."::create ".$this->error,LOG_WARNING); - $this->db->rollback(); - return -1; - } - } + { + $result=self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used + if ($result > 0) + { + $this->error='ErrorRefAlreadyExists'; + dol_syslog(get_class($this)."::create ".$this->error,LOG_WARNING); + $this->db->rollback(); + return -1; + } + } $soc = new Societe($this->db); $result=$soc->fetch($this->socid); @@ -682,7 +682,7 @@ class Commande extends CommonOrder $sql.= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address"; $sql.= ", fk_shipping_method"; $sql.= ", remise_absolue, remise_percent"; - $sql.= ", fk_incoterms, location_incoterms"; + $sql.= ", fk_incoterms, location_incoterms"; $sql.= ", entity"; $sql.= ")"; $sql.= " VALUES ('(PROV)',".$this->socid.", '".$this->db->idate($now)."', ".$user->id; @@ -722,7 +722,7 @@ class Commande extends CommonOrder $num=count($this->lines); /* - * Insertion du detail des produits dans la base + * Insert products details into db */ for ($i=0;$i<$num;$i++) { @@ -753,7 +753,7 @@ class Commande extends CommonOrder $this->lines[$i]->fk_fournprice, $this->lines[$i]->pa_ht, $this->lines[$i]->label, - $this->lines[$i]->array_options + $this->lines[$i]->array_options ); if ($result < 0) { @@ -771,14 +771,16 @@ class Commande extends CommonOrder } } - // Mise a jour ref - $sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='(PROV".$this->id.")' WHERE rowid=".$this->id; + // update ref + if (empty($this->ref)) + { + $this->ref = '(PROV'.$this->id.')'; + } + $sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->ref."' WHERE rowid=".$this->id; if ($this->db->query($sql)) { if ($this->id) { - $this->ref="(PROV".$this->id.")"; - // Add object linked if (is_array($this->linked_objects) && ! empty($this->linked_objects)) { @@ -796,7 +798,7 @@ class Commande extends CommonOrder { // On recupere les differents contact interne et externe $prop = new Propal($this->db); - $prop->fetch($origin_id); + $prop->fetch($origin_id); // We get ids of sales representatives of proposal $this->userid = $prop->getIdcontact('internal', 'SALESREPFOLL'); From bc4ecf8619e8235bd01844b0afa67700508b82fa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 16 Mar 2015 18:25:26 +0100 Subject: [PATCH 106/412] Fix the debug option must works for admin user --- htdocs/admin/const.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php index fc7fbc74f4d..f8fdb461d1e 100644 --- a/htdocs/admin/const.php +++ b/htdocs/admin/const.php @@ -229,7 +229,7 @@ $sql.= ", note"; $sql.= ", entity"; $sql.= " FROM ".MAIN_DB_PREFIX."const"; $sql.= " WHERE entity IN (".$user->entity.",".$conf->entity.")"; -if (empty($user->entity) && $debug) {} // to force for superadmin +if ((empty($user->entity) || $user->admin) && $debug) {} // to force for superadmin else $sql.= " AND visible = 1"; // We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits $sql.= " ORDER BY entity, name ASC"; From 141fa56d67450063d388f98d6216eed8bc6537e3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Mar 2015 00:11:04 +0100 Subject: [PATCH 107/412] Fixed bad parameter --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 07193c356e2..585fa65b75d 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4845,7 +4845,7 @@ function printCommonFooter($zone='private') print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED)?$conf->global->MAIN_OPTIMIZE_SPEED:'off'); if ($micro_start_time) { - $micro_end_time=dol_microtime_float(true); + $micro_end_time=dol_microtime_float(); print ' - Build time: '.ceil(1000*($micro_end_time-$micro_start_time)).' ms'; } if (function_exists("memory_get_usage")) From b693ed3f51eb141bdf77268190814dd9e56c080a Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Mon, 16 Mar 2015 23:21:17 +0000 Subject: [PATCH 108/412] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- htdocs/core/db/sqlite3.class.php | 14 ++++++------- .../filemanagerdol/connectors/php/basexml.php | 2 +- .../filemanagerdol/connectors/php/upload.php | 2 +- htdocs/core/lib/bank.lib.php | 6 +++--- htdocs/core/lib/functions.lib.php | 20 +++++++++---------- htdocs/core/lib/pdf.lib.php | 10 +++++----- htdocs/core/lib/price.lib.php | 2 +- htdocs/core/lib/product.lib.php | 4 ++-- htdocs/core/lib/treeview.lib.php | 2 +- htdocs/core/menus/standard/auguria_menu.php | 2 +- htdocs/core/menus/standard/eldy_menu.php | 2 +- htdocs/core/menus/standard/empty.php | 2 +- htdocs/core/modules/action/rapport.pdf.php | 2 +- .../barcode/doc/phpbarcode.modules.php | 4 ++-- .../cheque/pdf/modules_chequereceipts.php | 2 +- .../modules/export/export_csv.modules.php | 2 +- .../modules/export/export_excel.modules.php | 2 +- .../modules/export/export_tsv.modules.php | 2 +- .../fichinter/doc/pdf_soleil.modules.php | 2 +- .../modules/fichinter/modules_fichinter.php | 2 +- .../modules/import/import_csv.modules.php | 4 ++-- .../modules/mailings/modules_mailings.php | 2 +- .../core/modules/mailings/pomme.modules.php | 2 +- htdocs/core/modules/member/modules_cards.php | 2 +- .../modules/printsheet/modules_labels.php | 2 +- .../project/doc/pdf_baleine.modules.php | 6 +++--- .../core/modules/project/modules_project.php | 4 ++-- .../task/doc/doc_generic_task_odt.modules.php | 2 +- .../modules/project/task/modules_task.php | 4 ++-- .../pdf/pdf_muscadet.modules.php | 10 +++++----- .../modules/syslog/mod_syslog_chromephp.php | 2 +- .../modules/syslog/mod_syslog_firephp.php | 2 +- htdocs/ftp/index.php | 2 +- htdocs/imports/import.php | 2 +- htdocs/install/etape1.php | 2 +- htdocs/install/inc.php | 4 ++-- htdocs/install/upgrade2.php | 2 +- .../mailmanspip/class/mailmanspip.class.php | 8 ++++---- htdocs/opensurvey/fonctions.php | 2 +- .../product/actions_card_product.class.php | 2 +- .../product/class/html.formproduct.class.php | 2 +- htdocs/projet/class/project.class.php | 2 +- htdocs/support/inc.php | 2 +- htdocs/user/class/user.class.php | 8 ++++---- 44 files changed, 83 insertions(+), 83 deletions(-) diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php index 50d9e5c9c79..973a6147bdd 100644 --- a/htdocs/core/db/sqlite3.class.php +++ b/htdocs/core/db/sqlite3.class.php @@ -315,7 +315,7 @@ class DoliDBSqlite3 extends DoliDB * @param string $login login * @param string $passwd password * @param string $name name of database (not used for mysql, used for pgsql) - * @param string $port Port of database server + * @param integer $port Port of database server * @return resource Database access handler * @see close */ @@ -530,7 +530,7 @@ class DoliDBSqlite3 extends DoliDB /** * Return datas as an array * - * @param Resultset $resultset Resultset of request + * @param resource $resultset Resultset of request * @return array Array */ function fetch_row($resultset) @@ -588,7 +588,7 @@ class DoliDBSqlite3 extends DoliDB /** * Free last resultset used. * - * @param resultset $resultset Curseur de la requete voulue + * @param integer $resultset Curseur de la requete voulue * @return void */ function free($resultset=0) @@ -709,7 +709,7 @@ class DoliDBSqlite3 extends DoliDB * * @param string $fieldorvalue Field name or value to encrypt * @param int $withQuotes Return string with quotes - * @return return XXX(field) or XXX('value') or field or 'value' + * @return string XXX(field) or XXX('value') or field or 'value' */ function encrypt($fieldorvalue, $withQuotes=0) { @@ -1277,7 +1277,7 @@ class DoliDBSqlite3 extends DoliDB * Cette fonction est l'equivalent de la fonction MONTH de MySql. * * @param string $date Date - * @return integer + * @return string */ public static function dbMONTH($date) { @@ -1320,7 +1320,7 @@ class DoliDBSqlite3 extends DoliDB * dbWEEKDAY * * @param int $date Date - * @return string + * @return double */ public static function dbWEEKDAY($date) { $arr = date_parse($date); @@ -1472,7 +1472,7 @@ class DoliDBSqlite3 extends DoliDB * week_mode * * @param string $mode Mode - * @return string Week format + * @return integer Week format */ private static function week_mode($mode) { $week_format= ($mode & 7); diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php index 7565aae8211..a14b843b465 100644 --- a/htdocs/core/filemanagerdol/connectors/php/basexml.php +++ b/htdocs/core/filemanagerdol/connectors/php/basexml.php @@ -84,7 +84,7 @@ function CreateXmlFooter() /** * SendError * - * @param unknown_type $number Number + * @param integer $number Number * @param unknown_type $text Text * @return void */ diff --git a/htdocs/core/filemanagerdol/connectors/php/upload.php b/htdocs/core/filemanagerdol/connectors/php/upload.php index 664ffbf2bdb..eb9600b20a9 100644 --- a/htdocs/core/filemanagerdol/connectors/php/upload.php +++ b/htdocs/core/filemanagerdol/connectors/php/upload.php @@ -30,7 +30,7 @@ require 'commands.php'; /** * SendError * - * @param string $number Number + * @param integer $number Number * @param string $text Text * @return void */ diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php index a0f670c1958..df9a25ae7c8 100644 --- a/htdocs/core/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -120,7 +120,7 @@ function bank_admin_prepare_head($object) * Check SWIFT informations for a bank account * * @param Account $account A bank account - * @return int True if informations are valid, false otherwise + * @return boolean True if informations are valid, false otherwise */ function checkSwiftForAccount($account) { @@ -137,7 +137,7 @@ function checkSwiftForAccount($account) * Check IBAN number informations for a bank account * * @param Account $account A bank account - * @return int True if informations are valid, false otherwise + * @return boolean True if informations are valid, false otherwise */ function checkIbanForAccount($account) { @@ -156,7 +156,7 @@ function checkIbanForAccount($account) * Check account number informations for a bank account * * @param Account $account A bank account - * @return int True if informations are valid, false otherwise + * @return boolean True if informations are valid, false otherwise */ function checkBanForAccount($account) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 07193c356e2..6f197279ef6 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2116,7 +2116,7 @@ function img_edit_remove($titlealt = 'default', $other='') * Show logo editer/modifier fiche * * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. - * @param float $float Si il faut y mettre le style "float: right" + * @param integer $float Si il faut y mettre le style "float: right" * @param string $other Add more attributes on img * @return string Return tag img */ @@ -2133,7 +2133,7 @@ function img_edit($titlealt = 'default', $float = 0, $other = '') * Show logo view card * * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. - * @param float $float Si il faut y mettre le style "float: right" + * @param integer $float Si il faut y mettre le style "float: right" * @param string $other Add more attributes on img * @return string Return tag img */ @@ -2446,7 +2446,7 @@ function img_searchclear($titlealt = 'default', $other = '') * Show information for admin users * * @param string $text Text info - * @param string $infoonimgalt Info is shown only on alt of star picto, otherwise it is show on output after the star picto + * @param integer $infoonimgalt Info is shown only on alt of star picto, otherwise it is show on output after the star picto * @param int $nodiv No div * @return string String with info text */ @@ -2866,7 +2866,7 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so * @param int $page Number of page * @param string $file Lien * @param string $options Autres parametres d'url a propager dans les liens ("" par defaut) - * @param boolean|int $nextpage Do we show a next page button + * @param integer $nextpage Do we show a next page button * @param string $betweenarrows HTML Content to show between arrows * @return void */ @@ -2923,7 +2923,7 @@ function vatrate($rate,$addpercent=false,$info_bits=0,$usestarfornpr=0) * Function used into PDF and HTML pages * * @param float $amount Amount to format - * @param string $form Type of format, HTML or not (not by default) + * @param integer $form Type of format, HTML or not (not by default) * @param Translate $outlangs Object langs for output * @param int $trunc 1=Truncate if there is too much decimals (default), 0=Does not truncate * @param int $rounding Minimum number of decimal to show. If 0, no change, if -1, we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOTAL) @@ -3622,7 +3622,7 @@ function get_default_npr($thirdparty_seller, $thirdparty_buyer, $idprod=0, $idpr * @param Societe $thirdparty_buyer Thirdparty buyer * @param int $local Localtax to process (1 or 2) * @param int $idprod Id product - * @return float localtax, -1 si ne peut etre determine + * @return integer localtax, -1 si ne peut etre determine * @see get_default_tva, get_default_npr */ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $idprod=0) @@ -3664,7 +3664,7 @@ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $id * Return yes or no in current language * * @param string $yesno Value to test (1, 'yes', 'true' or 0, 'no', 'false') - * @param string $case 1=Yes/No, 0=yes/no, 2=Disabled checkbox, 3=Disabled checkbox + Yes/No + * @param integer $case 1=Yes/No, 0=yes/no, 2=Disabled checkbox, 3=Disabled checkbox + Yes/No * @param int $color 0=texte only, 1=Text is formated with a color font style ('ok' or 'error'), 2=Text is formated with 'ok' color. * @return string HTML string */ @@ -3805,7 +3805,7 @@ function picto_required() * Clean a string from all HTML tags and entities * * @param string $StringHtml String to clean - * @param string $removelinefeed Replace also all lines feeds by a space, otherwise only last one are removed + * @param integer $removelinefeed Replace also all lines feeds by a space, otherwise only last one are removed * @param string $pagecodeto Encoding of input/output string * @return string String cleaned * @@ -4183,7 +4183,7 @@ function print_date_range($date_start,$date_end,$format = '',$outputlangs='') * @param int $date_end End date * @param string $format Output format * @param Translate $outputlangs Output language - * @param string $withparenthesis 1=Add parenthesis, 0=non parenthesis + * @param integer $withparenthesis 1=Add parenthesis, 0=non parenthesis * @return string String */ function get_date_range($date_start,$date_end,$format = '',$outputlangs='', $withparenthesis=1) @@ -4952,7 +4952,7 @@ function dol_getmypid() * @param string $value The value to look for. * If param $numeric is 0, can contains several keywords separated with a space, like "keyword1 keyword2" = We want record field like keyword1 and field like keyword2 * If param $numeric is 1, can contains an operator <>= like "<10" or ">=100.5 < 1000" - * @param string $numeric 0=value is list of keywords, 1=value is a numeric test + * @param integer $numeric 0=value is list of keywords, 1=value is a numeric test * @return string $res The statement to append to the SQL query */ function natural_search($fields, $value, $numeric=0) diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index e1d1df04346..e671f519607 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -941,7 +941,7 @@ function pdf_writeLinkedObjects(&$pdf,$object,$outputlangs,$posx,$posy,$w,$h,$al * @param int $hideref Hide reference * @param int $hidedesc Hide description * @param int $issupplierline Is it a line for a supplier object ? - * @return void + * @return string|null */ function pdf_writelinedesc(&$pdf,$object,$i,$outputlangs,$w,$h,$posx,$posy,$hideref=0,$hidedesc=0,$issupplierline=0) { @@ -1159,7 +1159,7 @@ function pdf_getlinedesc($object,$i,$outputlangs,$hideref=0,$hidedesc=0,$issuppl * @param int $i Current line number * @param Translate $outputlangs Object langs for output * @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines) - * @return void + * @return null|string */ function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0) { @@ -1185,7 +1185,7 @@ function pdf_getlinenum($object,$i,$outputlangs,$hidedetails=0) * @param int $i Current line number * @param Translate $outputlangs Object langs for output * @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines) - * @return void + * @return null|string */ function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0) { @@ -1210,7 +1210,7 @@ function pdf_getlineref($object,$i,$outputlangs,$hidedetails=0) * @param int $i Current line number * @param Translate $outputlangs Object langs for output * @param int $hidedetails Hide details (0=no, 1=yes, 2=just special lines) - * @return void + * @return null|string */ function pdf_getlineref_supplier($object,$i,$outputlangs,$hidedetails=0) { @@ -1569,7 +1569,7 @@ function pdf_getlinetotalwithtax($object,$i,$outputlangs,$hidedetails=0) * @param Object $object Object * @param string $type Type * @param Translate $outputlangs Object langs for output - * @return void + * @return integer */ function pdf_getTotalQty($object,$type,$outputlangs) { diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php index aac29ad5256..983f2f27d53 100644 --- a/htdocs/core/lib/price.lib.php +++ b/htdocs/core/lib/price.lib.php @@ -49,7 +49,7 @@ * @param int $type 0/1=Product/service * @param Societe $seller Thirdparty seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc. * @param array $localtaxes_array Array with localtaxes info (loaded by getLocalTaxesFromRate function). - * @param float $progress Situation invoices progress (value from 0 to 100, 100 by default) + * @param integer $progress Situation invoices progress (value from 0 to 100, 100 by default) * @return result[ 0=total_ht, * 1=total_vat, * 2=total_ttc, diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index 1aea8f9e37b..a02747bb8aa 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -27,7 +27,7 @@ /** * Prepare array with list of tabs * - * @param Object $object Object related to tabs + * @param Product $object Object related to tabs * @param User $user Object user * @return array Array of tabs to show */ @@ -183,7 +183,7 @@ function product_admin_prepare_head() * * @param Product $product Product object * @param int $socid Thirdparty id - * @return void + * @return integer */ function show_stats_for_company($product,$socid) { diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php index 470da211f2e..08fa63c52c6 100644 --- a/htdocs/core/lib/treeview.lib.php +++ b/htdocs/core/lib/treeview.lib.php @@ -31,7 +31,7 @@ * @param array $fulltree Array of entries in correct order * @param string $key Key of entry into fulltree to show picto * @param int $silent Do not output indent and picto, returns only value - * @return array array(0 or 1 if at least one of this level after, 0 or 1 if at least one of higher level after, nbofdirinsub, nbofdocinsub) + * @return integer[] array(0 or 1 if at least one of this level after, 0 or 1 if at least one of higher level after, nbofdirinsub, nbofdocinsub) */ function tree_showpad(&$fulltree,$key,$silent=0) { diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php index 88052f380c0..36ecfd7effa 100644 --- a/htdocs/core/menus/standard/auguria_menu.php +++ b/htdocs/core/menus/standard/auguria_menu.php @@ -158,7 +158,7 @@ class MenuManager * Show menu * * @param string $mode 'top', 'left', 'jmobile' - * @return void + * @return string */ function showmenu($mode) { diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php index af85537d455..40d1d562552 100644 --- a/htdocs/core/menus/standard/eldy_menu.php +++ b/htdocs/core/menus/standard/eldy_menu.php @@ -112,7 +112,7 @@ class MenuManager * Show menu * * @param string $mode 'top', 'left', 'jmobile' - * @return void + * @return string */ function showmenu($mode) { diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php index 83f54c050d6..ec783af938d 100644 --- a/htdocs/core/menus/standard/empty.php +++ b/htdocs/core/menus/standard/empty.php @@ -61,7 +61,7 @@ class MenuManager * Show menu * * @param string $mode 'top', 'left', 'jmobile' - * @return void + * @return string */ function showmenu($mode) { diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php index 32554e1511a..65a80d97e5b 100644 --- a/htdocs/core/modules/action/rapport.pdf.php +++ b/htdocs/core/modules/action/rapport.pdf.php @@ -303,7 +303,7 @@ class CommActionRapport * @param PDF $pdf Object PDF * @param Translate $outputlangs Object lang for output * @param int $pagenb Page nb - * @return void + * @return integer */ function _pagehead(&$pdf, $outputlangs, $pagenb) { diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php index d476d2fa3f4..8f76595bf88 100644 --- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php +++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php @@ -108,7 +108,7 @@ class modPhpbarcode extends ModeleBarCode * @param string $code Value to encode * @param string $encoding Mode of encoding * @param string $readable Code can be read - * @param string $scale Scale + * @param integer $scale Scale * @return int <0 if KO, >0 if OK */ function buildBarCode($code,$encoding,$readable='Y',$scale=1) @@ -148,7 +148,7 @@ class modPhpbarcode extends ModeleBarCode * @param string $code Value to encode * @param string $encoding Mode of encoding * @param string $readable Code can be read - * @param string $scale Scale + * @param integer $scale Scale * @return int <0 if KO, >0 if OK */ function writeBarCode($code,$encoding,$readable='Y',$scale=1) diff --git a/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php b/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php index 1fde7ef8bdb..11ff9b509ad 100644 --- a/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php +++ b/htdocs/core/modules/cheque/pdf/modules_chequereceipts.php @@ -42,7 +42,7 @@ abstract class ModeleChequeReceipts extends CommonDocGenerator * Return list of active generation modules * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of templates */ static function liste_modeles($db,$maxfilenamelength=0) diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php index ce058a93455..85bf6151055 100644 --- a/htdocs/core/modules/export/export_csv.modules.php +++ b/htdocs/core/modules/export/export_csv.modules.php @@ -74,7 +74,7 @@ class ExportCsv extends ModeleExports /** * getDriverId * - * @return int + * @return string */ function getDriverId() { diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php index 87923b4cb9c..e5281150296 100644 --- a/htdocs/core/modules/export/export_excel.modules.php +++ b/htdocs/core/modules/export/export_excel.modules.php @@ -76,7 +76,7 @@ class ExportExcel extends ModeleExports /** * getDriverId * - * @return int + * @return string */ function getDriverId() { diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php index 409102fd857..a1b553bbe57 100644 --- a/htdocs/core/modules/export/export_tsv.modules.php +++ b/htdocs/core/modules/export/export_tsv.modules.php @@ -69,7 +69,7 @@ class ExportTsv extends ModeleExports /** * getDriverId * - * @return int + * @return string */ function getDriverId() { diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php index 1a26a161511..c10c24508e8 100644 --- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php +++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php @@ -657,7 +657,7 @@ class pdf_soleil extends ModelePDFFicheinter * @param Object $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text - * @return void + * @return integer */ function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0) { diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php index dbcdab37530..6f4b68f801c 100644 --- a/htdocs/core/modules/fichinter/modules_fichinter.php +++ b/htdocs/core/modules/fichinter/modules_fichinter.php @@ -41,7 +41,7 @@ abstract class ModelePDFFicheinter extends CommonDocGenerator * Return list of active generation modules * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of templates */ static function liste_modeles($db,$maxfilenamelength=0) diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php index cd3a35e4060..22008bb054d 100644 --- a/htdocs/core/modules/import/import_csv.modules.php +++ b/htdocs/core/modules/import/import_csv.modules.php @@ -88,7 +88,7 @@ class ImportCsv extends ModeleImports /** * getDriverId * - * @return int Id + * @return string Id */ function getDriverId() { @@ -305,7 +305,7 @@ class ImportCsv extends ModeleImports /** * Close file handle * - * @return void + * @return integer */ function import_close_file() { diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php index 50da9252ecc..5561526a7ff 100644 --- a/htdocs/core/modules/mailings/modules_mailings.php +++ b/htdocs/core/modules/mailings/modules_mailings.php @@ -62,7 +62,7 @@ class MailingTargets // This can't be abstract as it is used for some method /** * Return number of records for email selector * - * @return string Example + * @return integer Example */ function getNbOfRecords() { diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php index 2c93b588524..ce4a8b89e09 100644 --- a/htdocs/core/modules/mailings/pomme.modules.php +++ b/htdocs/core/modules/mailings/pomme.modules.php @@ -57,7 +57,7 @@ class mailing_pomme extends MailingTargets * array of SQL request that returns two field: * One called "label", One called "nb". * - * @return array Array with SQL requests + * @return string[] Array with SQL requests */ function getSqlArrayForStats() { diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php index 0b5d9e482ac..d7fa0cbaae1 100644 --- a/htdocs/core/modules/member/modules_cards.php +++ b/htdocs/core/modules/member/modules_cards.php @@ -41,7 +41,7 @@ class ModelePDFCards * Return list of active generation modules * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of templates */ function liste_modeles($db,$maxfilenamelength=0) diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php index d2594d75b21..15ef011ea04 100644 --- a/htdocs/core/modules/printsheet/modules_labels.php +++ b/htdocs/core/modules/printsheet/modules_labels.php @@ -41,7 +41,7 @@ class ModelePDFLabels * Return list of active generation modules * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of templates */ function liste_modeles($db,$maxfilenamelength=0) diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php index 28a704d6f8d..fcac8bd2646 100644 --- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php +++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php @@ -390,7 +390,7 @@ class pdf_baleine extends ModelePDFProjects * Show top header of page. * * @param PDF $pdf Object PDF - * @param Object $object Object to show + * @param Project $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output * @return void @@ -476,10 +476,10 @@ class pdf_baleine extends ModelePDFProjects * Show footer of page. Need this->emetteur object * * @param PDF $pdf PDF - * @param Object $object Object to show + * @param Project $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text - * @return void + * @return integer */ function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0) { diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php index 54d981e51a4..f79de708164 100644 --- a/htdocs/core/modules/project/modules_project.php +++ b/htdocs/core/modules/project/modules_project.php @@ -38,7 +38,7 @@ abstract class ModelePDFProjects extends CommonDocGenerator * Return list of active generation modules * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of templates */ static function liste_modeles($db,$maxfilenamelength=0) @@ -145,7 +145,7 @@ abstract class ModeleNumRefProjects * Create an intervention document on disk using template defined into PROJECT_ADDON_PDF * * @param DoliDB $db objet base de donnee - * @param Object $object Object fichinter + * @param Project $object Object fichinter * @param string $modele force le modele a utiliser ('' par defaut) * @param Translate $outputlangs objet lang a utiliser pour traduction * @param int $hidedetails Hide details of lines diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php index c074cba31e5..8a9669dadf1 100644 --- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php +++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php @@ -106,7 +106,7 @@ class doc_generic_task_odt extends ModelePDFTask /** * Define array with couple substitution key => substitution value * - * @param Object $object Main object to use as data source + * @param Project $object Main object to use as data source * @param Translate $outputlangs Lang object to use for output * @return array Array of substitution */ diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php index f861b1bf002..9f9cb5041c8 100644 --- a/htdocs/core/modules/project/task/modules_task.php +++ b/htdocs/core/modules/project/task/modules_task.php @@ -39,7 +39,7 @@ abstract class ModelePDFTask extends CommonDocGenerator * Return list of active generation modules * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of templates */ static function liste_modeles($db,$maxfilenamelength=0) @@ -145,7 +145,7 @@ abstract class ModeleNumRefTask * Create an intervention document on disk using template defined into PROJECT_TASK_ADDON_PDF * * @param DoliDB $db objet base de donnee - * @param Object $object Object fichinter + * @param Task $object Object fichinter * @param string $modele force le modele a utiliser ('' par defaut) * @param Translate $outputlangs objet lang a utiliser pour traduction * @param int $hidedetails Hide details of lines diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index 43d00cfbdfe..9a0291d5e8d 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -554,7 +554,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders * Show payments table * * @param PDF $pdf Object PDF - * @param Object $object Object order + * @param CommandeFournisseur $object Object order * @param int $posy Position y in PDF * @param Translate $outputlangs Object langs for output * @return int <0 if KO, >0 if OK @@ -569,10 +569,10 @@ class pdf_muscadet extends ModelePDFSuppliersOrders * Show miscellaneous information (payment mode, payment term, ...) * * @param PDF $pdf Object PDF - * @param Object $object Object to show + * @param CommandeFournisseur $object Object to show * @param int $posy Y * @param Translate $outputlangs Langs object - * @return void + * @return integer */ function _tableau_info(&$pdf, $object, $posy, $outputlangs) { @@ -938,7 +938,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders * Show top header of page. * * @param PDF $pdf Object PDF - * @param Object $object Object to show + * @param CommandeFournisseur $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output * @return void @@ -1139,7 +1139,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders * Show footer of page. Need this->emetteur object * * @param PDF $pdf PDF - * @param Object $object Object to show + * @param CommandeFournisseur $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text * @return int Return height of bottom margin including footer text diff --git a/htdocs/core/modules/syslog/mod_syslog_chromephp.php b/htdocs/core/modules/syslog/mod_syslog_chromephp.php index b2520d27d7b..b376595fd2b 100644 --- a/htdocs/core/modules/syslog/mod_syslog_chromephp.php +++ b/htdocs/core/modules/syslog/mod_syslog_chromephp.php @@ -114,7 +114,7 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface * Output log content * * @param array $content Content to log - * @return void + * @return null|false */ public function export($content) { diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php index 31addd8b17a..a9d4de979e3 100644 --- a/htdocs/core/modules/syslog/mod_syslog_firephp.php +++ b/htdocs/core/modules/syslog/mod_syslog_firephp.php @@ -111,7 +111,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface * Output log content * * @param array $content Content to log - * @return void + * @return null|false */ public function export($content) { diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index f1a051bcf2a..4da37cde779 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -634,7 +634,7 @@ llxFooter(); * @param string $ftp_user FTP user * @param string $ftp_password FTP password * @param string $section Directory - * @param string $ftp_passive Use a passive mode + * @param integer $ftp_passive Use a passive mode * @return int <0 if OK, >0 if KO */ function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive=0) diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index 17c9f717253..5fc55dd3dab 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -1754,7 +1754,7 @@ function show_elem($fieldssource,$pos,$key,$var,$nostyle='') * * @param array $fieldssource Array of field source * @param array $listofkey Array of keys - * @return void + * @return integer */ function getnewkey(&$fieldssource,&$listofkey) { diff --git a/htdocs/install/etape1.php b/htdocs/install/etape1.php index f7b81e1da66..32f85a0860d 100644 --- a/htdocs/install/etape1.php +++ b/htdocs/install/etape1.php @@ -776,7 +776,7 @@ function write_master_file($masterfile,$main_dir) * Save configuration file. No particular permissions are set by installer. * * @param string $conffile Path to conf file to generate/update - * @return void + * @return integer */ function write_conf_file($conffile) { diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index a7e66fbcf94..bac0ffe6eda 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -411,10 +411,10 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='') /** * Print HTML footer of install pages * - * @param string $nonext No button "Next step" + * @param integer $nonext No button "Next step" * @param string $setuplang Language code * @param string $jscheckfunction Add a javascript check function - * @param string $withpleasewait Add also please wait tags + * @param integer $withpleasewait Add also please wait tags * @return void */ function pFooter($nonext=0,$setuplang='',$jscheckfunction='', $withpleasewait=0) diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index a7226c1621d..f32506f54d1 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -2407,7 +2407,7 @@ function migrate_commande_deliveryaddress($db,$langs,$conf) * @param DoliDB $db Database handler * @param Translate $langs Object langs * @param Conf $conf Object conf - * @return void + * @return integer|null */ function migrate_restore_missing_links($db,$langs,$conf) { diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php index d874e539164..f7ae2608da5 100644 --- a/htdocs/mailmanspip/class/mailmanspip.class.php +++ b/htdocs/mailmanspip/class/mailmanspip.class.php @@ -166,7 +166,7 @@ class MailmanSpip /** * Fonction qui donne les droits redacteurs dans spip * - * @param object $object Object with data (->firstname, ->lastname, ->email and ->login) + * @param Adherent $object Object with data (->firstname, ->lastname, ->email and ->login) * @return int =0 if KO, >0 if OK */ function add_to_spip($object) @@ -208,7 +208,7 @@ class MailmanSpip /** * Fonction qui enleve les droits redacteurs dans spip * - * @param object $object Object with data (->login) + * @param Adherent $object Object with data (->login) * @return int =0 if KO, >0 if OK */ function del_to_spip($object) @@ -297,7 +297,7 @@ class MailmanSpip /** * Subscribe an email to all mailing-lists * - * @param object $object Object with data (->email, ->pass, ->element, ->type) + * @param Adherent $object Object with data (->email, ->pass, ->element, ->type) * @param array $listes To force mailing-list (string separated with ,) * @return int <0 if KO, >=0 if OK */ @@ -369,7 +369,7 @@ class MailmanSpip * Unsubscribe an email from all mailing-lists * Used when a user is resiliated * - * @param object $object Object with data (->email, ->pass, ->element, ->type) + * @param Adherent $object Object with data (->email, ->pass, ->element, ->type) * @param array $listes To force mailing-list (string separated with ,) * @return int <0 if KO, >=0 if OK */ diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php index b65abcaffe9..5b11a821b7c 100644 --- a/htdocs/opensurvey/fonctions.php +++ b/htdocs/opensurvey/fonctions.php @@ -184,7 +184,7 @@ function getUrlSondage($id, $admin = false) * Generate a random id * * @param string $car Char to generate key - * @return void + * @return string */ function dol_survey_random($car) { diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index 44c28f383b5..3537dc288a9 100644 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -68,7 +68,7 @@ class ActionsCardProduct * Assign custom values for canvas (for example into this->tpl to be used by templates) * * @param string $action Type of action - * @param string $id Id of object + * @param integer $id Id of object * @param string $ref Ref of object * @return void */ diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php index 69e999b18ea..d67b575023b 100644 --- a/htdocs/product/class/html.formproduct.class.php +++ b/htdocs/product/class/html.formproduct.class.php @@ -161,7 +161,7 @@ class FormProduct * @param string $measuring_style Unit to show: weight, size, surface, volume * @param string $default Force unit * @param int $adddefault Add empty unit called "Default" - * @return void + * @return string */ function load_measuring_units($name='measuring_units', $measuring_style='', $default='0', $adddefault=0) { diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 0cb72355bb0..21293fac121 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -1031,7 +1031,7 @@ class Project extends CommonObject * @param bool $clone_task_file clone file of task (if task are copied) * @param bool $clone_note clone note of project * @param bool $move_date move task date on clone - * @param bool $notrigger no trigger flag + * @param integer $notrigger no trigger flag * @return int New id of clone */ function createFromClone($fromid,$clone_contact=false,$clone_task=true,$clone_project_file=false,$clone_task_file=false,$clone_note=true,$move_date=true,$notrigger=0) diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php index 58b9de1d38c..c5f74469faa 100644 --- a/htdocs/support/inc.php +++ b/htdocs/support/inc.php @@ -225,7 +225,7 @@ function pHeader($soutitre,$next,$action='none') /** * Print HTML footer * - * @param string $nonext No button "Next step" + * @param integer $nonext No button "Next step" * @param string $setuplang Language code * @return void */ diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 4ced71a7022..e8f3487a32c 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1066,7 +1066,7 @@ class User extends CommonObject /** * Assign rights by default * - * @return Si erreur <0, si ok renvoi le nbre de droits par defaut positionnes + * @return integer erreur <0, si ok renvoi le nbre de droits par defaut positionnes */ function set_default_rights() { @@ -1621,7 +1621,7 @@ class User extends CommonObject /** * Update clicktodial info * - * @return void + * @return integer */ function update_clicktodial() { @@ -1777,8 +1777,8 @@ class User extends CommonObject * * @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto) * @param string $option On what the link point to - * @param boolean $infologin Add connection info to the tooltip - * @param string $notooltip 1=Disable tooltip + * @param integer $infologin Add connection info to the tooltip + * @param integer $notooltip 1=Disable tooltip * @param int $maxlen Max length of visible user name * @return string String with URL */ From 435be30047efbd80f8d2695dec1fac03769fd560 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Mar 2015 00:35:17 +0100 Subject: [PATCH 109/412] Clean code --- htdocs/commande/class/commande.class.php | 13 +++++++------ test/phpunit/CommandeTest.php | 2 ++ test/phpunit/FactureTest.php | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index b8d47ddf95c..1bcfa1ee7cb 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -777,15 +777,16 @@ class Commande extends CommonOrder } // update ref - if (empty($this->ref)) - { - $this->ref = '(PROV'.$this->id.')'; - } - $sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->ref."' WHERE rowid=".$this->id; + $initialref='(PROV'.$this->id.')'; + if (! empty($this->ref)) $initialref=$this->ref; + + $sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->db->escape($initialref)."' WHERE rowid=".$this->id; if ($this->db->query($sql)) { if ($this->id) { + $this->ref = $initialref; + // Add object linked if (is_array($this->linked_objects) && ! empty($this->linked_objects)) { @@ -803,7 +804,7 @@ class Commande extends CommonOrder { // On recupere les differents contact interne et externe $prop = new Propal($this->db); - $prop->fetch($origin_id); + $prop->fetch($origin_id); // We get ids of sales representatives of proposal $this->userid = $prop->getIdcontact('internal', 'SALESREPFOLL'); diff --git a/test/phpunit/CommandeTest.php b/test/phpunit/CommandeTest.php index 0bb7788d33f..aaba882cc87 100644 --- a/test/phpunit/CommandeTest.php +++ b/test/phpunit/CommandeTest.php @@ -77,6 +77,8 @@ class CommandeTest extends PHPUnit_Framework_TestCase global $conf,$user,$langs,$db; $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. + if (empty($conf->commande->enabled)) { print __METHOD__." module customer order must be enabled.\n"; die(); } + print __METHOD__."\n"; } diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php index 3248be7104c..d2ad97454bf 100644 --- a/test/phpunit/FactureTest.php +++ b/test/phpunit/FactureTest.php @@ -76,6 +76,7 @@ class FactureTest extends PHPUnit_Framework_TestCase { global $conf,$user,$langs,$db; + if (empty($conf->facture->enabled)) { print __METHOD__." module customer invoice must be enabled.\n"; die(); } if (! empty($conf->ecotaxdeee->enabled)) { print __METHOD__." ecotaxdeee module must not be enabled.\n"; die(); } $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. From bfd979224fdbd3ae2b8e2d0482657bb017ab223b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Mar 2015 10:38:25 +0100 Subject: [PATCH 110/412] Var not declared --- htdocs/core/class/ldap.class.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php index ca0cbab3925..2783c55ee03 100644 --- a/htdocs/core/class/ldap.class.php +++ b/htdocs/core/class/ldap.class.php @@ -2,7 +2,7 @@ /* Copyright (C) 2004 Rodolphe Quiedeville * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2005-2011 Regis Houssin - * Copyright (C) 2006-2011 Laurent Destailleur + * Copyright (C) 2006-2015 Laurent Destailleur * * 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 @@ -25,11 +25,12 @@ */ /** - * \class Ldap - * \brief Class to manage LDAP features + * Class to manage LDAP features */ class Ldap { + var $error; + /** * Tableau des serveurs (IP addresses ou nom d'hotes) */ @@ -78,7 +79,7 @@ class Ldap var $name; var $firstname; var $login; - var $phone; + var $phone; var $skype; var $fax; var $mail; @@ -414,9 +415,10 @@ class Ldap } else { - $this->error=@ldap_error($this->connection); - $this->errno=@ldap_errno($this->connection); - dol_syslog(get_class($this)."::add failed: ".$this->errno." ".$this->error, LOG_ERR); + $this->ldapErrorCode = @ldap_errno($this->connection); + $this->ldapErrorText = @ldap_error($this->connection); + $this->error=$this->ldapErrorCode." ".$this->ldapErrorText; + dol_syslog(get_class($this)."::add failed: ".$this->error, LOG_ERR); return -1; } } From 689d27055243b529295eb95dd21f3f35531c2ea2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Mar 2015 10:47:20 +0100 Subject: [PATCH 111/412] Doxygen --- htdocs/core/class/commonobject.class.php | 66 ++++++++++++++++-------- htdocs/core/class/fiscalyear.class.php | 2 +- 2 files changed, 45 insertions(+), 23 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index fe9cfd24013..f12938bda28 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -35,46 +35,68 @@ */ abstract class CommonObject { - public $db; + /** + * @var db Database handler (result of a new DoliDB) + */ + public $db; /** - * @var error Error string - * @deprecated Use instead the array of error strings + * @var error Error string + * @deprecated Use instead the array of error strings */ public $error; /** - * @var errors Aray of error string + * @var errors Array of error string */ public $errors; - public $canvas; // Contains canvas name if it is - public $context=array(); // Use to pass context information + /** + * @var string Column name of the ref field. + */ + protected $table_ref_field = ''; + + /** + * @var context Can be used to pass information when only object is provied to method + */ + public $context=array(); + + /** + * @var context Contains canvas name if record is an alternative canvas record + */ + public $canvas; + + /** + * @var import_key Key value used to track if data is coming from import wizard + */ + public $import_key; + + /** + * @var array_options Contains data to manage extrafields + */ + public $array_options=array(); + + /** + * @var linkedObjectsIds Array of linked objects ids. Loaded by ->fetchObjectLinked + */ + public $linkedObjectsIds; + + /** + * @var linkedObjectsIds Array of linked objects. Loaded by ->fetchObjectLinked + */ + public $linkedObjects; + + + // Following var are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them. public $name; public $lastname; public $firstname; public $civility_id; - public $import_key; - - public $array_options=array(); - - /** - * @var Societe - */ public $thirdparty; - public $linkedObjectsIds; // Loaded by ->fetchObjectLinked - public $linkedObjects; // Loaded by ->fetchObjectLinked - // No constructor as it is an abstract class - /** - * Column name of the ref field. - * @var string - */ - protected $table_ref_field = ''; - /** * Check an object id/ref exists diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php index 1abde51c263..a48fb4b15cf 100644 --- a/htdocs/core/class/fiscalyear.class.php +++ b/htdocs/core/class/fiscalyear.class.php @@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** * Class to manage fiscal year */ -class Fiscalyear +class Fiscalyear extends CommonObject { public $element='fiscalyear'; public $table_element='accounting_fiscalyear'; From 4fffeb3a89d51d828301528980520c87a510e7b0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Mar 2015 10:52:27 +0100 Subject: [PATCH 112/412] Clean code --- htdocs/adherents/class/cotisation.class.php | 10 +++++----- htdocs/core/class/commonobject.class.php | 11 ++++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/htdocs/adherents/class/cotisation.class.php b/htdocs/adherents/class/cotisation.class.php index 2e1966c371e..ee9358b51da 100644 --- a/htdocs/adherents/class/cotisation.class.php +++ b/htdocs/adherents/class/cotisation.class.php @@ -1,6 +1,6 @@ - * Copyright (C) 2006-2008 Laurent Destailleur + * Copyright (C) 2006-2015 Laurent Destailleur * * 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 @@ -90,7 +90,7 @@ class Cotisation extends CommonObject } else { - $this->error=$this->db->error(); + $this->error=$this->db->lasterror(); return -1; } } @@ -140,7 +140,7 @@ class Cotisation extends CommonObject } else { - $this->error=$this->db->error(); + $this->error=$this->db->lasterror(); return -1; } } @@ -181,7 +181,7 @@ class Cotisation extends CommonObject else { $this->db->rollback(); - $this->error=$this->db->error(); + $this->error=$this->db->lasterror(); return -1; } } @@ -217,7 +217,7 @@ class Cotisation extends CommonObject $result=$member->fetch($this->fk_adherent); $result=$member->update_end_date($user); - if ($accountline->rowid > 0) // If we found bank account line (this means this->fk_bank defined) + if ($accountline->id > 0) // If we found bank account line (this means this->fk_bank defined) { $result=$accountline->delete($user); // Return false if refused because line is conciliated if ($result > 0) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index f12938bda28..1fa6e924325 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -51,11 +51,6 @@ abstract class CommonObject */ public $errors; - /** - * @var string Column name of the ref field. - */ - protected $table_ref_field = ''; - /** * @var context Can be used to pass information when only object is provied to method */ @@ -86,6 +81,12 @@ abstract class CommonObject */ public $linkedObjects; + /** + * @var string Column name of the ref field. + */ + protected $table_ref_field = ''; + + // Following var are used by some objects only. We keep this property here in CommonObject to be able to provide common method using them. From 84bea6166ecf2aa1621c1a3384c026cce5328c87 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Mar 2015 10:55:45 +0100 Subject: [PATCH 113/412] Doxygen --- htdocs/core/class/commonobject.class.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 1fa6e924325..97157c6d408 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -36,48 +36,48 @@ abstract class CommonObject { /** - * @var db Database handler (result of a new DoliDB) + * @var DoliDb Database handler (result of a new DoliDB) */ public $db; /** - * @var error Error string + * @var string Error string * @deprecated Use instead the array of error strings */ public $error; /** - * @var errors Array of error string + * @var string[] Array of error strings */ public $errors; /** - * @var context Can be used to pass information when only object is provied to method + * @var string Can be used to pass information when only object is provied to method */ public $context=array(); /** - * @var context Contains canvas name if record is an alternative canvas record + * @var string Contains canvas name if record is an alternative canvas record */ public $canvas; /** - * @var import_key Key value used to track if data is coming from import wizard + * @var string Key value used to track if data is coming from import wizard */ public $import_key; /** - * @var array_options Contains data to manage extrafields + * @var mixed Contains data to manage extrafields */ public $array_options=array(); /** - * @var linkedObjectsIds Array of linked objects ids. Loaded by ->fetchObjectLinked + * @var int[] Array of linked objects ids. Loaded by ->fetchObjectLinked */ public $linkedObjectsIds; /** - * @var linkedObjectsIds Array of linked objects. Loaded by ->fetchObjectLinked + * @var mixed Array of linked objects. Loaded by ->fetchObjectLinked */ public $linkedObjects; From 6e251690ab1ac680e7d465eb7fa5264e06f122fa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Mar 2015 11:23:45 +0100 Subject: [PATCH 114/412] Doxygen --- htdocs/compta/bank/class/account.class.php | 4 +- htdocs/contrat/class/contrat.class.php | 67 ++++++------------- .../modules/modAskPriceSupplier.class.php | 2 +- .../core/modules/modExpenseReport.class.php | 9 ++- htdocs/core/modules/modFTP.class.php | 2 +- htdocs/core/modules/modFicheinter.class.php | 2 +- htdocs/core/modules/modGeoIPMaxmind.class.php | 2 +- htdocs/core/modules/modResource.class.php | 2 +- htdocs/expensereport/ajax/ajaxprojet.php | 1 + htdocs/expensereport/card.php | 13 ++-- .../class/expensereport.class.php | 7 +- .../class/expensereportstats.class.php | 2 +- htdocs/expensereport/export_csv.php | 1 + htdocs/expensereport/index.php | 1 + htdocs/expensereport/info.php | 2 +- htdocs/expensereport/list.php | 1 + 16 files changed, 51 insertions(+), 67 deletions(-) diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index c0704ef8f7a..900a970d949 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -39,12 +39,12 @@ class Account extends CommonObject public $table_element='bank_account'; /** - * //TODO: Discuss this. $rowid is preferred over $id - * @var + * @var int Use id instead of rowid * @deprecated */ var $rowid; var $id; + var $ref; var $label; //! 1=Compte courant/check/carte, 2=Compte liquide, 0=Compte épargne diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index daac348e920..dcabc4e0b52 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -89,23 +89,7 @@ class Contrat extends CommonObject var $product; /** - * TODO: Which is the correct one? - * Author of the contract - * @var - */ - var $user_author; - - /** - * TODO: Which is the correct one? - * Author of the contract - * @var User - */ - public $user_creation; - - /** - * TODO: Which is the correct one? - * Author of the contract - * @var int + * @var int Id of user author of the contract */ public $fk_user_author; @@ -117,38 +101,37 @@ class Contrat extends CommonObject public $user_author_id; /** - * @var User + * @var User Object user that create the contract. Set by the info method. + */ + public $user_creation; + + /** + * @var User Object user that close the contract. Set by the info method. */ public $user_cloture; /** - * Date of creation - * @var int + * @var int Date of creation */ var $date_creation; /** - * Date of last modification - * Not filled until you call ->info() - * @var int + * @var int Date of last modification. Not filled until you call ->info() */ public $date_modification; /** - * Date of validation - * @var int + * @var int Date of validation */ var $date_validation; /** - * Date when contract was signed - * @var int + * @var int Date when contract was signed */ var $date_contrat; /** - * Date of contract closure - * @var int + * @var int Date of contract closure * @deprecated we close contract lines, not a contract */ var $date_cloture; @@ -157,21 +140,15 @@ class Contrat extends CommonObject var $commercial_suivi_id; /** - * @deprecated Use note_private or note_public instead - */ - var $note; - - /** - * Private note - * @var string + * @var string Private note */ var $note_private; /** - * Public note - * @var string + * @var string Public note */ var $note_public; + var $modelpdf; /** @@ -184,8 +161,7 @@ class Contrat extends CommonObject var $extraparams=array(); /** - * Contract lines - * @var ContratLigne[] + * @var ContratLigne[] Contract lines */ var $lines=array(); @@ -569,7 +545,6 @@ class Contrat extends CommonObject $this->commercial_signature_id = $result["fk_commercial_signature"]; $this->commercial_suivi_id = $result["fk_commercial_suivi"]; - $this->note = $result["note_private"]; // deprecated $this->note_private = $result["note_private"]; $this->note_public = $result["note_public"]; $this->modelpdf = $result["model_pdf"]; @@ -726,7 +701,7 @@ class Contrat extends CommonObject // Retreive all extrafield for propal // fetch optionals attributes and labels $line->fetch_optionals($line->id,$extralabelsline); - + $this->lines[] = $line; //dol_syslog("1 ".$line->desc); @@ -822,13 +797,13 @@ class Contrat extends CommonObject if ($line->statut == 4 && (! empty($line->date_fin_prevue) && $line->date_fin_prevue < $now)) $this->nbofservicesexpired++; if ($line->statut == 5) $this->nbofservicesclosed++; - + // Retreive all extrafield for propal // fetch optionals attributes and labels - + $line->fetch_optionals($line->id,$extralabelsline); - - + + $this->lines[] = $line; $total_ttc+=$objp->total_ttc; diff --git a/htdocs/core/modules/modAskPriceSupplier.class.php b/htdocs/core/modules/modAskPriceSupplier.class.php index 4614b0b819d..451caccf649 100644 --- a/htdocs/core/modules/modAskPriceSupplier.class.php +++ b/htdocs/core/modules/modAskPriceSupplier.class.php @@ -21,7 +21,7 @@ */ /** - * \defgroup askpricesupplier Module to request supplier price proposals + * \defgroup askpricesupplier Module askpricesupplier * \brief Module to request supplier price proposals * \file htdocs/core/modules/modAskPriceSupplier.class.php * \ingroup askpricesupplier diff --git a/htdocs/core/modules/modExpenseReport.class.php b/htdocs/core/modules/modExpenseReport.class.php index 53289c512ff..dfe8180e0c1 100755 --- a/htdocs/core/modules/modExpenseReport.class.php +++ b/htdocs/core/modules/modExpenseReport.class.php @@ -17,14 +17,13 @@ */ /** - * \defgroup Indicateurs - * \brief Module indicateurs - * Such a file must be copied into htdocs/includes/module directory. + * \defgroup expensereport Module expensereport + * \brief Module to manage expense report. Replace old module Deplacement. */ /** - * \file htdocs/indicateurs/core/modules/modExpenseReport.class.php - * \ingroup indicateur + * \file htdocs/core/modules/modExpenseReport.class.php + * \ingroup expensereport * \brief Description and activation file for module ExpenseReport */ include_once(DOL_DOCUMENT_ROOT ."/core/modules/DolibarrModules.class.php"); diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php index 2d6e1689ba9..38b16127c90 100644 --- a/htdocs/core/modules/modFTP.class.php +++ b/htdocs/core/modules/modFTP.class.php @@ -17,7 +17,7 @@ */ /** - * \defgroup ftp Module FTP + * \defgroup ftp Module ftp * \brief Module for FTP client module * \file htdocs/core/modules/modFTP.class.php * \ingroup ftp diff --git a/htdocs/core/modules/modFicheinter.class.php b/htdocs/core/modules/modFicheinter.class.php index 7c54679bd9c..b41b291711a 100644 --- a/htdocs/core/modules/modFicheinter.class.php +++ b/htdocs/core/modules/modFicheinter.class.php @@ -21,7 +21,7 @@ */ /** - * \defgroup ficheinter Module intervention cards + * \defgroup ficheinter Module Interventions * \brief Module to manage intervention cards * \file htdocs/core/modules/modFicheinter.class.php * \ingroup ficheinter diff --git a/htdocs/core/modules/modGeoIPMaxmind.class.php b/htdocs/core/modules/modGeoIPMaxmind.class.php index 06d9d8f7f5e..cfe7acbdfa6 100644 --- a/htdocs/core/modules/modGeoIPMaxmind.class.php +++ b/htdocs/core/modules/modGeoIPMaxmind.class.php @@ -16,7 +16,7 @@ */ /** - * \defgroup geoip Module GeoIP + * \defgroup geoip Module geoipmaxmind * \brief Module to make geoip conversions * \file htdocs/core/modules/modGeoIPMaxmind.class.php * \ingroup geoip diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php index 26fe0b4bd31..9acebd5d90d 100644 --- a/htdocs/core/modules/modResource.class.php +++ b/htdocs/core/modules/modResource.class.php @@ -17,7 +17,7 @@ */ /** - * \defgroup resource Resource module + * \defgroup resource Module resource * \brief Resource module descriptor. * \file core/modules/modResource.class.php * \ingroup resource diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php index 77d22d1ac90..6b9dd7e062f 100755 --- a/htdocs/expensereport/ajax/ajaxprojet.php +++ b/htdocs/expensereport/ajax/ajaxprojet.php @@ -20,6 +20,7 @@ /** * \file htdocs/expensereport/ajax/ajaxprojet.php + * \ingroup expensereport * \brief File to return Ajax response on third parties request */ diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index c71705628b6..fad813a570b 100755 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -19,7 +19,8 @@ /** * \file htdocs/expensereport/card.php - * \brief Page for trip and expense card + * \ingroup expensereport + * \brief Page for trip and expense report card */ $res=0; @@ -1135,7 +1136,7 @@ if ($action == 'create') print ''; print ''; } - + // Public note print ''; print '' . $langs->trans('NotePublic') . ''; @@ -1155,7 +1156,7 @@ if ($action == 'create') print $doleditor->Create(1); print ''; } - + print ''; print ''; @@ -1286,7 +1287,7 @@ else print ''; } - + // Public note print ''; print '' . $langs->trans('NotePublic') . ''; @@ -1295,7 +1296,7 @@ else $doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70); print $doleditor->Create(1); print ''; - + // Private note if (empty($user->societe_id)) { print ''; @@ -1306,7 +1307,7 @@ else print $doleditor->Create(1); print ''; } - + print ''; dol_fiche_end(); diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index e43c6dd4507..0d30602987f 100755 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -16,6 +16,11 @@ * along with this program. If not, see . */ +/** + * \file htdocs/expensereport/class/expensereport.class.php + * \ingroup expensereport + * \brief File to manage Expense Reports + */ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; /** @@ -1420,7 +1425,7 @@ class ExpenseReport extends CommonObject return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } - + /** * List of types * diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php index 140e492972e..57c970b9fc8 100644 --- a/htdocs/expensereport/class/expensereportstats.class.php +++ b/htdocs/expensereport/class/expensereportstats.class.php @@ -19,7 +19,7 @@ /** * \file htdocs/expensereport/class/expensereportstats.class.php - * \ingroup ExpenseReport + * \ingroup expensereport * \brief Fichier de la classe de gestion des stats des expensereport et notes de frais */ include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php'; diff --git a/htdocs/expensereport/export_csv.php b/htdocs/expensereport/export_csv.php index 8228eb68532..ba3621d1ac0 100755 --- a/htdocs/expensereport/export_csv.php +++ b/htdocs/expensereport/export_csv.php @@ -17,6 +17,7 @@ /** * \file htdocs/expensereport/index.php + * \ingroup expensereport * \brief Page list of expenses */ diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php index 62f5cbe89fc..4af39adb633 100644 --- a/htdocs/expensereport/index.php +++ b/htdocs/expensereport/index.php @@ -21,6 +21,7 @@ /** * \file htdocs/expensereport/index.php + * \ingroup expensereport * \brief Page list of expenses */ diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php index e548c6521d7..c1e0b598e7e 100644 --- a/htdocs/expensereport/info.php +++ b/htdocs/expensereport/info.php @@ -19,7 +19,7 @@ /** * \file htdocs/expensereport/info.php - * \ingroup trip + * \ingroup expensereport * \brief Page to show a trip information */ diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php index 6d82b86e4af..9ef9c05a328 100755 --- a/htdocs/expensereport/list.php +++ b/htdocs/expensereport/list.php @@ -21,6 +21,7 @@ /** * \file htdocs/expensereport/index.php + * \ingroup expensereport * \brief list of expense reports */ From 166fda490969ab1d92e4c96fe55d493c30a588a1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Mar 2015 11:26:23 +0100 Subject: [PATCH 115/412] Normalize class names --- .../class/askpricesupplier.class.php | 26 +++++++++---------- htdocs/core/tpl/objectline_create.tpl.php | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php index ee0ad10d2e3..844e851a20c 100644 --- a/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php +++ b/htdocs/comm/askpricesupplier/class/askpricesupplier.class.php @@ -185,7 +185,7 @@ class AskPriceSupplier extends CommonObject $price = $prod->price; } - $line = new AskPriceSupplierLigne($this->db); + $line = new AskPriceSupplierLine($this->db); $line->fk_product=$idproduct; $line->desc=$productdesc; @@ -225,7 +225,7 @@ class AskPriceSupplier extends CommonObject return -5; } - $askpricesupplierligne=new AskPriceSupplierLigne($this->db); + $askpricesupplierligne=new AskPriceSupplierLine($this->db); $askpricesupplierligne->fk_askpricesupplier=$this->id; $askpricesupplierligne->fk_remise_except=$remise->id; $askpricesupplierligne->desc=$remise->description; // Description ligne @@ -376,7 +376,7 @@ class AskPriceSupplier extends CommonObject } // Insert line - $this->line=new AskPriceSupplierLigne($this->db); + $this->line=new AskPriceSupplierLine($this->db); $this->line->fk_askpricesupplier=$this->id; $this->line->label=$label; @@ -525,10 +525,10 @@ class AskPriceSupplier extends CommonObject } // Update line - $this->line=new AskPriceSupplierLigne($this->db); + $this->line=new AskPriceSupplierLine($this->db); // Stock previous line records - $staticline=new AskPriceSupplierLigne($this->db); + $staticline=new AskPriceSupplierLine($this->db); $staticline->fetch($rowid); $this->line->oldline = $staticline; @@ -621,7 +621,7 @@ class AskPriceSupplier extends CommonObject { if ($this->statut == 0) { - $line=new AskPriceSupplierLigne($this->db); + $line=new AskPriceSupplierLine($this->db); // For triggers $line->fetch($lineid); @@ -1106,7 +1106,7 @@ class AskPriceSupplier extends CommonObject { $objp = $this->db->fetch_object($result); - $line = new AskPriceSupplierLigne($this->db); + $line = new AskPriceSupplierLine($this->db); $line->rowid = $objp->rowid; $line->fk_askpricesupplier = $objp->fk_askpricesupplier; @@ -2088,7 +2088,7 @@ class AskPriceSupplier extends CommonObject $xnbp = 0; while ($xnbp < $nbp) { - $line=new AskPriceSupplierLigne($this->db); + $line=new AskPriceSupplierLine($this->db); $line->desc=$langs->trans("Description")." ".$xnbp; $line->qty=1; $line->subprice=100; @@ -2287,7 +2287,7 @@ class AskPriceSupplier extends CommonObject { $obj = $this->db->fetch_object($resql); - $this->lines[$i] = new AskPriceSupplierLigne($this->db); + $this->lines[$i] = new AskPriceSupplierLine($this->db); $this->lines[$i]->id = $obj->rowid; // for backward compatibility $this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->label = $obj->custom_label; @@ -2412,10 +2412,10 @@ class AskPriceSupplier extends CommonObject /** - * \class AskPriceSupplierLigne + * \class AskPriceSupplierLine * \brief Class to manage askpricesupplier lines */ -class AskPriceSupplierLigne extends CommonObject +class AskPriceSupplierLine extends CommonObject { var $db; var $error; @@ -2689,7 +2689,7 @@ class AskPriceSupplierLigne extends CommonObject $this->db->begin(); $sql = "DELETE FROM ".MAIN_DB_PREFIX."askpricesupplierdet WHERE rowid = ".$this->rowid; - dol_syslog("AskPriceSupplierLigne::delete", LOG_DEBUG); + dol_syslog("AskPriceSupplierLine::delete", LOG_DEBUG); if ($this->db->query($sql) ) { @@ -2852,7 +2852,7 @@ class AskPriceSupplierLigne extends CommonObject $sql.= ",total_ttc=".price2num($this->total_ttc,'MT').""; $sql.= " WHERE rowid = ".$this->rowid; - dol_syslog("AskPriceSupplierLigne::update_total", LOG_DEBUG); + dol_syslog("AskPriceSupplierLine::update_total", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index c7c6f455168..027e6b3d816 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -274,7 +274,7 @@ else { $newline = new PropaleLigne($this->db); } elseif ($this->table_element_line=='askpricesupplierdet') { - $newline = new AskPriceSupplierLigne($this->db); + $newline = new AskPriceSupplierLine($this->db); } elseif ($this->table_element_line=='facturedet') { $newline = new FactureLigne($this->db); From c700d8a8ec637a2fd9ab9d4f5951798a6627e7bb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Mar 2015 11:59:44 +0100 Subject: [PATCH 116/412] Fix remove warning --- htdocs/core/boxes/box_activity.php | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php index 66753f10f04..515cf26241e 100644 --- a/htdocs/core/boxes/box_activity.php +++ b/htdocs/core/boxes/box_activity.php @@ -233,7 +233,7 @@ class box_activity extends ModeleBoxes 'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&mainmenu=accountancy&leftmenu=customers_bills", ); $totalnb += $data[$j]->nb; - $this->info_box_contents[$line][3] = array( + $this->info_box_contents[$line][3] = array( 'td' => 'align="right"', 'text' => price($data[$j]->Mnttot,1,$langs,0,0,-1,$conf->currency), ); @@ -342,7 +342,8 @@ class box_activity extends ModeleBoxes } // list the summary of the propals - if (! empty($conf->propal->enabled) && $user->rights->propal->lire) { + if (! empty($conf->propal->enabled) && $user->rights->propal->lire) + { include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; $propalstatic=new Propal($db); @@ -350,7 +351,8 @@ class box_activity extends ModeleBoxes $filename = '/boxactivity-propal'.$fileid; $refresh = dol_cache_refresh($cachedir, $filename, $cachetime); $data = array(); - if ($refresh) { + if ($refresh) + { $sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb"; $sql.= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p"; if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; @@ -365,8 +367,8 @@ class box_activity extends ModeleBoxes $sql.= " ORDER BY p.fk_statut DESC"; $result = $db->query($sql); - - if ($result) { + if ($result) + { $num = $db->num_rows($result) + $line; $j=0; while ($j < $num) { @@ -380,12 +382,17 @@ class box_activity extends ModeleBoxes } else { dol_print_error($db); } - } else { + } + else + { $data = dol_readcachefile($cachedir, $filename); } - if (! empty($data)) { + + if (! empty($data)) + { $j=0; - while ($line < count($data)) { + while ($line < count($data)) + { $this->info_box_contents[$line][] = array( 'td' => 'align="left" width="16"', 'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&leftmenu=propals&viewstatut=".$data[$j]->fk_statut, @@ -393,7 +400,6 @@ class box_activity extends ModeleBoxes 'logo' => 'object_propal' ); - $objp = $db->fetch_object($result); $this->info_box_contents[$line][] = array( 'td' => 'align="left"', 'text' => $langs->trans("Proposals")." ".$propalstatic->LibStatut($data[$j]->fk_statut,0), From 9e9a8894ea17c198fee8e3e2d68dd8d81d4de6d8 Mon Sep 17 00:00:00 2001 From: jean Date: Tue, 17 Mar 2015 14:20:08 +0100 Subject: [PATCH 117/412] Add global $langs to method, necessary for triggers to function correctly --- htdocs/fourn/class/fournisseur.product.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 3d12352903f..4db72d48814 100644 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -154,7 +154,7 @@ class ProductFournisseur extends Product */ function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges=0, $remise_percent=0, $remise=0, $newnpr=0) { - global $conf; + global $conf, $langs; // Clean parameter if (empty($qty)) $qty=0; From 37c216cfe403d7b1c669d9e51cfbb20694f48d51 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 17 Mar 2015 15:43:11 +0100 Subject: [PATCH 118/412] Fix limit for very slow os. --- htdocs/install/upgrade.php | 2 +- htdocs/install/upgrade2.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 89e54ef4443..22c18c15fee 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -47,7 +47,7 @@ $ok = 0; // Ne fonctionne que si on est pas en safe_mode. $err=error_reporting(); error_reporting(0); -@set_time_limit(120); +@set_time_limit(300); error_reporting($err); diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index a7226c1621d..0c96c3c6d5c 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -55,7 +55,7 @@ $error = 0; // Ne fonctionne que si on est pas en safe_mode. $err=error_reporting(); error_reporting(0); -@set_time_limit(120); +@set_time_limit(300); error_reporting($err); $setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):'auto'; From 4e839524855c3d8806d41b81b0f8f74410901126 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 18 Mar 2015 05:07:32 +0100 Subject: [PATCH 119/412] Add payment on donation --- htdocs/compta/dons/card.php | 71 +- htdocs/compta/dons/class/don.class.php | 30 +- .../dons/class/paymentdonation.class.php | 607 ++++++++++++++++++ htdocs/compta/dons/payment.php | 313 +++++++++ .../install/mysql/migration/3.7.0-3.8.0.sql | 20 +- htdocs/install/mysql/tables/llx_don.sql | 8 +- .../mysql/tables/llx_payment_donation.sql | 33 + 7 files changed, 1041 insertions(+), 41 deletions(-) create mode 100644 htdocs/compta/dons/class/paymentdonation.class.php create mode 100644 htdocs/compta/dons/payment.php create mode 100644 htdocs/install/mysql/tables/llx_payment_donation.sql diff --git a/htdocs/compta/dons/card.php b/htdocs/compta/dons/card.php index a4e68fbc4de..0c4c92cecd7 100644 --- a/htdocs/compta/dons/card.php +++ b/htdocs/compta/dons/card.php @@ -142,7 +142,6 @@ if ($action == 'add') $object->societe = GETPOST("societe"); $object->address = GETPOST("address"); $object->amount = price2num(GETPOST("amount")); - $object->town = GETPOST("town"); $object->zip = GETPOST("zipcode"); $object->town = GETPOST("town"); $object->country_id = GETPOST('country_id', 'int'); @@ -196,7 +195,7 @@ if ($action == 'set_cancel') } if ($action == 'set_paid') { - if ($object->set_paye($id, $modepaiement) >= 0) + if ($object->set_paye($id, $modepayment) >= 0) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); exit; @@ -260,7 +259,7 @@ $formcompany = new FormCompany($db); /* ************************************************************************** */ /* */ -/* Creation */ +/* Donation card in create mode */ /* */ /* ************************************************************************** */ @@ -353,7 +352,7 @@ if ($action == 'create') /* ************************************************************ */ /* */ -/* Fiche don en mode edition */ +/* Donation card in edit mode */ /* */ /* ************************************************************ */ @@ -417,10 +416,10 @@ if (! empty($id) && $action == 'edit') print "".$langs->trans("PaymentMode")."\n"; - if ($object->modepaiementid) $selected = $object->modepaiementid; + if ($object->modepaymentid) $selected = $object->modepaymentid; else $selected = ''; - $form->select_types_paiements($selected, 'modepaiement', 'CRDT', 0, 1); + $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1); print "\n"; print "".''.$langs->trans("Status").''.$object->getLibStatut(4).''; @@ -453,7 +452,7 @@ if (! empty($id) && $action == 'edit') /* ************************************************************ */ /* */ -/* Fiche don en mode visu */ +/* Donation card in view mode */ /* */ /* ************************************************************ */ if (! empty($id) && $action != 'edit') @@ -503,8 +502,12 @@ if (! empty($id) && $action != 'edit') { $img=picto_from_langcode($object->country_code); print ($img?$img.' ':''); + print $object->country; } - print $object->country; + else + { + print $object->country_olddata; + } print ''; // EMail @@ -512,7 +515,7 @@ if (! empty($id) && $action != 'edit') // Payment mode print "".$langs->trans("PaymentMode").""; - $form->form_modes_reglement(null, $object->modepaiementid,'none'); + $form->form_modes_reglement(null, $object->modepaymentid,'none'); print "\n"; print "".''.$langs->trans("Status").''.$object->getLibStatut(4).''; @@ -532,41 +535,63 @@ if (! empty($id) && $action != 'edit') print "
"; - // TODO Gerer action emettre paiement - $resteapayer = 0; - + $remaintopay = $object->amount - $totalpaid; /** - * Barre d'actions + * Actions buttons */ print '
'; - print '
'.$langs->trans('Modify').'
'; + print '
id.'">'.$langs->trans('Modify').'
'; if ($object->statut == 0) { - print '
'.$langs->trans("ValidPromess").'
'; + print '
'.$langs->trans("ValidPromess").'
'; } - if (($object->statut == 0 || $object->statut == 1) && $resteapayer == 0 && $object->paye == 0) + if (($object->statut == 0 || $object->statut == 1) && $remaintopay == 0 && $object->paye == 0) { - print '
'.$langs->trans("ClassifyCanceled")."
"; + print '
'.$langs->trans("ClassifyCanceled")."
"; } - // TODO Gerer action emettre paiement - if ($object->statut == 1 && $resteapayer > 0) + // Create payment + if ($object->statut == 1 && $object->paid == 0 && $user->rights->don->creer) { - print '
'.$langs->trans("DoPayment")."
"; + if ($remaintopay == 0) + { + print '
' . $langs->trans('DoPayment') . '
'; + } + else + { + print '
' . $langs->trans('DoPayment') . '
'; + } } - if ($object->statut == 1 && $resteapayer == 0 && $object->paye == 0) + /* + // Classify paid + if ($object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement && (($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0)) + || ($object->type == Facture::TYPE_DEPOSIT && $object->paye == 0 && $resteapayer == 0 && $user->rights->facture->paiement && empty($discount->id)) + ) + { + print '
'.$langs->trans('ClassifyPaid').'
'; + } + + // Emit payment + if ($object->statut == 1 && $object->paid == 0 && ((price2num($object->amount) > 0 && round($remaintopay) > 0)) && $user->rights->don->creer) { - print '
'.$langs->trans("ClassifyPaid")."
"; + print '
'.$langs->trans("DoPayment").'
'; } + */ + // Classify 'paid' + if ($object->statut == 1 && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer) + { + print '
'.$langs->trans("ClassifyPaid")."
"; + } + if ($user->rights->don->supprimer) { - print '
'.$langs->trans("Delete")."
"; + print '
'.$langs->trans("Delete")."
"; } else { diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index 88682b9d738..b677a3afad2 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -322,7 +322,7 @@ class Don extends CommonObject $sql.= "datec"; $sql.= ", entity"; $sql.= ", amount"; - $sql.= ", fk_paiement"; + $sql.= ", fk_payment"; $sql.= ", firstname"; $sql.= ", lastname"; $sql.= ", societe"; @@ -330,7 +330,7 @@ class Don extends CommonObject $sql.= ", zip"; $sql.= ", town"; // $sql.= ", country"; -- Deprecated - $sql.= ", fk_pays"; + $sql.= ", fk_country"; $sql.= ", public"; $sql.= ", fk_don_projet"; $sql.= ", note_private"; @@ -406,14 +406,14 @@ class Don extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."don SET "; $sql .= "amount = " . price2num($this->amount); - $sql .= ",fk_paiement = ".($this->modepaiementid?$this->modepaiementid:"null"); + $sql .= ",fk_payment = ".($this->modepaymentid?$this->modepaymentid:"null"); $sql .= ",firstname = '".$this->db->escape($this->firstname)."'"; $sql .= ",lastname='".$this->db->escape($this->lastname)."'"; $sql .= ",societe='".$this->db->escape($this->societe)."'"; $sql .= ",address='".$this->db->escape($this->address)."'"; $sql .= ",zip='".$this->db->escape($this->zip)."'"; $sql .= ",town='".$this->db->escape($this->town)."'"; - $sql .= ",fk_pays = ".$this->country_id; + $sql .= ",fk_country = ".$this->country_id; $sql .= ",public=".$this->public; $sql .= ",fk_don_projet=".($this->fk_project>0?$this->fk_project:'null'); $sql .= ",note_private=".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL"); @@ -497,14 +497,14 @@ class Don extends CommonObject $sql = "SELECT d.rowid, d.datec, d.tms as datem, d.datedon,"; $sql.= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, "; - $sql.= " d.fk_pays, d.public, d.amount, d.fk_paiement, d.note_private, d.note_public, cp.libelle, d.email, d.phone, "; + $sql.= " d.fk_country, d.country as country_olddata, d.public, d.amount, d.fk_payment, d.paid, d.note_private, d.note_public, cp.libelle, d.email, d.phone, "; $sql.= " d.phone_mobile, d.fk_don_projet,"; $sql.= " p.title as project_label,"; $sql.= " c.code as country_code, c.label as country"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_don_projet"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_paiement"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_pays = c.rowid"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid"; $sql.= " WHERE d.rowid = ".$rowid." AND d.entity = ".$conf->entity; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); @@ -528,17 +528,19 @@ class Don extends CommonObject $this->town = $obj->town; $this->zip = $obj->zip; $this->town = $obj->town; - $this->country_id = $obj->country_id; - $this->country_code = $obj->country_code; - $this->country = $obj->country; - $this->email = $obj->email; + $this->country_id = $obj->country_id; + $this->country_code = $obj->country_code; + $this->country = $obj->country; + $this->country_olddata= $obj->country_olddata; + $this->email = $obj->email; $this->phone = $obj->phone; $this->phone_mobile = $obj->phone_mobile; $this->projet = $obj->project_label; $this->fk_project = $obj->fk_don_projet; $this->public = $obj->public; - $this->modepaiementid = $obj->fk_paiement; - $this->modepaiement = $obj->libelle; + $this->modepaymentid = $obj->fk_payment; + $this->modepayment = $obj->libelle; + $this->paid = $obj->paid; $this->amount = $obj->amount; $this->note_private = $obj->note_private; $this->note_public = $obj->note_public; @@ -597,7 +599,7 @@ class Don extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2"; if ($modepaiement) { - $sql .= ", fk_paiement=$modepaiement"; + $sql .= ", fk_payment=$modepayment"; } $sql .= " WHERE rowid = $rowid AND fk_statut = 1"; diff --git a/htdocs/compta/dons/class/paymentdonation.class.php b/htdocs/compta/dons/class/paymentdonation.class.php new file mode 100644 index 00000000000..65d72fbfb52 --- /dev/null +++ b/htdocs/compta/dons/class/paymentdonation.class.php @@ -0,0 +1,607 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/dons/class/paymentdonation.class.php + * \ingroup Donation + * \brief File of class to manage payment of donations + */ + +require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php'; + + +/** \class PaymentDonation + * \brief Class to manage payments of donations + */ +class PaymentDonation extends CommonObject +{ + public $element='payment_donation'; //!< Id that identify managed objects + public $table_element='payment_donation'; //!< Name of table without prefix where object is stored + + var $id; + var $ref; + + var $fk_donation; + var $datec=''; + var $tms=''; + var $datep=''; + var $amount; // Total amount of payment + var $amounts=array(); // Array of amounts + var $fk_typepayment; + var $num_payment; + var $note; + var $fk_bank; + var $fk_user_creat; + var $fk_user_modif; + + /** + * Constructor + * + * @param DoliDB $db Database handler + */ + function __construct($db) + { + $this->db = $db; + } + + /** + * Create payment of donation into database. + * Use this->amounts to have list of lines for the payment + * + * @param User $user User making payment + * @return int <0 if KO, id of payment if OK + */ + function create($user) + { + global $conf, $langs; + + $error=0; + + $now=dol_now(); + + // Validate parameters + if (! $this->datepaye) + { + $this->error='ErrorBadValueForParameterCreatePaymentDonation'; + return -1; + } + + // Clean parameters + if (isset($this->fk_donation)) $this->fk_donation=trim($this->fk_donation); + if (isset($this->amount)) $this->amount=trim($this->amount); + if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment); + if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); + if (isset($this->note)) $this->note=trim($this->note); + if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); + if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); + if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); + + $totalamount = 0; + foreach ($this->amounts as $key => $value) // How payment is dispatch + { + $newvalue = price2num($value,'MT'); + $this->amounts[$key] = $newvalue; + $totalamount += $newvalue; + } + $totalamount = price2num($totalamount); + + // Check parameters + if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null + + + $this->db->begin(); + + if ($totalamount != 0) + { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_donation (fk_donation, datec, datep, amount,"; + $sql.= " fk_typepayment, num_payment, note, fk_user_creat, fk_bank)"; + $sql.= " VALUES ($this->chid, '".$this->db->idate($now)."',"; + $sql.= " '".$this->db->idate($this->datepaye)."',"; + $sql.= " ".$totalamount.","; + $sql.= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".$user->id.","; + $sql.= " 0)"; + + dol_syslog(get_class($this)."::create", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_donation"); + } + else + { + $error++; + } + + } + + if ($totalamount != 0 && ! $error) + { + $this->amount=$totalamount; + $this->total=$totalamount; // deprecated + $this->db->commit(); + return $this->id; + } + else + { + $this->error=$this->db->error(); + $this->db->rollback(); + return -1; + } + } + + /** + * Load object in memory from database + * + * @param int $id Id object + * @return int <0 if KO, >0 if OK + */ + function fetch($id) + { + global $langs; + $sql = "SELECT"; + $sql.= " t.rowid,"; + $sql.= " t.fk_donation,"; + $sql.= " t.datec,"; + $sql.= " t.tms,"; + $sql.= " t.datep,"; + $sql.= " t.amount,"; + $sql.= " t.fk_typepayment,"; + $sql.= " t.num_payment,"; + $sql.= " t.note,"; + $sql.= " t.fk_bank,"; + $sql.= " t.fk_user_creat,"; + $sql.= " t.fk_user_modif,"; + $sql.= " pt.code as type_code, pt.libelle as type_libelle,"; + $sql.= ' b.fk_account'; + $sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as pt, ".MAIN_DB_PREFIX."payment_donation as t)"; + $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid'; + $sql.= " WHERE t.rowid = ".$id." AND t.fk_typepayment = pt.id"; + + dol_syslog(get_class($this)."::fetch", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + if ($this->db->num_rows($resql)) + { + $obj = $this->db->fetch_object($resql); + + $this->id = $obj->rowid; + $this->ref = $obj->rowid; + + $this->fk_donation = $obj->fk_donation; + $this->datec = $this->db->jdate($obj->datec); + $this->tms = $this->db->jdate($obj->tms); + $this->datep = $this->db->jdate($obj->datep); + $this->amount = $obj->amount; + $this->fk_typepayment = $obj->fk_typepayment; + $this->num_payment = $obj->num_payment; + $this->note = $obj->note; + $this->fk_bank = $obj->fk_bank; + $this->fk_user_creat = $obj->fk_user_creat; + $this->fk_user_modif = $obj->fk_user_modif; + + $this->type_code = $obj->type_code; + $this->type_libelle = $obj->type_libelle; + + $this->bank_account = $obj->fk_account; + $this->bank_line = $obj->fk_bank; + } + $this->db->free($resql); + + return 1; + } + else + { + $this->error="Error ".$this->db->lasterror(); + return -1; + } + } + + + /** + * Update database + * + * @param User $user User that modify + * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @return int <0 if KO, >0 if OK + */ + function update($user=null, $notrigger=0) + { + global $conf, $langs; + $error=0; + + // Clean parameters + + if (isset($this->fk_donation)) $this->fk_donation=trim($this->fk_donation); + if (isset($this->amount)) $this->amount=trim($this->amount); + if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment); + if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); + if (isset($this->note)) $this->note=trim($this->note); + if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); + if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); + if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); + + + + // Check parameters + // Put here code to add control on parameters values + + // Update request + $sql = "UPDATE ".MAIN_DB_PREFIX."payment_donation SET"; + + $sql.= " fk_donation=".(isset($this->fk_donation)?$this->fk_donation:"null").","; + $sql.= " datec=".(dol_strlen($this->datec)!=0 ? "'".$this->db->idate($this->datec)."'" : 'null').","; + $sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').","; + $sql.= " datep=".(dol_strlen($this->datep)!=0 ? "'".$this->db->idate($this->datep)."'" : 'null').","; + $sql.= " amount=".(isset($this->amount)?$this->amount:"null").","; + $sql.= " fk_typepayment=".(isset($this->fk_typepayment)?$this->fk_typepayment:"null").","; + $sql.= " num_payment=".(isset($this->num_payment)?"'".$this->db->escape($this->num_payment)."'":"null").","; + $sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").","; + $sql.= " fk_bank=".(isset($this->fk_bank)?$this->fk_bank:"null").","; + $sql.= " fk_user_creat=".(isset($this->fk_user_creat)?$this->fk_user_creat:"null").","; + $sql.= " fk_user_modif=".(isset($this->fk_user_modif)?$this->fk_user_modif:"null").""; + + + $sql.= " WHERE rowid=".$this->id; + + $this->db->begin(); + + dol_syslog(get_class($this)."::update", LOG_DEBUG); + $resql = $this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + + if (! $error) + { + if (! $notrigger) + { + // Uncomment this and change MYOBJECT to your own tag if you + // want this action call a trigger. + + //// Call triggers + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; + //$interface=new Interfaces($this->db); + //$result=$interface->run_triggers('MYOBJECT_MODIFY',$this,$user,$langs,$conf); + //if ($result < 0) { $error++; $this->errors=$interface->errors; } + //// End call triggers + } + } + + // Commit or rollback + if ($error) + { + foreach($this->errors as $errmsg) + { + dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR); + $this->error.=($this->error?', '.$errmsg:$errmsg); + } + $this->db->rollback(); + return -1*$error; + } + else + { + $this->db->commit(); + return 1; + } + } + + + /** + * Delete object in database + * + * @param User $user User that delete + * @param int $notrigger 0=launch triggers after, 1=disable triggers + * @return int <0 if KO, >0 if OK + */ + function delete($user, $notrigger=0) + { + global $conf, $langs; + $error=0; + + $this->db->begin(); + + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url"; + $sql.= " WHERE type='payment_sc' AND url_id=".$this->id; + + dol_syslog(get_class($this)."::delete", LOG_DEBUG); + $resql = $this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + } + + if (! $error) + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_donation"; + $sql.= " WHERE rowid=".$this->id; + + dol_syslog(get_class($this)."::delete", LOG_DEBUG); + $resql = $this->db->query($sql); + if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); } + } + + if (! $error) + { + if (! $notrigger) + { + // Uncomment this and change MYOBJECT to your own tag if you + // want this action call a trigger. + + //// Call triggers + //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php'; + //$interface=new Interfaces($this->db); + //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf); + //if ($result < 0) { $error++; $this->errors=$interface->errors; } + //// End call triggers + } + } + + // Commit or rollback + if ($error) + { + foreach($this->errors as $errmsg) + { + dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR); + $this->error.=($this->error?', '.$errmsg:$errmsg); + } + $this->db->rollback(); + return -1*$error; + } + else + { + $this->db->commit(); + return 1; + } + } + + + + /** + * Load an object from its id and create a new one in database + * + * @param int $fromid Id of object to clone + * @return int New id of clone + */ + function createFromClone($fromid) + { + global $user,$langs; + + $error=0; + + $object=new PaymentSocialContribution($this->db); + + $object->context['createfromclone'] = 'createfromclone'; + + $this->db->begin(); + + // Load source object + $object->fetch($fromid); + $object->id=0; + $object->statut=0; + + // Clear fields + // ... + + // Create clone + $result=$object->create($user); + + // Other options + if ($result < 0) + { + $this->error=$object->error; + $error++; + } + + if (! $error) + { + + + + } + + unset($this->context['createfromclone']); + + // End + if (! $error) + { + $this->db->commit(); + return $object->id; + } + else + { + $this->db->rollback(); + return -1; + } + } + + + /** + * Initialise an instance with random values. + * Used to build previews or test instances. + * id must be 0 if object instance is a specimen. + * + * @return void + */ + function initAsSpecimen() + { + $this->id=0; + + $this->fk_donation=''; + $this->datec=''; + $this->tms=''; + $this->datep=''; + $this->amount=''; + $this->fk_typepayment=''; + $this->num_payment=''; + $this->note=''; + $this->fk_bank=''; + $this->fk_user_creat=''; + $this->fk_user_modif=''; + + + } + + + /** + * Add record into bank for payment with links between this bank record and invoices of payment. + * All payment properties must have been set first like after a call to create(). + * + * @param User $user Object of user making payment + * @param string $mode 'payment_sc' + * @param string $label Label to use in bank record + * @param int $accountid Id of bank account to do link with + * @param string $emetteur_nom Name of transmitter + * @param string $emetteur_banque Name of bank + * @return int <0 if KO, >0 if OK + */ + function addPaymentToBank($user,$mode,$label,$accountid,$emetteur_nom,$emetteur_banque) + { + global $conf; + + $error=0; + + if (! empty($conf->banque->enabled)) + { + require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; + + $acc = new Account($this->db); + $acc->fetch($accountid); + + $total=$this->total; + if ($mode == 'payment_sc') $total=-$total; + + // Insert payment into llx_bank + $bank_line_id = $acc->addline( + $this->datepaye, + $this->paymenttype, // Payment mode id or code ("CHQ or VIR for example") + $label, + $total, + $this->num_payment, + '', + $user, + $emetteur_nom, + $emetteur_banque + ); + + // Mise a jour fk_bank dans llx_paiement. + // On connait ainsi le paiement qui a genere l'ecriture bancaire + if ($bank_line_id > 0) + { + $result=$this->update_fk_bank($bank_line_id); + if ($result <= 0) + { + $error++; + dol_print_error($this->db); + } + + // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction + $url=''; + if ($mode == 'payment_sc') $url=DOL_URL_ROOT.'/compta/payment_sc/card.php?id='; + if ($url) + { + $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode); + if ($result <= 0) + { + $error++; + dol_print_error($this->db); + } + } + + // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment) + $linkaddedforthirdparty=array(); + foreach ($this->amounts as $key => $value) + { + if ($mode == 'payment_sc') + { + $socialcontrib = new ChargeSociales($this->db); + $socialcontrib->fetch($key); + $result=$acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_libelle.(($socialcontrib->lib && $socialcontrib->lib!=$socialcontrib->type_libelle)?' ('.$socialcontrib->lib.')':''),'sc'); + if ($result <= 0) dol_print_error($this->db); + } + } + } + else + { + $this->error=$acc->error; + $error++; + } + } + + if (! $error) + { + return 1; + } + else + { + return -1; + } + } + + + /** + * Mise a jour du lien entre le paiement de charge et la ligne dans llx_bank generee + * + * @param int $id_bank Id if bank + * @return int >0 if OK, <=0 if KO + */ + function update_fk_bank($id_bank) + { + $sql = "UPDATE ".MAIN_DB_PREFIX."payment_donation SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id; + + dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG); + $result = $this->db->query($sql); + if ($result) + { + return 1; + } + else + { + $this->error=$this->db->error(); + return 0; + } + } + + /** + * Return clicable name (with picto eventually) + * + * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto + * @param int $maxlen Longueur max libelle + * @return string Chaine avec URL + */ + function getNomUrl($withpicto=0,$maxlen=0) + { + global $langs; + + $result=''; + + if (empty($this->ref)) $this->ref=$this->lib; + $label = $langs->trans("ShowPayment").': '.$this->ref; + + if (!empty($this->id)) + { + $link = ''; + $linkend=''; + + if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' '); + if ($withpicto && $withpicto != 2) $result.=' '; + if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend; + } + + return $result; + } +} + + diff --git a/htdocs/compta/dons/payment.php b/htdocs/compta/dons/payment.php new file mode 100644 index 00000000000..12b0296ca5a --- /dev/null +++ b/htdocs/compta/dons/payment.php @@ -0,0 +1,313 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/compta/dons/payment.php + * \ingroup Donation + * \brief Page to add payment of a donation + */ + +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/paymentdonation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; + +$langs->load("bills"); + +$chid=GETPOST("rowid"); +$action=GETPOST('action'); +$amounts = array(); + +// Security check +$socid=0; +if ($user->societe_id > 0) +{ + $socid = $user->societe_id; +} + + +/* + * Actions + */ + +if ($action == 'add_payment') +{ + $error=0; + + if ($_POST["cancel"]) + { + $loc = DOL_URL_ROOT.'/compta/dons/card.php?rowid='.$chid; + header("Location: ".$loc); + exit; + } + + $datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + + if (! $_POST["paymenttype"] > 0) + { + $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode")); + $error++; + } + if ($datepaye == '') + { + $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Date")); + $error++; + } + if (! empty($conf->banque->enabled) && ! $_POST["accountid"] > 0) + { + $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("AccountToCredit")); + $error++; + } + + if (! $error) + { + $paymentid = 0; + + // Read possible payments + foreach ($_POST as $key => $value) + { + if (substr($key,0,7) == 'amount_') + { + $other_chid = substr($key,7); + $amounts[$other_chid] = price2num($_POST[$key]); + } + } + + if (count($amounts) <= 0) + { + $error++; + $errmsg='ErrorNoPaymentDefined'; + } + + if (! $error) + { + $db->begin(); + + // Create a line of payments + $payment = new PaymentDonation($db); + $payment->chid = $chid; + $payment->datepaye = $datepaye; + $payment->amounts = $amounts; // Tableau de montant + $payment->paymenttype = $_POST["paymenttype"]; + $payment->num_payment = $_POST["num_payment"]; + $payment->note = $_POST["note"]; + + if (! $error) + { + $paymentid = $payment->create($user); + if ($paymentid < 0) + { + $errmsg=$payment->error; + $error++; + } + } + + if (! $error) + { + $result=$payment->addPaymentToBank($user,'payment_donation','(DonationPayment)',$_POST['accountid'],'',''); + if (! $result > 0) + { + $errmsg=$payment->error; + $error++; + } + } + + if (! $error) + { + $db->commit(); + $loc = DOL_URL_ROOT.'/compta/dons/card.php?rowid='.$chid; + header('Location: '.$loc); + exit; + } + else + { + $db->rollback(); + } + } + } + + $_GET["action"]='create'; +} + + +/* + * View + */ + +llxHeader(); + +$form=new Form($db); + + +// Form to create donation payment +if (GETPOST("action") == 'create') +{ + + $don = new Don($db); + $don->fetch($chid); + + $total = $don->amount; + + print_fiche_titre($langs->trans("DoPayment")); + print "
\n"; + + if ($mesg) + { + print "
$mesg
"; + } + + print '
'; + print ''; + print ''; + print ''; + print ''; + + print ''; + + print ''; + + print ''; + print '\n"; + print ''; + + $sql = "SELECT sum(p.amount) as total"; + $sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as p"; + $sql.= " WHERE p.fk_donation = ".$chid; + $resql = $db->query($sql); + if ($resql) + { + $obj=$db->fetch_object($resql); + $sumpaid = $obj->total; + $db->free(); + } + print ''; + print ''; + + print ''; + print "'; + print ''; + + print '"; + print ''; + + print '\n"; + print ''; + + print ''; + print ''; + print ''; + + // Number + print ''; + print ''."\n"; + + print ''; + print ''; + print ''; + print ''; + + print '
'.$langs->trans("Donation").'
'.$langs->trans("Ref").''.$chid.'
'.$langs->trans("Date")."".dol_print_date($don->date,'day')."
'.$langs->trans("Amount")."".price($don->amount,0,$outputlangs,1,-1,-1,$conf->currency).'
'.$langs->trans("AlreadyPaid").''.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'
'.$langs->trans("RemainderToPay").''.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'
".$langs->trans("Payment").'
'.$langs->trans("Date").''; + $datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $datepayment=empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaye):0; + $form->select_date($datepayment,'','','','',"add_payment",1,1); + print "
'.$langs->trans("PaymentMode").''; + $form->select_types_paiements(isset($_POST["paymenttype"])?$_POST["paymenttype"]:$don->paymenttype, "paymenttype"); + print "
'.$langs->trans('AccountToDebit').''; + $form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$don->accountid, "accountid", 0, '',1); // Show opend bank account list + print '
'.$langs->trans('Numero'); + print ' ('.$langs->trans("ChequeOrTransferNumber").')'; + print '
'.$langs->trans("Comments").'
'; + + print '
'; + + /* + * Autres charges impayees + */ + $num = 1; + $i = 0; + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + + $var=true; + $total=0; + $totalrecu=0; + + while ($i < $num) + { + $objp = $don; + + $var=!$var; + + print ""; + + print '"; + + print '"; + + print '"; + + print '"; + + print "\n"; + $total+=$objp->total; + $total_ttc+=$objp->total_ttc; + $totalrecu+=$objp->am; + $i++; + } + if ($i > 1) + { + // Print total + print ""; + print ''; + print ""; + print ""; + print ""; + print ''; + print "\n"; + } + + print "
'.$langs->trans("Amount").''.$langs->trans("AlreadyPaid").''.$langs->trans("RemainderToPay").''.$langs->trans("Amount").'
'.price($objp->amount)."'.price($sumpaid)."'.price($objp->amount - $sumpaid)."'; + if ($sumpaid < $objp->amount) + { + $namef = "amount_".$objp->id; + print ''; + } + else + { + print '-'; + } + print "
'.$langs->trans("Total").':".price($total_ttc)."".price($totalrecu)."".price($total_ttc - $totalrecu)." 
"; + + print '
'; + print ''; + print '     '; + print ''; + print '
'; + + print "
\n"; +} + + +$db->close(); + +llxFooter(); diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index d2520973275..c92c78014cb 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -372,4 +372,22 @@ ALTER TABLE llx_societe_extrafields DROP INDEX idx_societe_extrafields; ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_object); -- Module Donation -ALTER TABLE llx_don ADD COLUMN fk_pays integer NOT NULL after country; +ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL after country; +ALTER TABLE llx_don CHANGE COLUMN fk_paiement fk_payment integer; +ALTER TABLE llx_don ADD COLUMN paid smallint default 0 NOT NULL after fk_payment; + +create table llx_payment_donation +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_donation integer, + datec datetime, -- date de creation + tms timestamp, + datep datetime, -- payment date + amount real DEFAULT 0, + fk_typepayment integer NOT NULL, + num_payment varchar(50), + note text, + fk_bank integer NOT NULL, + fk_user_creat integer, -- creation user + fk_user_modif integer -- last modification user +)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index bf434e11518..d4e03c55d0c 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -2,6 +2,7 @@ -- Copyright (C) 2001-2002 Rodolphe Quiedeville -- Copyright (C) 2009 Regis Houssin -- Copyright (C) 2011 Laurent Destailleur +-- Copyright (C) 2015 Alexandre Spangaro -- -- 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 @@ -29,15 +30,16 @@ create table llx_don datec datetime, -- date de creation de l'enregistrement datedon datetime, -- date du don/promesse amount real DEFAULT 0, - fk_paiement integer, + fk_payment integer, + paid smallint default 0 NOT NULL, firstname varchar(50), lastname varchar(50), societe varchar(50), address text, zip varchar(30), town varchar(50), - country varchar(50), -- Deprecated - Replace with fk_pays - fk_pays integer NOT NULL, + country varchar(50), -- Deprecated - Replace with fk_country + fk_country integer NOT NULL, email varchar(255), phone varchar(24), phone_mobile varchar(24), diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql new file mode 100644 index 00000000000..0389a59e06e --- /dev/null +++ b/htdocs/install/mysql/tables/llx_payment_donation.sql @@ -0,0 +1,33 @@ +-- =================================================================== +-- Copyright (C) 2015 Alexandre Spangaro +-- +-- 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 +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see . +-- +-- =================================================================== + +create table llx_payment_donation +( + rowid integer AUTO_INCREMENT PRIMARY KEY, + fk_donation integer, + datec datetime, -- date de creation + tms timestamp, + datep datetime, -- payment date + amount real DEFAULT 0, + fk_typepayment integer NOT NULL, + num_payment varchar(50), + note text, + fk_bank integer NOT NULL, + fk_user_creat integer, -- creation user + fk_user_modif integer -- last modification user +)ENGINE=innodb; From e6d9d18f252613b5fc92bf9e72a6a0347c7644de Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 18 Mar 2015 06:29:10 +0100 Subject: [PATCH 120/412] Update work on donation --- htdocs/compta/dons/card.php | 36 ++++++------------- htdocs/compta/dons/class/don.class.php | 12 +++---- .../dons/class/paymentdonation.class.php | 21 +++++------ htdocs/compta/dons/payment.php | 14 ++++---- .../install/mysql/migration/3.7.0-3.8.0.sql | 1 + htdocs/install/mysql/tables/llx_don.sql | 2 +- 6 files changed, 37 insertions(+), 49 deletions(-) diff --git a/htdocs/compta/dons/card.php b/htdocs/compta/dons/card.php index 0c4c92cecd7..d20af7f8ba6 100644 --- a/htdocs/compta/dons/card.php +++ b/htdocs/compta/dons/card.php @@ -32,7 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; -if (! empty($conf->projet->enabled)) { +if (! empty($conf->projet->enabled)) +{ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; } require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; @@ -99,7 +100,7 @@ if ($action == 'update') $object->email = GETPOST("email"); $object->date = $donation_date; $object->public = GETPOST("public"); - $object->fk_project = GETPOST("projectid"); + $object->fk_project = GETPOST("fk_project"); $object->note_private= GETPOST("note_private"); $object->note_public = GETPOST("note_public"); @@ -334,10 +335,9 @@ if ($action == 'create') $formproject=new FormProjets($db); - // Si module projet actif print "".$langs->trans("Project").""; - $formproject->select_projects('',GETPOST("projectid"),"projectid"); - print "\n"; + $formproject->select_projects(-1, GETPOST("fk_project"),'fk_project', 0, 1, 0, 1); + print "\n"; } // Other attributes @@ -431,7 +431,7 @@ if (! empty($id) && $action == 'edit') $langs->load('projects'); print ''.$langs->trans('Project').''; - $formproject->select_projects(-1, (isset($_POST["projectid"])?$_POST["projectid"]:$don->fk_project), 'projectid'); + $formproject->select_projects(-1, $object->fk_project,'fk_project', 0, 1, 0, 1); print ''; } @@ -523,7 +523,10 @@ if (! empty($id) && $action != 'edit') // Project if (! empty($conf->projet->enabled)) { - print "".''.$langs->trans("Project").''.$object->projet.''; + print ''; + print ''.$langs->trans("Project").''; + print ''.$object->projet.''; + print ''; } // Other attributes @@ -567,22 +570,6 @@ if (! empty($id) && $action != 'edit') } } - /* - // Classify paid - if ($object->statut == 1 && $object->paye == 0 && $user->rights->facture->paiement && (($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0)) - || ($object->type == Facture::TYPE_DEPOSIT && $object->paye == 0 && $resteapayer == 0 && $user->rights->facture->paiement && empty($discount->id)) - ) - { - print '
'.$langs->trans('ClassifyPaid').'
'; - } - - // Emit payment - if ($object->statut == 1 && $object->paid == 0 && ((price2num($object->amount) > 0 && round($remaintopay) > 0)) && $user->rights->don->creer) - { - print '
'.$langs->trans("DoPayment").'
'; - } - */ - // Classify 'paid' if ($object->statut == 1 && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer) { @@ -625,6 +612,5 @@ if (! empty($id) && $action != 'edit') } - llxFooter(); -$db->close(); +$db->close(); \ No newline at end of file diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php index b677a3afad2..273d54a6eef 100644 --- a/htdocs/compta/dons/class/don.class.php +++ b/htdocs/compta/dons/class/don.class.php @@ -332,7 +332,7 @@ class Don extends CommonObject // $sql.= ", country"; -- Deprecated $sql.= ", fk_country"; $sql.= ", public"; - $sql.= ", fk_don_projet"; + $sql.= ", fk_project"; $sql.= ", note_private"; $sql.= ", note_public"; $sql.= ", fk_user_author"; @@ -415,7 +415,7 @@ class Don extends CommonObject $sql .= ",town='".$this->db->escape($this->town)."'"; $sql .= ",fk_country = ".$this->country_id; $sql .= ",public=".$this->public; - $sql .= ",fk_don_projet=".($this->fk_project>0?$this->fk_project:'null'); + $sql .= ",fk_project=".($this->fk_project>0?$this->fk_project:'null'); $sql .= ",note_private=".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL"); $sql .= ",note_public=".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL"); $sql .= ",datedon='".$this->db->idate($this->date)."'"; @@ -498,11 +498,11 @@ class Don extends CommonObject $sql = "SELECT d.rowid, d.datec, d.tms as datem, d.datedon,"; $sql.= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, "; $sql.= " d.fk_country, d.country as country_olddata, d.public, d.amount, d.fk_payment, d.paid, d.note_private, d.note_public, cp.libelle, d.email, d.phone, "; - $sql.= " d.phone_mobile, d.fk_don_projet,"; + $sql.= " d.phone_mobile, d.fk_project,"; $sql.= " p.title as project_label,"; $sql.= " c.code as country_code, c.label as country"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_don_projet"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_project"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid"; $sql.= " WHERE d.rowid = ".$rowid." AND d.entity = ".$conf->entity; @@ -535,8 +535,8 @@ class Don extends CommonObject $this->email = $obj->email; $this->phone = $obj->phone; $this->phone_mobile = $obj->phone_mobile; - $this->projet = $obj->project_label; - $this->fk_project = $obj->fk_don_projet; + $this->project = $obj->project_label; + $this->fk_project = $obj->fk_project; $this->public = $obj->public; $this->modepaymentid = $obj->fk_payment; $this->modepayment = $obj->libelle; diff --git a/htdocs/compta/dons/class/paymentdonation.class.php b/htdocs/compta/dons/class/paymentdonation.class.php index 65d72fbfb52..907ea46bf72 100644 --- a/htdocs/compta/dons/class/paymentdonation.class.php +++ b/htdocs/compta/dons/class/paymentdonation.class.php @@ -33,6 +33,7 @@ class PaymentDonation extends CommonObject public $table_element='payment_donation'; //!< Name of table without prefix where object is stored var $id; + var $rowid; var $ref; var $fk_donation; @@ -74,7 +75,7 @@ class PaymentDonation extends CommonObject $now=dol_now(); // Validate parameters - if (! $this->datepaye) + if (! $this->datepaid) { $this->error='ErrorBadValueForParameterCreatePaymentDonation'; return -1; @@ -110,7 +111,7 @@ class PaymentDonation extends CommonObject $sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_donation (fk_donation, datec, datep, amount,"; $sql.= " fk_typepayment, num_payment, note, fk_user_creat, fk_bank)"; $sql.= " VALUES ($this->chid, '".$this->db->idate($now)."',"; - $sql.= " '".$this->db->idate($this->datepaye)."',"; + $sql.= " '".$this->db->idate($this->datepaid)."',"; $sql.= " ".$totalamount.","; $sql.= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".$user->id.","; $sql.= " 0)"; @@ -485,7 +486,7 @@ class PaymentDonation extends CommonObject // Insert payment into llx_bank $bank_line_id = $acc->addline( - $this->datepaye, + $this->datepaid, $this->paymenttype, // Payment mode id or code ("CHQ or VIR for example") $label, $total, @@ -496,7 +497,7 @@ class PaymentDonation extends CommonObject $emetteur_banque ); - // Mise a jour fk_bank dans llx_paiement. + // Update fk_bank in llx_paiement. // On connait ainsi le paiement qui a genere l'ecriture bancaire if ($bank_line_id > 0) { @@ -509,7 +510,7 @@ class PaymentDonation extends CommonObject // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction $url=''; - if ($mode == 'payment_sc') $url=DOL_URL_ROOT.'/compta/payment_sc/card.php?id='; + if ($mode == 'payment_donation') $url=DOL_URL_ROOT.'/compta/dons/card.php?rowid='; if ($url) { $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode); @@ -520,15 +521,15 @@ class PaymentDonation extends CommonObject } } - // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment) + // Add link 'thirdparty' in bank_url between donation and bank transaction (for each donation concerned by payment) $linkaddedforthirdparty=array(); foreach ($this->amounts as $key => $value) { - if ($mode == 'payment_sc') + if ($mode == 'payment_donation') { - $socialcontrib = new ChargeSociales($this->db); - $socialcontrib->fetch($key); - $result=$acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_libelle.(($socialcontrib->lib && $socialcontrib->lib!=$socialcontrib->type_libelle)?' ('.$socialcontrib->lib.')':''),'sc'); + $don = new Don($this->db); + $don->fetch($key); + $result=$acc->add_url_line($bank_line_id, $don->rowid, DOL_URL_ROOT.'/compta/card.php?rowid=', $don->type_libelle.(($don->lib && $don->lib!=$don->type_libelle)?' ('.$don->lib.')':''),'sc'); if ($result <= 0) dol_print_error($this->db); } } diff --git a/htdocs/compta/dons/payment.php b/htdocs/compta/dons/payment.php index 12b0296ca5a..948cd221b0c 100644 --- a/htdocs/compta/dons/payment.php +++ b/htdocs/compta/dons/payment.php @@ -55,14 +55,14 @@ if ($action == 'add_payment') exit; } - $datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); if (! $_POST["paymenttype"] > 0) { $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode")); $error++; } - if ($datepaye == '') + if ($datepaid == '') { $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Date")); $error++; @@ -100,7 +100,7 @@ if ($action == 'add_payment') // Create a line of payments $payment = new PaymentDonation($db); $payment->chid = $chid; - $payment->datepaye = $datepaye; + $payment->datepaid = $datepaid; $payment->amounts = $amounts; // Tableau de montant $payment->paymenttype = $_POST["paymenttype"]; $payment->num_payment = $_POST["num_payment"]; @@ -202,8 +202,8 @@ if (GETPOST("action") == 'create') print ''; print ''.$langs->trans("Date").''; - $datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); - $datepayment=empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaye):0; + $datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $datepayment=empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaid):0; $form->select_date($datepayment,'','','','',"add_payment",1,1); print ""; print ''; @@ -214,9 +214,9 @@ if (GETPOST("action") == 'create') print ''; print ''; - print ''.$langs->trans('AccountToDebit').''; + print ''.$langs->trans('AccountToCredit').''; print ''; - $form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$don->accountid, "accountid", 0, '',1); // Show opend bank account list + $form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$don->accountid, "accountid", 0, '',1); // Show open bank account list print ''; // Number diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index c92c78014cb..b07974b8889 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -375,6 +375,7 @@ ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_ ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL after country; ALTER TABLE llx_don CHANGE COLUMN fk_paiement fk_payment integer; ALTER TABLE llx_don ADD COLUMN paid smallint default 0 NOT NULL after fk_payment; +ALTER TABLE llx_don CHANGE COLUMN fk_don_projet fk_project integer NULL; create table llx_payment_donation ( diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index d4e03c55d0c..a3882fc6f99 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -44,7 +44,7 @@ create table llx_don phone varchar(24), phone_mobile varchar(24), public smallint DEFAULT 1 NOT NULL, -- le don est-il public (0,1) - fk_don_projet integer NULL, -- projet auquel est fait le don + fk_project integer NULL, -- projet auquel est fait le don fk_user_author integer NOT NULL, fk_user_valid integer NULL, note_private text, From 5d4d8151c14a384cb77aaa1025675db0edbfb6d6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Mar 2015 11:04:50 +0100 Subject: [PATCH 121/412] Work on new timesheet input pages. --- htdocs/core/js/timesheet.js | 41 ++++- htdocs/core/lib/project.lib.php | 45 +++-- htdocs/core/menus/init_menu_auguria.sql | 4 +- htdocs/core/menus/standard/eldy.lib.php | 4 +- .../install/mysql/migration/3.7.0-3.8.0.sql | 3 + htdocs/langs/en_US/projects.lang | 3 +- htdocs/projet/activity/perday.php | 160 ++++++++--------- .../activity/{pertime.php => perweek.php} | 169 ++++++++++-------- htdocs/projet/class/project.class.php | 33 ++-- htdocs/projet/class/task.class.php | 6 +- htdocs/projet/tasks/task.php | 6 +- 11 files changed, 272 insertions(+), 202 deletions(-) rename htdocs/projet/activity/{pertime.php => perweek.php} (53%) diff --git a/htdocs/core/js/timesheet.js b/htdocs/core/js/timesheet.js index 7c85cb1afd0..c36c03f55ff 100644 --- a/htdocs/core/js/timesheet.js +++ b/htdocs/core/js/timesheet.js @@ -122,7 +122,28 @@ function updateTotal(days,mode) var nbline = document.getElementById('numberOfLines').value; for (var i=0;i= 0) + { + total.setHours(total.getHours()+taskTime.getHours()); + total.setMinutes(total.getMinutes()+taskTime.getMinutes()); + } + } + + var id='timeadded['+i+']['+days+']'; var taskTime= new Date(0); var element=document.getElementById(id); if(element) @@ -152,7 +173,23 @@ function updateTotal(days,mode) var nbline = document.getElementById('numberOfLines').value; for (var i=0;iglobal->PROJECT_DISABLE_TIMESHEET_PERDAY)) + if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK)) + { + $head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($mode?'?mode='.$mode:''); + $head[$h][1] = $langs->trans("InputPerWeek"); + $head[$h][2] = 'inputperweek'; + $h++; + } + + if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME)) { $head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($mode?'?mode='.$mode:''); $head[$h][1] = $langs->trans("InputPerDay"); @@ -185,11 +193,11 @@ function project_timesheet_prepare_head($mode) $h++; } - if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME)) + if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERACTION)) { - $head[$h][0] = DOL_URL_ROOT."/projet/activity/pertime.php".($mode?'?mode='.$mode:''); - $head[$h][1] = $langs->trans("InputPerTime"); - $head[$h][2] = 'inputpertime'; + $head[$h][0] = DOL_URL_ROOT."/projet/activity/peraction.php".($mode?'?mode='.$mode:''); + $head[$h][1] = $langs->trans("InputPerAction"); + $head[$h][2] = 'inputperaction'; $h++; } @@ -649,6 +657,8 @@ function projectLinesPerTime(&$inc, $parent, $lines, &$level, &$projectsrole, &$ * Output a task line into a perday intput mode * * @param string $inc Line number (start to 0, then increased by recursive call) + * @param int $firstdaytoshow First day to show + * @param User|null $fuser Restrict list to user if defined * @param string $parent Id of parent project to show (0 to show all) * @param Task[] $lines Array of lines * @param int $level Level (start to 0, then increased/decrease by recursive call) @@ -658,7 +668,7 @@ function projectLinesPerTime(&$inc, $parent, $lines, &$level, &$projectsrole, &$ * @param int $restricteditformytask 0=No restriction, 1=Enable add time only if task is a task i am affected to * @return $inc */ -function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0) +function projectLinesPerDay(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0) { global $db, $user, $bc, $langs; global $form, $formother, $projectstatic, $taskstatic; @@ -687,7 +697,7 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t $lastprojectid=$lines[$i]->fk_project; $projectstatic->id = $lines[$i]->fk_project; - $projectstatic->loadTimeSpent($datestart, $lines[$i]->id, $fuser->id); + $projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id); // Load time spent into this->weekWorkLoad and this->weekWorkLoadPerTaks for all day of a week } // If we want all or we have a role on task, we show it @@ -708,17 +718,18 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t print ''; $taskstatic->id=$lines[$i]->id; $taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id); - print $taskstatic->getNomUrl(1); + print $taskstatic->getNomUrl(1, 'withproject', 'time'); print ''; // Label task print ""; + print ''; for ($k = 0 ; $k < $level ; $k++) print "   "; $taskstatic->id=$lines[$i]->id; $taskstatic->ref=$lines[$i]->label; $taskstatic->date_start=$lines[$i]->date_start; $taskstatic->date_end=$lines[$i]->date_end; - print $taskstatic->getNomUrl(0); + print $taskstatic->getNomUrl(0, 'withproject', 'time'); //print "
"; //for ($k = 0 ; $k < $level ; $k++) print "   "; //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0); @@ -770,18 +781,22 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t $disabledtask=1; } - //var_dump($projectstatic->weekWorkLoad); + //var_dump($projectstatic->weekWorkLoadPerTask); // Fields to show current time $tableCell=''; $modeinput='hours'; for ($idw = 0; $idw < 7; $idw++) { - $dayWorkLoad = 0; + $tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd'); + $dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id]; + $alreadyspent=''; + if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin'); $tableCell =''; - $tableCell.='+'; - $tableCell.=''; + $tableCell.='+'; + $tableCell.=''; + $tableCell.= 'onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />'; $tableCell.=''; print $tableCell; } @@ -790,7 +805,7 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t $inc++; $level++; - if ($lines[$i]->id) projectLinesPerDay($inc, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); + if ($lines[$i]->id) projectLinesPerDay($inc, $firstdaytoshow, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); $level--; } else diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index b2f81ed1769..ec265cd4d3f 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -244,12 +244,12 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3700__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?leftmenu=projects', 'Activities', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/index.php?leftmenu=projects', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3703__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/activity/perday.php?leftmenu=projects', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3703__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3800__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?leftmenu=projects&mode=mine', 'MyActivities', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3801__+MAX_llx_menu__, 'project', '', 3800__+MAX_llx_menu__, '/projet/tasks.php?leftmenu=projects&action=create&mode=mine', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3802__+MAX_llx_menu__, 'project', '', 3800__+MAX_llx_menu__, '/projet/tasks/index.php?leftmenu=projects&mode=mine', 'List', 1, 'projects', '$user->rights->projet->lire', '', 2, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3803__+MAX_llx_menu__, 'project', '', 3800__+MAX_llx_menu__, '/projet/activity/perday.php?leftmenu=projects&mode=mine', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3803__+MAX_llx_menu__, 'project', '', 3800__+MAX_llx_menu__, '/projet/activity/perweek.php?leftmenu=projects&mode=mine', 'NewTimeSpent', 1, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__); -- Tools insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->mailing->enabled', __HANDLER__, 'left', 3900__+MAX_llx_menu__, 'tools', 'mailing', 8__+MAX_llx_menu__, '/comm/mailing/index.php?leftmenu=mailing', 'EMailings', 0, 'mails', '$user->rights->mailing->lire', '', 0, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->mailing->enabled', __HANDLER__, 'left', 3901__+MAX_llx_menu__, 'tools', '', 3900__+MAX_llx_menu__, '/comm/mailing/card.php?leftmenu=mailing&action=create', 'NewMailing', 1, 'mails', '$user->rights->mailing->creer', '', 0, 0, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 24af20ea4af..7c6ef944f7c 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1148,13 +1148,13 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/projet/activity/index.php?mode=mine", $langs->trans("MyActivities"), 0, $user->rights->projet->lire); $newmenu->add("/projet/tasks.php?action=create&mode=mine", $langs->trans("NewTask"), 1, $user->rights->projet->creer); $newmenu->add("/projet/tasks/index.php?mode=mine", $langs->trans("List"), 1, $user->rights->projet->lire); - $newmenu->add("/projet/activity/perday.php?mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); + $newmenu->add("/projet/activity/perweek.php?mode=mine", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer); // All project i have permission on $newmenu->add("/projet/activity/index.php", $langs->trans("Activities"), 0, $user->rights->projet->lire && $user->rights->projet->lire); $newmenu->add("/projet/tasks.php?action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer && $user->rights->projet->creer); $newmenu->add("/projet/tasks/index.php", $langs->trans("List"), 1, $user->rights->projet->lire && $user->rights->projet->lire); - $newmenu->add("/projet/activity/perday.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer && $user->rights->projet->creer); + $newmenu->add("/projet/activity/perweek.php", $langs->trans("NewTimeSpent"), 1, $user->rights->projet->creer && $user->rights->projet->creer); } } } diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index b7475d88f91..d4e56a980a6 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -27,6 +27,9 @@ ALTER TABLE llx_payment_salary ADD COLUMN salary real after datev; UPDATE llx_projet_task_time SET task_datehour = task_date where task_datehour IS NULL; ALTER TABLE llx_projet_task_time ADD COLUMN task_date_withhour integer DEFAULT 0 after task_datehour; +ALTER TABLE llx_projet_task MODIFY COLUMN duration_effective real DEFAULT 0 NULL; +ALTER TABLE llx_projet_task MODIFY COLUMN planned_workload real DEFAULT 0 NULL; + ALTER TABLE llx_commande_fournisseur MODIFY COLUMN date_livraison datetime; diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 8e7e29f7278..ef270909120 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -138,6 +138,7 @@ SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index abec2e8cf7c..5dc873cfccc 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -19,9 +19,9 @@ */ /** - * \file htdocs/projet/activity/pertime.php + * \file htdocs/projet/activity/perday.php * \ingroup projet - * \brief List activities of tasks (per time entry) + * \brief List activities of tasks (per day entry) */ require ("../../main.inc.php"); @@ -29,7 +29,6 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load('projects'); @@ -48,13 +47,6 @@ $socid=0; if ($user->societe_id > 0) $socid=$user->societe_id; $result = restrictedArea($user, 'projet', $projectid); -$now=dol_now(); - -$year=GETPOST("year","int")?GETPOST("year","int"):date("Y"); -$month=GETPOST("month","int")?GETPOST("month","int"):date("m"); -$week=GETPOST("week","int")?GETPOST("week","int"):date("W"); -$day=GETPOST("day","int")?GETPOST("day","int"):date("d"); - /* * Actions @@ -64,8 +56,68 @@ if ($action == 'addtime' && $user->rights->projet->creer) { $task = new Task($db); + $timespent_duration=array(); + foreach($_POST as $key => $time) + { + if (intval($time) > 0) + { + // Hours or minutes of duration + if (preg_match("/([0-9]+)duration(hour|min)/",$key,$matches)) + { + $id = $matches[1]; + if ($id > 0) + { + // We store HOURS in seconds + if($matches[2]=='hour') $timespent_duration[$id] += $time*60*60; + // We store MINUTES in seconds + if($matches[2]=='min') $timespent_duration[$id] += $time*60; + } + } + } + } + + if (count($timespent_duration) > 0) + { + foreach($timespent_duration as $key => $val) + { + $task->fetch($key); + $task->progress = GETPOST($key . 'progress', 'int'); + $task->timespent_duration = $val; + $task->timespent_fk_user = $user->id; + if (GETPOST($key."hour") != '' && GETPOST($key."hour") >= 0) // If hour was entered + { + $task->timespent_date = dol_mktime(GETPOST($key."hour"),GETPOST($key."min"),0,GETPOST($key."month"),GETPOST($key."day"),GETPOST($key."year")); + $task->timespent_withhour = 1; + } + else + { + $task->timespent_date = dol_mktime(12,0,0,GETPOST($key."month"),GETPOST($key."day"),GETPOST($key."year")); + } + + $result=$task->addTimeSpent($user); + if ($result < 0) + { + setEventMessages($task->error, $task->errors, 'errors'); + $error++; + break; + } + } + + if (! $error) + { + setEventMessage($langs->trans("RecordSaved")); + + // Redirect to avoid submit twice on back + header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'')); + exit; + } + } + else + { + setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors'); + } } @@ -75,7 +127,6 @@ if ($action == 'addtime' && $user->rights->projet->creer) */ $form=new Form($db); -$formother=new FormOther($db); $projectstatic=new Project($db); $project = new Project($db); $taskstatic = new Task($db); @@ -83,9 +134,8 @@ $taskstatic = new Task($db); $title=$langs->trans("TimeSpent"); if ($mine) $title=$langs->trans("MyTimeSpent"); -$usertoprocess=$user; +$usertoprocess = $user; -//$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); $projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess,0,1); // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project if ($id) @@ -103,50 +153,15 @@ $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0,$usertoprocess,($projec //var_dump($taskrole); -llxHeader("",$title,"",'','','',array('/core/js/timesheet.js')); +llxHeader("",$title,""); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num); -$startdayarray=dol_get_first_day_week($day, $month, $year); - -$prev = $startdayarray; -$prev_year = $prev['prev_year']; -$prev_month = $prev['prev_month']; -$prev_day = $prev['prev_day']; -$first_day = $prev['first_day']; -$first_month= $prev['first_month']; -$first_year = $prev['first_year']; -$week = $prev['week']; - -$day = (int) $day; -$next = dol_get_next_week($first_day, $week, $first_month, $first_year); -$next_year = $next['year']; -$next_month = $next['month']; -$next_day = $next['day']; - -// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1) -$firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year); -$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd'); - -$tmpday = $first_day; - -// Show navigation bar -$nav ="".img_previous($langs->trans("Previous"))."\n"; -$nav.=" ".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week; -$nav.=" \n"; -$nav.="".img_next($langs->trans("Next"))."\n"; -$nav.="   (".$langs->trans("Today").")"; -$picto='calendarweek'; - - -print '
'; +print ''; print ''; print ''; print ''; -print ''; -print ''; -print ''; $head=project_timesheet_prepare_head($mode); dol_fiche_head($head, 'inputperday', '', 0, 'task'); @@ -158,7 +173,7 @@ else if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'

'; else print $langs->trans("ProjectsPublicTaskDesc").($onlyopened?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'

'; } -print "\n"; + // Filter on user /* dol_fiche_head(''); @@ -180,10 +195,6 @@ print "\n"; dol_fiche_end(); */ - -print '
'.$nav.'
'; - - print ''; print ''; print ''; @@ -194,14 +205,8 @@ print ''; print ''; if ($usertoprocess->id == $user->id) print ''; else print ''; - -$startday=dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['first_day'], $startdayarray['first_year']); - -for($i=0;$i<7;$i++) -{ - print ''; -} - +print ''; +print ''; print "\n"; // By default, we can edit only tasks we are assigned to @@ -210,18 +215,7 @@ $restricteditformytask=(empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJEC if (count($tasksarray) > 0) { $j=0; - projectLinesPerDay($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); - - print ' - - - - - - - - - '; + projectLinesPerTime($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); } else { @@ -229,23 +223,9 @@ else } print "
'.$langs->trans("Project").''.$langs->trans("ProgressDeclared").''.$langs->trans("TimeSpent").''.$langs->trans("TimeSpentByYou").''.$langs->trans("TimeSpentByUser").''.dol_print_date($startday + ($i * 3600 * 24), '%a').'
'.dol_print_date($startday + ($i * 3600 * 24), 'day').'		'.$langs->trans("DateAndHour").''.$langs->trans("Duration").'
'.$langs->trans("Total").'
 
 
 
 
 
 
 
"; -print ''."\n"; -print ''."\n"; - dol_fiche_end(); -print '
'; -print ''; -print '
'; - -print '
'."\n\n"; - - -print ''; +print ''; llxFooter(); diff --git a/htdocs/projet/activity/pertime.php b/htdocs/projet/activity/perweek.php similarity index 53% rename from htdocs/projet/activity/pertime.php rename to htdocs/projet/activity/perweek.php index 9f2dc3e99ca..8a9adc04f17 100644 --- a/htdocs/projet/activity/pertime.php +++ b/htdocs/projet/activity/perweek.php @@ -19,9 +19,9 @@ */ /** - * \file htdocs/projet/activity/perday.php + * \file htdocs/projet/activity/perweek.php * \ingroup projet - * \brief List activities of tasks (per day entry) + * \brief List activities of tasks (per week entry) */ require ("../../main.inc.php"); @@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load('projects'); @@ -47,6 +48,13 @@ $socid=0; if ($user->societe_id > 0) $socid=$user->societe_id; $result = restrictedArea($user, 'projet', $projectid); +$now=dol_now(); + +$year=GETPOST("year","int")?GETPOST("year","int"):date("Y"); +$month=GETPOST("month","int")?GETPOST("month","int"):date("m"); +$week=GETPOST("week","int")?GETPOST("week","int"):date("W"); +$day=GETPOST("day","int")?GETPOST("day","int"):date("d"); + /* * Actions @@ -56,68 +64,8 @@ if ($action == 'addtime' && $user->rights->projet->creer) { $task = new Task($db); - $timespent_duration=array(); - foreach($_POST as $key => $time) - { - if (intval($time) > 0) - { - // Hours or minutes of duration - if (preg_match("/([0-9]+)duration(hour|min)/",$key,$matches)) - { - $id = $matches[1]; - if ($id > 0) - { - // We store HOURS in seconds - if($matches[2]=='hour') $timespent_duration[$id] += $time*60*60; - // We store MINUTES in seconds - if($matches[2]=='min') $timespent_duration[$id] += $time*60; - } - } - } - } - - if (count($timespent_duration) > 0) - { - foreach($timespent_duration as $key => $val) - { - $task->fetch($key); - $task->progress = GETPOST($key . 'progress', 'int'); - $task->timespent_duration = $val; - $task->timespent_fk_user = $user->id; - if (GETPOST($key."hour") != '' && GETPOST($key."hour") >= 0) // If hour was entered - { - $task->timespent_date = dol_mktime(GETPOST($key."hour"),GETPOST($key."min"),0,GETPOST($key."month"),GETPOST($key."day"),GETPOST($key."year")); - $task->timespent_withhour = 1; - } - else - { - $task->timespent_date = dol_mktime(12,0,0,GETPOST($key."month"),GETPOST($key."day"),GETPOST($key."year")); - } - - $result=$task->addTimeSpent($user); - if ($result < 0) - { - setEventMessages($task->error, $task->errors, 'errors'); - $error++; - break; - } - } - - if (! $error) - { - setEventMessage($langs->trans("RecordSaved")); - - // Redirect to avoid submit twice on back - header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'')); - exit; - } - } - else - { - setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors'); - } } @@ -127,6 +75,7 @@ if ($action == 'addtime' && $user->rights->projet->creer) */ $form=new Form($db); +$formother=new FormOther($db); $projectstatic=new Project($db); $project = new Project($db); $taskstatic = new Task($db); @@ -134,8 +83,9 @@ $taskstatic = new Task($db); $title=$langs->trans("TimeSpent"); if ($mine) $title=$langs->trans("MyTimeSpent"); -$usertoprocess = $user; +$usertoprocess=$user; +//$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); $projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess,0,1); // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project if ($id) @@ -153,18 +103,53 @@ $tasksrole=$taskstatic->getUserRolesForProjectsOrTasks(0,$usertoprocess,($projec //var_dump($taskrole); -llxHeader("",$title,""); +llxHeader("",$title,"",'','','',array('/core/js/timesheet.js')); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num); -print '
'; +$startdayarray=dol_get_first_day_week($day, $month, $year); + +$prev = $startdayarray; +$prev_year = $prev['prev_year']; +$prev_month = $prev['prev_month']; +$prev_day = $prev['prev_day']; +$first_day = $prev['first_day']; +$first_month= $prev['first_month']; +$first_year = $prev['first_year']; +$week = $prev['week']; + +$day = (int) $day; +$next = dol_get_next_week($first_day, $week, $first_month, $first_year); +$next_year = $next['year']; +$next_month = $next['month']; +$next_day = $next['day']; + +// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1) +$firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year); +$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd'); + +$tmpday = $first_day; + +// Show navigation bar +$nav ="".img_previous($langs->trans("Previous"))."\n"; +$nav.=" ".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week; +$nav.=" \n"; +$nav.="".img_next($langs->trans("Next"))."\n"; +$nav.="   (".$langs->trans("Today").")"; +$picto='calendarweek'; + + +print ''; print ''; print ''; print ''; +print ''; +print ''; +print ''; $head=project_timesheet_prepare_head($mode); -dol_fiche_head($head, 'inputpertime', '', 0, 'task'); +dol_fiche_head($head, 'inputperweek', '', 0, 'task'); // Show description of content if ($mine) print $langs->trans("MyTasksDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'

'; @@ -173,7 +158,7 @@ else if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'

'; else print $langs->trans("ProjectsPublicTaskDesc").($onlyopened?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'

'; } - +print "\n"; // Filter on user /* dol_fiche_head(''); @@ -195,6 +180,10 @@ else dol_fiche_end(); */ + +print '
'.$nav.'
'; + + print ''; print ''; print ''; @@ -205,8 +194,14 @@ print ''; print ''; if ($usertoprocess->id == $user->id) print ''; else print ''; -print ''; -print ''; + +$startday=dol_mktime(12, 0, 0, $startdayarray['first_month'], $startdayarray['first_day'], $startdayarray['first_year']); + +for($i=0;$i<7;$i++) +{ + print ''; +} + print "\n"; // By default, we can edit only tasks we are assigned to @@ -215,7 +210,18 @@ $restricteditformytask=(empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJEC if (count($tasksarray) > 0) { $j=0; - projectLinesPerTime($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); + projectLinesPerDay($j, $firstdaytoshow, $usertoprocess, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); + + print ' + + + + + + + + + '; } else { @@ -223,9 +229,30 @@ else } print "
'.$langs->trans("Project").''.$langs->trans("ProgressDeclared").''.$langs->trans("TimeSpent").''.$langs->trans("TimeSpentByYou").''.$langs->trans("TimeSpentByUser").''.$langs->trans("DateAndHour").''.$langs->trans("Duration").''.dol_print_date($startday + ($i * 3600 * 24), '%a').'
'.dol_print_date($startday + ($i * 3600 * 24), 'day').'
'.$langs->trans("Total").'
 
 
 
 
 
 
 
"; +print ''."\n"; +print ''."\n"; + dol_fiche_end(); -print '
'; +print '
'; +print ''; +print '
'; + +print ''."\n\n"; + +$modeinput='hours'; + +print ''; llxFooter(); diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 21293fac121..681abb411ce 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -63,6 +63,9 @@ class Project extends CommonObject var $oldcopy; + var $weekWorkLoad; // Used to store workload details of a projet + var $weekWorkLoadPerTask; // Used to store workload details of tasks of a projet + /** * Constructor @@ -1442,23 +1445,29 @@ class Project extends CommonObject /** - * load time spent into this->weekWorkLoad for all day of a week and task id + * Load time spent into this->weekWorkLoad and this->weekWorkLoadPerTask for all day of a week of project * * @param int $datestart First day of week (use dol_get_first_day to find this date) - * @param int $taskid Task id - * @param int $userid Time consumed per a particular user + * @param int $taskid Filter on a task id + * @param int $userid Time spent by a particular user * @return int <0 if OK, >0 if KO */ - public function loadTimeSpent($datestart,$taskid,$userid=0) + public function loadTimeSpent($datestart,$taskid=0,$userid=0) { $error=0; - $sql = "SELECT ptt.rowid, ptt.task_duration, ptt.task_date"; - $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt"; - $sql.= " WHERE ptt.fk_task='".$taskid."'"; - $sql.= " AND ptt.fk_user='".$userid."'"; - $sql .= "AND (ptt.task_date >= '".$this->db->idate($datestart)."' "; - $sql .= "AND (ptt.task_date < '".$this->db->idate($datestart + 7 * 24 * 3600)."' "; + if (empty($datestart)) dol_print_error('','Error datestart parameter is empty'); + + $sql = "SELECT ptt.rowid as taskid, ptt.task_duration, ptt.task_date, ptt.fk_task"; + $sql.= " FROM ".MAIN_DB_PREFIX."projet_task_time AS ptt, ".MAIN_DB_PREFIX."projet_task as pt"; + $sql.= " WHERE ptt.fk_task = pt.rowid"; + $sql.= " AND pt.fk_projet = ".$this->id; + $sql.= " AND (ptt.task_date >= '".$this->db->idate($datestart)."' "; + $sql.= " AND ptt.task_date <= '".$this->db->idate($datestart + (7 * 24 * 3600) - 1)."')"; + if ($task_id) $sql.= " AND ptt.fk_task=".$taskid; + if (is_numeric($userid)) $sql.= " AND ptt.fk_user=".$userid; + + //print $sql; $resql=$this->db->query($sql); if ($resql) { @@ -1470,10 +1479,8 @@ class Project extends CommonObject { $obj=$this->db->fetch_object($resql); $day=$this->db->jdate($obj->task_date); - //$day=(intval(date('w',strtotime($obj->task_date)))+1)%6; - // if several tasktime in one day then only the last is used $this->weekWorkLoad[$day] += $obj->task_duration; - $this->taskTimeId[$day]= ($obj->rowid)?($obj->rowid):0; + $this->weekWorkLoadPerTask[$day][$obj->fk_task] += $obj->task_duration; $i++; } $this->db->free($resql); diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 84888484d2c..5e02efe6463 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -287,7 +287,7 @@ class Task extends CommonObject $sql.= " label=".(isset($this->label)?"'".$this->db->escape($this->label)."'":"null").","; $sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").","; $sql.= " duration_effective=".(isset($this->duration_effective)?$this->duration_effective:"null").","; - $sql.= " planned_workload=".(isset($this->planned_workload)?$this->planned_workload:"0").","; + $sql.= " planned_workload=".((isset($this->planned_workload) && $this->planned_workload != '')?$this->planned_workload:"null").","; $sql.= " dateo=".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null').","; $sql.= " datee=".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null').","; $sql.= " progress=".$this->progress.","; @@ -497,8 +497,8 @@ class Task extends CommonObject * Return clicable name (with picto eventually) * * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto - * @param int $option Sur quoi pointe le lien - * @param int $mode Mode 'task', 'time', 'contact', 'note', document' define page to link to. + * @param string $option 'withproject' or '' + * @param string $mode Mode 'task', 'time', 'contact', 'note', document' define page to link to. * @return string Chaine avec URL */ function getNomUrl($withpicto=0,$option='',$mode='task') diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php index b6c35b2d73c..8dd7bac68d8 100644 --- a/htdocs/projet/tasks/task.php +++ b/htdocs/projet/tasks/task.php @@ -1,6 +1,6 @@ - * Copyright (C) 2006-2014 Laurent Destailleur + * Copyright (C) 2006-2015 Laurent Destailleur * Copyright (C) 2010-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -42,7 +42,7 @@ $action=GETPOST('action','alpha'); $confirm=GETPOST('confirm','alpha'); $withproject=GETPOST('withproject','int'); $project_ref=GETPOST('project_ref','alpha'); -$planned_workload=GETPOST('planned_workloadhour')*3600+GETPOST('planned_workloadmin')*60; +$planned_workload=((GETPOST('planned_workloadhour')!='' && GETPOST('planned_workloadmin')!='')?GETPOST('planned_workloadhour')*3600+GETPOST('planned_workloadmin')*60:''); // Security check $socid=0; @@ -457,7 +457,7 @@ if ($id > 0 || ! empty($ref)) if ($object->planned_workload != '') { $tmparray=$object->getSummaryOfTimeSpent(); - if ($tmparray['total_duration'] > 0) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %'; + if ($tmparray['total_duration'] > 0 && ! empty($object->planned_workload)) print round($tmparray['total_duration'] / $object->planned_workload * 100, 2).' %'; else print '0 %'; } else print ''; From 840b04746820d0732efea6749139f2775d35da99 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Mar 2015 11:20:08 +0100 Subject: [PATCH 122/412] Work on new timesheet input pages. --- htdocs/core/lib/project.lib.php | 22 +++++----------------- htdocs/projet/activity/perday.php | 8 +++++++- htdocs/projet/activity/perweek.php | 2 +- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index d353fea2af0..938130a5936 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -506,17 +506,11 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t * @param int $restricteditformytask 0=No restriction, 1=Enable add time only if task is a task i am affected to * @return $inc */ -function projectLinesPerTime(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0) +function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0) { global $db, $user, $bc, $langs; global $form, $formother, $projectstatic, $taskstatic; - if (! is_object($formother)) - { - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; - $formother = new FormOther($db); - } - $lastprojectid=0; $var=true; @@ -625,7 +619,7 @@ function projectLinesPerTime(&$inc, $parent, $lines, &$level, &$projectsrole, &$ print ''; //$s.='   '; $s=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1); - $s.=' '; + //$s.=' '; print $s; print ''; @@ -639,7 +633,7 @@ function projectLinesPerTime(&$inc, $parent, $lines, &$level, &$projectsrole, &$ $inc++; $level++; - if ($lines[$i]->id) projectLinesPerTime($inc, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); + if ($lines[$i]->id) projectLinesPerDay($inc, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); $level--; } else @@ -668,17 +662,11 @@ function projectLinesPerTime(&$inc, $parent, $lines, &$level, &$projectsrole, &$ * @param int $restricteditformytask 0=No restriction, 1=Enable add time only if task is a task i am affected to * @return $inc */ -function projectLinesPerDay(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0) +function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0) { global $db, $user, $bc, $langs; global $form, $formother, $projectstatic, $taskstatic; - if (! is_object($formother)) - { - require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; - $formother = new FormOther($db); - } - $lastprojectid=0; $var=true; @@ -805,7 +793,7 @@ function projectLinesPerDay(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$l $inc++; $level++; - if ($lines[$i]->id) projectLinesPerDay($inc, $firstdaytoshow, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); + if ($lines[$i]->id) projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); $level--; } else diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 5dc873cfccc..9c55874a762 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load('projects'); @@ -127,6 +128,7 @@ if ($action == 'addtime' && $user->rights->projet->creer) */ $form=new Form($db); +$formother = new FormOther($db); $projectstatic=new Project($db); $project = new Project($db); $taskstatic = new Task($db); @@ -215,7 +217,7 @@ $restricteditformytask=(empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJEC if (count($tasksarray) > 0) { $j=0; - projectLinesPerTime($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); + projectLinesPerDay($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); } else { @@ -225,6 +227,10 @@ print ""; dol_fiche_end(); +print '
'; +print ''; +print '
'; + print ''; diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index 8a9adc04f17..548210abf7f 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -210,7 +210,7 @@ $restricteditformytask=(empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJEC if (count($tasksarray) > 0) { $j=0; - projectLinesPerDay($j, $firstdaytoshow, $usertoprocess, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); + projectLinesPerWeek($j, $firstdaytoshow, $usertoprocess, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); print ' '.$langs->trans("Total").' From 426835781a68fedd05f06cb8a2a8bececcd4e7dc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Mar 2015 12:03:47 +0100 Subject: [PATCH 123/412] Fix hook usage --- htdocs/fourn/list.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php index 4c16f3a1d61..2bf4b616414 100644 --- a/htdocs/fourn/list.php +++ b/htdocs/fourn/list.php @@ -104,7 +104,7 @@ if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.f foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key; // Add fields from hooks $parameters=array(); -$hookmanager->executeHooks('printFieldListSelect',$parameters); // Note that $action and $object may have been modified by hook +$result=$hookmanager->executeHooks('printFieldListSelect',$parameters); // Note that $action and $object may have been modified by hook $sql.=$hookmanager->resPrint; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as ef ON ef.fk_object = s.rowid"; @@ -136,7 +136,8 @@ if ($search_categ > 0) $sql.= " AND cf.fk_categorie = ".$search_categ; if ($search_categ == -2) $sql.= " AND cf.fk_categorie IS NULL"; // Add where from hooks $parameters=array(); -$sql.=$hookmanager->executeHooks('printFieldListWhere',$parameters); // Note that $action and $object may have been modified by hook +$result=$hookmanager->executeHooks('printFieldListWhere',$parameters); // Note that $action and $object may have been modified by hook +$sql.=$hookmanager->resPrint; // Count total nb of records $nbtotalofrecords = 0; if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) From dd82ad69fe6cae2bbf5294194d60024a212a5996 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Mar 2015 12:30:49 +0100 Subject: [PATCH 124/412] printLeftBlock is now compliant with hook development rules. It is an "addreplace" hook so you must return content by doing ->resprints='mycontent' and not by doing return 'mycontent' --- ChangeLog | 3 ++- htdocs/main.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60521f04c81..e499c5b4e1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,7 +31,8 @@ WARNING: Following changes may create regression for some external modules, but Dolibarr better: - Removed hoo supplierorderdao into supplier order creation. This is a business event, so we must use the trigger ORDER_SUPPLIER_CREATE instead. - +- printLeftBlock is now compliant with hook development rules. It is an "addreplace" hook so you must +return content by doing ->resprints='mycontent' and not by doing return 'mycontent' ***** ChangeLog for 3.7 compared to 3.6.* ***** diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 1855ff9b42e..edf86c52853 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1686,8 +1686,8 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me // Execute hook printLeftBlock $parameters=array(); - $leftblock=$hookmanager->executeHooks('printLeftBlock',$parameters); // Note that $action and $object may have been modified by some hooks - print $leftblock; + $reshook=$hookmanager->executeHooks('printLeftBlock',$parameters); // Note that $action and $object may have been modified by some hooks + print $hookmanager->resPrint; if (empty($conf->dol_use_jmobile) && ! empty($conf->use_javascript_ajax) && ! empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT)) print '
'."\n"; else print '
'; // End div id="id-left" From 7ef11b2f38a09e1a920b55496065dc4e1f56ad96 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Mar 2015 13:16:59 +0100 Subject: [PATCH 125/412] Fix selected attribute not set correctly --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 6d83561e2a9..c909df601f8 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4303,7 +4303,7 @@ class Form } else { - $selected=($useempty?'':' selected="selected"'); + $selected=(($useempty && $value != '0' && $value != 'no')?'':' selected="selected"'); $resultyesno .= ''."\n"; $resultyesno .= ''."\n"; } From d5afa1b29f040349eb1b27382ee0e8fa5be4d4d3 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Wed, 18 Mar 2015 13:23:14 +0100 Subject: [PATCH 126/412] Update extrafields.class.php Link object : include only if something to display --- htdocs/core/class/extrafields.class.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 361c14319eb..a1ac0d5b6e3 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1054,6 +1054,7 @@ class ExtraFields elseif ($type == 'link') { $out=''; + $param_list=array_keys($param['options']); // 0 : ObjectName // 1 : classPath @@ -1292,14 +1293,15 @@ class ExtraFields elseif ($type == 'link') { $out=''; - $param_list=array_keys($params['options']); - // 0 : ObjectName - // 1 : classPath - $InfoFieldList = explode(":", $param_list[0]); - dol_include_once($InfoFieldList[1]); - $object = new $InfoFieldList[0]($this->db); + // only if something to display (perf) if ($value) { + $param_list=array_keys($params['options']); + // 0 : ObjectName + // 1 : classPath + $InfoFieldList = explode(":", $param_list[0]); + dol_include_once($InfoFieldList[1]); + $object = new $InfoFieldList[0]($this->db); $object->fetch($value); $value=$object->getNomUrl(3); } From bbef07ef3d212e9712115ff6e5b1da03697ec23c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Mar 2015 14:08:37 +0100 Subject: [PATCH 127/412] Finished prototype to use hook to add a column by a module. --- htdocs/comm/prospect/list.php | 3 ++- htdocs/fourn/list.php | 30 +++++++++++++++++------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index 999c212a80d..b2202a21b88 100644 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -399,7 +399,8 @@ if ($resql) print "\n"; $parameters=array(); - $formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook + $reshook=$hookmanager->executeHooks('printFieldListSearch',$parameters); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; print "\n"; diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php index 2bf4b616414..77202f989fe 100644 --- a/htdocs/fourn/list.php +++ b/htdocs/fourn/list.php @@ -101,7 +101,7 @@ $sql = "SELECT s.rowid as socid, s.nom as name, s.zip, s.town, s.datec, st.libel $sql.= "code_fournisseur, code_compta_fournisseur"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user "; // Add fields for extrafields -foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key; +foreach ($extrafields->attribute_list as $key => $val) $sql.=",ef.".$key.' as options_'.$key; // Add fields from hooks $parameters=array(); $result=$hookmanager->executeHooks('printFieldListSelect',$parameters); // Note that $action and $object may have been modified by hook @@ -187,11 +187,12 @@ if ($resql) print_liste_field_titre($langs->trans("SupplierCode"),$_SERVER["PHP_SELF"],"s.code_fournisseur","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("AccountancyCode"),$_SERVER["PHP_SELF"],"s.code_compta_fournisseur","",$param,'align="left"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateCreation"),$_SERVER["PHP_SELF"],"s.datec","",$param,'align="right"',$sortfield,$sortorder); + + $parameters=array(); + $reshook=$hookmanager->executeHooks('printFieldListTitle',$parameters); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$param,'align="right"',$sortfield,$sortorder); - - $parameters=array(); - $formconfirm=$hookmanager->executeHooks('printFieldListTitle',$parameters); // Note that $action and $object may have been modified by hook - print "\n"; print ''; @@ -214,13 +215,14 @@ if ($resql) print ''; print ''; + $parameters=array(); + $reshook=$hookmanager->executeHooks('printFieldListSearch',$parameters); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + print ''; print ''; print "\n"; - $parameters=array(); - $formconfirm=$hookmanager->executeHooks('printFieldListOption',$parameters); // Note that $action and $object may have been modified by hook - print ''; $var=True; @@ -242,12 +244,13 @@ if ($resql) print ''.$obj->town.''."\n"; print ''.$obj->code_fournisseur.' '; print ''.$obj->code_compta_fournisseur.' '; - print ''; - print dol_print_date($db->jdate($obj->datec),'day').''; - print ''.$thirdpartystatic->getLibStatut(3).''; + print ''.dol_print_date($db->jdate($obj->datec),'day').''; $parameters=array('obj' => $obj); - $formconfirm=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook + $reshook=$hookmanager->executeHooks('printFieldListValue',$parameters); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; + + print ''.$thirdpartystatic->getLibStatut(3).''; print "\n"; $i++; @@ -257,7 +260,8 @@ if ($resql) $db->free($resql); $parameters=array('sql' => $sql); - $formconfirm=$hookmanager->executeHooks('printFieldListFooter',$parameters); // Note that $action and $object may have been modified by hook + $reshook=$hookmanager->executeHooks('printFieldListFooter',$parameters); // Note that $action and $object may have been modified by hook + print $hookmanager->resPrint; } else { From 2c61717e1076d8995dd0e9cf04b9b6c2c5d1b3dd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Mar 2015 14:19:17 +0100 Subject: [PATCH 128/412] Fix sql syntax error --- htdocs/core/class/extrafields.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 361c14319eb..c821f6a1f34 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -530,7 +530,7 @@ class ExtraFields $sql.= " ".($perms?"'".$this->db->escape($perms)."'":"null").","; $sql.= " '".$pos."',"; $sql.= " '".$alwayseditable."',"; - $sql.= " '".$param."'"; + $sql.= " '".$param."',"; $sql.= " ".$list; $sql.= ")"; dol_syslog(get_class($this)."::update_label", LOG_DEBUG); @@ -1062,7 +1062,7 @@ class ExtraFields $object = new $InfoFieldList[0]($this->db); $object->fetch($value); $out=''; - + } /* Add comments if ($type == 'date') $out.=' (YYYY-MM-DD)'; From cd2fc2f89096d05bc5cc0c4eddf9a01e8301f2da Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Mar 2015 14:31:37 +0100 Subject: [PATCH 129/412] Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook development rules. They are "addreplace" hooks, so you must return content with"->resprints='mycontent'" and not with "return 'mycontent'" --- ChangeLog | 4 ++-- htdocs/comm/askpricesupplier/card.php | 6 +++--- htdocs/comm/propal.php | 6 +++--- htdocs/commande/card.php | 21 +++++++++++---------- htdocs/compta/facture.php | 15 ++++++++------- htdocs/fichinter/card.php | 4 +++- htdocs/fourn/commande/card.php | 4 +++- htdocs/fourn/facture/card.php | 4 +++- 8 files changed, 36 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index e499c5b4e1c..b641ebf3ddb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,8 +31,8 @@ WARNING: Following changes may create regression for some external modules, but Dolibarr better: - Removed hoo supplierorderdao into supplier order creation. This is a business event, so we must use the trigger ORDER_SUPPLIER_CREATE instead. -- printLeftBlock is now compliant with hook development rules. It is an "addreplace" hook so you must -return content by doing ->resprints='mycontent' and not by doing return 'mycontent' +- Hooks 'printLeftBlock' and 'formConfirm' are now compliant with hook development rules. They are + "addreplace" hooks, so you must return content with "->resprints='mycontent'" and not with "return 'mycontent'" ***** ChangeLog for 3.7 compared to 3.6.* ***** diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php index f2ca52f1f89..cbd0436e2ef 100644 --- a/htdocs/comm/askpricesupplier/card.php +++ b/htdocs/comm/askpricesupplier/card.php @@ -1346,9 +1346,9 @@ if ($action == 'create') if (! $formconfirm) { $parameters = array('lineid' => $lineid); - $formconfirm = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified - // by - // hook + $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + if (empty($reshook)) $formconfirm.=$hookmanager->resPrint; + elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint; } // Print form confirm diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index de68313e6f8..c9d5170f7e6 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1680,9 +1680,9 @@ if ($action == 'create') if (! $formconfirm) { $parameters = array('lineid' => $lineid); - $formconfirm = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified - // by - // hook + $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + if (empty($reshook)) $formconfirm.=$hookmanager->resPrint; + elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint; } // Print form confirm diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index bef752f5954..aa72ec9bf68 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -253,7 +253,7 @@ if (empty($reshook)) $object->contactid = GETPOST('contactid'); $object->fk_incoterms = GETPOST('incoterm_id', 'int'); $object->location_incoterms = GETPOST('location_incoterms', 'alpha'); - + // If creation from another object of another module (Example: origin=propal, originid=1) if (! empty($origin) && ! empty($originid)) { @@ -523,7 +523,7 @@ if (empty($reshook)) { $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha')); } - + // bank account else if ($action == 'setbankaccount' && $user->rights->commande->creer) { $result=$object->setBankAccount(GETPOST('fk_account', 'int')); @@ -1726,8 +1726,9 @@ if ($action == 'create' && $user->rights->commande->creer) if (! $formconfirm) { $parameters = array('lineid' => $lineid); - $formconfirm = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified - // by hook + $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + if (empty($reshook)) $formconfirm.=$hookmanager->resPrint; + elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint; } // Print form confirm @@ -1988,10 +1989,10 @@ if ($action == 'create' && $user->rights->commande->creer) print ''; print ''; } - + // Incoterms if (!empty($conf->incoterm->enabled)) - { + { print ''; print ''; } - + // Other attributes $cols = 3; include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; @@ -2243,10 +2244,10 @@ if ($action == 'create' && $user->rights->commande->creer) } // Cancel order - if ($object->statut == 1 && + if ($object->statut == 1 && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->cloturer)) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->commande->order_advance->annuler))) - ) + ) { print '
' . $langs->trans('Cancel') . '
'; } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index d38519bf6d5..f87f797509b 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -324,7 +324,7 @@ if (empty($reshook)) { $result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha')); } - + // bank account else if ($action == 'setbankaccount' && $user->rights->facture->creer) { @@ -2289,7 +2289,7 @@ if ($action == 'create') print $form->select_incoterms((!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : ''), (!empty($objectsrc->location_incoterms)?$objectsrc->location_incoterms:'')); print ''; } - + // Other attributes $parameters = array('objectsrc' => $objectsrc,'colspan' => ' colspan="3"'); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by @@ -2749,8 +2749,9 @@ if ($action == 'create') if (! $formconfirm) { $parameters = array('lineid' => $lineid); - $formconfirm = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by - // hook + $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + if (empty($reshook)) $formconfirm.=$hookmanager->resPrint; + elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint; } // Print form confirm @@ -3389,10 +3390,10 @@ if ($action == 'create') print ''; print ''; } - + // Incoterms if (!empty($conf->incoterm->enabled)) - { + { print '
'; print $langs->trans('IncotermLabel'); @@ -2005,13 +2006,13 @@ if ($action == 'create' && $user->rights->commande->creer) { print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1); } - else + else { print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id); } print '
'; print '
'; print $langs->trans('IncotermLabel'); @@ -3406,7 +3407,7 @@ if ($action == 'create') { print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1); } - else + else { print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id); } diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php index 661ffc9af30..9eb9b243830 100644 --- a/htdocs/fichinter/card.php +++ b/htdocs/fichinter/card.php @@ -1210,7 +1210,9 @@ else if ($id > 0 || ! empty($ref)) if (!$formconfirm) { $parameters=array('lineid'=>$lineid); - $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + if (empty($reshook)) $formconfirm.=$hookmanager->resPrint; + elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint; } // Print form confirm diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 41d06bebf43..3f6877d8d14 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1733,7 +1733,9 @@ elseif (! empty($object->id)) if (!$formconfirm) { $parameters=array('lineid'=>$lineid); - $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + if (empty($reshook)) $formconfirm.=$hookmanager->resPrint; + elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint; } // Print form confirm diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 1a37baa9937..cd6a9f64abd 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1716,7 +1716,9 @@ else if (!$formconfirm) { $parameters=array('lineid'=>$lineid); - $formconfirm=$hookmanager->executeHooks('formConfirm',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + $reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook + if (empty($reshook)) $formconfirm.=$hookmanager->resPrint; + elseif ($reshook > 0) $formconfirm=$hookmanager->resPrint; } // Print form confirm From b0b88be81fdbe9b55db48fdfed51da70ddef806b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Mar 2015 15:27:27 +0100 Subject: [PATCH 130/412] Sync transifex --- .tx/config | 6 + htdocs/core/lib/project.lib.php | 4 +- htdocs/langs/ar_SA/bills.lang | 5 +- htdocs/langs/ar_SA/incoterm.lang | 7 + htdocs/langs/ar_SA/printing.lang | 74 ++ htdocs/langs/ar_SA/projects.lang | 8 +- htdocs/langs/bg_BG/bills.lang | 5 +- htdocs/langs/bg_BG/incoterm.lang | 7 + htdocs/langs/bg_BG/printing.lang | 74 ++ htdocs/langs/bg_BG/projects.lang | 8 +- htdocs/langs/bn_BD/accountancy.lang | 160 +++ htdocs/langs/bn_BD/admin.lang | 1603 +++++++++++++++++++++++++ htdocs/langs/bn_BD/agenda.lang | 93 ++ htdocs/langs/bn_BD/banks.lang | 165 +++ htdocs/langs/bn_BD/bills.lang | 431 +++++++ htdocs/langs/bn_BD/bookmarks.lang | 19 + htdocs/langs/bn_BD/boxes.lang | 96 ++ htdocs/langs/bn_BD/cashdesk.lang | 40 + htdocs/langs/bn_BD/categories.lang | 112 ++ htdocs/langs/bn_BD/commercial.lang | 96 ++ htdocs/langs/bn_BD/companies.lang | 414 +++++++ htdocs/langs/bn_BD/compta.lang | 207 ++++ htdocs/langs/bn_BD/contracts.lang | 103 ++ htdocs/langs/bn_BD/cron.lang | 87 ++ htdocs/langs/bn_BD/deliveries.lang | 28 + htdocs/langs/bn_BD/dict.lang | 327 +++++ htdocs/langs/bn_BD/donations.lang | 38 + htdocs/langs/bn_BD/ecm.lang | 57 + htdocs/langs/bn_BD/errors.lang | 183 +++ htdocs/langs/bn_BD/exports.lang | 134 +++ htdocs/langs/bn_BD/externalsite.lang | 5 + htdocs/langs/bn_BD/ftp.lang | 12 + htdocs/langs/bn_BD/help.lang | 28 + htdocs/langs/bn_BD/holiday.lang | 148 +++ htdocs/langs/bn_BD/incoterm.lang | 7 + htdocs/langs/bn_BD/install.lang | 214 ++++ htdocs/langs/bn_BD/interventions.lang | 53 + htdocs/langs/bn_BD/languages.lang | 72 ++ htdocs/langs/bn_BD/ldap.lang | 29 + htdocs/langs/bn_BD/link.lang | 8 + htdocs/langs/bn_BD/mailmanspip.lang | 27 + htdocs/langs/bn_BD/mails.lang | 141 +++ htdocs/langs/bn_BD/main.lang | 725 +++++++++++ htdocs/langs/bn_BD/margins.lang | 45 + htdocs/langs/bn_BD/members.lang | 206 ++++ htdocs/langs/bn_BD/opensurvey.lang | 66 + htdocs/langs/bn_BD/orders.lang | 166 +++ htdocs/langs/bn_BD/other.lang | 238 ++++ htdocs/langs/bn_BD/paybox.lang | 40 + htdocs/langs/bn_BD/paypal.lang | 25 + htdocs/langs/bn_BD/printing.lang | 74 ++ htdocs/langs/bn_BD/productbatch.lang | 21 + htdocs/langs/bn_BD/products.lang | 256 ++++ htdocs/langs/bn_BD/projects.lang | 144 +++ htdocs/langs/bn_BD/propal.lang | 100 ++ htdocs/langs/bn_BD/resource.lang | 34 + htdocs/langs/bn_BD/salaries.lang | 13 + htdocs/langs/bn_BD/sendings.lang | 85 ++ htdocs/langs/bn_BD/sms.lang | 53 + htdocs/langs/bn_BD/stocks.lang | 134 +++ htdocs/langs/bn_BD/suppliers.lang | 45 + htdocs/langs/bn_BD/trips.lang | 126 ++ htdocs/langs/bn_BD/users.lang | 122 ++ htdocs/langs/bn_BD/withdrawals.lang | 97 ++ htdocs/langs/bn_BD/workflow.lang | 11 + htdocs/langs/bs_BA/bills.lang | 5 +- htdocs/langs/bs_BA/incoterm.lang | 7 + htdocs/langs/bs_BA/printing.lang | 74 ++ htdocs/langs/bs_BA/projects.lang | 8 +- htdocs/langs/ca_ES/bills.lang | 5 +- htdocs/langs/ca_ES/incoterm.lang | 7 + htdocs/langs/ca_ES/printing.lang | 74 ++ htdocs/langs/ca_ES/projects.lang | 8 +- htdocs/langs/cs_CZ/bills.lang | 5 +- htdocs/langs/cs_CZ/incoterm.lang | 7 + htdocs/langs/cs_CZ/printing.lang | 74 ++ htdocs/langs/cs_CZ/projects.lang | 8 +- htdocs/langs/da_DK/bills.lang | 5 +- htdocs/langs/da_DK/incoterm.lang | 7 + htdocs/langs/da_DK/printing.lang | 74 ++ htdocs/langs/da_DK/projects.lang | 8 +- htdocs/langs/de_DE/bills.lang | 5 +- htdocs/langs/de_DE/incoterm.lang | 7 + htdocs/langs/de_DE/printing.lang | 74 ++ htdocs/langs/de_DE/projects.lang | 8 +- htdocs/langs/el_GR/bills.lang | 5 +- htdocs/langs/el_GR/incoterm.lang | 7 + htdocs/langs/el_GR/printing.lang | 74 ++ htdocs/langs/el_GR/projects.lang | 8 +- htdocs/langs/en_AU/main.lang | 1 + htdocs/langs/en_CA/main.lang | 1 + htdocs/langs/en_GB/bills.lang | 24 - htdocs/langs/en_GB/commercial.lang | 2 - htdocs/langs/en_GB/cron.lang | 3 - htdocs/langs/en_GB/main.lang | 1 + htdocs/langs/en_GB/orders.lang | 3 - htdocs/langs/en_GB/suppliers.lang | 2 - htdocs/langs/en_GB/trips.lang | 14 - htdocs/langs/en_IN/main.lang | 1 + htdocs/langs/en_NZ/main.lang | 1 + htdocs/langs/en_SA/main.lang | 1 + htdocs/langs/en_US/incoterm.lang | 7 + htdocs/langs/en_US/products.lang | 0 htdocs/langs/en_ZA/main.lang | 1 + htdocs/langs/es_AR/bills.lang | 21 - htdocs/langs/es_AR/cron.lang | 3 - htdocs/langs/es_AR/orders.lang | 3 - htdocs/langs/es_AR/trips.lang | 13 - htdocs/langs/es_CO/admin.lang | 1 - htdocs/langs/es_CO/bills.lang | 2 - htdocs/langs/es_CO/cron.lang | 3 - htdocs/langs/es_CO/externalsite.lang | 2 + htdocs/langs/es_CO/main.lang | 53 +- htdocs/langs/es_CO/orders.lang | 3 - htdocs/langs/es_CO/salaries.lang | 6 + htdocs/langs/es_CO/trips.lang | 13 - htdocs/langs/es_ES/bills.lang | 5 +- htdocs/langs/es_ES/incoterm.lang | 7 + htdocs/langs/es_ES/printing.lang | 74 ++ htdocs/langs/es_ES/projects.lang | 8 +- htdocs/langs/et_EE/bills.lang | 5 +- htdocs/langs/et_EE/incoterm.lang | 7 + htdocs/langs/et_EE/printing.lang | 74 ++ htdocs/langs/et_EE/projects.lang | 8 +- htdocs/langs/eu_ES/bills.lang | 5 +- htdocs/langs/eu_ES/incoterm.lang | 7 + htdocs/langs/eu_ES/printing.lang | 74 ++ htdocs/langs/eu_ES/projects.lang | 8 +- htdocs/langs/fa_IR/bills.lang | 5 +- htdocs/langs/fa_IR/boxes.lang | 49 +- htdocs/langs/fa_IR/categories.lang | 4 +- htdocs/langs/fa_IR/deliveries.lang | 4 +- htdocs/langs/fa_IR/incoterm.lang | 7 + htdocs/langs/fa_IR/printing.lang | 74 ++ htdocs/langs/fa_IR/projects.lang | 8 +- htdocs/langs/fi_FI/bills.lang | 5 +- htdocs/langs/fi_FI/incoterm.lang | 7 + htdocs/langs/fi_FI/printing.lang | 74 ++ htdocs/langs/fi_FI/projects.lang | 8 +- htdocs/langs/fr_FR/bills.lang | 5 +- htdocs/langs/fr_FR/incoterm.lang | 2 +- htdocs/langs/fr_FR/printing.lang | 74 ++ htdocs/langs/fr_FR/projects.lang | 10 +- htdocs/langs/he_IL/bills.lang | 5 +- htdocs/langs/he_IL/incoterm.lang | 7 + htdocs/langs/he_IL/printing.lang | 74 ++ htdocs/langs/he_IL/projects.lang | 8 +- htdocs/langs/hr_HR/bills.lang | 5 +- htdocs/langs/hr_HR/incoterm.lang | 7 + htdocs/langs/hr_HR/printing.lang | 74 ++ htdocs/langs/hr_HR/projects.lang | 8 +- htdocs/langs/hu_HU/bills.lang | 5 +- htdocs/langs/hu_HU/incoterm.lang | 7 + htdocs/langs/hu_HU/printing.lang | 74 ++ htdocs/langs/hu_HU/projects.lang | 8 +- htdocs/langs/id_ID/bills.lang | 5 +- htdocs/langs/id_ID/incoterm.lang | 7 + htdocs/langs/id_ID/printing.lang | 74 ++ htdocs/langs/id_ID/projects.lang | 8 +- htdocs/langs/is_IS/bills.lang | 5 +- htdocs/langs/is_IS/incoterm.lang | 7 + htdocs/langs/is_IS/printing.lang | 74 ++ htdocs/langs/is_IS/projects.lang | 8 +- htdocs/langs/it_IT/bills.lang | 5 +- htdocs/langs/it_IT/incoterm.lang | 7 + htdocs/langs/it_IT/printing.lang | 74 ++ htdocs/langs/it_IT/projects.lang | 8 +- htdocs/langs/ja_JP/bills.lang | 5 +- htdocs/langs/ja_JP/incoterm.lang | 7 + htdocs/langs/ja_JP/printing.lang | 74 ++ htdocs/langs/ja_JP/projects.lang | 8 +- htdocs/langs/ka_GE/bills.lang | 5 +- htdocs/langs/ka_GE/incoterm.lang | 7 + htdocs/langs/ka_GE/printing.lang | 74 ++ htdocs/langs/ka_GE/projects.lang | 8 +- htdocs/langs/kn_IN/bills.lang | 5 +- htdocs/langs/kn_IN/incoterm.lang | 7 + htdocs/langs/kn_IN/printing.lang | 74 ++ htdocs/langs/kn_IN/projects.lang | 8 +- htdocs/langs/ko_KR/bills.lang | 5 +- htdocs/langs/ko_KR/incoterm.lang | 7 + htdocs/langs/ko_KR/printing.lang | 74 ++ htdocs/langs/ko_KR/projects.lang | 8 +- htdocs/langs/lo_LA/bills.lang | 5 +- htdocs/langs/lo_LA/incoterm.lang | 7 + htdocs/langs/lo_LA/printing.lang | 74 ++ htdocs/langs/lo_LA/projects.lang | 8 +- htdocs/langs/lt_LT/bills.lang | 5 +- htdocs/langs/lt_LT/incoterm.lang | 7 + htdocs/langs/lt_LT/printing.lang | 74 ++ htdocs/langs/lt_LT/projects.lang | 8 +- htdocs/langs/lv_LV/admin.lang | 10 +- htdocs/langs/lv_LV/bills.lang | 5 +- htdocs/langs/lv_LV/incoterm.lang | 7 + htdocs/langs/lv_LV/printing.lang | 74 ++ htdocs/langs/lv_LV/projects.lang | 8 +- htdocs/langs/mk_MK/bills.lang | 5 +- htdocs/langs/mk_MK/incoterm.lang | 7 + htdocs/langs/mk_MK/printing.lang | 74 ++ htdocs/langs/mk_MK/projects.lang | 8 +- htdocs/langs/nb_NO/bills.lang | 5 +- htdocs/langs/nb_NO/incoterm.lang | 7 + htdocs/langs/nb_NO/printing.lang | 74 ++ htdocs/langs/nb_NO/projects.lang | 8 +- htdocs/langs/nl_NL/bills.lang | 5 +- htdocs/langs/nl_NL/incoterm.lang | 7 + htdocs/langs/nl_NL/printing.lang | 74 ++ htdocs/langs/nl_NL/projects.lang | 8 +- htdocs/langs/pl_PL/bills.lang | 5 +- htdocs/langs/pl_PL/incoterm.lang | 7 + htdocs/langs/pl_PL/interventions.lang | 32 +- htdocs/langs/pl_PL/mailmanspip.lang | 52 +- htdocs/langs/pl_PL/mails.lang | 66 +- htdocs/langs/pl_PL/printing.lang | 74 ++ htdocs/langs/pl_PL/projects.lang | 8 +- htdocs/langs/pl_PL/workflow.lang | 10 +- htdocs/langs/pt_BR/banks.lang | 2 +- htdocs/langs/pt_BR/bills.lang | 42 +- htdocs/langs/pt_BR/commercial.lang | 1 - htdocs/langs/pt_BR/contracts.lang | 3 + htdocs/langs/pt_BR/cron.lang | 5 +- htdocs/langs/pt_BR/ecm.lang | 2 + htdocs/langs/pt_BR/errors.lang | 19 +- htdocs/langs/pt_BR/exports.lang | 2 +- htdocs/langs/pt_BR/externalsite.lang | 1 + htdocs/langs/pt_BR/interventions.lang | 11 + htdocs/langs/pt_BR/link.lang | 8 + htdocs/langs/pt_BR/margins.lang | 1 + htdocs/langs/pt_BR/printing.lang | 59 + htdocs/langs/pt_BR/products.lang | 20 +- htdocs/langs/pt_BR/projects.lang | 6 +- htdocs/langs/pt_BR/salaries.lang | 4 + htdocs/langs/pt_BR/sendings.lang | 4 - htdocs/langs/pt_BR/stocks.lang | 6 +- htdocs/langs/pt_BR/trips.lang | 12 - htdocs/langs/pt_BR/withdrawals.lang | 3 +- htdocs/langs/pt_BR/workflow.lang | 2 +- htdocs/langs/pt_PT/bills.lang | 5 +- htdocs/langs/pt_PT/incoterm.lang | 7 + htdocs/langs/pt_PT/printing.lang | 74 ++ htdocs/langs/pt_PT/projects.lang | 8 +- htdocs/langs/ro_RO/bills.lang | 5 +- htdocs/langs/ro_RO/incoterm.lang | 7 + htdocs/langs/ro_RO/printing.lang | 74 ++ htdocs/langs/ro_RO/productbatch.lang | 2 +- htdocs/langs/ro_RO/products.lang | 8 +- htdocs/langs/ro_RO/projects.lang | 22 +- htdocs/langs/ro_RO/salaries.lang | 2 +- htdocs/langs/ro_RO/stocks.lang | 4 +- htdocs/langs/ro_RO/trips.lang | 162 +-- htdocs/langs/ru_RU/bills.lang | 5 +- htdocs/langs/ru_RU/incoterm.lang | 7 + htdocs/langs/ru_RU/printing.lang | 74 ++ htdocs/langs/ru_RU/projects.lang | 8 +- htdocs/langs/sk_SK/bills.lang | 5 +- htdocs/langs/sk_SK/incoterm.lang | 7 + htdocs/langs/sk_SK/printing.lang | 74 ++ htdocs/langs/sk_SK/projects.lang | 8 +- htdocs/langs/sl_SI/bills.lang | 5 +- htdocs/langs/sl_SI/incoterm.lang | 7 + htdocs/langs/sl_SI/install.lang | 2 +- htdocs/langs/sl_SI/main.lang | 12 +- htdocs/langs/sl_SI/printing.lang | 74 ++ htdocs/langs/sl_SI/projects.lang | 8 +- htdocs/langs/sq_AL/bills.lang | 5 +- htdocs/langs/sq_AL/incoterm.lang | 7 + htdocs/langs/sq_AL/printing.lang | 74 ++ htdocs/langs/sq_AL/projects.lang | 8 +- htdocs/langs/sv_SE/bills.lang | 5 +- htdocs/langs/sv_SE/incoterm.lang | 7 + htdocs/langs/sv_SE/printing.lang | 74 ++ htdocs/langs/sv_SE/projects.lang | 8 +- htdocs/langs/sw_SW/bills.lang | 5 +- htdocs/langs/sw_SW/projects.lang | 8 +- htdocs/langs/th_TH/bills.lang | 5 +- htdocs/langs/th_TH/incoterm.lang | 7 + htdocs/langs/th_TH/printing.lang | 74 ++ htdocs/langs/th_TH/projects.lang | 8 +- htdocs/langs/tr_TR/agenda.lang | 2 +- htdocs/langs/tr_TR/bills.lang | 5 +- htdocs/langs/tr_TR/incoterm.lang | 7 + htdocs/langs/tr_TR/printing.lang | 74 ++ htdocs/langs/tr_TR/projects.lang | 12 +- htdocs/langs/uk_UA/bills.lang | 5 +- htdocs/langs/uk_UA/incoterm.lang | 7 + htdocs/langs/uk_UA/printing.lang | 74 ++ htdocs/langs/uk_UA/projects.lang | 8 +- htdocs/langs/uz_UZ/bills.lang | 5 +- htdocs/langs/uz_UZ/projects.lang | 8 +- htdocs/langs/vi_VN/bills.lang | 5 +- htdocs/langs/vi_VN/incoterm.lang | 7 + htdocs/langs/vi_VN/printing.lang | 74 ++ htdocs/langs/vi_VN/projects.lang | 8 +- htdocs/langs/zh_CN/bills.lang | 5 +- htdocs/langs/zh_CN/incoterm.lang | 7 + htdocs/langs/zh_CN/printing.lang | 74 ++ htdocs/langs/zh_CN/projects.lang | 8 +- htdocs/langs/zh_TW/bills.lang | 5 +- htdocs/langs/zh_TW/incoterm.lang | 7 + htdocs/langs/zh_TW/printing.lang | 74 ++ htdocs/langs/zh_TW/projects.lang | 8 +- htdocs/projet/activity/perweek.php | 93 +- 302 files changed, 12416 insertions(+), 646 deletions(-) create mode 100644 htdocs/langs/ar_SA/incoterm.lang create mode 100644 htdocs/langs/ar_SA/printing.lang create mode 100644 htdocs/langs/bg_BG/incoterm.lang create mode 100644 htdocs/langs/bg_BG/printing.lang create mode 100644 htdocs/langs/bn_BD/accountancy.lang create mode 100644 htdocs/langs/bn_BD/admin.lang create mode 100644 htdocs/langs/bn_BD/agenda.lang create mode 100644 htdocs/langs/bn_BD/banks.lang create mode 100644 htdocs/langs/bn_BD/bills.lang create mode 100644 htdocs/langs/bn_BD/bookmarks.lang create mode 100644 htdocs/langs/bn_BD/boxes.lang create mode 100644 htdocs/langs/bn_BD/cashdesk.lang create mode 100644 htdocs/langs/bn_BD/categories.lang create mode 100644 htdocs/langs/bn_BD/commercial.lang create mode 100644 htdocs/langs/bn_BD/companies.lang create mode 100644 htdocs/langs/bn_BD/compta.lang create mode 100644 htdocs/langs/bn_BD/contracts.lang create mode 100644 htdocs/langs/bn_BD/cron.lang create mode 100644 htdocs/langs/bn_BD/deliveries.lang create mode 100644 htdocs/langs/bn_BD/dict.lang create mode 100644 htdocs/langs/bn_BD/donations.lang create mode 100644 htdocs/langs/bn_BD/ecm.lang create mode 100644 htdocs/langs/bn_BD/errors.lang create mode 100644 htdocs/langs/bn_BD/exports.lang create mode 100644 htdocs/langs/bn_BD/externalsite.lang create mode 100644 htdocs/langs/bn_BD/ftp.lang create mode 100644 htdocs/langs/bn_BD/help.lang create mode 100644 htdocs/langs/bn_BD/holiday.lang create mode 100644 htdocs/langs/bn_BD/incoterm.lang create mode 100644 htdocs/langs/bn_BD/install.lang create mode 100644 htdocs/langs/bn_BD/interventions.lang create mode 100644 htdocs/langs/bn_BD/languages.lang create mode 100644 htdocs/langs/bn_BD/ldap.lang create mode 100644 htdocs/langs/bn_BD/link.lang create mode 100644 htdocs/langs/bn_BD/mailmanspip.lang create mode 100644 htdocs/langs/bn_BD/mails.lang create mode 100644 htdocs/langs/bn_BD/main.lang create mode 100644 htdocs/langs/bn_BD/margins.lang create mode 100644 htdocs/langs/bn_BD/members.lang create mode 100644 htdocs/langs/bn_BD/opensurvey.lang create mode 100644 htdocs/langs/bn_BD/orders.lang create mode 100644 htdocs/langs/bn_BD/other.lang create mode 100644 htdocs/langs/bn_BD/paybox.lang create mode 100644 htdocs/langs/bn_BD/paypal.lang create mode 100644 htdocs/langs/bn_BD/printing.lang create mode 100644 htdocs/langs/bn_BD/productbatch.lang create mode 100644 htdocs/langs/bn_BD/products.lang create mode 100644 htdocs/langs/bn_BD/projects.lang create mode 100644 htdocs/langs/bn_BD/propal.lang create mode 100644 htdocs/langs/bn_BD/resource.lang create mode 100644 htdocs/langs/bn_BD/salaries.lang create mode 100644 htdocs/langs/bn_BD/sendings.lang create mode 100644 htdocs/langs/bn_BD/sms.lang create mode 100644 htdocs/langs/bn_BD/stocks.lang create mode 100644 htdocs/langs/bn_BD/suppliers.lang create mode 100644 htdocs/langs/bn_BD/trips.lang create mode 100644 htdocs/langs/bn_BD/users.lang create mode 100644 htdocs/langs/bn_BD/withdrawals.lang create mode 100644 htdocs/langs/bn_BD/workflow.lang create mode 100644 htdocs/langs/bs_BA/incoterm.lang create mode 100644 htdocs/langs/bs_BA/printing.lang create mode 100644 htdocs/langs/ca_ES/incoterm.lang create mode 100644 htdocs/langs/ca_ES/printing.lang create mode 100644 htdocs/langs/cs_CZ/incoterm.lang create mode 100644 htdocs/langs/cs_CZ/printing.lang create mode 100644 htdocs/langs/da_DK/incoterm.lang create mode 100644 htdocs/langs/da_DK/printing.lang create mode 100644 htdocs/langs/de_DE/incoterm.lang create mode 100644 htdocs/langs/de_DE/printing.lang create mode 100644 htdocs/langs/el_GR/incoterm.lang create mode 100644 htdocs/langs/el_GR/printing.lang delete mode 100644 htdocs/langs/en_GB/bills.lang delete mode 100644 htdocs/langs/en_GB/commercial.lang delete mode 100644 htdocs/langs/en_GB/cron.lang delete mode 100644 htdocs/langs/en_GB/orders.lang delete mode 100644 htdocs/langs/en_GB/suppliers.lang delete mode 100644 htdocs/langs/en_GB/trips.lang create mode 100644 htdocs/langs/en_US/incoterm.lang mode change 100755 => 100644 htdocs/langs/en_US/products.lang delete mode 100644 htdocs/langs/es_AR/bills.lang delete mode 100644 htdocs/langs/es_AR/cron.lang delete mode 100644 htdocs/langs/es_AR/orders.lang delete mode 100644 htdocs/langs/es_AR/trips.lang delete mode 100644 htdocs/langs/es_CO/bills.lang delete mode 100644 htdocs/langs/es_CO/cron.lang create mode 100644 htdocs/langs/es_CO/externalsite.lang delete mode 100644 htdocs/langs/es_CO/orders.lang create mode 100644 htdocs/langs/es_CO/salaries.lang delete mode 100644 htdocs/langs/es_CO/trips.lang create mode 100644 htdocs/langs/es_ES/incoterm.lang create mode 100644 htdocs/langs/es_ES/printing.lang create mode 100644 htdocs/langs/et_EE/incoterm.lang create mode 100644 htdocs/langs/et_EE/printing.lang create mode 100644 htdocs/langs/eu_ES/incoterm.lang create mode 100644 htdocs/langs/eu_ES/printing.lang create mode 100644 htdocs/langs/fa_IR/incoterm.lang create mode 100644 htdocs/langs/fa_IR/printing.lang create mode 100644 htdocs/langs/fi_FI/incoterm.lang create mode 100644 htdocs/langs/fi_FI/printing.lang create mode 100644 htdocs/langs/fr_FR/printing.lang create mode 100644 htdocs/langs/he_IL/incoterm.lang create mode 100644 htdocs/langs/he_IL/printing.lang create mode 100644 htdocs/langs/hr_HR/incoterm.lang create mode 100644 htdocs/langs/hr_HR/printing.lang create mode 100644 htdocs/langs/hu_HU/incoterm.lang create mode 100644 htdocs/langs/hu_HU/printing.lang create mode 100644 htdocs/langs/id_ID/incoterm.lang create mode 100644 htdocs/langs/id_ID/printing.lang create mode 100644 htdocs/langs/is_IS/incoterm.lang create mode 100644 htdocs/langs/is_IS/printing.lang create mode 100644 htdocs/langs/it_IT/incoterm.lang create mode 100644 htdocs/langs/it_IT/printing.lang create mode 100644 htdocs/langs/ja_JP/incoterm.lang create mode 100644 htdocs/langs/ja_JP/printing.lang create mode 100644 htdocs/langs/ka_GE/incoterm.lang create mode 100644 htdocs/langs/ka_GE/printing.lang create mode 100644 htdocs/langs/kn_IN/incoterm.lang create mode 100644 htdocs/langs/kn_IN/printing.lang create mode 100644 htdocs/langs/ko_KR/incoterm.lang create mode 100644 htdocs/langs/ko_KR/printing.lang create mode 100644 htdocs/langs/lo_LA/incoterm.lang create mode 100644 htdocs/langs/lo_LA/printing.lang create mode 100644 htdocs/langs/lt_LT/incoterm.lang create mode 100644 htdocs/langs/lt_LT/printing.lang create mode 100644 htdocs/langs/lv_LV/incoterm.lang create mode 100644 htdocs/langs/lv_LV/printing.lang create mode 100644 htdocs/langs/mk_MK/incoterm.lang create mode 100644 htdocs/langs/mk_MK/printing.lang create mode 100644 htdocs/langs/nb_NO/incoterm.lang create mode 100644 htdocs/langs/nb_NO/printing.lang create mode 100644 htdocs/langs/nl_NL/incoterm.lang create mode 100644 htdocs/langs/nl_NL/printing.lang create mode 100644 htdocs/langs/pl_PL/incoterm.lang create mode 100644 htdocs/langs/pl_PL/printing.lang create mode 100644 htdocs/langs/pt_BR/link.lang create mode 100644 htdocs/langs/pt_BR/printing.lang create mode 100644 htdocs/langs/pt_PT/incoterm.lang create mode 100644 htdocs/langs/pt_PT/printing.lang create mode 100644 htdocs/langs/ro_RO/incoterm.lang create mode 100644 htdocs/langs/ro_RO/printing.lang create mode 100644 htdocs/langs/ru_RU/incoterm.lang create mode 100644 htdocs/langs/ru_RU/printing.lang create mode 100644 htdocs/langs/sk_SK/incoterm.lang create mode 100644 htdocs/langs/sk_SK/printing.lang create mode 100644 htdocs/langs/sl_SI/incoterm.lang create mode 100644 htdocs/langs/sl_SI/printing.lang create mode 100644 htdocs/langs/sq_AL/incoterm.lang create mode 100644 htdocs/langs/sq_AL/printing.lang create mode 100644 htdocs/langs/sv_SE/incoterm.lang create mode 100644 htdocs/langs/sv_SE/printing.lang create mode 100644 htdocs/langs/th_TH/incoterm.lang create mode 100644 htdocs/langs/th_TH/printing.lang create mode 100644 htdocs/langs/tr_TR/incoterm.lang create mode 100644 htdocs/langs/tr_TR/printing.lang create mode 100644 htdocs/langs/uk_UA/incoterm.lang create mode 100644 htdocs/langs/uk_UA/printing.lang create mode 100644 htdocs/langs/vi_VN/incoterm.lang create mode 100644 htdocs/langs/vi_VN/printing.lang create mode 100644 htdocs/langs/zh_CN/incoterm.lang create mode 100644 htdocs/langs/zh_CN/printing.lang create mode 100644 htdocs/langs/zh_TW/incoterm.lang create mode 100644 htdocs/langs/zh_TW/printing.lang diff --git a/.tx/config b/.tx/config index 2a5224f1667..0e71a09468e 100644 --- a/.tx/config +++ b/.tx/config @@ -146,6 +146,12 @@ source_file = htdocs/langs/en_US/holiday.lang source_lang = en_US type = MOZILLAPROPERTIES +[dolibarr.incoterm] +file_filter = htdocs/langs//incoterm.lang +source_file = htdocs/langs/en_US/incoterm.lang +source_lang = en_US +type = MOZILLAPROPERTIES + [dolibarr.install] file_filter = htdocs/langs//install.lang source_file = htdocs/langs/en_US/install.lang diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 938130a5936..0d4b43c9172 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -193,13 +193,13 @@ function project_timesheet_prepare_head($mode) $h++; } - if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERACTION)) + /*if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERACTION)) { $head[$h][0] = DOL_URL_ROOT."/projet/activity/peraction.php".($mode?'?mode='.$mode:''); $head[$h][1] = $langs->trans("InputPerAction"); $head[$h][2] = 'inputperaction'; $h++; - } + }*/ complete_head_from_modules($conf,$langs,null,$head,$h,'project_timesheet'); diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang index d0514e828ab..1ca60a487d1 100644 --- a/htdocs/langs/ar_SA/bills.lang +++ b/htdocs/langs/ar_SA/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=المدفوعات قد فعلت PaymentsBackAlreadyDone=Payments back already done PaymentRule=دفع الحكم PaymentMode=نوع الدفع -PaymentConditions=مدة السداد -PaymentConditionsShort=مدة السداد +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=دفع مبلغ ValidatePayment=Validate payment PaymentHigherThanReminderToPay=دفع أعلى من دفع تذكرة diff --git a/htdocs/langs/ar_SA/incoterm.lang b/htdocs/langs/ar_SA/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/ar_SA/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/ar_SA/printing.lang b/htdocs/langs/ar_SA/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/ar_SA/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang index b1625a43fdf..61d3720906e 100644 --- a/htdocs/langs/ar_SA/projects.lang +++ b/htdocs/langs/ar_SA/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=وهناك مشروع كامل لنموذج التقرير (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang index 8e51c4cf697..afa18f81cac 100644 --- a/htdocs/langs/bg_BG/bills.lang +++ b/htdocs/langs/bg_BG/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Плащания направили PaymentsBackAlreadyDone=Payments back already done PaymentRule=Плащане правило PaymentMode=Начин на плащане -PaymentConditions=Начин на плащане -PaymentConditionsShort=Начин на плащане +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Сума за плащане ValidatePayment=Проверка на плащане PaymentHigherThanReminderToPay=Плащането по-висока от напомняне за плащане diff --git a/htdocs/langs/bg_BG/incoterm.lang b/htdocs/langs/bg_BG/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/bg_BG/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/bg_BG/printing.lang b/htdocs/langs/bg_BG/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/bg_BG/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang index 76dc1909c2d..7fda3412b19 100644 --- a/htdocs/langs/bg_BG/projects.lang +++ b/htdocs/langs/bg_BG/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Прекъсни връзката към елемента # Documents models DocumentModelBaleine=Доклад за цялостния проект модел (logo. ..) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Свържете със средство за да определите времето -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang new file mode 100644 index 00000000000..bb9b358c045 --- /dev/null +++ b/htdocs/langs/bn_BD/accountancy.lang @@ -0,0 +1,160 @@ +# Dolibarr language file - en_US - Accounting Expert +CHARSET=UTF-8 + +Accounting=Accounting +Globalparameters=Global parameters +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +Menuaccount=Accounting accounts +Menuthirdpartyaccount=Thirdparty accounts +MenuTools=Tools + +ConfigAccountingExpert=Configuration of the module accounting expert +Journaux=Journals +JournalFinancial=Financial journals +Exports=Exports +Export=Export +Modelcsv=Model of export +OptionsDeactivatedForThisExportModel=For this export model, options are deactivated +Selectmodelcsv=Select a model of export +Modelcsv_normal=Classic export +Modelcsv_CEGID=Export towards CEGID Expert +BackToChartofaccounts=Return chart of accounts +Back=Return + +Definechartofaccounts=Define a chart of accounts +Selectchartofaccounts=Select a chart of accounts +Validate=Validate +Addanaccount=Add an accounting account +AccountAccounting=Accounting account +Ventilation=Breakdown +ToDispatch=To dispatch +Dispatched=Dispatched + +CustomersVentilation=Breakdown customers +SuppliersVentilation=Breakdown suppliers +TradeMargin=Trade margin +Reports=Reports +ByCustomerInvoice=By invoices customers +ByMonth=By Month +NewAccount=New accounting account +Update=Update +List=List +Create=Create +UpdateAccount=Modification of an accounting account +UpdateMvts=Modification of a movement +WriteBookKeeping=Record accounts in general ledger +Bookkeeping=General ledger +AccountBalanceByMonth=Account balance by month + +AccountingVentilation=Breakdown accounting +AccountingVentilationSupplier=Breakdown accounting supplier +AccountingVentilationCustomer=Breakdown accounting customer +Line=Line + +CAHTF=Total purchase supplier HT +InvoiceLines=Lines of invoice to be ventilated +InvoiceLinesDone=Ventilated lines of invoice +IntoAccount=In the accounting account + +Ventilate=Ventilate +VentilationAuto=Automatic breakdown + +Processing=Processing +EndProcessing=The end of processing +AnyLineVentilate=Any lines to ventilate +SelectedLines=Selected lines +Lineofinvoice=Line of invoice +VentilatedinAccount=Ventilated successfully in the accounting account +NotVentilatedinAccount=Not ventilated in the accounting account + +ACCOUNTING_SEPARATORCSV=Column separator in export file + +ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50) +ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements +ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements + +AccountLength=Length of the accounting accounts shown in Dolibarr +AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software. +ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts +ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts + +ACCOUNTING_SELL_JOURNAL=Sell journal +ACCOUNTING_PURCHASE_JOURNAL=Purchase journal +ACCOUNTING_BANK_JOURNAL=Bank journal +ACCOUNTING_CASH_JOURNAL=Cash journal +ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal +ACCOUNTING_SOCIAL_JOURNAL=Social journal + +ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer +ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait + +ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet) +ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet) +ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet) +ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet) + +Doctype=Type of document +Docdate=Date +Docref=Reference +Numerocompte=Account +Code_tiers=Thirdparty +Labelcompte=Label account +Debit=Debit +Credit=Credit +Amount=Amount +Sens=Sens +Codejournal=Journal + +DelBookKeeping=Delete the records of the general ledger + +SellsJournal=Sells journal +PurchasesJournal=Purchases journal +DescSellsJournal=Sells journal +DescPurchasesJournal=Purchases journal +BankJournal=Bank journal +DescBankJournal=Bank journal including all the types of payments other than cash +CashJournal=Cash journal +DescCashJournal=Cash journal including the type of payment cash + +CashPayment=Cash Payment + +SupplierInvoicePayment=Payment of invoice supplier +CustomerInvoicePayment=Payment of invoice customer + +ThirdPartyAccount=Thirdparty account + +NewAccountingMvt=New movement +NumMvts=Number of movement +ListeMvts=List of the movement +ErrorDebitCredit=Debit and Credit cannot have a value at the same time + +ReportThirdParty=List thirdparty account +DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts + +ListAccounts=List of the accounting accounts + +Pcgversion=Version of the plan +Pcgtype=Class of account +Pcgsubtype=Under class of account +Accountparent=Root of the account +Active=Statement + +NewFiscalYear=New fiscal year + +DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers +TotalVente=Total turnover HT +TotalMarge=Total sales margin +DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account +DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account +ChangeAccount=Change the accounting account for lines selected by the account: +Vide=- +DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers +DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account +DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account + +ValidateHistory=Validate Automatically + +ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used + +FicheVentilation=Breakdown card diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang new file mode 100644 index 00000000000..9782c2ea27f --- /dev/null +++ b/htdocs/langs/bn_BD/admin.lang @@ -0,0 +1,1603 @@ +# Dolibarr language file - Source file is en_US - admin +Foundation=Foundation +Version=Version +VersionProgram=Version program +VersionLastInstall=Version initial install +VersionLastUpgrade=Version last upgrade +VersionExperimental=Experimental +VersionDevelopment=Development +VersionUnknown=Unknown +VersionRecommanded=Recommended +FileCheck=Files Integrity +FilesMissing=Missing Files +FilesUpdated=Updated Files +FileCheckDolibarr=Check Dolibarr Files Integrity +XmlNotFound=Xml File of Dolibarr Integrity Not Found +SessionId=Session ID +SessionSaveHandler=Handler to save sessions +SessionSavePath=Storage session localization +PurgeSessions=Purge of sessions +ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself). +NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions. +LockNewSessions=Lock new connections +ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user %s will be able to connect after that. +UnlockNewSessions=Remove connection lock +YourSession=Your session +Sessions=Users session +WebUserGroup=Web server user/group +NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (%s) might be protected (For example, by OS permissions or by PHP directive open_basedir). +HTMLCharset=Charset for generated HTML pages +DBStoringCharset=Database charset to store data +DBSortingCharset=Database charset to sort data +WarningModuleNotActive=Module %s must be enabled +WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page. +DolibarrSetup=Dolibarr install or upgrade +DolibarrUser=Dolibarr user +InternalUser=Internal user +ExternalUser=External user +InternalUsers=Internal users +ExternalUsers=External users +GlobalSetup=Global setup +GUISetup=Display +SetupArea=Setup area +FormToTestFileUploadForm=Form to test file upload (according to setup) +IfModuleEnabled=Note: yes is effective only if module %s is enabled +RemoveLock=Remove file %s if it exists to allow usage of the update tool. +RestoreLock=Restore file %s, with read permission only, to disable any usage of update tool. +SecuritySetup=Security setup +ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher +ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher +ErrorDecimalLargerThanAreForbidden=Error, a precision higher than %s is not supported. +DictionarySetup=Dictionary setup +Dictionary=Dictionaries +Chartofaccounts=Chart of accounts +Fiscalyear=Fiscal years +ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record +ErrorCodeCantContainZero=Code can't contain value 0 +DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers) +ConfirmAjax=Use Ajax confirmation popups +UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box. +ActivityStateToSelectCompany= Add a filter option to show/hide thirdparties which are currently in activity or has ceased it +UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box). +DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties) +DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact) +SearchFilter=Search filters options +NumberOfKeyToSearch=Nbr of characters to trigger search: %s +ViewFullDateActions=Show full dates events in the third sheet +NotAvailableWhenAjaxDisabled=Not available when Ajax disabled +JavascriptDisabled=JavaScript disabled +UsePopupCalendar=Use popup for dates input +UsePreviewTabs=Use preview tabs +ShowPreview=Show preview +PreviewNotAvailable=Preview not available +ThemeCurrentlyActive=Theme currently active +CurrentTimeZone=TimeZone PHP (server) +MySQLTimeZone=TimeZone MySql (database) +TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered). +Space=Space +Table=Table +Fields=Fields +Index=Index +Mask=Mask +NextValue=Next value +NextValueForInvoices=Next value (invoices) +NextValueForCreditNotes=Next value (credit notes) +NextValueForDeposit=Next value (deposit) +NextValueForReplacements=Next value (replacements) +MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to %s %s, whatever this parameter's value is +NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration +MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload) +UseCaptchaCode=Use graphical code (CAPTCHA) on login page +UseAvToScanUploadedFiles=Use anti-virus to scan uploaded files +AntiVirusCommand= Full path to antivirus command +AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Example for ClamAv: /usr/bin/clamscan +AntiVirusParam= More parameters on command line +AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" +ComptaSetup=Accounting module setup +UserSetup=User management setup +MenuSetup=Menu management setup +MenuLimits=Limits and accuracy +MenuIdParent=Parent menu ID +DetailMenuIdParent=ID of parent menu (empty for a top menu) +DetailPosition=Sort number to define menu position +PersonalizedMenusNotSupported=Personalized menus not supported +AllMenus=All +NotConfigured=Module not configured +Setup=Setup +Activation=Activation +Active=Active +SetupShort=Setup +OtherOptions=Other options +OtherSetup=Other setup +CurrentValueSeparatorDecimal=Decimal separator +CurrentValueSeparatorThousand=Thousand separator +Destination=Destination +IdModule=Module ID +IdPermissions=Permissions ID +Modules=Modules +ModulesCommon=Main modules +ModulesOther=Other modules +ModulesInterfaces=Interfaces modules +ModulesSpecial=Modules very specific +ParameterInDolibarr=Parameter %s +LanguageParameter=Language parameter %s +LanguageBrowserParameter=Parameter %s +LocalisationDolibarrParameters=Localisation parameters +ClientTZ=Client Time Zone (user) +ClientHour=Client time (user) +OSTZ=Server OS Time Zone +PHPTZ=PHP server Time Zone +PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds) +ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds) +DaylingSavingTime=Daylight saving time +CurrentHour=PHP Time (server) +CompanyTZ=Company Time Zone (main company) +CompanyHour=Company Time (main company) +CurrentSessionTimeOut=Current session timeout +YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris" +OSEnv=OS Environment +Box=Box +Boxes=Boxes +MaxNbOfLinesForBoxes=Max number of lines for boxes +PositionByDefault=Default order +Position=Position +MenusDesc=Menus managers define content of the 2 menu bars (horizontal bar and vertical bar). +MenusEditorDesc=The menu editor allow you to define personalized entries in menus. Use it carefully to avoid making dolibarr unstable and menu entries permanently unreachable.
Some modules add entries in the menus (in menu All in most cases). If you removed some of these entries by mistake, you can restore them by disabling and reenabling the module. +MenuForUsers=Menu for users +LangFile=.lang file +System=System +SystemInfo=System information +SystemTools=System tools +SystemToolsArea=System tools area +SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for. +Purge=Purge +PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in %s directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server. +PurgeDeleteLogFile=Delete log file %s defined for Syslog module (no risk to loose data) +PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data) +PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory %s. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted. +PurgeRunNow=Purge now +PurgeNothingToDelete=No directory or file to delete. +PurgeNDirectoriesDeleted=%s files or directories deleted. +PurgeAuditEvents=Purge all security events +ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed. +NewBackup=New backup +GenerateBackup=Generate backup +Backup=Backup +Restore=Restore +RunCommandSummary=Backup has been launched with the following command +RunCommandSummaryToLaunch=Backup can be launched with the following command +WebServerMustHavePermissionForCommand=Your web server must have the permission to run such commands +BackupResult=Backup result +BackupFileSuccessfullyCreated=Backup file successfully generated +YouCanDownloadBackupFile=Generated files can now be downloaded +NoBackupFileAvailable=No backup files available. +ExportMethod=Export method +ImportMethod=Import method +ToBuildBackupFileClickHere=To build a backup file, click here. +ImportMySqlDesc=To import a backup file, you must use mysql command from command line: +ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line: +ImportMySqlCommand=%s %s < mybackupfile.sql +ImportPostgreSqlCommand=%s %s mybackupfile.sql +FileNameToGenerate=File name to generate +Compression=Compression +CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import +CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later +ExportCompatibility=Compatibility of generated export file +MySqlExportParameters=MySQL export parameters +PostgreSqlExportParameters= PostgreSQL export parameters +UseTransactionnalMode=Use transactional mode +FullPathToMysqldumpCommand=Full path to mysqldump command +FullPathToPostgreSQLdumpCommand=Full path to pg_dump command +ExportOptions=Export Options +AddDropDatabase=Add DROP DATABASE command +AddDropTable=Add DROP TABLE command +ExportStructure=Structure +Datas=Data +NameColumn=Name columns +ExtendedInsert=Extended INSERT +NoLockBeforeInsert=No lock commands around INSERT +DelayedInsert=Delayed insert +EncodeBinariesInHexa=Encode binary data in hexadecimal +IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE) +Yes=Yes +No=No +AutoDetectLang=Autodetect (browser language) +FeatureDisabledInDemo=Feature disabled in demo +Rights=Permissions +BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it. +OnlyActiveElementsAreShown=Only elements from enabled modules are shown. +ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature. +ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services. +ModulesSpecialDesc=Special modules are very specific or seldom used modules. +ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for a particular business. +ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet... +ModulesMarketPlaces=More modules... +DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules +DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development) +WebSiteDesc=Web site providers you can search to find more modules... +URL=Link +BoxesAvailable=Boxes available +BoxesActivated=Boxes activated +ActivateOn=Activate on +ActiveOn=Activated on +SourceFile=Source file +AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled +AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled +AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled +Required=Required +UsedOnlyWithTypeOption=Used by some agenda option only +Security=Security +Passwords=Passwords +DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended) +MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended) +InstrucToEncodePass=To have password encoded into the conf.php file, replace the line
$dolibarr_main_db_pass="..."
by
$dolibarr_main_db_pass="crypted:%s" +InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line
$dolibarr_main_db_pass="crypted:..."
by
$dolibarr_main_db_pass="%s" +ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation) +ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices). +Feature=Feature +DolibarrLicense=License +DolibarrProjectLeader=Project leader +Developpers=Developers/contributors +OtherDeveloppers=Other developers/contributors +OfficialWebSite=Dolibarr international official web site +OfficialWebSiteFr=French official web site +OfficialWiki=Dolibarr documentation on Wiki +OfficialDemo=Dolibarr online demo +OfficialMarketPlace=Official market place for external modules/addons +OfficialWebHostingService=Referenced web hosting services (Cloud hosting) +ReferencedPreferredPartners=Preferred Partners +OtherResources=Autres ressources +ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),
take a look at the Dolibarr Wiki:
%s +ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:
%s +HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr. +HelpCenterDesc2=Some part of this service are available in english only. +CurrentTopMenuHandler=Current top menu handler +CurrentLeftMenuHandler=Current left menu handler +CurrentMenuHandler=Current menu handler +CurrentSmartphoneMenuHandler=Current smartphone menu handler +MeasuringUnit=Measuring unit +Emails=E-mails +EMailsSetup=E-mails setup +EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless. +MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: %s) +MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s) +MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems) +MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems) +MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: %s) +MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent +MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to +MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to +MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to +MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to +MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos) +MAIN_MAIL_SENDMODE=Method to use to send EMails +MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required +MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required +MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt +MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos) +MAIN_SMS_SENDMODE=Method to use to send SMS +MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending +FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally. +SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on www.dolibarr.org forum. +ModuleSetup=Module setup +ModulesSetup=Modules setup +ModuleFamilyBase=System +ModuleFamilyCrm=Customer Relation Management (CRM) +ModuleFamilyProducts=Products Management +ModuleFamilyHr=Human Resource Management +ModuleFamilyProjects=Projects/Collaborative work +ModuleFamilyOther=Other +ModuleFamilyTechnic=Multi-modules tools +ModuleFamilyExperimental=Experimental modules +ModuleFamilyFinancial=Financial Modules (Accounting/Treasury) +ModuleFamilyECM=Electronic Content Management (ECM) +MenuHandlers=Menu handlers +MenuAdmin=Menu editor +DoNotUseInProduction=Do not use in production +ThisIsProcessToFollow=This is setup to process: +StepNb=Step %s +FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s). +DownloadPackageFromWebSite=Download package %s. +UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory %s +SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component. +NotExistsDirect=The alternative root directory is not defined.
+InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).
+InfDirExample=
Then declare it in the file conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*These lines are commented with "#", to uncomment only remove the character. +YouCanSubmitFile=Select module: +CurrentVersion=Dolibarr current version +CallUpdatePage=Go to the page that updates the database structure and datas: %s. +LastStableVersion=Last stable version +UpdateServerOffline=Update server offline +GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask.
{000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s.
{000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required.
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
+GenericMaskCodes2={cccc} the client code on n characters
{cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
{tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
+GenericMaskCodes3=All other characters in the mask will remain intact.
Spaces are not allowed.
+GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany done 2007-01-31:
+GenericMaskCodes4b=Example on third party created on 2007-03-01:
+GenericMaskCodes4c=Example on product created on 2007-03-01:
+GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX +GenericNumRefModelDesc=Returns a customizable number according to a defined mask. +ServerAvailableOnIPOrPort=Server is available at address %s on port %s +ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s +DoTestServerAvailability=Test server connectivity +DoTestSend=Test sending +DoTestSendHTML=Test sending HTML +ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask. +ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask. +UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system. +UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).
It must be the octal value (for example, 0666 means read and write for everyone).
This parameter is useless on a Windows server. +SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation +UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache) +DisableLinkToHelpCenter=Hide link "Need help or support" on login page +DisableLinkToHelp=Hide link "%s Online help" on left menu +AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea. +ModuleDisabled=Module disabled +ModuleDisabledSoNoEvent=Module disabled so event never created +ConfirmPurge=Are you sure you want to execute this purge ?
This will delete definitely all your data files with no way to restore them (ECM files, attached files...). +MinLength=Minimum length +LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory +ExamplesWithCurrentSetup=Examples with current running setup +ListOfDirectories=List of OpenDocument templates directories +ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.

Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.

Files in those directories must end with .odt. +NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories +ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir +FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation: +FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template +FirstnameNamePosition=Position of Name/Lastname +DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values: +KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices) +TestSubmitForm=Input test form +ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours. +ThemeDir=Skins directory +ConnectionTimeout=Connexion timeout +ResponseTimeout=Response timeout +SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__ +ModuleMustBeEnabledFirst=Module %s must be enabled first before using this feature. +SecurityToken=Key to secure URLs +NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s +PDF=PDF +PDFDesc=You can set each global options related to the PDF generation +PDFAddressForging=Rules to forge address boxes +HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF +HideDescOnPDF=Hide products description on generated PDF +HideRefOnPDF=Hide products ref. on generated PDF +HideDetailsOnPDF=Hide products lines details on generated PDF +Library=Library +UrlGenerationParameters=Parameters to secure URLs +SecurityTokenIsUnique=Use a unique securekey parameter for each URL +EnterRefToBuildUrl=Enter reference for object %s +GetSecuredUrl=Get calculated URL +ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons +OldVATRates=Old VAT rate +NewVATRates=New VAT rate +PriceBaseTypeToChange=Modify on prices with base reference value defined on +MassConvert=Launch mass convert +String=String +TextLong=Long text +Int=Integer +Float=Float +DateAndTime=Date and hour +Unique=Unique +Boolean=Boolean (Checkbox) +ExtrafieldPhone = Phone +ExtrafieldPrice = Price +ExtrafieldMail = Email +ExtrafieldSelect = Select list +ExtrafieldSelectList = Select from table +ExtrafieldSeparator=Separator +ExtrafieldCheckBox=Checkbox +ExtrafieldRadio=Radio button +ExtrafieldCheckBoxFromList= Checkbox from table +ExtrafieldParamHelpselect=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
...

In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key +ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... +ExtrafieldParamHelpradio=Parameters list have to be like key,value

for example :
1,value1
2,value2
3,value3
... +ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter

filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)

In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter +LibraryToBuildPDF=Library used to build PDF +WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir' +LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax) +SMS=SMS +LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s +RefreshPhoneLink=Refresh link +LinkToTest=Clickable link generated for user %s (click phone number to test) +KeepEmptyToUseDefault=Keep empty to use default value +DefaultLink=Default link +ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url) +ExternalModule=External module - Installed into directory %s +BarcodeInitForThirdparties=Mass barcode init for thirdparties +BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services +CurrentlyNWithoutBarCode=Currently, you have %s records on %s %s without barcode defined. +InitEmptyBarCode=Init value for next %s empty records +EraseAllCurrentBarCode=Erase all current barcode values +ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ? +AllBarcodeReset=All barcode values have been removed +NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup. +NoRecordWithoutBarcodeDefined=No record with no barcode value defined. + +# Modules +Module0Name=Users & groups +Module0Desc=Users and groups management +Module1Name=Third parties +Module1Desc=Companies and contact management (customers, prospects...) +Module2Name=Commercial +Module2Desc=Commercial management +Module10Name=Accounting +Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching. +Module20Name=Proposals +Module20Desc=Commercial proposal management +Module22Name=Mass E-mailings +Module22Desc=Mass E-mailing management +Module23Name= Energy +Module23Desc= Monitoring the consumption of energies +Module25Name=Customer Orders +Module25Desc=Customer order management +Module30Name=Invoices +Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers +Module40Name=Suppliers +Module40Desc=Supplier management and buying (orders and invoices) +Module42Name=Logs +Module42Desc=Logging facilities (file, syslog, ...) +Module49Name=Editors +Module49Desc=Editor management +Module50Name=Products +Module50Desc=Product management +Module51Name=Mass mailings +Module51Desc=Mass paper mailing management +Module52Name=Stocks +Module52Desc=Stock management (products) +Module53Name=Services +Module53Desc=Service management +Module54Name=Contracts/Subscriptions +Module54Desc=Management of contracts (services or reccuring subscriptions) +Module55Name=Barcodes +Module55Desc=Barcode management +Module56Name=Telephony +Module56Desc=Telephony integration +Module57Name=Standing orders +Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries. +Module58Name=ClickToDial +Module58Desc=Integration of a ClickToDial system (Asterisk, ...) +Module59Name=Bookmark4u +Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account +Module70Name=Interventions +Module70Desc=Intervention management +Module75Name=Expense and trip notes +Module75Desc=Expense and trip notes management +Module80Name=Shipments +Module80Desc=Shipments and delivery order management +Module85Name=Banks and cash +Module85Desc=Management of bank or cash accounts +Module100Name=External site +Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame +Module105Name=Mailman and SPIP +Module105Desc=Mailman or SPIP interface for member module +Module200Name=LDAP +Module200Desc=LDAP directory synchronisation +Module210Name=PostNuke +Module210Desc=PostNuke integration +Module240Name=Data exports +Module240Desc=Tool to export Dolibarr datas (with assistants) +Module250Name=Data imports +Module250Desc=Tool to import datas in Dolibarr (with assistants) +Module310Name=Members +Module310Desc=Foundation members management +Module320Name=RSS Feed +Module320Desc=Add RSS feed inside Dolibarr screen pages +Module330Name=Bookmarks +Module330Desc=Bookmark management +Module400Name=Projects/Opportunities/Leads +Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view. +Module410Name=Webcalendar +Module410Desc=Webcalendar integration +Module500Name=Special expenses (tax, social contributions, dividends) +Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries +Module510Name=Salaries +Module510Desc=Management of employees salaries and payments +Module600Name=Notifications +Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty) +Module700Name=Donations +Module700Desc=Donation management +Module770Name=Expense Report +Module770Desc=Management and claim expense reports (transportation, meal, ...) +Module1120Name=Supplier commercial proposal +Module1120Desc=Request supplier commercial proposal and prices +Module1200Name=Mantis +Module1200Desc=Mantis integration +Module1400Name=Accounting +Module1400Desc=Accounting management (double parties) +Module1520Name=Document Generation +Module1520Desc=Mass mail document generation +Module1780Name=Categories +Module1780Desc=Category management (products, suppliers and customers) +Module2000Name=WYSIWYG editor +Module2000Desc=Allow to edit some text area using an advanced editor +Module2200Name=Dynamic Prices +Module2200Desc=Enable the usage of math expressions for prices +Module2300Name=Cron +Module2300Desc=Scheduled task management +Module2400Name=Agenda +Module2400Desc=Events/tasks and agenda management +Module2500Name=Electronic Content Management +Module2500Desc=Save and share documents +Module2600Name=WebServices +Module2600Desc=Enable the Dolibarr web services server +Module2650Name=WebServices (client) +Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment) +Module2700Name=Gravatar +Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access +Module2800Desc=FTP Client +Module2900Name=GeoIPMaxmind +Module2900Desc=GeoIP Maxmind conversions capabilities +Module3100Name=Skype +Module3100Desc=Add a Skype button into card of adherents / third parties / contacts +Module5000Name=Multi-company +Module5000Desc=Allows you to manage multiple companies +Module6000Name=Workflow +Module6000Desc=Workflow management +Module20000Name=Leave Requests management +Module20000Desc=Declare and follow employees leaves requests +Module39000Name=Product batch +Module39000Desc=Batch or serial number, eat-by and sell-by date management on products +Module50000Name=PayBox +Module50000Desc=Module to offer an online payment page by credit card with PayBox +Module50100Name=Point of sales +Module50100Desc=Point of sales module +Module50200Name=Paypal +Module50200Desc=Module to offer an online payment page by credit card with Paypal +Module50400Name=Accounting (advanced) +Module50400Desc=Accounting management (double parties) +Module54000Name=PrintIPP +Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server). +Module55000Name=Open Poll +Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...) +Module59000Name=Margins +Module59000Desc=Module to manage margins +Module60000Name=Commissions +Module60000Desc=Module to manage commissions +Module150010Name=Batch number, eat-by date and sell-by date +Module150010Desc=batch number, eat-by date and sell-by date management for product +Permission11=Read customer invoices +Permission12=Create/modify customer invoices +Permission13=Unvalidate customer invoices +Permission14=Validate customer invoices +Permission15=Send customer invoices by email +Permission16=Create payments for customer invoices +Permission19=Delete customer invoices +Permission21=Read commercial proposals +Permission22=Create/modify commercial proposals +Permission24=Validate commercial proposals +Permission25=Send commercial proposals +Permission26=Close commercial proposals +Permission27=Delete commercial proposals +Permission28=Export commercial proposals +Permission31=Read products +Permission32=Create/modify products +Permission34=Delete products +Permission36=See/manage hidden products +Permission38=Export products +Permission41=Read projects (shared project and projects i'm contact for) +Permission42=Create/modify projects (shared project and projects i'm contact for) +Permission44=Delete projects (shared project and projects i'm contact for) +Permission61=Read interventions +Permission62=Create/modify interventions +Permission64=Delete interventions +Permission67=Export interventions +Permission71=Read members +Permission72=Create/modify members +Permission74=Delete members +Permission75=Setup types of membership +Permission76=Export datas +Permission78=Read subscriptions +Permission79=Create/modify subscriptions +Permission81=Read customers orders +Permission82=Create/modify customers orders +Permission84=Validate customers orders +Permission86=Send customers orders +Permission87=Close customers orders +Permission88=Cancel customers orders +Permission89=Delete customers orders +Permission91=Read social contributions and vat +Permission92=Create/modify social contributions and vat +Permission93=Delete social contributions and vat +Permission94=Export social contributions +Permission95=Read reports +Permission101=Read sendings +Permission102=Create/modify sendings +Permission104=Validate sendings +Permission106=Export sendings +Permission109=Delete sendings +Permission111=Read financial accounts +Permission112=Create/modify/delete and compare transactions +Permission113=Setup financial accounts (create, manage categories) +Permission114=Reconciliate transactions +Permission115=Export transactions and account statements +Permission116=Transfers between accounts +Permission117=Manage cheques dispatching +Permission121=Read third parties linked to user +Permission122=Create/modify third parties linked to user +Permission125=Delete third parties linked to user +Permission126=Export third parties +Permission141=Read projects (also private i am not contact for) +Permission142=Create/modify projects (also private i am not contact for) +Permission144=Delete projects (also private i am not contact for) +Permission146=Read providers +Permission147=Read stats +Permission151=Read standing orders +Permission152=Create/modify a standing orders request +Permission153=Transmission standing orders receipts +Permission154=Credit/refuse standing orders receipts +Permission161=Read contracts/subscriptions +Permission162=Create/modify contracts/subscriptions +Permission163=Activate a service/subscription of a contract +Permission164=Disable a service/subscription of a contract +Permission165=Delete contracts/subscriptions +Permission171=Read trips and expenses (own and his subordinates) +Permission172=Create/modify trips and expenses +Permission173=Delete trips and expenses +Permission174=Read all trips and expenses +Permission178=Export trips and expenses +Permission180=Read suppliers +Permission181=Read supplier orders +Permission182=Create/modify supplier orders +Permission183=Validate supplier orders +Permission184=Approve supplier orders +Permission185=Order or cancel supplier orders +Permission186=Receive supplier orders +Permission187=Close supplier orders +Permission188=Cancel supplier orders +Permission192=Create lines +Permission193=Cancel lines +Permission194=Read the bandwith lines +Permission202=Create ADSL connections +Permission203=Order connections orders +Permission204=Order connections +Permission205=Manage connections +Permission206=Read connections +Permission211=Read Telephony +Permission212=Order lines +Permission213=Activate line +Permission214=Setup Telephony +Permission215=Setup providers +Permission221=Read emailings +Permission222=Create/modify emailings (topic, recipients...) +Permission223=Validate emailings (allows sending) +Permission229=Delete emailings +Permission237=View recipients and info +Permission238=Manually send mailings +Permission239=Delete mailings after validation or sent +Permission241=Read categories +Permission242=Create/modify categories +Permission243=Delete categories +Permission244=See the contents of the hidden categories +Permission251=Read other users and groups +PermissionAdvanced251=Read other users +Permission252=Read permissions of other users +Permission253=Create/modify other users, groups and permisssions +PermissionAdvanced253=Create/modify internal/external users and permissions +Permission254=Create/modify external users only +Permission255=Modify other users password +Permission256=Delete or disable other users +Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves). +Permission271=Read CA +Permission272=Read invoices +Permission273=Issue invoices +Permission281=Read contacts +Permission282=Create/modify contacts +Permission283=Delete contacts +Permission286=Export contacts +Permission291=Read tariffs +Permission292=Set permissions on the tariffs +Permission293=Modify costumers tariffs +Permission300=Read bar codes +Permission301=Create/modify bar codes +Permission302=Delete bar codes +Permission311=Read services +Permission312=Assign service/subscription to contract +Permission331=Read bookmarks +Permission332=Create/modify bookmarks +Permission333=Delete bookmarks +Permission341=Read its own permissions +Permission342=Create/modify his own user information +Permission343=Modify his own password +Permission344=Modify its own permissions +Permission351=Read groups +Permission352=Read groups permissions +Permission353=Create/modify groups +Permission354=Delete or disable groups +Permission358=Export users +Permission401=Read discounts +Permission402=Create/modify discounts +Permission403=Validate discounts +Permission404=Delete discounts +Permission510=Read Salaries +Permission512=Create/modify salaries +Permission514=Delete salaries +Permission517=Export salaries +Permission531=Read services +Permission532=Create/modify services +Permission534=Delete services +Permission536=See/manage hidden services +Permission538=Export services +Permission701=Read donations +Permission702=Create/modify donations +Permission703=Delete donations +Permission771=Read expense reports (own and his subordinates) +Permission772=Create/modify expense reports +Permission773=Delete expense reports +Permission774=Read all expense reports (even for user not subordinates) +Permission775=Approve expense reports +Permission776=Pay expense reports +Permission779=Export expense reports +Permission1001=Read stocks +Permission1002=Create/modify warehouses +Permission1003=Delete warehouses +Permission1004=Read stock movements +Permission1005=Create/modify stock movements +Permission1101=Read delivery orders +Permission1102=Create/modify delivery orders +Permission1104=Validate delivery orders +Permission1109=Delete delivery orders +Permission1181=Read suppliers +Permission1182=Read supplier orders +Permission1183=Create/modify supplier orders +Permission1184=Validate supplier orders +Permission1185=Approve supplier orders +Permission1186=Order supplier orders +Permission1187=Acknowledge receipt of supplier orders +Permission1188=Delete supplier orders +Permission1201=Get result of an export +Permission1202=Create/Modify an export +Permission1231=Read supplier invoices +Permission1232=Create/modify supplier invoices +Permission1233=Validate supplier invoices +Permission1234=Delete supplier invoices +Permission1235=Send supplier invoices by email +Permission1236=Export supplier invoices, attributes and payments +Permission1237=Export supplier orders and their details +Permission1251=Run mass imports of external data into database (data load) +Permission1321=Export customer invoices, attributes and payments +Permission1421=Export customer orders and attributes +Permission23001 = Read Scheduled task +Permission23002 = Create/update Scheduled task +Permission23003 = Delete Scheduled task +Permission23004 = Execute Scheduled task +Permission2401=Read actions (events or tasks) linked to his account +Permission2402=Create/modify actions (events or tasks) linked to his account +Permission2403=Delete actions (events or tasks) linked to his account +Permission2411=Read actions (events or tasks) of others +Permission2412=Create/modify actions (events or tasks) of others +Permission2413=Delete actions (events or tasks) of others +Permission2501=Read/Download documents +Permission2502=Download documents +Permission2503=Submit or delete documents +Permission2515=Setup documents directories +Permission2801=Use FTP client in read mode (browse and download only) +Permission2802=Use FTP client in write mode (delete or upload files) +Permission50101=Use Point of sales +Permission50201=Read transactions +Permission50202=Import transactions +Permission54001=Print +Permission55001=Read polls +Permission55002=Create/modify polls +Permission59001=Read commercial margins +Permission59002=Define commercial margins +Permission59003=Read every user margin +DictionaryCompanyType=Thirdparties type +DictionaryCompanyJuridicalType=Juridical kinds of thirdparties +DictionaryProspectLevel=Prospect potential level +DictionaryCanton=State/Cantons +DictionaryRegion=Regions +DictionaryCountry=Countries +DictionaryCurrency=Currencies +DictionaryCivility=Civility title +DictionaryActions=Type of agenda events +DictionarySocialContributions=Social contributions types +DictionaryVAT=VAT Rates or Sales Tax Rates +DictionaryRevenueStamp=Amount of revenue stamps +DictionaryPaymentConditions=Payment terms +DictionaryPaymentModes=Payment modes +DictionaryTypeContact=Contact/Address types +DictionaryEcotaxe=Ecotax (WEEE) +DictionaryPaperFormat=Paper formats +DictionaryFees=Type of fees +DictionarySendingMethods=Shipping methods +DictionaryStaff=Staff +DictionaryAvailability=Delivery delay +DictionaryOrderMethods=Ordering methods +DictionarySource=Origin of proposals/orders +DictionaryAccountancyplan=Chart of accounts +DictionaryAccountancysystem=Models for chart of accounts +DictionaryEMailTemplates=Emails templates +SetupSaved=Setup saved +BackToModuleList=Back to modules list +BackToDictionaryList=Back to dictionaries list +VATReceivedOnly=Special rate not charged +VATManagement=VAT Management +VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to VAT, then VAT by default=0. End of rule.
If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule.
If seller and buyer in the European Community and goods are transport products (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.
If seller and buyer in the European Community and buyer is not a company, then the VAT by default=VAT of product sold. End of rule.
If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.
Else the proposed default VAT=0. End of rule. +VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies. +VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared. +VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices. +##### Local Taxes ##### +LTRate=Rate +LocalTax1IsUsed=Use second tax +LocalTax1IsNotUsed=Do not use second tax +LocalTax1IsUsedDesc=Use a second type of tax (other than VAT) +LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT) +LocalTax1Management=Second type of tax +LocalTax1IsUsedExample= +LocalTax1IsNotUsedExample= +LocalTax2IsUsed=Use third tax +LocalTax2IsNotUsed=Do not use third tax +LocalTax2IsUsedDesc=Use a third type of tax (other than VAT) +LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT) +LocalTax2Management=Third type of tax +LocalTax2IsUsedExample= +LocalTax2IsNotUsedExample= +LocalTax1ManagementES= RE Management +LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If te buyer is not subjected to RE, RE by default=0. End of rule.
If the buyer is subjected to RE then the RE by default. End of rule.
+LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule. +LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE. +LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE. +LocalTax2ManagementES= IRPF Management +LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.
If the seller is subjected to IRPF then the IRPF by default. End of rule.
+LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule. +LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules. +LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules. +CalcLocaltax=Reports +CalcLocaltax1ES=Sales - Purchases +CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases +CalcLocaltax2ES=Purchases +CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases +CalcLocaltax3ES=Sales +CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales +LabelUsedByDefault=Label used by default if no translation can be found for code +LabelOnDocuments=Label on documents +NbOfDays=Nb of days +AtEndOfMonth=At end of month +Offset=Offset +AlwaysActive=Always active +UpdateRequired=Your system needs to be updated. To do this, click on Update now. +Upgrade=Upgrade +MenuUpgrade=Upgrade / Extend +AddExtensionThemeModuleOrOther=Add extension (theme, module, ...) +WebServer=Web server +DocumentRootServer=Web server's root directory +DataRootServer=Data files directory +IP=IP +Port=Port +VirtualServerName=Virtual server name +AllParameters=All parameters +OS=OS +PhpEnv=Env +PhpModules=Modules +PhpConf=Conf +PhpWebLink=Web-Php link +Pear=Pear +PearPackages=Pear Packages +Browser=Browser +Server=Server +Database=Database +DatabaseServer=Database host +DatabaseName=Database name +DatabasePort=Database port +DatabaseUser=Database user +DatabasePassword=Database password +DatabaseConfiguration=Database setup +Tables=Tables +TableName=Table name +TableLineFormat=Line format +NbOfRecord=Nb of records +Constraints=Constraints +ConstraintsType=Constraints type +ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry +AllMustBeOk=All of these must be checked +Host=Server +DriverType=Driver type +SummarySystem=System information summary +SummaryConst=List of all Dolibarr setup parameters +SystemUpdate=System update +SystemSuccessfulyUpdate=Your system has been updated successfuly +MenuCompanySetup=Company/Foundation +MenuNewUser=New user +MenuTopManager=Top menu manager +MenuLeftManager=Left menu manager +MenuManager=Menu manager +MenuSmartphoneManager=Smartphone menu manager +DefaultMenuTopManager=Top menu manager +DefaultMenuLeftManager=Left menu manager +DefaultMenuManager= Standard menu manager +DefaultMenuSmartphoneManager=Smartphone menu manager +Skin=Skin theme +DefaultSkin=Default skin theme +MaxSizeList=Max length for list +DefaultMaxSizeList=Default max length for list +MessageOfDay=Message of the day +MessageLogin=Login page message +PermanentLeftSearchForm=Permanent search form on left menu +DefaultLanguage=Default language to use (language code) +EnableMultilangInterface=Enable multilingual interface +EnableShowLogo=Show logo on left menu +EnableHtml5=Enable Html5 (Developement - Only available on Eldy template) +SystemSuccessfulyUpdated=Your system has been updated successfully +CompanyInfo=Company/foundation information +CompanyIds=Company/foundation identities +CompanyName=Name +CompanyAddress=Address +CompanyZip=Zip +CompanyTown=Town +CompanyCountry=Country +CompanyCurrency=Main currency +Logo=Logo +DoNotShow=Do not show +DoNotSuggestPaymentMode=Do not suggest +NoActiveBankAccountDefined=No active bank account defined +OwnerOfBankAccount=Owner of bank account %s +BankModuleNotActive=Bank accounts module not enabled +ShowBugTrackLink=Show link "Report a bug" +ShowWorkBoard=Show "workbench" on homepage +Alerts=Alerts +Delays=Delays +DelayBeforeWarning=Delay before warning +DelaysBeforeWarning=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. +Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events not yet realised +Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not yet processed +Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not yet processed +Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close +Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed +Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate +Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services +Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices +Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices +Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation +Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee +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. +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 Setup -> Company/foundation are required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country). +SetupDescription4=Parameters in menu Setup -> Modules are required because Dolibarr is not a fixed ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in menus. +SetupDescription5=Other menu entries manage optional parameters. +EventsSetup=Setup for events logs +LogEvents=Security audit events +Audit=Audit +InfoDolibarr=Infos Dolibarr +InfoBrowser=Infos Browser +InfoOS=Infos OS +InfoWebServer=Infos web server +InfoDatabase=Infos database +InfoPHP=Infos PHP +InfoPerf=Infos performances +BrowserName=Browser name +BrowserOS=Browser OS +ListEvents=Audit events +ListOfSecurityEvents=List of Dolibarr security events +SecurityEventsPurged=Security events purged +LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu System tools - Audit. Warning, this feature can consume a large amount of data in database. +AreaForAdminOnly=Those features can be used by administrator users only. +SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only. +SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit. +CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page) +DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here +AvailableModules=Available modules +ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules). +SessionTimeOut=Time out for session +SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every %s/%s access, but only during access made by other sessions.
Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default session.gc_maxlifetime, no matter what the value entered here. +TriggersAvailable=Available triggers +TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory htdocs/core/triggers. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...). +TriggerDisabledByName=Triggers in this file are disabled by the -NORUN suffix in their name. +TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module %s is disabled. +TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules. +TriggerActiveAsModuleActive=Triggers in this file are active as module %s is enabled. +GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password +DictionaryDesc=Define here all reference datas. You can complete predefined value with yours. +ConstDesc=This page allows you to edit all other parameters not available in previous pages. They are reserved parameters for advanced developers or for troubleshouting. +OnceSetupFinishedCreateUsers=Warning, you are a Dolibarr administrator user. Administrator users are used to setup Dolibarr. For a usual usage of Dolibarr, it is recommended to use a non administrator user created from Users & Groups menu. +MiscellaneousDesc=Define here all other parameters related to security. +LimitsSetup=Limits/Precision setup +LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here +MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices +MAIN_MAX_DECIMALS_TOT=Max decimals for total prices +MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add ... after this number if you want to see ... when number is truncated when shown on screen) +MAIN_DISABLE_PDF_COMPRESSION=Use PDF compression for generated PDF files. +MAIN_ROUNDING_RULE_TOT= Size of rounding range (for rare countries where rounding is done on something else than base 10) +UnitPriceOfProduct=Net unit price of a product +TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding +ParameterActiveForNextInputOnly=Parameter effective for next input only +NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page. +NoEventFoundWithCriteria=No security event has been found for such search criterias. +SeeLocalSendMailSetup=See your local sendmail setup +BackupDesc=To make a complete backup of Dolibarr, you must: +BackupDesc2=* Save content of documents directory (%s) that contains all uploaded and generated files (you can make a zip for example). +BackupDesc3=* Save content of your database into a dump file. For this, you can use following assistant. +BackupDescX=Archived directory should be stored in a secure place. +BackupDescY=The generated dump file should be stored in a secure place. +BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one +RestoreDesc=To restore a Dolibarr backup, you must: +RestoreDesc2=* Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s). +RestoreDesc3=* Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation. Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant. +RestoreMySQL=MySQL import +ForcedToByAModule= This rule is forced to %s by an activated module +PreviousDumpFiles=Available database backup dump files +WeekStartOnDay=First day of week +RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s) +YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s or you must add -W option at end of command line to provide %s password. +YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP +DownloadMoreSkins=More skins to download +SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset +ShowProfIdInAddress=Show professionnal id with addresses on documents +ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents +TranslationUncomplete=Partial translation +SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/. +MenuUseLayout=Make vertical menu hidable (option javascript must not be disabled) +MAIN_DISABLE_METEO=Disable meteo view +TestLoginToAPI=Test login to API +ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it. +ExternalAccess=External access +MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet) +MAIN_PROXY_HOST=Name/Address of proxy server +MAIN_PROXY_PORT=Port of proxy server +MAIN_PROXY_USER=Login to use the proxy server +MAIN_PROXY_PASS=Password to use the proxy server +DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s. +ExtraFields=Complementary attributes +ExtraFieldsLines=Complementary attributes (lines) +ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines) +ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines) +ExtraFieldsThirdParties=Complementary attributes (thirdparty) +ExtraFieldsContacts=Complementary attributes (contact/address) +ExtraFieldsMember=Complementary attributes (member) +ExtraFieldsMemberType=Complementary attributes (member type) +ExtraFieldsCustomerOrders=Complementary attributes (orders) +ExtraFieldsCustomerInvoices=Complementary attributes (invoices) +ExtraFieldsSupplierOrders=Complementary attributes (orders) +ExtraFieldsSupplierInvoices=Complementary attributes (invoices) +ExtraFieldsProject=Complementary attributes (projects) +ExtraFieldsProjectTask=Complementary attributes (tasks) +ExtraFieldHasWrongValue=Attribute %s has a wrong value. +AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space +AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space +SendingMailSetup=Setup of sendings by email +SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba). +PathToDocuments=Path to documents +PathDirectory=Directory +SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages. +TranslationSetup=Configuration de la traduction +TranslationDesc=Choice of language visible on screen can be modified:
* Globally from menu Home - Setup - Display
* For user only from tab User display of user card (click on login on top of screen). +TotalNumberOfActivatedModules=Total number of activated feature modules: %s +YouMustEnableOneModule=You must at least enable 1 module +ClassNotFoundIntoPathWarning=Class %s not found into PHP path +YesInSummer=Yes in summer +OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users): +SuhosinSessionEncrypt=Session storage encrypted by Suhosin +ConditionIsCurrently=Condition is currently %s +YouUseBestDriver=You use driver %s that is best driver available currently. +YouDoNotUseBestDriver=You use drive %s but driver %s is recommended. +NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization. +SearchOptim=Search optimization +YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response. +BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance. +BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari. +XDebugInstalled=XDebug is loaded. +XCacheInstalled=XCache is loaded. +AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp". +FieldEdition=Edition of field %s +FixTZ=TimeZone fix +FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced) +GetBarCode=Get barcode +EmptyNumRefModelDesc=The code is free. This code can be modified at any time. +##### Module password generation +PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase. +PasswordGenerationNone=Do not suggest any generated password. Password must be type in manually. +##### Users setup ##### +UserGroupSetup=Users and groups module setup +GeneratePassword=Suggest a generated password +RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords +DoNotSuggest=Do not suggest any password +EncryptedPasswordInDatabase=To allow the encryption of the passwords in the database +DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page +UsersSetup=Users module setup +UserMailRequired=EMail required to create a new user +##### Company setup ##### +CompanySetup=Companies module setup +CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier) +AccountCodeManager=Module for accountancy code generation (customer or supplier) +ModuleCompanyCodeAquarium=Return an accountancy code built by:
%s followed by third party supplier code for a supplier accountancy code,
%s followed by third party customer code for a customer accountancy code. +ModuleCompanyCodePanicum=Return an empty accountancy code. +ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. +UseNotifications=Use notifications +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* or by setting a global target email address on module setup page. +ModelModules=Documents templates +DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) +WatermarkOnDraft=Watermark on draft document +JSOnPaimentBill=Activate feature to autofill payment lines on payment form +CompanyIdProfChecker=Rules on Professional Ids +MustBeUnique=Must be unique ? +MustBeMandatory=Mandatory to create third parties ? +MustBeInvoiceMandatory=Mandatory to validate invoices ? +Miscellaneous=Miscellaneous +##### Webcal setup ##### +WebCalSetup=Webcalendar link setup +WebCalSyncro=Add Dolibarr events to WebCalendar +WebCalAllways=Always, no asking +WebCalYesByDefault=On demand (yes by default) +WebCalNoByDefault=On demand (no by default) +WebCalNever=Never +WebCalURL=URL for calendar access +WebCalServer=Server hosting calendar database +WebCalDatabaseName=Database name +WebCalUser=User to access database +WebCalSetupSaved=Webcalendar setup saved successfully. +WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful. +WebCalTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. +WebCalTestKo2=Connection to server '%s' with user '%s' failed. +WebCalErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be a Webcalendar database. +WebCalAddEventOnCreateActions=Add calendar event on actions create +WebCalAddEventOnCreateCompany=Add calendar event on companies create +WebCalAddEventOnStatusPropal=Add calendar event on commercial proposals status change +WebCalAddEventOnStatusContract=Add calendar event on contracts status change +WebCalAddEventOnStatusBill=Add calendar event on bills status change +WebCalAddEventOnStatusMember=Add calendar event on members status change +WebCalUrlForVCalExport=An export link to %s format is available at following link: %s +WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct. +##### Invoices ##### +BillsSetup=Invoices module setup +BillsDate=Invoices date +BillsNumberingModule=Invoices and credit notes numbering model +BillsPDFModules=Invoice documents models +CreditNoteSetup=Credit note module setup +CreditNotePDFModules=Credit note document models +CreditNote=Credit note +CreditNotes=Credit notes +ForceInvoiceDate=Force invoice date to validation date +DisableRepeatable=Disable repeatable invoices +SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice +EnableEditDeleteValidInvoice=Enable the possibility to edit/delete valid invoice with no payment +SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account +SuggestPaymentByChequeToAddress=Suggest payment by cheque to +FreeLegalTextOnInvoices=Free text on invoices +WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty) +##### Proposals ##### +PropalSetup=Commercial proposals module setup +CreateForm=Create forms +NumberOfProductLines=Number of product lines +ProposalsNumberingModules=Commercial proposal numbering models +ProposalsPDFModules=Commercial proposal documents models +ClassifiedInvoiced=Classified invoiced +HideTreadedPropal=Hide the treated commercial proposals in the list +AddShippingDateAbility=Add shipping date ability +AddDeliveryAddressAbility=Add delivery date ability +UseOptionLineIfNoQuantity=A line of product/service with a zero amount is considered as an option +FreeLegalTextOnProposal=Free text on commercial proposals +WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal +##### AskPriceSupplier ##### +AskPriceSupplierSetup=Price requests suppliers module setup +AskPriceSupplierNumberingModules=Price requests suppliers numbering models +AskPriceSupplierPDFModules=Price requests suppliers documents models +FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers +WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty) +BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request +##### Orders ##### +OrdersSetup=Order management setup +OrdersNumberingModules=Orders numbering models +OrdersModelModule=Order documents models +HideTreadedOrders=Hide the treated or cancelled orders in the list +ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order +FreeLegalTextOnOrders=Free text on orders +WatermarkOnDraftOrders=Watermark on draft orders (none if empty) +ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable +BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order +##### Clicktodial ##### +ClickToDialSetup=Click To Dial module setup +ClickToDialUrlDesc=Url called when a click on phone picto is done. In URL, you can use tags
__PHONETO__ that will be replaced with the phone number of person to call
__PHONEFROM__ that will be replaced with phone number of calling person (yours)
__LOGIN__ that will be replaced with your clicktodial login (defined on your user card)
__PASS__ that will be replaced with your clicktodial password (defined on your user card). +##### Bookmark4u ##### +Bookmark4uSetup=Bookmark4u module setup +##### Interventions ##### +InterventionsSetup=Interventions module setup +FreeLegalTextOnInterventions=Free text on intervention documents +FicheinterNumberingModules=Intervention numbering models +TemplatePDFInterventions=Intervention card documents models +WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty) +##### Contracts ##### +ContractsSetup=Contracts/Subscriptions module setup +ContractsNumberingModules=Contracts numbering modules +TemplatePDFContracts=Contracts documents models +FreeLegalTextOnContracts=Free text on contracts +WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty) +##### Members ##### +MembersSetup=Members module setup +MemberMainOptions=Main options +AddSubscriptionIntoAccount=Suggest by default to create a bank transaction, in bank module, when adding a new payed subscription +AdherentLoginRequired= Manage a Login for each member +AdherentMailRequired=EMail required to create a new member +MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default +##### LDAP setup ##### +LDAPSetup=LDAP Setup +LDAPGlobalParameters=Global parameters +LDAPUsersSynchro=Users +LDAPGroupsSynchro=Groups +LDAPContactsSynchro=Contacts +LDAPMembersSynchro=Members +LDAPSynchronization=LDAP synchronisation +LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP +LDAPToDolibarr=LDAP -> Dolibarr +DolibarrToLDAP=Dolibarr -> LDAP +LDAPNamingAttribute=Key in LDAP +LDAPSynchronizeUsers=Organization of users in LDAP +LDAPSynchronizeGroups=Organization of groups in LDAP +LDAPSynchronizeContacts=Organization of contacts in LDAP +LDAPSynchronizeMembers=Organization of foundation's members in LDAP +LDAPTypeExample=OpenLdap, Egroupware or Active Directory +LDAPPrimaryServer=Primary server +LDAPSecondaryServer=Secondary server +LDAPServerPort=Server port +LDAPServerPortExample=Default port : 389 +LDAPServerProtocolVersion=Protocol version +LDAPServerUseTLS=Use TLS +LDAPServerUseTLSExample=Your LDAP server use TLS +LDAPServerDn=Server DN +LDAPAdminDn=Administrator DN +LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com) +LDAPPassword=Administrator password +LDAPUserDn=Users' DN +LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com) +LDAPGroupDn=Groups' DN +LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com) +LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/) +LDAPServerDnExample=Complete DN (ex: dc=example,dc=com) +LDAPPasswordExample=Admin password +LDAPDnSynchroActive=Users and groups synchronization +LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization +LDAPDnContactActive=Contacts' synchronization +LDAPDnContactActiveYes=Activated synchronization +LDAPDnContactActiveExample=Activated/Unactivated synchronization +LDAPDnMemberActive=Members' synchronization +LDAPDnMemberActiveExample=Activated/Unactivated synchronization +LDAPContactDn=Dolibarr contacts' DN +LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com) +LDAPMemberDn=Dolibarr members DN +LDAPMemberDnExample=Complete DN (ex: ou=members,dc=example,dc=com) +LDAPMemberObjectClassList=List of objectClass +LDAPMemberObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPUserObjectClassList=List of objectClass +LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPGroupObjectClassList=List of objectClass +LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames) +LDAPContactObjectClassList=List of objectClass +LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory) +LDAPMemberTypeDn=Dolibarr members type DN +LDAPMemberTypeDnExample=Complete DN (ex: ou=type_members,dc=example,dc=com) +LDAPTestConnect=Test LDAP connection +LDAPTestSynchroContact=Test contacts synchronization +LDAPTestSynchroUser=Test user synchronization +LDAPTestSynchroGroup=Test group synchronization +LDAPTestSynchroMember=Test member synchronization +LDAPTestSearch= Test a LDAP search +LDAPSynchroOK=Synchronization test successful +LDAPSynchroKO=Failed synchronization test +LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates +LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s) +LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s) +LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s) +LDAPUnbindSuccessfull=Disconnect successful +LDAPUnbindFailed=Disconnect failed +LDAPConnectToDNSuccessfull=Connection to DN (%s) successful +LDAPConnectToDNFailed=Connection to DN (%s) failed +LDAPSetupForVersion3=LDAP server configured for version 3 +LDAPSetupForVersion2=LDAP server configured for version 2 +LDAPDolibarrMapping=Dolibarr Mapping +LDAPLdapMapping=LDAP Mapping +LDAPFieldLoginUnix=Login (unix) +LDAPFieldLoginExample=Example : uid +LDAPFilterConnection=Search filter +LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson) +LDAPFieldLoginSamba=Login (samba, activedirectory) +LDAPFieldLoginSambaExample=Example : samaccountname +LDAPFieldFullname=Full name +LDAPFieldFullnameExample=Example : cn +LDAPFieldPassword=Password +LDAPFieldPasswordNotCrypted=Password not crypted +LDAPFieldPasswordCrypted=Password crypted +LDAPFieldPasswordExample=Example : userPassword +LDAPFieldCommonName=Common name +LDAPFieldCommonNameExample=Example : cn +LDAPFieldName=Name +LDAPFieldNameExample=Example : sn +LDAPFieldFirstName=First name +LDAPFieldFirstNameExample=Example : givenName +LDAPFieldMail=Email address +LDAPFieldMailExample=Example : mail +LDAPFieldPhone=Professional phone number +LDAPFieldPhoneExample=Example : telephonenumber +LDAPFieldHomePhone=Personal phone number +LDAPFieldHomePhoneExample=Example : homephone +LDAPFieldMobile=Cellular phone +LDAPFieldMobileExample=Example : mobile +LDAPFieldFax=Fax number +LDAPFieldFaxExample=Example : facsimiletelephonenumber +LDAPFieldAddress=Street +LDAPFieldAddressExample=Example : street +LDAPFieldZip=Zip +LDAPFieldZipExample=Example : postalcode +LDAPFieldTown=Town +LDAPFieldTownExample=Example : l +LDAPFieldCountry=Country +LDAPFieldCountryExample=Example : c +LDAPFieldDescription=Description +LDAPFieldDescriptionExample=Example : description +LDAPFieldGroupMembers= Group members +LDAPFieldGroupMembersExample= Example : uniqueMember +LDAPFieldBirthdate=Birthdate +LDAPFieldBirthdateExample=Example : +LDAPFieldCompany=Company +LDAPFieldCompanyExample=Example : o +LDAPFieldSid=SID +LDAPFieldSidExample=Example : objectsid +LDAPFieldEndLastSubscription=Date of subscription end +LDAPFieldTitle=Post/Function +LDAPFieldTitleExample=Example: title +LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class) +LDAPSetupNotComplete=LDAP setup not complete (go on others tabs) +LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode. +LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts. +LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users. +LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups. +LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module. +LDAPDescValues=Example values are designed for OpenLDAP with following loaded schemas: core.schema, cosine.schema, inetorgperson.schema). If you use thoose values and OpenLDAP, modify your LDAP config file slapd.conf to have all thoose schemas loaded. +ForANonAnonymousAccess=For an authenticated access (for a write access for example) +PerfDolibarr=Performance setup/optimizing report +YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance. +NotInstalled=Not installed, so your server is not slow down by this. +ApplicativeCache=Applicative cache +MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server. +MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete. +MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled. +OPCodeCache=OPCode cache +NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad). +HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript) +FilesOfTypeCached=Files of type %s are cached by HTTP server +FilesOfTypeNotCached=Files of type %s are not cached by HTTP server +FilesOfTypeCompressed=Files of type %s are compressed by HTTP server +FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server +CacheByServer=Cache by server +CacheByClient=Cache by browser +CompressionOfResources=Compression of HTTP responses +TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers +##### Products ##### +ProductSetup=Products module setup +ServiceSetup=Services module setup +ProductServiceSetup=Products and Services modules setup +NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit) +ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms +ModifyProductDescAbility=Personalization of product descriptions in forms +ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip) +ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language +UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string. +UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list). +UseEcoTaxeAbility=Support Eco-Taxe (WEEE) +SetDefaultBarcodeTypeProducts=Default barcode type to use for products +SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties +ProductCodeChecker= Module for product code generation and checking (product or service) +ProductOtherConf= Product / Service configuration +##### Syslog ##### +SyslogSetup=Logs module setup +SyslogOutput=Logs outputs +SyslogSyslog=Syslog +SyslogFacility=Facility +SyslogLevel=Level +SyslogSimpleFile=File +SyslogFilename=File name and path +YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file. +ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant +OnlyWindowsLOG_USER=Windows only supports LOG_USER +##### Donations ##### +DonationsSetup=Donation module setup +DonationsReceiptModel=Template of donation receipt +##### Barcode ##### +BarcodeSetup=Barcode setup +PaperFormatModule=Print format module +BarcodeEncodeModule=Barcode encoding type +UseBarcodeInProductModule=Use bar codes for products +CodeBarGenerator=Barcode generator +ChooseABarCode=No generator defined +FormatNotSupportedByGenerator=Format not supported by this generator +BarcodeDescEAN8=Barcode of type EAN8 +BarcodeDescEAN13=Barcode of type EAN13 +BarcodeDescUPC=Barcode of type UPC +BarcodeDescISBN=Barcode of type ISBN +BarcodeDescC39=Barcode of type C39 +BarcodeDescC128=Barcode of type C128 +GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
For example: /usr/local/bin/genbarcode +BarcodeInternalEngine=Internal engine +BarCodeNumberManager=Manager to auto define barcode numbers +##### Prelevements ##### +WithdrawalsSetup=Withdrawal module setup +##### ExternalRSS ##### +ExternalRSSSetup=External RSS imports setup +NewRSS=New RSS Feed +RSSUrl=RSS URL +RSSUrlExample=An interesting RSS feed +##### Mailing ##### +MailingSetup=EMailing module setup +MailingEMailFrom=Sender EMail (From) for emails sent by emailing module +MailingEMailError=Return EMail (Errors-to) for emails with errors +MailingDelay=Seconds to wait after sending next message +##### Notification ##### +NotificationSetup=EMail notification module setup +NotificationEMailFrom=Sender EMail (From) for emails sent for notifications +ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules) +FixedEmailTarget=Fixed email target +##### Sendings ##### +SendingsSetup=Sending module setup +SendingsReceiptModel=Sending receipt model +SendingsNumberingModules=Sendings numbering modules +SendingsAbility=Support shipment sheets for customer deliveries +NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated. +FreeLegalTextOnShippings=Free text on shipments +##### Deliveries ##### +DeliveryOrderNumberingModules=Products deliveries receipt numbering module +DeliveryOrderModel=Products deliveries receipt model +DeliveriesOrderAbility=Support products deliveries receipts +FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts +##### FCKeditor ##### +AdvancedEditor=Advanced editor +ActivateFCKeditor=Activate advanced editor for: +FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services) +FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note +FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files. +FCKeditorForMailing= WYSIWIG creation/edition for mass eMailings (Tools->eMailing) +FCKeditorForUserSignature=WYSIWIG creation/edition of user signature +FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing) +##### OSCommerce 1 ##### +OSCommerceErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't look to be an OSCommerce database (Key %s not found in table %s). +OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' successfull. +OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached. +OSCommerceTestKo2=Connection to server '%s' with user '%s' failed. +##### Stock ##### +StockSetup=Warehouse module setup +UserWarehouse=Use user personal warehouses +IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up. +##### Menu ##### +MenuDeleted=Menu deleted +TreeMenu=Tree menus +Menus=Menus +TreeMenuPersonalized=Personalized menus +NewMenu=New menu +MenuConf=Menus setup +Menu=Selection of menu +MenuHandler=Menu handler +MenuModule=Source module +HideUnauthorizedMenu= Hide unauthorized menus (gray) +DetailId=Id menu +DetailMenuHandler=Menu handler where to show new menu +DetailMenuModule=Module name if menu entry come from a module +DetailType=Type of menu (top or left) +DetailTitre=Menu label or label code for translation +DetailMainmenu=Group for which it belongs (obsolete) +DetailUrl=URL where menu send you (Absolute URL link or external link with http://) +DetailLeftmenu=Display condition or not (obsolete) +DetailEnabled=Condition to show or not entry +DetailRight=Condition to display unauthorized grey menus +DetailLangs=Lang file name for label code translation +DetailUser=Intern / Extern / All +Target=Target +DetailTarget=Target for links (_blank top open a new window) +DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu) +ModifMenu=Menu change +DeleteMenu=Delete menu entry +ConfirmDeleteMenu=Are you sure you want to delete menu entry %s ? +DeleteLine=Delete line +ConfirmDeleteLine=Are you sure you want to delete this line ? +##### Tax ##### +TaxSetup=Taxes, social contributions and dividends module setup +OptionVatMode=VAT due +OptionVATDefault=Cash basis +OptionVATDebitOption=Accrual basis +OptionVatDefaultDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on payments for services +OptionVatDebitOptionDesc=VAT is due:
- on delivery for goods (we use invoice date)
- on invoice (debit) for services +SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option: +OnDelivery=On delivery +OnPayment=On payment +OnInvoice=On invoice +SupposedToBePaymentDate=Payment date used +SupposedToBeInvoiceDate=Invoice date used +Buy=Buy +Sell=Sell +InvoiceDateUsed=Invoice date used +YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup. +AccountancyCode=Accountancy Code +AccountancyCodeSell=Sale account. code +AccountancyCodeBuy=Purchase account. code +##### Agenda ##### +AgendaSetup=Events and agenda module setup +PasswordTogetVCalExport=Key to authorize export link +PastDelayVCalExport=Do not export event older than +AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events) +AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view +AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view +AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda +##### ClickToDial ##### +ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example. +##### Point Of Sales (CashDesk) ##### +CashDesk=Point of sales +CashDeskSetup=Point of sales module setup +CashDeskThirdPartyForSell=Default generic third party to use for sells +CashDeskBankAccountForSell=Default account to use to receive cash payments +CashDeskBankAccountForCheque= Default account to use to receive payments by cheque +CashDeskBankAccountForCB= Default account to use to receive payments by credit cards +CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock). +CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease +StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled +StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management +CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required. +##### Bookmark ##### +BookmarkSetup=Bookmark module setup +BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu. +NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu +##### WebServices ##### +WebServicesSetup=Webservices module setup +WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services. +WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here +EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url +##### Bank ##### +BankSetupModule=Bank module setup +FreeLegalTextOnChequeReceipts=Free text on cheque receipts +BankOrderShow=Display order of bank accounts for countries using "detailed bank number" +BankOrderGlobal=General +BankOrderGlobalDesc=General display order +BankOrderES=Spanish +BankOrderESDesc=Spanish display order +##### Multicompany ##### +MultiCompanySetup=Multi-company module setup +##### Suppliers ##### +SuppliersSetup=Supplier module setup +SuppliersCommandModel=Complete template of supplier order (logo...) +SuppliersInvoiceModel=Complete template of supplier invoice (logo...) +SuppliersInvoiceNumberingModel=Supplier invoices numbering models +##### GeoIPMaxmind ##### +GeoIPMaxmindSetup=GeoIP Maxmind module setup +PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Examples:
/usr/local/share/GeoIP/GeoIP.dat
/usr/share/GeoIP/GeoIP.dat +NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions). +YouCanDownloadFreeDatFileTo=You can download a free demo version of the Maxmind GeoIP country file at %s. +YouCanDownloadAdvancedDatFileTo=You can also download a more complete version, with updates, of the Maxmind GeoIP country file at %s. +TestGeoIPResult=Test of a conversion IP -> country +##### Projects ##### +ProjectsNumberingModules=Projects numbering module +ProjectsSetup=Project module setup +ProjectsModelModule=Project reports document model +TasksNumberingModules=Tasks numbering module +TaskModelModule=Tasks reports document model +##### ECM (GED) ##### +ECMSetup = GED Setup +ECMAutoTree = Automatic tree folder and document +##### Fiscal Year ##### +FiscalYears=Fiscal years +FiscalYear=Fiscal year +FiscalYearCard=Fiscal year card +NewFiscalYear=New fiscal year +EditFiscalYear=Edit fiscal year +OpenFiscalYear=Open fiscal year +CloseFiscalYear=Close fiscal year +DeleteFiscalYear=Delete fiscal year +ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ? +Opened=Opened +Closed=Closed +AlwaysEditable=Can always be edited +MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) +NbMajMin=Minimum number of uppercase characters +NbNumMin=Minimum number of numeric characters +NbSpeMin=Minimum number of special characters +NbIteConsecutive=Maximum number of repeating same characters +NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation +SalariesSetup=Setup of module salaries +SortOrder=Sort order +Format=Format +TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type +IncludePath=Include path (defined into variable %s) +ExpenseReportsSetup=Setup of module Expense Reports +TemplatePDFExpenseReports=Document templates to generate expense report document +NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. +NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. diff --git a/htdocs/langs/bn_BD/agenda.lang b/htdocs/langs/bn_BD/agenda.lang new file mode 100644 index 00000000000..04e2ae30de8 --- /dev/null +++ b/htdocs/langs/bn_BD/agenda.lang @@ -0,0 +1,93 @@ +# Dolibarr language file - Source file is en_US - agenda +IdAgenda=ID event +Actions=Events +ActionsArea=Events area (Actions and tasks) +Agenda=Agenda +Agendas=Agendas +Calendar=Calendar +Calendars=Calendars +LocalAgenda=Internal calendar +ActionsOwnedBy=Event owned by +AffectedTo=Assigned to +DoneBy=Done by +Event=Event +Events=Events +EventsNb=Number of events +MyEvents=My events +OtherEvents=Other events +ListOfActions=List of events +Location=Location +EventOnFullDay=Event on all day(s) +SearchAnAction= Search an event/task +MenuToDoActions=All incomplete events +MenuDoneActions=All terminated events +MenuToDoMyActions=My incomplete events +MenuDoneMyActions=My terminated events +ListOfEvents=List of events (internal calendar) +ActionsAskedBy=Events reported by +ActionsToDoBy=Events assigned to +ActionsDoneBy=Events done by +ActionsForUser=Events for user +ActionsForUsersGroup=Events for all users of group +ActionAssignedTo=Event assigned to +AllMyActions= All my events/tasks +AllActions= All events/tasks +ViewList=List view +ViewCal=Month view +ViewDay=Day view +ViewWeek=Week view +ViewPerUser=Per user view +ViewWithPredefinedFilters= View with predefined filters +AutoActions= Automatic filling +AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked (by default), only manual actions will be included in agenda. +AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...) +AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda. +ActionsEvents=Events for which Dolibarr will create an action in agenda automatically +PropalValidatedInDolibarr=Proposal %s validated +InvoiceValidatedInDolibarr=Invoice %s validated +InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS +InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status +InvoiceDeleteDolibarr=Invoice %s deleted +OrderValidatedInDolibarr= Order %s validated +OrderApprovedInDolibarr=Order %s approved +OrderRefusedInDolibarr=Order %s refused +OrderBackToDraftInDolibarr=Order %s go back to draft status +OrderCanceledInDolibarr=Order %s canceled +ProposalSentByEMail=Commercial proposal %s sent by EMail +OrderSentByEMail=Customer order %s sent by EMail +InvoiceSentByEMail=Customer invoice %s sent by EMail +SupplierOrderSentByEMail=Supplier order %s sent by EMail +SupplierInvoiceSentByEMail=Supplier invoice %s sent by EMail +ShippingSentByEMail=Shipment %s sent by EMail +ShippingValidated= Shipment %s validated +InterventionSentByEMail=Intervention %s sent by EMail +NewCompanyToDolibarr= Third party created +DateActionPlannedStart= Planned start date +DateActionPlannedEnd= Planned end date +DateActionDoneStart= Real start date +DateActionDoneEnd= Real end date +DateActionStart= Start date +DateActionEnd= End date +AgendaUrlOptions1=You can also add following parameters to filter output: +AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s. +AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s. +AgendaUrlOptions4=logint=%s to restrict output to actions assigned to user %s. +AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID. +AgendaShowBirthdayEvents=Show birthday's contacts +AgendaHideBirthdayEvents=Hide birthday's contacts +Busy=Busy +ExportDataset_event1=List of agenda events +DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6) +DefaultWorkingHours=Default working hours in day (Example: 9-18) +# External Sites ical +ExportCal=Export calendar +ExtSites=Import external calendars +ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users. +ExtSitesNbOfAgenda=Number of calendars +AgendaExtNb=Calendar nb %s +ExtSiteUrlAgenda=URL to access .ical file +ExtSiteNoLabel=No Description +WorkingTimeRange=Working time range +WorkingDaysRange=Working days range +AddEvent=Create event +MyAvailability=My availability diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang new file mode 100644 index 00000000000..a2306950fb4 --- /dev/null +++ b/htdocs/langs/bn_BD/banks.lang @@ -0,0 +1,165 @@ +# Dolibarr language file - Source file is en_US - banks +Bank=Bank +Banks=Banks +MenuBankCash=Bank/Cash +MenuSetupBank=Bank/Cash setup +BankName=Bank name +FinancialAccount=Account +FinancialAccounts=Accounts +BankAccount=Bank account +BankAccounts=Bank accounts +ShowAccount=Show Account +AccountRef=Financial account ref +AccountLabel=Financial account label +CashAccount=Cash account +CashAccounts=Cash accounts +MainAccount=Main account +CurrentAccount=Current account +CurrentAccounts=Current accounts +SavingAccount=Savings account +SavingAccounts=Savings accounts +ErrorBankLabelAlreadyExists=Financial account label already exists +BankBalance=Balance +BankBalanceBefore=Balance before +BankBalanceAfter=Balance after +BalanceMinimalAllowed=Minimum allowed balance +BalanceMinimalDesired=Minimum desired balance +InitialBankBalance=Initial balance +EndBankBalance=End balance +CurrentBalance=Current balance +FutureBalance=Future balance +ShowAllTimeBalance=Show balance from start +AllTime=From start +Reconciliation=Reconciliation +RIB=Bank Account Number +IBAN=IBAN number +IbanValid=IBAN is Valid +IbanNotValid=IBAN is Not Valid +BIC=BIC/SWIFT number +SwiftValid=BIC/SWIFT is Valid +SwiftNotValid=BIC/SWIFT is Not Valid +StandingOrders=Standing orders +StandingOrder=Standing order +Withdrawals=Withdrawals +Withdrawal=Withdrawal +AccountStatement=Account statement +AccountStatementShort=Statement +AccountStatements=Account statements +LastAccountStatements=Last account statements +Rapprochement=Reconciliate +IOMonthlyReporting=Monthly reporting +BankAccountDomiciliation=Account address +BankAccountCountry=Account country +BankAccountOwner=Account owner name +BankAccountOwnerAddress=Account owner address +RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN). +CreateAccount=Create account +NewAccount=New account +NewBankAccount=New bank account +NewFinancialAccount=New financial account +MenuNewFinancialAccount=New financial account +NewCurrentAccount=New current account +NewSavingAccount=New savings account +NewCashAccount=New cash account +EditFinancialAccount=Edit account +AccountSetup=Financial accounts setup +SearchBankMovement=Search bank movement +Debts=Debts +LabelBankCashAccount=Bank or cash label +AccountType=Account type +BankType0=Savings account +BankType1=Current or credit card account +BankType2=Cash account +IfBankAccount=If bank account +AccountsArea=Accounts area +AccountCard=Account card +DeleteAccount=Delete account +ConfirmDeleteAccount=Are you sure you want to delete this account ? +Account=Account +ByCategories=By categories +ByRubriques=By categories +BankTransactionByCategories=Bank transactions by categories +BankTransactionForCategory=Bank transactions for category %s +RemoveFromRubrique=Remove link with category +RemoveFromRubriqueConfirm=Are you sure you want to remove link between the transaction and the category ? +ListBankTransactions=List of bank transactions +IdTransaction=Transaction ID +BankTransactions=Bank transactions +SearchTransaction=Search transaction +ListTransactions=List transactions +ListTransactionsByCategory=List transaction/category +TransactionsToConciliate=Transactions to reconcile +Conciliable=Can be reconciled +Conciliate=Reconcile +Conciliation=Reconciliation +ConciliationForAccount=Reconcile this account +IncludeClosedAccount=Include closed accounts +OnlyOpenedAccount=Only opened accounts +AccountToCredit=Account to credit +AccountToDebit=Account to debit +DisableConciliation=Disable reconciliation feature for this account +ConciliationDisabled=Reconciliation feature disabled +StatusAccountOpened=Opened +StatusAccountClosed=Closed +AccountIdShort=Number +EditBankRecord=Edit record +LineRecord=Transaction +AddBankRecord=Add transaction +AddBankRecordLong=Add transaction manually +ConciliatedBy=Reconciled by +DateConciliating=Reconcile date +BankLineConciliated=Transaction reconciled +CustomerInvoicePayment=Customer payment +CustomerInvoicePaymentBack=Customer payment back +SupplierInvoicePayment=Supplier payment +WithdrawalPayment=Withdrawal payment +SocialContributionPayment=Social contribution payment +FinancialAccountJournal=Financial account journal +BankTransfer=Bank transfer +BankTransfers=Bank transfers +TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction) +TransferFrom=From +TransferTo=To +TransferFromToDone=A transfer from %s to %s of %s %s has been recorded. +CheckTransmitter=Transmitter +ValidateCheckReceipt=Validate this check receipt ? +ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done ? +DeleteCheckReceipt=Delete this check receipt ? +ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt ? +BankChecks=Bank checks +BankChecksToReceipt=Checks waiting for deposit +ShowCheckReceipt=Show check deposit receipt +NumberOfCheques=Nb of check +DeleteTransaction=Delete transaction +ConfirmDeleteTransaction=Are you sure you want to delete this transaction ? +ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions +BankMovements=Movements +CashBudget=Cash budget +PlannedTransactions=Planned transactions +Graph=Graphics +ExportDataset_banque_1=Bank transactions and account statement +ExportDataset_banque_2=Deposit slip +TransactionOnTheOtherAccount=Transaction on the other account +TransactionWithOtherAccount=Account transfer +PaymentNumberUpdateSucceeded=Payment number updated succesfully +PaymentNumberUpdateFailed=Payment number could not be updated +PaymentDateUpdateSucceeded=Payment date update succesfully +PaymentDateUpdateFailed=Payment date could not be updated +Transactions=Transactions +BankTransactionLine=Bank transaction +AllAccounts=All bank/cash accounts +BackToAccount=Back to account +ShowAllAccounts=Show for all accounts +FutureTransaction=Transaction in futur. No way to conciliate. +SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create". +InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD +EventualyAddCategory=Eventually, specify a category in which to classify the records +ToConciliate=To conciliate? +ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click +BankDashboard=Bank accounts summary +DefaultRIB=Default BAN +AllRIB=All BAN +LabelRIB=BAN Label +NoBANRecord=No BAN record +DeleteARib=Delete BAN record +ConfirmDeleteRib=Are you sure you want to delete this BAN record ? diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang new file mode 100644 index 00000000000..69e1510ca44 --- /dev/null +++ b/htdocs/langs/bn_BD/bills.lang @@ -0,0 +1,431 @@ +# Dolibarr language file - Source file is en_US - bills +Bill=Invoice +Bills=Invoices +BillsCustomers=Customers invoices +BillsCustomer=Customers invoice +BillsSuppliers=Suppliers invoices +BillsCustomersUnpaid=Unpaid customers invoices +BillsCustomersUnpaidForCompany=Unpaid customer's invoices for %s +BillsSuppliersUnpaid=Unpaid supplier's invoices +BillsSuppliersUnpaidForCompany=Unpaid supplier's invoices for %s +BillsLate=Late payments +BillsStatistics=Customers invoices statistics +BillsStatisticsSuppliers=Suppliers invoices statistics +DisabledBecauseNotErasable=Disabled because can not be erased +InvoiceStandard=Standard invoice +InvoiceStandardAsk=Standard invoice +InvoiceStandardDesc=This kind of invoice is the common invoice. +InvoiceDeposit=Deposit invoice +InvoiceDepositAsk=Deposit invoice +InvoiceDepositDesc=This kind of invoice is done when a deposit has been received. +InvoiceProForma=Proforma invoice +InvoiceProFormaAsk=Proforma invoice +InvoiceProFormaDesc=Proforma invoice is an image of a true invoice but has no accountancy value. +InvoiceReplacement=Replacement invoice +InvoiceReplacementAsk=Replacement invoice for invoice +InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'. +InvoiceAvoir=Credit note +InvoiceAvoirAsk=Credit note to correct invoice +InvoiceAvoirDesc=The credit note is a negative invoice used to solve fact that an invoice has an amount that differs than amount really paid (because customer paid too much by error, or will not paid completely since he returned some products for example). +invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice +invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice +invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount +ReplaceInvoice=Replace invoice %s +ReplacementInvoice=Replacement invoice +ReplacedByInvoice=Replaced by invoice %s +ReplacementByInvoice=Replaced by invoice +CorrectInvoice=Correct invoice %s +CorrectionInvoice=Correction invoice +UsedByInvoice=Used to pay invoice %s +ConsumedBy=Consumed by +NotConsumed=Not consumed +NoReplacableInvoice=No replacable invoices +NoInvoiceToCorrect=No invoice to correct +InvoiceHasAvoir=Corrected by one or several invoices +CardBill=Invoice card +PredefinedInvoices=Predefined Invoices +Invoice=Invoice +Invoices=Invoices +InvoiceLine=Invoice line +InvoiceCustomer=Customer invoice +CustomerInvoice=Customer invoice +CustomersInvoices=Customers invoices +SupplierInvoice=Supplier invoice +SuppliersInvoices=Suppliers invoices +SupplierBill=Supplier invoice +SupplierBills=suppliers invoices +Payment=Payment +PaymentBack=Payment back +Payments=Payments +PaymentsBack=Payments back +PaidBack=Paid back +DatePayment=Payment date +DeletePayment=Delete payment +ConfirmDeletePayment=Are you sure you want to delete this payment ? +ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?
The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer. +SupplierPayments=Suppliers payments +ReceivedPayments=Received payments +ReceivedCustomersPayments=Payments received from customers +PayedSuppliersPayments=Payments payed to suppliers +ReceivedCustomersPaymentsToValid=Received customers payments to validate +PaymentsReportsForYear=Payments reports for %s +PaymentsReports=Payments reports +PaymentsAlreadyDone=Payments already done +PaymentsBackAlreadyDone=Payments back already done +PaymentRule=Payment rule +PaymentMode=Payment type +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms +PaymentAmount=Payment amount +ValidatePayment=Validate payment +PaymentHigherThanReminderToPay=Payment higher than reminder to pay +HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices. +HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay.
Edit your entry, otherwise confirm. +ClassifyPaid=Classify 'Paid' +ClassifyPaidPartially=Classify 'Paid partially' +ClassifyCanceled=Classify 'Abandoned' +ClassifyClosed=Classify 'Closed' +ClassifyUnBilled=Classify 'Unbilled' +CreateBill=Create Invoice +AddBill=Create invoice or credit note +AddToDraftInvoices=Add to draft invoice +DeleteBill=Delete invoice +SearchACustomerInvoice=Search for a customer invoice +SearchASupplierInvoice=Search for a supplier invoice +CancelBill=Cancel an invoice +SendRemindByMail=Send reminder by EMail +DoPayment=Do payment +DoPaymentBack=Do payment back +ConvertToReduc=Convert into future discount +EnterPaymentReceivedFromCustomer=Enter payment received from customer +EnterPaymentDueToCustomer=Make payment due to customer +DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero +Amount=Amount +PriceBase=Price base +BillStatus=Invoice status +BillStatusDraft=Draft (needs to be validated) +BillStatusPaid=Paid +BillStatusPaidBackOrConverted=Paid or converted into discount +BillStatusConverted=Paid (ready for final invoice) +BillStatusCanceled=Abandoned +BillStatusValidated=Validated (needs to be paid) +BillStatusStarted=Started +BillStatusNotPaid=Not paid +BillStatusClosedUnpaid=Closed (unpaid) +BillStatusClosedPaidPartially=Paid (partially) +BillShortStatusDraft=Draft +BillShortStatusPaid=Paid +BillShortStatusPaidBackOrConverted=Processed +BillShortStatusConverted=Processed +BillShortStatusCanceled=Abandoned +BillShortStatusValidated=Validated +BillShortStatusStarted=Started +BillShortStatusNotPaid=Not paid +BillShortStatusClosedUnpaid=Closed +BillShortStatusClosedPaidPartially=Paid (partially) +PaymentStatusToValidShort=To validate +ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined +ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this. +ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes +ErrorBillNotFound=Invoice %s does not exist +ErrorInvoiceAlreadyReplaced=Error, you try to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s. +ErrorDiscountAlreadyUsed=Error, discount already used +ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount +ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have a positive amount +ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status +BillFrom=From +BillTo=To +ActionsOnBill=Actions on invoice +NewBill=New invoice +LastBills=Last %s invoices +LastCustomersBills=Last %s customers invoices +LastSuppliersBills=Last %s suppliers invoices +AllBills=All invoices +OtherBills=Other invoices +DraftBills=Draft invoices +CustomersDraftInvoices=Customers draft invoices +SuppliersDraftInvoices=Suppliers draft invoices +Unpaid=Unpaid +ConfirmDeleteBill=Are you sure you want to delete this invoice ? +ConfirmValidateBill=Are you sure you want to validate this invoice with reference %s ? +ConfirmUnvalidateBill=Are you sure you want to change invoice %s to draft status ? +ConfirmClassifyPaidBill=Are you sure you want to change invoice %s to status paid ? +ConfirmCancelBill=Are you sure you want to cancel invoice %s ? +ConfirmCancelBillQuestion=Why do you want to classify this invoice 'abandoned' ? +ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s to status paid ? +ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ? +ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note. +ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount. +ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note. +ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad customer +ConfirmClassifyPaidPartiallyReasonProductReturned=Products partially returned +ConfirmClassifyPaidPartiallyReasonOther=Amount abandoned for other reason +ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction») +ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note. +ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use this choice if all other does not suit +ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A bad customer is a customer that refuse to pay his debt. +ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=This choice is used when payment is not complete because some of products were returned +ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:
- payment not complete because some products were shipped back
- amount claimed too important because a discount was forgotten
In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note. +ConfirmClassifyAbandonReasonOther=Other +ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice. +ConfirmCustomerPayment=Do you confirm this payment input for %s %s ? +ConfirmSupplierPayment=Do you confirm this payment input for %s %s ? +ConfirmValidatePayment=Are you sure you want to validate this payment ? No change can be made once payment is validated. +ValidateBill=Validate invoice +UnvalidateBill=Unvalidate invoice +NumberOfBills=Nb of invoices +NumberOfBillsByMonth=Nb of invoices by month +AmountOfBills=Amount of invoices +AmountOfBillsByMonthHT=Amount of invoices by month (net of tax) +ShowSocialContribution=Show social contribution +ShowBill=Show invoice +ShowInvoice=Show invoice +ShowInvoiceReplace=Show replacing invoice +ShowInvoiceAvoir=Show credit note +ShowInvoiceDeposit=Show deposit invoice +ShowPayment=Show payment +File=File +AlreadyPaid=Already paid +AlreadyPaidBack=Already paid back +AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and deposits) +Abandoned=Abandoned +RemainderToPay=Remaining unpaid +RemainderToTake=Remaining amount to take +RemainderToPayBack=Remaining amount to pay back +Rest=Pending +AmountExpected=Amount claimed +ExcessReceived=Excess received +EscompteOffered=Discount offered (payment before term) +SendBillRef=Submission of invoice %s +SendReminderBillRef=Submission of invoice %s (reminder) +StandingOrders=Standing orders +StandingOrder=Standing order +NoDraftBills=No draft invoices +NoOtherDraftBills=No other draft invoices +NoDraftInvoices=No draft invoices +RefBill=Invoice ref +ToBill=To bill +RemainderToBill=Remainder to bill +SendBillByMail=Send invoice by email +SendReminderBillByMail=Send reminder by email +RelatedCommercialProposals=Related commercial proposals +MenuToValid=To valid +DateMaxPayment=Payment due before +DateEcheance=Due date limit +DateInvoice=Invoice date +NoInvoice=No invoice +ClassifyBill=Classify invoice +SupplierBillsToPay=Suppliers invoices to pay +CustomerBillsUnpaid=Unpaid customers invoices +DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters +NonPercuRecuperable=Non-recoverable +SetConditions=Set payment terms +SetMode=Set payment mode +Billed=Billed +RepeatableInvoice=Template invoice +RepeatableInvoices=Template invoices +Repeatable=Template +Repeatables=Templates +ChangeIntoRepeatableInvoice=Convert into template invoice +CreateRepeatableInvoice=Create template invoice +CreateFromRepeatableInvoice=Create from template invoice +CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines +CustomersInvoicesAndPayments=Customer invoices and payments +ExportDataset_invoice_1=Customer invoices list and invoice's lines +ExportDataset_invoice_2=Customer invoices and payments +ProformaBill=Proforma Bill: +Reduction=Reduction +ReductionShort=Reduc. +Reductions=Reductions +ReductionsShort=Reduc. +Discount=Discount +Discounts=Discounts +AddDiscount=Create discount +AddRelativeDiscount=Create relative discount +EditRelativeDiscount=Edit relative discount +AddGlobalDiscount=Create absolute discount +EditGlobalDiscounts=Edit absolute discounts +AddCreditNote=Create credit note +ShowDiscount=Show discount +ShowReduc=Show the deduction +RelativeDiscount=Relative discount +GlobalDiscount=Global discount +CreditNote=Credit note +CreditNotes=Credit notes +Deposit=Deposit +Deposits=Deposits +DiscountFromCreditNote=Discount from credit note %s +DiscountFromDeposit=Payments from deposit invoice %s +AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation +CreditNoteDepositUse=Invoice must be validated to use this king of credits +NewGlobalDiscount=New absolute discount +NewRelativeDiscount=New relative discount +NoteReason=Note/Reason +ReasonDiscount=Reason +DiscountOfferedBy=Granted by +DiscountStillRemaining=Discounts still remaining +DiscountAlreadyCounted=Discounts already counted +BillAddress=Bill address +HelpEscompte=This discount is a discount granted to customer because its payment was made before term. +HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose. +HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example) +IdSocialContribution=Social contribution id +PaymentId=Payment id +InvoiceId=Invoice id +InvoiceRef=Invoice ref. +InvoiceDateCreation=Invoice creation date +InvoiceStatus=Invoice status +InvoiceNote=Invoice note +InvoicePaid=Invoice paid +PaymentNumber=Payment number +RemoveDiscount=Remove discount +WatermarkOnDraftBill=Watermark on draft invoices (nothing if empty) +InvoiceNotChecked=No invoice selected +CloneInvoice=Clone invoice +ConfirmCloneInvoice=Are you sure you want to clone this invoice %s ? +DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced +DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here. +NbOfPayments=Nb of payments +SplitDiscount=Split discount in two +ConfirmSplitDiscount=Are you sure you want to split this discount of %s %s into 2 lower discounts ? +TypeAmountOfEachNewDiscount=Input amount for each of two parts : +TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount. +ConfirmRemoveDiscount=Are you sure you want to remove this discount ? +RelatedBill=Related invoice +RelatedBills=Related invoices +LatestRelatedBill=Latest related invoice +WarningBillExist=Warning, one or more invoice already exist + +# PaymentConditions +PaymentConditionShortRECEP=Immediate +PaymentConditionRECEP=Immediate +PaymentConditionShort30D=30 days +PaymentCondition30D=30 days +PaymentConditionShort30DENDMONTH=30 days end of month +PaymentCondition30DENDMONTH=30 days end of month +PaymentConditionShort60D=60 days +PaymentCondition60D=60 days +PaymentConditionShort60DENDMONTH=60 days end of month +PaymentCondition60DENDMONTH=60 days end of month +PaymentConditionShortPT_DELIVERY=Delivery +PaymentConditionPT_DELIVERY=On delivery +PaymentConditionShortPT_ORDER=On order +PaymentConditionPT_ORDER=On order +PaymentConditionShortPT_5050=50-50 +PaymentConditionPT_5050=50%% in advance, 50%% on delivery +FixAmount=Fix amount +VarAmount=Variable amount (%% tot.) +# PaymentType +PaymentTypeVIR=Bank deposit +PaymentTypeShortVIR=Bank deposit +PaymentTypePRE=Bank's order +PaymentTypeShortPRE=Bank's order +PaymentTypeLIQ=Cash +PaymentTypeShortLIQ=Cash +PaymentTypeCB=Credit card +PaymentTypeShortCB=Credit card +PaymentTypeCHQ=Check +PaymentTypeShortCHQ=Check +PaymentTypeTIP=TIP +PaymentTypeShortTIP=TIP +PaymentTypeVAD=On line payment +PaymentTypeShortVAD=On line payment +PaymentTypeTRA=Bill payment +PaymentTypeShortTRA=Bill +BankDetails=Bank details +BankCode=Bank code +DeskCode=Desk code +BankAccountNumber=Account number +BankAccountNumberKey=Key +Residence=Domiciliation +IBANNumber=IBAN number +IBAN=IBAN +BIC=BIC/SWIFT +BICNumber=BIC/SWIFT number +ExtraInfos=Extra infos +RegulatedOn=Regulated on +ChequeNumber=Check N° +ChequeOrTransferNumber=Check/Transfer N° +ChequeMaker=Check transmitter +ChequeBank=Bank of Check +CheckBank=Check +NetToBePaid=Net to be paid +PhoneNumber=Tel +FullPhoneNumber=Telephone +TeleFax=Fax +PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration. +IntracommunityVATNumber=Intracommunity number of VAT +PaymentByChequeOrderedTo=Check payment (including tax) are payable to %s send to +PaymentByChequeOrderedToShort=Check payment (including tax) are payable to +SendTo=sent to +PaymentByTransferOnThisBankAccount=Payment by transfer on the following bank account +VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI +LawApplicationPart1=By application of the law 80.335 of 12/05/80 +LawApplicationPart2=the goods remain the property of +LawApplicationPart3=the seller until the complete cashing of +LawApplicationPart4=their price. +LimitedLiabilityCompanyCapital=SARL with Capital of +UseLine=Apply +UseDiscount=Use discount +UseCredit=Use credit +UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit +MenuChequeDeposits=Checks deposits +MenuCheques=Checks +MenuChequesReceipts=Checks receipts +NewChequeDeposit=New deposit +ChequesReceipts=Checks receipts +ChequesArea=Checks deposits area +ChequeDeposits=Checks deposits +Cheques=Checks +CreditNoteConvertedIntoDiscount=This credit note or deposit invoice has been converted into %s +UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices +ShowUnpaidAll=Show all unpaid invoices +ShowUnpaidLateOnly=Show late unpaid invoices only +PaymentInvoiceRef=Payment invoice %s +ValidateInvoice=Validate invoice +Cash=Cash +Reported=Delayed +DisabledBecausePayments=Not possible since there are some payments +CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid +ExpectedToPay=Expected payment +PayedByThisPayment=Paid by this payment +ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid. +ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back. +AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid". +ToMakePayment=Pay +ToMakePaymentBack=Pay back +ListOfYourUnpaidInvoices=List of unpaid invoices +NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative. +RevenueStamp=Revenue stamp +YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty +PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template) +TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +##### Types de contacts ##### +TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice +TypeContact_facture_external_BILLING=Customer invoice contact +TypeContact_facture_external_SHIPPING=Customer shipping contact +TypeContact_facture_external_SERVICE=Customer service contact +TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice +TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact +TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_invoice_supplier_external_SERVICE=Supplier service contact +# Situation invoices +InvoiceFirstSituationAsk=First situation invoice +InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice. +InvoiceSituation=Situation invoice +InvoiceSituationAsk=Invoice following the situation +InvoiceSituationDesc=Create a new situation following an already existing one +SituationAmount=Situation invoice amount(net) +SituationDeduction=Situation subtraction +Progress=Progress +ModifyAllLines=Modify all lines +CreateNextSituationInvoice=Create next situation +NotLastInCycle=This invoice in not the last in cycle and must not be modified. +DisabledBecauseNotLastInCycle=The next situation already exists. +DisabledBecauseFinal=This situation is final. +CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation. +NoSituations=No opened situations +InvoiceSituationLast=Final and general invoice diff --git a/htdocs/langs/bn_BD/bookmarks.lang b/htdocs/langs/bn_BD/bookmarks.lang new file mode 100644 index 00000000000..7acb946bb62 --- /dev/null +++ b/htdocs/langs/bn_BD/bookmarks.lang @@ -0,0 +1,19 @@ +# Dolibarr language file - Source file is en_US - marque pages +AddThisPageToBookmarks=Add this page to bookmarks +Bookmark=Bookmark +Bookmarks=Bookmarks +NewBookmark=New bookmark +ShowBookmark=Show bookmark +OpenANewWindow=Open a new window +ReplaceWindow=Replace current window +BookmarkTargetNewWindowShort=New window +BookmarkTargetReplaceWindowShort=Current window +BookmarkTitle=Bookmark title +UrlOrLink=URL +BehaviourOnClick=Behaviour when a URL is clicked +CreateBookmark=Create bookmark +SetHereATitleForLink=Set a title for the bookmark +UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL +ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window +BookmarksManagement=Bookmarks management +ListOfBookmarks=List of bookmarks diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang new file mode 100644 index 00000000000..bf118b9b88e --- /dev/null +++ b/htdocs/langs/bn_BD/boxes.lang @@ -0,0 +1,96 @@ +# Dolibarr language file - Source file is en_US - boxes +BoxLastRssInfos=Rss information +BoxLastProducts=Last %s products/services +BoxProductsAlertStock=Products in stock alert +BoxLastProductsInContract=Last %s contracted products/services +BoxLastSupplierBills=Last supplier's invoices +BoxLastCustomerBills=Last customer's invoices +BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices +BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices +BoxLastProposals=Last commercial proposals +BoxLastProspects=Last modified prospects +BoxLastCustomers=Last modified customers +BoxLastSuppliers=Last modified suppliers +BoxLastCustomerOrders=Last customer orders +BoxLastValidatedCustomerOrders=Last validated customer orders +BoxLastBooks=Last books +BoxLastActions=Last actions +BoxLastContracts=Last contracts +BoxLastContacts=Last contacts/addresses +BoxLastMembers=Last members +BoxFicheInter=Last interventions +BoxCurrentAccounts=Opened accounts balance +BoxSalesTurnover=Sales turnover +BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices +BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices +BoxTitleLastBooks=Last %s recorded books +BoxTitleNbOfCustomers=Number of clients +BoxTitleLastRssInfos=Last %s news from %s +BoxTitleLastProducts=Last %s modified products/services +BoxTitleProductsAlertStock=Products in stock alert +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders +BoxTitleLastSuppliers=Last %s recorded suppliers +BoxTitleLastCustomers=Last %s recorded customers +BoxTitleLastModifiedSuppliers=Last %s modified suppliers +BoxTitleLastModifiedCustomers=Last %s modified customers +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals +BoxTitleLastCustomerBills=Last %s customer's invoices +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices +BoxTitleLastSupplierBills=Last %s supplier's invoices +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices +BoxTitleLastModifiedProspects=Last %s modified prospects +BoxTitleLastProductsInContract=Last %s products/services in a contract +BoxTitleLastModifiedMembers=Last %s members +BoxTitleLastFicheInter=Last %s modified intervention +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices +BoxTitleCurrentAccounts=Opened account's balances +BoxTitleSalesTurnover=Sales turnover +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices +BoxTitleLastModifiedContacts=Last %s modified contacts/addresses +BoxMyLastBookmarks=My last %s bookmarks +BoxOldestExpiredServices=Oldest active expired services +BoxLastExpiredServices=Last %s oldest contacts with active expired services +BoxTitleLastActionsToDo=Last %s actions to do +BoxTitleLastContracts=Last %s contracts +BoxTitleLastModifiedDonations=Last %s modified donations +BoxTitleLastModifiedExpenses=Last %s modified expenses +BoxGlobalActivity=Global activity (invoices, proposals, orders) +FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s +LastRefreshDate=Last refresh date +NoRecordedBookmarks=No bookmarks defined. +ClickToAdd=Click here to add. +NoRecordedCustomers=No recorded customers +NoRecordedContacts=No recorded contacts +NoActionsToDo=No actions to do +NoRecordedOrders=No recorded customer's orders +NoRecordedProposals=No recorded proposals +NoRecordedInvoices=No recorded customer's invoices +NoUnpaidCustomerBills=No unpaid customer's invoices +NoRecordedSupplierInvoices=No recorded supplier's invoices +NoUnpaidSupplierBills=No unpaid supplier's invoices +NoModifiedSupplierBills=No recorded supplier's invoices +NoRecordedProducts=No recorded products/services +NoRecordedProspects=No recorded prospects +NoContractedProducts=No products/services contracted +NoRecordedContracts=No recorded contracts +NoRecordedInterventions=No recorded interventions +BoxLatestSupplierOrders=Latest supplier orders +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders +NoSupplierOrder=No recorded supplier order +BoxCustomersInvoicesPerMonth=Customer invoices per month +BoxSuppliersInvoicesPerMonth=Supplier invoices per month +BoxCustomersOrdersPerMonth=Customer orders per month +BoxSuppliersOrdersPerMonth=Supplier orders per month +BoxProposalsPerMonth=Proposals per month +NoTooLowStockProducts=No product under the low stock limit +BoxProductDistribution=Products/Services distribution +BoxProductDistributionFor=Distribution of %s for %s +ForCustomersInvoices=Customers invoices +ForCustomersOrders=Customers orders +ForProposals=Proposals diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang new file mode 100644 index 00000000000..d3dcfb68e64 --- /dev/null +++ b/htdocs/langs/bn_BD/cashdesk.lang @@ -0,0 +1,40 @@ +# Language file - Source file is en_US - cashdesk +CashDeskMenu=Point of sale +CashDesk=Point of sale +CashDesks=Point of sales +CashDeskBank=Bank account +CashDeskBankCash=Bank account (cash) +CashDeskBankCB=Bank account (card) +CashDeskBankCheque=Bank account (cheque) +CashDeskWarehouse=Warehouse +CashdeskShowServices=Selling services +CashDeskProducts=Products +CashDeskStock=Stock +CashDeskOn=on +CashDeskThirdParty=Third party +CashdeskDashboard=Point of sale access +ShoppingCart=Shopping cart +NewSell=New sell +BackOffice=Back office +AddThisArticle=Add this article +RestartSelling=Go back on sell +SellFinished=Sell finished +PrintTicket=Print ticket +NoProductFound=No article found +ProductFound=product found +ProductsFound=products found +NoArticle=No article +Identification=Identification +Article=Article +Difference=Difference +TotalTicket=Total ticket +NoVAT=No VAT for this sale +Change=Excess received +CalTip=Click to view the calendar +CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined
Change stock module setup, or choose a warehouse +BankToPay=Charge Account +ShowCompany=Show company +ShowStock=Show warehouse +DeleteArticle=Click to remove this article +FilterRefOrLabelOrBC=Search (Ref/Label) +UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock. diff --git a/htdocs/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang new file mode 100644 index 00000000000..22914931db1 --- /dev/null +++ b/htdocs/langs/bn_BD/categories.lang @@ -0,0 +1,112 @@ +# Dolibarr language file - Source file is en_US - categories +Category=Category +Categories=Categories +Rubrique=Category +Rubriques=Categories +categories=categories +TheCategorie=The category +NoCategoryYet=No category of this type created +In=In +AddIn=Add in +modify=modify +Classify=Classify +CategoriesArea=Categories area +ProductsCategoriesArea=Products/Services categories area +SuppliersCategoriesArea=Suppliers categories area +CustomersCategoriesArea=Customers categories area +ThirdPartyCategoriesArea=Third parties categories area +MembersCategoriesArea=Members categories area +ContactsCategoriesArea=Contacts categories area +MainCats=Main categories +SubCats=Subcategories +CatStatistics=Statistics +CatList=List of categories +AllCats=All categories +ViewCat=View category +NewCat=Add category +NewCategory=New category +ModifCat=Modify category +CatCreated=Category created +CreateCat=Create category +CreateThisCat=Create this category +ValidateFields=Validate the fields +NoSubCat=No subcategory. +SubCatOf=Subcategory +FoundCats=Found categories +FoundCatsForName=Categories found for the name : +FoundSubCatsIn=Subcategories found in the category +ErrSameCatSelected=You selected the same category several times +ErrForgotCat=You forgot to choose the category +ErrForgotField=You forgot to inform the fields +ErrCatAlreadyExists=This name is already used +AddProductToCat=Add this product to a category? +ImpossibleAddCat=Impossible to add the category +ImpossibleAssociateCategory=Impossible to associate the category to +WasAddedSuccessfully=%s was added successfully. +ObjectAlreadyLinkedToCategory=Element is already linked to this category. +CategorySuccessfullyCreated=This category %s has been added with success. +ProductIsInCategories=Product/service owns to following categories +SupplierIsInCategories=Third party owns to following suppliers categories +CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories +CompanyIsInSuppliersCategories=This third party owns to following suppliers categories +MemberIsInCategories=This member owns to following members categories +ContactIsInCategories=This contact owns to following contacts categories +ProductHasNoCategory=This product/service is not in any categories +SupplierHasNoCategory=This supplier is not in any categories +CompanyHasNoCategory=This company is not in any categories +MemberHasNoCategory=This member is not in any categories +ContactHasNoCategory=This contact is not in any categories +ClassifyInCategory=Classify in category +NoneCategory=None +NotCategorized=Without category +CategoryExistsAtSameLevel=This category already exists with this ref +ReturnInProduct=Back to product/service card +ReturnInSupplier=Back to supplier card +ReturnInCompany=Back to customer/prospect card +ContentsVisibleByAll=The contents will be visible by all +ContentsVisibleByAllShort=Contents visible by all +ContentsNotVisibleByAllShort=Contents not visible by all +CategoriesTree=Categories tree +DeleteCategory=Delete category +ConfirmDeleteCategory=Are you sure you want to delete this category ? +RemoveFromCategory=Remove link with categorie +RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? +NoCategoriesDefined=No category defined +SuppliersCategoryShort=Suppliers category +CustomersCategoryShort=Customers category +ProductsCategoryShort=Products category +MembersCategoryShort=Members category +SuppliersCategoriesShort=Suppliers categories +CustomersCategoriesShort=Customers categories +CustomersProspectsCategoriesShort=Custo./Prosp. categories +ProductsCategoriesShort=Products categories +MembersCategoriesShort=Members categories +ContactCategoriesShort=Contacts categories +ThisCategoryHasNoProduct=This category does not contain any product. +ThisCategoryHasNoSupplier=This category does not contain any supplier. +ThisCategoryHasNoCustomer=This category does not contain any customer. +ThisCategoryHasNoMember=This category does not contain any member. +ThisCategoryHasNoContact=This category does not contain any contact. +AssignedToCustomer=Assigned to a customer +AssignedToTheCustomer=Assigned to the customer +InternalCategory=Internal category +CategoryContents=Category contents +CategId=Category id +CatSupList=List of supplier categories +CatCusList=List of customer/prospect categories +CatProdList=List of products categories +CatMemberList=List of members categories +CatContactList=List of contact categories and contact +CatSupLinks=Links between suppliers and categories +CatCusLinks=Links between customers/prospects and categories +CatProdLinks=Links between products/services and categories +CatMemberLinks=Links between members and categories +DeleteFromCat=Remove from category +DeletePicture=Picture delete +ConfirmDeletePicture=Confirm picture deletion? +ExtraFieldsCategories=Complementary attributes +CategoriesSetup=Categories setup +CategorieRecursiv=Link with parent category automatically +CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory +AddProductServiceIntoCategory=Add the following product/service +ShowCategory=Show category diff --git a/htdocs/langs/bn_BD/commercial.lang b/htdocs/langs/bn_BD/commercial.lang new file mode 100644 index 00000000000..7acdc7bd7e6 --- /dev/null +++ b/htdocs/langs/bn_BD/commercial.lang @@ -0,0 +1,96 @@ +# Dolibarr language file - Source file is en_US - commercial +Commercial=Commercial +CommercialArea=Commercial area +CommercialCard=Commercial card +CustomerArea=Customers area +Customer=Customer +Customers=Customers +Prospect=Prospect +Prospects=Prospects +DeleteAction=Delete an event/task +NewAction=New event/task +AddAction=Create event/task +AddAnAction=Create an event/task +AddActionRendezVous=Create a Rendez-vous event +Rendez-Vous=Rendezvous +ConfirmDeleteAction=Are you sure you want to delete this event/task ? +CardAction=Event card +PercentDone=Percentage complete +ActionOnCompany=Task about company +ActionOnContact=Task about contact +TaskRDV=Meetings +TaskRDVWith=Meeting with %s +ShowTask=Show task +ShowAction=Show event +ActionsReport=Events report +ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative +SalesRepresentative=Sales representative +SalesRepresentatives=Sales representatives +SalesRepresentativeFollowUp=Sales representative (follow-up) +SalesRepresentativeSignature=Sales representative (signature) +CommercialInterlocutor=Commercial interlocutor +ErrorWrongCode=Wrong code +NoSalesRepresentativeAffected=No particular sales representative assigned +ShowCustomer=Show customer +ShowProspect=Show prospect +ListOfProspects=List of prospects +ListOfCustomers=List of customers +LastDoneTasks=Last %s completed tasks +LastRecordedTasks=Last recorded tasks +LastActionsToDo=Last %s oldest actions not completed +DoneAndToDoActionsFor=Completed and To do events for %s +DoneAndToDoActions=Completed and To do events +DoneActions=Completed events +DoneActionsFor=Completed events for %s +ToDoActions=Incomplete events +ToDoActionsFor=Incomplete events for %s +SendPropalRef=Submission of commercial proposal %s +SendOrderRef=Submission of order %s +StatusNotApplicable=Not applicable +StatusActionToDo=To do +StatusActionDone=Complete +MyActionsAsked=Events I have recorded +MyActionsToDo=Events I have to do +MyActionsDone=Events assigned to me +StatusActionInProcess=In process +TasksHistoryForThisContact=Events for this contact +LastProspectDoNotContact=Do not contact +LastProspectNeverContacted=Never contacted +LastProspectToContact=To contact +LastProspectContactInProcess=Contact in process +LastProspectContactDone=Contact done +DateActionPlanned=Date event planned for +DateActionDone=Date event done +ActionAskedBy=Event reported by +ActionAffectedTo=Event assigned to +ActionDoneBy=Event done by +ActionUserAsk=Reported by +ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%. +ActionAC_TEL=Phone call +ActionAC_FAX=Send fax +ActionAC_PROP=Send proposal by mail +ActionAC_EMAIL=Send Email +ActionAC_RDV=Meetings +ActionAC_INT=Intervention on site +ActionAC_FAC=Send customer invoice by mail +ActionAC_REL=Send customer invoice by mail (reminder) +ActionAC_CLO=Close +ActionAC_EMAILING=Send mass email +ActionAC_COM=Send customer order by mail +ActionAC_SHIP=Send shipping by mail +ActionAC_SUP_ORD=Send supplier order by mail +ActionAC_SUP_INV=Send supplier invoice by mail +ActionAC_OTH=Other +ActionAC_OTH_AUTO=Other (automatically inserted events) +ActionAC_MANUAL=Manually inserted events +ActionAC_AUTO=Automatically inserted events +Stats=Sales statistics +CAOrder=Sales volume (validated orders) +FromTo=from %s to %s +MargeOrder=Margins (validated orders) +RecapAnnee=Summary of the year +NoData=There is no data +StatusProsp=Prospect status +DraftPropals=Draft commercial proposals +SearchPropal=Search a commercial proposal +CommercialDashboard=Commercial summary diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang new file mode 100644 index 00000000000..8abf1fd1c5a --- /dev/null +++ b/htdocs/langs/bn_BD/companies.lang @@ -0,0 +1,414 @@ +# Dolibarr language file - Source file is en_US - companies +ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one. +ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one. +ErrorSetACountryFirst=Set the country first +SelectThirdParty=Select a third party +DeleteThirdParty=Delete a third party +ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ? +DeleteContact=Delete a contact/address +ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ? +MenuNewThirdParty=New third party +MenuNewCompany=New company +MenuNewCustomer=New customer +MenuNewProspect=New prospect +MenuNewSupplier=New supplier +MenuNewPrivateIndividual=New private individual +MenuSocGroup=Groups +NewCompany=New company (prospect, customer, supplier) +NewThirdParty=New third party (prospect, customer, supplier) +NewSocGroup=New company group +NewPrivateIndividual=New private individual (prospect, customer, supplier) +CreateDolibarrThirdPartySupplier=Create a third party (supplier) +ProspectionArea=Prospection area +SocGroup=Group of companies +IdThirdParty=Id third party +IdCompany=Company Id +IdContact=Contact Id +Contacts=Contacts/Addresses +ThirdPartyContacts=Third party contacts +ThirdPartyContact=Third party contact/address +StatusContactValidated=Status of contact/address +Company=Company +CompanyName=Company name +Companies=Companies +CountryIsInEEC=Country is inside European Economic Community +ThirdPartyName=Third party name +ThirdParty=Third party +ThirdParties=Third parties +ThirdPartyAll=Third parties (all) +ThirdPartyProspects=Prospects +ThirdPartyProspectsStats=Prospects +ThirdPartyCustomers=Customers +ThirdPartyCustomersStats=Customers +ThirdPartyCustomersWithIdProf12=Customers with %s or %s +ThirdPartySuppliers=Suppliers +ThirdPartyType=Third party type +Company/Fundation=Company/Foundation +Individual=Private individual +ToCreateContactWithSameName=Will create automatically a physical contact with same informations +ParentCompany=Parent company +Subsidiary=Subsidiary +Subsidiaries=Subsidiaries +NoSubsidiary=No subsidiary +ReportByCustomers=Report by customers +ReportByQuarter=Report by rate +CivilityCode=Civility code +RegisteredOffice=Registered office +Name=Name +Lastname=Last name +Firstname=First name +PostOrFunction=Post/Function +UserTitle=Title +Surname=Surname/Pseudo +Address=Address +State=State/Province +Region=Region +Country=Country +CountryCode=Country code +CountryId=Country id +Phone=Phone +Skype=Skype +Call=Call +Chat=Chat +PhonePro=Prof. phone +PhonePerso=Pers. phone +PhoneMobile=Mobile +No_Email=Don't send mass e-mailings +Fax=Fax +Zip=Zip Code +Town=City +Web=Web +Poste= Position +DefaultLang=Language by default +VATIsUsed=VAT is used +VATIsNotUsed=VAT is not used +CopyAddressFromSoc=Fill address with thirdparty address +NoEmailDefined=There is no email defined +##### Local Taxes ##### +LocalTax1IsUsedES= RE is used +LocalTax1IsNotUsedES= RE is not used +LocalTax2IsUsedES= IRPF is used +LocalTax2IsNotUsedES= IRPF is not used +LocalTax1ES=RE +LocalTax2ES=IRPF +TypeLocaltax1ES=RE Type +TypeLocaltax2ES=IRPF Type +TypeES=Type +ThirdPartyEMail=%s +WrongCustomerCode=Customer code invalid +WrongSupplierCode=Supplier code invalid +CustomerCodeModel=Customer code model +SupplierCodeModel=Supplier code model +Gencod=Bar code +##### Professional ID ##### +ProfId1Short=Prof. id 1 +ProfId2Short=Prof. id 2 +ProfId3Short=Prof. id 3 +ProfId4Short=Prof. id 4 +ProfId5Short=Prof. id 5 +ProfId6Short=Prof. id 5 +ProfId1=Professional ID 1 +ProfId2=Professional ID 2 +ProfId3=Professional ID 3 +ProfId4=Professional ID 4 +ProfId5=Professional ID 5 +ProfId6=Professional ID 6 +ProfId1AR=Prof Id 1 (CUIT/CUIL) +ProfId2AR=Prof Id 2 (Revenu brutes) +ProfId3AR=- +ProfId4AR=- +ProfId5AR=- +ProfId6AR=- +ProfId1AU=Prof Id 1 (ABN) +ProfId2AU=- +ProfId3AU=- +ProfId4AU=- +ProfId5AU=- +ProfId6AU=- +ProfId1BE=Prof Id 1 (Professional number) +ProfId2BE=- +ProfId3BE=- +ProfId4BE=- +ProfId5BE=- +ProfId6BE=- +ProfId1BR=- +ProfId2BR=IE (Inscricao Estadual) +ProfId3BR=IM (Inscricao Municipal) +ProfId4BR=CPF +#ProfId5BR=CNAE +#ProfId6BR=INSS +ProfId1CH=- +ProfId2CH=- +ProfId3CH=Prof Id 1 (Federal number) +ProfId4CH=Prof Id 2 (Commercial Record number) +ProfId5CH=- +ProfId6CH=- +ProfId1CL=Prof Id 1 (R.U.T.) +ProfId2CL=- +ProfId3CL=- +ProfId4CL=- +ProfId5CL=- +ProfId6CL=- +ProfId1CO=Prof Id 1 (R.U.T.) +ProfId2CO=- +ProfId3CO=- +ProfId4CO=- +ProfId5CO=- +ProfId6CO=- +ProfId1DE=Prof Id 1 (USt.-IdNr) +ProfId2DE=Prof Id 2 (USt.-Nr) +ProfId3DE=Prof Id 3 (Handelsregister-Nr.) +ProfId4DE=- +ProfId5DE=- +ProfId6DE=- +ProfId1ES=Prof Id 1 (CIF/NIF) +ProfId2ES=Prof Id 2 (Social security number) +ProfId3ES=Prof Id 3 (CNAE) +ProfId4ES=Prof Id 4 (Collegiate number) +ProfId5ES=- +ProfId6ES=- +ProfId1FR=Prof Id 1 (SIREN) +ProfId2FR=Prof Id 2 (SIRET) +ProfId3FR=Prof Id 3 (NAF, old APE) +ProfId4FR=Prof Id 4 (RCS/RM) +ProfId5FR=- +ProfId6FR=- +ProfId1GB=Registration Number +ProfId2GB=- +ProfId3GB=SIC +ProfId4GB=- +ProfId5GB=- +ProfId6GB=- +ProfId1HN=Id prof. 1 (RTN) +ProfId2HN=- +ProfId3HN=- +ProfId4HN=- +ProfId5HN=- +ProfId6HN=- +ProfId1IN=Prof Id 1 (TIN) +ProfId2IN=Prof Id 2 (PAN) +ProfId3IN=Prof Id 3 (SRVC TAX) +ProfId4IN=Prof Id 4 +ProfId5IN=Prof Id 5 +ProfId6IN=- +ProfId1MA=Id prof. 1 (R.C.) +ProfId2MA=Id prof. 2 (Patente) +ProfId3MA=Id prof. 3 (I.F.) +ProfId4MA=Id prof. 4 (C.N.S.S.) +ProfId5MA=- +ProfId6MA=- +ProfId1MX=Prof Id 1 (R.F.C). +ProfId2MX=Prof Id 2 (R..P. IMSS) +ProfId3MX=Prof Id 3 (Profesional Charter) +ProfId4MX=- +ProfId5MX=- +ProfId6MX=- +ProfId1NL=KVK nummer +ProfId2NL=- +ProfId3NL=- +ProfId4NL=Burgerservicenummer (BSN) +ProfId5NL=- +ProfId6NL=- +ProfId1PT=Prof Id 1 (NIPC) +ProfId2PT=Prof Id 2 (Social security number) +ProfId3PT=Prof Id 3 (Commercial Record number) +ProfId4PT=Prof Id 4 (Conservatory) +ProfId5PT=- +ProfId6PT=- +ProfId1SN=RC +ProfId2SN=NINEA +ProfId3SN=- +ProfId4SN=- +ProfId5SN=- +ProfId6SN=- +ProfId1TN=Prof Id 1 (RC) +ProfId2TN=Prof Id 2 (Fiscal matricule) +ProfId3TN=Prof Id 3 (Douane code) +ProfId4TN=Prof Id 4 (BAN) +ProfId5TN=- +ProfId6TN=- +ProfId1RU=Prof Id 1 (OGRN) +ProfId2RU=Prof Id 2 (INN) +ProfId3RU=Prof Id 3 (KPP) +ProfId4RU=Prof Id 4 (OKPO) +ProfId5RU=- +ProfId6RU=- +VATIntra=VAT number +VATIntraShort=VAT number +VATIntraVeryShort=VAT +VATIntraSyntaxIsValid=Syntax is valid +VATIntraValueIsValid=Value is valid +ProspectCustomer=Prospect / Customer +Prospect=Prospect +CustomerCard=Customer Card +Customer=Customer +CustomerDiscount=Customer Discount +CustomerRelativeDiscount=Relative customer discount +CustomerAbsoluteDiscount=Absolute customer discount +CustomerRelativeDiscountShort=Relative discount +CustomerAbsoluteDiscountShort=Absolute discount +CompanyHasRelativeDiscount=This customer has a default discount of %s%% +CompanyHasNoRelativeDiscount=This customer has no relative discount by default +CompanyHasAbsoluteDiscount=This customer still has discount credits or deposits for %s %s +CompanyHasCreditNote=This customer still has credit notes for %s %s +CompanyHasNoAbsoluteDiscount=This customer has no discount credit available +CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users) +CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself) +DefaultDiscount=Default discount +AvailableGlobalDiscounts=Absolute discounts available +DiscountNone=None +Supplier=Supplier +CompanyList=Company's list +AddContact=Create contact +AddContactAddress=Create contact/address +EditContact=Edit contact +EditContactAddress=Edit contact/address +Contact=Contact +ContactsAddresses=Contacts/Addresses +NoContactDefinedForThirdParty=No contact defined for this third party +NoContactDefined=No contact defined +DefaultContact=Default contact/address +AddCompany=Create company +AddThirdParty=Create third party +DeleteACompany=Delete a company +PersonalInformations=Personal data +AccountancyCode=Accountancy code +CustomerCode=Customer code +SupplierCode=Supplier code +CustomerAccount=Customer account +SupplierAccount=Supplier account +CustomerCodeDesc=Customer code, unique for all customers +SupplierCodeDesc=Supplier code, unique for all suppliers +RequiredIfCustomer=Required if third party is a customer or prospect +RequiredIfSupplier=Required if third party is a supplier +ValidityControledByModule=Validity controled by module +ThisIsModuleRules=This is rules for this module +LastProspect=Last +ProspectToContact=Prospect to contact +CompanyDeleted=Company "%s" deleted from database. +ListOfContacts=List of contacts/addresses +ListOfContactsAddresses=List of contacts/adresses +ListOfProspectsContacts=List of prospect contacts +ListOfCustomersContacts=List of customer contacts +ListOfSuppliersContacts=List of supplier contacts +ListOfCompanies=List of companies +ListOfThirdParties=List of third parties +ShowCompany=Show company +ShowContact=Show contact +ContactsAllShort=All (No filter) +ContactType=Contact type +ContactForOrders=Order's contact +ContactForProposals=Proposal's contact +ContactForContracts=Contract's contact +ContactForInvoices=Invoice's contact +NoContactForAnyOrder=This contact is not a contact for any order +NoContactForAnyProposal=This contact is not a contact for any commercial proposal +NoContactForAnyContract=This contact is not a contact for any contract +NoContactForAnyInvoice=This contact is not a contact for any invoice +NewContact=New contact +NewContactAddress=New contact/address +LastContacts=Last contacts +MyContacts=My contacts +Phones=Phones +Capital=Capital +CapitalOf=Capital of %s +EditCompany=Edit company +EditDeliveryAddress=Edit delivery address +ThisUserIsNot=This user is not a prospect, customer nor supplier +VATIntraCheck=Check +VATIntraCheckDesc=The link %s allows to ask the european VAT checker service. An external internet access from server is required for this service to work. +VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do +VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site +VATIntraManualCheck=You can also check manually from european web site %s +ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s). +NorProspectNorCustomer=Nor prospect, nor customer +JuridicalStatus=Juridical status +Staff=Staff +ProspectLevelShort=Potential +ProspectLevel=Prospect potential +ContactPrivate=Private +ContactPublic=Shared +ContactVisibility=Visibility +OthersNotLinkedToThirdParty=Others, not linked to a third party +ProspectStatus=Prospect status +PL_NONE=None +PL_UNKNOWN=Unknown +PL_LOW=Low +PL_MEDIUM=Medium +PL_HIGH=High +TE_UNKNOWN=- +TE_STARTUP=Startup +TE_GROUP=Large company +TE_MEDIUM=Medium company +TE_ADMIN=Governmental +TE_SMALL=Small company +TE_RETAIL=Retailer +TE_WHOLE=Wholetailer +TE_PRIVATE=Private individual +TE_OTHER=Other +StatusProspect-1=Do not contact +StatusProspect0=Never contacted +StatusProspect1=To contact +StatusProspect2=Contact in process +StatusProspect3=Contact done +ChangeDoNotContact=Change status to 'Do not contact' +ChangeNeverContacted=Change status to 'Never contacted' +ChangeToContact=Change status to 'To contact' +ChangeContactInProcess=Change status to 'Contact in process' +ChangeContactDone=Change status to 'Contact done' +ProspectsByStatus=Prospects by status +BillingContact=Billing contact +NbOfAttachedFiles=Number of attached files +AttachANewFile=Attach a new file +NoRIB=No BAN defined +NoParentCompany=None +ExportImport=Import-Export +ExportCardToFormat=Export card to format +ContactNotLinkedToCompany=Contact not linked to any third party +DolibarrLogin=Dolibarr login +NoDolibarrAccess=No Dolibarr access +ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ExportDataset_company_2=Contacts and properties +ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties +ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes +ImportDataset_company_3=Bank details +PriceLevel=Price level +DeliveriesAddress=Delivery addresses +DeliveryAddress=Delivery address +DeliveryAddressLabel=Delivery address label +DeleteDeliveryAddress=Delete a delivery address +ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address? +NewDeliveryAddress=New delivery address +AddDeliveryAddress=Create address +AddAddress=Create address +NoOtherDeliveryAddress=No alternative delivery address defined +SupplierCategory=Supplier category +JuridicalStatus200=Independant +DeleteFile=Delete file +ConfirmDeleteFile=Are you sure you want to delete this file? +AllocateCommercial=Assigned to sale representative +SelectCountry=Select a country +SelectCompany=Select a third party +Organization=Organization +AutomaticallyGenerated=Automatically generated +FiscalYearInformation=Information on the fiscal year +FiscalMonthStart=Starting month of the fiscal year +YouMustCreateContactFirst=You must create emails contacts for third party first to be able to add emails notifications. +ListSuppliersShort=List of suppliers +ListProspectsShort=List of prospects +ListCustomersShort=List of customers +ThirdPartiesArea=Third parties and contact area +LastModifiedThirdParties=Last %s modified third parties +UniqueThirdParties=Total of unique third parties +InActivity=Open +ActivityCeased=Closed +ActivityStateFilter=Activity status +ProductsIntoElements=List of products into %s +CurrentOutstandingBill=Current outstanding bill +OutstandingBill=Max. for outstanding bill +OutstandingBillReached=Reached max. for outstanding bill +MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0. +LeopardNumRefModelDesc=The code is free. This code can be modified at any time. +ManagingDirectors=Manager(s) name (CEO, director, president...) +SearchThirdparty=Search thirdparty +SearchContact=Search contact diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang new file mode 100644 index 00000000000..0d579a06ff1 --- /dev/null +++ b/htdocs/langs/bn_BD/compta.lang @@ -0,0 +1,207 @@ +# Dolibarr language file - Source file is en_US - compta +Accountancy=Accountancy +AccountancyCard=Accountancy card +Treasury=Treasury +MenuFinancial=Financial +TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation +TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation +OptionMode=Option for accountancy +OptionModeTrue=Option Incomes-Expenses +OptionModeVirtual=Option Claims-Debts +OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices. +OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output. +FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration) +VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup. +LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup. +Param=Setup +RemainingAmountPayment=Amount payment remaining : +AmountToBeCharged=Total amount to pay : +AccountsGeneral=Accounts +Account=Account +Accounts=Accounts +Accountparent=Account parent +Accountsparent=Accounts parent +BillsForSuppliers=Bills for suppliers +Income=Income +Outcome=Expense +ReportInOut=Income / Expense +ReportTurnover=Turnover +PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party +PaymentsNotLinkedToUser=Payments not linked to any user +Profit=Profit +AccountingResult=Accounting result +Balance=Balance +Debit=Debit +Credit=Credit +Piece=Accounting Doc. +Withdrawal=Withdrawal +Withdrawals=Withdrawals +AmountHTVATRealReceived=Net collected +AmountHTVATRealPaid=Net paid +VATToPay=VAT sells +VATReceived=VAT received +VATToCollect=VAT purchases +VATSummary=VAT Balance +LT2SummaryES=IRPF Balance +LT1SummaryES=RE Balance +VATPaid=VAT paid +SalaryPaid=Salary paid +LT2PaidES=IRPF Paid +LT1PaidES=RE Paid +LT2CustomerES=IRPF sales +LT2SupplierES=IRPF purchases +LT1CustomerES=RE sales +LT1SupplierES=RE purchases +VATCollected=VAT collected +ToPay=To pay +ToGet=To get back +SpecialExpensesArea=Area for all special payments +TaxAndDividendsArea=Tax, social contributions and dividends area +SocialContribution=Social contribution +SocialContributions=Social contributions +MenuSpecialExpenses=Special expenses +MenuTaxAndDividends=Taxes and dividends +MenuSalaries=Salaries +MenuSocialContributions=Social contributions +MenuNewSocialContribution=New contribution +NewSocialContribution=New social contribution +ContributionsToPay=Contributions to pay +AccountancyTreasuryArea=Accountancy/Treasury area +AccountancySetup=Accountancy setup +NewPayment=New payment +Payments=Payments +PaymentCustomerInvoice=Customer invoice payment +PaymentSupplierInvoice=Supplier invoice payment +PaymentSocialContribution=Social contribution payment +PaymentVat=VAT payment +PaymentSalary=Salary payment +ListPayment=List of payments +ListOfPayments=List of payments +ListOfCustomerPayments=List of customer payments +ListOfSupplierPayments=List of supplier payments +DatePayment=Payment date +DateStartPeriod=Date start period +DateEndPeriod=Date end period +NewVATPayment=New VAT payment +newLT2PaymentES=New IRPF payment +newLT1PaymentES=New RE payment +LT2PaymentES=IRPF Payment +LT2PaymentsES=IRPF Payments +LT1PaymentES=RE Payment +LT1PaymentsES=RE Payments +VATPayment=VAT Payment +VATPayments=VAT Payments +SocialContributionsPayments=Social contributions payments +ShowVatPayment=Show VAT payment +TotalToPay=Total to pay +TotalVATReceived=Total VAT received +CustomerAccountancyCode=Customer accountancy code +SupplierAccountancyCode=Supplier accountancy code +AccountNumberShort=Account number +AccountNumber=Account number +NewAccount=New account +SalesTurnover=Sales turnover +SalesTurnoverMinimum=Minimum sales turnover +ByThirdParties=By third parties +ByUserAuthorOfInvoice=By invoice author +AccountancyExport=Accountancy export +ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s +SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products. +CheckReceipt=Check deposit +CheckReceiptShort=Check deposit +LastCheckReceiptShort=Last %s check receipts +NewCheckReceipt=New discount +NewCheckDeposit=New check deposit +NewCheckDepositOn=Create receipt for deposit on account: %s +NoWaitingChecks=No checks waiting for deposit. +DateChequeReceived=Check reception date +NbOfCheques=Nb of checks +PaySocialContribution=Pay a social contribution +ConfirmPaySocialContribution=Are you sure you want to classify this social contribution as paid? +DeleteSocialContribution=Delete a social contribution +ConfirmDeleteSocialContribution=Are you sure you want to delete this social contribution? +ExportDataset_tax_1=Social contributions and payments +CalcModeVATDebt=Mode %sVAT on commitment accounting%s. +CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s. +CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting. +CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting +CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s +CalcModeLT1Debt=Mode %sRE on customer invoices%s +CalcModeLT1Rec= Mode %sRE on suppliers invoices%s +CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s +CalcModeLT2Debt=Mode %sIRPF on customer invoices%s +CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s +AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary +AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary +AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode %sClaims-Debts%s said Commitment accounting. +AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode %sIncomes-Expenses%s said cash accounting. +SeeReportInInputOutputMode=See report %sIncomes-Expenses%s said cash accounting for a calculation on actual payments made +SeeReportInDueDebtMode=See report %sClaims-Debts%s said commitment accounting for a calculation on issued invoices +RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included +RulesResultDue=- It includes outstanding invoices, expenses and VAT whether they are paid or not.
- It is based on the validation date of invoices and VAT and on the due date for expenses. +RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT.
- It is based on the payment dates of the invoices, expenses and VAT. +RulesCADue=- It includes the client's due invoices whether they are paid or not.
- It is based on the validation date of these invoices.
+RulesCAIn=- It includes all the effective payments of invoices received from clients.
- It is based on the payment date of these invoices
+DepositsAreNotIncluded=- Deposit invoices are nor included +DepositsAreIncluded=- Deposit invoices are included +LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF +LT1ReportByCustomersInInputOutputModeES=Report by third party RE +VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid +VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid +VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid +LT1ReportByQuartersInInputOutputMode=Report by RE rate +LT2ReportByQuartersInInputOutputMode=Report by IRPF rate +VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid +LT1ReportByQuartersInDueDebtMode=Report by RE rate +LT2ReportByQuartersInDueDebtMode=Report by IRPF rate +SeeVATReportInInputOutputMode=See report %sVAT encasement%s for a standard calculation +SeeVATReportInDueDebtMode=See report %sVAT on flow%s for a calculation with an option on the flow +RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment. +RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date. +RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date. +RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date. +OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair. +PercentOfInvoice=%%/invoice +NotUsedForGoods=Not used on goods +ProposalStats=Statistics on proposals +OrderStats=Statistics on orders +InvoiceStats=Statistics on bills +Dispatch=Dispatching +Dispatched=Dispatched +ToDispatch=To dispatch +ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer +SellsJournal=Sales Journal +PurchasesJournal=Purchases Journal +DescSellsJournal=Sales Journal +DescPurchasesJournal=Purchases Journal +InvoiceRef=Invoice ref. +CodeNotDef=Not defined +AddRemind=Dispatch available amount +RemainToDivide= Remain to dispatch : +WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module. +DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date. +Pcg_version=Pcg version +Pcg_type=Pcg type +Pcg_subtype=Pcg subtype +InvoiceLinesToDispatch=Invoice lines to dispatch +InvoiceDispatched=Dispatched invoices +AccountancyDashboard=Accountancy summary +ByProductsAndServices=By products and services +RefExt=External ref +ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice". +LinkedOrder=Link to order +ReCalculate=Recalculate +Mode1=Method 1 +Mode2=Method 2 +CalculationRuleDesc=To calculate total VAT, there is two methods:
Method 1 is rounding vat on each line, then summing them.
Method 2 is summing all vat on each line, then rounding result.
Final result may differs from few cents. Default mode is mode %s. +CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier. +TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module). +CalculationMode=Calculation mode +AccountancyJournal=Accountancy code journal +ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT +ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT +ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties +ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties +CloneTax=Clone a social contribution +ConfirmCloneTax=Confirm the clone of a social contribution +CloneTaxForNextMonth=Clone it for next month diff --git a/htdocs/langs/bn_BD/contracts.lang b/htdocs/langs/bn_BD/contracts.lang new file mode 100644 index 00000000000..d1be0e6513f --- /dev/null +++ b/htdocs/langs/bn_BD/contracts.lang @@ -0,0 +1,103 @@ +# Dolibarr language file - Source file is en_US - contracts +ContractsArea=Contracts area +ListOfContracts=List of contracts +LastModifiedContracts=Last %s modified contracts +AllContracts=All contracts +ContractCard=Contract card +ContractStatus=Contract status +ContractStatusNotRunning=Not running +ContractStatusRunning=Running +ContractStatusDraft=Draft +ContractStatusValidated=Validated +ContractStatusClosed=Closed +ServiceStatusInitial=Not running +ServiceStatusRunning=Running +ServiceStatusNotLate=Running, not expired +ServiceStatusNotLateShort=Not expired +ServiceStatusLate=Running, expired +ServiceStatusLateShort=Expired +ServiceStatusClosed=Closed +ServicesLegend=Services legend +Contracts=Contracts +ContractsAndLine=Contracts and line of contracts +Contract=Contract +NoContracts=No contracts +MenuServices=Services +MenuInactiveServices=Services not active +MenuRunningServices=Running services +MenuExpiredServices=Expired services +MenuClosedServices=Closed services +NewContract=New contract +AddContract=Create contract +SearchAContract=Search a contract +DeleteAContract=Delete a contract +CloseAContract=Close a contract +ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ? +ConfirmValidateContract=Are you sure you want to validate this contract under name %s ? +ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract ? +ConfirmCloseService=Are you sure you want to close this service with date %s ? +ValidateAContract=Validate a contract +ActivateService=Activate service +ConfirmActivateService=Are you sure you want to activate this service with date %s ? +RefContract=Contract reference +DateContract=Contract date +DateServiceActivate=Service activation date +DateServiceUnactivate=Service deactivation date +DateServiceStart=Date for beginning of service +DateServiceEnd=Date for end of service +ShowContract=Show contract +ListOfServices=List of services +ListOfInactiveServices=List of not active services +ListOfExpiredServices=List of expired active services +ListOfClosedServices=List of closed services +ListOfRunningContractsLines=List of running contract lines +ListOfRunningServices=List of running services +NotActivatedServices=Inactive services (among validated contracts) +BoardNotActivatedServices=Services to activate among validated contracts +LastContracts=Last %s contracts +LastActivatedServices=Last %s activated services +LastModifiedServices=Last %s modified services +EditServiceLine=Edit service line +ContractStartDate=Start date +ContractEndDate=End date +DateStartPlanned=Planned start date +DateStartPlannedShort=Planned start date +DateEndPlanned=Planned end date +DateEndPlannedShort=Planned end date +DateStartReal=Real start date +DateStartRealShort=Real start date +DateEndReal=Real end date +DateEndRealShort=Real end date +NbOfServices=Nb of services +CloseService=Close service +ServicesNomberShort=%s service(s) +RunningServices=Running services +BoardRunningServices=Expired running services +ServiceStatus=Status of service +DraftContracts=Drafts contracts +CloseRefusedBecauseOneServiceActive=Contract can't be closed as ther is at least one open service on it +CloseAllContracts=Close all contract lines +DeleteContractLine=Delete a contract line +ConfirmDeleteContractLine=Are you sure you want to delete this contract line ? +MoveToAnotherContract=Move service into another contract. +ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to move this service into this contract. +ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ? +PaymentRenewContractId=Renew contract line (number %s) +ExpiredSince=Expiration date +RelatedContracts=Related contracts +NoExpiredServices=No expired active services +ListOfServicesToExpireWithDuration=List of Services to expire in %s days +ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days +ListOfServicesToExpire=List of Services to expire +NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative. +StandardContractsTemplate=Standard contracts template +ContactNameAndSignature=For %s, name and signature: +OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned. + +##### Types de contacts ##### +TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract +TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract +TypeContact_contrat_external_BILLING=Billing customer contact +TypeContact_contrat_external_CUSTOMER=Follow-up customer contact +TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact +Error_CONTRACT_ADDON_NotDefined=Constant CONTRACT_ADDON not defined diff --git a/htdocs/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang new file mode 100644 index 00000000000..28dfc7770b2 --- /dev/null +++ b/htdocs/langs/bn_BD/cron.lang @@ -0,0 +1,87 @@ +# Dolibarr language file - Source file is en_US - cron +# About page +About = About +CronAbout = About Cron +CronAboutPage = Cron about page +# Right +Permission23101 = Read Scheduled task +Permission23102 = Create/update Scheduled task +Permission23103 = Delete Scheduled task +Permission23104 = Execute Scheduled task +# Admin +CronSetup= Scheduled job management setup +URLToLaunchCronJobs=URL to check and launch cron jobs if required +OrToLaunchASpecificJob=Or to check and launch a specific job +KeyForCronAccess=Security key for URL to launch cron jobs +FileToLaunchCronJobs=Command line to launch cron jobs +CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes +CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes +# Menu +CronJobs=Scheduled jobs +CronListActive=List of active/scheduled jobs +CronListInactive=List of disabled jobs +# Page list +CronDateLastRun=Last run +CronLastOutput=Last run output +CronLastResult=Last result code +CronListOfCronJobs=List of scheduled jobs +CronCommand=Command +CronList=Jobs list +CronDelete= Delete cron jobs +CronConfirmDelete= Are you sure you want to delete this cron job ? +CronExecute=Launch job +CronConfirmExecute= Are you sure to execute this job now +CronInfo= Jobs allow to execute task that have been planned +CronWaitingJobs=Wainting jobs +CronTask=Job +CronNone= None +CronDtStart=Start date +CronDtEnd=End date +CronDtNextLaunch=Next execution +CronDtLastLaunch=Last execution +CronFrequency=Frequancy +CronClass=Classe +CronMethod=Method +CronModule=Module +CronAction=Action +CronStatus=Status +CronStatusActive=Enabled +CronStatusInactive=Disabled +CronNoJobs=No jobs registered +CronPriority=Priority +CronLabel=Description +CronNbRun=Nb. launch +CronEach=Every +JobFinished=Job launched and finished +#Page card +CronAdd= Add jobs +CronHourStart= Start Hour and date of task +CronEvery= And execute task each +CronObject= Instance/Object to create +CronArgs=Parameters +CronSaveSucess=Save succesfully +CronNote=Comment +CronFieldMandatory=Fields %s is mandatory +CronErrEndDateStartDt=End date cannot be before start date +CronStatusActiveBtn=Enable +CronStatusInactiveBtn=Disable +CronTaskInactive=This job is disabled +CronDtLastResult=Last result date +CronId=Id +CronClassFile=Classes (filename.class.php) +CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module).
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product +CronClassFileHelp=The file name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php +CronObjectHelp=The object name to load.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product +CronMethodHelp=The object method to launch.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth +CronArgsHelp=The method arguments.
For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef +CronCommandHelp=The system command line to execute. +# Info +CronInfoPage=Information +# Common +CronType=Task type +CronType_method=Call method of a Dolibarr Class +CronType_command=Shell command +CronMenu=Cron +CronCannotLoadClass=Cannot load class %s or object %s +UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs. +TaskDisabled=Task disabled diff --git a/htdocs/langs/bn_BD/deliveries.lang b/htdocs/langs/bn_BD/deliveries.lang new file mode 100644 index 00000000000..d711c3704b4 --- /dev/null +++ b/htdocs/langs/bn_BD/deliveries.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - deliveries +Delivery=Delivery +Deliveries=Deliveries +DeliveryCard=Delivery card +DeliveryOrder=Delivery order +DeliveryOrders=Delivery orders +DeliveryDate=Delivery date +DeliveryDateShort=Deliv. date +CreateDeliveryOrder=Generate delivery order +QtyDelivered=Qty delivered +SetDeliveryDate=Set shipping date +ValidateDeliveryReceipt=Validate delivery receipt +ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt ? +DeleteDeliveryReceipt=Delete delivery receipt +DeleteDeliveryReceiptConfirm=Are you sure you want to delete delivery receipt %s ? +DeliveryMethod=Delivery method +TrackingNumber=Tracking number +DeliveryNotValidated=Delivery not validated +# merou PDF model +NameAndSignature=Name and Signature : +ToAndDate=To___________________________________ on ____/_____/__________ +GoodStatusDeclaration=Have received the goods above in good condition, +Deliverer=Deliverer : +Sender=Sender +Recipient=Recipient +ErrorStockIsNotEnough=There's not enough stock +Shippable=Shippable +NonShippable=Not Shippable diff --git a/htdocs/langs/bn_BD/dict.lang b/htdocs/langs/bn_BD/dict.lang new file mode 100644 index 00000000000..bef1f4821b4 --- /dev/null +++ b/htdocs/langs/bn_BD/dict.lang @@ -0,0 +1,327 @@ +# Dolibarr language file - Source file is en_US - dict +CountryFR=France +CountryBE=Belgium +CountryIT=Italy +CountryES=Spain +CountryDE=Germany +CountryCH=Switzerland +CountryGB=Great Britain +CountryUK=United Kingdom +CountryIE=Ireland +CountryCN=China +CountryTN=Tunisia +CountryUS=United States +CountryMA=Morocco +CountryDZ=Algeria +CountryCA=Canada +CountryTG=Togo +CountryGA=Gabon +CountryNL=Netherlands +CountryHU=Hungary +CountryRU=Russia +CountrySE=Sweden +CountryCI=Ivoiry Coast +CountrySN=Senegal +CountryAR=Argentina +CountryCM=Cameroon +CountryPT=Portugal +CountrySA=Saudi Arabia +CountryMC=Monaco +CountryAU=Australia +CountrySG=Singapore +CountryAF=Afghanistan +CountryAX=Åland Islands +CountryAL=Albania +CountryAS=American Samoa +CountryAD=Andorra +CountryAO=Angola +CountryAI=Anguilla +CountryAQ=Antarctica +CountryAG=Antigua and Barbuda +CountryAM=Armenia +CountryAW=Aruba +CountryAT=Austria +CountryAZ=Azerbaijan +CountryBS=Bahamas +CountryBH=Bahrain +CountryBD=Bangladesh +CountryBB=Barbados +CountryBY=Belarus +CountryBZ=Belize +CountryBJ=Benin +CountryBM=Bermuda +CountryBT=Bhutan +CountryBO=Bolivia +CountryBA=Bosnia and Herzegovina +CountryBW=Botswana +CountryBV=Bouvet Island +CountryBR=Brazil +CountryIO=British Indian Ocean Territory +CountryBN=Brunei Darussalam +CountryBG=Bulgaria +CountryBF=Burkina Faso +CountryBI=Burundi +CountryKH=Cambodia +CountryCV=Cape Verde +CountryKY=Cayman Islands +CountryCF=Central African Republic +CountryTD=Chad +CountryCL=Chile +CountryCX=Christmas Island +CountryCC=Cocos (Keeling) Islands +CountryCO=Colombia +CountryKM=Comoros +CountryCG=Congo +CountryCD=Congo, The Democratic Republic of the +CountryCK=Cook Islands +CountryCR=Costa Rica +CountryHR=Croatia +CountryCU=Cuba +CountryCY=Cyprus +CountryCZ=Czech Republic +CountryDK=Denmark +CountryDJ=Djibouti +CountryDM=Dominica +CountryDO=Dominican Republic +CountryEC=Ecuador +CountryEG=Egypt +CountrySV=El Salvador +CountryGQ=Equatorial Guinea +CountryER=Eritrea +CountryEE=Estonia +CountryET=Ethiopia +CountryFK=Falkland Islands +CountryFO=Faroe Islands +CountryFJ=Fiji Islands +CountryFI=Finland +CountryGF=French Guiana +CountryPF=French Polynesia +CountryTF=French Southern Territories +CountryGM=Gambia +CountryGE=Georgia +CountryGH=Ghana +CountryGI=Gibraltar +CountryGR=Greece +CountryGL=Greenland +CountryGD=Grenada +CountryGP=Guadeloupe +CountryGU=Guam +CountryGT=Guatemala +CountryGN=Guinea +CountryGW=Guinea-Bissau +CountryGY=Guyana +CountryHT=Haïti +CountryHM=Heard Island and McDonald +CountryVA=Holy See (Vatican City State) +CountryHN=Honduras +CountryHK=Hong Kong +CountryIS=Icelande +CountryIN=India +CountryID=Indonesia +CountryIR=Iran +CountryIQ=Iraq +CountryIL=Israel +CountryJM=Jamaica +CountryJP=Japan +CountryJO=Jordan +CountryKZ=Kazakhstan +CountryKE=Kenya +CountryKI=Kiribati +CountryKP=North Korea +CountryKR=South Korea +CountryKW=Kuwait +CountryKG=Kyrghyztan +CountryLA=Lao +CountryLV=Latvia +CountryLB=Lebanon +CountryLS=Lesotho +CountryLR=Liberia +CountryLY=Libyan +CountryLI=Liechtenstein +CountryLT=Lituania +CountryLU=Luxembourg +CountryMO=Macao +CountryMK=Macedonia, the former Yugoslav of +CountryMG=Madagascar +CountryMW=Malawi +CountryMY=Malaysia +CountryMV=Maldives +CountryML=Mali +CountryMT=Malta +CountryMH=Marshall Islands +CountryMQ=Martinique +CountryMR=Mauritania +CountryMU=Mauritius +CountryYT=Mayotte +CountryMX=Mexico +CountryFM=Micronesia +CountryMD=Moldova +CountryMN=Mongolia +CountryMS=Monserrat +CountryMZ=Mozambique +CountryMM=Birmania (Myanmar) +CountryNA=Namibia +CountryNR=Nauru +CountryNP=Nepal +CountryAN=Netherlands Antilles +CountryNC=New Caledonia +CountryNZ=New Zealand +CountryNI=Nicaragua +CountryNE=Niger +CountryNG=Nigeria +CountryNU=Niue +CountryNF=Norfolk Island +CountryMP=Northern Mariana Islands +CountryNO=Norway +CountryOM=Oman +CountryPK=Pakistan +CountryPW=Palau +CountryPS=Palestinian Territory, Occupied +CountryPA=Panama +CountryPG=Papua New Guinea +CountryPY=Paraguay +CountryPE=Peru +CountryPH=Philippines +CountryPN=Pitcairn Islands +CountryPL=Poland +CountryPR=Puerto Rico +CountryQA=Qatar +CountryRE=Reunion +CountryRO=Romania +CountryRW=Rwanda +CountrySH=Saint Helena +CountryKN=Saint Kitts and Nevis +CountryLC=Saint Lucia +CountryPM=Saint Pierre and Miquelon +CountryVC=Saint Vincent and Grenadines +CountryWS=Samoa +CountrySM=San Marino +CountryST=Sao Tome and Principe +CountryRS=Serbia +CountrySC=Seychelles +CountrySL=Sierra Leone +CountrySK=Slovakia +CountrySI=Slovenia +CountrySB=Solomon Islands +CountrySO=Somalia +CountryZA=South Africa +CountryGS=South Georgia and the South Sandwich Islands +CountryLK=Sri Lanka +CountrySD=Sudan +CountrySR=Suriname +CountrySJ=Svalbard and Jan Mayen +CountrySZ=Swaziland +CountrySY=Syrian +CountryTW=Taiwan +CountryTJ=Tajikistan +CountryTZ=Tanzania +CountryTH=Thailand +CountryTL=Timor-Leste +CountryTK=Tokelau +CountryTO=Tonga +CountryTT=Trinidad and Tobago +CountryTR=Turkey +CountryTM=Turkmenistan +CountryTC=Turks and Cailos Islands +CountryTV=Tuvalu +CountryUG=Uganda +CountryUA=Ukraine +CountryAE=United Arab Emirates +CountryUM=United States Minor Outlying Islands +CountryUY=Uruguay +CountryUZ=Uzbekistan +CountryVU=Vanuatu +CountryVE=Venezuela +CountryVN=Viet Nam +CountryVG=Virgin Islands, British +CountryVI=Virgin Islands, U.S. +CountryWF=Wallis and Futuna +CountryEH=Western Sahara +CountryYE=Yemen +CountryZM=Zambia +CountryZW=Zimbabwe +CountryGG=Guernsey +CountryIM=Isle of Man +CountryJE=Jersey +CountryME=Montenegro +CountryBL=Saint Barthelemy +CountryMF=Saint Martin + +##### Civilities ##### +CivilityMME=Mrs. +CivilityMR=Mr. +CivilityMLE=Ms. +CivilityMTRE=Master +CivilityDR=Doctor +##### Currencies ##### +Currencyeuros=Euros +CurrencyAUD=AU Dollars +CurrencySingAUD=AU Dollar +CurrencyCAD=CAN Dollars +CurrencySingCAD=CAN Dollar +CurrencyCHF=Swiss Francs +CurrencySingCHF=Swiss Franc +CurrencyEUR=Euros +CurrencySingEUR=Euro +CurrencyFRF=French Francs +CurrencySingFRF=French Franc +CurrencyGBP=GB Pounds +CurrencySingGBP=GB Pound +CurrencyINR=Indian rupees +CurrencySingINR=Indian rupee +CurrencyMAD=Dirham +CurrencySingMAD=Dirham +CurrencyMGA=Ariary +CurrencySingMGA=Ariary +CurrencyMUR=Mauritius rupees +CurrencySingMUR=Mauritius rupee +CurrencyNOK=Norwegian krones +CurrencySingNOK=Norwegian krone +CurrencyTND=Tunisian dinars +CurrencySingTND=Tunisian dinar +CurrencyUSD=US Dollars +CurrencySingUSD=US Dollar +CurrencyUAH=Hryvnia +CurrencySingUAH=Hryvnia +CurrencyXAF=CFA Francs BEAC +CurrencySingXAF=CFA Franc BEAC +CurrencyXOF=CFA Francs BCEAO +CurrencySingXOF=CFA Franc BCEAO +CurrencyXPF=CFP Francs +CurrencySingXPF=CFP Franc +CurrencyCentSingEUR=cent +CurrencyCentINR=paisa +CurrencyCentSingINR=paise +CurrencyThousandthSingTND=thousandth +#### Input reasons ##### +DemandReasonTypeSRC_INTE=Internet +DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign +DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign +DemandReasonTypeSRC_CAMP_PHO=Phone campaign +DemandReasonTypeSRC_CAMP_FAX=Fax campaign +DemandReasonTypeSRC_COMM=Commercial contact +DemandReasonTypeSRC_SHOP=Shop contact +DemandReasonTypeSRC_WOM=Word of mouth +DemandReasonTypeSRC_PARTNER=Partner +DemandReasonTypeSRC_EMPLOYEE=Employee +DemandReasonTypeSRC_SPONSORING=Sponsorship +#### Paper formats #### +PaperFormatEU4A0=Format 4A0 +PaperFormatEU2A0=Format 2A0 +PaperFormatEUA0=Format A0 +PaperFormatEUA1=Format A1 +PaperFormatEUA2=Format A2 +PaperFormatEUA3=Format A3 +PaperFormatEUA4=Format A4 +PaperFormatEUA5=Format A5 +PaperFormatEUA6=Format A6 +PaperFormatUSLETTER=Format Letter US +PaperFormatUSLEGAL=Format Legal US +PaperFormatUSEXECUTIVE=Format Executive US +PaperFormatUSLEDGER=Format Ledger/Tabloid +PaperFormatCAP1=Format P1 Canada +PaperFormatCAP2=Format P2 Canada +PaperFormatCAP3=Format P3 Canada +PaperFormatCAP4=Format P4 Canada +PaperFormatCAP5=Format P5 Canada +PaperFormatCAP6=Format P6 Canada diff --git a/htdocs/langs/bn_BD/donations.lang b/htdocs/langs/bn_BD/donations.lang new file mode 100644 index 00000000000..f7aed91cf81 --- /dev/null +++ b/htdocs/langs/bn_BD/donations.lang @@ -0,0 +1,38 @@ +# Dolibarr language file - Source file is en_US - donations +Donation=Donation +Donations=Donations +DonationRef=Donation ref. +Donor=Donor +Donors=Donors +AddDonation=Create a donation +NewDonation=New donation +ShowDonation=Show donation +DonationPromise=Gift promise +PromisesNotValid=Not validated promises +PromisesValid=Validated promises +DonationsPaid=Donations paid +DonationsReceived=Donations received +PublicDonation=Public donation +DonationsNumber=Donation number +DonationsArea=Donations area +DonationStatusPromiseNotValidated=Draft promise +DonationStatusPromiseValidated=Validated promise +DonationStatusPaid=Donation received +DonationStatusPromiseNotValidatedShort=Draft +DonationStatusPromiseValidatedShort=Validated +DonationStatusPaidShort=Received +ValidPromess=Validate promise +DonationReceipt=Donation receipt +BuildDonationReceipt=Build receipt +DonationsModels=Documents models for donation receipts +LastModifiedDonations=Last %s modified donations +SearchADonation=Search a donation +DonationRecipient=Donation recipient +ThankYou=Thank You +IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount +MinimumAmount=Minimum amount is %s +FreeTextOnDonations=Free text to show in footer +FrenchOptions=Options for France +DONATION_ART200=Show article 200 from CGI if you are concerned +DONATION_ART238=Show article 238 from CGI if you are concerned +DONATION_ART885=Show article 885 from CGI if you are concerned diff --git a/htdocs/langs/bn_BD/ecm.lang b/htdocs/langs/bn_BD/ecm.lang new file mode 100644 index 00000000000..4a1931a3217 --- /dev/null +++ b/htdocs/langs/bn_BD/ecm.lang @@ -0,0 +1,57 @@ +# Dolibarr language file - Source file is en_US - ecm +MenuECM=Documents +DocsMine=My documents +DocsGenerated=Generated documents +DocsElements=Elements documents +DocsThirdParties=Documents third parties +DocsContracts=Documents contracts +DocsProposals=Documents proposals +DocsOrders=Documents orders +DocsInvoices=Documents invoices +ECMNbOfDocs=Nb of documents in directory +ECMNbOfDocsSmall=Nb of doc. +ECMSection=Directory +ECMSectionManual=Manual directory +ECMSectionAuto=Automatic directory +ECMSectionsManual=Manual tree +ECMSectionsAuto=Automatic tree +ECMSections=Directories +ECMRoot=Root +ECMNewSection=New directory +ECMAddSection=Add directory +ECMNewDocument=New document +ECMCreationDate=Creation date +ECMNbOfFilesInDir=Number of files in directory +ECMNbOfSubDir=Number of sub-directories +ECMNbOfFilesInSubDir=Number of files in sub-directories +ECMCreationUser=Creator +ECMArea=EDM area +ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr. +ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.
* Manual directories can be used to save documents not linked to a particular element. +ECMSectionWasRemoved=Directory %s has been deleted. +ECMDocumentsSection=Document of directory +ECMSearchByKeywords=Search by keywords +ECMSearchByEntity=Search by object +ECMSectionOfDocuments=Directories of documents +ECMTypeManual=Manual +ECMTypeAuto=Automatic +ECMDocsBySocialContributions=Documents linked to social contributions +ECMDocsByThirdParties=Documents linked to third parties +ECMDocsByProposals=Documents linked to proposals +ECMDocsByOrders=Documents linked to customers orders +ECMDocsByContracts=Documents linked to contracts +ECMDocsByInvoices=Documents linked to customers invoices +ECMDocsByProducts=Documents linked to products +ECMDocsByProjects=Documents linked to projects +ECMDocsByUsers=Documents linked to users +ECMDocsByInterventions=Documents linked to interventions +ECMNoDirectoryYet=No directory created +ShowECMSection=Show directory +DeleteSection=Remove directory +ConfirmDeleteSection=Can you confirm you want to delete the directory %s ? +ECMDirectoryForFiles=Relative directory for files +CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files +ECMFileManager=File manager +ECMSelectASection=Select a directory on left tree... +DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory. + diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang new file mode 100644 index 00000000000..700e6344d7d --- /dev/null +++ b/htdocs/langs/bn_BD/errors.lang @@ -0,0 +1,183 @@ +# Dolibarr language file - Source file is en_US - errors + +# No errors +NoErrorCommitIsDone=No error, we commit +# Errors +Error=Error +Errors=Errors +ErrorButCommitIsDone=Errors found but we validate despite this +ErrorBadEMail=EMail %s is wrong +ErrorBadUrl=Url %s is wrong +ErrorLoginAlreadyExists=Login %s already exists. +ErrorGroupAlreadyExists=Group %s already exists. +ErrorRecordNotFound=Record not found. +ErrorFailToCopyFile=Failed to copy file '%s' into '%s'. +ErrorFailToRenameFile=Failed to rename file '%s' into '%s'. +ErrorFailToDeleteFile=Failed to remove file '%s'. +ErrorFailToCreateFile=Failed to create file '%s'. +ErrorFailToRenameDir=Failed to rename directory '%s' into '%s'. +ErrorFailToCreateDir=Failed to create directory '%s'. +ErrorFailToDeleteDir=Failed to delete directory '%s'. +ErrorFailedToDeleteJoinedFiles=Can not delete environment because there is some joined files. Remove join files first. +ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type. +ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only. +ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different. +ErrorBadThirdPartyName=Bad value for third party name +ErrorProdIdIsMandatory=The %s is mandatory +ErrorBadCustomerCodeSyntax=Bad syntax for customer code +ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. +ErrorCustomerCodeRequired=Customer code required +ErrorBarCodeRequired=Bar code required +ErrorCustomerCodeAlreadyUsed=Customer code already used +ErrorBarCodeAlreadyUsed=Bar code already used +ErrorPrefixRequired=Prefix required +ErrorUrlNotValid=The website address is incorrect +ErrorBadSupplierCodeSyntax=Bad syntax for supplier code +ErrorSupplierCodeRequired=Supplier code required +ErrorSupplierCodeAlreadyUsed=Supplier code already used +ErrorBadParameters=Bad parameters +ErrorBadValueForParameter=Wrong value '%s' for parameter incorrect '%s' +ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format) +ErrorBadDateFormat=Value '%s' has wrong date format +ErrorWrongDate=Date is not correct! +ErrorFailedToWriteInDir=Failed to write in directory %s +ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=%s) +ErrorUserCannotBeDelete=User can not be deleted. May be it is associated on Dolibarr entities. +ErrorFieldsRequired=Some required fields were not filled. +ErrorFailedToCreateDir=Failed to create a directory. Check that Web server user has permissions to write into Dolibarr documents directory. If parameter safe_mode is enabled on this PHP, check that Dolibarr php files owns to web server user (or group). +ErrorNoMailDefinedForThisUser=No mail defined for this user +ErrorFeatureNeedJavascript=This feature need javascript to be activated to work. Change this in setup - display. +ErrorTopMenuMustHaveAParentWithId0=A menu of type 'Top' can't have a parent menu. Put 0 in parent menu or choose a menu of type 'Left'. +ErrorLeftMenuMustHaveAParentId=A menu of type 'Left' must have a parent id. +ErrorFileNotFound=File %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) +ErrorDirNotFound=Directory %s not found (Bad path, wrong permissions or access denied by PHP openbasedir or safe_mode parameter) +ErrorFunctionNotAvailableInPHP=Function %s is required for this feature but is not available in this version/setup of PHP. +ErrorDirAlreadyExists=A directory with this name already exists. +ErrorFileAlreadyExists=A file with this name already exists. +ErrorPartialFile=File not received completely by server. +ErrorNoTmpDir=Temporary directy %s does not exists. +ErrorUploadBlockedByAddon=Upload blocked by a PHP/Apache plugin. +ErrorFileSizeTooLarge=File size is too large. +ErrorSizeTooLongForIntType=Size too long for int type (%s digits maximum) +ErrorSizeTooLongForVarcharType=Size too long for string type (%s chars maximum) +ErrorNoValueForSelectType=Please fill value for select list +ErrorNoValueForCheckBoxType=Please fill value for checkbox list +ErrorNoValueForRadioType=Please fill value for radio list +ErrorBadFormatValueList=The list value cannot have more than one come : %s, but need at least one: llave,valores +ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters. +ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters. +ErrorNoAccountancyModuleLoaded=No accountancy module activated +ErrorExportDuplicateProfil=This profile name already exists for this export set. +ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete. +ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors. +ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "statut not started" if field "done by" is also filled. +ErrorRefAlreadyExists=Ref used for creation already exists. +ErrorPleaseTypeBankTransactionReportName=Please type bank receipt name where transaction is reported (Format YYYYMM or YYYYMMDD) +ErrorRecordHasChildren=Failed to delete records since it has some childs. +ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object. +ErrorModuleRequireJavascript=Javascript must not be disabled to have this feature working. To enable/disable Javascript, go to menu Home->Setup->Display. +ErrorPasswordsMustMatch=Both typed passwords must match each other +ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page. +ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s) +ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s) +ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref) +ErrorsOnXLines=Errors on %s source record(s) +ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus) +ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s" +ErrorDatabaseParameterWrong=Database setup parameter '%s' has a value not compatible to use Dolibarr (must have value '%s'). +ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module. +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Setup - Modules to complete. +ErrorBadMask=Error on mask +ErrorBadMaskFailedToLocatePosOfSequence=Error, mask without sequence number +ErrorBadMaskBadRazMonth=Error, bad reset value +ErrorMaxNumberReachForThisMask=Max number reach for this mask +ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits +ErrorSelectAtLeastOne=Error. Select at least one entry. +ErrorProductWithRefNotExist=Product with reference '%s' don't exist +ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated +ErrorProdIdAlreadyExist=%s is assigned to another third +ErrorFailedToSendPassword=Failed to send password +ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information. +ErrorPasswordDiffers=Passwords differs, please type them again. +ErrorForbidden=Access denied.
You try to access to a page, area or feature without being in an authenticated session or that is not allowed to your user. +ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s. +ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...). +ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can be available. Administrators can disable this tab from menu Setup - Display. +ErrorRecordAlreadyExists=Record already exists +ErrorCantReadFile=Failed to read file '%s' +ErrorCantReadDir=Failed to read directory '%s' +ErrorFailedToFindEntity=Failed to read environment '%s' +ErrorBadLoginPassword=Bad value for login or password +ErrorLoginDisabled=Your account has been disabled +ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP Safe Mode is enabled, check that command is inside a directory defined by parameter safe_mode_exec_dir. +ErrorFailedToChangePassword=Failed to change password +ErrorLoginDoesNotExists=User with login %s could not be found. +ErrorLoginHasNoEmail=This user has no email address. Process aborted. +ErrorBadValueForCode=Bad value for security code. Try again with new value... +ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative +ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative +ErrorWebServerUserHasNotPermission=User account %s used to execute web server has no permission for that +ErrorNoActivatedBarcode=No barcode type activated +ErrUnzipFails=Failed to unzip %s with ZipArchive +ErrNoZipEngine=No engine to unzip %s file in this PHP +ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package +ErrorFileRequired=It takes a package Dolibarr file +ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal +ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base +ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base +ErrorNewValueCantMatchOldValue=New value can't be equal to old one +ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process. +ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start'). +ErrorFailedToAddContact=Failed to add contact +ErrorDateMustBeBeforeToday=The date can not be greater than today +ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode. +ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature. +ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s +ErrorWarehouseMustDiffers=Source and target warehouses must differs +ErrorBadFormat=Bad format! +ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice. +ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused. +ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated +ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed +ErrorPriceExpression1=Cannot assign to constant '%s' +ErrorPriceExpression2=Cannot redefine built-in function '%s' +ErrorPriceExpression3=Undefined variable '%s' in function definition +ErrorPriceExpression4=Illegal character '%s' +ErrorPriceExpression5=Unexpected '%s' +ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected) +ErrorPriceExpression8=Unexpected operator '%s' +ErrorPriceExpression9=An unexpected error occured +ErrorPriceExpression10=Iperator '%s' lacks operand +ErrorPriceExpression11=Expecting '%s' +ErrorPriceExpression14=Division by zero +ErrorPriceExpression17=Undefined variable '%s' +ErrorPriceExpression19=Expression not found +ErrorPriceExpression20=Empty expression +ErrorPriceExpression21=Empty result '%s' +ErrorPriceExpression22=Negative result '%s' +ErrorPriceExpressionInternal=Internal error '%s' +ErrorPriceExpressionUnknown=Unknown error '%s' +ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs +ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action + +# Warnings +WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined +WarningSafeModeOnCheckExecDir=Warning, PHP option safe_mode is on so command must be stored inside a directory declared by php parameter safe_mode_exec_dir. +WarningAllowUrlFopenMustBeOn=Parameter allow_url_fopen must be set to on in filer php.ini for having this module working completely. You must modify this file manually. +WarningBuildScriptNotRunned=Script %s was not yet ran to build graphics, or there is no data to show. +WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists. +WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this. +WarningConfFileMustBeReadOnly=Warning, your config file (htdocs/conf/conf.php) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe. +WarningsOnXLines=Warnings on %s source record(s) +WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be choosed by default until you check your module setup. +WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file install.lock into directory %s. Missing this file is a security hole. +WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup). +WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution. +WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box. +WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card). +WarningNotRelevant=Irrelevant operation for this dataset +WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers. +WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s. +WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters diff --git a/htdocs/langs/bn_BD/exports.lang b/htdocs/langs/bn_BD/exports.lang new file mode 100644 index 00000000000..d79df485608 --- /dev/null +++ b/htdocs/langs/bn_BD/exports.lang @@ -0,0 +1,134 @@ +# Dolibarr language file - Source file is en_US - exports +ExportsArea=Exports area +ImportArea=Import area +NewExport=New export +NewImport=New import +ExportableDatas=Exportable dataset +ImportableDatas=Importable dataset +SelectExportDataSet=Choose dataset you want to export... +SelectImportDataSet=Choose dataset you want to import... +SelectExportFields=Choose fields you want to export, or select a predefined export profile +SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile: +NotImportedFields=Fields of source file not imported +SaveExportModel=Save this export profile if you plan to reuse it later... +SaveImportModel=Save this import profile if you plan to reuse it later... +ExportModelName=Export profile name +ExportModelSaved=Export profile saved under name %s. +ExportableFields=Exportable fields +ExportedFields=Exported fields +ImportModelName=Import profile name +ImportModelSaved=Import profile saved under name %s. +ImportableFields=Importable fields +ImportedFields=Imported fields +DatasetToExport=Dataset to export +DatasetToImport=Import file into dataset +NoDiscardedFields=No fields in source file are discarded +Dataset=Dataset +ChooseFieldsOrdersAndTitle=Choose fields order... +FieldsOrder=Fields order +FieldsTitle=Fields title +FieldOrder=Field order +FieldTitle=Field title +ChooseExportFormat=Choose export format +NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file... +AvailableFormats=Available formats +LibraryShort=Library +LibraryUsed=Library used +LibraryVersion=Version +Step=Step +FormatedImport=Import assistant +FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge. +FormatedImportDesc2=First step is to choose a king of data you want to load, then file to load, then to choose which fields you want to load. +FormatedExport=Export assistant +FormatedExportDesc1=This area allows to export personalized data, using an assistant to help you in process without technical knowledge. +FormatedExportDesc2=First step is to choose a predefined dataset, then to choose which fields you want in your result files, and which order. +FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to. +Sheet=Sheet +NoImportableData=No importable data (no module with definitions to allow data imports) +FileSuccessfullyBuilt=Export file generated +SQLUsedForExport=SQL Request used to build export file +LineId=Id of line +LineDescription=Description of line +LineUnitPrice=Unit price of line +LineVATRate=VAT Rate of line +LineQty=Quantity for line +LineTotalHT=Amount net of tax for line +LineTotalTTC=Amount with tax for line +LineTotalVAT=Amount of VAT for line +TypeOfLineServiceOrProduct=Type of line (0=product, 1=service) +FileWithDataToImport=File with data to import +FileToImport=Source file to import +FileMustHaveOneOfFollowingFormat=File to import must have one of following format +DownloadEmptyExample=Download example of empty source file +ChooseFormatOfFileToImport=Choose file format to use as import file format by clicking on picto %s to select it... +ChooseFileToImport=Upload file then click on picto %s to select file as source import file... +SourceFileFormat=Source file format +FieldsInSourceFile=Fields in source file +FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory) +Field=Field +NoFields=No fields +MoveField=Move field column number %s +ExampleOfImportFile=Example_of_import_file +SaveImportProfile=Save this import profile +ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name. +ImportSummary=Import setup summary +TablesTarget=Targeted tables +FieldsTarget=Targeted fields +TableTarget=Targeted table +FieldTarget=Targeted field +FieldSource=Source field +DoNotImportFirstLine=Do not import first line of source file +NbOfSourceLines=Number of lines in source file +NowClickToTestTheImport=Check import parameters you have defined. If they are correct, click on button "%s" to launch a simulation of import process (no data will be changed in your database, it's only a simulation for the moment)... +RunSimulateImportFile=Launch the import simulation +FieldNeedSource=This field requires data from the source file +SomeMandatoryFieldHaveNoSource=Some mandatory fields have no source from data file +InformationOnSourceFile=Information on source file +InformationOnTargetTables=Information on target fields +SelectAtLeastOneField=Switch at least one source field in the column of fields to export +SelectFormat=Choose this import file format +RunImportFile=Launch import file +NowClickToRunTheImport=Check result of import simulation. If everything is ok, launch the definitive import. +DataLoadedWithId=All data will be loaded with the following import id: %s +ErrorMissingMandatoryValue=Mandatory data is empty in source file for field %s. +TooMuchErrors=There is still %s other source lines with errors but output has been limited. +TooMuchWarnings=There is still %s other source lines with warnings but output has been limited. +EmptyLine=Empty line (will be discarded) +CorrectErrorBeforeRunningImport=You must first correct all errors before running definitive import. +FileWasImported=File was imported with number %s. +YouCanUseImportIdToFindRecord=You can find all imported records in your database by filtering on field import_key='%s'. +NbOfLinesOK=Number of lines with no errors and no warnings: %s. +NbOfLinesImported=Number of lines successfully imported: %s. +DataComeFromNoWhere=Value to insert comes from nowhere in source file. +DataComeFromFileFieldNb=Value to insert comes from field number %s in source file. +DataComeFromIdFoundFromRef=Value that comes from field number %s of source file will be used to find id of parent object to use (So the objet %s that has the ref. from source file must exists into Dolibarr). +DataComeFromIdFoundFromCodeId=Code that comes from field number %s of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary %s). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases. +DataIsInsertedInto=Data coming from source file will be inserted into the following field: +DataIDSourceIsInsertedInto=The id of parent object found using the data in source file, will be inserted into the following field: +DataCodeIDSourceIsInsertedInto=The id of parent line found from code, will be inserted into following field: +SourceRequired=Data value is mandatory +SourceExample=Example of possible data value +ExampleAnyRefFoundIntoElement=Any ref found for element %s +ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s +CSVFormatDesc=Comma Separated Value file format (.csv).
This is a text file format where fields are separated by separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ]. +Excel95FormatDesc=Excel file format (.xls)
This is native Excel 95 format (BIFF5). +Excel2007FormatDesc=Excel file format (.xlsx)
This is native Excel 2007 format (SpreadsheetML). +TsvFormatDesc=Tab Separated Value file format (.tsv)
This is a text file format where fields are separated by a tabulator [tab]. +ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ). +CsvOptions=Csv Options +Separator=Separator +Enclosure=Enclosure +SuppliersProducts=Suppliers Products +BankCode=Bank code +DeskCode=Desk code +BankAccountNumber=Account number +BankAccountNumberKey=Key +SpecialCode=Special code +ExportStringFilter=%% allows replacing one or more characters in the text +ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days +ExportNumericFilter='NNNNN' filters by one value
'NNNNN+NNNNN' filters over a range of values
'>NNNNN' filters by lower values
'>NNNNN' filters by higher values +## filters +SelectFilterFields=If you want to filter on some values, just input values here. +FilterableFields=Champs Filtrables +FilteredFields=Filtered fields +FilteredFieldsValues=Value for filter diff --git a/htdocs/langs/bn_BD/externalsite.lang b/htdocs/langs/bn_BD/externalsite.lang new file mode 100644 index 00000000000..da4853df0df --- /dev/null +++ b/htdocs/langs/bn_BD/externalsite.lang @@ -0,0 +1,5 @@ +# Dolibarr language file - Source file is en_US - externalsite +ExternalSiteSetup=Setup link to external website +ExternalSiteURL=External Site URL +ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly. +ExampleMyMenuEntry=My menu entry diff --git a/htdocs/langs/bn_BD/ftp.lang b/htdocs/langs/bn_BD/ftp.lang new file mode 100644 index 00000000000..9984ce689ee --- /dev/null +++ b/htdocs/langs/bn_BD/ftp.lang @@ -0,0 +1,12 @@ +# Dolibarr language file - Source file is en_US - ftp +FTPClientSetup=FTP Client module setup +NewFTPClient=New FTP connection setup +FTPArea=FTP Area +FTPAreaDesc=This screen show you content of a FTP server view +SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete +FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions +FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s) +FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password +FTPFailedToRemoveFile=Failed to remove file %s. +FTPFailedToRemoveDir=Failed to remove directory %s (Check permissions and that directory is empty). +FTPPassiveMode=Passive mode diff --git a/htdocs/langs/bn_BD/help.lang b/htdocs/langs/bn_BD/help.lang new file mode 100644 index 00000000000..1bbd6e94f03 --- /dev/null +++ b/htdocs/langs/bn_BD/help.lang @@ -0,0 +1,28 @@ +# Dolibarr language file - Source file is en_US - help +CommunitySupport=Forum/Wiki support +EMailSupport=Emails support +RemoteControlSupport=Online real time / remote support +OtherSupport=Other support +ToSeeListOfAvailableRessources=To contact/see available resources: +ClickHere=Click here +HelpCenter=Help center +DolibarrHelpCenter=Dolibarr help and support center +ToGoBackToDolibarr=Otherwise, click here to use Dolibarr +TypeOfSupport=Source of support +TypeSupportCommunauty=Community (free) +TypeSupportCommercial=Commercial +TypeOfHelp=Type +NeedHelpCenter=Need help or support ? +Efficiency=Efficiency +TypeHelpOnly=Help only +TypeHelpDev=Help+Development +TypeHelpDevForm=Help+Development+Formation +ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on %s web site: +ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button +ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests. +BackToHelpCenter=Otherwise, click here to go back to help center home page. +LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated): +PossibleLanguages=Supported languages +MakeADonation=Help Dolibarr project, make a donation +SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation +SeeOfficalSupport=For official Dolibarr support in your language:
%s diff --git a/htdocs/langs/bn_BD/holiday.lang b/htdocs/langs/bn_BD/holiday.lang new file mode 100644 index 00000000000..f5b87fefb08 --- /dev/null +++ b/htdocs/langs/bn_BD/holiday.lang @@ -0,0 +1,148 @@ +# Dolibarr language file - Source file is en_US - holiday +HRM=HRM +Holidays=Leaves +CPTitreMenu=Leaves +MenuReportMonth=Monthly statement +MenuAddCP=Make a leave request +NotActiveModCP=You must enable the module Leaves to view this page. +NotConfigModCP=You must configure the module Leaves to view this page. To do this, click here . +NoCPforUser=You don't have any available day. +AddCP=Make a leave request +Employe=Employee +DateDebCP=Start date +DateFinCP=End date +DateCreateCP=Creation date +DraftCP=Draft +ToReviewCP=Awaiting approval +ApprovedCP=Approved +CancelCP=Canceled +RefuseCP=Refused +ValidatorCP=Approbator +ListeCP=List of leaves +ReviewedByCP=Will be reviewed by +DescCP=Description +SendRequestCP=Create leave request +DelayToRequestCP=Leave requests must be made at least %s day(s) before them. +MenuConfCP=Edit balance of leaves +UpdateAllCP=Update the leaves +SoldeCPUser=Leaves balance is %s days. +ErrorEndDateCP=You must select an end date greater than the start date. +ErrorSQLCreateCP=An SQL error occurred during the creation: +ErrorIDFicheCP=An error has occurred, the leave request does not exist. +ReturnCP=Return to previous page +ErrorUserViewCP=You are not authorized to read this leave request. +InfosCP=Information of the leave request +InfosWorkflowCP=Information Workflow +RequestByCP=Requested by +TitreRequestCP=Leave request +NbUseDaysCP=Number of days of vacation consumed +EditCP=Edit +DeleteCP=Delete +ActionValidCP=Validate +ActionRefuseCP=Refuse +ActionCancelCP=Cancel +StatutCP=Status +SendToValidationCP=Send to validation +TitleDeleteCP=Delete the leave request +ConfirmDeleteCP=Confirm the deletion of this leave request? +ErrorCantDeleteCP=Error you don't have the right to delete this leave request. +CantCreateCP=You don't have the right to make leave requests. +InvalidValidatorCP=You must choose an approbator to your leave request. +CantUpdate=You cannot update this leave request. +NoDateDebut=You must select a start date. +NoDateFin=You must select an end date. +ErrorDureeCP=Your leave request does not contain working day. +TitleValidCP=Approve the leave request +ConfirmValidCP=Are you sure you want to approve the leave request? +DateValidCP=Date approved +TitleToValidCP=Send leave request +ConfirmToValidCP=Are you sure you want to send the leave request? +TitleRefuseCP=Refuse the leave request +ConfirmRefuseCP=Are you sure you want to refuse the leave request? +NoMotifRefuseCP=You must choose a reason for refusing the request. +TitleCancelCP=Cancel the leave request +ConfirmCancelCP=Are you sure you want to cancel the leave request? +DetailRefusCP=Reason for refusal +DateRefusCP=Date of refusal +DateCancelCP=Date of cancellation +DefineEventUserCP=Assign an exceptional leave for a user +addEventToUserCP=Assign leave +MotifCP=Reason +UserCP=User +ErrorAddEventToUserCP=An error occurred while adding the exceptional leave. +AddEventToUserOkCP=The addition of the exceptional leave has been completed. +MenuLogCP=View logs of leave requests +LogCP=Log of updates of available vacation days +ActionByCP=Performed by +UserUpdateCP=For the user +PrevSoldeCP=Previous Balance +NewSoldeCP=New Balance +alreadyCPexist=A leave request has already been done on this period. +UserName=Name +Employee=Employee +FirstDayOfHoliday=First day of vacation +LastDayOfHoliday=Last day of vacation +HolidaysMonthlyUpdate=Monthly update +ManualUpdate=Manual update +HolidaysCancelation=Leave request cancelation + +## Configuration du Module ## +ConfCP=Configuration of leave request module +DescOptionCP=Description of the option +ValueOptionCP=Value +GroupToValidateCP=Group with the ability to approve leave requests +ConfirmConfigCP=Validate the configuration +LastUpdateCP=Last automatic update of leaves allocation +UpdateConfCPOK=Updated successfully. +ErrorUpdateConfCP=An error occurred during the update, please try again. +AddCPforUsers=Please add the balance of leaves allocation of users by clicking here. +DelayForSubmitCP=Deadline to make a leave requests +AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline +AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay +AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance +nbUserCP=Number of users supported in the module Leaves +nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken +nbHolidayEveryMonthCP=Number of leave days added every month +Module27130Name= Management of leave requests +Module27130Desc= Management of leave requests +TitleOptionMainCP=Main settings of leave request +TitleOptionEventCP=Settings of leave requets for events +ValidEventCP=Validate +UpdateEventCP=Update events +CreateEventCP=Create +NameEventCP=Event name +OkCreateEventCP=The addition of the event went well. +ErrorCreateEventCP=Error creating the event. +UpdateEventOkCP=The update of the event went well. +ErrorUpdateEventCP=Error while updating the event. +DeleteEventCP=Delete Event +DeleteEventOkCP=The event has been deleted. +ErrorDeleteEventCP=Error while deleting the event. +TitleDeleteEventCP=Delete a exceptional leave +TitleCreateEventCP=Create a exceptional leave +TitleUpdateEventCP=Edit or delete a exceptional leave +DeleteEventOptionCP=Delete +UpdateEventOptionCP=Update +ErrorMailNotSend=An error occurred while sending email: +NoCPforMonth=No leave this month. +nbJours=Number days +TitleAdminCP=Configuration of Leaves +#Messages +Hello=Hello +HolidaysToValidate=Validate leave requests +HolidaysToValidateBody=Below is a leave request to validate +HolidaysToValidateDelay=This leave request will take place within a period of less than %s days. +HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days. +HolidaysValidated=Validated leave requests +HolidaysValidatedBody=Your leave request for %s to %s has been validated. +HolidaysRefused=Request denied +HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason : +HolidaysCanceled=Canceled leaved request +HolidaysCanceledBody=Your leave request for %s to %s has been canceled. +Permission20000=Read you own leave requests +Permission20001=Create/modify your leave requests +Permission20002=Create/modify leave requests for everybody +Permission20003=Delete leave requests +Permission20004=Setup users available vacation days +Permission20005=Review log of modified leave requests +Permission20006=Read leaves monthly report diff --git a/htdocs/langs/bn_BD/incoterm.lang b/htdocs/langs/bn_BD/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/bn_BD/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang new file mode 100644 index 00000000000..dcd8df6e7db --- /dev/null +++ b/htdocs/langs/bn_BD/install.lang @@ -0,0 +1,214 @@ +# Dolibarr language file - Source file is en_US - install +InstallEasy=Just follow the instructions step by step. +MiscellaneousChecks=Prerequisites check +DolibarrWelcome=Welcome to Dolibarr +ConfFileExists=Configuration file %s exists. +ConfFileDoesNotExists=Configuration file %s does not exist ! +ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file %s does not exist and could not be created ! +ConfFileCouldBeCreated=Configuration file %s could be created. +ConfFileIsNotWritable=Configuration file %s is not writable. Check permissions. For first install, your web server must be granted to be able to write into this file during configuration process ("chmod 666" for example on a Unix like OS). +ConfFileIsWritable=Configuration file %s is writable. +ConfFileReload=Reload all information from configuration file. +PHPSupportSessions=This PHP supports sessions. +PHPSupportPOSTGETOk=This PHP supports variables POST and GET. +PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter variables_order in php.ini. +PHPSupportGD=This PHP support GD graphical functions. +PHPSupportUTF8=This PHP support UTF8 functions. +PHPMemoryOK=Your PHP max session memory is set to %s. This should be enough. +PHPMemoryTooLow=Your PHP max session memory is set to %s bytes. This should be too low. Change your php.ini to set memory_limit parameter to at least %s bytes. +Recheck=Click here for a more significative test +ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup. +ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available. +ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr. +ErrorDirDoesNotExists=Directory %s does not exist. +ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters. +ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'. +ErrorFailedToCreateDatabase=Failed to create database '%s'. +ErrorFailedToConnectToDatabase=Failed to connect to database '%s'. +ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required. +ErrorPHPVersionTooLow=PHP version too old. Version %s is required. +WarningPHPVersionTooLow=PHP version too old. Version %s or more is expected. This version should allow install but is not supported. +ErrorConnectedButDatabaseNotFound=Connection to server successfull but database '%s' not found. +ErrorDatabaseAlreadyExists=Database '%s' already exists. +IfDatabaseNotExistsGoBackAndUncheckCreate=If database does not exists, go back and check option "Create database". +IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option. +WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded. +PHPVersion=PHP Version +YouCanContinue=You can continue... +PleaseBePatient=Please be patient... +License=Using license +ConfigurationFile=Configuration file +WebPagesDirectory=Directory where web pages are stored +DocumentsDirectory=Directory to store uploaded and generated documents +URLRoot=URL Root +ForceHttps=Force secure connections (https) +CheckToForceHttps=Check this option to force secure connections (https).
This requires that the web server is configured with an SSL certificate. +DolibarrDatabase=Dolibarr Database +DatabaseChoice=Database choice +DatabaseType=Database type +DriverType=Driver type +Server=Server +ServerAddressDescription=Name or ip address for database server, usually 'localhost' when database server is hosted on same server than web server +ServerPortDescription=Database server port. Keep empty if unknown. +DatabaseServer=Database server +DatabaseName=Database name +DatabasePrefix=Database prefix table +Login=Login +AdminLogin=Login for Dolibarr database owner. +Password=Password +PasswordAgain=Retype password a second time +AdminPassword=Password for Dolibarr database owner. +CreateDatabase=Create database +CreateUser=Create owner +DatabaseSuperUserAccess=Database server - Superuser access +CheckToCreateDatabase=Check box if database does not exist and must be created.
In this case, you must fill the login/password for superuser account at the bottom of this page. +CheckToCreateUser=Check box if database owner does not exist and must be created.
In this case, you must choose its login and password and also fill the login/password for the superuser account at the bottom of this page. If this box is unchecked, owner database and its passwords must exists. +Experimental=(experimental) +DatabaseRootLoginDescription=Login of the user allowed to create new databases or new users, mandatory if your database or its owner does not already exists. +KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this) +SaveConfigurationFile=Save values +ConfigurationSaving=Saving configuration file +ServerConnection=Server connection +DatabaseConnection=Database connection +DatabaseCreation=Database creation +UserCreation=User creation +CreateDatabaseObjects=Database objects creation +ReferenceDataLoading=Reference data loading +TablesAndPrimaryKeysCreation=Tables and Primary keys creation +CreateTableAndPrimaryKey=Create table %s +CreateOtherKeysForTable=Create foreign keys and indexes for table %s +OtherKeysCreation=Foreign keys and indexes creation +FunctionsCreation=Functions creation +AdminAccountCreation=Administrator login creation +PleaseTypePassword=Please type a password, empty passwords are not allowed ! +PleaseTypeALogin=Please type a login ! +PasswordsMismatch=Passwords differs, please try again ! +SetupEnd=End of setup +SystemIsInstalled=This installation is complete. +SystemIsUpgraded=Dolibarr has been upgraded successfully. +YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below: +AdminLoginCreatedSuccessfuly=Dolibarr administrator login '%s' created successfuly. +GoToDolibarr=Go to Dolibarr +GoToSetupArea=Go to Dolibarr (setup area) +MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again. +GoToUpgradePage=Go to upgrade page again +Examples=Examples +WithNoSlashAtTheEnd=Without the slash "/" at the end +DirectoryRecommendation=It is recommanded to use a directory outside of your directory of your web pages. +LoginAlreadyExists=Already exists +DolibarrAdminLogin=Dolibarr admin login +AdminLoginAlreadyExists=Dolibarr administrator account '%s' already exists. Go back, if you want to create another one. +WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called install.lock into Dolibarr document directory, in order to avoid malicious use of it. +ThisPHPDoesNotSupportTypeBase=This PHP system does not support any interface to access database type %s +FunctionNotAvailableInThisPHP=Not available on this PHP +MigrateScript=Migration script +ChoosedMigrateScript=Choose migration script +DataMigration=Data migration +DatabaseMigration=Structure database migration +ProcessMigrateScript=Script processing +ChooseYourSetupMode=Choose your setup mode and click "Start"... +FreshInstall=Fresh install +FreshInstallDesc=Use this mode if this is your first install. If not, this mode can repair a incomplete previous install, but if you want to upgrade your version, choose "Upgrade" mode. +Upgrade=Upgrade +UpgradeDesc=Use this mode if you have replaced old Dolibarr files with files from a newer version. This will upgrade your database and data. +Start=Start +InstallNotAllowed=Setup not allowed by conf.php permissions +NotAvailable=Not available +YouMustCreateWithPermission=You must create file %s and set write permissions on it for the web server during install process. +CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload page. +AlreadyDone=Already migrated +DatabaseVersion=Database version +ServerVersion=Database server version +YouMustCreateItAndAllowServerToWrite=You must create this directory and allow for the web server to write into it. +CharsetChoice=Character set choice +CharacterSetClient=Character set used for generated HTML web pages +CharacterSetClientComment=Choose character set for web display.
Default proposed character set is the one of your database. +DBSortingCollation=Character sorting order +DBSortingCollationComment=Choose page code that defines character's sorting order used by database. This parameter is also called 'collation' by some databases.
This parameter can't be defined if database already exists. +CharacterSetDatabase=Character set for database +CharacterSetDatabaseComment=Choose character set wanted for database creation.
This parameter can't be defined if database already exists. +YouAskDatabaseCreationSoDolibarrNeedToConnect=You ask to create database %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. +YouAskLoginCreationSoDolibarrNeedToConnect=You ask to create database login %s, but for this, Dolibarr need to connect to server %s with super user %s permissions. +BecauseConnectionFailedParametersMayBeWrong=As connection failed, host or super user parameters must be wrong. +OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s +RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue. +KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do. +KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do. +KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do. +KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do. +FieldRenamed=Field renamed +IfLoginDoesNotExistsCheckCreateUser=If login does not exists yet, you must check option "Create user" +ErrorConnection=Server "%s", database name "%s", login "%s", or database password may be wrong or PHP client version may be too old compared to database version. +InstallChoiceRecommanded=Recommended choice to install version %s from your current version %s +InstallChoiceSuggested=Install choice suggested by installer. +MigrateIsDoneStepByStep=The targeted version (%s) has a gap of several versions, so install wizard will come back to suggest next migration once this one will be finished. +CheckThatDatabasenameIsCorrect=Check that database name "%s" is correct. +IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database". +OpenBaseDir=PHP openbasedir parameter +YouAskToCreateDatabaseSoRootRequired=You checked the box "Create database". For this, you need to provide login/password of superuser (bottom of form). +YouAskToCreateDatabaseUserSoRootRequired=You checked the box "Create database owner". For this, you need to provide login/password of superuser (bottom of form). +NextStepMightLastALongTime=Current step may last several minutes. Please wait until the next screen is shown completely before continuing. +MigrationCustomerOrderShipping=Migrate shipping for customer orders storage +MigrationShippingDelivery=Upgrade storage of shipping +MigrationShippingDelivery2=Upgrade storage of shipping 2 +MigrationFinished=Migration finished +LastStepDesc=Last step: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others. +ActivateModule=Activate module %s +ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode) +WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process... +ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) + +######### +# upgrade +MigrationFixData=Fix for denormalized data +MigrationOrder=Data migration for customer's orders +MigrationSupplierOrder=Data migration for supplier's orders +MigrationProposal=Data migration for commercial proposals +MigrationInvoice=Data migration for customer's invoices +MigrationContract=Data migration for contracts +MigrationSuccessfullUpdate=Upgrade successful +MigrationUpdateFailed=Failed upgrade process +MigrationRelationshipTables=Data migration for relationship tables (%s) +MigrationPaymentsUpdate=Payment data correction +MigrationPaymentsNumberToUpdate=%s payment(s) to update +MigrationProcessPaymentUpdate=Update payment(s) %s +MigrationPaymentsNothingToUpdate=No more things to do +MigrationPaymentsNothingUpdatable=No more payments that can be corrected +MigrationContractsUpdate=Contract data correction +MigrationContractsNumberToUpdate=%s contract(s) to update +MigrationContractsLineCreation=Create contract line for contract ref %s +MigrationContractsNothingToUpdate=No more things to do +MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do. +MigrationContractsEmptyDatesUpdate=Contract empty date correction +MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfuly +MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct +MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct +MigrationContractsInvalidDatesUpdate=Bad value date contract correction +MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=%s) +MigrationContractsInvalidDatesNumber=%s contracts modified +MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct +MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction +MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done succesfuly +MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct +MigrationReopeningContracts=Open contract closed by error +MigrationReopenThisContract=Reopen contract %s +MigrationReopenedContractsNumber=%s contracts modified +MigrationReopeningContractsNothingToUpdate=No closed contract to open +MigrationBankTransfertsUpdate=Update links between bank transaction and a bank transfer +MigrationBankTransfertsNothingToUpdate=All links are up to date +MigrationShipmentOrderMatching=Sendings receipt update +MigrationDeliveryOrderMatching=Delivery receipt update +MigrationDeliveryDetail=Delivery update +MigrationStockDetail=Update stock value of products +MigrationMenusDetail=Update dynamic menus tables +MigrationDeliveryAddress=Update delivery address in shipments +MigrationProjectTaskActors=Data migration for llx_projet_task_actors table +MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact +MigrationProjectTaskTime=Update time spent in seconds +MigrationActioncommElement=Update data on actions +MigrationPaymentMode=Data migration for payment mode +MigrationCategorieAssociation=Migration of categories +MigrationEvents=Migration of events to add event owner into assignement table + +ShowNotAvailableOptions=Show not available options +HideNotAvailableOptions=Hide not available options diff --git a/htdocs/langs/bn_BD/interventions.lang b/htdocs/langs/bn_BD/interventions.lang new file mode 100644 index 00000000000..c79da05364e --- /dev/null +++ b/htdocs/langs/bn_BD/interventions.lang @@ -0,0 +1,53 @@ +# Dolibarr language file - Source file is en_US - interventions +Intervention=Intervention +Interventions=Interventions +InterventionCard=Intervention card +NewIntervention=New intervention +AddIntervention=Create intervention +ListOfInterventions=List of interventions +EditIntervention=Edit intervention +ActionsOnFicheInter=Actions on intervention +LastInterventions=Last %s interventions +AllInterventions=All interventions +CreateDraftIntervention=Create draft +CustomerDoesNotHavePrefix=Customer does not have a prefix +InterventionContact=Intervention contact +DeleteIntervention=Delete intervention +ValidateIntervention=Validate intervention +ModifyIntervention=Modify intervention +DeleteInterventionLine=Delete intervention line +ConfirmDeleteIntervention=Are you sure you want to delete this intervention ? +ConfirmValidateIntervention=Are you sure you want to validate this intervention under name %s ? +ConfirmModifyIntervention=Are you sure you want to modify this intervention ? +ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ? +NameAndSignatureOfInternalContact=Name and signature of intervening : +NameAndSignatureOfExternalContact=Name and signature of customer : +DocumentModelStandard=Standard document model for interventions +InterventionCardsAndInterventionLines=Interventions and lines of interventions +InterventionClassifyBilled=Classify "Billed" +InterventionClassifyUnBilled=Classify "Unbilled" +StatusInterInvoiced=Billed +RelatedInterventions=Related interventions +ShowIntervention=Show intervention +SendInterventionRef=Submission of intervention %s +SendInterventionByMail=Send intervention by Email +InterventionCreatedInDolibarr=Intervention %s created +InterventionValidatedInDolibarr=Intervention %s validated +InterventionModifiedInDolibarr=Intervention %s modified +InterventionClassifiedBilledInDolibarr=Intervention %s set as billed +InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled +InterventionSentByEMail=Intervention %s sent by EMail +InterventionDeletedInDolibarr=Intervention %s deleted +SearchAnIntervention=Search an intervention +##### Types de contacts ##### +TypeContact_fichinter_internal_INTERREPFOLL=Representative following-up intervention +TypeContact_fichinter_internal_INTERVENING=Intervening +TypeContact_fichinter_external_BILLING=Billing customer contact +TypeContact_fichinter_external_CUSTOMER=Following-up customer contact +# Modele numérotation +ArcticNumRefModelDesc1=Generic number model +ArcticNumRefModelError=Failed to activate +PacificNumRefModelDesc1=Return numero with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence with no break and no return to 0 +PacificNumRefModelError=An intervention card starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module. +PrintProductsOnFichinter=Print products on intervention card +PrintProductsOnFichinterDetails=forinterventions generated from orders diff --git a/htdocs/langs/bn_BD/languages.lang b/htdocs/langs/bn_BD/languages.lang new file mode 100644 index 00000000000..d20aab00146 --- /dev/null +++ b/htdocs/langs/bn_BD/languages.lang @@ -0,0 +1,72 @@ +# Dolibarr language file - Source file is en_US - languages + +Language_ar_AR=Arabic +Language_ar_SA=Arabic +Language_bg_BG=Bulgarian +Language_bs_BA=Bosnian +Language_ca_ES=Catalan +Language_cs_CZ=Czech +Language_da_DA=Danish +Language_da_DK=Danish +Language_de_DE=German +Language_de_AT=German (Austria) +Language_de_CH=German (Switzerland) +Language_el_GR=Greek +Language_en_AU=English (Australia) +Language_en_CA=English (Canada) +Language_en_GB=English (United Kingdom) +Language_en_IN=English (India) +Language_en_NZ=English (New Zealand) +Language_en_SA=English (Saudi Arabia) +Language_en_US=English (United States) +Language_en_ZA=English (South Africa) +Language_es_ES=Spanish +Language_es_DO=Spanish (Dominican Republic) +Language_es_AR=Spanish (Argentina) +Language_es_CL=Spanish (Chile) +Language_es_HN=Spanish (Honduras) +Language_es_MX=Spanish (Mexico) +Language_es_PY=Spanish (Paraguay) +Language_es_PE=Spanish (Peru) +Language_es_PR=Spanish (Puerto Rico) +Language_et_EE=Estonian +Language_eu_ES=Basque +Language_fa_IR=Persian +Language_fi_FI=Fins +Language_fr_BE=French (Belgium) +Language_fr_CA=French (Canada) +Language_fr_CH=French (Switzerland) +Language_fr_FR=French +Language_fr_NC=French (New Caledonia) +Language_he_IL=Hebrew +Language_hr_HR=Croatian +Language_hu_HU=Hungarian +Language_id_ID=Indonesian +Language_is_IS=Icelandic +Language_it_IT=Italian +Language_ja_JP=Japanese +Language_ko_KR=Korean +Language_lt_LT=Lithuanian +Language_lv_LV=Latvian +Language_mk_MK=Macedonian +Language_nb_NO=Norwegian (Bokmål) +Language_nl_BE=Dutch (Belgium) +Language_nl_NL=Dutch (Netherlands) +Language_pl_PL=Polish +Language_pt_BR=Portuguese (Brazil) +Language_pt_PT=Portuguese +Language_ro_RO=Romanian +Language_ru_RU=Russian +Language_ru_UA=Russian (Ukraine) +Language_tr_TR=Turkish +Language_sl_SI=Slovenian +Language_sv_SV=Swedish +Language_sv_SE=Swedish +Language_sq_AL=Albanian +Language_sk_SK=Slovakian +Language_th_TH=Thai +Language_uk_UA=Ukrainian +Language_uz_UZ=Uzbek +Language_vi_VN=Vietnamese +Language_zh_CN=Chinese +Language_zh_TW=Chinese (Traditional) diff --git a/htdocs/langs/bn_BD/ldap.lang b/htdocs/langs/bn_BD/ldap.lang new file mode 100644 index 00000000000..02e457446a6 --- /dev/null +++ b/htdocs/langs/bn_BD/ldap.lang @@ -0,0 +1,29 @@ +# Dolibarr language file - Source file is en_US - ldap +DomainPassword=Password for domain +YouMustChangePassNextLogon=Password for user %s on the domain %s must be changed. +UserMustChangePassNextLogon=User must change password on the domain %s +LdapUacf_NORMAL_ACCOUNT=User account +LdapUacf_DONT_EXPIRE_PASSWORD=Password never expires +LdapUacf_ACCOUNTDISABLE=Account is disabled in the domain %s +LDAPInformationsForThisContact=Information in LDAP database for this contact +LDAPInformationsForThisUser=Information in LDAP database for this user +LDAPInformationsForThisGroup=Information in LDAP database for this group +LDAPInformationsForThisMember=Information in LDAP database for this member +LDAPAttribute=LDAP attribute +LDAPAttributes=LDAP attributes +LDAPCard=LDAP card +LDAPRecordNotFound=Record not found in LDAP database +LDAPUsers=Users in LDAP database +LDAPGroups=Groups in LDAP database +LDAPFieldStatus=Status +LDAPFieldFirstSubscriptionDate=First subscription date +LDAPFieldFirstSubscriptionAmount=First subscription amount +LDAPFieldLastSubscriptionDate=Last subscription date +LDAPFieldLastSubscriptionAmount=Last subscription amount +SynchronizeDolibarr2Ldap=Synchronize user (Dolibarr -> LDAP) +UserSynchronized=User synchronized +GroupSynchronized=Group synchronized +MemberSynchronized=Member synchronized +ContactSynchronized=Contact synchronized +ForceSynchronize=Force synchronizing Dolibarr -> LDAP +ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility. diff --git a/htdocs/langs/bn_BD/link.lang b/htdocs/langs/bn_BD/link.lang new file mode 100644 index 00000000000..8b1efb75ef3 --- /dev/null +++ b/htdocs/langs/bn_BD/link.lang @@ -0,0 +1,8 @@ +LinkANewFile=Link a new file/document +LinkedFiles=Linked files and documents +NoLinkFound=No registered links +LinkComplete=The file has been linked successfully +ErrorFileNotLinked=The file could not be linked +LinkRemoved=The link %s has been removed +ErrorFailedToDeleteLink= Failed to remove link '%s' +ErrorFailedToUpdateLink= Failed to update link '%s' diff --git a/htdocs/langs/bn_BD/mailmanspip.lang b/htdocs/langs/bn_BD/mailmanspip.lang new file mode 100644 index 00000000000..c85b3d60db2 --- /dev/null +++ b/htdocs/langs/bn_BD/mailmanspip.lang @@ -0,0 +1,27 @@ +# Dolibarr language file - Source file is en_US - mailmanspip +MailmanSpipSetup=Mailman and SPIP module Setup +MailmanTitle=Mailman mailing list system +TestSubscribe=To test subscription to Mailman lists +TestUnSubscribe=To test unsubscribe from Mailman lists +MailmanCreationSuccess=Subscription test was executed succesfully +MailmanDeletionSuccess=Unsubscription test was executed succesfully +SynchroMailManEnabled=A Mailman update will be performed +SynchroSpipEnabled=A Spip update will be performed +DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password +DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions +DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions +DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma) +SPIPTitle=SPIP Content Management System +DescADHERENT_SPIP_SERVEUR=SPIP Server +DescADHERENT_SPIP_DB=SPIP database name +DescADHERENT_SPIP_USER=SPIP database login +DescADHERENT_SPIP_PASS=SPIP database password +AddIntoSpip=Add into SPIP +AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP? +AddIntoSpipError=Failed to add the user in SPIP +DeleteIntoSpip=Remove from SPIP +DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP? +DeleteIntoSpipError=Failed to suppress the user from SPIP +SPIPConnectionFailed=Failed to connect to SPIP +SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done +SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang new file mode 100644 index 00000000000..7a211198822 --- /dev/null +++ b/htdocs/langs/bn_BD/mails.lang @@ -0,0 +1,141 @@ +# Dolibarr language file - Source file is en_US - mails +Mailing=EMailing +EMailing=EMailing +Mailings=EMailings +EMailings=EMailings +AllEMailings=All eMailings +MailCard=EMailing card +MailTargets=Targets +MailRecipients=Recipients +MailRecipient=Recipient +MailTitle=Description +MailFrom=Sender +MailErrorsTo=Errors to +MailReply=Reply to +MailTo=Receiver(s) +MailCC=Copy to +MailCCC=Cached copy to +MailTopic=EMail topic +MailText=Message +MailFile=Attached files +MailMessage=EMail body +ShowEMailing=Show emailing +ListOfEMailings=List of emailings +NewMailing=New emailing +EditMailing=Edit emailing +ResetMailing=Resend emailing +DeleteMailing=Delete emailing +DeleteAMailing=Delete an emailing +PreviewMailing=Preview emailing +PrepareMailing=Prepare emailing +CreateMailing=Create emailing +MailingDesc=This page allows you to send emailings to a group of people. +MailingResult=Sending emails result +TestMailing=Test email +ValidMailing=Valid emailing +ApproveMailing=Approve emailing +MailingStatusDraft=Draft +MailingStatusValidated=Validated +MailingStatusApproved=Approved +MailingStatusSent=Sent +MailingStatusSentPartialy=Sent partialy +MailingStatusSentCompletely=Sent completely +MailingStatusError=Error +MailingStatusNotSent=Not sent +MailSuccessfulySent=Email successfully sent (from %s to %s) +MailingSuccessfullyValidated=EMailing successfully validated +MailUnsubcribe=Unsubscribe +Unsuscribe=Unsubscribe +MailingStatusNotContact=Don't contact anymore +ErrorMailRecipientIsEmpty=Email recipient is empty +WarningNoEMailsAdded=No new Email to add to recipient's list. +ConfirmValidMailing=Are you sure you want to validate this emailing ? +ConfirmResetMailing=Warning, by reinitializing emailing %s, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do ? +ConfirmDeleteMailing=Are you sure you want to delete this emailling ? +NbOfRecipients=Number of recipients +NbOfUniqueEMails=Nb of unique emails +NbOfEMails=Nb of EMails +TotalNbOfDistinctRecipients=Number of distinct recipients +NoTargetYet=No recipients defined yet (Go on tab 'Recipients') +AddRecipients=Add recipients +RemoveRecipient=Remove recipient +CommonSubstitutions=Common substitutions +YouCanAddYourOwnPredefindedListHere=To create your email selector module, see htdocs/core/modules/mailings/README. +EMailTestSubstitutionReplacedByGenericValues=When using test mode, substitutions variables are replaced by generic values +MailingAddFile=Attach this file +NoAttachedFiles=No attached files +BadEMail=Bad value for EMail +CloneEMailing=Clone Emailing +ConfirmCloneEMailing=Are you sure you want to clone this emailing ? +CloneContent=Clone message +CloneReceivers=Cloner recipients +DateLastSend=Date of last sending +DateSending=Date sending +SentTo=Sent to %s +MailingStatusRead=Read +CheckRead=Read Receipt +YourMailUnsubcribeOK=The email %s is correctly unsubcribe from mailing list +MailtoEMail=Hyper link to email +ActivateCheckRead=Allow to use the "Unsubcribe" link +ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature +EMailSentToNRecipients=EMail sent to %s recipients. +XTargetsAdded=%s recipients added into target list +EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email. +MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s) +SendRemind=Send reminder by EMails +RemindSent=%s reminder(s) sent +AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent) +NoRemindSent=No EMail reminder sent +ResultOfMassSending=Result of mass EMail reminders sending + +# Libelle des modules de liste de destinataires mailing +MailingModuleDescContactCompanies=Contacts/addresses of all third parties (customer, prospect, supplier, ...) +MailingModuleDescDolibarrUsers=Dolibarr users +MailingModuleDescFundationMembers=Foundation members with emails +MailingModuleDescEmailsFromFile=EMails from a text file (email;lastname;firstname;other) +MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other) +MailingModuleDescContactsCategories=Third parties (by category) +MailingModuleDescDolibarrContractsLinesExpired=Third parties with expired contract's lines +MailingModuleDescContactsByCompanyCategory=Contacts/addresses of third parties (by third parties category) +MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category +MailingModuleDescMembersCategories=Foundation members (by categories) +MailingModuleDescContactsByFunction=Contacts/addresses of third parties (by position/function) +LineInFile=Line %s in file +RecipientSelectionModules=Defined requests for recipient's selection +MailSelectedRecipients=Selected recipients +MailingArea=EMailings area +LastMailings=Last %s emailings +TargetsStatistics=Targets statistics +NbOfCompaniesContacts=Unique contacts/addresses +MailNoChangePossible=Recipients for validated emailing can't be changed +SearchAMailing=Search mailing +SendMailing=Send emailing +SendMail=Send email +SentBy=Sent by +MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: +MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. +ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? +LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +TargetsReset=Clear list +ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing +ToAddRecipientsChooseHere=Add recipients by choosing from the lists +NbOfEMailingsReceived=Mass emailings received +NbOfEMailingsSend=Mass emailings sent +IdRecord=ID record +DeliveryReceipt=Delivery Receipt +YouCanUseCommaSeparatorForSeveralRecipients=You can use the comma separator to specify several recipients. +TagCheckMail=Track mail opening +TagUnsubscribe=Unsubscribe link +TagSignature=Signature sending user +TagMailtoEmail=Recipient EMail +# Module Notifications +Notifications=Notifications +NoNotificationsWillBeSent=No email notifications are planned for this event and company +ANotificationsWillBeSent=1 notification will be sent by email +SomeNotificationsWillBeSent=%s notifications will be sent by email +AddNewNotification=Activate a new email notification target +ListOfActiveNotifications=List all active email notification targets +ListOfNotificationsDone=List all email notifications sent +MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. +MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. +MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang new file mode 100644 index 00000000000..d40e28cb776 --- /dev/null +++ b/htdocs/langs/bn_BD/main.lang @@ -0,0 +1,725 @@ +# Dolibarr language file - Source file is en_US - main +DIRECTION=ltr +# Note for Chinese: +# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader) +# stsongstdlight or cid0cs are for simplified Chinese +# To read Chinese pdf with Linux: sudo apt-get install poppler-data +FONTFORPDF=helvetica +FONTSIZEFORPDF=10 +SeparatorDecimal=. +SeparatorThousand=, +FormatDateShort=%m/%d/%Y +FormatDateShortInput=%m/%d/%Y +FormatDateShortJava=MM/dd/yyyy +FormatDateShortJavaInput=MM/dd/yyyy +FormatDateShortJQuery=mm/dd/yy +FormatDateShortJQueryInput=mm/dd/yy +FormatHourShortJQuery=HH:MI +FormatHourShort=%I:%M %p +FormatHourShortDuration=%H:%M +FormatDateTextShort=%b %d, %Y +FormatDateText=%B %d, %Y +FormatDateHourShort=%m/%d/%Y %I:%M %p +FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p +FormatDateHourTextShort=%b %d, %Y, %I:%M %p +FormatDateHourText=%B %d, %Y, %I:%M %p +DatabaseConnection=Database connection +NoTranslation=No translation +NoRecordFound=No record found +NoError=No error +Error=Error +ErrorFieldRequired=Field '%s' is required +ErrorFieldFormat=Field '%s' has a bad value +ErrorFileDoesNotExists=File %s does not exist +ErrorFailedToOpenFile=Failed to open file %s +ErrorCanNotCreateDir=Can not create dir %s +ErrorCanNotReadDir=Can not read dir %s +ErrorConstantNotDefined=Parameter %s not defined +ErrorUnknown=Unknown error +ErrorSQL=SQL Error +ErrorLogoFileNotFound=Logo file '%s' was not found +ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this +ErrorGoToModuleSetup=Go to Module setup to fix this +ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s) +ErrorAttachedFilesDisabled=File attaching is disabled on this server +ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory. +ErrorInternalErrorDetected=Error detected +ErrorNoRequestRan=No request ran +ErrorWrongHostParameter=Wrong host parameter +ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form. +ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records. +ErrorWrongValue=Wrong value +ErrorWrongValueForParameterX=Wrong value for parameter %s +ErrorNoRequestInError=No request in error +ErrorServiceUnavailableTryLater=Service not available for the moment. Try again later. +ErrorDuplicateField=Duplicate value in a unique field +ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback changes. +ErrorConfigParameterNotDefined=Parameter %s is not defined inside Dolibarr config file conf.php. +ErrorCantLoadUserFromDolibarrDatabase=Failed to find user %s in Dolibarr database. +ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'. +ErrorNoSocialContributionForSellerCountry=Error, no social contribution type defined for country '%s'. +ErrorFailedToSaveFile=Error, failed to save file. +SetDate=Set date +SelectDate=Select a date +SeeAlso=See also %s +SeeHere=See here +BackgroundColorByDefault=Default background color +FileNotUploaded=The file was not uploaded +FileUploaded=The file was successfully uploaded +FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this. +NbOfEntries=Nb of entries +GoToWikiHelpPage=Read online help (need Internet access) +GoToHelpPage=Read help +RecordSaved=Record saved +RecordDeleted=Record deleted +LevelOfFeature=Level of features +NotDefined=Not defined +DefinedAndHasThisValue=Defined and value to +IsNotDefined=undefined +DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to %s in configuration file conf.php.
This means that password database is extern to Dolibarr, so changing this field may have no effects. +Administrator=Administrator +Undefined=Undefined +PasswordForgotten=Password forgotten ? +SeeAbove=See above +HomeArea=Home area +LastConnexion=Last connection +PreviousConnexion=Previous connection +ConnectedOnMultiCompany=Connected on environment +ConnectedSince=Connected since +AuthenticationMode=Authentification mode +RequestedUrl=Requested Url +DatabaseTypeManager=Database type manager +RequestLastAccess=Request for last database access +RequestLastAccessInError=Request for last database access in error +ReturnCodeLastAccessInError=Return code for last database access in error +InformationLastAccessInError=Information for last database access in error +DolibarrHasDetectedError=Dolibarr has detected a technical error +InformationToHelpDiagnose=This is information that can help diagnostic +MoreInformation=More information +TechnicalInformation=Technical information +NotePublic=Note (public) +NotePrivate=Note (private) +PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to %s decimals. +DoTest=Test +ToFilter=Filter +WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay. +yes=yes +Yes=Yes +no=no +No=No +All=All +Home=Home +Help=Help +OnlineHelp=Online help +PageWiki=Wiki page +Always=Always +Never=Never +Under=under +Period=Period +PeriodEndDate=End date for period +Activate=Activate +Activated=Activated +Closed=Closed +Closed2=Closed +Enabled=Enabled +Deprecated=Deprecated +Disable=Disable +Disabled=Disabled +Add=Add +AddLink=Add link +Update=Update +AddActionToDo=Add event to do +AddActionDone=Add event done +Close=Close +Close2=Close +Confirm=Confirm +ConfirmSendCardByMail=Do you really want to send content of this card by mail to %s ? +Delete=Delete +Remove=Remove +Resiliate=Resiliate +Cancel=Cancel +Modify=Modify +Edit=Edit +Validate=Validate +ValidateAndApprove=Validate and Approve +ToValidate=To validate +Save=Save +SaveAs=Save As +TestConnection=Test connection +ToClone=Clone +ConfirmClone=Choose data you want to clone : +NoCloneOptionsSpecified=No data to clone defined. +Of=of +Go=Go +Run=Run +CopyOf=Copy of +Show=Show +ShowCardHere=Show card +Search=Search +SearchOf=Search +Valid=Valid +Approve=Approve +Disapprove=Disapprove +ReOpen=Re-Open +Upload=Send file +ToLink=Link +Select=Select +Choose=Choose +ChooseLangage=Please choose your language +Resize=Resize +Recenter=Recenter +Author=Author +User=User +Users=Users +Group=Group +Groups=Groups +NoUserGroupDefined=No user group defined +Password=Password +PasswordRetype=Retype your password +NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration. +Name=Name +Person=Person +Parameter=Parameter +Parameters=Parameters +Value=Value +GlobalValue=Global value +PersonalValue=Personal value +NewValue=New value +CurrentValue=Current value +Code=Code +Type=Type +Language=Language +MultiLanguage=Multi-language +Note=Note +CurrentNote=Current note +Title=Title +Label=Label +RefOrLabel=Ref. or label +Info=Log +Family=Family +Description=Description +Designation=Description +Model=Model +DefaultModel=Default model +Action=Event +About=About +Number=Number +NumberByMonth=Number by month +AmountByMonth=Amount by month +Numero=Number +Limit=Limit +Limits=Limits +DevelopmentTeam=Development Team +Logout=Logout +NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s +Connection=Connection +Setup=Setup +Alert=Alert +Previous=Previous +Next=Next +Cards=Cards +Card=Card +Now=Now +Date=Date +DateAndHour=Date and hour +DateStart=Date start +DateEnd=Date end +DateCreation=Creation date +DateModification=Modification date +DateModificationShort=Modif. date +DateLastModification=Last modification date +DateValidation=Validation date +DateClosing=Closing date +DateDue=Due date +DateValue=Value date +DateValueShort=Value date +DateOperation=Operation date +DateOperationShort=Oper. Date +DateLimit=Limit date +DateRequest=Request date +DateProcess=Process date +DatePlanShort=Date planed +DateRealShort=Date real. +DateBuild=Report build date +DatePayment=Date of payment +DurationYear=year +DurationMonth=month +DurationWeek=week +DurationDay=day +DurationYears=years +DurationMonths=months +DurationWeeks=weeks +DurationDays=days +Year=Year +Month=Month +Week=Week +Day=Day +Hour=Hour +Minute=Minute +Second=Second +Years=Years +Months=Months +Days=Days +days=days +Hours=Hours +Minutes=Minutes +Seconds=Seconds +Weeks=Weeks +Today=Today +Yesterday=Yesterday +Tomorrow=Tomorrow +Morning=Morning +Afternoon=Afternoon +Quadri=Quadri +MonthOfDay=Month of the day +HourShort=H +MinuteShort=mn +Rate=Rate +UseLocalTax=Include tax +Bytes=Bytes +KiloBytes=Kilobytes +MegaBytes=Megabytes +GigaBytes=Gigabytes +TeraBytes=Terabytes +b=b. +Kb=Kb +Mb=Mb +Gb=Gb +Tb=Tb +Cut=Cut +Copy=Copy +Paste=Paste +Default=Default +DefaultValue=Default value +DefaultGlobalValue=Global value +Price=Price +UnitPrice=Unit price +UnitPriceHT=Unit price (net) +UnitPriceTTC=Unit price +PriceU=U.P. +PriceUHT=U.P. (net) +AskPriceSupplierUHT=P.U. HT Requested +PriceUTTC=U.P. +Amount=Amount +AmountInvoice=Invoice amount +AmountPayment=Payment amount +AmountHTShort=Amount (net) +AmountTTCShort=Amount (inc. tax) +AmountHT=Amount (net of tax) +AmountTTC=Amount (inc. tax) +AmountVAT=Amount tax +AmountLT1=Amount tax 2 +AmountLT2=Amount tax 3 +AmountLT1ES=Amount RE +AmountLT2ES=Amount IRPF +AmountTotal=Total amount +AmountAverage=Average amount +PriceQtyHT=Price for this quantity (net of tax) +PriceQtyMinHT=Price quantity min. (net of tax) +PriceQtyTTC=Price for this quantity (inc. tax) +PriceQtyMinTTC=Price quantity min. (inc. of tax) +Percentage=Percentage +Total=Total +SubTotal=Subtotal +TotalHTShort=Total (net) +TotalTTCShort=Total (inc. tax) +TotalHT=Total (net of tax) +TotalHTforthispage=Total (net of tax) for this page +TotalTTC=Total (inc. tax) +TotalTTCToYourCredit=Total (inc. tax) to your credit +TotalVAT=Total tax +TotalLT1=Total tax 2 +TotalLT2=Total tax 3 +TotalLT1ES=Total RE +TotalLT2ES=Total IRPF +IncludedVAT=Included tax +HT=Net of tax +TTC=Inc. tax +VAT=Sales tax +LT1ES=RE +LT2ES=IRPF +VATRate=Tax Rate +Average=Average +Sum=Sum +Delta=Delta +Module=Module +Option=Option +List=List +FullList=Full list +Statistics=Statistics +OtherStatistics=Other statistics +Status=Status +Favorite=Favorite +ShortInfo=Info. +Ref=Ref. +RefSupplier=Ref. supplier +RefPayment=Ref. payment +CommercialProposalsShort=Commercial proposals +Comment=Comment +Comments=Comments +ActionsToDo=Events to do +ActionsDone=Events done +ActionsToDoShort=To do +ActionsRunningshort=Started +ActionsDoneShort=Done +ActionNotApplicable=Not applicable +ActionRunningNotStarted=To start +ActionRunningShort=Started +ActionDoneShort=Finished +ActionUncomplete=Uncomplete +CompanyFoundation=Company/Foundation +ContactsForCompany=Contacts for this third party +ContactsAddressesForCompany=Contacts/addresses for this third party +AddressesForCompany=Addresses for this third party +ActionsOnCompany=Events about this third party +ActionsOnMember=Events about this member +NActions=%s events +NActionsLate=%s late +RequestAlreadyDone=Request already recorded +Filter=Filter +RemoveFilter=Remove filter +ChartGenerated=Chart generated +ChartNotGenerated=Chart not generated +GeneratedOn=Build on %s +Generate=Generate +Duration=Duration +TotalDuration=Total duration +Summary=Summary +MyBookmarks=My bookmarks +OtherInformationsBoxes=Other information boxes +DolibarrBoard=Dolibarr board +DolibarrStateBoard=Statistics +DolibarrWorkBoard=Work tasks board +Available=Available +NotYetAvailable=Not yet available +NotAvailable=Not available +Popularity=Popularity +Categories=Categories +Category=Category +By=By +From=From +to=to +and=and +or=or +Other=Other +Others=Others +OtherInformations=Other informations +Quantity=Quantity +Qty=Qty +ChangedBy=Changed by +ReCalculate=Recalculate +ResultOk=Success +ResultKo=Failure +Reporting=Reporting +Reportings=Reporting +Draft=Draft +Drafts=Drafts +Validated=Validated +Opened=Opened +New=New +Discount=Discount +Unknown=Unknown +General=General +Size=Size +Received=Received +Paid=Paid +Topic=Sujet +ByCompanies=By third parties +ByUsers=By users +Links=Links +Link=Link +Receipts=Receipts +Rejects=Rejects +Preview=Preview +NextStep=Next step +PreviousStep=Previous step +Datas=Data +None=None +NoneF=None +Late=Late +Photo=Picture +Photos=Pictures +AddPhoto=Add picture +Login=Login +CurrentLogin=Current login +January=January +February=February +March=March +April=April +May=May +June=June +July=July +August=August +September=September +October=October +November=November +December=December +JanuaryMin=Jan +FebruaryMin=Feb +MarchMin=Mar +AprilMin=Apr +MayMin=May +JuneMin=Jun +JulyMin=Jul +AugustMin=Aug +SeptemberMin=Sep +OctoberMin=Oct +NovemberMin=Nov +DecemberMin=Dec +Month01=January +Month02=February +Month03=March +Month04=April +Month05=May +Month06=June +Month07=July +Month08=August +Month09=September +Month10=October +Month11=November +Month12=December +MonthShort01=Jan +MonthShort02=Feb +MonthShort03=Mar +MonthShort04=Apr +MonthShort05=May +MonthShort06=Jun +MonthShort07=Jul +MonthShort08=Aug +MonthShort09=Sep +MonthShort10=Oct +MonthShort11=Nov +MonthShort12=Dec +AttachedFiles=Attached files and documents +FileTransferComplete=File was uploaded successfuly +DateFormatYYYYMM=YYYY-MM +DateFormatYYYYMMDD=YYYY-MM-DD +DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS +ReportName=Report name +ReportPeriod=Report period +ReportDescription=Description +Report=Report +Keyword=Mot clé +Legend=Legend +FillTownFromZip=Fill city from zip +Fill=Fill +Reset=Reset +ShowLog=Show log +File=File +Files=Files +NotAllowed=Not allowed +ReadPermissionNotAllowed=Read permission not allowed +AmountInCurrency=Amount in %s currency +Example=Example +Examples=Examples +NoExample=No example +FindBug=Report a bug +NbOfThirdParties=Number of third parties +NbOfCustomers=Number of customers +NbOfLines=Number of lines +NbOfObjects=Number of objects +NbOfReferers=Number of referrers +Referers=Refering objects +TotalQuantity=Total quantity +DateFromTo=From %s to %s +DateFrom=From %s +DateUntil=Until %s +Check=Check +Uncheck=Uncheck +Internal=Internal +External=External +Internals=Internal +Externals=External +Warning=Warning +Warnings=Warnings +BuildPDF=Build PDF +RebuildPDF=Rebuild PDF +BuildDoc=Build Doc +RebuildDoc=Rebuild Doc +Entity=Environment +Entities=Entities +EventLogs=Logs +CustomerPreview=Customer preview +SupplierPreview=Supplier preview +AccountancyPreview=Accountancy preview +ShowCustomerPreview=Show customer preview +ShowSupplierPreview=Show supplier preview +ShowAccountancyPreview=Show accountancy preview +ShowProspectPreview=Show prospect preview +RefCustomer=Ref. customer +Currency=Currency +InfoAdmin=Information for administrators +Undo=Undo +Redo=Redo +ExpandAll=Expand all +UndoExpandAll=Undo expand +Reason=Reason +FeatureNotYetSupported=Feature not yet supported +CloseWindow=Close window +Question=Question +Response=Response +Priority=Priority +SendByMail=Send by EMail +MailSentBy=Email sent by +TextUsedInTheMessageBody=Email body +SendAcknowledgementByMail=Send Ack. by email +NoEMail=No email +NoMobilePhone=No mobile phone +Owner=Owner +DetectedVersion=Detected version +FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value. +Refresh=Refresh +BackToList=Back to list +GoBack=Go back +CanBeModifiedIfOk=Can be modified if valid +CanBeModifiedIfKo=Can be modified if not valid +RecordModifiedSuccessfully=Record modified successfully +RecordsModified=%s records modified +AutomaticCode=Automatic code +NotManaged=Not managed +FeatureDisabled=Feature disabled +MoveBox=Move box %s +Offered=Offered +NotEnoughPermissions=You don't have permission for this action +SessionName=Session name +Method=Method +Receive=Receive +PartialWoman=Partial +PartialMan=Partial +TotalWoman=Total +TotalMan=Total +NeverReceived=Never received +Canceled=Canceled +YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary +Color=Color +Documents=Linked files +DocumentsNb=Linked files (%s) +Documents2=Documents +BuildDocuments=Generated documents +UploadDisabled=Upload disabled +MenuECM=Documents +MenuAWStats=AWStats +MenuMembers=Members +MenuAgendaGoogle=Google agenda +ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb +NoFileFound=No documents saved in this directory +CurrentUserLanguage=Current language +CurrentTheme=Current theme +CurrentMenuManager=Current menu manager +DisabledModules=Disabled modules +For=For +ForCustomer=For customer +Signature=Signature +HidePassword=Show command with password hidden +UnHidePassword=Show real command with clear password +Root=Root +Informations=Informations +Page=Page +Notes=Notes +AddNewLine=Add new line +AddFile=Add file +ListOfFiles=List of available files +FreeZone=Free entry +FreeLineOfType=Free entry of type +CloneMainAttributes=Clone object with its main attributes +PDFMerge=PDF Merge +Merge=Merge +PrintContentArea=Show page to print main content area +MenuManager=Menu manager +NoMenu=No sub-menu +WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login %s is allowed to use application at the moment. +CoreErrorTitle=System error +CoreErrorMessage=Sorry, an error occurred. Check the logs or contact your system administrator. +CreditCard=Credit card +FieldsWithAreMandatory=Fields with %s are mandatory +FieldsWithIsForPublic=Fields with %s are shown on public list of members. If you don't want this, check off the "public" box. +AccordingToGeoIPDatabase=(according to GeoIP convertion) +Line=Line +NotSupported=Not supported +RequiredField=Required field +Result=Result +ToTest=Test +ValidateBefore=Card must be validated before using this feature +Visibility=Visibility +Private=Private +Hidden=Hidden +Resources=Resources +Source=Source +Prefix=Prefix +Before=Before +After=After +IPAddress=IP address +Frequency=Frequency +IM=Instant messaging +NewAttribute=New attribute +AttributeCode=Attribute code +OptionalFieldsSetup=Extra attributes setup +URLPhoto=URL of photo/logo +SetLinkToThirdParty=Link to another third party +CreateDraft=Create draft +SetToDraft=Back to draft +ClickToEdit=Click to edit +ObjectDeleted=Object %s deleted +ByCountry=By country +ByTown=By town +ByDate=By date +ByMonthYear=By month/year +ByYear=By year +ByMonth=By month +ByDay=By day +BySalesRepresentative=By sales representative +LinkedToSpecificUsers=Linked to a particular user contact +DeleteAFile=Delete a file +ConfirmDeleteAFile=Are you sure you want to delete file +NoResults=No results +ModulesSystemTools=Modules tools +Test=Test +Element=Element +NoPhotoYet=No pictures available yet +HomeDashboard=Home summary +Deductible=Deductible +from=from +toward=toward +Access=Access +HelpCopyToClipboard=Use Ctrl+C to copy to clipboard +SaveUploadedFileWithMask=Save file on server with name "%s" (otherwise "%s") +OriginFileName=Original filename +SetDemandReason=Set source +SetBankAccount=Define Bank Account +AccountCurrency=Account Currency +ViewPrivateNote=View notes +XMoreLines=%s line(s) hidden +PublicUrl=Public URL +AddBox=Add box +SelectElementAndClickRefresh=Select an element and click Refresh +PrintFile=Print File %s +ShowTransaction=Show transaction +# Week day +Monday=Monday +Tuesday=Tuesday +Wednesday=Wednesday +Thursday=Thursday +Friday=Friday +Saturday=Saturday +Sunday=Sunday +MondayMin=Mo +TuesdayMin=Tu +WednesdayMin=We +ThursdayMin=Th +FridayMin=Fr +SaturdayMin=Sa +SundayMin=Su +Day1=Monday +Day2=Tuesday +Day3=Wednesday +Day4=Thursday +Day5=Friday +Day6=Saturday +Day0=Sunday +ShortMonday=M +ShortTuesday=T +ShortWednesday=W +ShortThursday=T +ShortFriday=F +ShortSaturday=S +ShortSunday=S diff --git a/htdocs/langs/bn_BD/margins.lang b/htdocs/langs/bn_BD/margins.lang new file mode 100644 index 00000000000..748b3c71f30 --- /dev/null +++ b/htdocs/langs/bn_BD/margins.lang @@ -0,0 +1,45 @@ +# Dolibarr language file - Source file is en_US - marges + +Margin=Margin +Margins=Margins +TotalMargin=Total Margin +MarginOnProducts=Margin / Products +MarginOnServices=Margin / Services +MarginRate=Margin rate +MarkRate=Mark rate +DisplayMarginRates=Display margin rates +DisplayMarkRates=Display mark rates +InputPrice=Input price +margin=Profit margins management +margesSetup=Profit margins management setup +MarginDetails=Margin details +ProductMargins=Product margins +CustomerMargins=Customer margins +SalesRepresentativeMargins=Sales representative margins +UserMargins=User margins +ProductService=Product or Service +AllProducts=All products and services +ChooseProduct/Service=Choose product or service +StartDate=Start date +EndDate=End date +Launch=Start +ForceBuyingPriceIfNull=Force buying price if null +ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0) +MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts +UseDiscountAsProduct=As a product +UseDiscountAsService=As a service +UseDiscountOnTotal=On subtotal +MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation. +MARGIN_TYPE=Margin type +MargeBrute=Raw margin +MargeNette=Net margin +MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
Net margin : Selling price - Cost price +CostPrice=Cost price +BuyingCost=Cost price +UnitCharges=Unit charges +Charges=Charges +AgentContactType=Commercial agent contact type +AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative +rateMustBeNumeric=Rate must be a numeric value +markRateShouldBeLesserThan100=Mark rate should be lower than 100 +ShowMarginInfos=Show margin infos diff --git a/htdocs/langs/bn_BD/members.lang b/htdocs/langs/bn_BD/members.lang new file mode 100644 index 00000000000..40bca8e85fb --- /dev/null +++ b/htdocs/langs/bn_BD/members.lang @@ -0,0 +1,206 @@ +# Dolibarr language file - Source file is en_US - members +MembersArea=Members area +PublicMembersArea=Public members area +MemberCard=Member card +SubscriptionCard=Subscription card +Member=Member +Members=Members +MemberAccount=Member login +ShowMember=Show member card +UserNotLinkedToMember=User not linked to a member +ThirdpartyNotLinkedToMember=Third-party not linked to a member +MembersTickets=Members Tickets +FundationMembers=Foundation members +Attributs=Attributes +ErrorMemberTypeNotDefined=Member type not defined +ListOfPublicMembers=List of public members +ListOfValidatedPublicMembers=List of validated public members +ErrorThisMemberIsNotPublic=This member is not public +ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: %s, login: %s) is already linked to a third party %s. Remove this link first because a third party can't be linked to only a member (and vice versa). +ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours. +ThisIsContentOfYourCard=This is details of your card +CardContent=Content of your member card +SetLinkToUser=Link to a Dolibarr user +SetLinkToThirdParty=Link to a Dolibarr third party +MembersCards=Members business cards +MembersList=List of members +MembersListToValid=List of draft members (to be validated) +MembersListValid=List of valid members +MembersListUpToDate=List of valid members with up to date subscription +MembersListNotUpToDate=List of valid members with subscription out of date +MembersListResiliated=List of resiliated members +MembersListQualified=List of qualified members +MenuMembersToValidate=Draft members +MenuMembersValidated=Validated members +MenuMembersUpToDate=Up to date members +MenuMembersNotUpToDate=Out of date members +MenuMembersResiliated=Resiliated members +MembersWithSubscriptionToReceive=Members with subscription to receive +DateAbonment=Subscription date +DateSubscription=Subscription date +DateNextSubscription=Next subscription +DateEndSubscription=Subscription end date +EndSubscription=End subscription +SubscriptionId=Subscription id +MemberId=Member id +NewMember=New member +NewType=New member type +MemberType=Member type +MemberTypeId=Member type id +MemberTypeLabel=Member type label +MembersTypes=Members types +MembersAttributes=Members attributes +SearchAMember=Search a member +MemberStatusDraft=Draft (needs to be validated) +MemberStatusDraftShort=Draft +MemberStatusActive=Validated (waiting subscription) +MemberStatusActiveShort=Validated +MemberStatusActiveLate=subscription expired +MemberStatusActiveLateShort=Expired +MemberStatusPaid=Subscription up to date +MemberStatusPaidShort=Up to date +MemberStatusResiliated=Resiliated member +MemberStatusResiliatedShort=Resiliated +MembersStatusToValid=Draft members +MembersStatusToValidShort=Draft members +MembersStatusValidated=Validated members +MembersStatusPaid=Subscription up to date +MembersStatusPaidShort=Up to date +MembersStatusNotPaid=Subscription out of date +MembersStatusNotPaidShort=Out of date +MembersStatusResiliated=Resiliated members +MembersStatusResiliatedShort=Resiliated members +NewCotisation=New contribution +PaymentSubscription=New contribution payment +EditMember=Edit member +SubscriptionEndDate=Subscription's end date +MembersTypeSetup=Members type setup +NewSubscription=New subscription +NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. +Subscription=Subscription +Subscriptions=Subscriptions +SubscriptionLate=Late +SubscriptionNotReceived=Subscription never received +SubscriptionLateShort=Late +SubscriptionNotReceivedShort=Never received +ListOfSubscriptions=List of subscriptions +SendCardByMail=Send card by Email +AddMember=Create member +NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types" +NewMemberType=New member type +WelcomeEMail=Welcome e-mail +SubscriptionRequired=Subscription required +EditType=Edit member type +DeleteType=Delete +VoteAllowed=Vote allowed +Physical=Physical +Moral=Moral +MorPhy=Moral/Physical +Reenable=Reenable +ResiliateMember=Resiliate a member +ConfirmResiliateMember=Are you sure you want to resiliate this member ? +DeleteMember=Delete a member +ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ? +DeleteSubscription=Delete a subscription +ConfirmDeleteSubscription=Are you sure you want to delete this subscription ? +Filehtpasswd=htpasswd file +ValidateMember=Validate a member +ConfirmValidateMember=Are you sure you want to validate this member ? +FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database. +PublicMemberList=Public member list +BlankSubscriptionForm=Public auto-subscription form +BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided. +EnablePublicSubscriptionForm=Enable the public auto-subscription form +MemberPublicLinks=Public links/pages +ExportDataset_member_1=Members and subscriptions +ImportDataset_member_1=Members +LastMembers=Last %s members +LastMembersModified=Last %s modified members +LastSubscriptionsModified=Last %s modified subscriptions +AttributeName=Attribute name +String=String +Text=Text +Int=Int +Date=Date +DateAndTime=Date and time +PublicMemberCard=Member public card +MemberNotOrNoMoreExpectedToSubscribe=Member not or no more expected to subscribe +AddSubscription=Create subscription +ShowSubscription=Show subscription +MemberModifiedInDolibarr=Member modified in Dolibarr +SendAnEMailToMember=Send information email to member +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription +DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription +DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation +DescADHERENT_MAIL_VALID=EMail for member validation +DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription +DescADHERENT_MAIL_COTIS=EMail for subscription +DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation +DescADHERENT_MAIL_RESIL=EMail for member resiliation +DescADHERENT_MAIL_FROM=Sender EMail for automatic emails +DescADHERENT_ETIQUETTE_TYPE=Format of labels page +DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets +DescADHERENT_CARD_TYPE=Format of cards page +DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards +DescADHERENT_CARD_TEXT=Text printed on member cards (align on left) +DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right) +DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards +GlobalConfigUsedIfNotDefined=Text defined in Foundation module setup will be used if not defined here +MayBeOverwrited=This text can be overwrited by value defined for member's type +ShowTypeCard=Show type '%s' +HTPasswordExport=htpassword file generation +NoThirdPartyAssociatedToMember=No third party associated to this member +ThirdPartyDolibarr=Dolibarr third party +MembersAndSubscriptions= Members and Subscriptions +MoreActions=Complementary action on recording +MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription +MoreActionBankDirect=Create a direct transaction record on account +MoreActionBankViaInvoice=Create an invoice and payment on account +MoreActionInvoiceOnly=Create an invoice with no payment +LinkToGeneratedPages=Generate visit cards +LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member. +DocForAllMembersCards=Generate business cards for all members +DocForOneMemberCards=Generate business cards for a particular member +DocForLabels=Generate address sheets +SubscriptionPayment=Subscription payment +LastSubscriptionDate=Last subscription date +LastSubscriptionAmount=Last subscription amount +MembersStatisticsByCountries=Members statistics by country +MembersStatisticsByState=Members statistics by state/province +MembersStatisticsByTown=Members statistics by town +MembersStatisticsByRegion=Members statistics by region +MemberByRegion=Members by region +NbOfMembers=Number of members +NoValidatedMemberYet=No validated members found +MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working. +MembersByStateDesc=This screen show you statistics on members by state/provinces/canton. +MembersByTownDesc=This screen show you statistics on members by town. +MembersStatisticsDesc=Choose statistics you want to read... +MenuMembersStats=Statistics +LastMemberDate=Last member date +Nature=Nature +Public=Information are public +Exports=Exports +NewMemberbyWeb=New member added. Awaiting approval +NewMemberForm=New member form +SubscriptionsStatistics=Statistics on subscriptions +NbOfSubscriptions=Number of subscriptions +AmountOfSubscriptions=Amount of subscriptions +TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation) +DefaultAmount=Default amount of subscription +CanEditAmount=Visitor can choose/edit amount of its subscription +MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page +Associations=Foundations +Collectivités=Organizations +Particuliers=Personal +Entreprises=Companies +DOLIBARRFOUNDATION_PAYMENT_FORM=To make your subscription payment using a bank transfer, see page http://wiki.dolibarr.org/index.php/Subscribe.
To pay using a Credit Card or Paypal, click on button at bottom of this page.
+ByProperties=By characteristics +MembersStatisticsByProperties=Members statistics by characteristics +MembersByNature=Members by nature +VATToUseForSubscriptions=VAT rate to use for subscriptions +NoVatOnSubscription=No TVA for subscriptions +MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription +ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s diff --git a/htdocs/langs/bn_BD/opensurvey.lang b/htdocs/langs/bn_BD/opensurvey.lang new file mode 100644 index 00000000000..0b191e426ec --- /dev/null +++ b/htdocs/langs/bn_BD/opensurvey.lang @@ -0,0 +1,66 @@ +# Dolibarr language file - Source file is en_US - opensurvey +Survey=Poll +Surveys=Polls +OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll... +NewSurvey=New poll +NoSurveysInDatabase=%s poll(s) into database. +OpenSurveyArea=Polls area +AddACommentForPoll=You can add a comment into poll... +AddComment=Add comment +CreatePoll=Create poll +PollTitle=Poll title +ToReceiveEMailForEachVote=Receive an email for each vote +TypeDate=Type date +TypeClassic=Type standard +OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it +RemoveAllDays=Remove all days +CopyHoursOfFirstDay=Copy hours of first day +RemoveAllHours=Remove all hours +SelectedDays=Selected days +TheBestChoice=The best choice currently is +TheBestChoices=The best choices currently are +with=with +OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line. +CommentsOfVoters=Comments of voters +ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes) +RemovePoll=Remove poll +UrlForSurvey=URL to communicate to get a direct access to poll +PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll: +CreateSurveyDate=Create a date poll +CreateSurveyStandard=Create a standard poll +CheckBox=Simple checkbox +YesNoList=List (empty/yes/no) +PourContreList=List (empty/for/against) +AddNewColumn=Add new column +TitleChoice=Choice label +ExportSpreadsheet=Export result spreadsheet +ExpireDate=Limit date +NbOfSurveys=Number of polls +NbOfVoters=Nb of voters +SurveyResults=Results +PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s. +5MoreChoices=5 more choices +Abstention=Abstention +Against=Against +YouAreInivitedToVote=You are invited to vote for this poll +VoteNameAlreadyExists=This name was already used for this poll +ErrorPollDoesNotExists=Error, poll %s does not exists. +OpenSurveyNothingToSetup=There is no specific setup to do. +PollWillExpire=Your poll will expire automatically %s days after the last date of your poll. +AddADate=Add a date +AddStartHour=Add start hour +AddEndHour=Add end hour +votes=vote(s) +NoCommentYet=No comments have been posted for this poll yet +CanEditVotes=Can change vote of others +CanComment=Voters can comment in the poll +CanSeeOthersVote=Voters can see other people's vote +SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes. +BackToCurrentMonth=Back to current month +ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation +ErrorOpenSurveyOneChoice=Enter at least one choice +ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD +ErrorInsertingComment=There was an error while inserting your comment +MoreChoices=Enter more choices for the voters +SurveyExpiredInfo=The voting time of this poll has expired. +EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s diff --git a/htdocs/langs/bn_BD/orders.lang b/htdocs/langs/bn_BD/orders.lang new file mode 100644 index 00000000000..8efafa5e94e --- /dev/null +++ b/htdocs/langs/bn_BD/orders.lang @@ -0,0 +1,166 @@ +# Dolibarr language file - Source file is en_US - orders +OrdersArea=Customers orders area +SuppliersOrdersArea=Suppliers orders area +OrderCard=Order card +OrderId=Order Id +Order=Order +Orders=Orders +OrderLine=Order line +OrderFollow=Follow up +OrderDate=Order date +OrderToProcess=Order to process +NewOrder=New order +ToOrder=Make order +MakeOrder=Make order +SupplierOrder=Supplier order +SuppliersOrders=Suppliers orders +SuppliersOrdersRunning=Current suppliers orders +CustomerOrder=Customer order +CustomersOrders=Customers orders +CustomersOrdersRunning=Current customer's orders +CustomersOrdersAndOrdersLines=Customer orders and order's lines +OrdersToValid=Customers orders to validate +OrdersToBill=Customers orders delivered +OrdersInProcess=Customers orders in process +OrdersToProcess=Customers orders to process +SuppliersOrdersToProcess=Supplier's orders to process +StatusOrderCanceledShort=Canceled +StatusOrderDraftShort=Draft +StatusOrderValidatedShort=Validated +StatusOrderSentShort=In process +StatusOrderSent=Shipment in process +StatusOrderOnProcessShort=Ordered +StatusOrderProcessedShort=Processed +StatusOrderToBillShort=Delivered +StatusOrderToBill2Short=To bill +StatusOrderApprovedShort=Approved +StatusOrderRefusedShort=Refused +StatusOrderToProcessShort=To process +StatusOrderReceivedPartiallyShort=Partially received +StatusOrderReceivedAllShort=Everything received +StatusOrderCanceled=Canceled +StatusOrderDraft=Draft (needs to be validated) +StatusOrderValidated=Validated +StatusOrderOnProcess=Ordered - Standby reception +StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation +StatusOrderProcessed=Processed +StatusOrderToBill=Delivered +StatusOrderToBill2=To bill +StatusOrderApproved=Approved +StatusOrderRefused=Refused +StatusOrderReceivedPartially=Partially received +StatusOrderReceivedAll=Everything received +ShippingExist=A shipment exists +ProductQtyInDraft=Product quantity into draft orders +ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered +DraftOrWaitingApproved=Draft or approved not yet ordered +DraftOrWaitingShipped=Draft or validated not yet shipped +MenuOrdersToBill=Orders delivered +MenuOrdersToBill2=Billable orders +SearchOrder=Search order +SearchACustomerOrder=Search a customer order +SearchASupplierOrder=Search a supplier order +ShipProduct=Ship product +Discount=Discount +CreateOrder=Create Order +RefuseOrder=Refuse order +ApproveOrder=Accept order +ValidateOrder=Validate order +UnvalidateOrder=Unvalidate order +DeleteOrder=Delete order +CancelOrder=Cancel order +AddOrder=Create order +AddToMyOrders=Add to my orders +AddToOtherOrders=Add to other orders +AddToDraftOrders=Add to draft order +ShowOrder=Show order +NoOpenedOrders=No opened orders +NoOtherOpenedOrders=No other opened orders +NoDraftOrders=No draft orders +OtherOrders=Other orders +LastOrders=Last %s orders +LastModifiedOrders=Last %s modified orders +LastClosedOrders=Last %s closed orders +AllOrders=All orders +NbOfOrders=Number of orders +OrdersStatistics=Order's statistics +OrdersStatisticsSuppliers=Supplier order's statistics +NumberOfOrdersByMonth=Number of orders by month +AmountOfOrdersByMonthHT=Amount of orders by month (net of tax) +ListOfOrders=List of orders +CloseOrder=Close order +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. +ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. +ConfirmDeleteOrder=Are you sure you want to delete this order ? +ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? +ConfirmUnvalidateOrder=Are you sure you want to restore order %s to draft status ? +ConfirmCancelOrder=Are you sure you want to cancel this order ? +ConfirmMakeOrder=Are you sure you want to confirm you made this order on %s ? +GenerateBill=Generate invoice +ClassifyShipped=Classify delivered +ClassifyBilled=Classify billed +ComptaCard=Accountancy card +DraftOrders=Draft orders +RelatedOrders=Related orders +OnProcessOrders=In process orders +RefOrder=Ref. order +RefCustomerOrder=Ref. customer order +RefCustomerOrderShort=Ref. cust. order +SendOrderByMail=Send order by mail +ActionsOnOrder=Events on order +NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order +OrderMode=Order method +AuthorRequest=Request author +UseCustomerContactAsOrderRecipientIfExist=Use customer contact address if defined instead of third party address as order recipient address +RunningOrders=Orders on process +UserWithApproveOrderGrant=Users granted with "approve orders" permission. +PaymentOrderRef=Payment of order %s +CloneOrder=Clone order +ConfirmCloneOrder=Are you sure you want to clone this order %s ? +DispatchSupplierOrder=Receiving supplier order %s +##### Types de contacts ##### +TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order +TypeContact_commande_internal_SHIPPING=Representative following-up shipping +TypeContact_commande_external_BILLING=Customer invoice contact +TypeContact_commande_external_SHIPPING=Customer shipping contact +TypeContact_commande_external_CUSTOMER=Customer contact following-up order +TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order +TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping +TypeContact_order_supplier_external_BILLING=Supplier invoice contact +TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact +TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order + +Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined +Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined +Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Failed to load module file '%s' +Error_FailedToLoad_COMMANDE_ADDON_File=Failed to load module file '%s' +Error_OrderNotChecked=No orders to invoice selected +# Sources +OrderSource0=Commercial proposal +OrderSource1=Internet +OrderSource2=Mail campaign +OrderSource3=Phone compaign +OrderSource4=Fax campaign +OrderSource5=Commercial +OrderSource6=Store +QtyOrdered=Qty ordered +AddDeliveryCostLine=Add a delivery cost line indicating the weight of the order +# Documents models +PDFEinsteinDescription=A complete order model (logo...) +PDFEdisonDescription=A simple order model +PDFProformaDescription=A complete proforma invoice (logo…) +# Orders modes +OrderByMail=Mail +OrderByFax=Fax +OrderByEMail=EMail +OrderByWWW=Online +OrderByPhone=Phone +CreateInvoiceForThisCustomer=Bill orders +NoOrdersToInvoice=No orders billable +CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders. +OrderCreation=Order creation +Ordered=Ordered +OrderCreated=Your orders have been created +OrderFail=An error happened during your orders creation +CreateOrders=Create orders +ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s". diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang new file mode 100644 index 00000000000..08747ea884b --- /dev/null +++ b/htdocs/langs/bn_BD/other.lang @@ -0,0 +1,238 @@ +# Dolibarr language file - Source file is en_US - other +SecurityCode=Security code +Calendar=Calendar +Tools=Tools +ToolsDesc=This area is dedicated to group miscellaneous tools not available into other menu entries.

Those tools can be reached from menu on the side. +Birthday=Birthday +BirthdayDate=Birthday +DateToBirth=Date of birth +BirthdayAlertOn= birthday alert active +BirthdayAlertOff= birthday alert inactive +Notify_FICHINTER_VALIDATE=Intervention validated +Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail +Notify_BILL_VALIDATE=Customer invoice validated +Notify_BILL_UNVALIDATE=Customer invoice unvalidated +Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved +Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused +Notify_ORDER_VALIDATE=Customer order validated +Notify_PROPAL_VALIDATE=Customer proposal validated +Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed +Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused +Notify_WITHDRAW_TRANSMIT=Transmission withdrawal +Notify_WITHDRAW_CREDIT=Credit withdrawal +Notify_WITHDRAW_EMIT=Perform withdrawal +Notify_ORDER_SENTBYMAIL=Customer order sent by mail +Notify_COMPANY_CREATE=Third party created +Notify_COMPANY_SENTBYMAIL=Mails sent from third party card +Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail +Notify_BILL_PAYED=Customer invoice payed +Notify_BILL_CANCEL=Customer invoice canceled +Notify_BILL_SENTBYMAIL=Customer invoice sent by mail +Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated +Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail +Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated +Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed +Notify_BILL_SUPPLIER_SENTBYMAIL=Supplier invoice sent by mail +Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled +Notify_CONTRACT_VALIDATE=Contract validated +Notify_FICHEINTER_VALIDATE=Intervention validated +Notify_SHIPPING_VALIDATE=Shipping validated +Notify_SHIPPING_SENTBYMAIL=Shipping sent by mail +Notify_MEMBER_VALIDATE=Member validated +Notify_MEMBER_MODIFY=Member modified +Notify_MEMBER_SUBSCRIPTION=Member subscribed +Notify_MEMBER_RESILIATE=Member resiliated +Notify_MEMBER_DELETE=Member deleted +Notify_PROJECT_CREATE=Project creation +Notify_TASK_CREATE=Task created +Notify_TASK_MODIFY=Task modified +Notify_TASK_DELETE=Task deleted +SeeModuleSetup=See module setup +NbOfAttachedFiles=Number of attached files/documents +TotalSizeOfAttachedFiles=Total size of attached files/documents +MaxSize=Maximum size +AttachANewFile=Attach a new file/document +LinkedObject=Linked object +Miscellaneous=Miscellaneous +NbOfActiveNotifications=Number of notifications (nb of recipient emails) +PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__ +PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.

__SIGNATURE__ +PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__ +PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ +DemoDesc=Dolibarr is a compact ERP/CRM composed by several functional modules. A demo that includes all modules does not mean anything as this never occurs. So, several demo profiles are available. +ChooseYourDemoProfil=Choose the demo profile that match your activity... +DemoFundation=Manage members of a foundation +DemoFundation2=Manage members and bank account of a foundation +DemoCompanyServiceOnly=Manage a freelance activity selling service only +DemoCompanyShopWithCashDesk=Manage a shop with a cash desk +DemoCompanyProductAndStocks=Manage a small or medium company selling products +DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules) +GoToDemo=Go to demo +CreatedBy=Created by %s +ModifiedBy=Modified by %s +ValidatedBy=Validated by %s +CanceledBy=Canceled by %s +ClosedBy=Closed by %s +CreatedById=User id who created +ModifiedById=User id who made last change +ValidatedById=User id who validated +CanceledById=User id who canceled +ClosedById=User id who closed +CreatedByLogin=User login who created +ModifiedByLogin=User login who made last change +ValidatedByLogin=User login who validated +CanceledByLogin=User login who canceled +ClosedByLogin=User login who closed +FileWasRemoved=File %s was removed +DirWasRemoved=Directory %s was removed +FeatureNotYetAvailableShort=Available in a next version +FeatureNotYetAvailable=Feature not yet available in this version +FeatureExperimental=Experimental feature. Not stable in this version +FeatureDevelopment=Development feature. Not stable in this version +FeaturesSupported=Features supported +Width=Width +Height=Height +Depth=Depth +Top=Top +Bottom=Bottom +Left=Left +Right=Right +CalculatedWeight=Calculated weight +CalculatedVolume=Calculated volume +Weight=Weight +TotalWeight=Total weight +WeightUnitton=tonnes +WeightUnitkg=kg +WeightUnitg=g +WeightUnitmg=mg +WeightUnitpound=pound +Length=Length +LengthUnitm=m +LengthUnitdm=dm +LengthUnitcm=cm +LengthUnitmm=mm +Surface=Area +SurfaceUnitm2=m2 +SurfaceUnitdm2=dm2 +SurfaceUnitcm2=cm2 +SurfaceUnitmm2=mm2 +SurfaceUnitfoot2=ft2 +SurfaceUnitinch2=in2 +Volume=Volume +TotalVolume=Total volume +VolumeUnitm3=m3 +VolumeUnitdm3=dm3 +VolumeUnitcm3=cm3 +VolumeUnitmm3=mm3 +VolumeUnitfoot3=ft3 +VolumeUnitinch3=in3 +VolumeUnitounce=ounce +VolumeUnitlitre=litre +VolumeUnitgallon=gallon +Size=size +SizeUnitm=m +SizeUnitdm=dm +SizeUnitcm=cm +SizeUnitmm=mm +SizeUnitinch=inch +SizeUnitfoot=foot +SizeUnitpoint=point +BugTracker=Bug tracker +SendNewPasswordDesc=This form allows you to request a new password. It will be send to your email address.
Change will be effective only after clicking on confirmation link inside this email.
Check your email reader software. +BackToLoginPage=Back to login page +AuthenticationDoesNotAllowSendNewPassword=Authentication mode is %s.
In this mode, Dolibarr can't know nor change your password.
Contact your system administrator if you want to change your password. +EnableGDLibraryDesc=Install or enable GD library with your PHP for use this option. +EnablePhpAVModuleDesc=You need to install a module compatible with your anti-virus. (Clamav : php4-clamavlib ou php5-clamavlib) +ProfIdShortDesc=Prof Id %s is an information depending on third party country.
For example, for country %s, it's code %s. +DolibarrDemo=Dolibarr ERP/CRM demo +StatsByNumberOfUnits=Statistics in number of products/services units +StatsByNumberOfEntities=Statistics in number of referring entities +NumberOfProposals=Number of proposals on last 12 month +NumberOfCustomerOrders=Number of customer orders on last 12 month +NumberOfCustomerInvoices=Number of customer invoices on last 12 month +NumberOfSupplierOrders=Number of supplier orders on last 12 month +NumberOfSupplierInvoices=Number of supplier invoices on last 12 month +NumberOfUnitsProposals=Number of units on proposals on last 12 month +NumberOfUnitsCustomerOrders=Number of units on customer orders on last 12 month +NumberOfUnitsCustomerInvoices=Number of units on customer invoices on last 12 month +NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month +NumberOfUnitsSupplierInvoices=Number of units on supplier invoices on last 12 month +EMailTextInterventionValidated=The intervention %s has been validated. +EMailTextInvoiceValidated=The invoice %s has been validated. +EMailTextProposalValidated=The proposal %s has been validated. +EMailTextOrderValidated=The order %s has been validated. +EMailTextOrderApproved=The order %s has been approved. +EMailTextOrderApprovedBy=The order %s has been approved by %s. +EMailTextOrderRefused=The order %s has been refused. +EMailTextOrderRefusedBy=The order %s has been refused by %s. +EMailTextExpeditionValidated=The shipping %s has been validated. +ImportedWithSet=Importation data set +DolibarrNotification=Automatic notification +ResizeDesc=Enter new width OR new height. Ratio will be kept during resizing... +NewLength=New width +NewHeight=New height +NewSizeAfterCropping=New size after cropping +DefineNewAreaToPick=Define new area on image to pick (left click on image then drag until you reach the opposite corner) +CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is informations on current edited image +ImageEditor=Image editor +YouReceiveMailBecauseOfNotification=You receive this message because your email has been added to list of targets to be informed of particular events into %s software of %s. +YouReceiveMailBecauseOfNotification2=This event is the following: +ThisIsListOfModules=This is a list of modules preselected by this demo profile (only most common modules are visible in this demo). Edit this to have a more personalized demo and click on "Start". +ClickHere=Click here +UseAdvancedPerms=Use the advanced permissions of some modules +FileFormat=File format +SelectAColor=Choose a color +AddFiles=Add Files +StartUpload=Start upload +CancelUpload=Cancel upload +FileIsTooBig=Files is too big +PleaseBePatient=Please be patient... +RequestToResetPasswordReceived=A request to change your Dolibarr password has been received +NewKeyIs=This is your new keys to login +NewKeyWillBe=Your new key to login to software will be +ClickHereToGoTo=Click here to go to %s +YouMustClickToChange=You must however first click on the following link to validate this password change +ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe. + +##### Calendar common ##### +AddCalendarEntry=Add entry in calendar %s +NewCompanyToDolibarr=Company %s added +ContractValidatedInDolibarr=Contract %s validated +ContractCanceledInDolibarr=Contract %s canceled +ContractClosedInDolibarr=Contract %s closed +PropalClosedSignedInDolibarr=Proposal %s signed +PropalClosedRefusedInDolibarr=Proposal %s refused +PropalValidatedInDolibarr=Proposal %s validated +PropalClassifiedBilledInDolibarr=Proposal %s classified billed +InvoiceValidatedInDolibarr=Invoice %s validated +InvoicePaidInDolibarr=Invoice %s changed to paid +InvoiceCanceledInDolibarr=Invoice %s canceled +PaymentDoneInDolibarr=Payment %s done +CustomerPaymentDoneInDolibarr=Customer payment %s done +SupplierPaymentDoneInDolibarr=Supplier payment %s done +MemberValidatedInDolibarr=Member %s validated +MemberResiliatedInDolibarr=Member %s resiliated +MemberDeletedInDolibarr=Member %s deleted +MemberSubscriptionAddedInDolibarr=Subscription for member %s added +ShipmentValidatedInDolibarr=Shipment %s validated +ShipmentDeletedInDolibarr=Shipment %s deleted +##### Export ##### +Export=Export +ExportsArea=Exports area +AvailableFormats=Available formats +LibraryUsed=Librairy used +LibraryVersion=Version +ExportableDatas=Exportable data +NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions) +ToExport=Export +NewExport=New export +##### External sites ##### +ExternalSites=External sites diff --git a/htdocs/langs/bn_BD/paybox.lang b/htdocs/langs/bn_BD/paybox.lang new file mode 100644 index 00000000000..aced32a4944 --- /dev/null +++ b/htdocs/langs/bn_BD/paybox.lang @@ -0,0 +1,40 @@ +# Dolibarr language file - Source file is en_US - paybox +PayBoxSetup=PayBox module setup +PayBoxDesc=This module offer pages to allow payment on Paybox by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects +PaymentForm=Payment form +WelcomeOnPaymentPage=Welcome on our online payment service +ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s. +ThisIsInformationOnPayment=This is information on payment to do +ToComplete=To complete +YourEMail=Email to receive payment confirmation +Creditor=Creditor +PaymentCode=Payment code +PayBoxDoPayment=Go on payment +YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information +PleaseBePatient=Please, be patient +Continue=Next +ToOfferALinkForOnlinePayment=URL for %s payment +ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order +ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice +ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line +ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user interface for a free amount +ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription +YouCanAddTagOnUrl=You can also add url parameter &tag=value to any of those URL (required only for free payment) to add your own payment comment tag. +SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url %s to have payment created automatically when validated by paybox. +YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you. +YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you. +AccountParameter=Account parameters +UsageParameter=Usage parameters +InformationToFindParameters=Help to find your %s account information +PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment +VendorName=Name of vendor +CSSUrlForPaymentForm=CSS style sheet url for payment form +MessageOK=Message on validated payment return page +MessageKO=Message on canceled payment return page +NewPayboxPaymentReceived=New Paybox payment received +NewPayboxPaymentFailed=New Paybox payment tried but failed +PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed) +PAYBOX_PBX_SITE=Value for PBX SITE +PAYBOX_PBX_RANG=Value for PBX Rang +PAYBOX_PBX_IDENTIFIANT=Value for PBX ID diff --git a/htdocs/langs/bn_BD/paypal.lang b/htdocs/langs/bn_BD/paypal.lang new file mode 100644 index 00000000000..65a3dc45a23 --- /dev/null +++ b/htdocs/langs/bn_BD/paypal.lang @@ -0,0 +1,25 @@ +# Dolibarr language file - Source file is en_US - paypal +PaypalSetup=PayPal module setup +PaypalDesc=This module offer pages to allow payment on PayPal by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...) +PaypalOrCBDoPayment=Pay with credit card or Paypal +PaypalDoPayment=Pay with Paypal +PaypalCBDoPayment=Pay with credit card +PAYPAL_API_SANDBOX=Mode test/sandbox +PAYPAL_API_USER=API username +PAYPAL_API_PASSWORD=API password +PAYPAL_API_SIGNATURE=API signature +PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only +PaypalModeIntegral=Integral +PaypalModeOnlyPaypal=PayPal only +PAYPAL_CSS_URL=Optionnal Url of CSS style sheet on payment page +ThisIsTransactionId=This is id of transaction: %s +PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail +PAYPAL_IPN_MAIL_ADDRESS=E-mail address for the instant notification of payment (IPN) +PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n +YouAreCurrentlyInSandboxMode=You are currently in the "sandbox" mode +NewPaypalPaymentReceived=New Paypal payment received +NewPaypalPaymentFailed=New Paypal payment tried but failed +PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not) +ReturnURLAfterPayment=Return URL after payment +ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed +PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed diff --git a/htdocs/langs/bn_BD/printing.lang b/htdocs/langs/bn_BD/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/bn_BD/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/bn_BD/productbatch.lang b/htdocs/langs/bn_BD/productbatch.lang new file mode 100644 index 00000000000..45263681965 --- /dev/null +++ b/htdocs/langs/bn_BD/productbatch.lang @@ -0,0 +1,21 @@ +# ProductBATCH language file - en_US - ProductBATCH +ManageLotSerial=Use batch/serial number +ProductStatusOnBatch=Yes (Batch/serial required) +ProductStatusNotOnBatch=No (Batch/serial not used) +ProductStatusOnBatchShort=Yes +ProductStatusNotOnBatchShort=No +Batch=Batch/Serial +atleast1batchfield=Eat-by date or Sell-by date or Batch number +batch_number=Batch/Serial number +l_eatby=Eat-by date +l_sellby=Sell-by date +DetailBatchNumber=Batch/Serial details +DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +printBatch=Batch: %s +printEatby=Eat-by: %s +printSellby=Sell-by: %s +printQty=Qty: %d +AddDispatchBatchLine=Add a line for Shelf Life dispatching +BatchDefaultNumber=Undefined +WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want. +ProductDoesNotUseBatchSerial=This product does not use batch/serial number diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang new file mode 100644 index 00000000000..3a18cda69e7 --- /dev/null +++ b/htdocs/langs/bn_BD/products.lang @@ -0,0 +1,256 @@ +# Dolibarr language file - Source file is en_US - products +ProductRef=Product ref. +ProductLabel=Product label +ProductServiceCard=Products/Services card +Products=Products +Services=Services +Product=Product +Service=Service +ProductId=Product/service id +Create=Create +Reference=Reference +NewProduct=New product +NewService=New service +ProductCode=Product code +ServiceCode=Service code +ProductVatMassChange=Mass VAT change +ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database. +MassBarcodeInit=Mass barcode init +MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete. +ProductAccountancyBuyCode=Accountancy code (buy) +ProductAccountancySellCode=Accountancy code (sell) +ProductOrService=Product or Service +ProductsAndServices=Products and Services +ProductsOrServices=Products or Services +ProductsAndServicesOnSell=Products and Services for sale or for purchase +ProductsAndServicesNotOnSell=Products and Services out of sale +ProductsAndServicesStatistics=Products and Services statistics +ProductsStatistics=Products statistics +ProductsOnSell=Product for sale or for pruchase +ProductsNotOnSell=Product out of sale and out of purchase +ProductsOnSellAndOnBuy=Products for sale and for purchase +ServicesOnSell=Services for sale or for purchase +ServicesNotOnSell=Services out of sale +ServicesOnSellAndOnBuy=Services for sale and for purchase +InternalRef=Internal reference +LastRecorded=Last products/services on sell recorded +LastRecordedProductsAndServices=Last %s recorded products/services +LastModifiedProductsAndServices=Last %s modified products/services +LastRecordedProducts=Last %s products recorded +LastRecordedServices=Last %s services recorded +LastProducts=Last products +CardProduct0=Product card +CardProduct1=Service card +CardContract=Contract card +Warehouse=Warehouse +Warehouses=Warehouses +WarehouseOpened=Warehouse opened +WarehouseClosed=Warehouse closed +Stock=Stock +Stocks=Stocks +Movement=Movement +Movements=Movements +Sell=Sales +Buy=Purchases +OnSell=For sale +OnBuy=For purchase +NotOnSell=Not for sale +ProductStatusOnSell=For sale +ProductStatusNotOnSell=Not for sale +ProductStatusOnSellShort=For sale +ProductStatusNotOnSellShort=Not for sale +ProductStatusOnBuy=For purchase +ProductStatusNotOnBuy=Not for purchase +ProductStatusOnBuyShort=For purchase +ProductStatusNotOnBuyShort=Not for purchase +UpdatePrice=Update price +AppliedPricesFrom=Applied prices from +SellingPrice=Selling price +SellingPriceHT=Selling price (net of tax) +SellingPriceTTC=Selling price (inc. tax) +PublicPrice=Public price +CurrentPrice=Current price +NewPrice=New price +MinPrice=Minim. selling price +MinPriceHT=Minim. selling price (net of tax) +MinPriceTTC=Minim. selling price (inc. tax) +CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount. +ContractStatus=Contract status +ContractStatusClosed=Closed +ContractStatusRunning=Running +ContractStatusExpired=expired +ContractStatusOnHold=Not running +ContractStatusToRun=To get running +ContractNotRunning=This contract is not running +ErrorProductAlreadyExists=A product with reference %s already exists. +ErrorProductBadRefOrLabel=Wrong value for reference or label. +ErrorProductClone=There was a problem while trying to clone the product or service. +ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price. +Suppliers=Suppliers +SupplierRef=Supplier's product ref. +ShowProduct=Show product +ShowService=Show service +ProductsAndServicesArea=Product and Services area +ProductsArea=Product area +ServicesArea=Services area +AddToMyProposals=Add to my proposals +AddToOtherProposals=Add to other proposals +AddToMyBills=Add to my bills +AddToOtherBills=Add to other bills +CorrectStock=Correct stock +AddPhoto=Add photo +ListOfStockMovements=List of stock movements +BuyingPrice=Buying price +SupplierCard=Supplier card +CommercialCard=Commercial card +AllWays=Path to find your product in stock +NoCat=Your product is not in any category +PrimaryWay=Primary path +PriceRemoved=Price removed +BarCode=Barcode +BarcodeType=Barcode type +SetDefaultBarcodeType=Set barcode type +BarcodeValue=Barcode value +NoteNotVisibleOnBill=Note (not visible on invoices, proposals...) +CreateCopy=Create copy +ServiceLimitedDuration=If product is a service with limited duration: +MultiPricesAbility=Several level of prices per product/service +MultiPricesNumPrices=Number of prices +MultiPriceLevelsName=Price categories +AssociatedProductsAbility=Activate the virtual package feature +AssociatedProducts=Package product +AssociatedProductsNumber=Number of products composing this virtual package product +ParentProductsNumber=Number of parent packaging product +IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product +IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product +EditAssociate=Associate +Translation=Translation +KeywordFilter=Keyword filter +CategoryFilter=Category filter +ProductToAddSearch=Search product to add +AddDel=Add/Delete +Quantity=Quantity +NoMatchFound=No match found +ProductAssociationList=List of related products/services: name of product/service (quantity affected) +ProductParentList=List of package products/services with this product as a component +ErrorAssociationIsFatherOfThis=One of selected product is parent with current product +DeleteProduct=Delete a product/service +ConfirmDeleteProduct=Are you sure you want to delete this product/service? +ProductDeleted=Product/Service "%s" deleted from database. +DeletePicture=Delete a picture +ConfirmDeletePicture=Are you sure you want to delete this picture ? +ExportDataset_produit_1=Products +ExportDataset_service_1=Services +ImportDataset_produit_1=Products +ImportDataset_service_1=Services +DeleteProductLine=Delete product line +ConfirmDeleteProductLine=Are you sure you want to delete this product line? +NoProductMatching=No product/service match your criteria +MatchingProducts=Matching products/services +NoStockForThisProduct=No stock for this product +NoStock=No Stock +Restock=Restock +ProductSpecial=Special +QtyMin=Minimum Qty +PriceQty=Price for this quantity +PriceQtyMin=Price for this min. qty (w/o discount) +VATRateForSupplierProduct=VAT Rate (for this supplier/product) +DiscountQtyMin=Default discount for qty +NoPriceDefinedForThisSupplier=No price/qty defined for this supplier/product +NoSupplierPriceDefinedForThisProduct=No supplier price/qty defined for this product +RecordedProducts=Products recorded +RecordedServices=Services recorded +RecordedProductsAndServices=Products/services recorded +PredefinedProductsToSell=Predefined products to sell +PredefinedServicesToSell=Predefined services to sell +PredefinedProductsAndServicesToSell=Predefined products/services to sell +PredefinedProductsToPurchase=Predefined product to purchase +PredefinedServicesToPurchase=Predefined services to purchase +PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase +GenerateThumb=Generate thumb +ProductCanvasAbility=Use special "canvas" addons +ServiceNb=Service #%s +ListProductServiceByPopularity=List of products/services by popularity +ListProductByPopularity=List of products by popularity +ListServiceByPopularity=List of services by popularity +Finished=Manufactured product +RowMaterial=Raw Material +CloneProduct=Clone product or service +ConfirmCloneProduct=Are you sure you want to clone product or service %s ? +CloneContentProduct=Clone all main informations of product/service +ClonePricesProduct=Clone main informations and prices +CloneCompositionProduct=Clone packaged product/services +ProductIsUsed=This product is used +NewRefForClone=Ref. of new product/service +CustomerPrices=Customers prices +SuppliersPrices=Suppliers prices +SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services) +CustomCode=Customs code +CountryOrigin=Origin country +HiddenIntoCombo=Hidden into select lists +Nature=Nature +ProductCodeModel=Product ref template +ServiceCodeModel=Service ref template +AddThisProductCard=Create product card +HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist. +AddThisServiceCard=Create service card +HelpAddThisServiceCard=This option allows you to create or clone a service if it does not exist. +CurrentProductPrice=Current price +AlwaysUseNewPrice=Always use current price of product/service +AlwaysUseFixedPrice=Use the fixed price +PriceByQuantity=Different prices by quantity +PriceByQuantityRange=Quantity range +ProductsDashboard=Products/Services summary +UpdateOriginalProductLabel=Modify original label +HelpUpdateOriginalProductLabel=Allows to edit the name of the product +### composition fabrication +Building=Production and items dispatchment +Build=Produce +BuildIt=Produce & Dispatch +BuildindListInfo=Available quantity for production per warehouse (set it to 0 for no further action) +QtyNeed=Qty +UnitPmp=Net unit VWAP +CostPmpHT=Net total VWAP +ProductUsedForBuild=Auto consumed by production +ProductBuilded=Production completed +ProductsMultiPrice=Product multi-price +ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices) +ProductSellByQuarterHT=Products turnover quarterly VWAP +ServiceSellByQuarterHT=Services turnover quarterly VWAP +Quarter1=1st. Quarter +Quarter2=2nd. Quarter +Quarter3=3rd. Quarter +Quarter4=4th. Quarter +BarCodePrintsheet=Print bar code +PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s. +NumberOfStickers=Number of stickers to print on page +PrintsheetForOneBarCode=Print several stickers for one barcode +BuildPageToPrint=Generate page to print +FillBarCodeTypeAndValueManually=Fill barcode type and value manually. +FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product. +FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty. +DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s. +DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s. +BarCodeDataForProduct=Barcode information of product %s : +BarCodeDataForThirdparty=Barcode information of thirdparty %s : +ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values) +PriceByCustomer=Different price for each customer +PriceCatalogue=Unique price per product/service +PricingRule=Rules for customer prices +AddCustomerPrice=Add price by customers +ForceUpdateChildPriceSoc=Set same price on customer subsidiaries +PriceByCustomerLog=Price by customer log +MinimumPriceLimit=Minimum price can't be lower that %s +MinimumRecommendedPrice=Minimum recommended price is : %s +PriceExpressionEditor=Price expression editor +PriceExpressionSelected=Selected price expression +PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions +PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey# +PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# +PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx# +PriceMode=Price mode +PriceNumeric=Number +DefaultPrice=Default price +ComposedProductIncDecStock=Increase/Decrease stock on parent change +ComposedProduct=Sub-product +MinSupplierPrice=Minimun supplier price diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang new file mode 100644 index 00000000000..44d0d89687a --- /dev/null +++ b/htdocs/langs/bn_BD/projects.lang @@ -0,0 +1,144 @@ +# Dolibarr language file - Source file is en_US - projects +RefProject=Ref. project +ProjectId=Project Id +Project=Project +Projects=Projects +ProjectStatus=Project status +SharedProject=Everybody +PrivateProject=Contacts of project +MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type). +ProjectsPublicDesc=This view presents all projects you are allowed to read. +ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. +ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything). +MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type). +OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). +TasksPublicDesc=This view presents all projects and tasks you are allowed to read. +TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). +ProjectsArea=Projects area +NewProject=New project +AddProject=Create project +DeleteAProject=Delete a project +DeleteATask=Delete a task +ConfirmDeleteAProject=Are you sure you want to delete this project ? +ConfirmDeleteATask=Are you sure you want to delete this task ? +OfficerProject=Officer project +LastProjects=Last %s projects +AllProjects=All projects +ProjectsList=List of projects +ShowProject=Show project +SetProject=Set project +NoProject=No project defined or owned +NbOpenTasks=Nb of opened tasks +NbOfProjects=Nb of projects +TimeSpent=Time spent +TimeSpentByYou=Time spent by you +TimeSpentByUser=Time spent by user +TimesSpent=Time spent +RefTask=Ref. task +LabelTask=Label task +TaskTimeSpent=Time spent on tasks +TaskTimeUser=User +TaskTimeNote=Note +TaskTimeDate=Date +TasksOnOpenedProject=Tasks on opened projects +WorkloadNotDefined=Workload not defined +NewTimeSpent=New time spent +MyTimeSpent=My time spent +MyTasks=My tasks +Tasks=Tasks +Task=Task +TaskDateStart=Task start date +TaskDateEnd=Task end date +TaskDescription=Task description +NewTask=New task +AddTask=Create task +AddDuration=Add duration +Activity=Activity +Activities=Tasks/activities +MyActivity=My activity +MyActivities=My tasks/activities +MyProjects=My projects +DurationEffective=Effective duration +Progress=Progress +ProgressDeclared=Declared progress +ProgressCalculated=Calculated progress +Time=Time +ListProposalsAssociatedProject=List of the commercial proposals associated with the project +ListOrdersAssociatedProject=List of customer's orders associated with the project +ListInvoicesAssociatedProject=List of customer's invoices associated with the project +ListPredefinedInvoicesAssociatedProject=List of customer's predefined invoices associated with project +ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project +ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project +ListContractAssociatedProject=List of contracts associated with the project +ListFichinterAssociatedProject=List of interventions associated with the project +ListExpenseReportsAssociatedProject=List of expense reports associated with the project +ListActionsAssociatedProject=List of events associated with the project +ActivityOnProjectThisWeek=Activity on project this week +ActivityOnProjectThisMonth=Activity on project this month +ActivityOnProjectThisYear=Activity on project this year +ChildOfTask=Child of project/task +NotOwnerOfProject=Not owner of this private project +AffectedTo=Allocated to +CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab. +ValidateProject=Validate projet +ConfirmValidateProject=Are you sure you want to validate this project ? +CloseAProject=Close project +ConfirmCloseAProject=Are you sure you want to close this project ? +ReOpenAProject=Open project +ConfirmReOpenAProject=Are you sure you want to re-open this project ? +ProjectContact=Project contacts +ActionsOnProject=Events on project +YouAreNotContactOfProject=You are not a contact of this private project +DeleteATimeSpent=Delete time spent +ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ? +DoNotShowMyTasksOnly=See also tasks not assigned to me +ShowMyTasksOnly=View only tasks assigned to me +TaskRessourceLinks=Ressources +ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party +NoTasks=No tasks for this project +LinkedToAnotherCompany=Linked to other third party +TaskIsNotAffectedToYou=Task not assigned to you +ErrorTimeSpentIsEmpty=Time spent is empty +ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (%s tasks at the moment) and all inputs of time spent. +IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties. +CloneProject=Clone project +CloneTasks=Clone tasks +CloneContacts=Clone contacts +CloneNotes=Clone notes +CloneProjectFiles=Clone project joined files +CloneTaskFiles=Clone task(s) joined files (if task(s) cloned) +CloneMoveDate=Update project/tasks dates from now ? +ConfirmCloneProject=Are you sure to clone this project ? +ProjectReportDate=Change task date according project start date +ErrorShiftTaskDate=Impossible to shift task date according to new project start date +ProjectsAndTasksLines=Projects and tasks +ProjectCreatedInDolibarr=Project %s created +TaskCreatedInDolibarr=Task %s created +TaskModifiedInDolibarr=Task %s modified +TaskDeletedInDolibarr=Task %s deleted +##### Types de contacts ##### +TypeContact_project_internal_PROJECTLEADER=Project leader +TypeContact_project_external_PROJECTLEADER=Project leader +TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor +TypeContact_project_task_internal_TASKEXECUTIVE=Task executive +TypeContact_project_task_external_TASKEXECUTIVE=Task executive +TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor +TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor +SelectElement=Select element +AddElement=Link to element +UnlinkElement=Unlink element +# Documents models +DocumentModelBaleine=A complete project's report model (logo...) +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation +ProjectReferers=Refering objects +SearchAProject=Search a project +ProjectMustBeValidatedFirst=Project must be validated first +ProjectDraft=Draft projects +FirstAddRessourceToAllocateTime=Associate a ressource to allocate time +InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action +TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/bn_BD/propal.lang b/htdocs/langs/bn_BD/propal.lang new file mode 100644 index 00000000000..2b6d12870a1 --- /dev/null +++ b/htdocs/langs/bn_BD/propal.lang @@ -0,0 +1,100 @@ +# Dolibarr language file - Source file is en_US - propal +Proposals=Commercial proposals +Proposal=Commercial proposal +ProposalShort=Proposal +ProposalsDraft=Draft commercial proposals +ProposalDraft=Draft commercial proposal +ProposalsOpened=Opened commercial proposals +Prop=Commercial proposals +CommercialProposal=Commercial proposal +CommercialProposals=Commercial proposals +ProposalCard=Proposal card +NewProp=New commercial proposal +NewProposal=New commercial proposal +NewPropal=New proposal +Prospect=Prospect +ProspectList=Prospect list +DeleteProp=Delete commercial proposal +ValidateProp=Validate commercial proposal +AddProp=Create proposal +ConfirmDeleteProp=Are you sure you want to delete this commercial proposal ? +ConfirmValidateProp=Are you sure you want to validate this commercial proposal under name %s ? +LastPropals=Last %s proposals +LastClosedProposals=Last %s closed proposals +LastModifiedProposals=Last %s modified proposals +AllPropals=All proposals +LastProposals=Last proposals +SearchAProposal=Search a proposal +ProposalsStatistics=Commercial proposal's statistics +NumberOfProposalsByMonth=Number by month +AmountOfProposalsByMonthHT=Amount by month (net of tax) +NbOfProposals=Number of commercial proposals +ShowPropal=Show proposal +PropalsDraft=Drafts +PropalsOpened=Opened +PropalsNotBilled=Closed not billed +PropalStatusDraft=Draft (needs to be validated) +PropalStatusValidated=Validated (proposal is open) +PropalStatusOpened=Validated (proposal is open) +PropalStatusClosed=Closed +PropalStatusSigned=Signed (needs billing) +PropalStatusNotSigned=Not signed (closed) +PropalStatusBilled=Billed +PropalStatusDraftShort=Draft +PropalStatusValidatedShort=Validated +PropalStatusOpenedShort=Opened +PropalStatusClosedShort=Closed +PropalStatusSignedShort=Signed +PropalStatusNotSignedShort=Not signed +PropalStatusBilledShort=Billed +PropalsToClose=Commercial proposals to close +PropalsToBill=Signed commercial proposals to bill +ListOfProposals=List of commercial proposals +ActionsOnPropal=Events on proposal +NoOpenedPropals=No opened commercial proposals +NoOtherOpenedPropals=No other opened commercial proposals +RefProposal=Commercial proposal ref +SendPropalByMail=Send commercial proposal by mail +AssociatedDocuments=Documents associated with the proposal: +ErrorCantOpenDir=Can't open directory +DatePropal=Date of proposal +DateEndPropal=Validity ending date +DateEndPropalShort=Date end +ValidityDuration=Validity duration +CloseAs=Close with status +ClassifyBilled=Classify billed +BuildBill=Build invoice +ErrorPropalNotFound=Propal %s not found +Estimate=Estimate : +EstimateShort=Estimate +OtherPropals=Other proposals +AddToDraftProposals=Add to draft proposal +NoDraftProposals=No draft proposals +CopyPropalFrom=Create commercial proposal by copying existing proposal +CreateEmptyPropal=Create empty commercial proposals vierge or from list of products/services +DefaultProposalDurationValidity=Default commercial proposal validity duration (in days) +UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address +ClonePropal=Clone commercial proposal +ConfirmClonePropal=Are you sure you want to clone the commercial proposal %s ? +ConfirmReOpenProp=Are you sure you want to open back the commercial proposal %s ? +ProposalsAndProposalsLines=Commercial proposal and lines +ProposalLine=Proposal line +AvailabilityPeriod=Availability delay +SetAvailability=Set availability delay +AfterOrder=after order +##### Availability ##### +AvailabilityTypeAV_NOW=Immediate +AvailabilityTypeAV_1W=1 week +AvailabilityTypeAV_2W=2 weeks +AvailabilityTypeAV_3W=3 weeks +AvailabilityTypeAV_1M=1 month +##### Types de contacts ##### +TypeContact_propal_internal_SALESREPFOLL=Representative following-up proposal +TypeContact_propal_external_BILLING=Customer invoice contact +TypeContact_propal_external_CUSTOMER=Customer contact following-up proposal +# Document models +DocModelAzurDescription=A complete proposal model (logo...) +DocModelJauneDescription=Jaune proposal model +DefaultModelPropalCreate=Default model creation +DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced) +DefaultModelPropalClosed=Default template when closing a business proposal (unbilled) diff --git a/htdocs/langs/bn_BD/resource.lang b/htdocs/langs/bn_BD/resource.lang new file mode 100644 index 00000000000..32bdd92f884 --- /dev/null +++ b/htdocs/langs/bn_BD/resource.lang @@ -0,0 +1,34 @@ + +MenuResourceIndex=Resources +MenuResourceAdd=New resource +MenuResourcePlanning=Resource planning +DeleteResource=Delete resource +ConfirmDeleteResourceElement=Confirm delete the resource for this element +NoResourceInDatabase=No resource in database. +NoResourceLinked=No resource linked + +ResourcePageIndex=Resources list +ResourceSingular=Resource +ResourceCard=Resource card +AddResource=Create a resource +ResourceFormLabel_ref=Resource name +ResourceType=Resource type +ResourceFormLabel_description=Resource description + +ResourcesLinkedToElement=Resources linked to element + +ShowResourcePlanning=Show resource planning +GotoDate=Go to date + +ResourceElementPage=Element resources +ResourceCreatedWithSuccess=Resource successfully created +RessourceLineSuccessfullyDeleted=Resource line successfully deleted +RessourceLineSuccessfullyUpdated=Resource line successfully updated +ResourceLinkedWithSuccess=Resource linked with success + +TitleResourceCard=Resource card +ConfirmDeleteResource=Confirm to delete this resource +RessourceSuccessfullyDeleted=Resource successfully deleted +DictionaryResourceType=Type of resources + +SelectResource=Select resource diff --git a/htdocs/langs/bn_BD/salaries.lang b/htdocs/langs/bn_BD/salaries.lang new file mode 100644 index 00000000000..28c21adfad3 --- /dev/null +++ b/htdocs/langs/bn_BD/salaries.lang @@ -0,0 +1,13 @@ +# Dolibarr language file - Source file is en_US - users +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge +Salary=Salary +Salaries=Salaries +Employee=Employee +NewSalaryPayment=New salary payment +SalaryPayment=Salary payment +SalariesPayments=Salaries payments +ShowSalaryPayment=Show salary payment +THM=Average hourly price +TJM=Average daily price +CurrentSalary=Current salary diff --git a/htdocs/langs/bn_BD/sendings.lang b/htdocs/langs/bn_BD/sendings.lang new file mode 100644 index 00000000000..b1ff55f71c1 --- /dev/null +++ b/htdocs/langs/bn_BD/sendings.lang @@ -0,0 +1,85 @@ +# Dolibarr language file - Source file is en_US - sendings +RefSending=Ref. shipment +Sending=Shipment +Sendings=Shipments +Shipment=Shipment +Shipments=Shipments +ShowSending=Show Sending +Receivings=Receipts +SendingsArea=Shipments area +ListOfSendings=List of shipments +SendingMethod=Shipping method +SendingReceipt=Shipping receipt +LastSendings=Last %s shipments +SearchASending=Search for shipment +StatisticsOfSendings=Statistics for shipments +NbOfSendings=Number of shipments +NumberOfShipmentsByMonth=Number of shipments by month +SendingCard=Shipment card +NewSending=New shipment +CreateASending=Create a shipment +CreateSending=Create shipment +QtyOrdered=Qty ordered +QtyShipped=Qty shipped +QtyToShip=Qty to ship +QtyReceived=Qty received +KeepToShip=Remain to ship +OtherSendingsForSameOrder=Other shipments for this order +DateSending=Date sending order +DateSendingShort=Date sending order +SendingsForSameOrder=Shipments for this order +SendingsAndReceivingForSameOrder=Shipments and receivings for this order +SendingsToValidate=Shipments to validate +StatusSendingCanceled=Canceled +StatusSendingDraft=Draft +StatusSendingValidated=Validated (products to ship or already shipped) +StatusSendingProcessed=Processed +StatusSendingCanceledShort=Canceled +StatusSendingDraftShort=Draft +StatusSendingValidatedShort=Validated +StatusSendingProcessedShort=Processed +SendingSheet=Shipment sheet +Carriers=Carriers +Carrier=Carrier +CarriersArea=Carriers area +NewCarrier=New carrier +ConfirmDeleteSending=Are you sure you want to delete this shipment ? +ConfirmValidateSending=Are you sure you want to validate this shipment with reference %s ? +ConfirmCancelSending=Are you sure you want to cancel this shipment ? +GenericTransport=Generic transport +Enlevement=Gotten by customer +DocumentModelSimple=Simple document model +DocumentModelMerou=Merou A5 model +WarningNoQtyLeftToSend=Warning, no products waiting to be shipped. +StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known). +DateDeliveryPlanned=Planed date of delivery +DateReceived=Date delivery received +SendShippingByEMail=Send shipment by EMail +SendShippingRef=Submission of shipment %s +ActionsOnShipping=Events on shipment +LinkToTrackYourPackage=Link to track your package +ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card. +RelatedShippings=Related shipments +ShipmentLine=Shipment line +CarrierList=List of transporters +SendingRunning=Product from ordered customer orders +SuppliersReceiptRunning=Product from ordered supplier orders +ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders +ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders +ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent +ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received + +# Sending methods +SendingMethodCATCH=Catch by customer +SendingMethodTRANS=Transporter +SendingMethodCOLSUI=Colissimo +# ModelDocument +DocumentModelSirocco=Simple document model for delivery receipts +DocumentModelTyphon=More complete document model for delivery receipts (logo...) +Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined +SumOfProductVolumes=Sum of product volumes +SumOfProductWeights=Sum of product weights + +# warehouse details +DetailWarehouseNumber= Warehouse details +DetailWarehouseFormat= W:%s (Qty : %d) diff --git a/htdocs/langs/bn_BD/sms.lang b/htdocs/langs/bn_BD/sms.lang new file mode 100644 index 00000000000..4e89bb24730 --- /dev/null +++ b/htdocs/langs/bn_BD/sms.lang @@ -0,0 +1,53 @@ +# Dolibarr language file - Source file is en_US - sms +Sms=Sms +SmsSetup=Sms setup +SmsDesc=This page allows you to define globals options on SMS features +SmsCard=SMS Card +AllSms=All SMS campains +SmsTargets=Targets +SmsRecipients=Targets +SmsRecipient=Target +SmsTitle=Description +SmsFrom=Sender +SmsTo=Target +SmsTopic=Topic of SMS +SmsText=Message +SmsMessage=SMS Message +ShowSms=Show Sms +ListOfSms=List SMS campains +NewSms=New SMS campain +EditSms=Edit Sms +ResetSms=New sending +DeleteSms=Delete Sms campain +DeleteASms=Remove a Sms campain +PreviewSms=Previuw Sms +PrepareSms=Prepare Sms +CreateSms=Create Sms +SmsResult=Result of Sms sending +TestSms=Test Sms +ValidSms=Validate Sms +ApproveSms=Approve Sms +SmsStatusDraft=Draft +SmsStatusValidated=Validated +SmsStatusApproved=Approved +SmsStatusSent=Sent +SmsStatusSentPartialy=Sent partially +SmsStatusSentCompletely=Sent completely +SmsStatusError=Error +SmsStatusNotSent=Not sent +SmsSuccessfulySent=Sms correctly sent (from %s to %s) +ErrorSmsRecipientIsEmpty=Number of target is empty +WarningNoSmsAdded=No new phone number to add to target list +ConfirmValidSms=Do you confirm validation of this campain ? +ConfirmResetMailing=Warning, if you make a reinit of Sms campain %s, you will allow to make a mass sending of it a second time. Is it really what you wan to do ? +ConfirmDeleteMailing=Do you confirm removing of campain ? +NbOfRecipients=Number of targets +NbOfUniqueSms=Nb dof unique phone numbers +NbOfSms=Nbre of phon numbers +ThisIsATestMessage=This is a test message +SendSms=Send SMS +SmsInfoCharRemain=Nb of remaining characters +SmsInfoNumero= (format international ie : +33899701761) +DelayBeforeSending=Delay before sending (minutes) +SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider. + diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang new file mode 100644 index 00000000000..29706d17615 --- /dev/null +++ b/htdocs/langs/bn_BD/stocks.lang @@ -0,0 +1,134 @@ +# Dolibarr language file - Source file is en_US - stocks +WarehouseCard=Warehouse card +Warehouse=Warehouse +Warehouses=Warehouses +NewWarehouse=New warehouse / Stock area +WarehouseEdit=Modify warehouse +MenuNewWarehouse=New warehouse +WarehouseOpened=Warehouse opened +WarehouseClosed=Warehouse closed +WarehouseSource=Source warehouse +WarehouseSourceNotDefined=No warehouse defined, +AddOne=Add one +WarehouseTarget=Target warehouse +ValidateSending=Delete sending +CancelSending=Cancel sending +DeleteSending=Delete sending +Stock=Stock +Stocks=Stocks +Movement=Movement +Movements=Movements +ErrorWarehouseRefRequired=Warehouse reference name is required +ErrorWarehouseLabelRequired=Warehouse label is required +CorrectStock=Correct stock +ListOfWarehouses=List of warehouses +ListOfStockMovements=List of stock movements +StocksArea=Warehouses area +Location=Location +LocationSummary=Short name location +NumberOfDifferentProducts=Number of different products +NumberOfProducts=Total number of products +LastMovement=Last movement +LastMovements=Last movements +Units=Units +Unit=Unit +StockCorrection=Correct stock +StockTransfer=Stock transfer +StockMovement=Transfer +StockMovements=Stock transfers +LabelMovement=Movement label +NumberOfUnit=Number of units +UnitPurchaseValue=Unit purchase price +TotalStock=Total in stock +StockTooLow=Stock too low +StockLowerThanLimit=Stock lower than alert limit +EnhancedValue=Value +PMPValue=Weighted average price +PMPValueShort=WAP +EnhancedValueOfWarehouses=Warehouses value +UserWarehouseAutoCreate=Create a warehouse automatically when creating a user +IndependantSubProductStock=Product stock and subproduct stock are independant +QtyDispatched=Quantity dispatched +QtyDispatchedShort=Qty dispatched +QtyToDispatchShort=Qty to dispatch +OrderDispatch=Stock dispatching +RuleForStockManagementDecrease=Rule for stock management decrease +RuleForStockManagementIncrease=Rule for stock management increase +DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation +DeStockOnValidateOrder=Decrease real stocks on customers orders validation +DeStockOnShipment=Decrease real stocks on shipment validation +ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation +ReStockOnValidateOrder=Increase real stocks on suppliers orders approbation +ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving +ReStockOnDeleteInvoice=Increase real stocks on invoice deletion +OrderStatusNotReadyToDispatch=Order has not yet or no more a status that allows dispatching of products in stock warehouses. +StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock +NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required. +DispatchVerb=Dispatch +StockLimitShort=Limit for alert +StockLimit=Stock limit for alert +PhysicalStock=Physical stock +RealStock=Real Stock +VirtualStock=Virtual stock +MininumStock=Minimum stock +StockUp=Stock up +MininumStockShort=Stock min +StockUpShort=Stock up +IdWarehouse=Id warehouse +DescWareHouse=Description warehouse +LieuWareHouse=Localisation warehouse +WarehousesAndProducts=Warehouses and products +AverageUnitPricePMPShort=Weighted average input price +AverageUnitPricePMP=Weighted average input price +SellPriceMin=Selling Unit Price +EstimatedStockValueSellShort=Value to sell +EstimatedStockValueSell=Value to Sell +EstimatedStockValueShort=Input stock value +EstimatedStockValue=Input stock value +DeleteAWarehouse=Delete a warehouse +ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse %s ? +PersonalStock=Personal stock %s +ThisWarehouseIsPersonalStock=This warehouse represents personal stock of %s %s +SelectWarehouseForStockDecrease=Choose warehouse to use for stock decrease +SelectWarehouseForStockIncrease=Choose warehouse to use for stock increase +NoStockAction=No stock action +LastWaitingSupplierOrders=Orders waiting for receptions +DesiredStock=Desired stock +StockToBuy=To order +Replenishment=Replenishment +ReplenishmentOrders=Replenishment orders +VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs +UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature +UseVirtualStock=Use virtual stock +UsePhysicalStock=Use physical stock +CurentSelectionMode=Curent selection mode +CurentlyUsingVirtualStock=Virtual stock +CurentlyUsingPhysicalStock=Physical stock +RuleForStockReplenishment=Rule for stocks replenishment +SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier +AlertOnly= Alerts only +WarehouseForStockDecrease=The warehouse %s will be used for stock decrease +WarehouseForStockIncrease=The warehouse %s will be used for stock increase +ForThisWarehouse=For this warehouse +ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference. +ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. +Replenishments=Replenishments +NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s) +NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s) +MassMovement=Mass movement +MassStockMovement=Mass stock movement +SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s". +RecordMovement=Record transfert +ReceivingForSameOrder=Receipts for this order +StockMovementRecorded=Stock movements recorded +RuleForStockAvailability=Rules on stock requirements +StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice +StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order +StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment +MovementLabel=Label of movement +InventoryCode=Movement or inventory code +IsInPackage=Contained into package +ShowWarehouse=Show warehouse +MovementCorrectStock=Stock content correction for product %s +MovementTransferStock=Stock transfer of product %s into another warehouse +WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. diff --git a/htdocs/langs/bn_BD/suppliers.lang b/htdocs/langs/bn_BD/suppliers.lang new file mode 100644 index 00000000000..baf573c66ac --- /dev/null +++ b/htdocs/langs/bn_BD/suppliers.lang @@ -0,0 +1,45 @@ +# Dolibarr language file - Source file is en_US - suppliers +Suppliers=Suppliers +AddSupplier=Create a supplier +SupplierRemoved=Supplier removed +SuppliersInvoice=Suppliers invoice +NewSupplier=New supplier +History=History +ListOfSuppliers=List of suppliers +ShowSupplier=Show supplier +OrderDate=Order date +BuyingPrice=Buying price +BuyingPriceMin=Minimum buying price +BuyingPriceMinShort=Min buying price +TotalBuyingPriceMin=Total of subproducts buying prices +SomeSubProductHaveNoPrices=Some sub-products have no price defined +AddSupplierPrice=Add supplier price +ChangeSupplierPrice=Change supplier price +ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier +ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first. +ProductHasAlreadyReferenceInThisSupplier=This product has already a reference in this supplier +ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s +NoRecordedSuppliers=No suppliers recorded +SupplierPayment=Supplier payment +SuppliersArea=Suppliers area +RefSupplierShort=Ref. supplier +Availability=Availability +ExportDataset_fournisseur_1=Supplier invoices list and invoice lines +ExportDataset_fournisseur_2=Supplier invoices and payments +ExportDataset_fournisseur_3=Supplier orders and order lines +ApproveThisOrder=Approve this order +ConfirmApproveThisOrder=Are you sure you want to approve order %s ? +DenyingThisOrder=Deny this order +ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ? +ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ? +AddCustomerOrder=Create customer order +AddCustomerInvoice=Create customer invoice +AddSupplierOrder=Create supplier order +AddSupplierInvoice=Create supplier invoice +ListOfSupplierProductForSupplier=List of products and prices for supplier %s +NoneOrBatchFileNeverRan=None or batch %s not ran recently +SentToSuppliers=Sent to suppliers +ListOfSupplierOrders=List of supplier orders +MenuOrdersSupplierToBill=Supplier orders to invoice +NbDaysToDelivery=Delivery delay in days +DescNbDaysToDelivery=The biggest delay is display among order product list diff --git a/htdocs/langs/bn_BD/trips.lang b/htdocs/langs/bn_BD/trips.lang new file mode 100644 index 00000000000..ba36fc9b07b --- /dev/null +++ b/htdocs/langs/bn_BD/trips.lang @@ -0,0 +1,126 @@ +# Dolibarr language file - Source file is en_US - trips +ExpenseReport=Expense report +ExpenseReports=Expense reports +Trip=Expense report +Trips=Expense reports +TripsAndExpenses=Expenses reports +TripsAndExpensesStatistics=Expense reports statistics +TripCard=Expense report card +AddTrip=Create expense report +ListOfTrips=List of expense report +ListOfFees=List of fees +NewTrip=New expense report +CompanyVisited=Company/foundation visited +Kilometers=Kilometers +FeesKilometersOrAmout=Amount or kilometers +DeleteTrip=Delete expense report +ConfirmDeleteTrip=Are you sure you want to delete this expense report ? +ListTripsAndExpenses=List of expense reports +ListToApprove=Waiting for approval +ExpensesArea=Expense reports area +SearchATripAndExpense=Search an expense report +ClassifyRefunded=Classify 'Refunded' +ExpenseReportWaitingForApproval=A new expense report has been submitted for approval +ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s +TripId=Id expense report +AnyOtherInThisListCanValidate=Person to inform for validation. +TripSociete=Information company +TripSalarie=Informations user +TripNDF=Informations expense report +DeleteLine=Delete a ligne of the expense report +ConfirmDeleteLine=Are you sure you want to delete this line ? +PDFStandardExpenseReports=Standard template to generate a PDF document for expense report +ExpenseReportLine=Expense report line +TF_OTHER=Other +TF_TRANSPORTATION=Transportation +TF_LUNCH=Lunch +TF_METRO=Metro +TF_TRAIN=Train +TF_BUS=Bus +TF_CAR=Car +TF_PEAGE=Toll +TF_ESSENCE=Fuel +TF_HOTEL=Hostel +TF_TAXI=Taxi + +ErrorDoubleDeclaration=You have declared another expense report into a similar date range. +ListTripsAndExpenses=List of expense reports +AucuneNDF=No expense reports found for this criteria +AucuneLigne=There is no expense report declared yet +AddLine=Add a line +AddLineMini=Add + +Date_DEBUT=Period date start +Date_FIN=Period date end +ModePaiement=Payment mode +Note=Note +Project=Project + +VALIDATOR=User to inform for approbation +VALIDOR=Approved by +AUTHOR=Recorded by +AUTHORPAIEMENT=Paied by +REFUSEUR=Denied by +CANCEL_USER=Canceled by + +MOTIF_REFUS=Reason +MOTIF_CANCEL=Reason + +DATE_REFUS=Deny date +DATE_SAVE=Validation date +DATE_VALIDE=Validation date +DateApprove=Approving date +DATE_CANCEL=Cancelation date +DATE_PAIEMENT=Payment date + +Deny=Deny +TO_PAID=Pay +BROUILLONNER=Reopen +SendToValid=Sent to approve +ModifyInfoGen=Edit +ValidateAndSubmit=Validate and submit for approval + +NOT_VALIDATOR=You are not allowed to approve this expense report +NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. + +RefuseTrip=Deny an expense report +ConfirmRefuseTrip=Are you sure you want to deny this expense report ? + +ValideTrip=Approve expense report +ConfirmValideTrip=Are you sure you want to approve this expense report ? + +PaidTrip=Pay an expense report +ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? + +CancelTrip=Cancel an expense report +ConfirmCancelTrip=Are you sure you want to cancel this expense report ? + +BrouillonnerTrip=Move back expense report to status "Draft"n +ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? + +SaveTrip=Validate expense report +ConfirmSaveTrip=Are you sure you want to validate this expense report ? + +Synchro_Compta=NDF <-> Compte + +TripSynch=Synchronisation : Notes de frais <-> Compte courant +TripToSynch=Notes de frais à intégrer dans la compta +AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". +ViewAccountSynch=Voir le compte + +ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? +ndfToAccount=Note de frais - Intégration + +ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant? +AccountToNdf=Note de frais - Retrait + +LINE_NOT_ADDED=Ligne non ajoutée : +NO_PROJECT=Aucun projet sélectionné. +NO_DATE=Aucune date sélectionnée. +NO_PRICE=Aucun prix indiqué. + +TripForValid=à Valider +TripForPaid=à Payer +TripPaid=Payée + +NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang new file mode 100644 index 00000000000..baf209f9d1c --- /dev/null +++ b/htdocs/langs/bn_BD/users.lang @@ -0,0 +1,122 @@ +# Dolibarr language file - Source file is en_US - users +HRMArea=HRM area +UserCard=User card +ContactCard=Contact card +GroupCard=Group card +NoContactCard=No card among contacts +Permission=Permission +Permissions=Permissions +EditPassword=Edit password +SendNewPassword=Regenerate and send password +ReinitPassword=Regenerate password +PasswordChangedTo=Password changed to: %s +SubjectNewPassword=Your new password for Dolibarr +AvailableRights=Available permissions +OwnedRights=Owned permissions +GroupRights=Group permissions +UserRights=User permissions +UserGUISetup=User display setup +DisableUser=Disable +DisableAUser=Disable a user +DeleteUser=Delete +DeleteAUser=Delete a user +DisableGroup=Disable +DisableAGroup=Disable a group +EnableAUser=Enable a user +EnableAGroup=Enable a group +DeleteGroup=Delete +DeleteAGroup=Delete a group +ConfirmDisableUser=Are you sure you want to disable user %s ? +ConfirmDisableGroup=Are you sure you want to disable group %s ? +ConfirmDeleteUser=Are you sure you want to delete user %s ? +ConfirmDeleteGroup=Are you sure you want to delete group %s ? +ConfirmEnableUser=Are you sure you want to enable user %s ? +ConfirmEnableGroup=Are you sure you want to enable group %s ? +ConfirmReinitPassword=Are you sure you want to generate a new password for user %s ? +ConfirmSendNewPassword=Are you sure you want to generate and send new password for user %s ? +NewUser=New user +CreateUser=Create user +SearchAGroup=Search a group +SearchAUser=Search a user +LoginNotDefined=Login is not defined. +NameNotDefined=Name is not defined. +ListOfUsers=List of users +Administrator=Administrator +SuperAdministrator=Super Administrator +SuperAdministratorDesc=Global administrator +AdministratorDesc=Administrator's entity +DefaultRights=Default permissions +DefaultRightsDesc=Define here default permissions that are automatically granted to a new created user (Go on user card to change permission of an existing user). +DolibarrUsers=Dolibarr users +LastName=Name +FirstName=First name +ListOfGroups=List of groups +NewGroup=New group +CreateGroup=Create group +RemoveFromGroup=Remove from group +PasswordChangedAndSentTo=Password changed and sent to %s. +PasswordChangeRequestSent=Request to change password for %s sent to %s. +MenuUsersAndGroups=Users & Groups +LastGroupsCreated=Last %s created groups +LastUsersCreated=Last %s users created +ShowGroup=Show group +ShowUser=Show user +NonAffectedUsers=Non assigned users +UserModified=User modified successfully +PhotoFile=Photo file +UserWithDolibarrAccess=User with Dolibarr access +ListOfUsersInGroup=List of users in this group +ListOfGroupsForUser=List of groups for this user +UsersToAdd=Users to add to this group +GroupsToAdd=Groups to add to this user +NoLogin=No login +LinkToCompanyContact=Link to third party / contact +LinkedToDolibarrMember=Link to member +LinkedToDolibarrUser=Link to Dolibarr user +LinkedToDolibarrThirdParty=Link to Dolibarr third party +CreateDolibarrLogin=Create a user +CreateDolibarrThirdParty=Create a third party +LoginAccountDisable=Account disabled, put a new login to activate it. +LoginAccountDisableInDolibarr=Account disabled in Dolibarr. +LoginAccountDisableInLdap=Account disabled in the domain. +UsePersonalValue=Use personal value +GuiLanguage=Interface language +InternalUser=Internal user +MyInformations=My data +ExportDataset_user_1=Dolibarr's users and properties +DomainUser=Domain user %s +Reactivate=Reactivate +CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card. +InternalExternalDesc=An internal user is a user that is part of your company/foundation.
An external user is a customer, supplier or other.

In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display) +PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group. +Inherited=Inherited +UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party) +UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party) +IdPhoneCaller=Id phone caller +UserLogged=User %s login +UserLogoff=User %s logout +NewUserCreated=User %s created +NewUserPassword=Password change for %s +EventUserModified=User %s modified +UserDisabled=User %s disabled +UserEnabled=User %s activated +UserDeleted=User %s removed +NewGroupCreated=Group %s created +GroupModified=Group %s modified +GroupDeleted=Group %s removed +ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ? +ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ? +ConfirmCreateThirdParty=Are you sure you want to create a third party for this member ? +LoginToCreate=Login to create +NameToCreate=Name of third party to create +YourRole=Your roles +YourQuotaOfUsersIsReached=Your quota of active users is reached ! +NbOfUsers=Nb of users +DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin +HierarchicalResponsible=Supervisor +HierarchicView=Hierarchical view +UseTypeFieldToChange=Use field Type to change +OpenIDURL=OpenID URL +LoginUsingOpenID=Use OpenID to login +WeeklyHours=Weekly hours +ColorUser=Color of the user diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang new file mode 100644 index 00000000000..c36ffbf025a --- /dev/null +++ b/htdocs/langs/bn_BD/withdrawals.lang @@ -0,0 +1,97 @@ +# Dolibarr language file - Source file is en_US - withdrawals +StandingOrdersArea=Standing orders area +CustomersStandingOrdersArea=Customers standing orders area +StandingOrders=Standing orders +StandingOrder=Standing orders +NewStandingOrder=New standing order +StandingOrderToProcess=To process +StandingOrderProcessed=Processed +Withdrawals=Withdrawals +Withdrawal=Withdrawal +WithdrawalsReceipts=Withdrawal receipts +WithdrawalReceipt=Withdrawal receipt +WithdrawalReceiptShort=Receipt +LastWithdrawalReceipts=Last %s withdrawal receipts +WithdrawedBills=Withdrawn invoices +WithdrawalsLines=Withdrawal lines +RequestStandingOrderToTreat=Request for standing orders to process +RequestStandingOrderTreated=Request for standing orders processed +NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines. +CustomersStandingOrders=Customer standing orders +CustomerStandingOrder=Customer standing order +NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request +NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information +InvoiceWaitingWithdraw=Invoice waiting for withdraw +AmountToWithdraw=Amount to withdraw +WithdrawsRefused=Withdraws refused +NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request. +ResponsibleUser=Responsible user +WithdrawalsSetup=Withdrawal setup +WithdrawStatistics=Withdraw's statistics +WithdrawRejectStatistics=Withdraw reject's statistics +LastWithdrawalReceipt=Last %s withdrawing receipts +MakeWithdrawRequest=Make a withdraw request +ThirdPartyBankCode=Third party bank code +ThirdPartyDeskCode=Third party desk code +NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN. +ClassCredited=Classify credited +ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account? +TransData=Transmission date +TransMetod=Transmission method +Send=Send +Lines=Lines +StandingOrderReject=Issue a rejection +WithdrawalRefused=Withdrawal refused +WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society +RefusedData=Date of rejection +RefusedReason=Reason for rejection +RefusedInvoicing=Billing the rejection +NoInvoiceRefused=Do not charge the rejection +InvoiceRefused=Invoice refused (Charge the rejection to customer) +Status=Status +StatusUnknown=Unknown +StatusWaiting=Waiting +StatusTrans=Sent +StatusCredited=Credited +StatusRefused=Refused +StatusMotif0=Unspecified +StatusMotif1=Insufficient funds +StatusMotif2=Request contested +StatusMotif3=No Withdrawal order +StatusMotif4=Customer Order +StatusMotif5=RIB unusable +StatusMotif6=Account without balance +StatusMotif7=Judicial Decision +StatusMotif8=Other reason +CreateAll=Withdraw all +CreateGuichet=Only office +CreateBanque=Only bank +OrderWaiting=Waiting for treatment +NotifyTransmision=Withdrawal Transmission +NotifyEmision=Withdrawal Emission +NotifyCredit=Withdrawal Credit +NumeroNationalEmetter=National Transmitter Number +PleaseSelectCustomerBankBANToWithdraw=Select information about customer bank account to withdraw +WithBankUsingRIB=For bank accounts using RIB +WithBankUsingBANBIC=For bank accounts using IBAN/BIC/SWIFT +BankToReceiveWithdraw=Bank account to receive withdraws +CreditDate=Credit on +WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported) +ShowWithdraw=Show Withdraw +IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one withdrawal payment not yet processed, it won't be set as paid to allow prior withdrawal management. +DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null. +WithdrawalFile=Withdrawal file +SetToStatusSent=Set to status "File Sent" +ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid" +StatisticsByLineStatus=Statistics by status of lines + +### Notifications +InfoCreditSubject=Payment of standing order %s by the bank +InfoCreditMessage=The standing order %s has been paid by the bank
Data of payment: %s +InfoTransSubject=Transmission of standing order %s to bank +InfoTransMessage=The standing order %s has been sent to bank by %s %s.

+InfoTransData=Amount: %s
Method: %s
Date: %s +InfoFoot=This is an automated message sent by Dolibarr +InfoRejectSubject=Standing order refused +InfoRejectMessage=Hello,

the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.

--
%s +ModeWarning=Option for real mode was not set, we stop after this simulation diff --git a/htdocs/langs/bn_BD/workflow.lang b/htdocs/langs/bn_BD/workflow.lang new file mode 100644 index 00000000000..17c8dd3aafa --- /dev/null +++ b/htdocs/langs/bn_BD/workflow.lang @@ -0,0 +1,11 @@ +# Dolibarr language file - Source file is en_US - admin +WorkflowSetup=Workflow module setup +WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in. +ThereIsNoWorkflowToModify=There is no workflow you can modify for module you have activated. +descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Create a customer order automatically after a commercial proposal is signed +descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Create a customer invoice automatically after a commercial proposal is signed +descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Create a customer invoice automatically after a contract is validated +descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Create a customer invoice automatically after a customer order is closed +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang index 1b69bd47535..9555ed5ea91 100644 --- a/htdocs/langs/bs_BA/bills.lang +++ b/htdocs/langs/bs_BA/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Izvršene uplate PaymentsBackAlreadyDone=Izvršeni povrati uplata PaymentRule=Pravilo plaćanja PaymentMode=Način plaćanja -PaymentConditions=Rok plaćanja -PaymentConditionsShort=Rok plaćanja +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Iznos plaćanja ValidatePayment=Potvrditi uplatu PaymentHigherThanReminderToPay=Uplata viša od zaostalog duga diff --git a/htdocs/langs/bs_BA/incoterm.lang b/htdocs/langs/bs_BA/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/bs_BA/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/bs_BA/printing.lang b/htdocs/langs/bs_BA/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/bs_BA/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang index 7f9d2c4415e..7bbafa2fa64 100644 --- a/htdocs/langs/bs_BA/projects.lang +++ b/htdocs/langs/bs_BA/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang index bf96794fbdc..ec60df3dd2d 100644 --- a/htdocs/langs/ca_ES/bills.lang +++ b/htdocs/langs/ca_ES/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Pagaments efectuats PaymentsBackAlreadyDone=Reemborsaments ja efectuats PaymentRule=Forma de pagament PaymentMode=Forma de pagament -PaymentConditions=Condicions de pagament -PaymentConditionsShort=Condicions pagament +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Import pagament ValidatePayment=Validar aquest pagament PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar diff --git a/htdocs/langs/ca_ES/incoterm.lang b/htdocs/langs/ca_ES/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/ca_ES/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/ca_ES/printing.lang b/htdocs/langs/ca_ES/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/ca_ES/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang index 694c1c3a732..593de6fcc1c 100644 --- a/htdocs/langs/ca_ES/projects.lang +++ b/htdocs/langs/ca_ES/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Model d'informe de projecte complet (logo...) -PlannedWorkload = Càrrega de treball prevista -WorkloadOccupation= Percentatge afectat +PlannedWorkload=Càrrega de treball prevista +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Objectes vinculats SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang index e40c3cbdffd..0317d44870a 100644 --- a/htdocs/langs/cs_CZ/bills.lang +++ b/htdocs/langs/cs_CZ/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Platby neučinily PaymentsBackAlreadyDone=Platby zpět neučinily PaymentRule=Platba pravidlo PaymentMode=Typ platby -PaymentConditions=Termín vyplacení -PaymentConditionsShort=Termín vyplacení +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Částka platby ValidatePayment=Ověření platby PaymentHigherThanReminderToPay=Platební vyšší než upomínce k zaplacení diff --git a/htdocs/langs/cs_CZ/incoterm.lang b/htdocs/langs/cs_CZ/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/cs_CZ/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/cs_CZ/printing.lang b/htdocs/langs/cs_CZ/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/cs_CZ/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang index 3e8b7a046b0..5655c05549e 100644 --- a/htdocs/langs/cs_CZ/projects.lang +++ b/htdocs/langs/cs_CZ/projects.lang @@ -130,13 +130,15 @@ AddElement=Odkaz na prvek UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Kompletní projektový report (logo. ..) -PlannedWorkload = Plánované vytížení -WorkloadOccupation= Zábor vytížení +PlannedWorkload=Plánované vytížení +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Odkazující objekty SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang index 4fec0d6f176..94c961167d3 100644 --- a/htdocs/langs/da_DK/bills.lang +++ b/htdocs/langs/da_DK/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Betalinger allerede gjort PaymentsBackAlreadyDone=Payments back already done PaymentRule=Betaling regel PaymentMode=Betalingstype -PaymentConditions=Betaling sigt -PaymentConditionsShort=Betaling sigt +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Indbetalingsbeløb ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Betaling højere end påmindelse om at betale diff --git a/htdocs/langs/da_DK/incoterm.lang b/htdocs/langs/da_DK/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/da_DK/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/da_DK/printing.lang b/htdocs/langs/da_DK/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/da_DK/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang index a72024e975f..91e45f99006 100644 --- a/htdocs/langs/da_DK/projects.lang +++ b/htdocs/langs/da_DK/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=En komplet projekt rapport model (logo. ..) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang index 9caea1587c2..d882f33b034 100644 --- a/htdocs/langs/de_DE/bills.lang +++ b/htdocs/langs/de_DE/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Bereits getätigte Zahlungen PaymentsBackAlreadyDone=Rückzahlungen bereits erledigt PaymentRule=Zahlungsregel PaymentMode=Zahlungsart -PaymentConditions=Zahlungskonditionen -PaymentConditionsShort=Konditionen +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Zahlungsbetrag ValidatePayment=Zahlung freigeben PaymentHigherThanReminderToPay=Zahlungsbetrag übersteigt Zahlungserinnerung diff --git a/htdocs/langs/de_DE/incoterm.lang b/htdocs/langs/de_DE/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/de_DE/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/de_DE/printing.lang b/htdocs/langs/de_DE/printing.lang new file mode 100644 index 00000000000..3f783f02e08 --- /dev/null +++ b/htdocs/langs/de_DE/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direkt drucken +Module112000Desc=Direkt-Druck-System aktivieren +PrintingSetup=Direkt-Druck-System einrichten +PrintingDesc=Dieses Modul fügt einen "Drucken"-Button zu, um Dokumente direkt zu einen Drucker zu senden. Dies erfordert ein Linux-System mit installiertem CUPS. +ModuleDriverSetup=Modul Treiber einrichten +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=Treiberliste +PrintTestDesc=Druckerliste +FileWasSentToPrinter=Datei %s wurde an den Drucker gesendet +NoActivePrintingModuleFound=Kein aktives Modul, um Druckvorgang auszuführen +PleaseSelectaDriverfromList=Bitte wählen Sie einen Treiber von der Liste +SetupDriver=Treibereinstellungen +TestDriver=Test +TargetedPrinter=Zieldrucker +UserConf=Je Nutzer einrichten +PRINTGCP=Google Cloud Print +PrintGCPDesc=Dieser Treiber erlaubt das direkte senden zu ein Drucker via Google Cloud Print +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=Druckerliste für Google Cloud Print +PRINTGCP_LOGIN=Login für Google Account +PRINTGCP_PASSWORD=Passwort für Google Account +STATE_ONLINE=Online +STATE_UNKNOWN=Unbekannt +STATE_OFFLINE=Abwesend +STATE_DORMANT=Schon lange Abwesend +TYPE_GOOGLE=Google +TYPE_HP=HP Drucker +TYPE_DOCS=Docs / Dokumente +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Angezeigter Name +GCP_Id=Drucker ID +GCP_OwnerName=Besitzername +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Druckertyp +PRINTIPP=PrintIPP Treiber +PrintIPPSetup=Einstellungen des DirektDruck-Moduls +PrintIPPDesc=Dieser Treiber erlaubt es Dokumente direkt an einen Drucker zu senden. Es ist dafür erforderlich, ein Linux System mit CUPS installiert zu haben. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=Druckerliste für Treiber PrintIPP +PRINTIPP_ENABLED=Zeige " Direkt drucken" Icon in der Dokumentenliste +PRINTIPP_HOST=Druckserver +PRINTIPP_PORT=Port +PRINTIPP_USER=Anmeldung +PRINTIPP_PASSWORD=Passwort +NoPrinterFound=Keine Drucker gefunden (CUPS-Konfiguration prüfen) +FileWasSentToPrinter=Datei %s wurde an den Drucker gesendet +NoDefaultPrinterDefined=Kein Standarddrucker defininert +DefaultPrinter=Standarddrucker +Printer=Drucker +CupsServer=CUPS-Server +IPP_Uri=Drucker Uri +IPP_Name=Druckername +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Farbe +IPP_Device=Device +IPP_Media=Druckermedium +IPP_Supported=Medientyp +STATE_IPP_idle=Beschäftigt +STATE_IPP_stopped=Angehalten +STATE_IPP_paused=Pausiert +STATE_IPP_toner-low-report=Niedriger Tonerstand +STATE_IPP_none=Keine +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermisch +IPP_COLOR_print-black=BW Drucker diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang index fbbc111f0f7..b32d37c2026 100644 --- a/htdocs/langs/de_DE/projects.lang +++ b/htdocs/langs/de_DE/projects.lang @@ -130,13 +130,15 @@ AddElement=Mit Element verknüpfen UnlinkElement=Verknüpfung zu Element aufheben # Documents models DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.) -PlannedWorkload = Geplante Auslastung -WorkloadOccupation= Beeinflussung der Auslastung +PlannedWorkload=Geplante Auslastung +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Bezugnahmen SearchAProject=Suchen Sie ein Projekt ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden ProjectDraft=Projekt-Entwürfe FirstAddRessourceToAllocateTime=Eine Ressource zuordnen, um Zeit festzulegen -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang index 597c71d53e7..b7981cb6906 100644 --- a/htdocs/langs/el_GR/bills.lang +++ b/htdocs/langs/el_GR/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Ιστορικό Πληρωμών PaymentsBackAlreadyDone=Payments back already done PaymentRule=Κανόνας Πληρωμής PaymentMode=Τρόπος Πληρωμής -PaymentConditions=Συνθήκη Πληρωμής -PaymentConditionsShort=Συνθήκες Πληρωμής +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Σύνολο πληρωμής ValidatePayment=Επικύρωση πληρωμής PaymentHigherThanReminderToPay=Η πληρωμή είναι μεγαλύτερη από το υπόλοιπο diff --git a/htdocs/langs/el_GR/incoterm.lang b/htdocs/langs/el_GR/incoterm.lang new file mode 100644 index 00000000000..d033be2b50a --- /dev/null +++ b/htdocs/langs/el_GR/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Διεθνείς Εμπορικός Όρος +Module210009Desc=Προσθέστε δυνατότητες για τη διαχείριση του Διεθνή Εμπορικού Όρου +IncotermLabel=Διεθνείς Εμπορικοί Όροι +IncotermSetupTitle1=Χαρακτηριστικό +IncotermSetupTitle2=Κατάσταση +IncotermSetup=Ρύθμιση του module Διεθνείς Εμπορικός Όρος +IncotermFunctionDesc=Ενεργοποίηση Διεθνείς Εμπορικός Όρος χαρακτηριστικό (Πελ./Προμ., προσφορά, παραγγελία πελάτη, Τιμολογίου Πελάτη, την αποστολή, παραγγελία Προμηθευτή) diff --git a/htdocs/langs/el_GR/printing.lang b/htdocs/langs/el_GR/printing.lang new file mode 100644 index 00000000000..55bc4ce2747 --- /dev/null +++ b/htdocs/langs/el_GR/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Άμεση εκτύπωση +Module112000Desc=Ενεργοποίηση άμεσης εκτύπωσης +PrintingSetup=Ρύθμιση του συστήματος για την άμεση εκτύπωση +PrintingDesc=Το module αυτό προσθέτει ένα κουμπί Εκτύπωσης για να στείλετε έγγραφα απευθείας σε έναν εκτυπωτή (χωρίς να ανοίξετε το έγγραφο με μια εφαρμογή). +ModuleDriverSetup=Ρύθμιση Module οδήγησης +PrintingDriverDesc=Διαμόρφωση μεταβλητών για τον οδηγό εκτύπωσης. +ListDrivers=Λίστα οδηγών +PrintTestDesc=Λίστα εκτυπωτών. +FileWasSentToPrinter=Το αρχείο %s στάλθηκε στον εκτυπωτή +NoActivePrintingModuleFound=Κανένα ενεργό module εκτύπωσης για έγγραφο +PleaseSelectaDriverfromList=Παρακαλώ επιλέξτε ένα πρόγραμμα οδήγησης από τη λίστα. +SetupDriver=Ρυθμίσεις του προγράμματος οδήγησης +TestDriver=Test +TargetedPrinter=Στοχευμένη εκτύπωση +UserConf=Ρύθμισης ανά χρήστη +PRINTGCP=Google Cloud Print +PrintGCPDesc=Αυτό το πρόγραμμα οδήγησης επιτρέπει να στείλετε έγγραφα απευθείας σε έναν εκτυπωτή του Google Cloud Print. +PrintingDriverDescprintgcp=Διαμόρφωση των μεταβλητών για τον οδηγό εκτύπωσης του Google Cloud Print. +PrintTestDescprintgcp=Λίστα εκτυπωτών στο Google Cloud Print. +PRINTGCP_LOGIN=Είσοδος Χρήστη Google +PRINTGCP_PASSWORD=Google Account Κωδικός +STATE_ONLINE=Online +STATE_UNKNOWN=Άγνωστος +STATE_OFFLINE=Εκτός Σύνδεσης +STATE_DORMANT=Εκτός λειτουργίας για αρκετό διάστημα +TYPE_GOOGLE=Google +TYPE_HP=HP εκτυπωτής +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Όνομα +GCP_displayName=Εμφανιζόμενο όνομα +GCP_Id=ID εκτυπωτή +GCP_OwnerName=Όνομα Ιδιοκτήτη +GCP_State=Κατάσταση εκτυπωτή +GCP_connectionStatus=Κατάσταση Online +GCP_Type=Τύπος εκτυπωτή +PRINTIPP=Οδηγός PrintIPP +PrintIPPSetup=Ρυθμίσεις module για το Direct Print +PrintIPPDesc=Αυτό το πρόγραμμα οδήγησης επιτρέπει να στείλετε έγγραφα απευθείας σε έναν εκτυπωτή. Απαιτείται ένα σύστημα Linux με εγκατεστημένο CUPS. +PrintingDriverDescprintipp=Διαμόρφωση μεταβλητών για τον οδηγό εκτύπωσης PrintIPP. +PrintTestDescprintipp=Λίστα εκτυπωτών για τον οδηγό PrintIPP. +PRINTIPP_ENABLED=Εμφάνιση εικονιδίου "Απευθείας εκτύπωσης" στις λίστες εγγράφων +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Είσοδος +PRINTIPP_PASSWORD=Κωδικός +NoPrinterFound=Δεν βρέθηκαν εκτυπωτές (Ελέγξτε τις ρυθμίσεις του CUPS) +FileWasSentToPrinter=Το αρχείο %s στάλθηκε στον εκτυπωτή +NoDefaultPrinterDefined=Δεν έχει οριστεί προ επιλεγμένος εκτυπωτής +DefaultPrinter=Προεπιλογή εκτυπωτή +Printer=Eκτυπωτής +CupsServer=CUPS Server +IPP_Uri=Uri εκτυπωτή +IPP_Name=Όνομα εκτυπωτή +IPP_State=Κατάσταση εκτυπωτή +IPP_State_reason=Λόγος κατάστασης +IPP_State_reason1=Λόγος 1 κατάστασης +IPP_BW=Ασπρόμαυρη +IPP_Color=Έγχρωμη +IPP_Device=Συσκευή +IPP_Media=Μέσα εκτύπωσης +IPP_Supported=Τύπος των μέσων +STATE_IPP_idle=Αδρανής +STATE_IPP_stopped=Σταμάτησε +STATE_IPP_paused=Παύση +STATE_IPP_toner-low-report=Χαμηλή στάθμη Toner +STATE_IPP_none=Καμία +MEDIA_IPP_stationery=Γραφική ύλη +MEDIA_IPP_thermal=Θερμικός +IPP_COLOR_print-black=Ασπρόμαυρος Εκτυπωτής diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang index 3e20c208dc9..4758fb8c27a 100644 --- a/htdocs/langs/el_GR/projects.lang +++ b/htdocs/langs/el_GR/projects.lang @@ -130,13 +130,15 @@ AddElement=Σύνδεση με το στοιχείο UnlinkElement=Αποσύνδεση στοιχείου # Documents models DocumentModelBaleine=Μοντέλο έκθεση Μια πλήρης έργου (logo. ..) -PlannedWorkload = Σχέδιο φόρτου εργασίας -WorkloadOccupation= Επιτήδευση Φόρτου εργασίας +PlannedWorkload=Σχέδιο φόρτου εργασίας +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Αναφορές από αντικείμενα SearchAProject=Αναζήτηση ένα έργο ProjectMustBeValidatedFirst=Το έργο πρέπει να επικυρωθεί πρώτα ProjectDraft=Πρόχειρα έργα FirstAddRessourceToAllocateTime=Συσχετίστε έναν πόρο για την κατανομή του χρόνου -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang index 27e0c30c352..e9516954cb2 100644 --- a/htdocs/langs/en_AU/main.lang +++ b/htdocs/langs/en_AU/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/en_CA/main.lang b/htdocs/langs/en_CA/main.lang index fca2906cd12..5615b28145a 100644 --- a/htdocs/langs/en_CA/main.lang +++ b/htdocs/langs/en_CA/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd.MM.yyyy FormatDateShortJavaInput=dd.MM.yyyy FormatDateShortJQuery=dd.mm.yy FormatDateShortJQueryInput=dd.mm.yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang deleted file mode 100644 index 025fcbe0f18..00000000000 --- a/htdocs/langs/en_GB/bills.lang +++ /dev/null @@ -1,24 +0,0 @@ -# Dolibarr language file - Source file is en_US - bills -PaymentConditionShortRECEP=Due on Receipt -PaymentConditionRECEP=Due on Receipt -PaymentTypeVIR=Bank transfer -PaymentTypeShortVIR=Bank transfer -PaymentTypePRE=Direct debit -PaymentTypeShortPRE=Direct debit -PaymentTypeCHQ=Cheque -PaymentTypeShortCHQ=Cheque -BankCode=Sort code -ChequeNumber=Cheque N° -ChequeOrTransferNumber=Cheque/Transfer N° -ChequeMaker=Cheque transmitter -ChequeBank=Bank of Cheque -PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration. -PaymentByChequeOrderedTo=Cheque payment (including tax) are payable to %s send to -PaymentByChequeOrderedToShort=Cheque payment (including tax) are payable to -MenuChequeDeposits=Cheques deposits -MenuCheques=Cheques -MenuChequesReceipts=Cheques receipts -ChequesReceipts=Cheques receipts -ChequesArea=Cheques deposits area -ChequeDeposits=Cheques deposits -Cheques=Cheques diff --git a/htdocs/langs/en_GB/commercial.lang b/htdocs/langs/en_GB/commercial.lang deleted file mode 100644 index 18d8db06801..00000000000 --- a/htdocs/langs/en_GB/commercial.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - commercial -ActionAffectedTo=Event assigned to diff --git a/htdocs/langs/en_GB/cron.lang b/htdocs/langs/en_GB/cron.lang deleted file mode 100644 index 3f755fc725d..00000000000 --- a/htdocs/langs/en_GB/cron.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - cron -CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes -CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang index ced56a38a13..0d2a37aa449 100644 --- a/htdocs/langs/en_GB/main.lang +++ b/htdocs/langs/en_GB/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/en_GB/orders.lang b/htdocs/langs/en_GB/orders.lang deleted file mode 100644 index 2c71fc66ccc..00000000000 --- a/htdocs/langs/en_GB/orders.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - orders -StatusOrderOnProcessShort=Ordered -StatusOrderOnProcess=Ordered - Standby reception diff --git a/htdocs/langs/en_GB/suppliers.lang b/htdocs/langs/en_GB/suppliers.lang deleted file mode 100644 index 5213cec4e07..00000000000 --- a/htdocs/langs/en_GB/suppliers.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - suppliers -DenyingThisOrder=Deny this order diff --git a/htdocs/langs/en_GB/trips.lang b/htdocs/langs/en_GB/trips.lang deleted file mode 100644 index f5e6f1a92eb..00000000000 --- a/htdocs/langs/en_GB/trips.lang +++ /dev/null @@ -1,14 +0,0 @@ -# Dolibarr language file - Source file is en_US - trips -Trip=Expense report -Trips=Expense reports -TripsAndExpenses=Expenses reports -TripsAndExpensesStatistics=Expense reports statistics -TripCard=Expense report card -AddTrip=Create expense report -ListOfTrips=List of expense report -NewTrip=New expense report -DeleteTrip=Delete expense report -ConfirmDeleteTrip=Are you sure you want to delete this expense report ? -ListTripsAndExpenses=List of expense reports -ExpensesArea=Expense reports area -SearchATripAndExpense=Search an expense report diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang index 7fbca74ca3d..1847a4b4ab1 100644 --- a/htdocs/langs/en_IN/main.lang +++ b/htdocs/langs/en_IN/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%b %d, %Y diff --git a/htdocs/langs/en_NZ/main.lang b/htdocs/langs/en_NZ/main.lang index 93e9771e575..aaa245d3508 100644 --- a/htdocs/langs/en_NZ/main.lang +++ b/htdocs/langs/en_NZ/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/en_SA/main.lang b/htdocs/langs/en_SA/main.lang index f8402963091..8fee9b5f5d9 100644 --- a/htdocs/langs/en_SA/main.lang +++ b/htdocs/langs/en_SA/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy FormatDateShortJavaInput=dd/MM/yyyy FormatDateShortJQuery=dd/mm/yy FormatDateShortJQueryInput=dd/mm/yy +FormatHourShortJQuery=HH:MI FormatHourShort=%I:%M %p FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/en_US/incoterm.lang b/htdocs/langs/en_US/incoterm.lang new file mode 100644 index 00000000000..0a3f3c677d8 --- /dev/null +++ b/htdocs/langs/en_US/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) \ No newline at end of file diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang old mode 100755 new mode 100644 diff --git a/htdocs/langs/en_ZA/main.lang b/htdocs/langs/en_ZA/main.lang index a696d3c77d8..4c30b385ef8 100644 --- a/htdocs/langs/en_ZA/main.lang +++ b/htdocs/langs/en_ZA/main.lang @@ -10,6 +10,7 @@ FormatDateShortJava=yyy/MM/dd FormatDateShortJavaInput=yyyy/MM/yy FormatDateShortJQuery=yy/mm/yy FormatDateShortJQueryInput=yy/mm/dd +FormatHourShortJQuery=HH:MI FormatHourShort=%H:%M FormatHourShortDuration=%H:%M FormatDateTextShort=%d %b %Y diff --git a/htdocs/langs/es_AR/bills.lang b/htdocs/langs/es_AR/bills.lang deleted file mode 100644 index 75496f66e43..00000000000 --- a/htdocs/langs/es_AR/bills.lang +++ /dev/null @@ -1,21 +0,0 @@ -# Dolibarr language file - Source file is en_US - bills -InvoiceAvoir=Nota de crédito -InvoiceAvoirAsk=Nota de crédito para corregir la factura -InvoiceAvoirDesc=La nota de crédito es una factura negativa destinada a compensar un importe de factura que difiere del importe realmente pagado (por haber pagado de más o por devolución de productos, por ejemplo). -InvoiceHasAvoir=Corregida por una o más notas de crédito -ConfirmConvertToReduc=¿Quiere convertir esta nota de crédito en una reducción futura?
El importe de esta nota de crédito se almacenará para este cliente. Podrá utilizarse para reducir el importe de una próxima factura del cliente. -AddBill=Crear factura o nota de crédito -EnterPaymentDueToCustomer=Realizar pago de notas de crédito al cliente -ErrorInvoiceAvoirMustBeNegative=Error, una factura de tipo nota de crédito debe tener un importe negativo -ConfirmClassifyPaidPartiallyReasonAvoir=El resto a pagar (%s %s) se ha regularizado (ya que artículo se ha devuelto, olvidado entregar, descuento no definido...) mediante una nota de crédito -ConfirmClassifyPaidPartiallyReasonOtherDesc=Esta elección será posible, por ejemplo, en los casos siguiente:
-pago parcial ya que una partida de productos se ha devuleto.
- reclamado por no entregar productos de la factura
En todos los casos, la reclamación debe regularizarse mediante una nota de crédito -ShowInvoiceAvoir=Ver nota de crédito -AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (excluidos las notas de crédito y anticipos) -AddCreditNote=Crear nota de crédito -ShowDiscount=Ver la nota de crédito -CreditNote=Nota de crédito -CreditNotes=Notas de crédito -DiscountFromCreditNote=Descuento resultante de la nota de crédito %s -AbsoluteDiscountUse=Este tipo de crédito no puede ser utilizado en una factura antes de su validación -CreditNoteConvertedIntoDiscount=Esta nota de crédito se convirtió en %s -TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas y %syymm-nnnn para las notas de crédito donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0 diff --git a/htdocs/langs/es_AR/cron.lang b/htdocs/langs/es_AR/cron.lang deleted file mode 100644 index 3f755fc725d..00000000000 --- a/htdocs/langs/es_AR/cron.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - cron -CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes -CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes diff --git a/htdocs/langs/es_AR/orders.lang b/htdocs/langs/es_AR/orders.lang deleted file mode 100644 index 2c71fc66ccc..00000000000 --- a/htdocs/langs/es_AR/orders.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - orders -StatusOrderOnProcessShort=Ordered -StatusOrderOnProcess=Ordered - Standby reception diff --git a/htdocs/langs/es_AR/trips.lang b/htdocs/langs/es_AR/trips.lang deleted file mode 100644 index b4a068e21c4..00000000000 --- a/htdocs/langs/es_AR/trips.lang +++ /dev/null @@ -1,13 +0,0 @@ -# Dolibarr language file - Source file is en_US - trips -Trip=Expense report -Trips=Expense reports -TripsAndExpenses=Expenses reports -TripsAndExpensesStatistics=Expense reports statistics -TripCard=Expense report card -AddTrip=Create expense report -ListOfTrips=List of expense report -NewTrip=New expense report -DeleteTrip=Delete expense report -ConfirmDeleteTrip=Are you sure you want to delete this expense report ? -ListTripsAndExpenses=List of expense reports -ExpensesArea=Expense reports area diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang index d43134a3f9c..1c53b65c99c 100644 --- a/htdocs/langs/es_CO/admin.lang +++ b/htdocs/langs/es_CO/admin.lang @@ -2,4 +2,3 @@ AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
Example for ClamAv: /usr/bin/clamscan AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib" ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir -MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application) diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang deleted file mode 100644 index f1e67a676c3..00000000000 --- a/htdocs/langs/es_CO/bills.lang +++ /dev/null @@ -1,2 +0,0 @@ -# Dolibarr language file - Source file is en_US - bills -ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid. diff --git a/htdocs/langs/es_CO/cron.lang b/htdocs/langs/es_CO/cron.lang deleted file mode 100644 index 3f755fc725d..00000000000 --- a/htdocs/langs/es_CO/cron.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - cron -CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes -CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes diff --git a/htdocs/langs/es_CO/externalsite.lang b/htdocs/langs/es_CO/externalsite.lang new file mode 100644 index 00000000000..41f70db06fe --- /dev/null +++ b/htdocs/langs/es_CO/externalsite.lang @@ -0,0 +1,2 @@ +# Dolibarr language file - Source file is en_US - externalsite +ExampleMyMenuEntry=Mi entrada en el menú diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang index 2e691473326..b4e3fdd0dcf 100644 --- a/htdocs/langs/es_CO/main.lang +++ b/htdocs/langs/es_CO/main.lang @@ -2,20 +2,43 @@ DIRECTION=ltr FONTFORPDF=helvetica FONTSIZEFORPDF=10 -SeparatorDecimal=. -SeparatorThousand=, -FormatDateShort=%m/%d/%Y -FormatDateShortInput=%m/%d/%Y -FormatDateShortJava=MM/dd/yyyy -FormatDateShortJavaInput=MM/dd/yyyy -FormatDateShortJQuery=mm/dd/yy -FormatDateShortJQueryInput=mm/dd/yy +SeparatorDecimal=, +SeparatorThousand=. +FormatDateShort=%d/%m/%Y +FormatDateShortInput=%d/%m/%Y +FormatDateShortJava=dd/MM/yyyy +FormatDateShortJavaInput=dd/MM/yyyy +FormatDateShortJQuery=dd/mm/yy +FormatDateShortJQueryInput=dd/mm/yy FormatHourShortJQuery=HH:MI -FormatHourShort=%I:%M %p +FormatHourShort=%H:%M FormatHourShortDuration=%H:%M -FormatDateTextShort=%b %d, %Y -FormatDateText=%B %d, %Y -FormatDateHourShort=%m/%d/%Y %I:%M %p -FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p -FormatDateHourTextShort=%b %d, %Y, %I:%M %p -FormatDateHourText=%B %d, %Y, %I:%M %p +FormatDateTextShort=%d %b %Y +FormatDateText=%d %B %Y +FormatDateHourShort=%d/%m/%Y %H:%M +FormatDateHourSecShort=%d/%m/%Y %H:%M:%S +FormatDateHourTextShort=%d %b %Y %H:%M +FormatDateHourText=%d %B %Y %H:%M +NoRecordFound=No se encontraron registros +ErrorFileNotUploaded=El archivo no se transifirió. Compruebe que el tamaño no supere el máximo permitido, el espacio libre disponible en el disco y que no hay un archivo con el mismo nombre en el directorio destino. +ErrorNoRequestRan=No hay petición +ErrorSomeErrorWereFoundRollbackIsDone=Se encontraron algunos errores. Modificaciones sin aplicar. +ErrorNoSocialContributionForSellerCountry=Error, no hay tipo de carga social definida para el país '%s'. +SeeHere=Ver aquí +FileNotUploaded=El archivo no se subió +FileWasNotUploaded=Un archivo ha sido seleccionado para adjuntarlo, pero aún no se ha subido. Haga clic en "Adjuntar este archivo". +SeeAbove=Ver arriba +InformationToHelpDiagnose=Esta es una información que puede ayudar de diagnóstico +ValidateAndApprove=Validar y aprobar +Disapprove=Desaprobar +NoUserGroupDefined=No hay grupo de usuario definido +DateAndHour=Fecha y hora +DateModificationShort=Fecha modificación +UseLocalTax=Incluir impuestos +CommercialProposalsShort=Cotizaciones +RequestAlreadyDone=La solicitud ya ha sido procesada +NbOfReferers=Número de remitentes +Currency=Moneda +SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Actualizar +PrintFile=Imprimir archivo %s +ShowTransaction=Mostrar transacción diff --git a/htdocs/langs/es_CO/orders.lang b/htdocs/langs/es_CO/orders.lang deleted file mode 100644 index 2c71fc66ccc..00000000000 --- a/htdocs/langs/es_CO/orders.lang +++ /dev/null @@ -1,3 +0,0 @@ -# Dolibarr language file - Source file is en_US - orders -StatusOrderOnProcessShort=Ordered -StatusOrderOnProcess=Ordered - Standby reception diff --git a/htdocs/langs/es_CO/salaries.lang b/htdocs/langs/es_CO/salaries.lang new file mode 100644 index 00000000000..a0ff0166a6d --- /dev/null +++ b/htdocs/langs/es_CO/salaries.lang @@ -0,0 +1,6 @@ +# Dolibarr language file - Source file is en_US - salaries +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Código contable para pagos de salarios +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Código contable para cargo financiero +THM=Valor de hora promedio +TJM=Valor día promedio +CurrentSalary=Salario actual diff --git a/htdocs/langs/es_CO/trips.lang b/htdocs/langs/es_CO/trips.lang deleted file mode 100644 index b4a068e21c4..00000000000 --- a/htdocs/langs/es_CO/trips.lang +++ /dev/null @@ -1,13 +0,0 @@ -# Dolibarr language file - Source file is en_US - trips -Trip=Expense report -Trips=Expense reports -TripsAndExpenses=Expenses reports -TripsAndExpensesStatistics=Expense reports statistics -TripCard=Expense report card -AddTrip=Create expense report -ListOfTrips=List of expense report -NewTrip=New expense report -DeleteTrip=Delete expense report -ConfirmDeleteTrip=Are you sure you want to delete this expense report ? -ListTripsAndExpenses=List of expense reports -ExpensesArea=Expense reports area diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang index 782efdf26e2..dc4aa2e3948 100644 --- a/htdocs/langs/es_ES/bills.lang +++ b/htdocs/langs/es_ES/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Pagos efectuados PaymentsBackAlreadyDone=Reembolsos ya efectuados PaymentRule=Forma de pago PaymentMode=Forma de pago -PaymentConditions=Condiciones de pago -PaymentConditionsShort=Condiciones pago +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Importe pago ValidatePayment=Validar este pago PaymentHigherThanReminderToPay=Pago superior al resto a pagar diff --git a/htdocs/langs/es_ES/incoterm.lang b/htdocs/langs/es_ES/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/es_ES/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/es_ES/printing.lang b/htdocs/langs/es_ES/printing.lang new file mode 100644 index 00000000000..adaeafcf55d --- /dev/null +++ b/htdocs/langs/es_ES/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Impresión Directa +Module112000Desc=Activa Sistema de Impresión Directa +PrintingSetup=Configuración de la Impresión Directa +PrintingDesc=Este módulo añade un botón para enviar documentos directamente a una impresora (sin abrir documentos en la aplicación) con varios módulos. +ModuleDriverSetup=Configuración del módulo Drivers +PrintingDriverDesc=Configuración variables para el driver de impresión. +ListDrivers=Listado de drivers +PrintTestDesc=Listado de Impresoras. +FileWasSentToPrinter=El archivo %s ha sido enviado a la impresora +NoActivePrintingModuleFound=Sin módulo activo para imprimir documentos +PleaseSelectaDriverfromList=Seleccione un driver del listado. +SetupDriver=Configuración driver +TestDriver=Prueba +TargetedPrinter=Impresora destino +UserConf=Configuración por usuario +PRINTGCP=Google Cloud Print +PrintGCPDesc=Este driver le permite enviar documentos directamente a una impresora con Google Cloud Print. +PrintingDriverDescprintgcp=Configuración variables del driver de impresión Google Cloud Print. +PrintTestDescprintgcp=Listado de impresoras para Google Cloud Print. +PRINTGCP_LOGIN=Cuenta Google +PRINTGCP_PASSWORD=Contraseña Google +STATE_ONLINE=Online +STATE_UNKNOWN=Desconocido +STATE_OFFLINE=Offline +STATE_DORMANT=Desconectada +TYPE_GOOGLE=Google +TYPE_HP=Impresora HP +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Nombre +GCP_displayName=Nombre a mostrar +GCP_Id=Id Impresora +GCP_OwnerName=Nombre del propietario +GCP_State=Estado Impresora +GCP_connectionStatus=Estado Online +GCP_Type=Tipo Impresora +PRINTIPP=Driver PrintIPP +PrintIPPSetup=Configuración del módulo Impresión Directa +PrintIPPDesc=Este módulo añade un botón para enviar documentos directamente a una impresora. Es necesario un SO Linux con CUPS instalado. +PrintingDriverDescprintipp=Configuración variables del driver de impresión PrintIPP +PrintTestDescprintipp=Listado de impresoras del driver PrintIPP. +PRINTIPP_ENABLED=Mostrar icono "Impresión directa" en los listados de documentos +PRINTIPP_HOST=Servidor de Impresión +PRINTIPP_PORT=Puerto +PRINTIPP_USER=Usuario +PRINTIPP_PASSWORD=Contraseña +NoPrinterFound=No se han encontrado impresoras (Compruebe la configuración de su CUPS) +FileWasSentToPrinter=El archivo %s ha sido enviado a la impresora +NoDefaultPrinterDefined=No hay impresora por defecto definida +DefaultPrinter=Impresora por defecto +Printer=Impresora +CupsServer=Servidor CUPS +IPP_Uri=URI Impresora +IPP_Name=Nombre impresora +IPP_State=Estado Impresora +IPP_State_reason=Razón del estado +IPP_State_reason1=Razon 1 del estado +IPP_BW=Blanco y negro +IPP_Color=Color +IPP_Device=Dispositivo +IPP_Media=Comunicación Impresora +IPP_Supported=Tipo de comunicación +STATE_IPP_idle=Idle +STATE_IPP_stopped=Parada +STATE_IPP_paused=Pausada +STATE_IPP_toner-low-report=Toner bajo +STATE_IPP_none=Ninguna +MEDIA_IPP_stationery=Bandeja +MEDIA_IPP_thermal=Térmica +IPP_COLOR_print-black=Impresora Blanco y Negro diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang index b5c4081e1ba..da3e7c8b288 100644 --- a/htdocs/langs/es_ES/projects.lang +++ b/htdocs/langs/es_ES/projects.lang @@ -130,13 +130,15 @@ AddElement=Vincular a elmento UnlinkElement=Desvincular elemento # Documents models DocumentModelBaleine=Modelo de informe de proyecto completo (logo...) -PlannedWorkload = Carga de trabajo prevista -WorkloadOccupation= Porcentaje afectado +PlannedWorkload=Carga de trabajo prevista +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Objetos vinculados SearchAProject=Buscar un proyecto ProjectMustBeValidatedFirst=El proyecto debe validarse primero ProjectDraft=Proyectos borrador FirstAddRessourceToAllocateTime=Asociar un recurso para asignar tiempo consumido -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang index 7fbee469a0a..4ebfb5ad8ec 100644 --- a/htdocs/langs/et_EE/bills.lang +++ b/htdocs/langs/et_EE/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Juba tehtud maksed PaymentsBackAlreadyDone=Juba tehtud tagasimaksed PaymentRule=Maksereegel PaymentMode=Makse liik -PaymentConditions=Maksetähtaeg -PaymentConditionsShort=Maksetähtaeg +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Makse summa ValidatePayment=Kinnita makse PaymentHigherThanReminderToPay=Makse on suurem, kui makstava summa jääk diff --git a/htdocs/langs/et_EE/incoterm.lang b/htdocs/langs/et_EE/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/et_EE/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/et_EE/printing.lang b/htdocs/langs/et_EE/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/et_EE/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang index af73d9b93c7..86d8f546767 100644 --- a/htdocs/langs/et_EE/projects.lang +++ b/htdocs/langs/et_EE/projects.lang @@ -130,13 +130,15 @@ AddElement=Seosta elemendiga UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Täielik projekti aruande mudel (logo jne) -PlannedWorkload = Planeeritav koormus -WorkloadOccupation= Koormus mõjutab +PlannedWorkload=Planeeritav koormus +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Viitavad objektid SearchAProject=Otsi projekti ProjectMustBeValidatedFirst=Esmalt peab projekti kinnitama ProjectDraft=Projektide mustandid FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang index 5ded974ea16..4eb42a057b5 100644 --- a/htdocs/langs/eu_ES/bills.lang +++ b/htdocs/langs/eu_ES/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Jada egindako ordainketak PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Ordainketa mota -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Ordainketaren zenbatekoa ValidatePayment=Ordainketak balioztatu PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/eu_ES/incoterm.lang b/htdocs/langs/eu_ES/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/eu_ES/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/eu_ES/printing.lang b/htdocs/langs/eu_ES/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/eu_ES/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/eu_ES/projects.lang +++ b/htdocs/langs/eu_ES/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang index 90a5b2b6aeb..db80589b564 100644 --- a/htdocs/langs/fa_IR/bills.lang +++ b/htdocs/langs/fa_IR/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=پرداخت از قبل انجام می شود PaymentsBackAlreadyDone=پرداخت به عقب در حال حاضر انجام می شود PaymentRule=قانون پرداخت PaymentMode=نحوه پرداخت -PaymentConditions=مدت پرداخت -PaymentConditionsShort=مدت پرداخت +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=مقدار پرداخت ValidatePayment=اعتبار پرداخت PaymentHigherThanReminderToPay=پرداخت بالاتر از یادآوری به پرداخت diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang index 9ce956f693d..a903fc35967 100644 --- a/htdocs/langs/fa_IR/boxes.lang +++ b/htdocs/langs/fa_IR/boxes.lang @@ -12,6 +12,7 @@ BoxLastProspects=چشم انداز تاریخ و زمان آخرین اصلاح BoxLastCustomers=مشتریان آخرین تغییر BoxLastSuppliers=تامین کنندگان آخرین تغییر BoxLastCustomerOrders=آخرین سفارشات مشتری +BoxLastValidatedCustomerOrders=Last validated customer orders BoxLastBooks=آخرین کتاب ها BoxLastActions=تاریخ و زمان آخرین اقدامات BoxLastContracts=تاریخ و زمان آخرین قرارداد @@ -24,39 +25,42 @@ BoxTotalUnpaidCustomerBills=فاکتورها مجموع مشتری پرداخت BoxTotalUnpaidSuppliersBills=فاکتورها مجموع عرضه کننده کالا پرداخت نشده است BoxTitleLastBooks=تاریخ و زمان آخرین٪ کتاب ثبت BoxTitleNbOfCustomers=تعدادی از مشتریان -BoxTitleLastRssInfos=تاریخ و زمان آخرین٪ خبر از%s -BoxTitleLastProducts=تاریخ و زمان آخرین%s تغییر داده محصولات / خدمات +BoxTitleLastRssInfos=تاریخ و زمان آخرین٪ خبر از٪ s +BoxTitleLastProducts=تاریخ و زمان آخرین٪ s تغییر داده محصولات / خدمات BoxTitleProductsAlertStock=محصولات موجود در انبار هشدار -BoxTitleLastCustomerOrders=تاریخ و زمان آخرین%s را سفارش مشتری تغییر +BoxTitleLastCustomerOrders=Last %s customer orders +BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders BoxTitleLastSuppliers=تاریخ و زمان آخرین٪ بازدید کنندگان تامین کنندگان ثبت BoxTitleLastCustomers=تاریخ و زمان آخرین٪ ثبت مشتریان BoxTitleLastModifiedSuppliers=تاریخ و زمان آخرین٪ بازدید کنندگان تامین کنندگان اصلاح شده BoxTitleLastModifiedCustomers=تاریخ و زمان آخرین٪ مشتریان اصلاح شده -BoxTitleLastCustomersOrProspects=تاریخ و زمان آخرین٪ مشتریان اصلاح و یا چشم انداز -BoxTitleLastPropals=تاریخ و زمان آخرین%s را پیشنهاد ثبت +BoxTitleLastCustomersOrProspects=Last %s customers or prospects +BoxTitleLastPropals=Last %s proposals +BoxTitleLastModifiedPropals=Last %s modified proposals BoxTitleLastCustomerBills=صورت حساب آخرین٪ بازدید کنندگان مشتری +BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices BoxTitleLastSupplierBills=صورت حساب آخرین٪ کننده است -BoxTitleLastProspects=تاریخ و زمان آخرین%s در چشم انداز ثبت -BoxTitleLastModifiedProspects=تاریخ و زمان آخرین%s در چشم انداز تغییر +BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices +BoxTitleLastModifiedProspects=تاریخ و زمان آخرین٪ s در چشم انداز تغییر BoxTitleLastProductsInContract=تاریخ و زمان آخرین٪ محصولات / خدمات در قرارداد -BoxTitleLastModifiedMembers=تاریخ و زمان آخرین٪ اعضای اصلاح شده -BoxTitleLastFicheInter=تاریخ و زمان آخرین%s را مداخله اصلاح شده -BoxTitleOldestUnpaidCustomerBills=فاکتورها قدیمی تر از%s مشتری پرداخت نشده است -BoxTitleOldestUnpaidSupplierBills=فاکتورها قدیمی تر از%s عرضه کننده کالا پرداخت نشده است +BoxTitleLastModifiedMembers=Last %s members +BoxTitleLastFicheInter=تاریخ و زمان آخرین٪ s را مداخله اصلاح شده +BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices +BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices BoxTitleCurrentAccounts=مانده حساب باز است BoxTitleSalesTurnover=گردش مالی فروش -BoxTitleTotalUnpaidCustomerBills=صورت حساب به مشتری پرداخت نشده است -BoxTitleTotalUnpaidSuppliersBills=فاکتورها منبع پرداخت نشده است -BoxTitleLastModifiedContacts=تاریخ و زمان آخرین%s تغییر اطلاعات تماس / آدرس +BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices +BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices +BoxTitleLastModifiedContacts=تاریخ و زمان آخرین٪ s تغییر اطلاعات تماس / آدرس BoxMyLastBookmarks=آخرین٪ من بازدید کنندگان بوک مارک ها BoxOldestExpiredServices=قدیمی تر خدمات منقضی فعال BoxLastExpiredServices=تاریخ و زمان آخرین٪ قدیمی ترین ارتباط با خدمات منقضی فعال -BoxTitleLastActionsToDo=تاریخ و زمان آخرین اقدامات%s را به انجام -BoxTitleLastContracts=تاریخ و زمان آخرین%s در قرارداد +BoxTitleLastActionsToDo=تاریخ و زمان آخرین اقدامات٪ s را به انجام +BoxTitleLastContracts=تاریخ و زمان آخرین٪ s در قرارداد BoxTitleLastModifiedDonations=تاریخ و زمان آخرین٪ بازدید کنندگان کمک های مالی اصلاح شده -BoxTitleLastModifiedExpenses=تاریخ و زمان آخرین%s در هزینه های اصلاح شده +BoxTitleLastModifiedExpenses=تاریخ و زمان آخرین٪ s در هزینه های اصلاح شده BoxGlobalActivity=فعالیت های جهانی (فاکتورها، پیشنهادات، سفارشات) -FailedToRefreshDataInfoNotUpToDate=به روز کردن شار RSS شکست خورده است. آخرین تاریخ تازه کردن موفق:%s را +FailedToRefreshDataInfoNotUpToDate=به روز کردن شار RSS شکست خورده است. آخرین تاریخ تازه کردن موفق:٪ s را LastRefreshDate=آخرین تاریخ تازه کردن NoRecordedBookmarks=بدون بوک مارک ها تعریف شده است. ClickToAdd=برای اضافه کردن اینجا کلیک کنید. @@ -65,8 +69,8 @@ NoRecordedContacts=بدون اطلاعات تماس ثبت NoActionsToDo=هیچ عملیاتی برای انجام NoRecordedOrders=سفارشات بدون مشتری ثبت شده است NoRecordedProposals=هیچ طرح ثبت -NoRecordedInvoices=فاکتورها هیچ مشتری ثبت شده است -NoUnpaidCustomerBills=فاکتورها هیچ مشتری پرداخت نشده است +NoRecordedInvoices=فاکتورهای هیچ مشتری ثبت شده است +NoUnpaidCustomerBills=فاکتورهای هیچ مشتری پرداخت نشده است NoRecordedSupplierInvoices=فاکتورها بدون منبع ثبت در NoUnpaidSupplierBills=فاکتورها بدون منبع پرداخت نشده است NoModifiedSupplierBills=فاکتورها بدون منبع ثبت در @@ -76,7 +80,8 @@ NoContractedProducts=محصولات / خدمات قرارداد NoRecordedContracts=بدون قرارداد ثبت NoRecordedInterventions=بدون مداخلات ثبت BoxLatestSupplierOrders=آخرین سفارشات کالا -BoxTitleLatestSupplierOrders=٪ آخرین سفارشات کالا +BoxTitleLatestSupplierOrders=Last %s supplier orders +BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders NoSupplierOrder=بدون منظور عرضه کننده کالا ثبت BoxCustomersInvoicesPerMonth=صورت حساب به مشتری در هر ماه BoxSuppliersInvoicesPerMonth=فاکتورها منبع در هر ماه @@ -85,7 +90,7 @@ BoxSuppliersOrdersPerMonth=سفارشات تامین کننده در هر ماه BoxProposalsPerMonth=پیشنهادات در هر ماه NoTooLowStockProducts=هیچ محصولی در زیر حد سهام کم BoxProductDistribution=محصولات / خدمات توزیع -BoxProductDistributionFor=توزیع از%s را برای%s +BoxProductDistributionFor=توزیع از٪ s را برای٪ s ForCustomersInvoices=مشتریان فاکتورها ForCustomersOrders=سفارشات مشتریان ForProposals=پیشنهادات diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang index 427073d5f48..d220bfe612d 100644 --- a/htdocs/langs/fa_IR/categories.lang +++ b/htdocs/langs/fa_IR/categories.lang @@ -108,5 +108,5 @@ ExtraFieldsCategories=ویژگی های مکمل CategoriesSetup=شاخه ها راه اندازی CategorieRecursiv=پیوند با گروه پدر و مادر به طور خودکار CategorieRecursivHelp=اگر فعال شود، محصول نیز به دسته پدر و مادر مرتبط است که با اضافه کردن به زیرشاخه -AddProductServiceIntoCategory=Add the following product/service -ShowCategory=Show category +AddProductServiceIntoCategory=افزودن پیگیری محصول/سرویس +ShowCategory=نمایش دسته diff --git a/htdocs/langs/fa_IR/deliveries.lang b/htdocs/langs/fa_IR/deliveries.lang index b2526f06e6b..80465cb4b4e 100644 --- a/htdocs/langs/fa_IR/deliveries.lang +++ b/htdocs/langs/fa_IR/deliveries.lang @@ -12,7 +12,7 @@ SetDeliveryDate=تنظیم تاریخ حمل و نقل ValidateDeliveryReceipt=اعتبارسنجی رسید تحویل ValidateDeliveryReceiptConfirm=آیا مطمئن هستید که می خواهید به اعتبار این رسید تحویل؟ DeleteDeliveryReceipt=حذف رسید تحویل -DeleteDeliveryReceiptConfirm=آیا مطمئن هستید که می خواهید تحویل رسید از%s را حذف کنید؟ +DeleteDeliveryReceiptConfirm=آیا مطمئن هستید که می خواهید تحویل رسید از٪ s را حذف کنید؟ DeliveryMethod=روش تحویل TrackingNumber=تعداد پیگیری DeliveryNotValidated=تحویل اعتبار نیست @@ -24,3 +24,5 @@ Deliverer=منجی: Sender=فرستنده Recipient=دریافت کننده ErrorStockIsNotEnough=این سهام به اندازه کافی وجود ندارد +Shippable=حمل و نقلی +NonShippable=حمل و نقلی نیست diff --git a/htdocs/langs/fa_IR/incoterm.lang b/htdocs/langs/fa_IR/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/fa_IR/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/fa_IR/printing.lang b/htdocs/langs/fa_IR/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/fa_IR/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang index 0e685cffc26..efcea608be1 100644 --- a/htdocs/langs/fa_IR/projects.lang +++ b/htdocs/langs/fa_IR/projects.lang @@ -130,13 +130,15 @@ AddElement=لینک به عنصر UnlinkElement=Unlink element # Documents models DocumentModelBaleine=مدل گزارش یک پروژه کامل (logo. ..) -PlannedWorkload = حجم کار برنامه ریزی شده -WorkloadOccupation= تظاهر حجم کار +PlannedWorkload=حجم کار برنامه ریزی شده +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=مراجعه اشیاء SearchAProject=جستجوی یک پروژه ProjectMustBeValidatedFirst=پروژه ابتدا باید معتبر باشد ProjectDraft=پروژه های پیش نویس FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang index 01bdc48e34e..e8d2f7c5646 100644 --- a/htdocs/langs/fi_FI/bills.lang +++ b/htdocs/langs/fi_FI/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Maksut jo PaymentsBackAlreadyDone=Payments back already done PaymentRule=Maksu sääntö PaymentMode=Maksutapa -PaymentConditions=Maksuaika -PaymentConditionsShort=Maksuaika +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Maksusumma ValidatePayment=Vahvista maksu PaymentHigherThanReminderToPay=Maksu korkeampi kuin muistutus maksaa diff --git a/htdocs/langs/fi_FI/incoterm.lang b/htdocs/langs/fi_FI/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/fi_FI/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/fi_FI/printing.lang b/htdocs/langs/fi_FI/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/fi_FI/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang index 3772988a48c..bb52a53a1b6 100644 --- a/htdocs/langs/fi_FI/projects.lang +++ b/htdocs/langs/fi_FI/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Täydellinen hankkeen tarkastusraportin malli (logo. ..) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 1956ca025be..255838cede3 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Versements déjà effectués PaymentsBackAlreadyDone=Remboursements déjà effectués PaymentRule=Mode de paiement PaymentMode=Mode de règlement -PaymentConditions=Conditions de règlement -PaymentConditionsShort=Conditions règlement +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Montant règlement ValidatePayment=Valider ce règlement PaymentHigherThanReminderToPay=Règlement supérieur au reste à payer diff --git a/htdocs/langs/fr_FR/incoterm.lang b/htdocs/langs/fr_FR/incoterm.lang index 9b01dcaa46e..5706403aec3 100644 --- a/htdocs/langs/fr_FR/incoterm.lang +++ b/htdocs/langs/fr_FR/incoterm.lang @@ -4,4 +4,4 @@ IncotermLabel=Incoterms IncotermSetupTitle1=Fonction IncotermSetupTitle2=État IncotermSetup=Configuration du module Incoterm -IncotermFunctionDesc=Activer la fonction Incoterm (Société, Proposition comercial, Commande, Facture, Expédition, Livraison, Commande fournisseur) \ No newline at end of file +IncotermFunctionDesc=Activer la fonction Incoterm (Société, Proposition comercial, Commande, Facture, Expédition, Livraison, Commande fournisseur) diff --git a/htdocs/langs/fr_FR/printing.lang b/htdocs/langs/fr_FR/printing.lang new file mode 100644 index 00000000000..b65b22a5659 --- /dev/null +++ b/htdocs/langs/fr_FR/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Impressions Directe +Module112000Desc=Activer le système d'impression Directe +PrintingSetup=Réglages du module Impression Directe +PrintingDesc=Ce module ajoute un bouton Imprimer afin d'envoyer directement les documents à une imprimante (sans ouvrir le document dans une application). +ModuleDriverSetup=Configuration des drivers impression +PrintingDriverDesc=Paramètres de configuration pour le driver d'impression +ListDrivers=Liste des drivers +PrintTestDesc=Liste des imprimantes +FileWasSentToPrinter=Le fichier %s a été envoyé à l'imprimante +NoActivePrintingModuleFound=Pas de module actif pour imprimer le document +PleaseSelectaDriverfromList=Sélection un driver dans la liste +SetupDriver=Configuration du driver +TestDriver=Test +TargetedPrinter=Imprimante cible +UserConf=Configuration par utilisateur +PRINTGCP=Impression Google Cloud Print +PrintGCPDesc=Ce driver permet d'envoyer des documents directement à l'imprimante via Google Cloud Print +PrintingDriverDescprintgcp=Paramètres de configuration pour l'impression Google Cloud Print +PrintTestDescprintgcp=Liste des imprimantes pour Google Cloud Print +PRINTGCP_LOGIN=Compte login google +PRINTGCP_PASSWORD=Mot de passe compte Google +STATE_ONLINE=En ligne +STATE_UNKNOWN=Inconnu +STATE_OFFLINE=Hors ligne +STATE_DORMANT=Hors ligne +TYPE_GOOGLE=Google +TYPE_HP=Imprimante HP +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Nom +GCP_displayName=Nom affiché +GCP_Id=Id imprimante +GCP_OwnerName=Nom propriétaire +GCP_State=Etat imprimante +GCP_connectionStatus=Etats en ligne +GCP_Type=Type d'imprimante +PRINTIPP=Driver PrintIPP +PrintIPPSetup=Configuration du module d'Impression Directe +PrintIPPDesc=Ce driver permet d'envoyer les documents directement à une imprimante. Il requiert un système Linux avec CUPS installé. +PrintingDriverDescprintipp=Paramètres de configuration pour l'impressions par le driver PrintIPP +PrintTestDescprintipp=Liste des imprimantes du driver PrintIPP +PRINTIPP_ENABLED=Afficher l'icône « Impression directe » dans les listes de documents +PRINTIPP_HOST=Serveur d'impression +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Mot de passe +NoPrinterFound=Aucune imprimante trouvée (vérifiez votre configuration CUPS) +FileWasSentToPrinter=Le fichier %s a été envoyé à l'imprimante +NoDefaultPrinterDefined=Il n'y a pas d'imprimante définie par défaut +DefaultPrinter=Imprimante par défaut +Printer=Imprimante +CupsServer=Serveur CUPS +IPP_Uri=Uri imprimante +IPP_Name=Nom imprimante +IPP_State=Etat imprimante +IPP_State_reason=Motif état +IPP_State_reason1=Motif état1 +IPP_BW=Black and White +IPP_Color=Couleur +IPP_Device=Dispositif +IPP_Media=Média d'impression +IPP_Supported=Type de média +STATE_IPP_idle=En attente +STATE_IPP_stopped=Stoppé +STATE_IPP_paused=En pause +STATE_IPP_toner-low-report=Toner faible +STATE_IPP_none=Aucune +MEDIA_IPP_stationery=En attente +MEDIA_IPP_thermal=Température +IPP_COLOR_print-black=Imprimante NB diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang index 08d2436c16e..65575fd5ce8 100644 --- a/htdocs/langs/fr_FR/projects.lang +++ b/htdocs/langs/fr_FR/projects.lang @@ -71,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet ListContractAssociatedProject=Liste des contrats associés au projet ListFichinterAssociatedProject=Liste des interventions associées au projet -ListExpenseReportsAssociatedProject=List of expense reports associated with the project +ListExpenseReportsAssociatedProject=Liste des notes de frais associées avec ce projet ListActionsAssociatedProject=Liste des événements associés au projet ActivityOnProjectThisWeek=Activité sur les projets cette semaine ActivityOnProjectThisMonth=Activité sur les projets ce mois @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Délier l'élément # Documents models DocumentModelBaleine=Modèle de rapport de projet complet (logo...) -PlannedWorkload = Charge de travail prévue -WorkloadOccupation= Pourcentage affectation +PlannedWorkload=Charge de travail prévue +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Objets associés SearchAProject=Rechercher un projet ProjectMustBeValidatedFirst=Le projet doit être validé d'abord ProjectDraft=Projets brouillons FirstAddRessourceToAllocateTime=Ajouter une ressource pour pouvoir allouer tu temps -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang index 0a1e1ef5d5d..28559d91fa7 100644 --- a/htdocs/langs/he_IL/bills.lang +++ b/htdocs/langs/he_IL/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/he_IL/incoterm.lang b/htdocs/langs/he_IL/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/he_IL/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/he_IL/printing.lang b/htdocs/langs/he_IL/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/he_IL/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang index 31faca7c515..31eba8b830a 100644 --- a/htdocs/langs/he_IL/projects.lang +++ b/htdocs/langs/he_IL/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang index 784462c316b..fbc13f66546 100644 --- a/htdocs/langs/hr_HR/bills.lang +++ b/htdocs/langs/hr_HR/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Izvršena plaćanja PaymentsBackAlreadyDone=Izvršeni povrati plaćanja PaymentRule=Pravilo plaćanja PaymentMode=Oblik plaćanja -PaymentConditions=Rok plaćanja -PaymentConditionsShort=Rok plaćanja +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Iznos plaćanja ValidatePayment=Ovjeri plaćanje PaymentHigherThanReminderToPay=Plaćanje je veće nego podsjetnik za plaćanje diff --git a/htdocs/langs/hr_HR/incoterm.lang b/htdocs/langs/hr_HR/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/hr_HR/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/hr_HR/printing.lang b/htdocs/langs/hr_HR/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/hr_HR/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang index 58ef04b2e35..9c5fecce3da 100644 --- a/htdocs/langs/hr_HR/projects.lang +++ b/htdocs/langs/hr_HR/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang index 5eca0e94b49..682a36e4fde 100644 --- a/htdocs/langs/hu_HU/bills.lang +++ b/htdocs/langs/hu_HU/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Kifizetések már megtette PaymentsBackAlreadyDone=Payments back already done PaymentRule=Fizetési szabály PaymentMode=Fizetési típus -PaymentConditions=Fizetési határidő -PaymentConditionsShort=Fizetési határidő +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Fizetés összege ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Fizetési magasabb emlékeztető fizetni diff --git a/htdocs/langs/hu_HU/incoterm.lang b/htdocs/langs/hu_HU/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/hu_HU/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/hu_HU/printing.lang b/htdocs/langs/hu_HU/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/hu_HU/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang index 085c0f39bc5..75518a0bc42 100644 --- a/htdocs/langs/hu_HU/projects.lang +++ b/htdocs/langs/hu_HU/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Teljes jelentés modell (logo, ...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang index 0aff57599da..27b0443877e 100644 --- a/htdocs/langs/id_ID/bills.lang +++ b/htdocs/langs/id_ID/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Pembayaran - pembayaran yang sudah selesai PaymentsBackAlreadyDone=Pembayaran - pembayaran kembali yang sudah selesai PaymentRule=Aturan pembayaran PaymentMode=Jenis pembayaran -PaymentConditions=Ketentuan pembayaran -PaymentConditionsShort=Ketentuan pembayaran +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Jumlah pembayaran ValidatePayment=Validasi pembayaran PaymentHigherThanReminderToPay=Pengingat untuk pembayaran yang lebih tinggi diff --git a/htdocs/langs/id_ID/incoterm.lang b/htdocs/langs/id_ID/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/id_ID/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/id_ID/printing.lang b/htdocs/langs/id_ID/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/id_ID/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/id_ID/projects.lang +++ b/htdocs/langs/id_ID/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang index 40a85a7a31f..2da4c4085f7 100644 --- a/htdocs/langs/is_IS/bills.lang +++ b/htdocs/langs/is_IS/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Greiðslur gert þegar PaymentsBackAlreadyDone=Payments back already done PaymentRule=Greiðsla regla PaymentMode=Greiðslumáti -PaymentConditions=Greiðsla orð -PaymentConditionsShort=Greiðsla orð +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Upphæð greiðslu ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Greiðsla hærri en áminning að borga diff --git a/htdocs/langs/is_IS/incoterm.lang b/htdocs/langs/is_IS/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/is_IS/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/is_IS/printing.lang b/htdocs/langs/is_IS/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/is_IS/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang index ee5af4c6a48..f8426bd2033 100644 --- a/htdocs/langs/is_IS/projects.lang +++ b/htdocs/langs/is_IS/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=skýrslu lýkur verkefninu er líkan (logo. ..) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang index 62ab683bd6e..451631b87a7 100644 --- a/htdocs/langs/it_IT/bills.lang +++ b/htdocs/langs/it_IT/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Pagamenti già fatti PaymentsBackAlreadyDone=Rimborso già effettuato PaymentRule=Regola pagamento PaymentMode=Tipo di pagamento -PaymentConditions=Termine di pagamento -PaymentConditionsShort=Ter. di pagamento +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Importo del pagamento ValidatePayment=Convalidare questo pagamento? PaymentHigherThanReminderToPay=Pagamento superiore alla rimanenza da pagare diff --git a/htdocs/langs/it_IT/incoterm.lang b/htdocs/langs/it_IT/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/it_IT/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/it_IT/printing.lang b/htdocs/langs/it_IT/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/it_IT/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang index ce4d893f0fd..8520ba26e37 100644 --- a/htdocs/langs/it_IT/projects.lang +++ b/htdocs/langs/it_IT/projects.lang @@ -130,13 +130,15 @@ AddElement=Link all'elemento UnlinkElement=Rimuovi collegamento # Documents models DocumentModelBaleine=Modello per il report di un progetto completo (logo, etc..) -PlannedWorkload = Carico di lavoro previsto -WorkloadOccupation= Carico di lavoro supposto +PlannedWorkload=Carico di lavoro previsto +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Elementi correlati SearchAProject=Cerca un progetto ProjectMustBeValidatedFirst=I progetti devono prima essere validati ProjectDraft=Progetti bozza FirstAddRessourceToAllocateTime=Associa una risorsa per allocare il tempo -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang index f27ee25bc1a..0fcd2a7fcc2 100644 --- a/htdocs/langs/ja_JP/bills.lang +++ b/htdocs/langs/ja_JP/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=支払いがすでに行わ PaymentsBackAlreadyDone=Payments back already done PaymentRule=支払いルール PaymentMode=お支払い方法の種類 -PaymentConditions=支払期間 -PaymentConditionsShort=支払期間 +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=支払金額 ValidatePayment=Validate payment PaymentHigherThanReminderToPay=支払うために思い出させるよりも高い支払い diff --git a/htdocs/langs/ja_JP/incoterm.lang b/htdocs/langs/ja_JP/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/ja_JP/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/ja_JP/printing.lang b/htdocs/langs/ja_JP/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/ja_JP/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang index 0011d0ab801..92c233d9feb 100644 --- a/htdocs/langs/ja_JP/projects.lang +++ b/htdocs/langs/ja_JP/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=完全なプロジェクトのレポートモデル（logo. ..） -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang index 7232f00e91c..69e1510ca44 100644 --- a/htdocs/langs/ka_GE/bills.lang +++ b/htdocs/langs/ka_GE/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/ka_GE/incoterm.lang b/htdocs/langs/ka_GE/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/ka_GE/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/ka_GE/printing.lang b/htdocs/langs/ka_GE/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/ka_GE/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/ka_GE/projects.lang +++ b/htdocs/langs/ka_GE/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang index 7232f00e91c..69e1510ca44 100644 --- a/htdocs/langs/kn_IN/bills.lang +++ b/htdocs/langs/kn_IN/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/kn_IN/incoterm.lang b/htdocs/langs/kn_IN/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/kn_IN/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/kn_IN/printing.lang b/htdocs/langs/kn_IN/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/kn_IN/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/kn_IN/projects.lang +++ b/htdocs/langs/kn_IN/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang index 7232f00e91c..69e1510ca44 100644 --- a/htdocs/langs/ko_KR/bills.lang +++ b/htdocs/langs/ko_KR/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/ko_KR/incoterm.lang b/htdocs/langs/ko_KR/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/ko_KR/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/ko_KR/printing.lang b/htdocs/langs/ko_KR/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/ko_KR/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/ko_KR/projects.lang +++ b/htdocs/langs/ko_KR/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang index 7232f00e91c..69e1510ca44 100644 --- a/htdocs/langs/lo_LA/bills.lang +++ b/htdocs/langs/lo_LA/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/lo_LA/incoterm.lang b/htdocs/langs/lo_LA/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/lo_LA/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/lo_LA/printing.lang b/htdocs/langs/lo_LA/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/lo_LA/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/lo_LA/projects.lang +++ b/htdocs/langs/lo_LA/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang index 109f690c9e9..aafc8302888 100644 --- a/htdocs/langs/lt_LT/bills.lang +++ b/htdocs/langs/lt_LT/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Jau atlikti mokėjimai PaymentsBackAlreadyDone=Jau atlikti mokėjimai atgal (grąžinimai) PaymentRule=Mokėjimo taisyklė PaymentMode=Mokėjimo būdas -PaymentConditions=Mokėjimo terminas -PaymentConditionsShort=Mokėjimo terminas +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Mokėjimo suma ValidatePayment=Mokėjimą pripažinti galiojančiu PaymentHigherThanReminderToPay=Mokėjimas svarbesnis už priminimą sumokėti diff --git a/htdocs/langs/lt_LT/incoterm.lang b/htdocs/langs/lt_LT/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/lt_LT/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/lt_LT/printing.lang b/htdocs/langs/lt_LT/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/lt_LT/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang index ad5077bc7b4..571dc0007cc 100644 --- a/htdocs/langs/lt_LT/projects.lang +++ b/htdocs/langs/lt_LT/projects.lang @@ -130,13 +130,15 @@ AddElement=Susieti su elementu UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Pilnas projekto ataskaitos modelis (logo. ..) -PlannedWorkload = Planuojamas darbo krūvis -WorkloadOccupation= Darbo krūvio paskirtis +PlannedWorkload=Planuojamas darbo krūvis +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Nurodomi objektai SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang index b1e121979c8..5cfd0de415e 100644 --- a/htdocs/langs/lv_LV/admin.lang +++ b/htdocs/langs/lv_LV/admin.lang @@ -8,9 +8,9 @@ VersionExperimental=Eksperimentāls VersionDevelopment=Attīstība VersionUnknown=Nezināms VersionRecommanded=Ieteicams -FileCheck=Files Integrity -FilesMissing=Missing Files -FilesUpdated=Updated Files +FileCheck=Failu veselums +FilesMissing=Trūkstošie faili +FilesUpdated=Atjaunotie faili FileCheckDolibarr=Check Dolibarr Files Integrity XmlNotFound=Xml File of Dolibarr Integrity Not Found SessionId=Sesijas ID @@ -1436,7 +1436,7 @@ SendingsReceiptModel=Nosūtot saņemšanas modeli SendingsNumberingModules=Sendings numerācijas moduļus SendingsAbility=Support shipment sheets for customer deliveries NoNeedForDeliveryReceipts=Vairumā gadījumu, sendings ieņēmumi tiek izmantoti gan kā loksnes klientu piegādēm (produktu sarakstu, lai nosūtītu) un loksnes, kas tiek recevied un paraksta klientu. Tātad produkta piegādes kvītis ir dublēta iezīme, un reti aktivizēts. -FreeLegalTextOnShippings=Free text on shipments +FreeLegalTextOnShippings=Brīvais teksts piegādēs ##### Deliveries ##### DeliveryOrderNumberingModules=Produkti piegādes kvīts numerācija modulis DeliveryOrderModel=Produkti piegādes kvīts modelis @@ -1553,7 +1553,7 @@ BankOrderESDesc=Spāņu displejs, lai ##### Multicompany ##### MultiCompanySetup=Multi-kompānija modulis iestatīšana ##### Suppliers ##### -SuppliersSetup=Piegādātājs modulis uzstādīšana +SuppliersSetup=Piegādātāja moduļa iestatījumi SuppliersCommandModel=Pilnīga veidni no piegādātāja secībā (logo. ..) SuppliersInvoiceModel=Pilnīga veidni no piegādātāja rēķina (logo. ..) SuppliersInvoiceNumberingModel=Piegādātāju rēķinu numerācijas modeļus diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang index 4216d9f6a05..cf62660e3df 100644 --- a/htdocs/langs/lv_LV/bills.lang +++ b/htdocs/langs/lv_LV/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Jau samaksāts PaymentsBackAlreadyDone=Maksājumi atpakaļ izdarījušas PaymentRule=Maksājuma noteikums PaymentMode=Maksājuma veids -PaymentConditions=Maksājuma noteikumi -PaymentConditionsShort=Maksājuma noteikumi +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Maksājuma summa ValidatePayment=Apstiprināt maksājumu PaymentHigherThanReminderToPay=Maksājumu augstāka nekā atgādinājums par samaksu diff --git a/htdocs/langs/lv_LV/incoterm.lang b/htdocs/langs/lv_LV/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/lv_LV/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/lv_LV/printing.lang b/htdocs/langs/lv_LV/printing.lang new file mode 100644 index 00000000000..7ca777ca34e --- /dev/null +++ b/htdocs/langs/lv_LV/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printeris +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Nosaukums +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Īpašnieka nosaukums +GCP_State=Printera statuss +GCP_connectionStatus=Online State +GCP_Type=Printera tips +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Ports +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Parole +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Noklusējuma printeris +Printer=Printeris +CupsServer=CUPS Serveris +IPP_Uri=Printer Uri +IPP_Name=Printera nosaukums +IPP_State=Printera statuss +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=Melnbalts +IPP_Color=Krāsainais +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang index bc4ff4c3057..975654740b1 100644 --- a/htdocs/langs/lv_LV/projects.lang +++ b/htdocs/langs/lv_LV/projects.lang @@ -130,13 +130,15 @@ AddElement=Saite uz elementu UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Pilnīgu projekta ziņojums modelis (logo. ..) -PlannedWorkload = Plānotais darba apjoms -WorkloadOccupation= Darba slodze izlikšanās +PlannedWorkload=Plānotais darba apjoms +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Atsaucoties objekti SearchAProject=Meklēt projektu ProjectMustBeValidatedFirst=Projektu vispirms jāpārbauda ProjectDraft=Melnraksta projekts FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang index 7232f00e91c..69e1510ca44 100644 --- a/htdocs/langs/mk_MK/bills.lang +++ b/htdocs/langs/mk_MK/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/mk_MK/incoterm.lang b/htdocs/langs/mk_MK/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/mk_MK/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/mk_MK/printing.lang b/htdocs/langs/mk_MK/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/mk_MK/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/mk_MK/projects.lang +++ b/htdocs/langs/mk_MK/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang index db2883bb788..510cc00557a 100644 --- a/htdocs/langs/nb_NO/bills.lang +++ b/htdocs/langs/nb_NO/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Betalinger allerede utført PaymentsBackAlreadyDone=Tilbakebetalinger allerede utført PaymentRule=Betalingsregel PaymentMode=Betalingsmåte -PaymentConditions=Betalingsbetingelser -PaymentConditionsShort=Betalingsbetingelser +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Beløp til betaling ValidatePayment=Godkjenn betaling PaymentHigherThanReminderToPay=Betalingen er høyere enn restbeløp diff --git a/htdocs/langs/nb_NO/incoterm.lang b/htdocs/langs/nb_NO/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/nb_NO/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/nb_NO/printing.lang b/htdocs/langs/nb_NO/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/nb_NO/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang index 86f6159f0fa..e1ca6e4c987 100644 --- a/htdocs/langs/nb_NO/projects.lang +++ b/htdocs/langs/nb_NO/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Koble fra element # Documents models DocumentModelBaleine=En komplett prosjektets rapport modell (logo. ..) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang index 1f75b981c62..2b5abd111e8 100644 --- a/htdocs/langs/nl_NL/bills.lang +++ b/htdocs/langs/nl_NL/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Betalingen gedaan PaymentsBackAlreadyDone=Terugbetaling al gedaan PaymentRule=Betalingsvoorwaarde PaymentMode=Betalingstype -PaymentConditions=Betalingstermijn -PaymentConditionsShort=Betalingstermijn +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Betalingsbedrag ValidatePayment=Valideer deze betaling PaymentHigherThanReminderToPay=Betaling hoger dan herinnering te betalen diff --git a/htdocs/langs/nl_NL/incoterm.lang b/htdocs/langs/nl_NL/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/nl_NL/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/nl_NL/printing.lang b/htdocs/langs/nl_NL/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/nl_NL/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang index e242d88716f..74ddfd7837e 100644 --- a/htdocs/langs/nl_NL/projects.lang +++ b/htdocs/langs/nl_NL/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Een compleet projectrapportagemodel (logo, etc) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang index 0d11b2c8bf0..094cf87680e 100644 --- a/htdocs/langs/pl_PL/bills.lang +++ b/htdocs/langs/pl_PL/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Płatności już PaymentsBackAlreadyDone=Payments back already done PaymentRule=Zasady płatności PaymentMode=Typ płatności -PaymentConditions=Termin płatności -PaymentConditionsShort=Termin płatności +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Kwota płatności ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Płatności wyższe niż upomnienie do zapłaty diff --git a/htdocs/langs/pl_PL/incoterm.lang b/htdocs/langs/pl_PL/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/pl_PL/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang index 1bd9519089d..7894486a1c6 100644 --- a/htdocs/langs/pl_PL/interventions.lang +++ b/htdocs/langs/pl_PL/interventions.lang @@ -3,7 +3,7 @@ Intervention=Interwencja Interventions=Interwencje InterventionCard=Interwencja karty NewIntervention=Nowa interwencja -AddIntervention=Create intervention +AddIntervention=Tworzenie interwencji ListOfInterventions=Wykaz interwencji EditIntervention=Editer interwencji ActionsOnFicheInter=Działania w zakresie interwencji @@ -23,22 +23,22 @@ ConfirmDeleteInterventionLine=Czy na pewno chcesz usunąć tę linię interwencj NameAndSignatureOfInternalContact=Nazwisko i podpis interwencji: NameAndSignatureOfExternalContact=Nazwisko i podpis klienta: DocumentModelStandard=Model standardowy dokument dla interwencji -InterventionCardsAndInterventionLines=Interventions and lines of interventions -InterventionClassifyBilled=Classify "Billed" -InterventionClassifyUnBilled=Classify "Unbilled" +InterventionCardsAndInterventionLines=Interwencje i kierunki interwencji +InterventionClassifyBilled=Sklasyfikować "Rozlicz" +InterventionClassifyUnBilled=Sklasyfikować "Unbilled" StatusInterInvoiced=Zapowiadane RelatedInterventions=Podobne interwencje ShowIntervention=Pokaż interwencji -SendInterventionRef=Submission of intervention %s -SendInterventionByMail=Send intervention by Email -InterventionCreatedInDolibarr=Intervention %s created -InterventionValidatedInDolibarr=Intervention %s validated -InterventionModifiedInDolibarr=Intervention %s modified -InterventionClassifiedBilledInDolibarr=Intervention %s set as billed -InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled -InterventionSentByEMail=Intervention %s sent by EMail -InterventionDeletedInDolibarr=Intervention %s deleted -SearchAnIntervention=Search an intervention +SendInterventionRef=Złożenie interwencyjnego% s +SendInterventionByMail=Wyślij interwencji przez e-mail +InterventionCreatedInDolibarr=% S tworzone interwencji +InterventionValidatedInDolibarr=% Interwencja s zatwierdzone +InterventionModifiedInDolibarr=% S zmodyfikowano interwencji +InterventionClassifiedBilledInDolibarr=% Interwencyjnej s zestaw jako rozliczane +InterventionClassifiedUnbilledInDolibarr=% Interwencyjnej s zestaw jako weryfikowane +InterventionSentByEMail=% Interwencja y wysyłane e-mailem +InterventionDeletedInDolibarr=% Interwencja s usunięte +SearchAnIntervention=Szukaj interwencji ##### Types de contacts ##### TypeContact_fichinter_internal_INTERREPFOLL=Przedstawiciela w ślad za interwencję TypeContact_fichinter_internal_INTERVENING=Interwencja @@ -49,5 +49,5 @@ ArcticNumRefModelDesc1=Generic numer modelu ArcticNumRefModelError=Nie można włączyć PacificNumRefModelDesc1=Wróć NUMERO z formatu %syymm rr-nnnn gdzie jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0 PacificNumRefModelError=Interwencja karty zaczynające się od $ syymm już istnieje i nie jest kompatybilne z tym modelem sekwencji. Usuń go lub zmienić jego nazwę, aby włączyć ten moduł. -PrintProductsOnFichinter=Print products on intervention card -PrintProductsOnFichinterDetails=forinterventions generated from orders +PrintProductsOnFichinter=Drukarnie na karcie interwencyjną +PrintProductsOnFichinterDetails=forinterventions wygenerowane z zamówień diff --git a/htdocs/langs/pl_PL/mailmanspip.lang b/htdocs/langs/pl_PL/mailmanspip.lang index 4df2bf08bde..d5113dc6507 100644 --- a/htdocs/langs/pl_PL/mailmanspip.lang +++ b/htdocs/langs/pl_PL/mailmanspip.lang @@ -1,27 +1,27 @@ # Dolibarr language file - Source file is en_US - mailmanspip -# MailmanSpipSetup=Mailman and SPIP module Setup -# MailmanTitle=Mailman mailing list system -# TestSubscribe=To test subscription to Mailman lists -# TestUnSubscribe=To test unsubscribe from Mailman lists -# MailmanCreationSuccess=Subscription test was executed succesfully -# MailmanDeletionSuccess=Unsubscription test was executed succesfully -# SynchroMailManEnabled=A Mailman update will be performed -# SynchroSpipEnabled=A Spip update will be performed -# DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password -# DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions -# DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions -# DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma) -# SPIPTitle=SPIP Content Management System -# DescADHERENT_SPIP_SERVEUR=SPIP Server -# DescADHERENT_SPIP_DB=SPIP database name -# DescADHERENT_SPIP_USER=SPIP database login -# DescADHERENT_SPIP_PASS=SPIP database password -# AddIntoSpip=Add into SPIP -# AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP? -# AddIntoSpipError=Failed to add the user in SPIP -# DeleteIntoSpip=Remove from SPIP -# DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP? -# DeleteIntoSpipError=Failed to suppress the user from SPIP -# SPIPConnectionFailed=Failed to connect to SPIP -# SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done -# SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done +MailmanSpipSetup=Listonosz i SPIP Konfiguracja modułu +MailmanTitle=Lista System listonosz pocztowy +TestSubscribe=Aby przetestować subskrypcji Liste list +TestUnSubscribe=Aby przetestować wypisać się z listy Liste +MailmanCreationSuccess=Subskrypcja Badanie zostało wykonane pomyślnie +MailmanDeletionSuccess=Badanie zostało zrealizowane pomyślnie wypisania +SynchroMailManEnabled=Listonosz aktualizacja zostanie przeprowadzona +SynchroSpipEnabled=Aktualizacja zostanie wykonana Spip +DescADHERENT_MAILMAN_ADMINPW=Listonosz hasło administratora +DescADHERENT_MAILMAN_URL=Adres do subskrypcji Liste +DescADHERENT_MAILMAN_UNSUB_URL=URL Liste unsubscriptions +DescADHERENT_MAILMAN_LISTS=Lista (y) do automatycznego napisem nowych członków (oddzielone przecinkiem) +SPIPTitle=Content Management System SPIP +DescADHERENT_SPIP_SERVEUR=SPIP Server +DescADHERENT_SPIP_DB=Nazwa bazy danych SPIP +DescADHERENT_SPIP_USER=SPIP logowania bazy danych +DescADHERENT_SPIP_PASS=Hasło bazy danych SPIP +AddIntoSpip=Dodaj do SPIP +AddIntoSpipConfirmation=Czy na pewno chcesz dodać ten element do SPIP? +AddIntoSpipError=Nie udało się dodać użytkownika w SPIP +DeleteIntoSpip=Usuń z SPIP +DeleteIntoSpipConfirmation=Czy na pewno chcesz usunąć ten element z SPIP? +DeleteIntoSpipError=Nie udało się stłumić użytkownika z SPIP +SPIPConnectionFailed=Nie można połączyć się SPIP +SuccessToAddToMailmanList=Dodaj %s do %s listonosz listy lub bazy danych SPIP wykonanej +SuccessToRemoveToMailmanList=Usuwanie %s z %s listonosz listy lub bazy danych SPIP zrobić diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang index d1a930134f5..634c2963f93 100644 --- a/htdocs/langs/pl_PL/mails.lang +++ b/htdocs/langs/pl_PL/mails.lang @@ -43,10 +43,10 @@ MailingStatusSentCompletely=Wysłane całkowicie MailingStatusError=Błąd MailingStatusNotSent=Nie wysłano MailSuccessfulySent=E-mail wysłany successfuly (od %s do %s) -MailingSuccessfullyValidated=EMailing successfully validated -MailUnsubcribe=Unsubscribe -Unsuscribe=Unsubscribe -MailingStatusNotContact=Don't contact anymore +MailingSuccessfullyValidated=Wysyłanie pomyślnie zweryfikowane +MailUnsubcribe=Wyrejestrowanie +Unsuscribe=Wyrejestrowanie +MailingStatusNotContact=Nie kontaktuj się więcej ErrorMailRecipientIsEmpty=E-mail odbiorcy jest pusty WarningNoEMailsAdded=Brak nowych wiadomości e-mail, aby dodać adres do listy. ConfirmValidMailing=Czy na pewno chcesz, aby potwierdzić tego e-maila? @@ -73,31 +73,31 @@ DateLastSend=Data ostatniej wysyłanie DateSending=Data wysłania SentTo=Wysłane do %s MailingStatusRead=Czytać -CheckRead=Read Receipt -YourMailUnsubcribeOK=The email %s is correctly unsubcribe from mailing list -MailtoEMail=Hyper link to email -ActivateCheckRead=Allow to use the "Unsubcribe" link -ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature -EMailSentToNRecipients=EMail sent to %s recipients. -XTargetsAdded=%s recipients added into target list -EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email. -MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s) -SendRemind=Send reminder by EMails -RemindSent=%s reminder(s) sent -AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent) -NoRemindSent=No EMail reminder sent -ResultOfMassSending=Result of mass EMail reminders sending +CheckRead=Czytaj Otrzymanie +YourMailUnsubcribeOK=E-mail% s jest prawidłowo unsubcribe z listy mailingowej +MailtoEMail=Hyper link e-mail +ActivateCheckRead=Pozwól, aby skorzystać z linku "Unsubcribe" +ActivateCheckReadKey=Klucz do szyfrowania wykorzystanie wykorzystanie URL dla "Czytaj Pokwitowanie" oraz funkcja "Unsubcribe" +EMailSentToNRecipients=Napisz e-mail wysłany do% s odbiorców. +XTargetsAdded=% s dodany do listy odbiorców docelowych +EachInvoiceWillBeAttachedToEmail=Dokument za pomocą domyślnej faktury szablon dokumentu będą tworzone i dołączone do każdego maila. +MailTopicSendRemindUnpaidInvoices=Przypomnienie faktury% s (% s) +SendRemind=Wyślij przypomnienie poprzez e-maile +RemindSent=Przypominamy% s (e) wysłany +AllRecipientSelectedForRemind=Zaznacz wszystkie thirdparties i jeśli e-mail jest ustawiony (zauważ, że jeden elektronicznej za faktury będą wysyłane) +NoRemindSent=Bez przypomnienia e-mail wysłany +ResultOfMassSending=Wynik przypomnienia masowe wysyłanie wiadomości e-mail # Libelle des modules de liste de destinataires mailing MailingModuleDescContactCompanies=Kontakty wszystkich stron trzecich (klienta, perspektywa, dostawca, ...) MailingModuleDescDolibarrUsers=Wszystkie Dolibarr użytkownikom wiadomości e-mail MailingModuleDescFundationMembers=Fundacja użytkowników z e-maili MailingModuleDescEmailsFromFile=E-maile z pliku tekstowego (e-mail, imię, nazwisko) -MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other) +MailingModuleDescEmailsFromUser=E-maili od danych wejściowych użytkownika (e-mail; Nazwisko; imię, inne) MailingModuleDescContactsCategories=Kontakty wszystkich stron trzecich (według kategorii) MailingModuleDescDolibarrContractsLinesExpired=Trzecim minął zamówienia linie MailingModuleDescContactsByCompanyCategory=Kontakt trzecich (przez osoby trzecie kategoria) -MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category +MailingModuleDescContactsByCategory=Kontakt / adresy stron trzecich według kategorii MailingModuleDescMembersCategories=Członkowie Fundacji (o kategorie) MailingModuleDescContactsByFunction=Kontakt trzecich (według pozycji / funkcji) LineInFile=Linia w pliku %s @@ -112,30 +112,30 @@ SearchAMailing=Szukaj mailowych SendMailing=Wyślij e-maila SendMail=Wyślij e-mail SentBy=Wysłane przez -MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients: +MailingNeedCommand=Ze względów bezpieczeństwa, wysyłając e-maila jest lepiej, gdy wykonywane z linii poleceń. Jeśli masz, poproś administratora serwera, aby uruchomić następujące polecenie, aby wysłać e-maila do wszystkich odbiorców: MailingNeedCommand2=Możesz jednak wysłać je w sieci poprzez dodanie parametru MAILING_LIMIT_SENDBYWEB o wartości max liczba wiadomości e-mail, który chcesz wysłać przez sesji. -ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +ConfirmSendingEmailing=Jeśli nie możesz lub preferują wysyłanie ich z przeglądarki www, prosimy o potwierdzenie jesteś pewien, że chcesz wysłać e-maila teraz z przeglądarki? +LimitSendingEmailing=Uwaga: Wysyłanie Emailings z interfejsu WWW jest wykonywana w kilku czasach ze względów bezpieczeństwa oraz limitu czasu,% s odbiorców jednocześnie dla każdej sesji wysyłającego. TargetsReset=Wyczyść listę ToClearAllRecipientsClickHere=Aby wyczyścić odbiorców tego e-maila na listę, kliknij przycisk ToAddRecipientsChooseHere=Aby dodać odbiorców, wybierz w tych wykazach NbOfEMailingsReceived=Masa emailings otrzymała -NbOfEMailingsSend=Mass emailings sent +NbOfEMailingsSend=Masowe Emailings wysłane IdRecord=ID rekordu DeliveryReceipt=Odbiór dostawy YouCanUseCommaSeparatorForSeveralRecipients=Możesz używać przecinka separator określić kilku odbiorców. -TagCheckMail=Track mail opening -TagUnsubscribe=Unsubscribe link -TagSignature=Signature sending user -TagMailtoEmail=Recipient EMail +TagCheckMail=Utwór otwierający elektronicznej +TagUnsubscribe=Wypisz odnośnik +TagSignature=Podpis wysyłania użytkownika +TagMailtoEmail=E-mail odbiorcy # Module Notifications Notifications=Powiadomienia NoNotificationsWillBeSent=Brak powiadomień e-mail są planowane dla tego wydarzenia i spółka ANotificationsWillBeSent=1 zgłoszenie zostanie wysłane pocztą elektroniczną SomeNotificationsWillBeSent=%s powiadomienia będą wysyłane przez e-mail -AddNewNotification=Activate a new email notification target -ListOfActiveNotifications=List all active email notification targets +AddNewNotification=Aktywuj nowy cel powiadomienia e-mail +ListOfActiveNotifications=Lista wszystkich aktywnych celów powiadomienia e-mail ListOfNotificationsDone=Lista wszystkich powiadomień e-mail wysłany -MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. -MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. -MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. +MailSendSetupIs=Konfiguracja poczty e-mail wysyłającego musi być połączone z '% s'. Tryb ten może być wykorzystywany do wysyłania masowego wysyłania. +MailSendSetupIs2=Najpierw trzeba przejść, z konta administratora, w menu% sHome - Ustawienia - e-maile% s, aby zmienić parametr '% s' na tryb '% s' używać. W tym trybie można wprowadzić ustawienia serwera SMTP dostarczonych przez usługodawcę internetowego i używać funkcji e-maila Mszę św. +MailSendSetupIs3=Jeśli masz jakieś pytania na temat jak skonfigurować serwer SMTP, możesz poprosić o% s. diff --git a/htdocs/langs/pl_PL/printing.lang b/htdocs/langs/pl_PL/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/pl_PL/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang index 2c0a3ee7470..a71243d3674 100644 --- a/htdocs/langs/pl_PL/projects.lang +++ b/htdocs/langs/pl_PL/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Kompletny model projektu sprawozdania (logo. ..) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/pl_PL/workflow.lang b/htdocs/langs/pl_PL/workflow.lang index 62b7ba48b97..90ce3d2d91f 100644 --- a/htdocs/langs/pl_PL/workflow.lang +++ b/htdocs/langs/pl_PL/workflow.lang @@ -1,11 +1,11 @@ # Dolibarr language file - Source file is en_US - admin -WorkflowSetup=Workflow konfiguracji modułu -WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in. +WorkflowSetup=Konfiguracja modułu przepływu pracy +WorkflowDesc=Moduł ten zaprojektowany został do zmiany zachowania automatycznych działań w aplikacjach. Domyślnie, przepływ pracy jest otwarty (zrobisz co chcesz w zamówieniach). Możesz aktywować automatyczne czynności, które cię interesują. ThereIsNoWorkflowToModify=Nie ma przepływu pracy można modyfikować modułu został uaktywniony. descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Tworzenie zlecenia klienta automatycznie po handlowego wniosek jest podpisany descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Tworzenie faktury klienta automatycznie po handlowego wniosek jest podpisany descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Tworzenie faktury klienta automatycznie po zatwierdzeniu umowy descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Tworzenie faktury klienta automatycznie po zamówienie klienta jest zamknięty -descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid -descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid -descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated +descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klasyfikowania związany propozycję źródłowego zapowiadane gdy zamówienie klienta jest ustawiony na płatne +descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klasyfikowania związane Źródło (-a), gdy klienta do faktury klienta naliczana jest ustawiony wypłacane +descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klasyfikowania związany zamówienie klienta źródłowego (s) do grubodzioby, gdy faktura klient jest weryfikowany diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang index c111878d3d6..eb99b0d2d95 100644 --- a/htdocs/langs/pt_BR/banks.lang +++ b/htdocs/langs/pt_BR/banks.lang @@ -4,6 +4,7 @@ MenuSetupBank=Configuração Banco/Caixa BankName=Nome do Banco BankAccount=Conta Bancaria BankAccounts=Contas Bancarias +ShowAccount=Visualizar Conta AccountRef=Ref. Conta Financeira AccountLabel=Etiqueta da Conta Financeira CashAccount=Conta Caixa/Efetivo @@ -103,7 +104,6 @@ AllAccounts=Todas as Contas bancarias/de Caixa BackToAccount=Voltar e a Conta FutureTransaction=Transação futura. Impossivel conciliar. SelectChequeTransactionAndGenerate=Selecionar/filtrar cheques a se incluir no recibo de deposito e clickar no "Criar" -InputReceiptNumber=Escolha o relatorio bancario relativo a conciliação. Use um valor numerico (como AAAAMM) EventualyAddCategory=Posivelmente especificar a categoria para se clasificar os registros ToConciliate=A se conciliar ? ThenCheckLinesAndConciliate=Verificar as linhas presentes no relatorio do banco e clickar diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang index a807b965562..e9e3fe97c2b 100644 --- a/htdocs/langs/pt_BR/bills.lang +++ b/htdocs/langs/pt_BR/bills.lang @@ -2,45 +2,46 @@ Bill=Fatura Bills=Faturas BillsCustomers=Faturas de Clientes -BillsCustomer=Fatura de Cliente +BillsCustomer=Fatura a Clientes BillsSuppliers=Faturas de Fornecedores BillsCustomersUnpaid=Faturas de Clientes Pendentes de Cobrança -BillsCustomersUnpaidForCompany=Faturas cliente nao pagas para %s +BillsCustomersUnpaidForCompany=Faturas cliente não pagas para %s BillsSuppliersUnpaid=Faturas de Fornecedores Pendentes de Pagamento BillsSuppliersUnpaidForCompany=Faturas do fornecedor não pagas para %s BillsLate=Atrasos de Pagamento -BillsStatistics=Estatísticas faturas a clientes +BillsStatistics=Estatísticas de faturas a clientes BillsStatisticsSuppliers=Estatísticas faturas de Fornecedores DisabledBecauseNotErasable=Ação desativada porque não pode ser cancelada InvoiceStandard=Fatura Padrão InvoiceStandardAsk=Fatura Padrão InvoiceStandardDesc=Este tipo de fatura é a fatura tradicional. Também é conhecida como Fatura de Débito. -InvoiceDeposit=Depositar Fatura -InvoiceDepositAsk=Depositar Fatura +InvoiceDeposit=Fatura de depósito +InvoiceDepositAsk=Fatura de depósito InvoiceDepositDesc=Este tipo de fatura é feita com um depósito quando foi recebido. InvoiceProForma=Fatura Pro-Forma InvoiceProFormaAsk=Fatura Pro-Forma InvoiceProFormaDesc=Fatura Pro-Forma é uma verdadeira imagem de uma fatura, mas não tem valor contábil. -InvoiceReplacement=Substituição da Fatura -InvoiceReplacementAsk=Substituição da Fatura para Fatura +InvoiceReplacement=Fatura de substituição +InvoiceReplacementAsk=Fatura de substituição para Fatura InvoiceReplacementDesc=A fatura retificada serve para cancelar e para substituir uma fatura existente em que ainda não existe pagamentos.

Nota: só uma fatura sem nenhum pagamento pode retificar se. Sim esta última não está fechada, passará automaticamente ao estado 'abandonada'. InvoiceAvoirAsk=Nota de Crédito para Corrigir a Fatura InvoiceAvoirDesc=A Nota de Crédito é uma fatura negativa destinada a compensar um valor de uma fatura que difere do valor realmente pago (por ter pago a mais ou por devolução de produtos, por Exemplo).

Nota: Tenha em conta que a fatura original a corrigir deve ter sido fechada (' paga' ou ' paga parcialmente ') para poder realizar uma nota de crédito. invoiceAvoirWithLines=Criar Nota de Crédito conforme a fatura original invoiceAvoirWithPaymentRestAmount=Cirar nota de credito com restante não pago da fatura original invoiceAvoirLineWithPaymentRestAmount=Nota de credito para valor restante não pago -ReplaceInvoice=Retificar a Fatura %s -ReplacementInvoice=Substituição da Fatura +ReplaceInvoice=Substituir a Fatura %s +ReplacementInvoice=Fatura de substituição ReplacedByInvoice=Substituído por Fatura %s ReplacementByInvoice=Substituído por Fatura -CorrectInvoice=Correção de Fatura %s -CorrectionInvoice=Correção de Fatura -UsedByInvoice=Aplicar sobre a fatura %s +CorrectInvoice=Corrigir Fatura %s +CorrectionInvoice=Fatura de correção +UsedByInvoice=Usada para pagar a fatura %s NotConsumed=Sem Consumo NoReplacableInvoice=Sem Faturas Retificáveis NoInvoiceToCorrect=Sem Faturas a Corrigir +InvoiceHasAvoir=Corrigida por uma ou mais faturas CardBill=Ficha Fatura -PredefinedInvoices=Fatura Predefinida +PredefinedInvoices=Faturas Predefinidas Invoice=Fatura Invoices=Faturas InvoiceLine=Linha de Fatura @@ -176,6 +177,8 @@ ExcessReceived=Recebido em Excesso EscompteOffered=Desconto (Pagamento antecipado) SendBillRef=Confirmação de fatura %s SendReminderBillRef=Lembrete de confirmação de fatura %s +StandingOrders=Débitos Diretos +StandingOrder=Débito Direto NoDraftBills=Nenhuma Fatura Rascunho NoOtherDraftBills=Nenhuma Outra Fatura Rascunho NoDraftInvoices=Nenhuma Fatura Rascunho @@ -190,6 +193,7 @@ NoInvoice=Nenhuma Fatura ClassifyBill=Classificar a Fatura SupplierBillsToPay=Faturas de Fornecedores a Pagar CustomerBillsUnpaid=Faturas de Clientes Pendentes de Cobrança +DispenseMontantLettres=Faturas escrita atraves proceduras mecanogaficas são dispensed pelos pedidos em cartas. NonPercuRecuperable=Sem Recuperação SetConditions=Definir Condições de Pagamento SetMode=Definir Modo de Pagamento @@ -306,7 +310,6 @@ DisabledBecausePayments=Não é possível uma vez já que existem alguns pagamen CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento já que há pelo menos uma fatura classificada como pago ExpectedToPay=Esperando pagamento PayedByThisPayment=Pago -ClosePaidInvoicesAutomatically=Classifique "Paid" todas as faturas padrão ou a substituição inteiramente paga. ClosePaidCreditNotesAutomatically=Classificar "pagou" todas as notas de crédito totalmente pago de volta. AllCompletelyPayedInvoiceWillBeClosed=Todos fatura que permanecer sem pagar será automaticamente fechada ao status de "Paid". ToMakePaymentBack=pagar tudo @@ -314,7 +317,7 @@ NoteListOfYourUnpaidInvoices=Atenção: Esta lista inclue somente faturas para t RevenueStamp=Selo da receita YouMustCreateInvoiceFromThird=Esta opção só está disponível ao criar fatura de terceiros PDFCrabeDescription=Modelo de fatura completo (ICMS, método de pagamento a mostrar, logotipo...) -TerreNumRefModelDesc1=Mostrarr número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0 +TerreNumRefModelDesc1=Mostrar número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0 MarsNumRefModelDesc1=Mostrar número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0 TerreNumRefModelError=O projeto começa começado por $syymm já existe e não é compatível com este modelo de seq�ência. Remova-o ou renomei-o para ativar este módulo. TypeContact_facture_internal_SALESREPFOLL=Responsável do acompanhamento da fatura do cliente @@ -325,3 +328,12 @@ TypeContact_invoice_supplier_internal_SALESREPFOLL=Representante seguindo a fatu TypeContact_invoice_supplier_external_BILLING=Contato da Fatura de Fornecedor TypeContact_invoice_supplier_external_SHIPPING=Contato de envio do fornecedor TypeContact_invoice_supplier_external_SERVICE=Contato de servico do fornecedor +InvoiceFirstSituationAsk=Primeira situação da fatura +InvoiceSituation=Situação da fatura +InvoiceSituationAsk=Fatura acompanhando a situação +InvoiceSituationDesc=Criar uma nova situação na sequência de um um já existente +CreateNextSituationInvoice=Criar proxima situação +DisabledBecauseNotLastInCycle=A próxima situação já existe. +CantBeLessThanMinPercent=O progresso não pode ser menor do que o seu valor na situação anterior. +NoSituations=Não há situações abertas +InvoiceSituationLast=Fatura final e geral diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang index e714cacf5f4..98fe235628e 100644 --- a/htdocs/langs/pt_BR/commercial.lang +++ b/htdocs/langs/pt_BR/commercial.lang @@ -48,7 +48,6 @@ LastProspectContactInProcess=Contato em Curso LastProspectContactDone=Clientes Potenciais Contactados DateActionPlanned=Data Planificação ActionAskedBy=Ação Questionada por -ActionAffectedTo=Responsável pelo evento ActionDoneBy=Ação Realizada por ActionUserAsk=Registrada por ErrorStatusCantBeZeroIfStarted=Se o campo 'Ficha de Realização' tiver dados a ação está em curso, por isso o campo 'Estado' não pode ser 0%%. diff --git a/htdocs/langs/pt_BR/contracts.lang b/htdocs/langs/pt_BR/contracts.lang index 1ef7f2f6dc0..e345252161d 100644 --- a/htdocs/langs/pt_BR/contracts.lang +++ b/htdocs/langs/pt_BR/contracts.lang @@ -1,6 +1,7 @@ # Dolibarr language file - Source file is en_US - contracts ContractsArea=Área Contratos ListOfContracts=Lista de Contratos +LastModifiedContracts=Os %s últimos contratos alterados AllContracts=Todos os Contratos ContractCard=Ficha Contrato ContractStatusNotRunning=Fora de Serviço @@ -37,6 +38,7 @@ ListOfRunningContractsLines=Lista de Linhas de Contratos em Serviço ListOfRunningServices=Lista de Serviços Ativos NotActivatedServices=Serviços Desativados (Com os Contratos Validados) BoardNotActivatedServices=Serviços a Ativar (Com os Contratos Validados) +LastContracts=Os %s últimos contratos LastActivatedServices=Os %s últimos Serviços Ativados LastModifiedServices=Os %s últimos Serviços Modificados EditServiceLine=Edição Linha do Serviço @@ -71,6 +73,7 @@ ListOfServicesToExpire=Lista de servicos a vencer NoteListOfYourExpiredServices=Esta lista contém apenas contratos de serviços de terceiros as quais você está ligado como representante de vendas. StandardContractsTemplate=Modelo de contratos simples ContactNameAndSignature=Para %s, nome e assinatura: +OnlyLinesWithTypeServiceAreUsed=Somente as linhas com o tipo de "serviço" será clonado. TypeContact_contrat_external_BILLING=Contato cliente de faturação do contrato TypeContact_contrat_external_CUSTOMER=Contato cliente seguimento do contrato TypeContact_contrat_external_SALESREPSIGN=Contato cliente assinante do contrato diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang index 36a14dfc527..8dafd18f8ba 100644 --- a/htdocs/langs/pt_BR/cron.lang +++ b/htdocs/langs/pt_BR/cron.lang @@ -9,9 +9,10 @@ URLToLaunchCronJobs=URL para checar e iniciar os cron se necessario OrToLaunchASpecificJob=Ou checkar e iniciar um specifico trabalho KeyForCronAccess=Chave seguranca para URL que lanca tarefas cron FileToLaunchCronJobs=Linha de comando para iniciar tarefas agendadas -CronExplainHowToRunUnix=No ambiente Unix você deve usar crontab para executar linha de comando a cada minuto -CronExplainHowToRunWin=No ambiente Microsoft (tm) Windows você pode usar ferramentas tarefa agendada para executar a linha de comando cada minuto +CronExplainHowToRunUnix=No ambiente Unix você deve usar a seguinte entrada crontab para executar a linha de comando a cada 5 minutos +CronExplainHowToRunWin=Em ambiente Microsoft (tm) Windows, Você PODE USAR Ferramentas de Tarefa agendada Para executar a Linha de Comando de Cada 5 Minutos CronJobs=Trabalhos programados +CronListActive=Lista de tarefas ativas / Programadas CronListInactive=Lista de trabalhos nao ativos CronDateLastRun=Ultimo acionamento CronLastOutput=Saida do ultimo acionamento diff --git a/htdocs/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang index 950e0e3cdc3..81341af1809 100644 --- a/htdocs/langs/pt_BR/ecm.lang +++ b/htdocs/langs/pt_BR/ecm.lang @@ -31,6 +31,8 @@ ECMDocsByThirdParties=Documentos associados a fornecedores ECMDocsByProposals=Documentos associados a orçamentos ECMDocsByInvoices=Documentos associados a faturas do cliente ECMDocsByProjects=Documentos associados a projetos +ECMDocsByUsers=Documentos relacionados a usuários +ECMDocsByInterventions=Documentos ligados a intervenções ShowECMSection=Exibir pasta DeleteSection=Apagar pasta ConfirmDeleteSection=Você confirmar que quer apagar a pasta %s ? diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang index 6bdc570f7f9..fc051f05a77 100644 --- a/htdocs/langs/pt_BR/errors.lang +++ b/htdocs/langs/pt_BR/errors.lang @@ -18,7 +18,6 @@ ErrorFromToAccountsMustDiffers=a conta origem e destino devem ser diferentes. ErrorBadThirdPartyName=Nome de Fornecedor incorreto ErrorProdIdIsMandatory=Obrigatório ErrorBadCustomerCodeSyntax=a sintaxis do código cliente é incorreta -ErrorBadBarCodeSyntax=A sintaxe do código de barras esta incorreta ErrorBarCodeRequired=Código de barras necessário ErrorBarCodeAlreadyUsed=Código de barras já utilizado ErrorUrlNotValid=O Endereço do Site está incorreta @@ -63,9 +62,8 @@ ErrorRefAlreadyExists=a referencia utilizada para a criação já existe ErrorRecordHasChildren=não se pode eliminar o registo porque tem hijos. ErrorRecordIsUsedCantDelete=Não é possível excluir registro. Ele já é usado ou incluídos em outro objeto. ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display. -ErrorContactEMail=Um erro técnico ocorrido. Por favor, contate o administrador para seguinte e-mail% s en fornecer o código de erro% s em sua mensagem, ou ainda melhor, adicionando uma cópia de tela da página. +ErrorContactEMail=Ocorreu um erro técnico. Por favor, contate o administrador no seguinte e-mail %s e forneça o seguinte código de erro %s em sua mensagem. Ou, se possível, adicione uma foto da tela - print screen. ErrorWrongValueForField=Valor errado para o número do campo% s (valor '% s' não corresponde regra% s) -ErrorFieldValueNotIn=Valor errado para o número do campo% s (valor '% s' não é um valor disponível no campo% s da tabela% s) ErrorFieldRefNotIn=Valor errado para o número do campo% s (valor '% s' não é um% s ref existente) ErrorsOnXLines=Erros no registro de origem% s (s) ErrorSpecialCharNotAllowedForField=Os caracteres especiais não são permitidos para o campo "% s" @@ -75,6 +73,8 @@ ErrorQtyTooLowForThisSupplier=Quantidade insuficiente para este fornecedor ErrorModuleSetupNotComplete=Configuração do módulo parece ser incompleto. Vá em Setup - Módulos para ser concluído. ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sem número de sequência ErrorBadMaskBadRazMonth=Erro, valor de redefinição ruim +ErrorMaxNumberReachForThisMask=Número máximo de alcance para essa máscara +ErrorCounterMustHaveMoreThan3Digits=Contador deve ter mais de 3 dígitos ErrorProductWithRefNotExist=O produto com referência não existem '% s' ErrorDeleteNotPossibleLineIsConsolidated=Não e possívelexcluir porque registro está ligada a uma transação bancária que está conciliada ErrorProdIdAlreadyExist=% S é atribuída a outro terço @@ -95,6 +95,7 @@ ErrorLoginDoesNotExists=a conta de usuário de %s não foi encontrado. ErrorLoginHasNoEmail=Este usuário não tem e-mail. impossível continuar. ErrorBadValueForCode=Valor incorreto para o código. volte a \ttentar com um Novo valor... ErrorBothFieldCantBeNegative=Campos% se% s não pode ser tanto negativo +ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade nas linhas das notas de clientes não pode ser negativa ErrorWebServerUserHasNotPermission=Conta de usuário usado para executar servidor não tem permissão ErrUnzipFails=Falha ao descompactar com ZipArchive ErrNoZipEngine=Não esta instaladoo programa para descompactar o arquivo% s neste PHP @@ -116,6 +117,18 @@ ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erro, esse membro ainda não e ErrorThereIsSomeDeliveries=Erro, há algumas entregas ligados a este envio. Supressão recusou. ErrorCantDeletePaymentReconciliated=Não posso deletar o pagamento que gerou uma transação bancaria conciliada. ErrorCantDeletePaymentSharedWithPayedInvoice=Não e possivel cancelar o pagamento condiviso para pelo menos uma fatura com estado Pago +ErrorPriceExpression1=Não é possível atribuir a constante %s' +ErrorPriceExpression2=Não é possível redefinir a função built-in '%s' +ErrorPriceExpression4=Caracter Ilegal '%s' +ErrorPriceExpression5=Inesperado '%s' +ErrorPriceExpression6=Número errado de argumentos (%s dado, %s esperado) +ErrorPriceExpression8=Operador Inesperado '%s' +ErrorPriceExpression9=Ocorreu um erro inesperado +ErrorPriceExpression14=Divisão por zero +ErrorPriceExpression19=Expressão não encontrada +ErrorPriceExpression20=Expressão vazia +ErrorSrcAndTargetWarehouseMustDiffers=Origem e de destino de armazéns devem ser diferentes +ErrorTryToMakeMoveOnProductRequiringBatchData=Erro, tentando fazer um movimento de estoque, sem lote / informação de série, em um produto que requer lote / informação de série. WarningMandatorySetupNotComplete=Parâmetros de configuração obrigatórios ainda não estão definidos WarningSafeModeOnCheckExecDir=Atenção, a opção PHP safe_mode está em modo de comando devem ser armazenados dentro de um diretório declarado pelo php parâmetro safe_mode_exec_dir. WarningAllowUrlFopenMustBeOn=o parâmetro allow_url_fopen deve ser especificado a on ao Arquivo php.ini para discolocar deste módulo completamente ativo. deve modificar este Arquivo manualmente diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang index d680c4d1145..5b70e3733cb 100644 --- a/htdocs/langs/pt_BR/exports.lang +++ b/htdocs/langs/pt_BR/exports.lang @@ -85,7 +85,7 @@ Enclosure=Recinto SuppliersProducts=Fornecedores Produtos SpecialCode=Código especial ExportStringFilter=Permite substituir um ou mais caracteres no texto -ExportDateFilter='AAAA' YYYYMM 'AAAAMMDD': filtros em um ano / mês / dia
'AAAA + AAAA' YYYYMM + YYYYMM 'AAAAMMDD + AAAAMMDD': filtros mais uma série de anos / meses / dias
> AAAA ''> YYYYMM ''> AAAAMMDD ': filtros nos seguintes anos / meses / dias
'AAAA+AAAA, AAAAMM+AAAAMM, AAAAMMDD+AAAAMMDD : filtros mais de uma gama de ano / mês / dia inicial
> AAAA, > AAAAMM, > AAAAMMDD : filtros em todos seguindo anos / meses / dias
< AAAA, < AAAAMM, < AAAAMMDD : filtros em todos os anos / meses / dias anteriores ExportNumericFilter=filtros "NNNNN" por um valor
filtros "NNNNN + NNNNN 'mais de uma faixa de valores
'> NNNNN' filtros por valores mais baixos
'> NNNNN' filtros por valores mais elevados SelectFilterFields=Se você deseja filtrar alguns valores, apenas os valores de entrada aqui. FilteredFields=Campos filtrados diff --git a/htdocs/langs/pt_BR/externalsite.lang b/htdocs/langs/pt_BR/externalsite.lang index f0669dcd138..f762322072c 100644 --- a/htdocs/langs/pt_BR/externalsite.lang +++ b/htdocs/langs/pt_BR/externalsite.lang @@ -2,3 +2,4 @@ ExternalSiteSetup=Link configuraçao ao site externo ExternalSiteURL=URL site externo ExternalSiteModuleNotComplete=Modulo SiteExterno nao foi configurado corretamente. +ExampleMyMenuEntry=Minha entrada do menu diff --git a/htdocs/langs/pt_BR/interventions.lang b/htdocs/langs/pt_BR/interventions.lang index bfd7757fb23..33d186a1c04 100644 --- a/htdocs/langs/pt_BR/interventions.lang +++ b/htdocs/langs/pt_BR/interventions.lang @@ -1,4 +1,5 @@ # Dolibarr language file - Source file is en_US - interventions +AddIntervention=Criar Intervenção ActionsOnFicheInter=Açoes na intervençao CustomerDoesNotHavePrefix=O cliente não tem prefixoo de definido InterventionContact=Contato Intervenção @@ -7,9 +8,19 @@ ConfirmDeleteIntervention=Tem certeza que quer eliminar esta intervenção? ConfirmValidateIntervention=Tem certeza que quer Confirmar esta intervenção? ConfirmModifyIntervention=Tem certeza que quer modificar esta intervenção? ConfirmDeleteInterventionLine=Tem certeza que quer eliminar esta linha? +InterventionClassifyBilled=Classificar "Faturado" +InterventionClassifyUnBilled=Classificar "à faturar" StatusInterInvoiced=Faturado RelatedInterventions=Intervençoes relativas ShowIntervention=Mostrar intervençao +SendInterventionByMail=Enviar por E-mail intervenção +InterventionCreatedInDolibarr=Intervenção %s criada +InterventionValidatedInDolibarr=Intervenção %s validada +InterventionModifiedInDolibarr=Intervenção %s alterada +InterventionClassifiedBilledInDolibarr=Intervenção %s classificada como Faturada +InterventionClassifiedUnbilledInDolibarr=Intervenção %s definida como à faturar +InterventionDeletedInDolibarr=Intervenção %s excluída +SearchAnIntervention=Pesquisar uma intervenção TypeContact_fichinter_internal_INTERREPFOLL=Responsável do Seguimento da Intervenção TypeContact_fichinter_external_BILLING=Contato do cliente da faturação da intervenção TypeContact_fichinter_external_CUSTOMER=Contato do cliente do seguimento da intervenção diff --git a/htdocs/langs/pt_BR/link.lang b/htdocs/langs/pt_BR/link.lang new file mode 100644 index 00000000000..fc6685ef08d --- /dev/null +++ b/htdocs/langs/pt_BR/link.lang @@ -0,0 +1,8 @@ +# Dolibarr language file - Source file is en_US - link +LinkANewFile=Vincular um novo arquivo/documento +LinkedFiles=Arquivos vinculados e documentos +NoLinkFound=Não há links registrados +LinkComplete=O arquivo foi associada com sucesso +ErrorFileNotLinked=O arquivo não pôde ser vinculado +ErrorFailedToDeleteLink=Falha ao remover link '%s' +ErrorFailedToUpdateLink=Falha ao atualizar link '%s' diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang index aad28107830..32dee0c3306 100644 --- a/htdocs/langs/pt_BR/margins.lang +++ b/htdocs/langs/pt_BR/margins.lang @@ -11,6 +11,7 @@ MarginDetails=Detalhes de margem ProductMargins=Margem de produtos CustomerMargins=Margems de clientes SalesRepresentativeMargins=Tolerância aos representante de vendas +UserMargins=Margens do Usuário ProductService=Produto ou serviço StartDate=Data inicio EndDate=Data fim diff --git a/htdocs/langs/pt_BR/printing.lang b/htdocs/langs/pt_BR/printing.lang new file mode 100644 index 00000000000..7df33364e64 --- /dev/null +++ b/htdocs/langs/pt_BR/printing.lang @@ -0,0 +1,59 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Impressão Direta +Module112000Desc=Habilitar Sistema de Impressão Direta +PrintingSetup=Configuração do Sistema de Impressão Direta +PrintingDesc=Este módulo adiciona um botão Imprimir para enviar documentos diretamente para uma impressora (sem abrir documento em um aplicativo) com vários módulos. +ModuleDriverSetup=Configuração do modulo driver +PrintingDriverDesc=Configuração de variáveis para o driver de impressão. +ListDrivers=Lista de drivers +PrintTestDesc=Lista de Impressoras. +FileWasSentToPrinter=Arquivo %s enviado para impressora +NoActivePrintingModuleFound=Sem módulo ativo para impressão de documentos +PleaseSelectaDriverfromList=Por favor, selecione um driver da lista. +SetupDriver=Configuração de Driver +TestDriver=Teste +TargetedPrinter=Impressora em questão +UserConf=Configuração por usuário +PrintGCPDesc=Este driver permite enviar documentos diretamente para uma impressora com o Google Cloud Print. +PrintingDriverDescprintgcp=Configuração das variáveis para o driver de impressão do Google Cloud Print. +PrintTestDescprintgcp=Lista de Impressoras para Google Cloud Print. +PRINTGCP_LOGIN=Login de conta GOOGLE +PRINTGCP_PASSWORD=Senha de conta GOOGLE +STATE_UNKNOWN=Desconhecido +STATE_DORMANT=Off-line por um bom tempo +TYPE_HP=HP Impressora +GCP_Name=Nome +GCP_displayName=Nome De Exibição +GCP_Id=ID da impressora +GCP_OwnerName=Nome do proprietário +GCP_State=Estado da impressora +GCP_connectionStatus=Estado online +GCP_Type=Tipo de impressora +PrintIPPSetup=Configuração do módulo de Impressão Direta +PrintIPPDesc=Este driver permite enviar documentos diretamente para uma impressora. Ele requer um sistema Linux com CUPS instalados. +PrintingDriverDescprintipp=Configuração das variáveis para o driver de impressão PrintIPP. +PrintTestDescprintipp=Lista de Impressoras para driver PrintIPP. +PRINTIPP_ENABLED=Mostrar ícone "Impressão direta" em listas de documentos +PRINTIPP_HOST=Servidor de impressão +PRINTIPP_PORT=Porta +PRINTIPP_PASSWORD=Senha +NoPrinterFound=Nenhuma impressora encontrada (verifique a configuração do CUPS) +NoDefaultPrinterDefined=Nenhuma impressora padrão definida +DefaultPrinter=Impressora padrão +Printer=Impressora +CupsServer=Servidor CUPS +IPP_Name=\nNome da impressora +IPP_State=Estado da impressora +IPP_State_reason=Estado razão +IPP_State_reason1=Estado razão1 +IPP_Color=Cor +IPP_Device=Dispositivo +IPP_Media=Mídia da impressora +IPP_Supported=Tipo de mídia +STATE_IPP_stopped=Parou +STATE_IPP_paused=Pausada +STATE_IPP_toner-low-report=Toner Baixo +STATE_IPP_none=Nenhum +MEDIA_IPP_stationery=artigos de papelaria +MEDIA_IPP_thermal=Térmico +IPP_COLOR_print-black=Impressora BW diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang index d30c9cbbf8b..2fa64f205ad 100644 --- a/htdocs/langs/pt_BR/products.lang +++ b/htdocs/langs/pt_BR/products.lang @@ -7,8 +7,12 @@ MassBarcodeInit=Inicialização de código de barras. MassBarcodeInitDesc=Esta página pode ser usado para inicializar um código de barras em objetos que não têm código de barras definidas. Verifique antes que a instalação do módulo de código de barras é completa. ProductAccountancyBuyCode=Codigo contabilidade (compras) ProductAccountancySellCode=Codigo contabilidade (vendas) -ProductsOnSellAndOnBuy=Produtos não para venda ou compra -ServicesOnSellAndOnBuy=Serviços não para venda ou compra +ProductsAndServicesOnSell=Produtos e Serviços para venda ou para compra +ProductsOnSell=Produto para venda ou para compra +ProductsNotOnSell=Produto fora de venda e de compra +ProductsOnSellAndOnBuy=Produtos para venda e compra +ServicesOnSell=Serviços para venda ou para compra +ServicesOnSellAndOnBuy=Serviços para venda e compra LastRecorded=últimos Produtos/Serviços em Venda Registados LastRecordedProductsAndServices=Os %s últimos Produtos/Perviços Registados LastModifiedProductsAndServices=Os %s últimos Produtos/Serviços Registados @@ -32,6 +36,7 @@ MinPrice=Preço mínimo de venda MinPriceHT=Minimo preço de venda (líquido de imposto) MinPriceTTC=Minimo preço de venda (inc. taxa) CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS) +ContractStatusClosed=Encerrado ContractStatusToRun=Para començar ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço. @@ -55,6 +60,7 @@ ProductAssociationList=Lista de produtos/serviços associados : Nome do produto/ ProductParentList=Lista de pacote produtos/serviços com este produto como componente ErrorAssociationIsFatherOfThis=Um dos produtos selecionados é pai do produto em curso ConfirmDeleteProduct=? Tem certeza que quer eliminar este produto/serviço? +ConfirmDeletePicture=? Tem certeza que quer eliminar esta foto? ConfirmDeleteProductLine=Tem certeza que quer eliminar esta linha de produto? NoStockForThisProduct=Não existe estoque deste produto NoStock=Sem estoque @@ -96,6 +102,7 @@ AddThisServiceCard=Criar ficha serviço HelpAddThisServiceCard=Esta opção permite de criar ou clonar um serviço caso o mesmo não existe. AlwaysUseNewPrice=Usar sempre preço atual do produto/serviço AlwaysUseFixedPrice=Usar preço fixo +PriceByQuantity=Diferentes preços por quantidade PriceByQuantityRange=Intervalo de quantidade ProductsDashboard=Resumo de produtos/serviços HelpUpdateOriginalProductLabel=Permite editar o nome do produto @@ -128,10 +135,17 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definição do código ou valor do c BarCodeDataForProduct=Informações de código de barras do produto% s: BarCodeDataForThirdparty=Informações de código de barras do fornecedor: ResetBarcodeForAllRecords=Definir o valor de código de barras para todos os registros (isto também irá repor valor de código de barras já definido com novos valores) +PriceByCustomer=Preço diferente para cada cliente PriceCatalogue=Preço único por produto / serviço -PricingRule=As regras de tarifação +PricingRule=Regras para os preços dos clientes AddCustomerPrice=Adicione preço por parte dos clientes ForceUpdateChildPriceSoc=Situado mesmo preço em outros pedidos dos clientes PriceByCustomerLog=Preço por cliente MinimumPriceLimit=Preço minimo nao pode ser inferior a %s MinimumRecommendedPrice=Preço minimo recomendado e: %s +PriceExpressionEditor=Editor de expressão Preço +PriceExpressionSelected=Expressão de preço Selecionado +PriceExpressionEditorHelp1="Preço = 2 + 2" ou "2 + 2" para fixação do preço. use; para separar expressões +PriceExpressionEditorHelp2=Você pode acessar ExtraFields com variáveis como\n#options_myextrafieldkey# +PriceMode=Modo de Preço +PriceNumeric=Número diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang index 1b32494e7c8..e16645e7107 100644 --- a/htdocs/langs/pt_BR/projects.lang +++ b/htdocs/langs/pt_BR/projects.lang @@ -9,11 +9,14 @@ MyTasksDesc=Esta exibição é limitado a projetos ou tarefas que você é um co TasksPublicDesc=Essa exibição apresenta todos os projetos e tarefas que você tem permissão para ler. TasksDesc=Essa exibição apresenta todos os projetos e tarefas (suas permissões de usuário concede-lhe ver tudo). AddProject=Criar projeto +DeleteAProject=Eliminar um Projeto +DeleteATask=Eliminar uma Tarefa ConfirmDeleteAProject=Tem certeza que quer eliminar este projeto? ConfirmDeleteATask=Tem certeza que quer eliminar esta tarefa? OfficerProject=Responsável do Projeto LastProjects=Os %s últimos Projetos ShowProject=Adicionar Projeto +NoProject=Nenhum Projeto Definido NbOpenTasks=No Tarefas Abertas NbOfProjects=No de Projetos TimeSpent=Tempo Dedicado @@ -74,8 +77,7 @@ SelectElement=Selecionar componente AddElement=Link para componente UnlinkElement=Desligar elemento DocumentModelBaleine=Modelo de relatório de um projeto completo (logo. ..) -PlannedWorkload =carga horária planejada -WorkloadOccupation=Carga horária empregada +PlannedWorkload=carga horária planejada ProjectReferers=Fazendo referência a objetos SearchAProject=Buscar um projeto ProjectMustBeValidatedFirst=O projeto tem que primeiramente ser validado diff --git a/htdocs/langs/pt_BR/salaries.lang b/htdocs/langs/pt_BR/salaries.lang index ae54678cc61..04f737983b5 100644 --- a/htdocs/langs/pt_BR/salaries.lang +++ b/htdocs/langs/pt_BR/salaries.lang @@ -1,4 +1,8 @@ # Dolibarr language file - Source file is en_US - salaries +SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Codigo contabilidade para pagamentos de salarios +SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Codigo contabilidade para despesas financeiras NewSalaryPayment=Novo pagamento de salário SalaryPayment=Pagamento de salário SalariesPayments=Pagamentos de salários +THM=Preço medio por hora +TJM=Preço medio por diaria diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang index a17cd46bf39..a1e3c7bb152 100644 --- a/htdocs/langs/pt_BR/sendings.lang +++ b/htdocs/langs/pt_BR/sendings.lang @@ -3,7 +3,6 @@ RefSending=Ref. Envio SendingsArea=Área Envios LastSendings=Os %s últimos Envios QtyReceived=Quant. Recibida -KeepToShip=Fica por Enviar StatusSendingValidated=Validado (produtos a enviar o enviados) Carriers=Transportadoras Carrier=Transportadora @@ -22,11 +21,8 @@ SendShippingRef=Submeter para envio %s ActionsOnShipping=Eventos no envio LinkToTrackYourPackage=Atalho para rastreamento do pacote ShipmentCreationIsDoneFromOrder=No momento a criaçao de um novo envio e feito da ficha de pedido. -RelatedShippings=Envios relativos ShipmentLine=Linha de envio CarrierList=Lista de transportadoras -SendingRunning=Produto da ordem do cliente ja enviado -SuppliersReceiptRunning=Produto do pedido do fornecedor ja recebido SendingMethodCATCH=Remoção pelo cliente SendingMethodTRANS=Transportadora SendingMethodCOLSUI=Acompanhamento diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang index 62b718a2a79..b75f00caf22 100644 --- a/htdocs/langs/pt_BR/stocks.lang +++ b/htdocs/langs/pt_BR/stocks.lang @@ -42,6 +42,7 @@ ReStockOnValidateOrder=Incrementar os estoques físicos sobre os pedidos ReStockOnDispatchOrder=Aumentar os estoques reais no envio manual para armazenamento, depois de receber ordem fornecedor ReStockOnDeleteInvoice=Aumentar os estoques reais sobre exclusão fatura OrderStatusNotReadyToDispatch=Não tem ordem ainda não ou nato tem um status que permite envio de produtos em para armazenamento. +StockDiffPhysicTeoric=Explicação para a diferença entre o estoque físico e teórico NoPredefinedProductToDispatch=Não há produtos pré-definidos para este objeto. Portanto, não envio em estoque é necessária. StockLimitShort=Limite para alerta StockLimit=Limite de estoque para alerta @@ -86,7 +87,6 @@ WarehouseForStockDecrease=Os arquivos serão utilizados para redução estoque WarehouseForStockIncrease=O arquivos serão utilizados para aumento de ForThisWarehouse=Para este armazenamento ReplenishmentStatusDesc=Esta lista de todos os produtos com um estoque menor do que o estoque desejado (ou inferior ao valor de alerta se checkbox "alerta só" está marcada), e sugerir-lhe para criar ordens de fornecedor para preencher a diferença. -ReplenishmentOrdersDesc=Esta lista de todos os pedidos de fornecedores esta aberto Replenishments=Reconstituições NbOfProductBeforePeriod=Quantidade de produtos em estoque antes do período selecionado NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois @@ -94,9 +94,11 @@ MassMovement=Movimento de massas MassStockMovement=Movimento de estoque em massa SelectProductInAndOutWareHouse=Selecione um produto, uma quantidade, um armazém de origem e um armazém de destino e clique em "% s". Uma vez feito isso para todos os movimentos necessários, clique em "% s". RecordMovement=Gravar a transferência -ReceivingForSameOrder=Recebimentos para este fim StockMovementRecorded=Movimentos de estoque gravados RuleForStockAvailability=Regras sobre os requisitos de ações StockMustBeEnoughForInvoice=Banco de nível deve ser o suficiente para adicionar o produto / serviço em fatura StockMustBeEnoughForOrder=Banco de nível deve ser o suficiente para adicionar o produto / serviço em ordem StockMustBeEnoughForShipment=Banco de nível deve ser o suficiente para adicionar o produto / serviço no transporte +MovementLabel=Rótulo de Movimento +ShowWarehouse=Mostrar armazém +MovementCorrectStock=Correção da conteúdo para o produto %s diff --git a/htdocs/langs/pt_BR/trips.lang b/htdocs/langs/pt_BR/trips.lang index 8af39e7001d..2ad8b512535 100644 --- a/htdocs/langs/pt_BR/trips.lang +++ b/htdocs/langs/pt_BR/trips.lang @@ -1,16 +1,4 @@ # Dolibarr language file - Source file is en_US - trips -Trip=Deslocamento -Trips=Deslocamentos -TripsAndExpenses=Deslocamentos e Despesas -TripsAndExpensesStatistics=Estatisticas de viagems e despesas -TripCard=Ficha de Deslocamento -AddTrip=Criar viagem -ListOfTrips=Lista de Deslocamentos -NewTrip=Nova Deslocamento Kilometers=Kilometros FeesKilometersOrAmout=Quantidade de Kilometros -DeleteTrip=Eliminar Deslocamento -ConfirmDeleteTrip=Tem certeza que quer eliminar esta deslocamento? -ExpensesArea=Area de viagems e despesas -SearchATripAndExpense=Buscar para uma viagem ou despesa ClassifyRefunded=Classificar 'Rembolsado' diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang index 08653c368d4..ef40826cfdf 100644 --- a/htdocs/langs/pt_BR/withdrawals.lang +++ b/htdocs/langs/pt_BR/withdrawals.lang @@ -30,6 +30,7 @@ WithdrawalRefused=Retirada recusada WithdrawalRefusedConfirm=Você tem certeza que quer entrar com uma rejeição de retirada para a sociedade RefusedInvoicing=Cobrança da rejeição NoInvoiceRefused=Não carregue a rejeição +InvoiceRefused=Fatura recusada (Verificar a rejeição junto ao cliente) StatusWaiting=Aguardando StatusTrans=Enviado StatusRefused=Negado @@ -51,10 +52,10 @@ BankToReceiveWithdraw=Conta bancária para receber saques CreditDate=A crédito ShowWithdraw=Mostrar Retire IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se fatura não tem pelo menos um pagamento retirada ainda processado, não vai ser definido como pago para permitir a gestão de remoção prévia. -DoStandingOrdersBeforePayments=Essa guia permite que você solicite uma ordem permanente. Depois de concluído, você pode digitar o pagamento para fechar a fatura. WithdrawalFile=Arquivo Retirada SetToStatusSent=Defina o status "arquivo enviado" ThisWillAlsoAddPaymentOnInvoice=Isto também se aplica aos pagamentos de faturas e classificá-los como "Paid" +StatisticsByLineStatus=Estatísticas por situação de linhas InfoCreditSubject=Pagamento pendente pelo banco InfoCreditMessage=O pedido pendente foi pago pelo banco
Dados de pagamento:% s InfoTransSubject=Transmissão de pedido pendente para o banco diff --git a/htdocs/langs/pt_BR/workflow.lang b/htdocs/langs/pt_BR/workflow.lang index 1f532022dee..a815cc3188a 100644 --- a/htdocs/langs/pt_BR/workflow.lang +++ b/htdocs/langs/pt_BR/workflow.lang @@ -1,6 +1,6 @@ # Dolibarr language file - Source file is en_US - workflow WorkflowSetup=Configuração do módulo de Fluxo de Trabalho -WorkflowDesc=Este módulo foi projetado para modificar o comportamento de ações automáticas dentro a aplicação. Por padrão, o fluxo de trabalho e abilitado (você faz as coisas em ordem que você quiser). Você pode habilitar ações automáticas que são de seu interesse. +WorkflowDesc=Este módulo é concebido para modificar o comportamento de ações automáticas para aplicação. Por padrão, o fluxo de trabalho é aberto (você faz as coisas na ordem que você quiser). Você pode ativar as ações automáticas que você tem interesse. ThereIsNoWorkflowToModify=Não há fluxo de trabalho que você pode modificar para o módulo que você ativou. descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar uma ordem do cliente automaticamente, após uma proposta comercial é assinada descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Criar uma factura de cliente automaticamente após um proposta comercial é assinado diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang index 8a28a423f86..4c18ada3752 100644 --- a/htdocs/langs/pt_PT/bills.lang +++ b/htdocs/langs/pt_PT/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Pagamentos efectuados PaymentsBackAlreadyDone=Devolução de pagamentos efetuados PaymentRule=Estado do Pagamento PaymentMode=Forma de Pagamento -PaymentConditions=Tipo de Pagamento -PaymentConditionsShort=Tipo de Pagamento +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Montante a Pagar ValidatePayment=Validar pagamento PaymentHigherThanReminderToPay=Pagamento superior ao resto a pagar diff --git a/htdocs/langs/pt_PT/incoterm.lang b/htdocs/langs/pt_PT/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/pt_PT/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/pt_PT/printing.lang b/htdocs/langs/pt_PT/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/pt_PT/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang index 31d5119f907..aa68d1907b8 100644 --- a/htdocs/langs/pt_PT/projects.lang +++ b/htdocs/langs/pt_PT/projects.lang @@ -130,13 +130,15 @@ AddElement=Ligar ao elemento UnlinkElement=Desligar o elemento # Documents models DocumentModelBaleine=modelo de um projeto completo do relatório (logo. ..) -PlannedWorkload = Carga de trabalho planeada -WorkloadOccupation= Afectação da carga de trabalho +PlannedWorkload=Carga de trabalho planeada +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Procurar um projeto ProjectMustBeValidatedFirst=Primeiro deve validar o projeto ProjectDraft=Esboço de projetos FirstAddRessourceToAllocateTime=Associar um recuirso para alocar a hora -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang index 2365a67dac4..92e62558764 100644 --- a/htdocs/langs/ro_RO/bills.lang +++ b/htdocs/langs/ro_RO/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Plăţi deja efectuate PaymentsBackAlreadyDone=Plaţi Return deja efectuate PaymentRule=Mod de Plată PaymentMode=Tip de plată -PaymentConditions=Termen de plată -PaymentConditionsShort=Termen de plată +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Sumă de plată ValidatePayment=Validează plata PaymentHigherThanReminderToPay=Plată mai mare decât restul de plată diff --git a/htdocs/langs/ro_RO/incoterm.lang b/htdocs/langs/ro_RO/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/ro_RO/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/ro_RO/printing.lang b/htdocs/langs/ro_RO/printing.lang new file mode 100644 index 00000000000..92a4f5353fd --- /dev/null +++ b/htdocs/langs/ro_RO/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Imprimare directa +Module112000Desc=Activeaza Sistemul Imprimare directa\n\n +PrintingSetup=Configurarea Sistemuluii Imprimare directă +PrintingDesc=Acest modul adauga un buton de imprimare pentru a trimite documentele direct la o imprimantă ( fara deschiderea documentului in aplicatie) cu diferite module. +ModuleDriverSetup=Configurare Modul Driver +PrintingDriverDesc=Configurare variabile pentru driverul de imprimanta +ListDrivers=Lista driverelor +PrintTestDesc=Lista imprimantelor +FileWasSentToPrinter=Fișierul %s a fost trimis la imprimantă +NoActivePrintingModuleFound=Niciun modul activ de printare documente +PleaseSelectaDriverfromList=Selectati un driver din lista. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Imprimantă implicită +UserConf=Configurare pe utilizator +PRINTGCP=Google Cloud Print +PrintGCPDesc=Acest driver permite trimiterea documentelor direct la imprimanta cu Google Cloud Print. +PrintingDriverDescprintgcp=Configurare variabile pentru driverul imprimanta Google Cloud Print. +PrintTestDescprintgcp=Lista imprimantelor pentru Google Cloud Print +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Necunoscut +STATE_OFFLINE=Offline +STATE_DORMANT=Offline pentru o vreme +TYPE_GOOGLE=Google +TYPE_HP=Imprimanta HP +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Nume +GCP_displayName=Nume afişat +GCP_Id=Id Imprimanta +GCP_OwnerName=Nume Proprietar +GCP_State=Stare Imprimanta +GCP_connectionStatus=Stare Online +GCP_Type=Tip Imprimanta +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Configurarea modulului Imprimare directă +PrintIPPDesc=Acest driver permite trimiterea documentelor direct la o imprimanta. Este nevoie de un sistem Linux cu CUPS instalat. +PrintingDriverDescprintipp=Configurare variabile pentru driverul de imprimanta PrintPP. +PrintTestDescprintipp=Lista imprimantelor pentru driverele PrintPP +PRINTIPP_ENABLED=Afișare pictogramă "Print Direct" în listele de documente +PRINTIPP_HOST=Server print +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Parolă +NoPrinterFound=Nu există imprimante (verificați setarea CUPS) +FileWasSentToPrinter=Fișierul %s a fost trimis la imprimantă +NoDefaultPrinterDefined=Nicio imprimantă implicită definită +DefaultPrinter=Imprimantă implicită +Printer=Imprimanta +CupsServer=Server CUPS +IPP_Uri=Uri Imprimanta +IPP_Name=Nume Imprimanta +IPP_State=Stare Imprimanta +IPP_State_reason=Motiv Stare +IPP_State_reason1=Motiv 1 Stare +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Imprimanta Media +IPP_Supported=Tip Media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Oprita +STATE_IPP_paused=Pauza +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=Niciunul +MEDIA_IPP_stationery=Stationar +MEDIA_IPP_thermal=Termala +IPP_COLOR_print-black=Imprimanta BW diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang index 0be80ae35d4..0337f1f875e 100644 --- a/htdocs/langs/ro_RO/productbatch.lang +++ b/htdocs/langs/ro_RO/productbatch.lang @@ -10,7 +10,7 @@ batch_number=Lot / Număr de serie l_eatby=Data expirare l_sellby=Data vânzare DetailBatchNumber=Detalii Lot / Serie -DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d) +DetailBatchFormat=Lot/Serie: %s - Mananca de: %s - Vindem de: %s (Cant : %d) printBatch=Lot: %s printEatby=Expiră : %s printSellby=Vanzare: %s diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang index 35cd6613d46..0a803535194 100644 --- a/htdocs/langs/ro_RO/products.lang +++ b/htdocs/langs/ro_RO/products.lang @@ -250,7 +250,7 @@ PriceExpressionEditorHelp3=In ambele preturi produs/serviciu si furnizori sunt d PriceExpressionEditorHelp4=In pret produs/serviciu numai: #supplier_min_price#
In pret furnizor numai: #supplier_quantity# and #supplier_tva_tx# PriceMode=Mod preț PriceNumeric=Număr -DefaultPrice=Default price -ComposedProductIncDecStock=Increase/Decrease stock on parent change -ComposedProduct=Sub-product -MinSupplierPrice=Minimun supplier price +DefaultPrice=Preț Implicit +ComposedProductIncDecStock=Mărește/micșorează stoc pe schimbări sintetice +ComposedProduct=Sub-produs +MinSupplierPrice=Preț Minim furnizor diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang index 143ed2e0a43..5138b13125f 100644 --- a/htdocs/langs/ro_RO/projects.lang +++ b/htdocs/langs/ro_RO/projects.lang @@ -8,10 +8,10 @@ SharedProject=Toată lumea PrivateProject=Contacte proiect MyProjectsDesc=Această vedere este limitată la proiecte sau sarcini pentru care sunteţi contact(indiferent de tip). ProjectsPublicDesc=Această vedere prezintă toate proiectele la care aveţi permisiunea să le citiţi. -ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read. +ProjectsPublicTaskDesc=Această vedere prezintă toate proiectele şi activităţile care sunt permise să le citiţi. ProjectsDesc=Această vedere prezintă toate proiectele (permisiuni de utilizator va acorda permisiunea de a vizualiza totul). MyTasksDesc=Această vedere este limitată la proiecte sau sarcini pentru care sunteţi contact(indiferent de tip). -OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). +OnlyOpenedProject=Numai proiectele deschise sunt vizibile (proiecte cu statutul draft sau închise nu sunt vizibile). TasksPublicDesc=Această vedere prezintă toate proiectele şi activităţile care sunt permise să le citiţi. TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni de utilizator va acorda permisiunea de a vizualiza totul). ProjectsArea=Proiecte @@ -31,8 +31,8 @@ NoProject=Niciun proiect definit sau responsabil NbOpenTasks=Nr taskuri deschise NbOfProjects=Nr proiecte TimeSpent=Timp comsumat -TimeSpentByYou=Time spent by you -TimeSpentByUser=Time spent by user +TimeSpentByYou=Timpul consumat da tine +TimeSpentByUser=Timp consumat pe utilizator TimesSpent=Timpi consumaţi RefTask=Ref. Task LabelTask=Eticheta Task @@ -71,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista comenzi furnizori asociate la proie ListSupplierInvoicesAssociatedProject=Lista facturi furnizori asociate la proiect ListContractAssociatedProject=Lista contracte asociate la proiect ListFichinterAssociatedProject=Lista intervenţii asociate la proiectului -ListExpenseReportsAssociatedProject=List of expense reports associated with the project +ListExpenseReportsAssociatedProject=Lista rapoartelor cheltuieli asociate proiectului ListActionsAssociatedProject=Lista evenimentelor asociate la proiectului ActivityOnProjectThisWeek=Activitatea de pe proiect în această săptămână ActivityOnProjectThisMonth=Activitatea de pe proiect în această lună @@ -130,13 +130,15 @@ AddElement=Link către element UnlinkElement=Element nelegat # Documents models DocumentModelBaleine=Modelul de rapor al unui proiect complet t (logo. ..) -PlannedWorkload = Volum de lucru Planificat -WorkloadOccupation= Volum de lucru Procent +PlannedWorkload=Volum de lucru Planificat +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Obiecte asociate SearchAProject=Cauta proiect ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi ProjectDraft=Proiecte schiţă FirstAddRessourceToAllocateTime=Asociază o resursă la timpul alocat -InputPerTime=Input per time -InputPerDay=Input per day -TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s +InputPerDay=Intrare pe zi +InputPerWeek=Input per week +InputPerAction=Input per action +TimeAlreadyRecorded=Timpul consumat deja înregistrat pentru această sarcină / zi și utilizator %s diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang index 75c0b1969d3..232688c5b4d 100644 --- a/htdocs/langs/ro_RO/salaries.lang +++ b/htdocs/langs/ro_RO/salaries.lang @@ -10,4 +10,4 @@ SalariesPayments=Plati salarii ShowSalaryPayment=Arata plata salariu THM=Pret mediu pe ora TJM=Pret mediu zilnic -CurrentSalary=Current salary +CurrentSalary=Salariu curent diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang index 394853cb355..8e22013d8e4 100644 --- a/htdocs/langs/ro_RO/stocks.lang +++ b/htdocs/langs/ro_RO/stocks.lang @@ -47,7 +47,7 @@ PMPValue=Valoric PMP PMPValueShort=WAP EnhancedValueOfWarehouses=Stoc valoric UserWarehouseAutoCreate=Creaţi un stoc în mod automat atunci când se creează un utilizator -IndependantSubProductStock=Product stock and subproduct stock are independant +IndependantSubProductStock=Stocul de produse și stocul de subproduse sunt independente QtyDispatched=Cantitate dipecerizată QtyDispatchedShort=Cant Expediate QtyToDispatchShort=Cant de expediat @@ -111,7 +111,7 @@ WarehouseForStockDecrease=Depozitul %s va fi utilizat pentru scăderea st WarehouseForStockIncrease=Depozitul %s va fi utilizat pentru creşterea stocului ForThisWarehouse=Pentru acest depozit ReplenishmentStatusDesc=Aceasta este lista cu toate produsele având stocul mai mic decât stocul dorit (sau valoarea de alertă dacă casuţa "doar alertă " este bifată) și sugerăm să vă creaţi comenzi furnizor pentru a completa diferența. -ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here. +ReplenishmentOrdersDesc=Aceasta este lista tuturor comenzilor furnizori deschise, inclusiv produse predefinite. Doar comenzile deschise cu produse predefinite, astfel încât pot afecta stocurile, sunt vizibile aici. Replenishments=Reaprovizionări NbOfProductBeforePeriod=Cantitatea de produs %s în stoc înainte de perioada selectată (< %s) NbOfProductAfterPeriod=Cantitatea de produs %s în stoc după perioada selectată (> %s) diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang index f32deae8693..88c9d0a73a4 100644 --- a/htdocs/langs/ro_RO/trips.lang +++ b/htdocs/langs/ro_RO/trips.lang @@ -1,112 +1,112 @@ # Dolibarr language file - Source file is en_US - trips -ExpenseReport=Expense report -ExpenseReports=Expense reports -Trip=Expense report -Trips=Expense reports -TripsAndExpenses=Expenses reports -TripsAndExpensesStatistics=Expense reports statistics -TripCard=Expense report card -AddTrip=Create expense report -ListOfTrips=List of expense report +ExpenseReport=Raport Cheltuieli +ExpenseReports=Rapoarte Cheltuieli +Trip=Raport Cheltuieli +Trips=Rapoarte Cheltuieli +TripsAndExpenses=Rapoarte Cheltuieli +TripsAndExpensesStatistics=Statistici Rapoarte Cheltuieli +TripCard=Fisa Raport Cheltuieli +AddTrip=Creare Raport Cheltuieli +ListOfTrips=Listă rapoarte de cheltuieli ListOfFees=Lista note cheltuieli -NewTrip=New expense report +NewTrip= Raport de cheltuieli nou CompanyVisited=Societatea / Instituţia vizitată Kilometers=Kilometri FeesKilometersOrAmout=Valoarea sau km -DeleteTrip=Delete expense report -ConfirmDeleteTrip=Are you sure you want to delete this expense report ? -ListTripsAndExpenses=List of expense reports -ListToApprove=Waiting for approval -ExpensesArea=Expense reports area -SearchATripAndExpense=Search an expense report +DeleteTrip=Șterge raport de cheltuieli +ConfirmDeleteTrip=Sunteți sigur că doriți să ștergeți acest raport cheltuieli? +ListTripsAndExpenses=Listă rapoarte de cheltuieli +ListToApprove=În așteptare pentru aprobare +ExpensesArea=Rapoarte de cheltuieli +SearchATripAndExpense=Căutați un raport de cheltuieli ClassifyRefunded=Clasează "Rambursată" ExpenseReportWaitingForApproval=A new expense report has been submitted for approval ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s -TripId=Id expense report -AnyOtherInThisListCanValidate=Person to inform for validation. -TripSociete=Information company -TripSalarie=Informations user +TripId=ID Raport de cheltuieli +AnyOtherInThisListCanValidate=Persoana de informare pentru validare. +TripSociete=Informații companie +TripSalarie=Informații Utilizator TripNDF=Informations expense report -DeleteLine=Delete a ligne of the expense report -ConfirmDeleteLine=Are you sure you want to delete this line ? +DeleteLine=Ștergeo linie a raportului de cheltuieli +ConfirmDeleteLine=Sunteţi sigur că doriţi să ştergeţi această linie? PDFStandardExpenseReports=Standard template to generate a PDF document for expense report -ExpenseReportLine=Expense report line +ExpenseReportLine=Line raport de cheltuieli TF_OTHER=Altele -TF_TRANSPORTATION=Transportation +TF_TRANSPORTATION=Transport TF_LUNCH=Prânz -TF_METRO=Metro -TF_TRAIN=Train -TF_BUS=Bus -TF_CAR=Car -TF_PEAGE=Toll -TF_ESSENCE=Fuel +TF_METRO=Metrou +TF_TRAIN=Tren +TF_BUS=Autobuz +TF_CAR=Mașină +TF_PEAGE=Taxă +TF_ESSENCE=Combustibil TF_HOTEL=Hostel TF_TAXI=Taxi -ErrorDoubleDeclaration=You have declared another expense report into a similar date range. -ListTripsAndExpenses=List of expense reports -AucuneNDF=No expense reports found for this criteria -AucuneLigne=There is no expense report declared yet -AddLine=Add a line -AddLineMini=Add +ErrorDoubleDeclaration=Ați declarat un alt raport de cheltuieli într-un interval de timp similar. +ListTripsAndExpenses=Listă rapoarte de cheltuieli +AucuneNDF=Nu există rapoarte de cheltuieli pentru acest criteriu +AucuneLigne=Nu există încă nici un raport de cheltuieli declarate +AddLine=Adaugao linie +AddLineMini=Adaugă -Date_DEBUT=Period date start -Date_FIN=Period date end -ModePaiement=Payment mode -Note=Note -Project=Project +Date_DEBUT=Perioada Dată început +Date_FIN=Perioada Dată sfârşit +ModePaiement=Mod plata +Note=Notă +Project=Proiect -VALIDATOR=User to inform for approbation -VALIDOR=Approved by -AUTHOR=Recorded by -AUTHORPAIEMENT=Paied by -REFUSEUR=Denied by -CANCEL_USER=Canceled by +VALIDATOR=Utilizatorul de informat pentru aprobare +VALIDOR=Aprobat de +AUTHOR=Înregistrat de +AUTHORPAIEMENT=Platit de +REFUSEUR=Respins de +CANCEL_USER=Anulat de -MOTIF_REFUS=Reason -MOTIF_CANCEL=Reason +MOTIF_REFUS=Motiv +MOTIF_CANCEL=Motiv -DATE_REFUS=Deny date -DATE_SAVE=Validation date -DATE_VALIDE=Validation date -DateApprove=Approving date -DATE_CANCEL=Cancelation date -DATE_PAIEMENT=Payment date +DATE_REFUS=Dată respingere +DATE_SAVE=Dată validare +DATE_VALIDE=Dată validare +DateApprove=Data Aprobare +DATE_CANCEL=Data anulare +DATE_PAIEMENT=Data Plata -Deny=Deny -TO_PAID=Pay -BROUILLONNER=Reopen -SendToValid=Sent to approve -ModifyInfoGen=Edit -ValidateAndSubmit=Validate and submit for approval +Deny=Respinge +TO_PAID=Plăteşte +BROUILLONNER=Redeschide +SendToValid=Trimis la aprobare +ModifyInfoGen=Editare +ValidateAndSubmit=Validareaza și trimite pentru aprobare -NOT_VALIDATOR=You are not allowed to approve this expense report -NOT_AUTHOR=You are not the author of this expense report. Operation cancelled. +NOT_VALIDATOR=Nu aveti permisiunea să aprobati acest raport de cheltuieli +NOT_AUTHOR=Tu nu esti autorul acestui raport de cheltuieli. Operatiune anulata. -RefuseTrip=Deny an expense report -ConfirmRefuseTrip=Are you sure you want to deny this expense report ? +RefuseTrip=Respinge un raport de cheltuieli +ConfirmRefuseTrip=Sunteți sigur că doriți să respingeti acest raport cheltuieli? -ValideTrip=Approve expense report -ConfirmValideTrip=Are you sure you want to approve this expense report ? +ValideTrip=Aproba raport de cheltuieli +ConfirmValideTrip=Sunteți sigur că doriți să aprobati acest raport cheltuieli? -PaidTrip=Pay an expense report -ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ? +PaidTrip=Plăste un raport de cheltuieli +ConfirmPaidTrip=Sunteţi sigur că doriţi sa clasati acest raport de cheltuieli ca "Platit" ? -CancelTrip=Cancel an expense report -ConfirmCancelTrip=Are you sure you want to cancel this expense report ? +CancelTrip=Anulează un raport de cheltuieli +ConfirmCancelTrip=Sunteți sigur că doriți să anulați acest raport cheltuieli? -BrouillonnerTrip=Move back expense report to status "Draft"n +BrouillonnerTrip=Muta Inapoi raportul de cheltuieli la statutul de "Draft" ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ? -SaveTrip=Validate expense report +SaveTrip=Valideaza raport de cheltuieli ConfirmSaveTrip=Are you sure you want to validate this expense report ? -Synchro_Compta=NDF <-> Compte +Synchro_Compta=NDF <-> Cont TripSynch=Synchronisation : Notes de frais <-> Compte courant TripToSynch=Notes de frais à intégrer dans la compta AucuneTripToSynch=Aucune note de frais n'est en statut "Payée". -ViewAccountSynch=Voir le compte +ViewAccountSynch=Vezi Contul ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant? ndfToAccount=Note de frais - Intégration @@ -115,12 +115,12 @@ ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du co AccountToNdf=Note de frais - Retrait LINE_NOT_ADDED=Ligne non ajoutée : -NO_PROJECT=Aucun projet sélectionné. -NO_DATE=Aucune date sélectionnée. -NO_PRICE=Aucun prix indiqué. +NO_PROJECT=Niciun proiect selectat +NO_DATE=Nicio data selectata +NO_PRICE=Nici unul pret indicat. -TripForValid=à Valider -TripForPaid=à Payer -TripPaid=Payée +TripForValid=De validat +TripForPaid=De platit +TripPaid=Platit NoTripsToExportCSV=No expense report to export for this period. diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang index 35392a8c81e..a7eac867c68 100644 --- a/htdocs/langs/ru_RU/bills.lang +++ b/htdocs/langs/ru_RU/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Платежи уже сделаны PaymentsBackAlreadyDone=Payments back already done PaymentRule=Правила оплаты PaymentMode=Тип платежа -PaymentConditions=Условия платежа -PaymentConditionsShort=Условия платежа +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Сумма платежа ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Платеж больше, чем в напоминании об оплате diff --git a/htdocs/langs/ru_RU/incoterm.lang b/htdocs/langs/ru_RU/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/ru_RU/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/ru_RU/printing.lang b/htdocs/langs/ru_RU/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/ru_RU/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang index 91a4da8d284..6fcad543512 100644 --- a/htdocs/langs/ru_RU/projects.lang +++ b/htdocs/langs/ru_RU/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=доклад полной проекта модели (logo. ..) -PlannedWorkload = Запланированная нагрузка -WorkloadOccupation= Workload affectation +PlannedWorkload=Запланированная нагрузка +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang index cbd81b2852b..583a431a013 100644 --- a/htdocs/langs/sk_SK/bills.lang +++ b/htdocs/langs/sk_SK/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Platby neurobili PaymentsBackAlreadyDone=Platby späť neurobili PaymentRule=Platba pravidlo PaymentMode=Typ platby -PaymentConditions=Termín vyplatenia -PaymentConditionsShort=Termín vyplatenia +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Suma platby ValidatePayment=Overenie platby PaymentHigherThanReminderToPay=Platobné vyššia než upomienke na zaplatenie diff --git a/htdocs/langs/sk_SK/incoterm.lang b/htdocs/langs/sk_SK/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/sk_SK/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/sk_SK/printing.lang b/htdocs/langs/sk_SK/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/sk_SK/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang index 8963a13c602..d1405991f2f 100644 --- a/htdocs/langs/sk_SK/projects.lang +++ b/htdocs/langs/sk_SK/projects.lang @@ -130,13 +130,15 @@ AddElement=Odkaz na elementu UnlinkElement=Unlink element # Documents models DocumentModelBaleine=Kompletné projektu model zostavy (logo. ..) -PlannedWorkload = Plánované zaťaženie -WorkloadOccupation= Pracovná záťaž pretvárka +PlannedWorkload=Plánované zaťaženie +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Odkazujúce objekty SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang index 7f5af4fc0d5..7f5c104ae7a 100644 --- a/htdocs/langs/sl_SI/bills.lang +++ b/htdocs/langs/sl_SI/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Izvršena plačila PaymentsBackAlreadyDone=Vrnitev plačila že izvršena PaymentRule=Pravilo plačila PaymentMode=Način plačila -PaymentConditions=Rok plačila -PaymentConditionsShort=Rok plačila +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Znesek plačila ValidatePayment=Potrdi plačilo PaymentHigherThanReminderToPay=Plačilo višje od opomina diff --git a/htdocs/langs/sl_SI/incoterm.lang b/htdocs/langs/sl_SI/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/sl_SI/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang index 05e51e48ef4..824579c3114 100644 --- a/htdocs/langs/sl_SI/install.lang +++ b/htdocs/langs/sl_SI/install.lang @@ -156,7 +156,7 @@ LastStepDesc=Zadnji korak: Tukaj določite uporabniško ime in ActivateModule=Vključite modul %s ShowEditTechnicalParameters=Kliknite tukaj za prikaz/popravek naprednih parametrov (expertni način) WarningUpgrade=Pozor:\nAli ste najprej naredili varnostno kopijo baze podatkov ?\nTo je zelo priporočeno: na primer zaradi nekaterih hroščev v sistemu baze podatkov (na primer mysql verzija 5.5.40), lahko med tem postopkom izgubite nekatere podatke ali tabele, zato je priporočeno imeti celotno kopijo vaše baze podatkov pred začetkom migracije.\n\nKliknite OK za začetek procesa migracije... -ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s) +ErrorDatabaseVersionForbiddenForMigration=Verzija vaše baze podatkov je %s. Vsebuje kritičnega hrošča, ki povzroči izgubo podatkov, če naredite strukturno spremembo baze, kot jo zahteva postopek migracije. Zato migracija ne bo dovoljena, dokler ne posodobite baze na višjo stabilno verzijo (seznam znanih hroščastih verzij: %s) ######### # upgrade diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang index a41f62aba48..0b0e4a38d9a 100644 --- a/htdocs/langs/sl_SI/main.lang +++ b/htdocs/langs/sl_SI/main.lang @@ -141,7 +141,7 @@ Cancel=Razveljavi Modify=Spremeni Edit=Uredi Validate=Potrdi -ValidateAndApprove=Validate and Approve +ValidateAndApprove=Potrdi in odobri ToValidate=Za potrditev Save=Shrani SaveAs=Shrani kot @@ -159,7 +159,7 @@ Search=Išči SearchOf=Iskanje Valid=Veljaven Approve=Potrdi -Disapprove=Disapprove +Disapprove=Prekliči odobritev ReOpen=Ponovno odpri Upload=Dodaj datoteko ToLink=Povezava @@ -221,7 +221,7 @@ Cards=Kartice Card=Kartica Now=Zdaj Date=Datum -DateAndHour=Date and hour +DateAndHour=Datum in ura DateStart=Začetni datum DateEnd=Končni datum DateCreation=Datum kreiranja @@ -298,7 +298,7 @@ UnitPriceHT=Cena enote (neto) UnitPriceTTC=Cena enote PriceU=C.E. PriceUHT=C.E. (neto) -AskPriceSupplierUHT=P.U. HT Requested +AskPriceSupplierUHT=Zahtevan P.U. HT PriceUTTC=C.E. Amount=Znesek AmountInvoice=Znesek računa @@ -525,7 +525,7 @@ DateFromTo=Od %s do %s DateFrom=Od %s DateUntil=Do %s Check=Preveri -Uncheck=Uncheck +Uncheck=Odznači Internal=Interno External=Eksterno Internals=Interni @@ -693,7 +693,7 @@ PublicUrl=Javni URL AddBox=Dodaj okvir SelectElementAndClickRefresh=Izberi element in klikni osveži PrintFile=Natisni datoteko %s -ShowTransaction=Show transaction +ShowTransaction=Prikaži transakcijo # Week day Monday=Ponedeljek Tuesday=Torek diff --git a/htdocs/langs/sl_SI/printing.lang b/htdocs/langs/sl_SI/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/sl_SI/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang index 86aa5c2da19..ece1a228e71 100644 --- a/htdocs/langs/sl_SI/projects.lang +++ b/htdocs/langs/sl_SI/projects.lang @@ -130,13 +130,15 @@ AddElement=Povezava do elementa UnlinkElement=Nepovezan element # Documents models DocumentModelBaleine=Model poročila za celoten projekt (logo...) -PlannedWorkload = Planirana delovna obremenitev -WorkloadOccupation= Pretvarjanje delovne obremenitve +PlannedWorkload=Planirana delovna obremenitev +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Referenčni objekti SearchAProject=Iskanje projekta ProjectMustBeValidatedFirst=Projekt mora biti najprej potrjen ProjectDraft=Osnutek projekta FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang index 7232f00e91c..69e1510ca44 100644 --- a/htdocs/langs/sq_AL/bills.lang +++ b/htdocs/langs/sq_AL/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/sq_AL/incoterm.lang b/htdocs/langs/sq_AL/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/sq_AL/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/sq_AL/printing.lang b/htdocs/langs/sq_AL/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/sq_AL/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/sq_AL/projects.lang +++ b/htdocs/langs/sq_AL/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang index 2228c0a85ef..549fcce7940 100644 --- a/htdocs/langs/sv_SE/bills.lang +++ b/htdocs/langs/sv_SE/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Betalningar redan gjort PaymentsBackAlreadyDone=Återbetalningar är utförda tidigare PaymentRule=Betalningsregel PaymentMode=Betalningssätt -PaymentConditions=Betalningsvillkor -PaymentConditionsShort=Betalningsvillkor +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Betalningsbelopp ValidatePayment=Bekräfta betalning PaymentHigherThanReminderToPay=Betalning högre än påminnelse att betala diff --git a/htdocs/langs/sv_SE/incoterm.lang b/htdocs/langs/sv_SE/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/sv_SE/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/sv_SE/printing.lang b/htdocs/langs/sv_SE/printing.lang new file mode 100644 index 00000000000..22d1d42401b --- /dev/null +++ b/htdocs/langs/sv_SE/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direkt utskrift +Module112000Desc=Aktivera System för Direkt Utskrift +PrintingSetup=Inställningar av System för Direkt Utskrift +PrintingDesc=Denna modul lägger till en Utskrift-knapp i diverse moduler för att skicka dokument direkt till en skrivare (utan att öppna dokumentet i någon tillämpning). +ModuleDriverSetup=Inställningar för Modul drivrutiner +PrintingDriverDesc=Konfigurationsvariabler för skrivardrivrutin. +ListDrivers=Lista över drivrutiner +PrintTestDesc=Lista över skrivare +FileWasSentToPrinter=Fil %s skickades till utskrift +NoActivePrintingModuleFound=Ingen aktiv modul för utskrift av dokumentet +PleaseSelectaDriverfromList=Var god välj en drivrutin från listan. +SetupDriver=Inställningar av drivrutin +TestDriver=Test +TargetedPrinter=Målskrivare +UserConf=Inställningar per användare +PRINTGCP=Google Cloud Print +PrintGCPDesc=Denna drivrutin skickar dokument direkt till en skrivare med Google Cloud Print. +PrintingDriverDescprintgcp=Konfigurationsvariabler för skrivardrivrutin Google Cloud Print. +PrintTestDescprintgcp=Lista över skrivare för Google Cloud Print. +PRINTGCP_LOGIN=Google konto login +PRINTGCP_PASSWORD=Google konto lösenord +STATE_ONLINE=Online +STATE_UNKNOWN=Okänd +STATE_OFFLINE=Offline +STATE_DORMANT=Offline rätt länge +TYPE_GOOGLE=Google +TYPE_HP=HP-skrivare +TYPE_DOCS=DOCS +TYPE_DRIVE=Google drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Namn +GCP_displayName=Visningsnamn +GCP_Id=Skrivar id +GCP_OwnerName=Ägar namn +GCP_State=Skrivaretillstånd +GCP_connectionStatus=Ansluten +GCP_Type=Skrivar typ +PRINTIPP=PrintIPP-drivrutin +PrintIPPSetup=Inställningar Direct Print Module +PrintIPPDesc=Denna drivrutin skickar dokument direkt till en skrivare. Den kräver ett Linux-system med CUPS. +PrintingDriverDescprintipp=Konfigurationsvariabler för skrivardrivrutin PrintIPP +PrintTestDescprintipp=Lista över skrivare för drivrutin PrintIPP. +PRINTIPP_ENABLED=Visa ikonför "Direktutskrift" i dokumentlista +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Inlogg +PRINTIPP_PASSWORD=Lösenord +NoPrinterFound=Ingen skrivare funnen (kontrollera CUPS-inställningar) +FileWasSentToPrinter=Fil %s skickades till utskrift +NoDefaultPrinterDefined=Ingen standarskrivare är definerad +DefaultPrinter=Standard skrivare +Printer=Skrivare +CupsServer=CUPS server +IPP_Uri=Printer Uri +IPP_Name=Skrivarnamn +IPP_State=Skrivartillstånd +IPP_State_reason=Ange orsak +IPP_State_reason1=Ange orsak1 +IPP_BW=Svartvit +IPP_Color=Färg +IPP_Device=Enhet +IPP_Media=Utskriftmedia +IPP_Supported=Papperstyp +STATE_IPP_idle=Vilande +STATE_IPP_stopped=Stannad +STATE_IPP_paused=Pausad +STATE_IPP_toner-low-report=Toner låg nivå +STATE_IPP_none=Ingen +MEDIA_IPP_stationery=Papperstyp +MEDIA_IPP_thermal=Termisk +IPP_COLOR_print-black=BW-skrivare diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang index cdec5ad6557..af391db2150 100644 --- a/htdocs/langs/sv_SE/projects.lang +++ b/htdocs/langs/sv_SE/projects.lang @@ -130,13 +130,15 @@ AddElement=Länk till inslag UnlinkElement=Ta bort länk elementet # Documents models DocumentModelBaleine=En fullständig projektets rapport modellen (logo. ..) -PlannedWorkload = Planerad arbetsbelastning -WorkloadOccupation= Arbetsbelastning affektation +PlannedWorkload=Planerad arbetsbelastning +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Med hänvisning objekt SearchAProject=Sök ett projekt ProjectMustBeValidatedFirst=Projekt måste valideras först ProjectDraft=Utkast projekt FirstAddRessourceToAllocateTime=Associera en resurse att avsätta tid -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang index 7232f00e91c..69e1510ca44 100644 --- a/htdocs/langs/sw_SW/bills.lang +++ b/htdocs/langs/sw_SW/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/sw_SW/projects.lang +++ b/htdocs/langs/sw_SW/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang index 7232f00e91c..69e1510ca44 100644 --- a/htdocs/langs/th_TH/bills.lang +++ b/htdocs/langs/th_TH/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/th_TH/incoterm.lang b/htdocs/langs/th_TH/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/th_TH/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/th_TH/printing.lang b/htdocs/langs/th_TH/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/th_TH/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/th_TH/projects.lang +++ b/htdocs/langs/th_TH/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang index 0520ecb6de7..d3398bfc410 100644 --- a/htdocs/langs/tr_TR/agenda.lang +++ b/htdocs/langs/tr_TR/agenda.lang @@ -25,7 +25,7 @@ MenuToDoMyActions=Sonlanmayan etkinliklerim MenuDoneMyActions=Sonlanan etkinliklerim ListOfEvents=Etkinlik listesi (iç takvim) ActionsAskedBy=Etkinliği bildiren -ActionsToDoBy=Etkinlikten etkilenen +ActionsToDoBy=Etkinlik için görevlendirilen ActionsDoneBy=Etkinliği yapan ActionsForUser=Kullanıcı etkinlikleri ActionsForUsersGroup=Grupun tüm üyelerine ait etkinlikler diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang index 75337d23cc2..b4dfe964b99 100644 --- a/htdocs/langs/tr_TR/bills.lang +++ b/htdocs/langs/tr_TR/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Halihazırda yapılmış ödemeler PaymentsBackAlreadyDone=Zaten yapılmış geri ödemeler PaymentRule=Ödeme kuralı PaymentMode=Ödeme türü -PaymentConditions=Ödeme şartı -PaymentConditionsShort=Ödeme şartı +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Ödeme tutarı ValidatePayment=Ödeme doğrula PaymentHigherThanReminderToPay=Ödeme hatırlatmasından daha yüksek ödeme diff --git a/htdocs/langs/tr_TR/incoterm.lang b/htdocs/langs/tr_TR/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/tr_TR/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/tr_TR/printing.lang b/htdocs/langs/tr_TR/printing.lang new file mode 100644 index 00000000000..087b9d2a8a4 --- /dev/null +++ b/htdocs/langs/tr_TR/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Doğrudan yazdırma +Module112000Desc=Doğrudan Yazdırma Sistemini Engelle +PrintingSetup=Doğrudan Yazdırma Sistemi Ayarları +PrintingDesc=Bu modül, çeşitli modüllerde belgeleri doğrudan yazıcıya göndermek için bir Yazdırma tuşu ekler (belge uygulamada açılmadan) +ModuleDriverSetup=Modül Sürücüsü Ayarları +PrintingDriverDesc=Yazıcı sürücüsü değişkenlerinin ayarları +ListDrivers=Sürücü listesi +PrintTestDesc=Yazıcı Listesi +FileWasSentToPrinter=%s Dosyası yazıcıya gönderilmiştir +NoActivePrintingModuleFound=Belge yazdıracak etkin modül yok +PleaseSelectaDriverfromList=Lütfen listeden bir sürücü seçin. +SetupDriver=Sürücü kurulumu +TestDriver=Test +TargetedPrinter=Hedeflenen yazıcı +UserConf=Kişi başına ayarlar +PRINTGCP=Google Bulut Yazdırma +PrintGCPDesc=Bu sürücü belgelerin Google Bulut Yazdırma ile doğrudan bir yazıcıya gönderilmesini sağlar. +PrintingDriverDescprintgcp=Google Bulut Yazdırmanın yazıcı sürücüsü yapılandırma değişkenleri. +PrintTestDescprintgcp=Google Bulut Yazdırma için Yazıcı Listesi. +PRINTGCP_LOGIN=Google Hesabı Oturum Açma +PRINTGCP_PASSWORD=Google Hesabı Parolası +STATE_ONLINE=Çevrimiçi +STATE_UNKNOWN=Bilinmeyen +STATE_OFFLINE=Çevrimdışı +STATE_DORMANT=Uzunca bir süre Çevrimdışı +TYPE_GOOGLE=Google +TYPE_HP=HP Yazıcı +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Adı +GCP_displayName=Adı göster +GCP_Id=Yazıcı ID +GCP_OwnerName=Sahip Adı +GCP_State=Yazıcı Durumu +GCP_connectionStatus=Çevrimiçi Durumu +GCP_Type=Yazıcı Türü +PRINTIPP=PrintIPP Sürücüsü +PrintIPPSetup=Doğrudan Yazdırma modülü kurulumu +PrintIPPDesc=Bu sürücü belgelerin doğrudan yazıcıya gönderilmesini sağlar. Bu işlem CUPS kurulu bir Linux sistemi gerektirir. +PrintingDriverDescprintipp=Yazdırma sürücüsü PrintIPP için yapılandırma değişkenleri. +PrintTestDescprintipp=PrintIPP sürücüsü için Yazıcı Listesi. +PRINTIPP_ENABLED=Belgele listelerinde "Doğrudan yazdır" simgesini göster +PRINTIPP_HOST=Yazma sunucusu +PRINTIPP_PORT=Port +PRINTIPP_USER=Oturum açma +PRINTIPP_PASSWORD=Parola +NoPrinterFound=Yazıcı bulunamadı (CUPS ayarlarınızı denetleyin) +FileWasSentToPrinter=%s Dosyası yazıcıya gönderilmiştir +NoDefaultPrinterDefined=Tanımlı varsayılan yazıcı yok +DefaultPrinter=Varsayılan yazıcı +Printer=Yazıcı +CupsServer=CUPS sunucusu +IPP_Uri=Uri Yazıcısı +IPP_Name=Yazıcı Adı +IPP_State=Yazıcı Durumu +IPP_State_reason=Durum nedeni +IPP_State_reason1=Durum nedeni1 +IPP_BW=SB +IPP_Color=Renkli +IPP_Device=Aygıt +IPP_Media=Yazıcı ortamı +IPP_Supported=Ortam türü +STATE_IPP_idle=Boşta +STATE_IPP_stopped=Durduruldu +STATE_IPP_paused=Bekletildi +STATE_IPP_toner-low-report=Toner Azaldı +STATE_IPP_none=Hiçbiri +MEDIA_IPP_stationery=Antetli kağıt +MEDIA_IPP_thermal=Termal +IPP_COLOR_print-black=SB Yazıcı diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang index b9531646c0b..aa33b4ca11a 100644 --- a/htdocs/langs/tr_TR/projects.lang +++ b/htdocs/langs/tr_TR/projects.lang @@ -31,8 +31,8 @@ NoProject=Tanımlı ya da sahip olunan hiçbir proje yok NbOpenTasks=Açık görev sayısı NbOfProjects=Proje sayısı TimeSpent=Harcanan süre -TimeSpentByYou=Time spent by you -TimeSpentByUser=Time spent by user +TimeSpentByYou=Tarafınızdan harcanan süre +TimeSpentByUser=Kullanıcı tarafından harcanan süre TimesSpent=Harcanan süre RefTask=Görev ref. LabelTask=Görev etiketi @@ -130,13 +130,15 @@ AddElement=Öğeye bağlan UnlinkElement=Öğenin bağlantısını kaldır # Documents models DocumentModelBaleine=Eksiksiz bir proje rapor modeli (logo. ..) -PlannedWorkload = Planlı işyükü -WorkloadOccupation= İş yükü benzetmesi +PlannedWorkload=Planlı işyükü +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Yönlendirme nesneleri SearchAProject=Bir proje ara ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır ProjectDraft=Taslak projeler FirstAddRessourceToAllocateTime=Zaman ayırmak için bir kaynak ilişkilendirin -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang index 7232f00e91c..69e1510ca44 100644 --- a/htdocs/langs/uk_UA/bills.lang +++ b/htdocs/langs/uk_UA/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/uk_UA/incoterm.lang b/htdocs/langs/uk_UA/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/uk_UA/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/uk_UA/printing.lang b/htdocs/langs/uk_UA/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/uk_UA/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/uk_UA/projects.lang +++ b/htdocs/langs/uk_UA/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang index 7232f00e91c..69e1510ca44 100644 --- a/htdocs/langs/uz_UZ/bills.lang +++ b/htdocs/langs/uz_UZ/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done PaymentsBackAlreadyDone=Payments back already done PaymentRule=Payment rule PaymentMode=Payment type -PaymentConditions=Payment term -PaymentConditionsShort=Payment term +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Payment amount ValidatePayment=Validate payment PaymentHigherThanReminderToPay=Payment higher than reminder to pay diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang index 0a12f4c64b7..44d0d89687a 100644 --- a/htdocs/langs/uz_UZ/projects.lang +++ b/htdocs/langs/uz_UZ/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=A complete project's report model (logo...) -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang index d30df986f9f..88ea5adf51f 100644 --- a/htdocs/langs/vi_VN/bills.lang +++ b/htdocs/langs/vi_VN/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=Thanh toán đã được thực hiện PaymentsBackAlreadyDone=Thanh toán đã được thực hiện trở lại PaymentRule=Quy tắc thanh toán PaymentMode=Phương thức thanh toán -PaymentConditions=Thời hạn thanh toán -PaymentConditionsShort=Thời hạn thanh toán +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=Số tiền thanh toán ValidatePayment=Xác nhận thanh toán PaymentHigherThanReminderToPay=Thanh toán cao hơn so với lời nhắc nhở phải trả diff --git a/htdocs/langs/vi_VN/incoterm.lang b/htdocs/langs/vi_VN/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/vi_VN/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/vi_VN/printing.lang b/htdocs/langs/vi_VN/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/vi_VN/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang index 13576931acd..f818741658b 100644 --- a/htdocs/langs/vi_VN/projects.lang +++ b/htdocs/langs/vi_VN/projects.lang @@ -130,13 +130,15 @@ AddElement=Liên kết đến yếu tố UnlinkElement=Yếu tố Bỏ liên kết # Documents models DocumentModelBaleine=Mô hình báo cáo hoàn chỉnh của dự án (lôgô...) -PlannedWorkload = Tải tiến trình công việc đã dự định -WorkloadOccupation= Sử dụng tiến trình công việc +PlannedWorkload=Tải tiến trình công việc đã dự định +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Các đối tượng tham chiếu SearchAProject=Tìm kiếm một dự án ProjectMustBeValidatedFirst=Dự án phải được xác nhận đầu tiên ProjectDraft=Dự thảo dự án FirstAddRessourceToAllocateTime=Kết hợp một ressource để phân bổ thời gian -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang index 873e55377a3..3f1380ab37d 100644 --- a/htdocs/langs/zh_CN/bills.lang +++ b/htdocs/langs/zh_CN/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=付款已完成 PaymentsBackAlreadyDone=返回已经完成付款 PaymentRule=付款规则 PaymentMode=付款方式 -PaymentConditions=付款方式 -PaymentConditionsShort=付款方式 +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=付款金额 ValidatePayment=验证付款 PaymentHigherThanReminderToPay=付款支付更高的比提醒 diff --git a/htdocs/langs/zh_CN/incoterm.lang b/htdocs/langs/zh_CN/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/zh_CN/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/zh_CN/printing.lang b/htdocs/langs/zh_CN/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/zh_CN/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang index b8326f1613d..ac970564116 100644 --- a/htdocs/langs/zh_CN/projects.lang +++ b/htdocs/langs/zh_CN/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=一个完整的项目报告模型（logo. ..） -PlannedWorkload = 计划的工作量 -WorkloadOccupation= 工作量的分配 +PlannedWorkload=计划的工作量 +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=参考对象 SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang index 2bf9461e0e1..85f3950552a 100644 --- a/htdocs/langs/zh_TW/bills.lang +++ b/htdocs/langs/zh_TW/bills.lang @@ -74,8 +74,9 @@ PaymentsAlreadyDone=付款已完成 PaymentsBackAlreadyDone=Payments back already done PaymentRule=付款規則 PaymentMode=付款方式 -PaymentConditions=付款條件 -PaymentConditionsShort=付款天數 +PaymentTerm=Payment term +PaymentConditions=Payment terms +PaymentConditionsShort=Payment terms PaymentAmount=付款金額 ValidatePayment=Validate payment PaymentHigherThanReminderToPay=付款支付更高的比提醒 diff --git a/htdocs/langs/zh_TW/incoterm.lang b/htdocs/langs/zh_TW/incoterm.lang new file mode 100644 index 00000000000..2396d2acb0e --- /dev/null +++ b/htdocs/langs/zh_TW/incoterm.lang @@ -0,0 +1,7 @@ +Module210009Name=Incoterm +Module210009Desc=Add features to manage Incoterm +IncotermLabel=Incoterms +IncotermSetupTitle1=Feature +IncotermSetupTitle2=Status +IncotermSetup=Setup of module Incoterm +IncotermFunctionDesc=Activate Incoterm feature (Thirdparty, Proposal, Customer Order, Customer Invoice, Shipment, Supplier order) diff --git a/htdocs/langs/zh_TW/printing.lang b/htdocs/langs/zh_TW/printing.lang new file mode 100644 index 00000000000..f0cd2a40292 --- /dev/null +++ b/htdocs/langs/zh_TW/printing.lang @@ -0,0 +1,74 @@ +# Dolibarr language file - Source file is en_US - printing +Module112000Name=Direct Printing +Module112000Desc=Enable Direct Printing System +PrintingSetup=Setup of Direct Printing System +PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module. +ModuleDriverSetup=Setup Module Driver +PrintingDriverDesc=Configuration variables for printing driver. +ListDrivers=List of drivers +PrintTestDesc=List of Printers. +FileWasSentToPrinter=File %s was sent to printer +NoActivePrintingModuleFound=No active module to print document +PleaseSelectaDriverfromList=Please select a driver from list. +SetupDriver=Driver setup +TestDriver=Test +TargetedPrinter=Targeted printer +UserConf=Setup per user +PRINTGCP=Google Cloud Print +PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print. +PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print. +PrintTestDescprintgcp=List of Printers for Google Cloud Print. +PRINTGCP_LOGIN=Google Account Login +PRINTGCP_PASSWORD=Google Account Password +STATE_ONLINE=Online +STATE_UNKNOWN=Unknown +STATE_OFFLINE=Offline +STATE_DORMANT=Offline for quite a while +TYPE_GOOGLE=Google +TYPE_HP=HP Printer +TYPE_DOCS=DOCS +TYPE_DRIVE=Google Drive +TYPE_FEDEX=Fedex +TYPE_ANDROID_CHROME_SNAPSHOT=Android +TYPE_IOS_CHROME_SNAPSHOT=IOS +GCP_Name=Name +GCP_displayName=Display Name +GCP_Id=Printer Id +GCP_OwnerName=Owner Name +GCP_State=Printer State +GCP_connectionStatus=Online State +GCP_Type=Printer Type +PRINTIPP=PrintIPP Driver +PrintIPPSetup=Setup of Direct Print module +PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed. +PrintingDriverDescprintipp=Configuration variables for printing driver PrintIPP. +PrintTestDescprintipp=List of Printers for driver PrintIPP. +PRINTIPP_ENABLED=Show "Direct print" icon in document lists +PRINTIPP_HOST=Print server +PRINTIPP_PORT=Port +PRINTIPP_USER=Login +PRINTIPP_PASSWORD=Password +NoPrinterFound=No printers found (check your CUPS setup) +FileWasSentToPrinter=File %s was sent to printer +NoDefaultPrinterDefined=No default printer defined +DefaultPrinter=Default printer +Printer=Printer +CupsServer=CUPS Server +IPP_Uri=Printer Uri +IPP_Name=Printer Name +IPP_State=Printer State +IPP_State_reason=State reason +IPP_State_reason1=State reason1 +IPP_BW=BW +IPP_Color=Color +IPP_Device=Device +IPP_Media=Printer media +IPP_Supported=Type of media +STATE_IPP_idle=Idle +STATE_IPP_stopped=Stopped +STATE_IPP_paused=Paused +STATE_IPP_toner-low-report=Low Toner +STATE_IPP_none=None +MEDIA_IPP_stationery=Stationery +MEDIA_IPP_thermal=Thermal +IPP_COLOR_print-black=BW Printer diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang index 4c29cb68aad..d39fc8620ef 100644 --- a/htdocs/langs/zh_TW/projects.lang +++ b/htdocs/langs/zh_TW/projects.lang @@ -130,13 +130,15 @@ AddElement=Link to element UnlinkElement=Unlink element # Documents models DocumentModelBaleine=一個完整的項目報告模型（logo. ..） -PlannedWorkload = Planned workload -WorkloadOccupation= Workload affectation +PlannedWorkload=Planned workload +PlannedWorkloadShort=Workload +WorkloadOccupation=Workload assignation ProjectReferers=Refering objects SearchAProject=Search a project ProjectMustBeValidatedFirst=Project must be validated first ProjectDraft=Draft projects FirstAddRessourceToAllocateTime=Associate a ressource to allocate time -InputPerTime=Input per time InputPerDay=Input per day +InputPerWeek=Input per week +InputPerAction=Input per action TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index 548210abf7f..b7ab0a8bd71 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -54,6 +54,29 @@ $year=GETPOST("year","int")?GETPOST("year","int"):date("Y"); $month=GETPOST("month","int")?GETPOST("month","int"):date("m"); $week=GETPOST("week","int")?GETPOST("week","int"):date("W"); $day=GETPOST("day","int")?GETPOST("day","int"):date("d"); +$day = (int) $day; + +$startdayarray=dol_get_first_day_week($day, $month, $year); + +$prev = $startdayarray; +$prev_year = $prev['prev_year']; +$prev_month = $prev['prev_month']; +$prev_day = $prev['prev_day']; +$first_day = $prev['first_day']; +$first_month= $prev['first_month']; +$first_year = $prev['first_year']; +$week = $prev['week']; + +$next = dol_get_next_week($first_day, $week, $first_month, $first_year); +$next_year = $next['year']; +$next_month = $next['month']; +$next_day = $next['day']; + +// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1) +$firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year); +$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd'); + +$usertoprocess=$user; /* @@ -64,8 +87,55 @@ if ($action == 'addtime' && $user->rights->projet->creer) { $task = new Task($db); + $timetoadd=$_POST['task']; + if (empty($timetoadd)) + { + setEventMessage($langs->trans("ErrorTimeSpentIsEmpty"), 'errors'); + } + else + { + foreach($timetoadd as $taskid => $value) + { + foreach($value as $key => $val) + { + $amountoadd=$timetoadd[$taskid][$key]; + if (! empty($amountoadd)) + { + $tmpduration=explode(':',$amountoadd); + $newduration=0; + if (! empty($tmpduration[0])) $newduration+=($tmpduration[0] * 3600); + if (! empty($tmpduration[1])) $newduration+=($tmpduration[1] * 60); + if (! empty($tmpduration[2])) $newduration+=($tmpduration[2]); + if ($newduration > 0) + { + $task->fetch($taskid); + $task->progress = GETPOST($taskid . 'progress', 'int'); + $task->timespent_duration = $newduration; + $task->timespent_fk_user = $usertoprocess->id; + $task->timespent_date = dol_time_plus_duree($firstdaytoshow, $key, 'd'); + $result=$task->addTimeSpent($user); + if ($result < 0) + { + setEventMessages($task->error, $task->errors, 'errors'); + $error++; + break; + } + } + } + } + } + + if (! $error) + { + setEventMessage($langs->trans("RecordSaved")); + + // Redirect to avoid submit twice on back + header('Location: '.$_SERVER["PHP_SELF"].($projectid?'?id='.$projectid:'?').($mode?'&mode='.$mode:'')); + exit; + } + } } @@ -83,8 +153,6 @@ $taskstatic = new Task($db); $title=$langs->trans("TimeSpent"); if ($mine) $title=$langs->trans("MyTimeSpent"); -$usertoprocess=$user; - //$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,$mine,1); $projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess,0,1); // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project @@ -108,27 +176,6 @@ llxHeader("",$title,"",'','','',array('/core/js/timesheet.js')); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num); -$startdayarray=dol_get_first_day_week($day, $month, $year); - -$prev = $startdayarray; -$prev_year = $prev['prev_year']; -$prev_month = $prev['prev_month']; -$prev_day = $prev['prev_day']; -$first_day = $prev['first_day']; -$first_month= $prev['first_month']; -$first_year = $prev['first_year']; -$week = $prev['week']; - -$day = (int) $day; -$next = dol_get_next_week($first_day, $week, $first_month, $first_year); -$next_year = $next['year']; -$next_month = $next['month']; -$next_day = $next['day']; - -// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1) -$firstdaytoshow=dol_mktime(0,0,0,$first_month,$first_day,$first_year); -$lastdaytoshow=dol_time_plus_duree($firstdaytoshow, 7, 'd'); - $tmpday = $first_day; // Show navigation bar From 058042d09df972d3e215236f401c6c9aaa66af58 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Wed, 18 Mar 2015 17:52:17 +0100 Subject: [PATCH 131/412] NEW : update skeleton and class builder --- dev/skeletons/build_class_from_table.php | 41 ++++++++++++-- dev/skeletons/skeleton_class.class.php | 72 ++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 4 deletions(-) diff --git a/dev/skeletons/build_class_from_table.php b/dev/skeletons/build_class_from_table.php index 0b2e96daaac..ca10cf49ef0 100755 --- a/dev/skeletons/build_class_from_table.php +++ b/dev/skeletons/build_class_from_table.php @@ -174,7 +174,7 @@ $targetcontent=$sourcecontent; // Substitute class name $targetcontent=preg_replace('/skeleton_class\.class\.php/', $classmin.'.class.php', $targetcontent); $targetcontent=preg_replace('/\$element=\'skeleton\'/', '\$element=\''.$classmin.'\'', $targetcontent); -$targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$classmin.'\'', $targetcontent); +$targetcontent=preg_replace('/\$table_element=\'skeleton\'/', '\$table_element=\''.$tablenoprefix.'\'', $targetcontent); $targetcontent=preg_replace('/Skeleton_Class/', $classname, $targetcontent); // Substitute comments @@ -252,7 +252,13 @@ foreach($property as $key => $prop) if ($addfield) { $varprop.="\t\t\$sql.= \" "; - if ($prop['istime']) + if ($prop['field']=='datec') + { + $varprop.='"."\'".$this->db->idate(dol_now())."\'"."'; + if ($i < count($property)) $varprop.=","; + $varprop.='";'; + } + elseif ($prop['istime']) { $varprop.='".(! isset($this->'.$prop['field'].') || dol_strlen($this->'.$prop['field'].')==0?\'NULL\':"\'".$this->db->idate('; $varprop.="\$this->".$prop['field'].""; @@ -268,6 +274,12 @@ foreach($property as $key => $prop) if ($i < count($property)) $varprop.=","; $varprop.='";'; } + elseif ($prop['field']=='fk_user_mod' || $prop['field']=='fk_user_author') + { + $varprop.='".$user->id."'; + if ($i < count($property)) $varprop.=","; + $varprop.='";'; + } else { $varprop.='".(! isset($this->'.$prop['field'].')?\'NULL\':"\'".'; @@ -289,11 +301,17 @@ $i=0; foreach($property as $key => $prop) { $i++; - if ($prop['field'] != 'rowid' && $prop['field'] != 'id') + if ($prop['field'] != 'rowid' && $prop['field'] != 'id' && $prop['field'] != 'datec' && $prop['field'] != 'fk_user_author') { $varprop.="\t\t\$sql.= \" "; $varprop.=$prop['field'].'='; - if ($prop['istime']) + if ($prop['field']=='tms') { + $varprop.='".(dol_strlen($this->'.$prop['field'].')!=0 ? "\'".$this->db->idate('; + $varprop.='$this->'.$prop['field']; + $varprop.=')."\'" : "\'".$this->db->idate(dol_now())."\'").'; + $varprop.='"'; + } + elseif ($prop['istime']) { // (dol_strlen($this->datep)!=0 ? "'".$this->db->idate($this->datep)."'" : 'null') $varprop.='".(dol_strlen($this->'.$prop['field'].')!=0 ? "\'".$this->db->idate('; @@ -301,6 +319,9 @@ foreach($property as $key => $prop) $varprop.=')."\'" : \'null\').'; $varprop.='"'; } + elseif ($prop['field']=='fk_user_mod') { + $varprop.='".$user->id."'; + } else { $varprop.="\"."; @@ -325,6 +346,7 @@ $targetcontent=preg_replace('/\$sql\.= " t\.field2";/', '', $targetcontent); // Substitute select set parameters $varprop="\n"; +$varpropline="\n"; $cleanparam=''; $i=0; foreach($property as $key => $prop) @@ -338,11 +360,22 @@ foreach($property as $key => $prop) if ($prop['istime']) $varprop.=')'; $varprop.=";"; $varprop.="\n"; + + $varpropline.="\t\t\t\t\$line->".$prop['field']." = "; + if ($prop['istime']) $varpropline.='$this->db->jdate('; + $varpropline.='$obj->'.$prop['field']; + if ($prop['istime']) $varpropline.=')'; + $varpropline.=";"; + $varpropline.="\n"; } } $targetcontent=preg_replace('/\$this->prop1 = \$obj->field1;/', $varprop, $targetcontent); $targetcontent=preg_replace('/\$this->prop2 = \$obj->field2;/', '', $targetcontent); +//Substirute fetchAll +$targetcontent=preg_replace('/\$line->prop1 = \$obj->field1;/', $varpropline, $targetcontent); +$targetcontent=preg_replace('/\$line->prop2 = \$obj->field2;/', '', $targetcontent); + // Substitute initasspecimen parameters $varprop="\n"; diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php index c1710165066..c9e20317695 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -1,6 +1,7 @@ * Copyright (C) 2014 Juanjo Menent + * Copyright (C) 2015 Florian Henry * Copyright (C) ---Put here your own copyright and developer email--- * * This program is free software; you can redistribute it and/or modify @@ -41,6 +42,8 @@ class Skeleton_Class extends CommonObject var $element='skeleton'; //!< Id that identify managed objects var $table_element='skeleton'; //!< Name of table without prefix where object is stored + var $lines=array(); + var $id; var $prop1; var $prop2; @@ -175,6 +178,69 @@ class Skeleton_Class extends CommonObject } } + /** + * Load object in memory from the database + * + * @param string $sortorder Sort Order + * @param string $sortfield Sort field + * @param int $limit offset limit + * @param int $offset offset limit + * @param array $filter filter array + * @return int <0 if KO, >0 if OK + */ + function fetchAll($sortorder, $sortfield, $limit, $offset, $filter = array()) + { + global $langs; + $sql = "SELECT"; + $sql.= " t.rowid,"; + $sql.= " t.field1,"; + $sql.= " t.field2"; + //... + $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t"; + + // Manage filter + $sqlwhere=array(); + if (count($filter)>0) { + foreach ( $filter as $key => $value ) { + //$sqlwhere []= ' AND '. $key . ' LIKE \'%' . $this->db->escape($value) . '%\''; + } + } + if (count($sqlwhere)>0) { + $sql.= ' WHERE '.implode(' AND ', $sqlwhere); + } + $sql .= " ORDER BY " . $sortfield . " " . $sortorder . " " . $this->db->plimit($limit + 1, $offset); + + $this->lines = array (); + + dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG); + $resql=$this->db->query($sql); + if ($resql) + { + $num = $this->db->num_rows($resql); + + while ($obj = $this->db->fetch_object($resql)) + { + $line=new Skeleton_ClassLine(); + + $line->id = $obj->rowid; + $line->prop1 = $obj->field1; + $line->prop2 = $obj->field2; + + $this->line[]=$line; + //... + } + $this->db->free($resql); + + return $num; + } + else + { + $this->error="Error ".$this->db->lasterror(); + dol_syslog(get_class($this)."::fetchAll ".$this->error, LOG_ERR); + return -1; + } + } + /** * Update object into database @@ -368,3 +434,9 @@ class Skeleton_Class extends CommonObject } } + +class Skeleton_ClassLine { + var $id; + var $prop1; + var $prop2; +} From a2676e57684fdea66934291b698199a91204072b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Mar 2015 21:06:55 +0100 Subject: [PATCH 132/412] Fix: the type of notification sent was not filled --- htdocs/core/class/notify.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index db88671f7ff..ac63b3e48c5 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -423,7 +423,7 @@ class Notify if ($mailfile->sendfile()) { $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, objet_id, email)"; - $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$object->socid.", null, '".$obj->type."', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')"; + $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$object->socid.", null, 'email', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')"; if (! $this->db->query($sql)) { dol_print_error($this->db); From 6ceda02eaae3a8972a9fc6cda57ad18bc4104a53 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 18 Mar 2015 21:44:57 +0100 Subject: [PATCH 133/412] NEW: Enhancement of module 'Notification by Email'. Show nb of notifications set. Can set several emails. Can set a threshold on amount for notifications. Add notification on supplier order validation. --- htdocs/admin/commande.php | 22 +- htdocs/admin/facture.php | 29 +- htdocs/admin/notification.php | 143 +++++++- htdocs/admin/propal.php | 23 +- htdocs/admin/supplier_invoice.php | 38 ++- htdocs/admin/supplier_order.php | 39 ++- htdocs/comm/askpricesupplier/card.php | 2 +- htdocs/comm/propal.php | 2 +- htdocs/commande/card.php | 14 +- htdocs/compta/facture.php | 2 +- htdocs/core/class/html.form.class.php | 26 +- htdocs/core/class/notify.class.php | 315 ++++++++++-------- htdocs/core/lib/admin.lib.php | 8 +- ..._50_modNotification_Notification.class.php | 10 +- htdocs/expedition/card.php | 8 +- htdocs/fourn/commande/card.php | 2 +- htdocs/fourn/facture/card.php | 2 +- .../install/mysql/migration/3.7.0-3.8.0.sql | 42 +++ .../mysql/tables/llx_c_action_trigger.sql | 2 +- htdocs/langs/en_US/admin.lang | 7 +- htdocs/langs/en_US/other.lang | 2 + htdocs/societe/notify/card.php | 30 +- htdocs/theme/eldy/style.css.php | 6 +- 23 files changed, 541 insertions(+), 233 deletions(-) diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 7c0d7fdbf9c..2484df559e2 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -622,9 +622,29 @@ else } print '
'; - print '
'; + +/* + * Notifications + */ + +print_titre($langs->trans("Notifications")); +print ''; +print ''; +print ''; +print ''; +print ''; +print "\n"; + +print '\n"; + +print '
'.$langs->trans("Parameter").' 
'; +print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; +print '		'; +print "
'; + + llxFooter(); $db->close(); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 298c0beddf5..51c627c277b 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -171,7 +171,7 @@ else if ($action == 'setdoc') // on passe donc par une variable pour avoir un affichage coherent $conf->global->FACTURE_ADDON_PDF = $value; } - + // On active le modele $ret = delDocumentModel($value, $type); if ($ret > 0) @@ -341,7 +341,7 @@ foreach ($dirmodels as $reldir) // Check if there is a filter on country preg_match('/\-(.*)_(.*)$/',$classname,$reg); if (! empty($reg[2]) && $reg[2] != strtoupper($mysoc->country_code)) continue; - + $classname = preg_replace('/\-.*$/','',$classname); if (! class_exists($classname) && is_readable($dir.$filebis) && (preg_match('/mod_/',$filebis) || preg_match('/mod_/',$classname)) && substr($filebis, dol_strlen($filebis)-3, 3) == 'php') { @@ -416,7 +416,7 @@ foreach ($dirmodels as $reldir) $htmltooltip.=$langs->trans($module->error).'
'; } } - + // Example for credit invoice $facture->type=2; $nextval=$module->getNextValue($mysoc,$facture); @@ -630,7 +630,6 @@ print '
'; /* * Modes de reglement - * */ print '
'; print_titre($langs->trans("SuggestedPaymentModesIfNotDefinedInInvoice")); @@ -811,7 +810,27 @@ print ''."\n"; print "\n"; -//dol_fiche_end(); +/* + * Notifications + */ +print '
'; +print_titre($langs->trans("Notifications")); +print ''; +print ''; +print ''; +print ''; +print ''; +print "\n"; + +print '\n"; + +print '
'.$langs->trans("Parameter").' 
'; +print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; +print '		'; +print "
'; + +dol_fiche_end(); + llxFooter(); diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 03832cdb861..58fd2442357 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -24,6 +24,7 @@ */ require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Notification.class.php'; @@ -48,25 +49,56 @@ $action = GETPOST("action"); if ($action == 'setvalue' && $user->admin) { + $db->begin(); + $result=dolibarr_set_const($db, "NOTIFICATION_EMAIL_FROM", $_POST["email_from"], 'chaine', 0, '', $conf->entity); if ($result < 0) $error++; if (! $error) { + //var_dump($_POST); foreach($_POST as $key => $val) { - if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_/',$key)) continue; - //print $key.' - '.$val.'
'; - $result=dolibarr_set_const($db, $key, $val, 'chaine', 0, '', $conf->entity); + if (! preg_match('/^NOTIF_(.*)_key$/', $key, $reg)) continue; + + $newval=''; + $newkey=''; + + $shortkey=preg_replace('/_key$/','',$key); + //print $shortkey.'
'; + + if (preg_match('/^NOTIF_(.*)_old_(.*)_key/',$key,$reg)) + { + dolibarr_del_const($db, 'NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.$reg[2], $conf->entity); + + $newkey='NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount')); + $newval=GETPOST($shortkey.'_key'); + //print $newkey.' - '.$newval.'
'; + } + else if (preg_match('/^NOTIF_(.*)_new_key/',$key,$reg)) + { + // Add a new entry + $newkey='NOTIFICATION_FIXEDEMAIL_'.$reg[1].'_THRESHOLD_HIGHER_'.((int) GETPOST($shortkey.'_amount')); + $newval=GETPOST($shortkey.'_key'); + } + + if ($newkey && $newval) + { + $result=dolibarr_set_const($db, $newkey, $newval, 'chaine', 0, '', $conf->entity); + } } } if (! $error) { + $db->commit(); + setEventMessage($langs->trans("SetupSaved")); } else { + $db->rollback(); + setEventMessage($langs->trans("Error"),'errors'); } } @@ -78,6 +110,7 @@ if ($action == 'setvalue' && $user->admin) */ $form=new Form($db); +$notify = new Notify($db); llxHeader('',$langs->trans("NotificationSetup")); @@ -107,7 +140,53 @@ print ''; print '
'; -print_fiche_titre($langs->trans("ListOfAvailableNotifications"),'',''); + +if ($conf->societe->enabled) +{ + print_fiche_titre($langs->trans("ListOfNotificationsPerContact"),'',''); + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print "\n"; + + // Load array of available notifications + $notificationtrigger=new InterfaceNotification($db); + $listofnotifiedevents=$notificationtrigger->getListOfManagedEvents(); + + $var=true; + foreach($listofnotifiedevents as $notifiedevent) + { + $var=!$var; + $label=$langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label']; + + if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder'); + elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal'); + elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill'); + elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order'); + + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } + + print '
'.$langs->trans("Module").''.$langs->trans("Code").''.$langs->trans("Label").''.$langs->trans("NbOfTargetedContacts").''.'
'.$elementLabel.''.$notifiedevent['code'].''.$label.''; + $nb = $notify->countDefinedNotifications($notifiedevent['code'], 0); + print $nb; + print '
'; + print '* '.$langs->trans("GoOntoContactCardToAddMore").'
'; + print '
'; +} + + +print_fiche_titre($langs->trans("ListOfFixedNotifications"),'',''); print ''; print ''; @@ -115,12 +194,15 @@ print ''; print ''; print ''; print ''; +print ''; +print ''; print "\n"; // Load array of available notifications $notificationtrigger=new InterfaceNotification($db); $listofnotifiedevents=$notificationtrigger->getListOfManagedEvents(); +$var=true; foreach($listofnotifiedevents as $notifiedevent) { $var=!$var; @@ -136,18 +218,47 @@ foreach($listofnotifiedevents as $notifiedevent) print ''; print ''; print ''; + + print ''; + + print ''; print ''; } diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 30ae7e71ab3..55a6ec749b6 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -643,6 +643,27 @@ print "\n"; print "\n \n \n\n"; print "
'.$langs->trans("Module").''.$langs->trans("Code").''.$langs->trans("Label").''.$langs->trans("FixedEmailTarget").''.$langs->trans("Threshold").''.'
'.$notifiedevent['code'].''.$label.''; - $param='NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code']; - $value=GETPOST($param)?GETPOST($param,'alpha'):$conf->global->$param; - $s=''; // Do not use type="email" here, we must be able to enter a list of email with , separator. - $arrayemail=explode(',',$value); - $showwarning=0; - foreach($arrayemail as $key=>$valuedet) - { - $valuedet=trim($valuedet); - if (! empty($valuedet) && ! isValidEmail($valuedet)) $showwarning++; - } - if ((! empty($conf->global->$param)) && $showwarning) $s.=' '.img_warning($langs->trans("ErrorBadEMail")); - print $form->textwithpicto($s,$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients")); + // Notification with threshold + foreach($conf->global as $key => $val) + { + if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_(.*)/', $key, $reg)) continue; + + $param='NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_'.$reg[1]; + $value=GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key')?GETPOST('NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key','alpha'):$conf->global->$param; + + $s=''; // Do not use type="email" here, we must be able to enter a list of email with , separator. + $arrayemail=explode(',',$value); + $showwarning=0; + foreach($arrayemail as $key=>$valuedet) + { + $valuedet=trim($valuedet); + if (! empty($valuedet) && ! isValidEmail($valuedet)) $showwarning++; + } + if ((! empty($conf->global->$param)) && $showwarning) $s.=' '.img_warning($langs->trans("ErrorBadEMail")); + print $form->textwithpicto($s,$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"),1,'help','',0,2); + print '
'; + } + // New entry input fields + $s=''; // Do not use type="email" here, we must be able to enter a list of email with , separator. + print $form->textwithpicto($s,$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"),1,'help','',0,2); + print '		'; + // Notification with threshold + foreach($conf->global as $key => $val) + { + if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifiedevent['code'].'_THRESHOLD_HIGHER_(.*)/', $key, $reg)) continue; + + print $langs->trans("AmountHT").' >= '; + print '
'; + } + // New entry input fields + print $langs->trans("AmountHT").' >= '; + print '		'; + // TODO Add link to show message content + print '
".$langs->trans("PathDirectory")."".$conf->propal->dir_output."
\n
"; -$db->close(); + +/* + * Notifications + */ + +print_titre($langs->trans("Notifications")); +print ''; +print ''; +print ''; +print ''; +print ''; +print "\n"; + +print '\n"; + +print '
'.$langs->trans("Parameter").' 
'; +print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; +print '		'; +print "
'; + llxFooter(); + +$db->close(); diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index 19b5e89b0dd..6fe32cf4485 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -443,14 +443,16 @@ foreach ($dirmodels as $reldir) } } -print '
'; -print '
'; +print '
'; /* * Other options - * */ +print '
'; +print ''; +print ''; + print_titre($langs->trans("OtherOptions")); print ''; print ''; @@ -459,16 +461,38 @@ print ''; print ''; print "\n"; -print ''; -print ''; -print ''; print '\n"; + +print '
'.$langs->trans("Value").' 
'; print $langs->trans("FreeLegalTextOnInvoices").' ('.$langs->trans("AddCRIfTooLong").')
'; print ''; print '		'; print ''; print "

'; + print '
'; -$db->close(); + +/* + * Notifications + */ + +print_titre($langs->trans("Notifications")); +print ''; +print ''; +print ''; +print ''; +print ''; +print "\n"; + +print '\n"; + +print '
'.$langs->trans("Parameter").' 
'; +print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; +print '		'; +print "
'; + + llxFooter(); + +$db->close(); diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index 24e1682eb18..5be30f08ee3 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -439,14 +439,16 @@ foreach ($dirmodels as $reldir) } } -print '
'; -print '
'; +print '
'; /* * Other options - * */ +print '
'; +print ''; +print ''; + print_titre($langs->trans("OtherOptions")); print ''; print ''; @@ -455,16 +457,39 @@ print ''; print ''; print "\n"; -print ''; -print ''; -print ''; print '\n"; + +print '
'.$langs->trans("Value").' 
'; print $langs->trans("FreeLegalTextOnOrders").' ('.$langs->trans("AddCRIfTooLong").')
'; print ''; print '		'; print ''; print "

'; + print '
'; -$db->close(); + + +/* + * Notifications + */ + +print_titre($langs->trans("Notifications")); +print ''; +print ''; +print ''; +print ''; +print ''; +print "\n"; + +print '\n"; + +print '
'.$langs->trans("Parameter").' 
'; +print $langs->trans("YouMayFindNotificationsFeaturesIntoModuleNotification").'
'; +print '		'; +print "
'; + + llxFooter(); + +$db->close(); diff --git a/htdocs/comm/askpricesupplier/card.php b/htdocs/comm/askpricesupplier/card.php index cbd0436e2ef..3a3b283f8e9 100644 --- a/htdocs/comm/askpricesupplier/card.php +++ b/htdocs/comm/askpricesupplier/card.php @@ -1337,7 +1337,7 @@ if ($action == 'create') require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php'; $notify = new Notify($db); $text .= '
'; - $text .= $notify->confirmMessage('ASKPRICESUPPLIER_VALIDATE', $object->socid); + $text .= $notify->confirmMessage('ASKPRICESUPPLIER_VALIDATE', $object->socid, $object); } if (! $error) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index c9d5170f7e6..be60d721d6a 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1671,7 +1671,7 @@ if ($action == 'create') require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php'; $notify = new Notify($db); $text .= '
'; - $text .= $notify->confirmMessage('PROPAL_VALIDATE', $object->socid); + $text .= $notify->confirmMessage('PROPAL_VALIDATE', $object->socid, $object); } if (! $error) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index aa72ec9bf68..c091817d606 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1600,7 +1600,7 @@ if ($action == 'create' && $user->rights->commande->creer) require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php'; $notify = new Notify($db); $text .= '
'; - $text .= $notify->confirmMessage('ORDER_VALIDATE', $object->socid); + $text .= $notify->confirmMessage('ORDER_VALIDATE', $object->socid, $object); } $qualified_for_stock_change=0; @@ -2045,7 +2045,7 @@ if ($action == 'create' && $user->rights->commande->creer) // Total HT print '' . $langs->trans('AmountHT') . ''; - print '' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . ''; + print '' . price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency) . ''; // Margin Infos if (! empty($conf->margin->enabled)) { @@ -2057,23 +2057,23 @@ if ($action == 'create' && $user->rights->commande->creer) print ''; - // Total TVA - print '' . $langs->trans('AmountVAT') . '' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . ''; + // Total VAT + print '' . $langs->trans('AmountVAT') . '' . price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency) . ''; // Amount Local Taxes if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) // Localtax1 { print '' . $langs->transcountry("AmountLT1", $mysoc->country_code) . ''; - print '' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . ''; + print '' . price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency) . ''; } if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) // Localtax2 IRPF { print '' . $langs->transcountry("AmountLT2", $mysoc->country_code) . ''; - print '' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . ''; + print '' . price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency) . ''; } // Total TTC - print '' . $langs->trans('AmountTTC') . '' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . ''; + print '' . $langs->trans('AmountTTC') . '' . price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency) . ''; // Statut print '' . $langs->trans('Status') . '' . $object->getLibStatut(4) . ''; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index f87f797509b..e8f3bde2fd9 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2587,7 +2587,7 @@ if ($action == 'create') require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php'; $notify = new Notify($db); $text .= '
'; - $text .= $notify->confirmMessage('BILL_VALIDATE', $object->socid); + $text .= $notify->confirmMessage('BILL_VALIDATE', $object->socid, $object); } $formquestion = array(); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 6dd908812b7..55bd1f37093 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -395,12 +395,13 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag - if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip + if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; if (empty($notabs)) $s.=''; + elseif ($notabs == 2) $s.='
'; if ($direction < 0) { $s.='<'.$tag.$paramfortooltipimg; if ($tag == 'td') { @@ -411,8 +412,8 @@ class Form // Use another method to help avoid having a space in value in order to use this value with jquery // TODO add this in css //if ($text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.(($direction < 0)?' ':'').$text.(($direction > 0)?' ':'').''; - $paramfortooltiptd.= (($direction < 0)?' style="padding-left: 3px !important;"':''); - $paramfortooltiptd.= (($direction > 0)?' style="padding-right: 3px !important;"':''); + $paramfortooltiptd.= (($direction < 0)?' class="inline-block" style="padding-left: 3px !important;"':''); + $paramfortooltiptd.= (($direction > 0)?' class="inline-block" style="padding-right: 3px !important;"':''); if ((string) $text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.$text.''; if ($direction > 0) { $s.='<'.$tag.$paramfortooltipimg; @@ -422,6 +423,7 @@ class Form $s.= '>'.$img.''; } if (empty($notabs)) $s.='
'; + elseif ($notabs == 2) $s.='
'; return $s; } @@ -583,7 +585,7 @@ class Form $sql.= " FROM ".MAIN_DB_PREFIX."c_incoterms"; $sql.= " WHERE active = 1"; $sql.= " ORDER BY code ASC"; - + dol_syslog(get_class($this)."::select_incoterm", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) @@ -593,14 +595,14 @@ class Form include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php'; $out .= ajax_combobox($htmlname, $events); } - + if (!empty($page)) { $out .= '
'; $out .= ''; $out .= ''; } - + $out.= ''; - + $out .= ''; - - if (!empty($page)) + + if (!empty($page)) { $out .= '
'; } diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index db88671f7ff..1a024c61552 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -61,14 +61,15 @@ class Notify * * @param string $action Id of action in llx_c_action_trigger * @param int $socid Id of third party + * @param Object $object Object the notification is about * @return string Message */ - function confirmMessage($action,$socid) + function confirmMessage($action,$socid,$object) { global $langs; $langs->load("mails"); - $nb=$this->countDefinedNotifications($action,$socid); + $nb=$this->countDefinedNotifications($action,$socid,$object); if ($nb <= 0) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("NoNotificationsWillBeSent"); if ($nb == 1) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("ANotificationsWillBeSent"); if ($nb >= 2) $texte=img_object($langs->trans("Notifications"),'email').' '.$langs->trans("SomeNotificationsWillBeSent",$nb); @@ -76,22 +77,25 @@ class Notify } /** - * Return number of notifications activated for action code and third party + * Return number of notifications activated for action code (and third party) * - * @param string $action Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage) - * @param int $socid Id of third party - * @return int <0 if KO, nb of notifications sent if OK + * @param string $notifcode Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage) + * @param int $socid Id of third party or 0 for all thirdparties + * @param Object $object Object the notification is about + * @return int <0 if KO, nb of notifications sent if OK */ - function countDefinedNotifications($action,$socid) + function countDefinedNotifications($notifcode,$socid,$object=null) { global $conf; $error=0; $num=0; + $valueforthreshold = $object->total_ht; + if (! $error) { - $sql = "SELECT n.rowid"; + $sql = "SELECT COUNT(n.rowid) as nb"; $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n,"; $sql.= " ".MAIN_DB_PREFIX."socpeople as c,"; $sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,"; @@ -99,22 +103,23 @@ class Notify $sql.= " WHERE n.fk_contact = c.rowid"; $sql.= " AND a.rowid = n.fk_action"; $sql.= " AND n.fk_soc = s.rowid"; - if (is_numeric($action)) $sql.= " AND n.fk_action = ".$action; // Old usage - else $sql.= " AND a.code = '".$action."'"; // New usage + if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode; // Old usage + else $sql.= " AND a.code = '".$notifcode."'"; // New usage $sql.= " AND s.entity IN (".getEntity('societe', 1).")"; - $sql.= " AND s.rowid = ".$socid; + if ($socid > 0) $sql.= " AND s.rowid = ".$socid; - dol_syslog(get_class($this)."::countDefinedNotifications ".$action.", ".$socid."", LOG_DEBUG); + dol_syslog(get_class($this)."::countDefinedNotifications ".$notifcode.", ".$socid."", LOG_DEBUG); $resql = $this->db->query($sql); if ($resql) { - $num = $this->db->num_rows($resql); + $obj = $this->db->fetch_object($resql); + if ($obj) $num = $obj->nb; } else { $error++; - $this->error=$this->db->error.' sql='.$sql; + $this->error=$this->db->lasterror(); } } @@ -123,12 +128,19 @@ class Notify // List of notifications enabled for fixed email foreach($conf->global as $key => $val) { - if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$action.'/', $key, $reg)) continue; - $num++; + if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue; + + $threshold = (float) $reg[1]; + if ($valueforthreshold <= $threshold) + { + continue; + } + + $tmpemail=explode(',',$val); + $num+=count($tmpemail); } } - // TODO return array with list of email instead of number, + type of notification (contacts or fixed email) if ($error) return -1; return $num; } @@ -137,17 +149,17 @@ class Notify * Check if notification are active for couple action/company. * If yes, send mail and save trace into llx_notify. * - * @param string $action Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage) - * @param Object $object Object the notification deals on - * @return int <0 if KO, or number of changes if OK + * @param string $notifcode Code of action in llx_c_action_trigger (new usage) or Id of action in llx_c_action_trigger (old usage) + * @param Object $object Object the notification deals on + * @return int <0 if KO, or number of changes if OK */ - function send($action, $object) + function send($notifcode, $object) { global $conf,$langs,$mysoc,$dolibarr_main_url_root; include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; - dol_syslog(get_class($this)."::send action=".$action.", object=".$object->id); + dol_syslog(get_class($this)."::send notifcode=".$notifcode.", object=".$object->id); $langs->load("other"); @@ -166,7 +178,20 @@ class Notify $link = ''; $num = 0; - if (! in_array($action, array('BILL_VALIDATE', 'ORDER_VALIDATE', 'PROPAL_VALIDATE', 'FICHINTER_VALIDATE', 'ORDER_SUPPLIER_APPROVE', 'ORDER_SUPPLIER_REFUSE', 'SHIPPING_VALIDATE'))) + if (! in_array( + $notifcode, + array( + 'BILL_VALIDATE', + 'ORDER_VALIDATE', + 'PROPAL_VALIDATE', + 'FICHINTER_VALIDATE', + 'ORDER_SUPPLIER_VALIDATE', + 'ORDER_SUPPLIER_APPROVE', + 'ORDER_SUPPLIER_REFUSE', + 'SHIPPING_VALIDATE' + ) + ) + ) { return 0; } @@ -181,8 +206,8 @@ class Notify $sql.= " ".MAIN_DB_PREFIX."societe as s"; $sql.= " WHERE n.fk_contact = c.rowid AND a.rowid = n.fk_action"; $sql.= " AND n.fk_soc = s.rowid"; - if (is_numeric($action)) $sql.= " AND n.fk_action = ".$action; // Old usage - else $sql.= " AND a.code = '".$action."'"; // New usage + if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode; // Old usage + else $sql.= " AND a.code = '".$notifcode."'"; // New usage $sql .= " AND s.rowid = ".$object->socid; $result = $this->db->query($sql); @@ -197,8 +222,8 @@ class Notify { $obj = $this->db->fetch_object($result); - $sendto = $obj->firstname . " " . $obj->lastname . " <".$obj->email.">"; - $actiondefid = $obj->adid; + $sendto = dolGetFirstLastname($obj->firstname,$obj->lastname) . " <".$obj->email.">"; + $notifcodedefid = $obj->adid; if (dol_strlen($obj->email)) { @@ -210,7 +235,7 @@ class Notify $outputlangs->setDefaultLang($obj->default_lang); } - switch ($action) { + switch ($notifcode) { case 'BILL_VALIDATE': $link='/compta/facture.php?facid='.$object->id; $dir_output = $conf->facture->dir_output; @@ -235,6 +260,14 @@ class Notify $object_type = 'ficheinter'; $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref); break; + case 'ORDER_SUPPLIER_VALIDATE': + $link='/fourn/commande/card.php?id='.$object->id; + $dir_output = $conf->fournisseur->dir_output.'/commande/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$object->ref,$user->getFullName($langs)); + $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; + break; case 'ORDER_SUPPLIER_APPROVE': $link='/fourn/commande/card.php?id='.$object->id; $dir_output = $conf->fournisseur->dir_output.'/commande/'; @@ -294,7 +327,7 @@ class Notify if ($mailfile->sendfile()) { $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, objet_id, email)"; - $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$object->socid.", ".$obj->cid.", '".$obj->type."', '".$object_type."', ".$object->id.", '".$this->db->escape($obj->email)."')"; + $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".$object->socid.", ".$obj->cid.", '".$obj->type."', '".$object_type."', ".$object->id.", '".$this->db->escape($obj->email)."')"; if (! $this->db->query($sql)) { dol_print_error($this->db); @@ -328,113 +361,133 @@ class Notify // Check notification using fixed email if (! $error) { - $param='NOTIFICATION_FIXEDEMAIL_'.$action; - if (! empty($conf->global->$param)) - { - $sendto = $conf->global->$param; - $actiondefid = dol_getIdFromCode($this->db, $action, 'c_action_trigger', 'code', 'rowid'); - if ($actiondefid <= 0) dol_print_error($this->db, 'Failed to get id from code'); + foreach($conf->global as $key => $val) + { + if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue; - $object_type = ''; - $link = ''; - $num++; + $threshold = (float) $reg[1]; + if ($object->total_ht <= $threshold) + { + dol_syslog("A notification is requested for notifcode = ".$notifcode." but amount = ".$object->total_ht." so lower than threshold = ".$threshold.". We discard this notification"); + continue; + } - switch ($action) { - case 'BILL_VALIDATE': - $link='/compta/facture.php?facid='.$object->id; - $dir_output = $conf->facture->dir_output; - $object_type = 'facture'; - $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref); - break; - case 'ORDER_VALIDATE': - $link='/commande/card.php?id='.$object->id; - $dir_output = $conf->commande->dir_output; - $object_type = 'order'; - $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref); - break; - case 'PROPAL_VALIDATE': - $link='/comm/propal.php?id='.$object->id; - $dir_output = $conf->propal->dir_output; - $object_type = 'propal'; - $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref); - break; - case 'FICHINTER_VALIDATE': - $link='/fichinter/card.php?id='.$object->id; - $dir_output = $conf->facture->dir_output; - $object_type = 'ficheinter'; - $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref); - break; - case 'ORDER_SUPPLIER_APPROVE': - $link='/fourn/commande/card.php?id='.$object->id; - $dir_output = $conf->fournisseur->dir_output.'/commande/'; - $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; - $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs)); - $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; - break; - case 'ORDER_SUPPLIER_REFUSE': - $link='/fourn/commande/card.php?id='.$object->id; - $dir_output = $conf->fournisseur->dir_output.'/commande/'; - $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; - $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs)); - $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; - break; - case 'SHIPPING_VALIDATE': - $dir_output = $conf->expedition->dir_output.'/sending/'; - $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref); - break; - } - $ref = dol_sanitizeFileName($object->ref); - $pdf_path = $dir_output."/".$ref."/".$ref.".pdf"; - if (! dol_is_file($pdf_path)) - { - // We can't add PDF as it is not generated yet. - $filepdf = ''; - } - else - { - $filepdf = $pdf_path; - } + $param='NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_'.$reg[1]; + //if (! empty($conf->global->$param)) + //{ + $sendto = $conf->global->$param; + $notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid'); + if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code'); - $subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification"); + $object_type = ''; + $link = ''; + $num++; - $message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n"; - $message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n"; - $message.= "\n"; - $message.= $mesg; - if ($link) $message=dol_concatdesc($message,$urlwithroot.$link); - - $mailfile = new CMailFile( - $subject, - $sendto, - $replyto, - $message, - array($file), - array($mimefile), - array($filename[count($filename)-1]), - '', - '', - 0, - -1 - ); - - if ($mailfile->sendfile()) - { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, objet_id, email)"; - $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$actiondefid.", ".$object->socid.", null, '".$obj->type."', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')"; - if (! $this->db->query($sql)) - { - dol_print_error($this->db); + switch ($notifcode) { + case 'BILL_VALIDATE': + $link='/compta/facture.php?facid='.$object->id; + $dir_output = $conf->facture->dir_output; + $object_type = 'facture'; + $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref); + break; + case 'ORDER_VALIDATE': + $link='/commande/card.php?id='.$object->id; + $dir_output = $conf->commande->dir_output; + $object_type = 'order'; + $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref); + break; + case 'PROPAL_VALIDATE': + $link='/comm/propal.php?id='.$object->id; + $dir_output = $conf->propal->dir_output; + $object_type = 'propal'; + $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref); + break; + case 'FICHINTER_VALIDATE': + $link='/fichinter/card.php?id='.$object->id; + $dir_output = $conf->facture->dir_output; + $object_type = 'ficheinter'; + $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref); + break; + case 'ORDER_SUPPLIER_VALIDATE': + $link='/fourn/commande/card.php?id='.$object->id; + $dir_output = $conf->fournisseur->dir_output.'/commande/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$object->ref,$user->getFullName($langs)); + $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; + break; + case 'ORDER_SUPPLIER_APPROVE': + $link='/fourn/commande/card.php?id='.$object->id; + $dir_output = $conf->fournisseur->dir_output.'/commande/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs)); + $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; + break; + case 'ORDER_SUPPLIER_REFUSE': + $link='/fourn/commande/card.php?id='.$object->id; + $dir_output = $conf->fournisseur->dir_output.'/commande/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs)); + $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; + break; + case 'SHIPPING_VALIDATE': + $dir_output = $conf->expedition->dir_output.'/sending/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref); + break; } - } - else - { - $error++; - $this->errors[]=$mailfile->error; - } - } + $ref = dol_sanitizeFileName($object->ref); + $pdf_path = $dir_output."/".$ref."/".$ref.".pdf"; + if (! dol_is_file($pdf_path)) + { + // We can't add PDF as it is not generated yet. + $filepdf = ''; + } + else + { + $filepdf = $pdf_path; + } + + $subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification"); + + $message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n"; + $message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n"; + $message.= "\n"; + $message.= $mesg; + if ($link) $message=dol_concatdesc($message,$urlwithroot.$link); + + $mailfile = new CMailFile( + $subject, + $sendto, + $replyto, + $message, + array($file), + array($mimefile), + array($filename[count($filename)-1]), + '', + '', + 0, + -1 + ); + + if ($mailfile->sendfile()) + { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, objet_id, email)"; + $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".$object->socid.", null, 'email', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')"; + if (! $this->db->query($sql)) + { + dol_print_error($this->db); + } + } + else + { + $error++; + $this->errors[]=$mailfile->error; + } + //} + } } if (! $error) return $num; diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index a54cb5fcc79..3901e3231df 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -386,6 +386,12 @@ function dolibarr_del_const($db, $name, $entity=1) { global $conf; + if (empty($name)) + { + dol_print_error('','Error call dolibar_del_const with parameter name empty'); + return -1; + } + $sql = "DELETE FROM ".MAIN_DB_PREFIX."const"; $sql.= " WHERE (".$db->decrypt('name')." = '".$db->escape($name)."'"; if (is_numeric($name)) $sql.= " OR rowid = '".$db->escape($name)."'"; @@ -438,7 +444,7 @@ function dolibarr_get_const($db, $name, $entity=1) /** - * Insert a parameter (key,value) into database. + * Insert a parameter (key,value) into database (delete old key then insert it again). * * @param DoliDB $db Database handler * @param string $name Name of constant diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php index 940e3a1712d..160387f5fde 100644 --- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php +++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php @@ -40,6 +40,7 @@ class InterfaceNotification extends DolibarrTriggers 'ORDER_VALIDATE', 'PROPAL_VALIDATE', 'FICHINTER_VALIDATE', + 'ORDER_SUPPLIER_VALIDATE', 'ORDER_SUPPLIER_APPROVE', 'ORDER_SUPPLIER_REFUSE', 'SHIPPING_VALIDATE' @@ -84,8 +85,8 @@ class InterfaceNotification extends DolibarrTriggers $sql = "SELECT rowid, code, label, description, elementtype"; $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger"; - $sql.= $this->db->order("elementtype, code"); - dol_syslog("Get list of notifications", LOG_DEBUG); + $sql.= $this->db->order("rang, elementtype, code"); + dol_syslog("getListOfManagedEvents Get list of notifications", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { @@ -103,13 +104,14 @@ class InterfaceNotification extends DolibarrTriggers { //print 'xx'.$obj->code; $element=$obj->elementtype; + + // Exclude events if related module is disabled if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0; elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0; elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0; elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0; elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0; - elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member')) - && empty($conf->$element->enabled)) $qualified=0; + elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member')) && empty($conf->$element->enabled)) $qualified=0; } if ($qualified) diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php index e7f98d345f4..fa451f74f1c 100644 --- a/htdocs/expedition/card.php +++ b/htdocs/expedition/card.php @@ -602,7 +602,7 @@ if ($action == 'create') print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:'')); print ''; } - + // Other attributes $parameters=array('colspan' => ' colspan="3"'); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$expe,$action); // Note that $action and $object may have been modified by hook @@ -934,7 +934,7 @@ else if ($id || $ref) require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; $notify=new Notify($db); $text.='
'; - $text.=$notify->confirmMessage('SHIPPING_VALIDATE',$object->socid); + $text.=$notify->confirmMessage('SHIPPING_VALIDATE',$object->socid, $object); } print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans('ValidateSending'),$text,'confirm_valid','',0,1); @@ -1193,7 +1193,7 @@ else if ($id || $ref) // Incoterms if (!empty($conf->incoterm->enabled)) - { + { print ''; print ''; print ''; print '
'; print $langs->trans('IncotermLabel'); @@ -1207,7 +1207,7 @@ else if ($id || $ref) { print $form->textwithpicto($object->display_incoterms(), $object->libelle_incoterms, 1); } - else + else { print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms)?$object->location_incoterms:''), $_SERVER['PHP_SELF'].'?id='.$object->id); } diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 3f6877d8d14..a9a824a8b5d 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1657,7 +1657,7 @@ elseif (! empty($object->id)) require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; $notify=new Notify($db); $text.='
'; - $text.=$notify->confirmMessage('ORDER_SUPPLIER_APPROVE', $object->socid); + $text.=$notify->confirmMessage('ORDER_SUPPLIER_APPROVE', $object->socid, $object); } $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_valid', '', 0, 1); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index cd6a9f64abd..a48534b4c24 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1664,7 +1664,7 @@ else require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; $notify=new Notify($db); $text.='
'; - $text.=$notify->confirmMessage('BILL_SUPPLIER_VALIDATE',$object->socid); + $text.=$notify->confirmMessage('BILL_SUPPLIER_VALIDATE',$object->socid, $object); }*/ $formquestion=array(); diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index d4e56a980a6..633b13f9ad2 100755 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -373,3 +373,45 @@ INSERT INTO llx_c_incoterms (code, libelle, active) VALUES ('DDP', 'Delivered Du -- Extrafields fk_object must be unique (1-1 relation) ALTER TABLE llx_societe_extrafields DROP INDEX idx_societe_extrafields; ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_object); + + +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_SUBSCRIPTION','Member subscribed','Executed when a member is subscribed','member',23); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROJECT_CREATE','Project creation','Executed when a project is created','project',30); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_CREATE','Task created','Executed when a project task is created','project',35); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_MODIFY','Task modified','Executed when a project task is modified','project',36); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37); + diff --git a/htdocs/install/mysql/tables/llx_c_action_trigger.sql b/htdocs/install/mysql/tables/llx_c_action_trigger.sql index fa8052d77f9..cbec0c81437 100644 --- a/htdocs/install/mysql/tables/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/tables/llx_c_action_trigger.sql @@ -22,9 +22,9 @@ create table llx_c_action_trigger ( rowid integer AUTO_INCREMENT PRIMARY KEY, + elementtype varchar(16) NOT NULL, code varchar(32) NOT NULL, label varchar(128) NOT NULL, description varchar(255), - elementtype varchar(16) NOT NULL, rang integer DEFAULT 0 )ENGINE=innodb; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index b8590a1fc38..7bb08ba2c0f 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1107,7 +1107,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
%s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* or by setting a global target email address on module setup page. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting a global target email address on module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1601,3 +1601,8 @@ ExpenseReportsSetup=Setup of module Expense Reports TemplatePDFExpenseReports=Document templates to generate expense report document NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only. NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only. +YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification". +ListOfNotificationsPerContact=List of notifications per contact* +ListOfFixedNotifications=List of fixed notifications +GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contact +Threshold=Threshold diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index e84c7653712..b1cf1d714af 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail Notify_BILL_VALIDATE=Customer invoice validated Notify_BILL_UNVALIDATE=Customer invoice unvalidated +Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused Notify_ORDER_VALIDATE=Customer order validated @@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated. EMailTextProposalValidated=The proposal %s has been validated. EMailTextOrderValidated=The order %s has been validated. EMailTextOrderApproved=The order %s has been approved. +EMailTextOrderValidatedBy=The order %s has been recorded by %s. EMailTextOrderApprovedBy=The order %s has been approved by %s. EMailTextOrderRefused=The order %s has been refused. EMailTextOrderRefusedBy=The order %s has been refused by %s. diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 0a2a4d35032..69920a7e5ce 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -24,6 +24,7 @@ */ require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Notification.class.php'; @@ -173,33 +174,8 @@ if ($result > 0) print '
'.$langs->trans("NbOfActiveNotifications").''; - $nb=0; - // List of per contact notifications - $sql = "SELECT COUNT(n.rowid) as nb"; - $sql.= " FROM ".MAIN_DB_PREFIX."notify_def as n"; - $sql.= " WHERE fk_soc = ".$object->id; - $resql=$db->query($sql); - if ($resql) - { - $num = $db->num_rows($resql); - $i = 0; - while ($i < $num) - { - $obj = $db->fetch_object($resql); - $nb=$obj->nb; - $i++; - } - } - else { - dol_print_error($db); - } - // List of notifications enabled for fixed email - foreach($conf->global as $key => $val) - { - if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue; - $listtmp=explode(',',$val); - $nb+=count($listtmp); - } + $notify=new Notify($db); + $nb = $notify->countDefinedNotifications('', $object->id); print $nb; print '
'; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index e6dbf78d6a0..11c72f88586 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1394,9 +1394,9 @@ div.tabsElem { margin-top: 8px; } /* To avoid overlap of tabs when not browser div.tabBar { color: #; padding-top: 9px; - padding-left: px; - padding-right: px; - padding-bottom: 8px; + padding-left: px; + padding-right: px; + padding-bottom: 12px; margin: 0px 0px 14px 0px; -moz-border-radius:6px; -webkit-border-radius: 6px; From dbeccf765307252dfec7a8576e80ff158db9a9f8 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 18 Mar 2015 21:56:00 +0100 Subject: [PATCH 134/412] Update work --- htdocs/compta/dons/card.php | 97 ++++++++++++++++++++++++++++++++----- htdocs/projet/element.php | 23 ++++++--- 2 files changed, 103 insertions(+), 17 deletions(-) diff --git a/htdocs/compta/dons/card.php b/htdocs/compta/dons/card.php index d20af7f8ba6..88331bb5498 100644 --- a/htdocs/compta/dons/card.php +++ b/htdocs/compta/dons/card.php @@ -404,7 +404,7 @@ if (! empty($id) && $action == 'edit') print $formcompany->select_ziptown((isset($_POST["zipcode"])?$_POST["zipcode"]:$object->zip),'zipcode',array('town','selectcountry_id','state_id'),6); print ' '; print $formcompany->select_ziptown((isset($_POST["town"])?$_POST["town"]:$object->town),'town',array('zipcode','selectcountry_id','state_id')); - print ''; + print ''; // Country print ''.$langs->trans('Country').''; @@ -478,26 +478,101 @@ if (! empty($id) && $action != 'edit') print ''; // Date - print ''.$langs->trans("Date").''; + print ''.$langs->trans("Date").''; print dol_print_date($object->date,"day"); print ""; - print "".''.$langs->trans("Amount").''.price($object->amount,0,$langs,0,0,-1,$conf->currency).''; + print ''.$langs->trans("Amount").''; + print price($object->amount,0,$langs,0,0,-1,$conf->currency); + print ''; - print "".$langs->trans("PublicDonation").""; + print ''.$langs->trans("PublicDonation").''; print yn($object->public); - print "\n"; + print ''; - print "".''.$langs->trans("Company").''.$object->societe.''; - print "".''.$langs->trans("Lastname").''.$object->lastname.''; - print "".''.$langs->trans("Firstname").''.$object->firstname.''; - print "".''.$langs->trans("Address").''.dol_nl2br($object->address).''; + print "".''.$langs->trans("Company").''.$object->societe.''; + print "".''.$langs->trans("Lastname").''.$object->lastname.''; + print "".''.$langs->trans("Firstname").''.$object->firstname.''; + print "".''.$langs->trans("Address").''.dol_nl2br($object->address).''; + + $rowspan=6; + if (! empty($conf->projet->enabled)) $rowspan++; + print ''; + + /* + * Payments + */ + $sql = "SELECT p.rowid, p.num_payment, datep as dp, p.amount,"; + $sql.= "c.code as type_code,c.libelle as paiement_type"; + $sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as p"; + $sql.= ", ".MAIN_DB_PREFIX."c_paiement as c "; + $sql.= ", ".MAIN_DB_PREFIX."don as d"; + $sql.= " WHERE d.rowid = '".$rowid."'"; + $sql.= " AND p.fk_donation = d.rowid"; + $sql.= " AND d.entity = ".$conf->entity; + $sql.= " AND p.fk_typepayment = c.id"; + $sql.= " ORDER BY dp DESC"; + + //print $sql; + $resql = $db->query($sql); + if ($resql) + { + $num = $db->num_rows($resql); + $i = 0; $total = 0; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + + $var=True; + while ($i < $num) + { + $objp = $db->fetch_object($resql); + $var=!$var; + print "'; + print '\n"; + $labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->paiement_type; + print "\n"; + print '\n"; + print ""; + $totalpaid += $object->amount; + $i++; + } + + if ($object->paid == 0) + { + print "\n"; + print "\n"; + + $remaintopay = $object->amount - $totalpaid; + + print ""; + print "\n"; + } + print "
'.$langs->trans("RefPayment").''.$langs->trans("Date").''.$langs->trans("Type").''.$langs->trans("Amount").' 
"; + print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."".$labeltype.' '.$object->num_paiement."'.price($object->amount)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AlreadyPaid")." :".price($totalpaye)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("AmountExpected")." :".price($object->amount)." ".$langs->trans("Currency".$conf->currency)."
".$langs->trans("RemainderToPay")." :".price($resteapayer)." ".$langs->trans("Currency".$conf->currency)."
"; + $db->free($resql); + } + else + { + dol_print_error($db); + } + print ""; + + print ""; // Zip / Town - print "".''.$langs->trans("Zip").' / '.$langs->trans("Town").''.$object->zip.($object->zip && $object->town?' / ':'').$object->town.''; + print ''.$langs->trans("Zip").' / '.$langs->trans("Town").''; + print $object->zip.($object->zip && $object->town?' / ':'').$object->town.''; + + // Country - print ''.$langs->trans('Country').''; + print ''.$langs->trans('Country').''; if (! empty($object->country_code)) { $img=picto_from_langcode($object->country_code); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 3075d128066..a49914b538a 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2012 Juanjo Menent + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -41,16 +42,18 @@ if (! empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichi if (! empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'; if (! empty($conf->expensereport->enabled)) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; if (! empty($conf->agenda->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; +if (! empty($conf->don->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; $langs->load("projects"); $langs->load("companies"); $langs->load("suppliers"); -if (! empty($conf->facture->enabled)) $langs->load("bills"); -if (! empty($conf->commande->enabled)) $langs->load("orders"); -if (! empty($conf->propal->enabled)) $langs->load("propal"); -if (! empty($conf->ficheinter->enabled)) $langs->load("interventions"); -if (! empty($conf->deplacement->enabled)) $langs->load("trips"); +if (! empty($conf->facture->enabled)) $langs->load("bills"); +if (! empty($conf->commande->enabled)) $langs->load("orders"); +if (! empty($conf->propal->enabled)) $langs->load("propal"); +if (! empty($conf->ficheinter->enabled)) $langs->load("interventions"); +if (! empty($conf->deplacement->enabled)) $langs->load("trips"); if (! empty($conf->expensereport->enabled)) $langs->load("trips"); +if (! empty($conf->expensereport->enabled)) $langs->load("donations"); $id=GETPOST('id','int'); $ref=GETPOST('ref','alpha'); @@ -244,7 +247,15 @@ $listofreferent=array( 'table'=>'actioncomm', 'datefieldname'=>'datep', 'disableamount'=>1, - 'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire) + 'test'=>$conf->agenda->enabled && $user->rights->agenda->allactions->lire), +'donation'=>array( + 'name'=>"Donation", + 'title'=>"ListDonationsAssociatedProject", + 'class'=>'Don', + 'table'=>'don', + 'datefieldname'=>'date', + 'disableamount'=>1, + 'test'=>$conf->don->enabled && $user->rights->don->lire), ); if ($action=="addelement") From 4e68586389eb7cb28745c2b07052678b14fd7f55 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 19 Mar 2015 05:08:23 +0100 Subject: [PATCH 135/412] Move module Dons in htdocs>donations --- htdocs/{ => donations}/admin/dons.php | 0 .../dons/class => donations/admin}/index.html | 0 htdocs/donations/admin/index.php | 117 ++++++++++++++++++ htdocs/{compta/dons => donations}/card.php | 0 .../dons => donations}/class/don.class.php | 0 htdocs/donations/class/index.html | 0 .../class/paymentdonation.class.php | 0 .../{compta/dons => donations}/document.php | 0 htdocs/donations/index.html | 0 htdocs/{compta/dons => donations}/index.php | 0 htdocs/{compta/dons => donations}/info.php | 0 htdocs/{compta/dons => donations}/list.php | 0 htdocs/{compta/dons => donations}/payment.php | 0 htdocs/{compta/dons => donations}/stats.php | 0 14 files changed, 117 insertions(+) rename htdocs/{ => donations}/admin/dons.php (100%) rename htdocs/{compta/dons/class => donations/admin}/index.html (100%) create mode 100644 htdocs/donations/admin/index.php rename htdocs/{compta/dons => donations}/card.php (100%) rename htdocs/{compta/dons => donations}/class/don.class.php (100%) create mode 100644 htdocs/donations/class/index.html rename htdocs/{compta/dons => donations}/class/paymentdonation.class.php (100%) rename htdocs/{compta/dons => donations}/document.php (100%) create mode 100644 htdocs/donations/index.html rename htdocs/{compta/dons => donations}/index.php (100%) rename htdocs/{compta/dons => donations}/info.php (100%) rename htdocs/{compta/dons => donations}/list.php (100%) rename htdocs/{compta/dons => donations}/payment.php (100%) rename htdocs/{compta/dons => donations}/stats.php (100%) diff --git a/htdocs/admin/dons.php b/htdocs/donations/admin/dons.php similarity index 100% rename from htdocs/admin/dons.php rename to htdocs/donations/admin/dons.php diff --git a/htdocs/compta/dons/class/index.html b/htdocs/donations/admin/index.html similarity index 100% rename from htdocs/compta/dons/class/index.html rename to htdocs/donations/admin/index.html diff --git a/htdocs/donations/admin/index.php b/htdocs/donations/admin/index.php new file mode 100644 index 00000000000..78ff3b48f9a --- /dev/null +++ b/htdocs/donations/admin/index.php @@ -0,0 +1,117 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/** + * \file htdocs/admin/index.php + * \ingroup Donations + * \brief Setup page to configure donations module + */ + +require '../main.inc.php'; + +// Class +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; + +$langs->load("admin"); +$langs->load("donations"); + +// Security check +if (!$user->admin) + accessforbidden(); + +$action = GETPOST('action', 'alpha'); + +// Other parameters DONATIONS_* +$list = array ( + 'DONATIONS_ACCOUNTING_ACCOUNT_PRODUCT' +); + +/* + * Actions + */ + +if ($action == 'update') +{ + $error = 0; + + foreach ($list as $constname) { + $constvalue = GETPOST($constname, 'alpha'); + + if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) { + $error++; + } + } + + if (! $error) + { + setEventMessage($langs->trans("SetupSaved")); + } + else + { + setEventMessage($langs->trans("Error"),'errors'); + } +} + +/* + * View + */ + +llxHeader('',$langs->trans('DonationsSetup')); + +$form = new Form($db); + +$linkback=''.$langs->trans("BackToModuleList").''; +print_fiche_titre($langs->trans('DonationsSetup'),$linkback,'setup'); + +print '
'; +print ''; +print ''; + +/* + * Params + */ +print ''; +print ''; +print ''; +print "\n"; + +foreach ($list as $key) +{ + $var=!$var; + + print ''; + + // Param + $label = $langs->trans($key); + print ''; + + // Value + print ''; +} + +print ''; + +print ''; +print "
' . $langs->trans('Options') . '
'; + print ''; + print '
\n"; + +print '
'; + +llxFooter(); +$db->close(); \ No newline at end of file diff --git a/htdocs/compta/dons/card.php b/htdocs/donations/card.php similarity index 100% rename from htdocs/compta/dons/card.php rename to htdocs/donations/card.php diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/donations/class/don.class.php similarity index 100% rename from htdocs/compta/dons/class/don.class.php rename to htdocs/donations/class/don.class.php diff --git a/htdocs/donations/class/index.html b/htdocs/donations/class/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/compta/dons/class/paymentdonation.class.php b/htdocs/donations/class/paymentdonation.class.php similarity index 100% rename from htdocs/compta/dons/class/paymentdonation.class.php rename to htdocs/donations/class/paymentdonation.class.php diff --git a/htdocs/compta/dons/document.php b/htdocs/donations/document.php similarity index 100% rename from htdocs/compta/dons/document.php rename to htdocs/donations/document.php diff --git a/htdocs/donations/index.html b/htdocs/donations/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/compta/dons/index.php b/htdocs/donations/index.php similarity index 100% rename from htdocs/compta/dons/index.php rename to htdocs/donations/index.php diff --git a/htdocs/compta/dons/info.php b/htdocs/donations/info.php similarity index 100% rename from htdocs/compta/dons/info.php rename to htdocs/donations/info.php diff --git a/htdocs/compta/dons/list.php b/htdocs/donations/list.php similarity index 100% rename from htdocs/compta/dons/list.php rename to htdocs/donations/list.php diff --git a/htdocs/compta/dons/payment.php b/htdocs/donations/payment.php similarity index 100% rename from htdocs/compta/dons/payment.php rename to htdocs/donations/payment.php diff --git a/htdocs/compta/dons/stats.php b/htdocs/donations/stats.php similarity index 100% rename from htdocs/compta/dons/stats.php rename to htdocs/donations/stats.php From 7b6cb59f4bc1994c54680e086563055dd630ecc9 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 19 Mar 2015 05:17:10 +0100 Subject: [PATCH 136/412] Move module Don in htdocs->donations --- htdocs/{ => donations}/core/lib/donation.lib.php | 0 .../core/modules/dons/html_cerfafr.html | 0 .../core/modules/dons/html_cerfafr.modules.php | 0 htdocs/{ => donations}/core/modules/dons/index.html | 0 .../{ => donations}/core/modules/dons/modules_don.php | 0 htdocs/{ => donations}/core/modules/modDon.class.php | 10 +++++----- 6 files changed, 5 insertions(+), 5 deletions(-) rename htdocs/{ => donations}/core/lib/donation.lib.php (100%) rename htdocs/{ => donations}/core/modules/dons/html_cerfafr.html (100%) rename htdocs/{ => donations}/core/modules/dons/html_cerfafr.modules.php (100%) rename htdocs/{ => donations}/core/modules/dons/index.html (100%) rename htdocs/{ => donations}/core/modules/dons/modules_don.php (100%) rename htdocs/{ => donations}/core/modules/modDon.class.php (95%) diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/donations/core/lib/donation.lib.php similarity index 100% rename from htdocs/core/lib/donation.lib.php rename to htdocs/donations/core/lib/donation.lib.php diff --git a/htdocs/core/modules/dons/html_cerfafr.html b/htdocs/donations/core/modules/dons/html_cerfafr.html similarity index 100% rename from htdocs/core/modules/dons/html_cerfafr.html rename to htdocs/donations/core/modules/dons/html_cerfafr.html diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/donations/core/modules/dons/html_cerfafr.modules.php similarity index 100% rename from htdocs/core/modules/dons/html_cerfafr.modules.php rename to htdocs/donations/core/modules/dons/html_cerfafr.modules.php diff --git a/htdocs/core/modules/dons/index.html b/htdocs/donations/core/modules/dons/index.html similarity index 100% rename from htdocs/core/modules/dons/index.html rename to htdocs/donations/core/modules/dons/index.html diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/donations/core/modules/dons/modules_don.php similarity index 100% rename from htdocs/core/modules/dons/modules_don.php rename to htdocs/donations/core/modules/dons/modules_don.php diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/donations/core/modules/modDon.class.php similarity index 95% rename from htdocs/core/modules/modDon.class.php rename to htdocs/donations/core/modules/modDon.class.php index b1b265146a4..bf5db49ec82 100644 --- a/htdocs/core/modules/modDon.class.php +++ b/htdocs/donations/core/modules/modDon.class.php @@ -2,7 +2,7 @@ /* Copyright (C) 2003-2005 Rodolphe Quiedeville * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005-2011 Regis Houssin - * Copyright (C) 2014 Alexandre Spangaro + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -64,7 +64,7 @@ class modDon extends DolibarrModules $this->requiredby = array(); // Config pages - $this->config_page_url = array("dons.php"); + $this->config_page_url = array("dons.php@donations"); // Constants $this->const = array (); @@ -146,8 +146,8 @@ class modDon extends DolibarrModules global $conf; $sql = array( - "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][2]."' AND entity = ".$conf->entity, - "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][2]."','donation',".$conf->entity.")", + "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->const[0][4]."' AND entity = ".$conf->entity, + "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->const[0][4]."','donation',".$conf->entity.")", ); return $this->_init($sql,$options); @@ -168,4 +168,4 @@ class modDon extends DolibarrModules return $this->_remove($sql,$options); } -} +} \ No newline at end of file From fa411323722b34adba3072f86f2e40abb75031b5 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 19 Mar 2015 05:22:42 +0100 Subject: [PATCH 137/412] Move module Don in htdocs->donations --- htdocs/compta/index.php | 4 ++-- htdocs/compta/resultat/clientfourn.php | 2 +- htdocs/core/menus/init_menu_auguria.sql | 8 ++++---- htdocs/core/menus/standard/eldy.lib.php | 8 ++++---- htdocs/donations/admin/dons.php | 2 +- htdocs/donations/card.php | 10 +++++----- htdocs/donations/class/don.class.php | 4 ++-- htdocs/donations/class/paymentdonation.class.php | 4 ++-- htdocs/donations/core/lib/donation.lib.php | 6 +++--- .../core/modules/dons/html_cerfafr.modules.php | 2 +- htdocs/donations/core/modules/dons/modules_don.php | 2 +- htdocs/donations/document.php | 6 +++--- htdocs/donations/index.php | 4 ++-- htdocs/donations/info.php | 4 ++-- htdocs/donations/list.php | 4 ++-- htdocs/donations/payment.php | 12 ++++++------ htdocs/donations/stats.php | 2 +- 17 files changed, 42 insertions(+), 42 deletions(-) diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index b1d32083a8a..9af8296f84d 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -127,7 +127,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) if (! empty($conf->don->enabled) && $user->rights->don->lire) { $langs->load("donations"); - print '
'; + print ''; print ''; print ''; print ''; @@ -497,7 +497,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- // Last donations if (! empty($conf->don->enabled) && $user->rights->societe->lire) { - include_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; + include_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; $langs->load("boxes"); $donationstatic=new Don($db); diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 09469329069..4f1ff225417 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -651,7 +651,7 @@ if ($conf->donation->enabled) $var = !$var; print ""; - print "\n"; + print "\n"; if ($modecompta == 'CREANCES-DETTES') print ''; print ''; diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index b2f81ed1769..87e8f6a9ec2 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -172,10 +172,10 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Accountancy - Orders to bill insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'accountancy', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__); -- Donations -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled', __HANDLER__, 'left', 2000__+MAX_llx_menu__, 'accountancy', 'donations', 6__+MAX_llx_menu__, '/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/card.php?leftmenu=donations&mainmenu=accountancy&action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/list.php?leftmenu=donations&mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__); ---insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/compta/dons/stats.php?leftmenu=donations&mainmenu=accountancy', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled', __HANDLER__, 'left', 2000__+MAX_llx_menu__, 'accountancy', 'donations', 6__+MAX_llx_menu__, '/donations/index.php?leftmenu=donations&mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/donations/card.php?leftmenu=donations&mainmenu=accountancy&action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/donations/list.php?leftmenu=donations&mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__); +--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/donations/stats.php?leftmenu=donations&mainmenu=accountancy', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__); -- Special expenses insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled || $conf->salaries->enabled', __HANDLER__, 'left', 2200__+MAX_llx_menu__, 'accountancy', 'tax', 6__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy', 'MenuSpecialExpenses', 0, 'compta', '(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)', '', 0, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled', __HANDLER__, 'left', 2210__+MAX_llx_menu__, 'accountancy', 'tax_sal', 2200__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary&mainmenu=accountancy', 'Salaries', 1, 'salaries', '$user->rights->salaries->read', '', 0, 1, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 24af20ea4af..95cbad199a7 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -788,10 +788,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->don->enabled)) { $langs->load("donations"); - $newmenu->add("/compta/dons/index.php?leftmenu=donations&mainmenu=accountancy",$langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations'); - if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/card.php?action=create",$langs->trans("NewDonation"), 1, $user->rights->don->creer); - if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/compta/dons/list.php",$langs->trans("List"), 1, $user->rights->don->lire); - //if ($leftmenu=="donations") $newmenu->add("/compta/dons/stats.php",$langs->trans("Statistics"), 1, $user->rights->don->lire); + $newmenu->add("/donations/index.php?leftmenu=donations&mainmenu=accountancy",$langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations'); + if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/donations/card.php?action=create",$langs->trans("NewDonation"), 1, $user->rights->don->creer); + if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/donations/list.php",$langs->trans("List"), 1, $user->rights->don->lire); + //if ($leftmenu=="donations") $newmenu->add("/donations/stats.php",$langs->trans("Statistics"), 1, $user->rights->don->lire); } // Taxes and social contributions diff --git a/htdocs/donations/admin/dons.php b/htdocs/donations/admin/dons.php index dcac1079422..f4afddc65d0 100644 --- a/htdocs/donations/admin/dons.php +++ b/htdocs/donations/admin/dons.php @@ -25,7 +25,7 @@ */ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; $langs->load("admin"); $langs->load("donations"); diff --git a/htdocs/donations/card.php b/htdocs/donations/card.php index 88331bb5498..79b97c2fde3 100644 --- a/htdocs/donations/card.php +++ b/htdocs/donations/card.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/compta/dons/card.php + * \file htdocs/donations/card.php * \ingroup don * \brief Page of donation card */ @@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; if (! empty($conf->projet->enabled)) { @@ -466,7 +466,7 @@ if (! empty($id) && $action != 'edit') print ''; print '
'.$langs->trans("SearchADonation").'
 ".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."'.price($obj->amount).''.price($obj->amount).'
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; $nbrows=12; if (! empty($conf->projet->enabled)) $nbrows++; @@ -534,7 +534,7 @@ if (! empty($id) && $action != 'edit') $objp = $db->fetch_object($resql); $var=!$var; print "'; + print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''; print '\n"; $labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->paiement_type; print "\n"; @@ -641,7 +641,7 @@ if (! empty($id) && $action != 'edit') } else { - print '
' . $langs->trans('DoPayment') . '
'; + print '
' . $langs->trans('DoPayment') . '
'; } } diff --git a/htdocs/donations/class/don.class.php b/htdocs/donations/class/don.class.php index 273d54a6eef..51c3958f2e6 100644 --- a/htdocs/donations/class/don.class.php +++ b/htdocs/donations/class/don.class.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/compta/dons/class/don.class.php + * \file htdocs/donations/class/don.class.php * \ingroup Donation * \brief File of class to manage donations */ @@ -723,7 +723,7 @@ class Don extends CommonObject $result=''; $label=$langs->trans("ShowDonation").': '.$this->id; - $link = ''; + $link = ''; $linkend=''; $picto='generic'; diff --git a/htdocs/donations/class/paymentdonation.class.php b/htdocs/donations/class/paymentdonation.class.php index 907ea46bf72..72d1709b252 100644 --- a/htdocs/donations/class/paymentdonation.class.php +++ b/htdocs/donations/class/paymentdonation.class.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/compta/dons/class/paymentdonation.class.php + * \file htdocs/donations/class/paymentdonation.class.php * \ingroup Donation * \brief File of class to manage payment of donations */ @@ -510,7 +510,7 @@ class PaymentDonation extends CommonObject // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction $url=''; - if ($mode == 'payment_donation') $url=DOL_URL_ROOT.'/compta/dons/card.php?rowid='; + if ($mode == 'payment_donation') $url=DOL_URL_ROOT.'/donations/card.php?rowid='; if ($url) { $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode); diff --git a/htdocs/donations/core/lib/donation.lib.php b/htdocs/donations/core/lib/donation.lib.php index dcbe2d30e84..c274811bca1 100644 --- a/htdocs/donations/core/lib/donation.lib.php +++ b/htdocs/donations/core/lib/donation.lib.php @@ -34,7 +34,7 @@ function donation_prepare_head($object) $h = 0; $head = array (); - $head[$h][0] = DOL_URL_ROOT . '/compta/dons/card.php?id=' . $object->id; + $head[$h][0] = DOL_URL_ROOT . '/donations/card.php?id=' . $object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'card'; $h ++; @@ -45,12 +45,12 @@ function donation_prepare_head($object) // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation'); - $head[$h][0] = DOL_URL_ROOT . '/compta/dons/document.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT . '/donations/document.php?id='.$object->id; $head[$h][1] = $langs->trans("Documents"); $head[$h][2] = 'documents'; $h++; - $head[$h][0] = DOL_URL_ROOT . '/compta/dons/info.php?id=' . $object->id; + $head[$h][0] = DOL_URL_ROOT . '/donations/info.php?id=' . $object->id; $head[$h][1] = $langs->trans("Info"); $head[$h][2] = 'info'; $h++; diff --git a/htdocs/donations/core/modules/dons/html_cerfafr.modules.php b/htdocs/donations/core/modules/dons/html_cerfafr.modules.php index b4cc2795c1a..0efaf8c4524 100644 --- a/htdocs/donations/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/donations/core/modules/dons/html_cerfafr.modules.php @@ -25,7 +25,7 @@ * \brief Form of donation */ require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; diff --git a/htdocs/donations/core/modules/dons/modules_don.php b/htdocs/donations/core/modules/dons/modules_don.php index 8c894e7fa1f..69db5bec011 100644 --- a/htdocs/donations/core/modules/dons/modules_don.php +++ b/htdocs/donations/core/modules/dons/modules_don.php @@ -25,7 +25,7 @@ * \brief File of class to manage donation document generation */ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; diff --git a/htdocs/donations/document.php b/htdocs/donations/document.php index d4671097fad..16729a9bd81 100644 --- a/htdocs/donations/document.php +++ b/htdocs/donations/document.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/compta/dons/document.php + * \file htdocs/donations/document.php * \ingroup Donation * \brief Page of linked files into donations */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; @@ -96,7 +96,7 @@ if ($object->id) print '
"; - print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."".$labeltype.' '.$object->num_paiement."
'; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; - print ''; + print ''; print '\n"; print ''; diff --git a/htdocs/donations/stats.php b/htdocs/donations/stats.php index 1fbde7c0ce7..7552c29ebc0 100644 --- a/htdocs/donations/stats.php +++ b/htdocs/donations/stats.php @@ -17,7 +17,7 @@ */ /** - * \file htdocs/compta/dons/stats.php + * \file htdocs/donations/stats.php * \ingroup don * \brief Page des statistiques de dons */ From c9d31dab3a5fc4c3e3cfbfbb6c99497da1be80e5 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 19 Mar 2015 05:41:13 +0100 Subject: [PATCH 138/412] Move module Dons in htdocs->donations --- htdocs/projet/element.php | 2 +- htdocs/public/donations/donateurs_code.php | 2 +- htdocs/public/donations/therm.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index a49914b538a..69dc6a539c1 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -42,7 +42,7 @@ if (! empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichi if (! empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'; if (! empty($conf->expensereport->enabled)) require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; if (! empty($conf->agenda->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php'; -if (! empty($conf->don->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +if (! empty($conf->don->enabled)) require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; $langs->load("projects"); $langs->load("companies"); diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php index d2435f9f20f..ad42b7e0e7f 100644 --- a/htdocs/public/donations/donateurs_code.php +++ b/htdocs/public/donations/donateurs_code.php @@ -39,7 +39,7 @@ function llxHeaderVierge() { print 'Export agenda cal function llxFooterVierge() { print ''; } require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT .'/compta/dons/class/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT .'/donations/class/class/don.class.php'; // Security check if (empty($conf->don->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/donations/therm.php b/htdocs/public/donations/therm.php index 1e111567c17..36bdec4637f 100644 --- a/htdocs/public/donations/therm.php +++ b/htdocs/public/donations/therm.php @@ -27,7 +27,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; // Security check if (empty($conf->don->enabled)) accessforbidden('',1,1,1); From f44d91e1533b7ec3a0455834e10b2886422cc158 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 19 Mar 2015 11:47:30 +0100 Subject: [PATCH 139/412] NEW: The notification module accept keyword __SUPERVISOR__ to send notification to supervisor of user. --- htdocs/admin/notification.php | 4 +- htdocs/core/class/CMailFile.class.php | 12 +- htdocs/core/class/notify.class.php | 235 ++++++++++++++------------ htdocs/core/lib/functions.lib.php | 12 +- htdocs/langs/en_US/admin.lang | 4 +- htdocs/langs/en_US/mails.lang | 2 + htdocs/langs/en_US/other.lang | 2 +- htdocs/societe/notify/card.php | 12 +- 8 files changed, 152 insertions(+), 131 deletions(-) diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 58fd2442357..6de3cc09665 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -232,10 +232,10 @@ foreach($listofnotifiedevents as $notifiedevent) foreach($arrayemail as $key=>$valuedet) { $valuedet=trim($valuedet); - if (! empty($valuedet) && ! isValidEmail($valuedet)) $showwarning++; + if (! empty($valuedet) && ! isValidEmail($valuedet,1)) $showwarning++; } if ((! empty($conf->global->$param)) && $showwarning) $s.=' '.img_warning($langs->trans("ErrorBadEMail")); - print $form->textwithpicto($s,$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"),1,'help','',0,2); + print $form->textwithpicto($s,$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'
'.$langs->trans("YouCanAlsoUseSupervisorKeyword"),1,'help','',0,2); print '
'; } // New entry input fields diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 573e768fb4b..61ea308df39 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -85,8 +85,8 @@ class CMailFile * CMailFile * * @param string $subject Topic/Subject of mail - * @param string $to Recipients emails (RFC 2822: "Nom firstname [, ...]" ou "email[, ...]" ou "[, ...]") - * @param string $from Sender email (RFC 2822: "Nom firstname [, ...]" ou "email[, ...]" ou "[, ...]") + * @param string $to Recipients emails (RFC 2822: "Name firstname [, ...]" or "email[, ...]" or "[, ...]"). Note: the keyword '__SUPERVISOREMAIL__' is not allowed here and must be replaced by caller. + * @param string $from Sender email (RFC 2822: "Name firstname [, ...]" or "email[, ...]" or "[, ...]") * @param string $msg Message * @param array $filename_list List of files to attach (full path of filename on file system) * @param array $mimetype_list List of MIME type of attached files @@ -98,9 +98,7 @@ class CMailFile * @param string $errors_to Email errors * @param string $css Css option */ - function __construct($subject,$to,$from,$msg, - $filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(), - $addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='') + function __construct($subject,$to,$from,$msg,$filename_list=array(),$mimetype_list=array(),$mimefilename_list=array(),$addr_cc="",$addr_bcc="",$deliveryreceipt=0,$msgishtml=0,$errors_to='',$css='') { global $conf; @@ -1023,9 +1021,9 @@ class CMailFile } /** - * Return an address for SMTP protocol + * Return a formatted address string for SMTP protocol * - * @param string $address Example: 'John Doe ' or 'john@doe.com' + * @param string $address Example: 'John Doe , Alan Smith ' or 'john@doe.com, alan@smith.com' * @param int $format 0=auto, 1=emails with <>, 2=emails without <>, 3=auto + label between " * @param int $encode 1=Encode name to RFC2822 * @return string If format 0: '' or 'John Doe ' or '=?UTF-8?B?Sm9obiBEb2U=?= ' diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index 1a024c61552..aa92e6ee50f 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -155,7 +155,7 @@ class Notify */ function send($notifcode, $object) { - global $conf,$langs,$mysoc,$dolibarr_main_url_root; + global $user,$conf,$langs,$mysoc,$dolibarr_main_url_root; include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; @@ -373,120 +373,137 @@ class Notify } $param='NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_'.$reg[1]; - //if (! empty($conf->global->$param)) - //{ - $sendto = $conf->global->$param; - $notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid'); - if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code'); - $object_type = ''; - $link = ''; - $num++; + $sendto = $conf->global->$param; + $notifcodedefid = dol_getIdFromCode($this->db, $notifcode, 'c_action_trigger', 'code', 'rowid'); + if ($notifcodedefid <= 0) dol_print_error($this->db, 'Failed to get id from code'); - switch ($notifcode) { - case 'BILL_VALIDATE': - $link='/compta/facture.php?facid='.$object->id; - $dir_output = $conf->facture->dir_output; - $object_type = 'facture'; - $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref); - break; - case 'ORDER_VALIDATE': - $link='/commande/card.php?id='.$object->id; - $dir_output = $conf->commande->dir_output; - $object_type = 'order'; - $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref); - break; - case 'PROPAL_VALIDATE': - $link='/comm/propal.php?id='.$object->id; - $dir_output = $conf->propal->dir_output; - $object_type = 'propal'; - $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref); - break; - case 'FICHINTER_VALIDATE': - $link='/fichinter/card.php?id='.$object->id; - $dir_output = $conf->facture->dir_output; - $object_type = 'ficheinter'; - $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref); - break; - case 'ORDER_SUPPLIER_VALIDATE': - $link='/fourn/commande/card.php?id='.$object->id; - $dir_output = $conf->fournisseur->dir_output.'/commande/'; - $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; - $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$object->ref,$user->getFullName($langs)); - $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; - break; - case 'ORDER_SUPPLIER_APPROVE': - $link='/fourn/commande/card.php?id='.$object->id; - $dir_output = $conf->fournisseur->dir_output.'/commande/'; - $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; - $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs)); - $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; - break; - case 'ORDER_SUPPLIER_REFUSE': - $link='/fourn/commande/card.php?id='.$object->id; - $dir_output = $conf->fournisseur->dir_output.'/commande/'; - $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; - $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs)); - $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; - break; - case 'SHIPPING_VALIDATE': - $dir_output = $conf->expedition->dir_output.'/sending/'; - $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref); - break; - } - $ref = dol_sanitizeFileName($object->ref); - $pdf_path = $dir_output."/".$ref."/".$ref.".pdf"; - if (! dol_is_file($pdf_path)) - { - // We can't add PDF as it is not generated yet. - $filepdf = ''; - } - else - { - $filepdf = $pdf_path; - } + $object_type = ''; + $link = ''; + $num++; - $subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification"); + switch ($notifcode) { + case 'BILL_VALIDATE': + $link='/compta/facture.php?facid='.$object->id; + $dir_output = $conf->facture->dir_output; + $object_type = 'facture'; + $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref); + break; + case 'ORDER_VALIDATE': + $link='/commande/card.php?id='.$object->id; + $dir_output = $conf->commande->dir_output; + $object_type = 'order'; + $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref); + break; + case 'PROPAL_VALIDATE': + $link='/comm/propal.php?id='.$object->id; + $dir_output = $conf->propal->dir_output; + $object_type = 'propal'; + $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref); + break; + case 'FICHINTER_VALIDATE': + $link='/fichinter/card.php?id='.$object->id; + $dir_output = $conf->facture->dir_output; + $object_type = 'ficheinter'; + $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref); + break; + case 'ORDER_SUPPLIER_VALIDATE': + $link='/fourn/commande/card.php?id='.$object->id; + $dir_output = $conf->fournisseur->dir_output.'/commande/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderValidatedBy",$object->ref,$user->getFullName($langs)); + $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; + break; + case 'ORDER_SUPPLIER_APPROVE': + $link='/fourn/commande/card.php?id='.$object->id; + $dir_output = $conf->fournisseur->dir_output.'/commande/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs)); + $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; + break; + case 'ORDER_SUPPLIER_REFUSE': + $link='/fourn/commande/card.php?id='.$object->id; + $dir_output = $conf->fournisseur->dir_output.'/commande/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs)); + $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; + break; + case 'SHIPPING_VALIDATE': + $dir_output = $conf->expedition->dir_output.'/sending/'; + $object_type = 'order_supplier'; + $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref); + break; + } + $ref = dol_sanitizeFileName($object->ref); + $pdf_path = $dir_output."/".$ref."/".$ref.".pdf"; + if (! dol_is_file($pdf_path)) + { + // We can't add PDF as it is not generated yet. + $filepdf = ''; + } + else + { + $filepdf = $pdf_path; + } - $message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n"; - $message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n"; - $message.= "\n"; - $message.= $mesg; - if ($link) $message=dol_concatdesc($message,$urlwithroot.$link); + $subject = '['.$application.'] '.$langs->transnoentitiesnoconv("DolibarrNotification"); - $mailfile = new CMailFile( - $subject, - $sendto, - $replyto, - $message, - array($file), - array($mimefile), - array($filename[count($filename)-1]), - '', - '', - 0, - -1 - ); + $message = $langs->transnoentities("YouReceiveMailBecauseOfNotification",$application,$mysoc->name)."\n"; + $message.= $langs->transnoentities("YouReceiveMailBecauseOfNotification2",$application,$mysoc->name)."\n"; + $message.= "\n"; + $message.= $mesg; + if ($link) $message=dol_concatdesc($message,$urlwithroot.$link); - if ($mailfile->sendfile()) - { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, objet_id, email)"; - $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".$object->socid.", null, 'email', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')"; - if (! $this->db->query($sql)) - { - dol_print_error($this->db); - } - } - else - { - $error++; - $this->errors[]=$mailfile->error; - } - //} + // Replace keyword __SUPERVISOREMAIL__ + if (preg_match('/__SUPERVISOREMAIL__/', $sendto)) + { + $newval=''; + if ($user->fk_user > 0) + { + $supervisoruser=new User($this->db); + $supervisoruser->fetch($user->fk_user); + if ($supervisoruser->email) $newval=trim(dolGetFirstLastname($supervisoruser->firstname, $supervisoruser->lastname).' <'.$supervisoruser->email.'>'); + } + dol_syslog("Replace the __SUPERVISOREMAIL__ key into recipient email string with ".$newval); + $sendto = preg_replace('/__SUPERVISOREMAIL__/', $newval, $sendto); + $sendto = preg_replace('/^[\s,]+/','',$sendto); // Clean start of string + $sendto = preg_replace('/[\s,]+$/','',$sendto); // Clean end of string + } + + if ($sendto) + { + $mailfile = new CMailFile( + $subject, + $sendto, + $replyto, + $message, + array($file), + array($mimefile), + array($filename[count($filename)-1]), + '', + '', + 0, + -1 + ); + + if ($mailfile->sendfile()) + { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify (daten, fk_action, fk_soc, fk_contact, type, objet_type, objet_id, email)"; + $sql.= " VALUES ('".$this->db->idate(dol_now())."', ".$notifcodedefid.", ".$object->socid.", null, 'email', '".$object_type."', ".$object->id.", '".$this->db->escape($conf->global->$param)."')"; + if (! $this->db->query($sql)) + { + dol_print_error($this->db); + } + } + else + { + $error++; + $this->errors[]=$mailfile->error; + } + } } } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index d2ec84de96a..6ac8e92b229 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1633,14 +1633,14 @@ function dol_print_address($address, $htmlid, $mode, $id) /** * Return true if email syntax is ok * - * @param string $address email (Ex: "toto@titi.com", "John Do ") - * @return boolean true if email syntax is OK, false if KO or empty string + * @param string $address email (Ex: "toto@titi.com", "John Do ") + * @param int $acceptsupervisorkey If 1, the special string '__SUPERVISOREMAIL__' is also accepted as valid + * @return boolean true if email syntax is OK, false if KO or empty string */ -function isValidEmail($address) +function isValidEmail($address, $acceptsupervisorkey=0) { - if (filter_var($address, FILTER_VALIDATE_EMAIL)) { - return true; - } + if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') return true; + if (filter_var($address, FILTER_VALIDATE_EMAIL)) return true; return false; } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 7bb08ba2c0f..2439066ad9c 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1107,7 +1107,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
%s followed by ModuleCompanyCodePanicum=Return an empty accountancy code. ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code. UseNotifications=Use notifications -NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting a global target email address on module setup page. +NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one contact at time.
* or by setting global target email addresses in module setup page. ModelModules=Documents templates DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...) WatermarkOnDraft=Watermark on draft document @@ -1604,5 +1604,5 @@ NoModueToManageStockIncrease=No module able to manage automatic stock increase h YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification". ListOfNotificationsPerContact=List of notifications per contact* ListOfFixedNotifications=List of fixed notifications -GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contact +GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses Threshold=Threshold diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 6fffc35bb08..37a50c14965 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing. MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature. MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s. +YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor) +NbOfTargetedContacts=Current number of targeted contact emails \ No newline at end of file diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index b1cf1d714af..e3de07b3d5d 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -48,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation Notify_TASK_CREATE=Task created Notify_TASK_MODIFY=Task modified Notify_TASK_DELETE=Task deleted -SeeModuleSetup=See module setup +SeeModuleSetup=See setup of module %s NbOfAttachedFiles=Number of attached files/documents TotalSizeOfAttachedFiles=Total size of attached files/documents MaxSize=Maximum size diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index 69920a7e5ce..f8594a545ea 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -264,18 +264,22 @@ if ($result > 0) if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue; print ''; @@ -286,7 +290,7 @@ if ($result > 0) print ''; - print ''; + print ''; print ''; } From d442ac328c0a2d4b8ac2bb6d14fb64da1e6b96d2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 19 Mar 2015 12:34:03 +0100 Subject: [PATCH 140/412] Fix: some replacement tags were missing --- htdocs/fourn/commande/card.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index eefd5c961e2..d42c649f044 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1966,8 +1966,13 @@ elseif (! empty($object->id)) $formmail->withbody=1; $formmail->withdeliveryreceipt=1; $formmail->withcancel=1; + + $object->fetch_projet(); // Tableau des substitutions $formmail->substit['__ORDERREF__']=$object->ref; + $formmail->substit['__ORDERSUPPLIERREF__']=$object->ref_supplier; + $formmail->substit['__THIRPARTY_NAME__'] = $object->thirdparty->name; + $formmail->substit['__PROJECT_REF__'] = (is_object($object->projet)?$object->projet->ref:''); $formmail->substit['__SIGNATURE__']=$user->signature; $formmail->substit['__PERSONALIZED__']=''; $formmail->substit['__CONTACTCIVNAME__']=''; From 3a9c195f1018845239095824a0c28054be90afb9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Mar 2015 00:34:55 +0100 Subject: [PATCH 141/412] Fix hook management match spec --- htdocs/core/class/html.formfile.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 3be937babdf..fe0fae0ec4d 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -550,7 +550,11 @@ class FormFile // Execute hooks $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)) + { + $reshook = $hookmanager->executeHooks('formBuilddocOptions',$parameters,$GLOBALS['object']); + $out.= $hookmanager->resPrint; + } } // Get list of files From 0e01dbd44e845216a06b587f9124a211591106f5 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Fri, 20 Mar 2015 06:36:48 +0100 Subject: [PATCH 142/412] Update work --- htdocs/donations/admin/dons.php | 19 ++++++++++--------- htdocs/donations/card.php | 6 +++--- .../modules/dons/html_cerfafr.modules.php | 6 +++--- .../core/modules/dons/modules_don.php | 6 +++--- .../donations/core/modules/modDon.class.php | 6 +++--- htdocs/donations/document.php | 4 ++-- htdocs/donations/index.php | 2 +- htdocs/donations/info.php | 6 +++--- htdocs/donations/list.php | 6 +++--- htdocs/donations/payment.php | 4 ++-- htdocs/donations/stats.php | 2 +- htdocs/langs/en_US/donations.lang | 2 ++ 12 files changed, 36 insertions(+), 33 deletions(-) diff --git a/htdocs/donations/admin/dons.php b/htdocs/donations/admin/dons.php index f4afddc65d0..daf7b2f0e6d 100644 --- a/htdocs/donations/admin/dons.php +++ b/htdocs/donations/admin/dons.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005-2010 Laurent Destailleur * Copyright (C) 2012-2013 Juanjo Menent * Copyright (C) 2013 Philippe Grand - * Copyright (C) 2014 Alexandre Spangaro + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -19,13 +19,14 @@ */ /** - * \file htdocs/admin/dons.php - * \ingroup dons - * \brief Page d'administration/configuration du module Dons + * \file htdocs/donations/admin/dons.php + * \ingroup donations + * \brief Page to setup the donation module */ -require '../main.inc.php'; +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $langs->load("admin"); $langs->load("donations"); @@ -52,7 +53,7 @@ if ($action == 'specimen') $don->initAsSpecimen(); // Search template files - $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/"; + $dir = DOL_DOCUMENT_ROOT . "/donations/core/modules/dons/"; $file = $modele.".modules.php"; if (file_exists($dir.$file)) { @@ -173,7 +174,7 @@ else if ($action == 'setart885') { * View */ -$dir = "../core/modules/dons/"; +$dir = DOL_DOCUMENT_ROOT.'/donations/core/modules/dons/'; $form=new Form($db); llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration'); @@ -191,7 +192,7 @@ print ''; print ''; print '
'.$langs->trans("Ref").''; diff --git a/htdocs/donations/index.php b/htdocs/donations/index.php index 100380bc128..9a4f13e7e4a 100644 --- a/htdocs/donations/index.php +++ b/htdocs/donations/index.php @@ -18,13 +18,13 @@ */ /** - * \file htdocs/compta/dons/index.php + * \file htdocs/donations/index.php * \ingroup don * \brief Home page of donation module */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; $langs->load("donations"); diff --git a/htdocs/donations/info.php b/htdocs/donations/info.php index ca2c03878d6..2121e379a65 100644 --- a/htdocs/donations/info.php +++ b/htdocs/donations/info.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/compta/dons/info.php + * \file htdocs/donations/info.php * \ingroup Donation * \brief Page to show a donation information */ @@ -24,7 +24,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; $langs->load("donations"); diff --git a/htdocs/donations/list.php b/htdocs/donations/list.php index 95011ca0b74..5e0c1690413 100644 --- a/htdocs/donations/list.php +++ b/htdocs/donations/list.php @@ -19,13 +19,13 @@ */ /** - * \file htdocs/compta/dons/list.php + * \file htdocs/donations/list.php * \ingroup don * \brief Page de liste des dons */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load("companies"); diff --git a/htdocs/donations/payment.php b/htdocs/donations/payment.php index 948cd221b0c..4df5b1c0e22 100644 --- a/htdocs/donations/payment.php +++ b/htdocs/donations/payment.php @@ -16,14 +16,14 @@ */ /** - * \file htdocs/compta/dons/payment.php + * \file htdocs/donations/payment.php * \ingroup Donation * \brief Page to add payment of a donation */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/don.class.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/dons/class/paymentdonation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/class/paymentdonation.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("bills"); @@ -50,7 +50,7 @@ if ($action == 'add_payment') if ($_POST["cancel"]) { - $loc = DOL_URL_ROOT.'/compta/dons/card.php?rowid='.$chid; + $loc = DOL_URL_ROOT.'/donations/card.php?rowid='.$chid; header("Location: ".$loc); exit; } @@ -129,7 +129,7 @@ if ($action == 'add_payment') if (! $error) { $db->commit(); - $loc = DOL_URL_ROOT.'/compta/dons/card.php?rowid='.$chid; + $loc = DOL_URL_ROOT.'/donations/card.php?rowid='.$chid; header('Location: '.$loc); exit; } @@ -180,7 +180,7 @@ if (GETPOST("action") == 'create') print '
'.$langs->trans("Donation").'
'.$langs->trans("Ref").''.$chid.'
'.$langs->trans("Ref").''.$chid.'
'.$langs->trans("Date")."".dol_print_date($don->date,'day')."
'.$langs->trans("Amount")."".price($don->amount,0,$outputlangs,1,-1,-1,$conf->currency).'
'; $listtmp=explode(',',$val); + $first=1; foreach($listtmp as $keyemail => $valemail) { + if (! $first) print ', '; + $first=0; $valemail=trim($valemail); //print $keyemail.' - '.$valemail.' - '.$reg[1].'
'; - if (isValidEmail($valemail)) + if (isValidEmail($valemail, 1)) { - print ' <'.$valemail.'>'; + if ($valemail == '__SUPERVISOREMAIL__') print $valemail; + else print ' <'.$valemail.'>'; } else { $langs->load("errors"); - print '   '.img_warning().' '.$langs->trans("ErrorBadEMail",$valemail); + print ' '.img_warning().' '.$langs->trans("ErrorBadEMail",$valemail); } } print '		'; print $langs->trans("Email"); print ''.$langs->trans("SeeModuleSetup").''.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'
'; print ''; -print ''; +print ''; print ''; print "\n"; $var=true; @@ -210,7 +211,7 @@ print ''; /* * French params */ -if ($conf->global->MAIN_LANG_DEFAULT == "fr_FR") +if (preg_match('/fr/i',$outputlangs->defaultlang)) { print '
'; print_titre($langs->trans("FrenchOptions")); diff --git a/htdocs/donations/card.php b/htdocs/donations/card.php index 79b97c2fde3..0d1cea0d4f1 100644 --- a/htdocs/donations/card.php +++ b/htdocs/donations/card.php @@ -25,9 +25,9 @@ * \brief Page of donation card */ -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/core/modules/dons/modules_don.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; diff --git a/htdocs/donations/core/modules/dons/html_cerfafr.modules.php b/htdocs/donations/core/modules/dons/html_cerfafr.modules.php index 0efaf8c4524..4f4c4b7be1a 100644 --- a/htdocs/donations/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/donations/core/modules/dons/html_cerfafr.modules.php @@ -20,11 +20,11 @@ */ /** - * \file htdocs/core/modules/dons/html_cerfafr.modules.php + * \file htdocs/donations/core/modules/dons/html_cerfafr.modules.php * \ingroup don * \brief Form of donation */ -require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/core/modules/dons/modules_don.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; @@ -132,7 +132,7 @@ class html_cerfafr extends ModeleDon else $paymentmode = ''; // Define contents - $donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html"; + $donmodel=DOL_DOCUMENT_ROOT ."/donations/core/modules/dons/html_cerfafr.html"; $form = implode('', file($donmodel)); $form = str_replace('__REF__',$don->id,$form); $form = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$form); diff --git a/htdocs/donations/core/modules/dons/modules_don.php b/htdocs/donations/core/modules/dons/modules_don.php index 69db5bec011..f3a38bbfc0b 100644 --- a/htdocs/donations/core/modules/dons/modules_don.php +++ b/htdocs/donations/core/modules/dons/modules_don.php @@ -20,8 +20,8 @@ */ /** - * \file htdocs/core/modules/dons/modules_don.php - * \ingroup don + * \file htdocs/donations/core/modules/dons/modules_don.php + * \ingroup donations * \brief File of class to manage donation document generation */ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; @@ -201,7 +201,7 @@ function don_create($db, $id, $message, $modele, $outputlangs, $hidedetails=0, $ $file = $prefix."_".preg_replace('/^html_/','',$modele).".modules.php"; // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."core/modules/dons/".$file,0); + $file=dol_buildpath($reldir."donations/core/modules/dons/".$file,0); if (file_exists($file)) { $filefound=1; diff --git a/htdocs/donations/core/modules/modDon.class.php b/htdocs/donations/core/modules/modDon.class.php index bf5db49ec82..d602d867e1c 100644 --- a/htdocs/donations/core/modules/modDon.class.php +++ b/htdocs/donations/core/modules/modDon.class.php @@ -19,10 +19,10 @@ */ /** - * \defgroup don Module donation + * \defgroup don Module donations * \brief Module to manage the follow-up of the donations - * \file htdocs/core/modules/modDon.class.php - * \ingroup don + * \file htdocs/donations/core/modules/modDon.class.php + * \ingroup donations * \brief Description and activation file for module Donation */ diff --git a/htdocs/donations/document.php b/htdocs/donations/document.php index 16729a9bd81..19088425c8b 100644 --- a/htdocs/donations/document.php +++ b/htdocs/donations/document.php @@ -21,11 +21,11 @@ * \brief Page of linked files into donations */ -require '../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("other"); diff --git a/htdocs/donations/index.php b/htdocs/donations/index.php index 9a4f13e7e4a..7ed677f6f58 100644 --- a/htdocs/donations/index.php +++ b/htdocs/donations/index.php @@ -23,7 +23,7 @@ * \brief Home page of donation module */ -require '../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; $langs->load("donations"); diff --git a/htdocs/donations/info.php b/htdocs/donations/info.php index 2121e379a65..b3c60cf004e 100644 --- a/htdocs/donations/info.php +++ b/htdocs/donations/info.php @@ -17,12 +17,12 @@ /** * \file htdocs/donations/info.php - * \ingroup Donation + * \ingroup donations * \brief Page to show a donation information */ -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; diff --git a/htdocs/donations/list.php b/htdocs/donations/list.php index 5e0c1690413..4f49c28fb59 100644 --- a/htdocs/donations/list.php +++ b/htdocs/donations/list.php @@ -20,11 +20,11 @@ /** * \file htdocs/donations/list.php - * \ingroup don - * \brief Page de liste des dons + * \ingroup donations + * \brief List of donations */ -require '../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; diff --git a/htdocs/donations/payment.php b/htdocs/donations/payment.php index 4df5b1c0e22..b86678dcd39 100644 --- a/htdocs/donations/payment.php +++ b/htdocs/donations/payment.php @@ -17,11 +17,11 @@ /** * \file htdocs/donations/payment.php - * \ingroup Donation + * \ingroup donations * \brief Page to add payment of a donation */ -require '../../main.inc.php'; +require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/paymentdonation.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; diff --git a/htdocs/donations/stats.php b/htdocs/donations/stats.php index 7552c29ebc0..2dacd9e093f 100644 --- a/htdocs/donations/stats.php +++ b/htdocs/donations/stats.php @@ -22,7 +22,7 @@ * \brief Page des statistiques de dons */ -require '../../main.inc.php'; +require '../main.inc.php'; $langs->load("donations"); diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index 77d91ad801d..13634f98380 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -21,6 +21,8 @@ DonationStatusPaid=Donation received DonationStatusPromiseNotValidatedShort=Draft DonationStatusPromiseValidatedShort=Validated DonationStatusPaidShort=Received +DonationTitle=Donation receipt +DonationDatePayment=Payment date ValidPromess=Validate promise DonationReceipt=Donation receipt BuildDonationReceipt=Build receipt From 56295ed43819ea1b975021f31fde75be28065067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Fri, 20 Mar 2015 11:28:23 +0100 Subject: [PATCH 143/412] Fixed delivery date in order list not showing up --- htdocs/commande/liste.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index 55323b697f9..9f5f1e7fe58 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -6,6 +6,7 @@ * Copyright (C) 2012 Juanjo Menent * Copyright (C) 2013 Christophe Battarel * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2015 Marcos García * * 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 @@ -112,7 +113,7 @@ $help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Ped llxHeader('',$langs->trans("Orders"),$help_url); $sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,'; -$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison, c.fk_statut, c.facture as facturee'; +$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison as date_delivery, c.fk_statut, c.facture as facturee'; $sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s'; $sql.= ', '.MAIN_DB_PREFIX.'commande as c'; // We'll need this table joined to the select in order to filter by sale From 5e84ce69cae5d33ed1eaabeb51f51f93692bf35d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Mar 2015 12:07:34 +0100 Subject: [PATCH 144/412] Fix code to avoid callback usage (this fails on some php) --- htdocs/index.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/index.php b/htdocs/index.php index 15967013e8a..70950fb0b26 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -407,10 +407,11 @@ $var=true; //Remove any invalid response //load_board can return an integer if failed or WorkboardResponse if OK -$valid_dashboardlines = array_filter($dashboardlines, function ($board) { - return $board instanceof WorkboardResponse; -}); - +$valid_dashboardlines=array(); +foreach($dashboardlines as $tmp) +{ + if ($tmp instanceof WorkboardResponse) $valid_dashboardlines[] = $tmp; +} $rowspan = count($valid_dashboardlines); foreach($valid_dashboardlines as $board) From 70f6c3fdbb13134a3f2ead471a8b829e789d60fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Fri, 20 Mar 2015 12:59:37 +0100 Subject: [PATCH 145/412] NEW: List of recent modified supplier product prices in Supplier card --- htdocs/fourn/card.php | 46 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index b9957c12134..c88dae2e8f3 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -5,6 +5,7 @@ * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2014 Jean Heimburger + * Copyright (C) 2015 Marcos García * * 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 @@ -313,9 +314,50 @@ if ($object->id > 0) $langs->load("products"); print '
'.$langs->trans("Parameter").''.$langs->trans("Parameters").' 
'; print ''; - print '
'.$langs->trans("ProductsAndServices").''; + print ''.$langs->trans("ProductsAndServices").''; print ''.$langs->trans("All").' '.$object->nbOfProductRefs().''; - print '
'; + print ''; + + //Query from product/liste.php + $sql = 'SELECT p.rowid, p.ref, p.label, pfp.tms,'; + $sql.= ' p.fk_product_type'; + $sql.= ' FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp'; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product"; + $sql.= ' WHERE p.entity IN ('.getEntity('product', 1).')'; + $sql.= ' AND pfp.fk_soc = '.$object->id; + $sql .= $db->order('pfp.tms', 'desc'); + $sql.= $db->plimit($MAXLIST); + + $query = $db->query($sql); + + $return = array(); + + if ($db->num_rows($query)) { + + $productstatic = new Product($db); + + while ($objp = $db->fetch_object($query)) { + + $var=!$var; + + $productstatic->id = $objp->rowid; + $productstatic->ref = $objp->ref; + $productstatic->label = $objp->label; + $productstatic->type = $objp->fk_product_type; + + print ""; + print ''; + print $productstatic->getNomUrl(1); + print ''; + print ''; + print dol_trunc(dol_htmlentities($objp->label), 30); + print ''; + print ''.dol_print_date($objp->tms).''; + print ''; + } + } + + print ''; } From 92af226fffdde4dca2cb0ef895eae46b180d6937 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Mar 2015 15:19:42 +0100 Subject: [PATCH 146/412] Fix Not into official 3.7 but must be into migration for 3.7 when migration is done by 3.8 code --- htdocs/index.php | 9 +++++---- htdocs/install/mysql/migration/3.6.0-3.7.0.sql | 6 ++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/htdocs/index.php b/htdocs/index.php index 15967013e8a..70950fb0b26 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -407,10 +407,11 @@ $var=true; //Remove any invalid response //load_board can return an integer if failed or WorkboardResponse if OK -$valid_dashboardlines = array_filter($dashboardlines, function ($board) { - return $board instanceof WorkboardResponse; -}); - +$valid_dashboardlines=array(); +foreach($dashboardlines as $tmp) +{ + if ($tmp instanceof WorkboardResponse) $valid_dashboardlines[] = $tmp; +} $rowspan = count($valid_dashboardlines); foreach($valid_dashboardlines as $board) diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 7a432a1109e..73312c6c613 100755 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -1165,3 +1165,9 @@ UPDATE llx_bank_url set url = REPLACE( url, 'fiche.php', 'card.php'); -- Add id commandefourndet in llx_commande_fournisseur_dispatch to correct /fourn/commande/dispatch.php display when several times same product in supplier order ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN fk_commandefourndet INTEGER NOT NULL DEFAULT 0 AFTER fk_product; + + +-- Not into official 3.7 but must be into migration for 3.7 when migration is done by 3.8 code +ALTER TABLE llx_extrafields ADD COLUMN perms varchar(255) after fieldrequired; +ALTER TABLE llx_extrafields ADD COLUMN list integer DEFAULT 0 after perms; + From b0e928c213ed9cd3715d5fa6d56c0d46b270b1e7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Mar 2015 15:26:00 +0100 Subject: [PATCH 147/412] Disable migration with bugged versions --- htdocs/install/upgrade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 22c18c15fee..1e1ba08b6f9 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -193,9 +193,9 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) // Test database version is not forbidden for migration $dbversion_disallowed=array( array('type'=>'mysql','version'=>array(5,5,40)), - array('type'=>'mysqli','version'=>array(5,5,40)) - //,array('type'=>'mysql','version'=>array(5,5,41)), - //array('type'=>'mysqli','version'=>array(5,5,41)) + array('type'=>'mysqli','version'=>array(5,5,40)), + array('type'=>'mysql','version'=>array(5,5,41)), + array('type'=>'mysqli','version'=>array(5,5,41)) ); $listofforbiddenversion=''; foreach ($dbversion_disallowed as $dbversion_totest) From 0784e9638a7ab88df303b28d1c3d1b3941f5fff1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Mar 2015 17:57:40 +0100 Subject: [PATCH 148/412] The test on db version must not lock the phpunit --- .travis.yml | 12 +++---- htdocs/install/upgrade.php | 64 +++++++++++++++++++++----------------- 2 files changed, 41 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index c97b547e499..6c5833ccfdb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,13 +91,13 @@ before_script: script: - cd htdocs/install - date -# - php upgrade.php 3.4.0 3.5.0 > upgrade.log -# - php upgrade2.php 3.4.0 3.5.0 > upgrade2.log - - php upgrade.php 3.5.0 3.6.0 >> upgrade.log - - php upgrade2.php 3.5.0 3.6.0 >> upgrade2.log - - php upgrade.php 3.6.0 3.7.0 >> upgrade.log +# - php upgrade.php 3.4.0 3.5.0 ignoredbversion > upgrade.log +# - php upgrade2.php 3.4.0 3.5.0 ignoredbversion > upgrade2.log + - php upgrade.php 3.5.0 3.6.0 ignoredbversion >> upgrade.log + - php upgrade2.php 3.5.0 3.6.0 ignoredbversion >> upgrade2.log + - php upgrade.php 3.6.0 3.7.0 ignoredbversion >> upgrade.log # - cat upgrade360370.log - - php upgrade2.php 3.6.0 3.7.0 >> upgrade2.log + - php upgrade2.php 3.6.0 3.7.0 ignoredbversion >> upgrade2.log # - cat upgrade2.log - cd ../.. - date diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 1e1ba08b6f9..126c0896c80 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -19,9 +19,11 @@ * Upgrade scripts can be ran from command line with syntax: * * cd htdocs/install - * php upgrade.php 3.4.0 3.5.0 + * php upgrade.php 3.4.0 3.5.0 [dirmodule|ignoredbversion] * php upgrade2.php 3.4.0 3.5.0 * + * Option 'dirmodule' allows to provide a path for an external module, so we migrate from command line a script from a module. + * Option 'ignoredbversion' allows to run migration even if database is a bugged database version. * Return code is 0 if OK, >0 if error */ @@ -55,7 +57,8 @@ $setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):'auto'; $langs->setDefaultLang($setuplang); $versionfrom=GETPOST("versionfrom",'',3)?GETPOST("versionfrom",'',3):(empty($argv[1])?'':$argv[1]); $versionto=GETPOST("versionto",'',3)?GETPOST("versionto",'',3):(empty($argv[2])?'':$argv[2]); -$versionmodule=GETPOST("versionmodule",'',3)?GETPOST("versionmodule",'',3):(empty($argv[3])?'':$argv[3]); +$dirmodule=GETPOST("dirmodule",'',3)?GETPOST("dirmodule",'',3):(empty($argv[3])?'':$argv[3]); +$ignoredbversion=GETPOST('ignoredbversion','',3)?GETPOST('ignoredbversion','',3):(empty($argv[3])?'':$argv[3]); $langs->load("admin"); $langs->load("install"); @@ -191,31 +194,34 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) } // Test database version is not forbidden for migration - $dbversion_disallowed=array( - array('type'=>'mysql','version'=>array(5,5,40)), - array('type'=>'mysqli','version'=>array(5,5,40)), - array('type'=>'mysql','version'=>array(5,5,41)), - array('type'=>'mysqli','version'=>array(5,5,41)) - ); - $listofforbiddenversion=''; - foreach ($dbversion_disallowed as $dbversion_totest) - { - if ($dbversion_totest['type'] == $db->type) $listofforbiddenversion.=($listofforbiddenversion?', ':'').join('.',$dbversion_totest['version']); - } - foreach ($dbversion_disallowed as $dbversion_totest) - { - //print $db->type.' - '.join('.',$versionarray).' - '.versioncompare($dbversion_totest['version'],$versionarray)."
\n"; - if ($dbversion_totest['type'] == $db->type - && (versioncompare($dbversion_totest['version'],$versionarray) == 0 || versioncompare($dbversion_totest['version'],$versionarray)<=-4 || versioncompare($dbversion_totest['version'],$versionarray)>=4) - ) - { - // Warning: database version too low. - print '
'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration",join('.',$versionarray),$listofforbiddenversion)."
".$langs->trans("Error")."\n"; - dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration",join('.',$versionarray),$listofforbiddenversion)); - $ok=0; - break; - } - } + if (empty($ignoredbversion)) + { + $dbversion_disallowed=array( + array('type'=>'mysql','version'=>array(5,5,40)), + array('type'=>'mysqli','version'=>array(5,5,40)), + array('type'=>'mysql','version'=>array(5,5,41)), + array('type'=>'mysqli','version'=>array(5,5,41)) + ); + $listofforbiddenversion=''; + foreach ($dbversion_disallowed as $dbversion_totest) + { + if ($dbversion_totest['type'] == $db->type) $listofforbiddenversion.=($listofforbiddenversion?', ':'').join('.',$dbversion_totest['version']); + } + foreach ($dbversion_disallowed as $dbversion_totest) + { + //print $db->type.' - '.join('.',$versionarray).' - '.versioncompare($dbversion_totest['version'],$versionarray)."
\n"; + if ($dbversion_totest['type'] == $db->type + && (versioncompare($dbversion_totest['version'],$versionarray) == 0 || versioncompare($dbversion_totest['version'],$versionarray)<=-4 || versioncompare($dbversion_totest['version'],$versionarray)>=4) + ) + { + // Warning: database version too low. + print '
'.$langs->trans("ErrorDatabaseVersionForbiddenForMigration",join('.',$versionarray),$listofforbiddenversion)."
".$langs->trans("Error")."\n"; + dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorDatabaseVersionForbiddenForMigration",join('.',$versionarray),$listofforbiddenversion)); + $ok=0; + break; + } + } + } } // Force l'affichage de la progression @@ -370,7 +376,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) if ($ok) { $dir = "mysql/migration/"; // We use mysql migration scripts whatever is database driver - if (! empty($versionmodule)) $dir=dol_buildpath('/'.$versionmodule.'/sql/',0); + if (! empty($dirmodule)) $dir=dol_buildpath('/'.$dirmodule.'/sql/',0); // Clean last part to exclude minor version x.y.z -> x.y $newversionfrom=preg_replace('/(\.[0-9]+)$/i','.0',$versionfrom); @@ -475,7 +481,7 @@ $ret=0; if (! $ok && isset($argv[1])) $ret=1; dol_syslog("Exit ".$ret); -pFooter(((! $ok && empty($_GET["ignoreerrors"])) || $versionmodule),$setuplang); +pFooter(((! $ok && empty($_GET["ignoreerrors"])) || $dirmodule),$setuplang); if ($db->connected) $db->close(); From eeb09b83a10fd4dcb843b3afde336866258ff014 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 20 Mar 2015 20:50:46 +0100 Subject: [PATCH 149/412] The test on db version must not lock the phpunit --- htdocs/install/upgrade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 126c0896c80..359980763b0 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -57,8 +57,8 @@ $setuplang=GETPOST("selectlang",'',3)?GETPOST("selectlang",'',3):'auto'; $langs->setDefaultLang($setuplang); $versionfrom=GETPOST("versionfrom",'',3)?GETPOST("versionfrom",'',3):(empty($argv[1])?'':$argv[1]); $versionto=GETPOST("versionto",'',3)?GETPOST("versionto",'',3):(empty($argv[2])?'':$argv[2]); -$dirmodule=GETPOST("dirmodule",'',3)?GETPOST("dirmodule",'',3):(empty($argv[3])?'':$argv[3]); -$ignoredbversion=GETPOST('ignoredbversion','',3)?GETPOST('ignoredbversion','',3):(empty($argv[3])?'':$argv[3]); +$dirmodule=((GETPOST("dirmodule",'',3) && GETPOST("dirmodule",'',3) != 'ignoredbversion'))?GETPOST("dirmodule",'',3):((empty($argv[3]) || $argv[3] == 'ignoredbversion')?'':$argv[3]); +$ignoredbversion=(GETPOST('ignoredbversion','',3)=='ignoredbversion')?GETPOST('ignoredbversion','',3):((empty($argv[3]) || $argv[3] != 'ignoredbversion')?'':$argv[3]); $langs->load("admin"); $langs->load("install"); From b8ed5533658b83e327faa50b38b694bd7c76ed25 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 21 Mar 2015 01:08:29 +0100 Subject: [PATCH 150/412] We must keep the @, some tools use it to know it is login page. --- htdocs/core/tpl/login.tpl.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 29eda49a9a9..f9e22ed3812 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -29,7 +29,7 @@ if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile=1; if (! empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax=1; $arrayofjs=array('/core/js/dst.js'.(empty($conf->dol_use_jmobile)?'':'?version='.urlencode(DOL_VERSION))); // Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second -$titleofloginpage=$langs->trans('Login').' '.$title; // title is defined by dol_loginfunction in security2.lib.php +$titleofloginpage=$langs->trans('Login').' @ '.$title; // title is defined by dol_loginfunction in security2.lib.php. We must keep the @, some tools use it to know it is login page. print top_htmlhead('',$titleofloginpage,0,0,$arrayofjs); ?> @@ -49,7 +49,6 @@ $(document).ready(function () {
'; + + +/* + * Boutons Actions + */ +print '
'; + +/* +if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) +{ + if ($user->societe_id == 0 && $payment->statut == 0 && $_GET['action'] == '') + { + if ($user->rights->facture->paiement) + { + print ''.$langs->trans('Valid').''; + } + } +} +*/ + +if ($_GET['action'] == '') +{ + if ($user->rights->don->supprimer) + { + if (! $disable_delete) + { + print ''.$langs->trans('Delete').''; + } + else + { + print ''.$langs->trans('Delete').''; + } + } +} + +print '
'; + + + +llxFooter(); + +$db->close(); diff --git a/htdocs/donations/payment/index.html b/htdocs/donations/payment/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/donations/payment.php b/htdocs/donations/payment/payment.php similarity index 99% rename from htdocs/donations/payment.php rename to htdocs/donations/payment/payment.php index b86678dcd39..871bbaa1056 100644 --- a/htdocs/donations/payment.php +++ b/htdocs/donations/payment/payment.php @@ -21,7 +21,7 @@ * \brief Page to add payment of a donation */ -require '../main.inc.php'; +require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/paymentdonation.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; From 9264482e25eb0bbfd323f14d1d2ffae8846ca6f6 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 22 Mar 2015 08:20:19 +0100 Subject: [PATCH 157/412] Update works --- htdocs/{donations => }/core/lib/donation.lib.php | 0 .../core/modules/dons/html_cerfafr.html | 0 .../core/modules/dons/html_cerfafr.modules.php | 2 +- htdocs/{donations => }/core/modules/dons/index.html | 0 .../{donations => }/core/modules/dons/modules_don.php | 4 ++-- htdocs/{donations => }/core/modules/modDon.class.php | 0 htdocs/donations/admin/donation.php | 5 +++-- htdocs/donations/card.php | 10 +++++----- htdocs/donations/document.php | 4 ++-- htdocs/donations/index.php | 6 +++--- htdocs/donations/info.php | 2 +- htdocs/donations/payment/card.php | 2 +- 12 files changed, 18 insertions(+), 17 deletions(-) rename htdocs/{donations => }/core/lib/donation.lib.php (100%) rename htdocs/{donations => }/core/modules/dons/html_cerfafr.html (100%) rename htdocs/{donations => }/core/modules/dons/html_cerfafr.modules.php (99%) rename htdocs/{donations => }/core/modules/dons/index.html (100%) rename htdocs/{donations => }/core/modules/dons/modules_don.php (97%) rename htdocs/{donations => }/core/modules/modDon.class.php (100%) diff --git a/htdocs/donations/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php similarity index 100% rename from htdocs/donations/core/lib/donation.lib.php rename to htdocs/core/lib/donation.lib.php diff --git a/htdocs/donations/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html similarity index 100% rename from htdocs/donations/core/modules/dons/html_cerfafr.html rename to htdocs/core/modules/dons/html_cerfafr.html diff --git a/htdocs/donations/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php similarity index 99% rename from htdocs/donations/core/modules/dons/html_cerfafr.modules.php rename to htdocs/core/modules/dons/html_cerfafr.modules.php index 4f4c4b7be1a..69484033374 100644 --- a/htdocs/donations/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -24,7 +24,7 @@ * \ingroup don * \brief Form of donation */ -require_once DOL_DOCUMENT_ROOT.'/donations/core/modules/dons/modules_don.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; diff --git a/htdocs/donations/core/modules/dons/index.html b/htdocs/core/modules/dons/index.html similarity index 100% rename from htdocs/donations/core/modules/dons/index.html rename to htdocs/core/modules/dons/index.html diff --git a/htdocs/donations/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php similarity index 97% rename from htdocs/donations/core/modules/dons/modules_don.php rename to htdocs/core/modules/dons/modules_don.php index f3a38bbfc0b..abb7dd105ae 100644 --- a/htdocs/donations/core/modules/dons/modules_don.php +++ b/htdocs/core/modules/dons/modules_don.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/donations/core/modules/dons/modules_don.php + * \file htdocs/core/modules/dons/modules_don.php * \ingroup donations * \brief File of class to manage donation document generation */ @@ -201,7 +201,7 @@ function don_create($db, $id, $message, $modele, $outputlangs, $hidedetails=0, $ $file = $prefix."_".preg_replace('/^html_/','',$modele).".modules.php"; // On verifie l'emplacement du modele - $file=dol_buildpath($reldir."donations/core/modules/dons/".$file,0); + $file=dol_buildpath($reldir."core/modules/dons/".$file,0); if (file_exists($file)) { $filefound=1; diff --git a/htdocs/donations/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php similarity index 100% rename from htdocs/donations/core/modules/modDon.class.php rename to htdocs/core/modules/modDon.class.php diff --git a/htdocs/donations/admin/donation.php b/htdocs/donations/admin/donation.php index ba0a72843fc..6c363c4bdc1 100644 --- a/htdocs/donations/admin/donation.php +++ b/htdocs/donations/admin/donation.php @@ -25,7 +25,7 @@ */ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; @@ -54,7 +54,8 @@ if ($action == 'specimen') $don->initAsSpecimen(); // Search template files - $dir = DOL_DOCUMENT_ROOT . "/donations/core/modules/dons/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/"; + $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/"; $file = $modele.".modules.php"; if (file_exists($dir.$file)) { diff --git a/htdocs/donations/card.php b/htdocs/donations/card.php index a8424da558e..6c2bd28a2d0 100644 --- a/htdocs/donations/card.php +++ b/htdocs/donations/card.php @@ -20,14 +20,14 @@ */ /** - * \file htdocs/donations/card.php - * \ingroup don - * \brief Page of donation card + * \file htdocs/donations/card.php + * \ingroup donations + * \brief Page of donation card */ require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/core/modules/dons/modules_don.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; diff --git a/htdocs/donations/document.php b/htdocs/donations/document.php index 19088425c8b..0cfb0447630 100644 --- a/htdocs/donations/document.php +++ b/htdocs/donations/document.php @@ -17,7 +17,7 @@ /** * \file htdocs/donations/document.php - * \ingroup Donation + * \ingroup donations * \brief Page of linked files into donations */ @@ -25,7 +25,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("other"); diff --git a/htdocs/donations/index.php b/htdocs/donations/index.php index 7ed677f6f58..ac64d6b2dde 100644 --- a/htdocs/donations/index.php +++ b/htdocs/donations/index.php @@ -18,9 +18,9 @@ */ /** - * \file htdocs/donations/index.php - * \ingroup don - * \brief Home page of donation module + * \file htdocs/donations/index.php + * \ingroup donations + * \brief Home page of donation module */ require '../main.inc.php'; diff --git a/htdocs/donations/info.php b/htdocs/donations/info.php index b3c60cf004e..a85b734fcf6 100644 --- a/htdocs/donations/info.php +++ b/htdocs/donations/info.php @@ -22,7 +22,7 @@ */ require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; diff --git a/htdocs/donations/payment/card.php b/htdocs/donations/payment/card.php index 3e4d03d15d2..6b30fdcc89b 100644 --- a/htdocs/donations/payment/card.php +++ b/htdocs/donations/payment/card.php @@ -121,7 +121,7 @@ $form = new Form($db); $h=0; -$head[$h][0] = DOL_URL_ROOT.'/donations/payment/card.php?id='.$_GET["id"]; +$head[$h][0] = DOL_URL_ROOT.'/donations/payment/card.php?id='.$id; $head[$h][1] = $langs->trans("Card"); $hselected = $h; $h++; From dafc955848d95a6b74e7bea8182e2855002bfaf0 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 22 Mar 2015 08:25:45 +0100 Subject: [PATCH 158/412] Correct path --- htdocs/donations/admin/donation.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/donations/admin/donation.php b/htdocs/donations/admin/donation.php index 6c363c4bdc1..fa785763cc0 100644 --- a/htdocs/donations/admin/donation.php +++ b/htdocs/donations/admin/donation.php @@ -55,7 +55,6 @@ if ($action == 'specimen') // Search template files $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/"; - $dir = DOL_DOCUMENT_ROOT . "/core/modules/dons/"; $file = $modele.".modules.php"; if (file_exists($dir.$file)) { @@ -176,7 +175,7 @@ else if ($action == 'setart885') { * View */ -$dir = DOL_DOCUMENT_ROOT.'/donations/core/modules/dons/'; +$dir = "../../core/modules/dons/"; $form=new Form($db); llxHeader('',$langs->trans("DonationsSetup"),'DonConfiguration'); From 87da1d734e9b104d4e92c1407cea20c3a171a61e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 12:13:26 +0100 Subject: [PATCH 159/412] mysql 5.5.41 is still bugged returning "lost connexion" during migration but there is no more data loss so we can allow this version. A database upgrade to 5.6 will be required if this occurs. --- htdocs/install/upgrade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 359980763b0..c001a771f06 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -198,9 +198,9 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) { $dbversion_disallowed=array( array('type'=>'mysql','version'=>array(5,5,40)), - array('type'=>'mysqli','version'=>array(5,5,40)), - array('type'=>'mysql','version'=>array(5,5,41)), - array('type'=>'mysqli','version'=>array(5,5,41)) + array('type'=>'mysqli','version'=>array(5,5,40)) //, + //array('type'=>'mysql','version'=>array(5,5,41)), + //array('type'=>'mysqli','version'=>array(5,5,41)) ); $listofforbiddenversion=''; foreach ($dbversion_disallowed as $dbversion_totest) From 15ac0894c9c3adb47cdc93b8b30da74f80202db7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 12:22:11 +0100 Subject: [PATCH 160/412] Prepare 3.7 release --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2d8c32c7986..456f58e3d60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,12 @@ English Dolibarr ChangeLog -------------------------------------------------------------- +WARNING: Do not try to make any Dolibarr upgrade if you are running Mysql version 5.5.40. +Mysql version 5.5.40 has a very critical bug making your data beeing definitely lost. +You may also experience troubles with Mysql 5.5.41 with error "Lost connection" during migration. +Upgrading to any other version or database system is abolutely required BEFORE trying to +make a migration. + ***** ChangeLog for 3.7 compared to 3.6.* ***** For users: From 2d90256640f987125704f5cdc07065f6fc43cc98 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 12:51:29 +0100 Subject: [PATCH 161/412] Revert "Refactor 1" --- htdocs/comm/propal/class/propal.class.php | 6 +- htdocs/commande/class/commande.class.php | 74 +++++----- htdocs/compta/facture/class/facture.class.php | 36 ++++- htdocs/core/class/commoninvoice.class.php | 95 ------------ htdocs/core/class/commonobject.class.php | 30 ++-- htdocs/core/class/commonobjectline.class.php | 13 -- htdocs/core/class/commonorder.class.php | 136 +----------------- htdocs/core/lib/functions.lib.php | 4 +- htdocs/core/tpl/objectline_create.tpl.php | 2 +- htdocs/core/tpl/objectline_edit.tpl.php | 4 +- htdocs/core/tpl/objectline_view.tpl.php | 16 +-- htdocs/fichinter/class/fichinter.class.php | 1 + htdocs/filefunc.inc.php | 1 + .../class/fournisseur.commande.class.php | 98 ++++++------- .../fourn/class/fournisseur.facture.class.php | 122 ++++++---------- htdocs/fourn/commande/card.php | 2 +- htdocs/fourn/facture/card.php | 2 +- htdocs/margin/admin/margin.php | 3 + htdocs/projet/admin/project.php | 7 +- htdocs/societe/admin/societe.php | 5 +- 20 files changed, 208 insertions(+), 449 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 533df89b773..8909441b9c1 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -107,9 +107,6 @@ class Propal extends CommonObject var $products=array(); var $extraparams=array(); - /** - * @var PropaleLigne[] - */ var $lines = array(); var $line; @@ -2804,6 +2801,9 @@ class Propal extends CommonObject */ class PropaleLigne extends CommonObject { + var $db; + var $error; + public $element='propaldet'; public $table_element='propaldet'; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 2d377758aa5..1bcfa1ee7cb 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -104,10 +104,7 @@ class Commande extends CommonOrder var $user_author_id; - /** - * @var OrderLine[] - */ - var $lines = array(); + var $lines = array(); //Incorterms var $fk_incoterms; @@ -1638,12 +1635,12 @@ class Commande extends CommonOrder $line = new OrderLine($this->db); - $line->rowid = $objp->rowid; + $line->rowid = $objp->rowid; // \deprecated $line->id = $objp->rowid; $line->fk_commande = $objp->fk_commande; - $line->commande_id = $objp->fk_commande; + $line->commande_id = $objp->fk_commande; // \deprecated $line->label = $objp->custom_label; - $line->desc = $objp->description; + $line->desc = $objp->description; // Description ligne $line->product_type = $objp->product_type; $line->qty = $objp->qty; $line->tva_tx = $objp->tva_tx; @@ -1669,11 +1666,11 @@ class Commande extends CommonOrder $line->special_code = $objp->special_code; $line->fk_parent_line = $objp->fk_parent_line; - $line->ref = $objp->product_ref; + $line->ref = $objp->product_ref; // TODO deprecated $line->product_ref = $objp->product_ref; - $line->libelle = $objp->product_label; + $line->libelle = $objp->product_label; // TODO deprecated $line->product_label = $objp->product_label; - $line->product_desc = $objp->product_desc; + $line->product_desc = $objp->product_desc; // Description produit $line->fk_product_type = $objp->fk_product_type; // Produit ou service $line->date_start = $this->db->jdate($objp->date_start); @@ -3178,7 +3175,6 @@ class Commande extends CommonOrder $this->lines[$i] = new OrderLine($this->db); $this->lines[$i]->id = $obj->rowid; - $this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->label = $obj->custom_label; $this->lines[$i]->description = $obj->description; $this->lines[$i]->fk_product = $obj->fk_product; @@ -3265,44 +3261,56 @@ class Commande extends CommonOrder */ class OrderLine extends CommonOrderLine { + var $db; + var $error; + public $element='commandedet'; public $table_element='commandedet'; var $oldline; - /** - * Id of parent order - * @var int - */ - public $fk_commande; - - /** - * Id of parent order - * @var int - * @deprecated Use fk_commande - */ - public $commande_id; - // From llx_commandedet + var $rowid; var $fk_parent_line; var $fk_facture; var $label; + var $desc; // Description ligne + var $fk_product; // Id produit predefini + var $product_type = 0; // Type 0 = product, 1 = Service + + var $qty; // Quantity (example 2) + var $tva_tx; // VAT Rate for product/service (example 19.6) + var $localtax1_tx; // Local tax 1 + var $localtax2_tx; // Local tax 2 + var $localtax1_type; // Local tax 1 type + var $localtax2_type; // Local tax 2 type + var $subprice; // U.P. HT (example 100) + var $remise_percent; // % for line discount (example 20%) var $fk_remise_except; var $rang = 0; var $fk_fournprice; - - /** - * Buy price without taxes - * @var float - */ var $pa_ht; var $marge_tx; var $marque_tx; + var $info_bits = 0; // Bit 0: 0 si TVA normal - 1 si TVA NPR + // Bit 1: 0 ligne normale - 1 si ligne de remise fixe + var $special_code = 0; + var $total_ht; // Total HT de la ligne toute quantite et incluant la remise ligne + var $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne + var $total_localtax1; // Total local tax 1 for the line + var $total_localtax2; // Total local tax 2 for the line + var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne - /** - * @deprecated - */ - var $remise; + // Ne plus utiliser + var $remise; + var $price; + + // From llx_product + var $ref; // deprecated + var $libelle; // deprecated + var $product_ref; + var $product_label; // Label produit + var $product_desc; // Description produit // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) // Start and end date of the line diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 38fab4c217c..48955652ac5 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3408,7 +3408,6 @@ class Facture extends CommonInvoice $this->lines[$i] = new FactureLigne($this->db); $this->lines[$i]->id = $obj->rowid; - $this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->label = $obj->custom_label; // deprecated $this->lines[$i]->description = $obj->description; $this->lines[$i]->fk_product = $obj->fk_product; @@ -3607,12 +3606,16 @@ class Facture extends CommonInvoice */ class FactureLigne extends CommonInvoiceLine { + var $db; + var $error; + public $element='facturedet'; public $table_element='facturedet'; var $oldline; //! From llx_facturedet + var $rowid; //! Id facture var $fk_facture; //! Id parent line @@ -3620,9 +3623,17 @@ class FactureLigne extends CommonInvoiceLine var $label; // deprecated //! Description ligne var $desc; + var $fk_product; // Id of predefined product + var $product_type = 0; // Type 0 = product, 1 = Service + var $qty; // Quantity (example 2) + var $tva_tx; // Taux tva produit/service (example 19.6) + var $localtax1_tx; // Local tax 1 + var $localtax2_tx; // Local tax 2 var $localtax1_type; // Local tax 1 type var $localtax2_type; // Local tax 2 type + var $subprice; // P.U. HT (example 100) + var $remise_percent; // % de la remise ligne (example 20%) var $fk_remise_except; // Link to line into llx_remise_except var $rang = 0; @@ -3631,6 +3642,10 @@ class FactureLigne extends CommonInvoiceLine var $marge_tx; var $marque_tx; + var $info_bits = 0; // Liste d'options cumulables: + // Bit 0: 0 si TVA normal - 1 si TVA NPR + // Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) + var $special_code; // Liste d'options non cumulabels: // 1: frais de port // 2: ecotaxe @@ -3639,6 +3654,15 @@ class FactureLigne extends CommonInvoiceLine var $origin; var $origin_id; + //! Total HT de la ligne toute quantite et incluant la remise ligne + var $total_ht; + //! Total TVA de la ligne toute quantite et incluant la remise ligne + var $total_tva; + var $total_localtax1; //Total Local tax 1 de la ligne + var $total_localtax2; //Total Local tax 2 de la ligne + //! Total TTC de la ligne toute quantite et incluant la remise ligne + var $total_ttc; + var $fk_code_ventilation = 0; var $date_start; @@ -3667,6 +3691,16 @@ class FactureLigne extends CommonInvoiceLine */ public $fk_prev_id; + /** + * Constructor + * + * @param DoliDB $db Database handler + */ + function __construct($db) + { + $this->db = $db; + } + /** * Load invoice line from database * diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index 1a7ebfc34c8..6087a5a0adb 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -400,100 +400,5 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php'; */ abstract class CommonInvoiceLine extends CommonObjectLine { - /** - * Quantity - * @var int - */ - public $qty; - - /** - * Unit price before taxes - * @var float - */ - public $subprice; - - /** - * Type of the product. 0 for product 1 for service - * @var int - */ - public $product_type = 0; - - /** - * Id of corresponding product - * @var int - */ - public $fk_product; - - /** - * VAT % - * @var float - */ - public $tva_tx; - - /** - * Local tax 1 % - * @var float - */ - public $localtax1_tx; - - /** - * Local tax 2 % - * @var float - */ - public $localtax2_tx; - - /** - * Percent of discount - * @var float - */ - public $remise_percent; - - /** - * Total amount before taxes - * @var float - */ - public $total_ht; - - /** - * Total VAT amount - * @var float - */ - public $total_tva; - - /** - * Total local tax 1 amount - * @var float - */ - public $total_localtax1; - - /** - * Total local tax 2 amount - * @var float - */ - public $total_localtax2; - - /** - * Total amount with taxes - * @var float - */ - public $total_ttc; - - /** - * Liste d'options cumulables: - * Bit 0: 0 si TVA normal - 1 si TVA NPR - * Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) - * @var int - */ - public $info_bits = 0; - - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - public function __construct(DoliDB $db) - { - $this->db = $db; - } } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 5dc524d964c..97157c6d408 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2685,9 +2685,10 @@ abstract class CommonObject * @param string $buyer Object of buyer third party * @param string $selected Object line selected * @param int $dateSelector 1=Show also date range input fields + * @param int $permtoedit Permission to edit line * @return void */ - function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0) + function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0, $permtoedit=0) { global $conf, $hookmanager, $inputalsopricewithtax, $usemargins, $langs, $user; @@ -2780,7 +2781,7 @@ abstract class CommonObject } else { - $this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline); + $this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline,$permtoedit); } $i++; @@ -2792,7 +2793,7 @@ abstract class CommonObject * TODO Move this into an output class file (htmlline.class.php) * * @param string $action GET/POST action - * @param CommonObjectLine $line Selected object line to output + * @param array $line Selected object line to output * @param string $var Is it a an odd line (true) * @param int $num Number of line (0) * @param int $i I @@ -2801,14 +2802,13 @@ abstract class CommonObject * @param string $buyer Object of buyer third party * @param string $selected Object line selected * @param object $extrafieldsline Object of extrafield line attribute + * @param int $permtoedit Permission to edit * @return void */ - function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0) + function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0,$permtoedit=0) { global $conf,$langs,$user,$object,$hookmanager; - global $form,$bc,$bcdd, $object_rights; - - $object_rights = $this->getRights(); + global $form,$bc,$bcdd; $element=$this->element; @@ -2821,7 +2821,7 @@ abstract class CommonObject if (! empty($line->date_end)) $type=1; // deprecated // Ligne en mode visu - if ($action != 'editline' || $selected != $line->rowid) + if ($action != 'editline' || $selected != $line->id) { // Product if ($line->fk_product > 0) @@ -2879,7 +2879,7 @@ abstract class CommonObject } // Ligne en mode update - if ($this->statut == 0 && $action == 'editline' && $selected == $line->rowid) + if ($this->statut == 0 && $action == 'editline' && $selected == $line->id) { $label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : '')); if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("Label").'"'; @@ -3883,16 +3883,4 @@ abstract class CommonObject return $out; } - /** - * Returns the rights used for this class - * @return stdClass - */ - public function getRights() - { - global $user; - - return $user->rights->{$this->element}; - } - - } diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index b88dfabe83d..c3c8d823a34 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -28,19 +28,6 @@ */ abstract class CommonObjectLine extends CommonObject { - /** - * Id of the line - * @var int - * @deprecated Use $rowid - */ - public $id; - - /** - * Id of the line - * @var int - */ - public $rowid; - // TODO // Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code. diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php index b4882af8a58..469e1676a53 100644 --- a/htdocs/core/class/commonorder.class.php +++ b/htdocs/core/class/commonorder.class.php @@ -22,7 +22,6 @@ */ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; -require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php'; /** * \class CommonOrder @@ -37,141 +36,8 @@ abstract class CommonOrder extends CommonObject * \class CommonOrderLine * \brief Superclass for orders classes */ -abstract class CommonOrderLine extends CommonObjectLine +abstract class CommonOrderLine extends CommonObject { - /** - * Product ref - * @var string - * @deprecated Use product_ref - */ - public $ref; - - /** - * Product ref - * @var string - */ - public $product_ref; - - /** - * Product label - * @var string - * @deprecated Use product_label - */ - public $libelle; - - /** - * Product label - * @var string - */ - public $product_label; - - /** - * Product description - * @var string - */ - public $product_desc; - - /** - * Quantity - * @var int - */ - public $qty; - - /** - * @deprecated - */ - var $price; - - /** - * Unit price before taxes - * @var float - */ - public $subprice; - - /** - * Type of the product. 0 for product 1 for service - * @var int - */ - public $product_type = 0; - - /** - * Description of the line - * @var string - */ - public $desc; - - /** - * Id of corresponding product - * @var int - */ - public $fk_product; - - /** - * Percent line discount - * @var float - */ - public $remise_percent; - - /** - * VAT % - * @var float - */ - public $tva_tx; - - /** - * Local tax 1 % - * @var float - */ - public $localtax1_tx; - - /** - * Local tax 2 % - * @var float - */ - public $localtax2_tx; - - public $localtax1_type; - public $localtax2_type; - - /** - * Total amount before taxes - * @var float - */ - public $total_ht; - - /** - * Total VAT amount - * @var float - */ - public $total_tva; - - /** - * Total local tax 1 amount - * @var float - */ - public $total_localtax1; - - /** - * Total local tax 2 amount - * @var float - */ - public $total_localtax2; - - /** - * Total amount with taxes - * @var float - */ - public $total_ttc; - - /** - * Liste d'options cumulables: - * Bit 0: 0 si TVA normal - 1 si TVA NPR - * Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) - * @var int - */ - public $info_bits = 0; - - public $special_code = 0; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 73a1633e78c..d2ce8023a65 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3927,7 +3927,9 @@ function dol_htmlcleanlastbr($stringtodecode) */ function dol_html_entity_decode($a,$b,$c='UTF-8') { - return html_entity_decode($a,$b,$c); + // We use @ to avoid warning on PHP4 that does not support entity decoding to UTF8; + $ret=@html_entity_decode($a,$b,$c); + return $ret; } /** diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 84cc158515d..027e6b3d816 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -286,7 +286,7 @@ else { $newline = new CommandeFournisseurLigne($this->db); } elseif ($this->table_element_line=='facture_fourn_det') { - $newline = new SupplierInvoiceLine($this->db); + $newline = new FactureFournisseurLigne($this->db); } if (is_object($newline)) { print $newline->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay+8)); diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 6be8a82d69a..5b895a69da3 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -53,9 +53,9 @@ $coldisplay=-1; // We remove first td ?> > global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>global->MAIN_VIEW_LINE_NUMBER))?2:1; ?> -
+
- + diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index da122306dbc..1fd86ed871d 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -48,11 +48,11 @@ if (empty($usemargins)) $usemargins=0; ?> -> +> global->MAIN_VIEW_LINE_NUMBER)) { ?> -
+
info_bits & 2) == 2) { ?> tva_tx,'%',$line->info_bits); ?> - pu_ht); ?> + pu_ht)?price($line->pu_ht):price($line->subprice)); ?> pu_ttc)?price($line->pu_ttc):price($line->subprice)); ?> @@ -179,11 +179,11 @@ if (empty($usemargins)) $usemargins=0; total_ht); ?> - statut == 0 && ($object_rights->creer)) { ?> + statut == 0 && ($user->rights->$element->creer || $permtoedit)) { ?> info_bits & 2) == 2) { ?> - rowid.'#line_'.$line->rowid; ?>"> + id.'#line_'.$line->id; ?>"> @@ -192,7 +192,7 @@ if (empty($usemargins)) $usemargins=0; situation_counter == 1 || !$this->situation_cycle_ref) { - print 'rowid . '">'; + print 'id . '">'; print img_delete(); print ''; } @@ -202,12 +202,12 @@ if (empty($usemargins)) $usemargins=0; 1 && empty($conf->browser->phone) && ($this->situation_counter == 1 || !$this->situation_cycle_ref)) { ?> 0) { ?> - rowid; ?>"> + id; ?>"> - rowid; ?>"> + id; ?>"> diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index baf2555a905..51d37dcc8ae 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -1022,6 +1022,7 @@ class FichinterLigne extends CommonObjectLine var $error; // From llx_fichinterdet + var $rowid; var $fk_fichinter; var $desc; // Description ligne var $datei; // Date intervention diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 15bee891775..7343e65c854 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -83,6 +83,7 @@ if (! empty($dolibarr_strict_mode)) } else { + if (! defined('E_DEPRECATED')) define('E_DEPRECATED',0); // For PHP < 5.3.0 compatibility error_reporting(E_ALL & ~(E_STRICT|E_NOTICE|E_DEPRECATED)); } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index e52b98b7e53..8b7d81fdda0 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -93,16 +93,13 @@ class CommandeFournisseur extends CommonOrder var $extraparams=array(); - /** - * @var CommandeFournisseurLigne[] - */ - public $lines = array(); //Ajout pour askpricesupplier var $origin; var $origin_id; var $linked_objects=array(); + var $lines = array(); - /** + /** * Constructor * * @param DoliDB $db Database handler @@ -113,6 +110,7 @@ class CommandeFournisseur extends CommonOrder $this->db = $db; $this->products = array(); + $this->lines = array(); // List of language codes for status $this->statuts[0] = 'StatusOrderDraft'; @@ -260,15 +258,14 @@ class CommandeFournisseur extends CommonOrder $line = new CommandeFournisseurLigne($this->db); $line->id = $objp->rowid; - $line->rowid = $objp->rowid; - $line->desc = $objp->description; - $line->description = $objp->description; + $line->desc = $objp->description; // Description ligne + $line->description = $objp->description; // Description ligne $line->qty = $objp->qty; $line->tva_tx = $objp->tva_tx; $line->localtax1_tx = $objp->localtax1_tx; $line->localtax2_tx = $objp->localtax2_tx; - $line->subprice = $objp->subprice; - $line->pu_ht = $objp->subprice; + $line->subprice = $objp->subprice; // deprecated + $line->pu_ht = $objp->subprice; // Unit price HT $line->remise_percent = $objp->remise_percent; $line->total_ht = $objp->total_ht; $line->total_tva = $objp->total_tva; @@ -277,16 +274,16 @@ class CommandeFournisseur extends CommonOrder $line->total_ttc = $objp->total_ttc; $line->product_type = $objp->product_type; - $line->fk_product = $objp->fk_product; + $line->fk_product = $objp->fk_product; // Id du produit - $line->libelle = $objp->product_label; - $line->product_label = $objp->product_label; - $line->product_desc = $objp->product_desc; + $line->libelle = $objp->product_label; // TODO deprecated + $line->product_label = $objp->product_label; // Label produit + $line->product_desc = $objp->product_desc; // Description produit - $line->ref = $objp->product_ref; - $line->product_ref = $objp->product_ref; - $line->ref_fourn = $objp->ref_supplier; - $line->ref_supplier = $objp->ref_supplier; + $line->ref = $objp->product_ref; // TODO deprecated + $line->product_ref = $objp->product_ref; // Internal reference + $line->ref_fourn = $objp->ref_supplier; // TODO deprecated + $line->ref_supplier = $objp->ref_supplier; // Reference supplier $line->date_start = $this->db->jdate($objp->date_start); $line->date_end = $this->db->jdate($objp->date_end); @@ -1624,6 +1621,7 @@ class CommandeFournisseur extends CommonOrder } } + /** * Return array of dispathed lines waiting to be approved for this order * @@ -2328,18 +2326,6 @@ class CommandeFournisseur extends CommonOrder if ($nb === 0) return $langs->trans('Undefined'); else return $nb.' '.$langs->trans('Days'); } - - /** - * Returns the rights used for this class - * @return stdClass - */ - public function getRights() - { - global $user; - - return $user->rights->fournisseur->commande; - } - } @@ -2349,32 +2335,42 @@ class CommandeFournisseur extends CommonOrder */ class CommandeFournisseurLigne extends CommonOrderLine { + var $db; + var $error; + public $element='commande_fournisseurdet'; public $table_element='commande_fournisseurdet'; - - /** - * Unit price without taxes - * @var float - */ - public $pu_ht; - var $date_start; + var $oldline; + + // From llx_commandedet + var $qty; + var $tva_tx; + var $localtax1_tx; + var $localtax2_tx; + var $localtax1_type; + var $localtax2_type; + var $subprice; + var $remise_percent; + var $desc; // Description ligne + var $fk_product; // Id of predefined product + var $product_type = 0; // Type 0 = product, 1 = Service + var $total_ht; + var $total_tva; + var $total_localtax1; + var $total_localtax2; + var $total_ttc; + var $info_bits; + var $special_code; + var $date_start; var $date_end; + // From llx_product + var $libelle; // Label produit + var $product_desc; // Description produit + // From llx_product_fournisseur_price - - /** - * Supplier ref - * @var string - * @deprecated Use ref_supplier - */ - public $ref_fourn; - - /** - * Supplier reference - * @var string - */ - public $ref_supplier; + var $ref_fourn; // Ref supplier /** @@ -2434,7 +2430,7 @@ class CommandeFournisseurLigne extends CommonOrderLine $this->date_start = $this->db->jdate($objp->date_start); $this->date_end = $this->db->jdate($objp->date_end); - + $this->db->free($result); return 1; } diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 19cb26cf17b..9cc6b237c41 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -89,12 +89,9 @@ class FactureFournisseur extends CommonInvoice var $mode_reglement_id; var $mode_reglement_code; - /** - * Invoice lines - * @var SupplierInvoiceLine[] - */ - public $lines = array(); + var $lines; var $fournisseur; // deprecated + var $thirdparty; // To store thirdparty //Incorterms var $fk_incoterms; @@ -103,6 +100,31 @@ class FactureFournisseur extends CommonInvoice var $extraparams=array(); + /** + * Standard invoice + */ + const TYPE_STANDARD = 0; + + /** + * Replacement invoice + */ + const TYPE_REPLACEMENT = 1; + + /** + * Credit note invoice + */ + const TYPE_CREDIT_NOTE = 2; + + /** + * Deposit invoice + */ + const TYPE_DEPOSIT = 3; + + /** + * Proforma invoice + */ + const TYPE_PROFORMA = 4; + /** * Constructor * @@ -123,6 +145,7 @@ class FactureFournisseur extends CommonInvoice $this->propalid = 0; $this->products = array(); + $this->lines = array(); } /** @@ -473,7 +496,7 @@ class FactureFournisseur extends CommonInvoice */ function fetch_lines() { - $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx'; + $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx, f.tva'; $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 '; $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line'; $sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc'; @@ -494,7 +517,7 @@ class FactureFournisseur extends CommonInvoice { $obj = $this->db->fetch_object($resql_rows); - $this->lines[$i] = new SupplierInvoiceLine($this->db); + $this->lines[$i] = new FactureFournisseurLigne($this->db); $this->lines[$i]->id = $obj->rowid; $this->lines[$i]->rowid = $obj->rowid; @@ -504,7 +527,6 @@ class FactureFournisseur extends CommonInvoice $this->lines[$i]->ref_supplier = $obj->ref_supplier; // Reference product supplier TODO Rename field ref to ref_supplier into table llx_facture_fourn_det and llx_commande_fournisseurdet and update fields it into updateline $this->lines[$i]->libelle = $obj->label; // This field may contains label of product (when invoice create from order) $this->lines[$i]->product_desc = $obj->product_desc; // Description du produit - $this->lines[$i]->subprice = $obj->pu_ht; $this->lines[$i]->pu_ht = $obj->pu_ht; $this->lines[$i]->pu_ttc = $obj->pu_ttc; $this->lines[$i]->tva_tx = $obj->tva_tx; @@ -512,7 +534,7 @@ class FactureFournisseur extends CommonInvoice $this->lines[$i]->localtax2_tx = $obj->localtax2_tx; $this->lines[$i]->qty = $obj->qty; $this->lines[$i]->remise_percent = $obj->remise_percent; - $this->lines[$i]->tva = $obj->total_tva; + $this->lines[$i]->tva = $obj->tva; $this->lines[$i]->total_ht = $obj->total_ht; $this->lines[$i]->total_tva = $obj->total_tva; $this->lines[$i]->total_localtax1 = $obj->total_localtax1; @@ -1291,7 +1313,7 @@ class FactureFournisseur extends CommonInvoice if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used { - $linetmp = new SupplierInvoiceLine($this->db); + $linetmp = new FactureFournisseurLigne($this->db); $linetmp->id=$this->rowid; $linetmp->array_options = $array_options; $result=$linetmp->insertExtraFields(); @@ -1836,18 +1858,6 @@ class FactureFournisseur extends CommonInvoice return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } - /** - * Returns the rights used for this class - * @return stdClass - */ - public function getRights() - { - global $user; - - return $user->rights->fournisseur->facture; - } - - } @@ -1855,70 +1865,20 @@ class FactureFournisseur extends CommonInvoice /** * Class to manage line invoices */ -class SupplierInvoiceLine extends CommonInvoice +class FactureFournisseurLigne extends CommonInvoice { + var $db; + var $error; + + var $pu_ht; + var $pu_ttc; + public $element='facture_fourn_det'; public $table_element='facture_fourn_det'; - var $oldline; + var $oldline; - public $ref; - public $product_ref; - public $ref_supplier; - public $libelle; - public $product_desc; - - /** - * Unit price before taxes - * @var float - * @deprecated Use $subprice - */ - public $pu_ht; - - /** - * Unit price included taxes - * @var float - */ - public $pu_ttc; - - /** - * Total VAT amount - * @var float - * @deprecated Use $total_tva instead - */ - public $tva; - - /** - * Id of the corresponding supplier invoice - * @var int - */ - var $fk_facture_fourn; - - /** - * Product label - * @var string - */ - var $label; // deprecated - - /** - * Description of the line - * @var string - */ - var $description; - - var $skip_update_total; // Skip update price total for special lines - - /** - * @var int Situation advance percentage - */ - public $situation_percent; - - /** - * @var int Previous situation line id reference - */ - public $fk_prev_id; - - /** + /** * Constructor * * @param DoliDB $db Database handler diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 3ca8aae79d5..26a0b5a5438 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2015,7 +2015,7 @@ elseif (! empty($object->id)) // Show object lines $inputalsopricewithtax=0; if (! empty($object->lines)) - $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1); + $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1, $user->rights->fournisseur->commande->creer); $num = count($object->lines); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index e93d06ad530..a48534b4c24 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2092,7 +2092,7 @@ else // Show object lines if (! empty($object->lines)) - $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1); + $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1, $user->rights->fournisseur->facture->creer); $num=count($object->lines); diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php index b031a190f44..f8beb7cd1ca 100644 --- a/htdocs/margin/admin/margin.php +++ b/htdocs/margin/admin/margin.php @@ -72,6 +72,7 @@ if ($action == 'remises') { if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', $_POST['MARGIN_METHODE_FOR_DISCOUNT'], 'chaine', 0, '', $conf->entity) > 0) { + $conf->global->MARGIN_METHODE_FOR_DISCOUNT = $_POST['MARGIN_METHODE_FOR_DISCOUNT']; setEventMessage($langs->trans("RecordModifiedSuccessfully")); } else @@ -84,6 +85,7 @@ if ($action == 'typemarges') { if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0) { + $conf->global->MARGIN_METHODE_FOR_DISCOUNT = $_POST['MARGIN_TYPE']; setEventMessage($langs->trans("RecordModifiedSuccessfully")); } else @@ -96,6 +98,7 @@ if ($action == 'contact') { if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0) { + $conf->global->AGENT_CONTACT_TYPE = $_POST['AGENT_CONTACT_TYPE']; setEventMessage($langs->trans("RecordModifiedSuccessfully")); } else diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index a29bb9a2d63..915d4ef69ef 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -237,7 +237,12 @@ if ($action == 'deltask') // Set default model else if ($action == 'setdoc') { - dolibarr_set_const($db, "PROJECT_ADDON_PDF",$value,'chaine',0,'',$conf->entity); + if (dolibarr_set_const($db, "PROJECT_ADDON_PDF",$value,'chaine',0,'',$conf->entity)) + { + // La constante qui a ete lue en avant du nouveau set + // on passe donc par une variable pour avoir un affichage coherent + $conf->global->PROJECT_ADDON_PDF = $value; + } // On active le modele $ret = delDocumentModel($value, $type); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 881946cb1cd..8fec81c686c 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -165,7 +165,10 @@ if ($action == 'setdoc') $db->begin(); - dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity); + if (dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity)) + { + $conf->global->COMPANY_ADDON_PDF = $value; + } // On active le modele $type='company'; From aa5ffa0bf22cfc3543352bfa40e6fc53d23bb9dc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 14:23:49 +0100 Subject: [PATCH 162/412] phpcs --- dev/skeletons/skeleton_class.class.php | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php index c9e20317695..c59b3986a08 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -43,7 +43,7 @@ class Skeleton_Class extends CommonObject var $table_element='skeleton'; //!< Name of table without prefix where object is stored var $lines=array(); - + var $id; var $prop1; var $prop2; @@ -106,11 +106,11 @@ class Skeleton_Class extends CommonObject if (! $notrigger) { // Uncomment this and change MYOBJECT to your own tag if you - // want this action calls a trigger. + // want this action to call a trigger. //// Call triggers //$result=$this->call_trigger('MYOBJECT_CREATE',$user); - //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail} + //if ($result < 0) $error++; //// End call triggers } } @@ -118,11 +118,6 @@ class Skeleton_Class extends CommonObject // Commit or rollback if ($error) { - foreach($this->errors as $errmsg) - { - dol_syslog(__METHOD__." ".$errmsg, LOG_ERR); - $this->error.=($this->error?', '.$errmsg:$errmsg); - } $this->db->rollback(); return -1*$error; } @@ -197,7 +192,7 @@ class Skeleton_Class extends CommonObject $sql.= " t.field2"; //... $sql.= " FROM ".MAIN_DB_PREFIX."mytable as t"; - + // Manage filter $sqlwhere=array(); if (count($filter)>0) { @@ -211,26 +206,26 @@ class Skeleton_Class extends CommonObject $sql .= " ORDER BY " . $sortfield . " " . $sortorder . " " . $this->db->plimit($limit + 1, $offset); $this->lines = array (); - + dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { $num = $this->db->num_rows($resql); - + while ($obj = $this->db->fetch_object($resql)) { $line=new Skeleton_ClassLine(); - + $line->id = $obj->rowid; $line->prop1 = $obj->field1; $line->prop2 = $obj->field2; - + $this->line[]=$line; //... } $this->db->free($resql); - + return $num; } else @@ -435,7 +430,8 @@ class Skeleton_Class extends CommonObject } -class Skeleton_ClassLine { +class Skeleton_ClassLine +{ var $id; var $prop1; var $prop2; From 17dc76838e836d2ff13cdf532443c9cf9e21b004 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 15:25:57 +0100 Subject: [PATCH 163/412] Fix bad url --- htdocs/core/boxes/box_contacts.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php index fdd5f725883..aaeabbb0572 100644 --- a/htdocs/core/boxes/box_contacts.php +++ b/htdocs/core/boxes/box_contacts.php @@ -62,7 +62,7 @@ class box_contacts extends ModeleBoxes if ($user->rights->societe->lire) { - $sql = "SELECT sp.rowid, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc"; + $sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc"; $sql.= ", s.nom as socname"; $sql.= ", s.code_client"; $sql.= " FROM ".MAIN_DB_PREFIX."socpeople as sp"; @@ -87,7 +87,8 @@ class box_contacts extends ModeleBoxes $datec=$db->jdate($objp->datec); $datem=$db->jdate($objp->tms); - $contactstatic->lastname=$objp->lastname; + $contactstatic->id=$objp->id; + $contactstatic->lastname=$objp->lastname; $contactstatic->firstname=$objp->firstname; $contactstatic->civility_id=$objp->civility_id; From feef043513d82f9df1c50c9e36983c37c7fb7249 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 22 Mar 2015 15:27:05 +0100 Subject: [PATCH 164/412] Correct --- htdocs/core/modules/dons/html_cerfafr.modules.php | 4 ++-- htdocs/core/modules/modDon.class.php | 2 +- htdocs/donations/admin/donation_extrafields.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php index 69484033374..0efaf8c4524 100644 --- a/htdocs/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/donations/core/modules/dons/html_cerfafr.modules.php + * \file htdocs/core/modules/dons/html_cerfafr.modules.php * \ingroup don * \brief Form of donation */ @@ -132,7 +132,7 @@ class html_cerfafr extends ModeleDon else $paymentmode = ''; // Define contents - $donmodel=DOL_DOCUMENT_ROOT ."/donations/core/modules/dons/html_cerfafr.html"; + $donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html"; $form = implode('', file($donmodel)); $form = str_replace('__REF__',$don->id,$form); $form = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$form); diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php index a4a825d8343..6d67b625f91 100644 --- a/htdocs/core/modules/modDon.class.php +++ b/htdocs/core/modules/modDon.class.php @@ -21,7 +21,7 @@ /** * \defgroup don Module donations * \brief Module to manage the follow-up of the donations - * \file htdocs/donations/core/modules/modDon.class.php + * \file htdocs/core/modules/modDon.class.php * \ingroup donations * \brief Description and activation file for module Donation */ diff --git a/htdocs/donations/admin/donation_extrafields.php b/htdocs/donations/admin/donation_extrafields.php index 3caa65bce98..f93b48bafca 100644 --- a/htdocs/donations/admin/donation_extrafields.php +++ b/htdocs/donations/admin/donation_extrafields.php @@ -22,7 +22,7 @@ */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; $langs->load("companies"); From b44f87f54807a9f7f82469bd88d45965abebb118 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 15:38:50 +0100 Subject: [PATCH 165/412] Clean css --- htdocs/theme/eldy/style.css.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 11c72f88586..42bf78a0745 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -840,9 +840,6 @@ foreach($mainmenuusedarray as $val) .bodylogin { background: #f0f0f0; - /* -moz-box-shadow: inset 0 0 10px #000000; - -webkit-box-shadow: inset 0 0 10px #000000; - box-shadow: inset 0 0 10px #000000; */ } .login_vertical_align { padding: 10px; From 809690fad7347e9f744135f395ad09b91ee75106 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 18:09:22 +0100 Subject: [PATCH 166/412] Saved logo in black int menu eldy. Start new dev theme based on material design. --- htdocs/theme/eldy/img/menus_black/agenda.png | Bin 0 -> 750 bytes .../eldy/img/menus_black/agenda_over.png | Bin 0 -> 580 bytes htdocs/theme/eldy/img/menus_black/bank.png | Bin 0 -> 892 bytes .../theme/eldy/img/menus_black/bank_over.png | Bin 0 -> 638 bytes .../theme/eldy/img/menus_black/commercial.png | Bin 0 -> 898 bytes .../eldy/img/menus_black/commercial_over.png | Bin 0 -> 650 bytes htdocs/theme/eldy/img/menus_black/company.png | Bin 0 -> 602 bytes .../eldy/img/menus_black/company_over.png | Bin 0 -> 426 bytes htdocs/theme/eldy/img/menus_black/ecm.png | Bin 0 -> 969 bytes .../theme/eldy/img/menus_black/ecm_over.png | Bin 0 -> 672 bytes .../eldy/img/menus_black/externalsite.png | Bin 0 -> 560 bytes .../img/menus_black/externalsite_over.png | Bin 0 -> 415 bytes htdocs/theme/eldy/img/menus_black/ftp.png | Bin 0 -> 844 bytes .../theme/eldy/img/menus_black/ftp_over.png | Bin 0 -> 612 bytes .../theme/eldy/img/menus_black/generic1.png | Bin 0 -> 611 bytes .../eldy/img/menus_black/generic1_over.png | Bin 0 -> 490 bytes .../theme/eldy/img/menus_black/generic2.png | Bin 0 -> 611 bytes .../eldy/img/menus_black/generic2_over.png | Bin 0 -> 490 bytes .../theme/eldy/img/menus_black/generic3.png | Bin 0 -> 611 bytes .../eldy/img/menus_black/generic3_over.png | Bin 0 -> 490 bytes .../theme/eldy/img/menus_black/generic4.png | Bin 0 -> 611 bytes .../eldy/img/menus_black/generic4_over.png | Bin 0 -> 490 bytes htdocs/theme/eldy/img/menus_black/globe.png | Bin 0 -> 1175 bytes .../theme/eldy/img/menus_black/globe_over.png | Bin 0 -> 847 bytes htdocs/theme/eldy/img/menus_black/home.png | Bin 0 -> 716 bytes .../theme/eldy/img/menus_black/home_over.png | Bin 0 -> 474 bytes htdocs/theme/eldy/img/menus_black/mail.png | Bin 0 -> 787 bytes .../theme/eldy/img/menus_black/mail_over.png | Bin 0 -> 533 bytes htdocs/theme/eldy/img/menus_black/members.png | Bin 0 -> 1134 bytes .../eldy/img/menus_black/members_over.png | Bin 0 -> 733 bytes htdocs/theme/eldy/img/menus_black/money.png | Bin 0 -> 1387 bytes .../theme/eldy/img/menus_black/money_over.png | Bin 0 -> 952 bytes .../eldy/img/menus_black/pointofsale.png | Bin 0 -> 573 bytes .../eldy/img/menus_black/pointofsale_over.png | Bin 0 -> 437 bytes .../theme/eldy/img/menus_black/products.png | Bin 0 -> 529 bytes .../eldy/img/menus_black/products_over.png | Bin 0 -> 374 bytes htdocs/theme/eldy/img/menus_black/project.png | Bin 0 -> 477 bytes .../eldy/img/menus_black/project_over.png | Bin 0 -> 380 bytes htdocs/theme/eldy/img/menus_black/shop.png | Bin 0 -> 715 bytes .../theme/eldy/img/menus_black/shop_over.png | Bin 0 -> 510 bytes htdocs/theme/eldy/img/menus_black/tools.png | Bin 0 -> 1148 bytes .../theme/eldy/img/menus_black/tools_over.png | Bin 0 -> 724 bytes htdocs/theme/md_dev/.gitignore | 1 + htdocs/theme/md_dev/AUTHOR | 1 + htdocs/theme/md_dev/ckeditor/config.js | 92 + htdocs/theme/md_dev/ckeditor/index.html | 0 htdocs/theme/md_dev/graph-color.php | 34 + htdocs/theme/md_dev/img/1downarrow.png | Bin 0 -> 225 bytes .../theme/md_dev/img/1downarrow_selected.png | Bin 0 -> 341 bytes htdocs/theme/md_dev/img/1leftarrow.png | Bin 0 -> 228 bytes .../theme/md_dev/img/1leftarrow_selected.png | Bin 0 -> 228 bytes htdocs/theme/md_dev/img/1rightarrow.png | Bin 0 -> 231 bytes .../theme/md_dev/img/1rightarrow_selected.png | Bin 0 -> 231 bytes htdocs/theme/md_dev/img/1uparrow.png | Bin 0 -> 232 bytes htdocs/theme/md_dev/img/1uparrow_selected.png | Bin 0 -> 355 bytes htdocs/theme/md_dev/img/1updownarrow.png | Bin 0 -> 278 bytes htdocs/theme/md_dev/img/addfile.png | Bin 0 -> 593 bytes htdocs/theme/md_dev/img/background.png | Bin 0 -> 25628 bytes htdocs/theme/md_dev/img/bg-bas-rubrique.png | Bin 0 -> 300 bytes htdocs/theme/md_dev/img/bg-rubrique.png | Bin 0 -> 89 bytes htdocs/theme/md_dev/img/bg-titre-rubrique.png | Bin 0 -> 374 bytes htdocs/theme/md_dev/img/button_bg.png | Bin 0 -> 199 bytes htdocs/theme/md_dev/img/button_edit.png | Bin 0 -> 961 bytes htdocs/theme/md_dev/img/calc.png | Bin 0 -> 734 bytes htdocs/theme/md_dev/img/calendar.png | Bin 0 -> 250 bytes htdocs/theme/md_dev/img/call.png | Bin 0 -> 286 bytes htdocs/theme/md_dev/img/call_out.png | Bin 0 -> 318 bytes htdocs/theme/md_dev/img/close.png | Bin 0 -> 301 bytes htdocs/theme/md_dev/img/close_title.png | Bin 0 -> 240 bytes htdocs/theme/md_dev/img/delete.png | Bin 0 -> 202 bytes htdocs/theme/md_dev/img/detail.png | Bin 0 -> 589 bytes htdocs/theme/md_dev/img/disable.png | Bin 0 -> 245 bytes htdocs/theme/md_dev/img/edit.png | Bin 0 -> 818 bytes htdocs/theme/md_dev/img/edit_add.png | Bin 0 -> 220 bytes htdocs/theme/md_dev/img/edit_remove.png | Bin 0 -> 122 bytes htdocs/theme/md_dev/img/editdelete.png | Bin 0 -> 245 bytes htdocs/theme/md_dev/img/error.png | Bin 0 -> 489 bytes htdocs/theme/md_dev/img/favicon.ico | Bin 0 -> 2238 bytes htdocs/theme/md_dev/img/file.png | Bin 0 -> 505 bytes htdocs/theme/md_dev/img/filenew.png | Bin 0 -> 397 bytes htdocs/theme/md_dev/img/filter.png | Bin 0 -> 206 bytes htdocs/theme/md_dev/img/folder-open.png | Bin 0 -> 801 bytes htdocs/theme/md_dev/img/folder.png | Bin 0 -> 935 bytes htdocs/theme/md_dev/img/gradient.gif | Bin 0 -> 1013 bytes htdocs/theme/md_dev/img/grip.png | Bin 0 -> 90 bytes htdocs/theme/md_dev/img/grip_title.png | Bin 0 -> 90 bytes htdocs/theme/md_dev/img/headbg.jpg | Bin 0 -> 12151 bytes htdocs/theme/md_dev/img/headbg2.jpg | Bin 0 -> 30553 bytes htdocs/theme/md_dev/img/help.png | Bin 0 -> 657 bytes htdocs/theme/md_dev/img/helpdoc.png | Bin 0 -> 693 bytes htdocs/theme/md_dev/img/high.png | Bin 0 -> 611 bytes htdocs/theme/md_dev/img/history.png | Bin 0 -> 1362 bytes htdocs/theme/md_dev/img/index.html | 0 htdocs/theme/md_dev/img/info.png | Bin 0 -> 657 bytes htdocs/theme/md_dev/img/liste_titre.png | Bin 0 -> 196 bytes htdocs/theme/md_dev/img/liste_titre2.png | Bin 0 -> 304 bytes htdocs/theme/md_dev/img/lock.png | Bin 0 -> 646 bytes htdocs/theme/md_dev/img/login_background.png | Bin 0 -> 79 bytes htdocs/theme/md_dev/img/logo_setup.svg | 475 +++ htdocs/theme/md_dev/img/logout.png | Bin 0 -> 608 bytes htdocs/theme/md_dev/img/menus/README.md | 12 + htdocs/theme/md_dev/img/menus/agenda.png | Bin 0 -> 700 bytes htdocs/theme/md_dev/img/menus/agenda_over.png | Bin 0 -> 541 bytes htdocs/theme/md_dev/img/menus/bank.png | Bin 0 -> 827 bytes htdocs/theme/md_dev/img/menus/bank_over.png | Bin 0 -> 620 bytes htdocs/theme/md_dev/img/menus/chart.png | Bin 0 -> 1321 bytes htdocs/theme/md_dev/img/menus/commercial.png | Bin 0 -> 845 bytes .../md_dev/img/menus/commercial_over.png | Bin 0 -> 638 bytes htdocs/theme/md_dev/img/menus/company.png | Bin 0 -> 572 bytes .../theme/md_dev/img/menus/company_over.png | Bin 0 -> 406 bytes htdocs/theme/md_dev/img/menus/ecm.png | Bin 0 -> 912 bytes htdocs/theme/md_dev/img/menus/ecm_over.png | Bin 0 -> 647 bytes .../theme/md_dev/img/menus/externalsite.png | Bin 0 -> 531 bytes .../md_dev/img/menus/externalsite_over.png | Bin 0 -> 404 bytes htdocs/theme/md_dev/img/menus/ftp.png | Bin 0 -> 788 bytes htdocs/theme/md_dev/img/menus/ftp_over.png | Bin 0 -> 563 bytes htdocs/theme/md_dev/img/menus/generic1.png | Bin 0 -> 570 bytes .../theme/md_dev/img/menus/generic1_over.png | Bin 0 -> 486 bytes htdocs/theme/md_dev/img/menus/generic2.png | Bin 0 -> 570 bytes .../theme/md_dev/img/menus/generic2_over.png | Bin 0 -> 548 bytes htdocs/theme/md_dev/img/menus/generic3.png | Bin 0 -> 570 bytes .../theme/md_dev/img/menus/generic3_over.png | Bin 0 -> 486 bytes htdocs/theme/md_dev/img/menus/generic4.png | Bin 0 -> 570 bytes .../theme/md_dev/img/menus/generic4_over.png | Bin 0 -> 486 bytes htdocs/theme/md_dev/img/menus/globe.png | Bin 0 -> 1175 bytes htdocs/theme/md_dev/img/menus/globe_over.png | Bin 0 -> 844 bytes htdocs/theme/md_dev/img/menus/holiday.png | Bin 0 -> 1086 bytes htdocs/theme/md_dev/img/menus/home.png | Bin 0 -> 679 bytes htdocs/theme/md_dev/img/menus/home_over.png | Bin 0 -> 484 bytes htdocs/theme/md_dev/img/menus/index.html | 0 htdocs/theme/md_dev/img/menus/mail.png | Bin 0 -> 718 bytes htdocs/theme/md_dev/img/menus/mail_over.png | Bin 0 -> 534 bytes htdocs/theme/md_dev/img/menus/members.png | Bin 0 -> 1044 bytes .../theme/md_dev/img/menus/members_over.png | Bin 0 -> 720 bytes htdocs/theme/md_dev/img/menus/money.png | Bin 0 -> 1259 bytes htdocs/theme/md_dev/img/menus/money_over.png | Bin 0 -> 940 bytes htdocs/theme/md_dev/img/menus/pointofsale.png | Bin 0 -> 542 bytes .../md_dev/img/menus/pointofsale_over.png | Bin 0 -> 424 bytes htdocs/theme/md_dev/img/menus/products.png | Bin 0 -> 510 bytes .../theme/md_dev/img/menus/products_over.png | Bin 0 -> 358 bytes htdocs/theme/md_dev/img/menus/project.png | Bin 0 -> 449 bytes .../theme/md_dev/img/menus/project_over.png | Bin 0 -> 360 bytes htdocs/theme/md_dev/img/menus/shop.png | Bin 0 -> 679 bytes htdocs/theme/md_dev/img/menus/shop_over.png | Bin 0 -> 502 bytes htdocs/theme/md_dev/img/menus/tools.png | Bin 0 -> 1052 bytes htdocs/theme/md_dev/img/menus/tools_over.png | Bin 0 -> 706 bytes htdocs/theme/md_dev/img/menutab-r.png | Bin 0 -> 198 bytes htdocs/theme/md_dev/img/nav-overlay.png | Bin 0 -> 109 bytes htdocs/theme/md_dev/img/nav-overlay3.png | Bin 0 -> 1780 bytes htdocs/theme/md_dev/img/next.png | Bin 0 -> 622 bytes htdocs/theme/md_dev/img/object_account.png | Bin 0 -> 453 bytes htdocs/theme/md_dev/img/object_accounting.png | Bin 0 -> 170 bytes htdocs/theme/md_dev/img/object_action.png | Bin 0 -> 528 bytes htdocs/theme/md_dev/img/object_action_rdv.png | Bin 0 -> 675 bytes htdocs/theme/md_dev/img/object_address.png | Bin 0 -> 358 bytes .../md_dev/img/object_askpricesupplier.png | Bin 0 -> 284 bytes htdocs/theme/md_dev/img/object_barcode.png | Bin 0 -> 219 bytes htdocs/theme/md_dev/img/object_bill.png | Bin 0 -> 394 bytes htdocs/theme/md_dev/img/object_billa.png | Bin 0 -> 395 bytes htdocs/theme/md_dev/img/object_billd.png | Bin 0 -> 341 bytes htdocs/theme/md_dev/img/object_billr.png | Bin 0 -> 399 bytes htdocs/theme/md_dev/img/object_book.png | Bin 0 -> 222 bytes htdocs/theme/md_dev/img/object_bookmark.png | Bin 0 -> 201 bytes htdocs/theme/md_dev/img/object_calendar.png | Bin 0 -> 199 bytes .../theme/md_dev/img/object_calendarday.png | Bin 0 -> 223 bytes .../md_dev/img/object_calendarperuser.png | Bin 0 -> 198 bytes .../theme/md_dev/img/object_calendarweek.png | Bin 0 -> 188 bytes .../md_dev/img/object_category-expanded.png | Bin 0 -> 295 bytes htdocs/theme/md_dev/img/object_category.png | Bin 0 -> 281 bytes htdocs/theme/md_dev/img/object_commercial.png | Bin 0 -> 304 bytes htdocs/theme/md_dev/img/object_company.png | Bin 0 -> 492 bytes htdocs/theme/md_dev/img/object_contact.png | Bin 0 -> 593 bytes .../theme/md_dev/img/object_contact_all.png | Bin 0 -> 810 bytes htdocs/theme/md_dev/img/object_contract.png | Bin 0 -> 359 bytes htdocs/theme/md_dev/img/object_cron.png | Bin 0 -> 433 bytes htdocs/theme/md_dev/img/object_dir.png | Bin 0 -> 301 bytes htdocs/theme/md_dev/img/object_email.png | Bin 0 -> 368 bytes htdocs/theme/md_dev/img/object_energie.png | Bin 0 -> 376 bytes htdocs/theme/md_dev/img/object_generic.png | Bin 0 -> 361 bytes htdocs/theme/md_dev/img/object_globe.png | Bin 0 -> 366 bytes htdocs/theme/md_dev/img/object_group.png | Bin 0 -> 912 bytes htdocs/theme/md_dev/img/object_holiday.png | Bin 0 -> 771 bytes .../theme/md_dev/img/object_intervention.png | Bin 0 -> 340 bytes htdocs/theme/md_dev/img/object_invoice.png | Bin 0 -> 394 bytes htdocs/theme/md_dev/img/object_label.png | Bin 0 -> 769 bytes htdocs/theme/md_dev/img/object_list.png | Bin 0 -> 179 bytes htdocs/theme/md_dev/img/object_margin.png | Bin 0 -> 571 bytes htdocs/theme/md_dev/img/object_opensurvey.png | Bin 0 -> 743 bytes htdocs/theme/md_dev/img/object_order.png | Bin 0 -> 357 bytes htdocs/theme/md_dev/img/object_payment.png | Bin 0 -> 339 bytes htdocs/theme/md_dev/img/object_phoning.png | Bin 0 -> 577 bytes .../theme/md_dev/img/object_phoning_fax.png | Bin 0 -> 633 bytes htdocs/theme/md_dev/img/object_product.png | Bin 0 -> 559 bytes htdocs/theme/md_dev/img/object_project.png | Bin 0 -> 926 bytes htdocs/theme/md_dev/img/object_projectpub.png | Bin 0 -> 929 bytes .../theme/md_dev/img/object_projecttask.png | Bin 0 -> 941 bytes htdocs/theme/md_dev/img/object_propal.png | Bin 0 -> 284 bytes htdocs/theme/md_dev/img/object_reduc.png | Bin 0 -> 361 bytes htdocs/theme/md_dev/img/object_resource.png | Bin 0 -> 199 bytes htdocs/theme/md_dev/img/object_rss.png | Bin 0 -> 362 bytes htdocs/theme/md_dev/img/object_sending.png | Bin 0 -> 273 bytes htdocs/theme/md_dev/img/object_service.png | Bin 0 -> 365 bytes htdocs/theme/md_dev/img/object_skype.png | Bin 0 -> 682 bytes htdocs/theme/md_dev/img/object_stock.png | Bin 0 -> 554 bytes htdocs/theme/md_dev/img/object_task.png | Bin 0 -> 176 bytes htdocs/theme/md_dev/img/object_task_time.png | Bin 0 -> 199 bytes htdocs/theme/md_dev/img/object_technic.png | Bin 0 -> 433 bytes htdocs/theme/md_dev/img/object_trip.png | Bin 0 -> 337 bytes htdocs/theme/md_dev/img/object_user.png | Bin 0 -> 607 bytes htdocs/theme/md_dev/img/off.png | Bin 0 -> 568 bytes htdocs/theme/md_dev/img/on.png | Bin 0 -> 603 bytes htdocs/theme/md_dev/img/pdf2.png | Bin 0 -> 636 bytes htdocs/theme/md_dev/img/pdf3.png | Bin 0 -> 566 bytes htdocs/theme/md_dev/img/play.png | Bin 0 -> 653 bytes htdocs/theme/md_dev/img/previous.png | Bin 0 -> 620 bytes htdocs/theme/md_dev/img/printer.png | Bin 0 -> 270 bytes htdocs/theme/md_dev/img/puce.png | Bin 0 -> 504 bytes htdocs/theme/md_dev/img/recent.png | Bin 0 -> 447 bytes htdocs/theme/md_dev/img/redstar.png | Bin 0 -> 533 bytes htdocs/theme/md_dev/img/refresh.png | Bin 0 -> 722 bytes htdocs/theme/md_dev/img/reload.png | Bin 0 -> 704 bytes htdocs/theme/md_dev/img/rightarrow.png | Bin 0 -> 156 bytes htdocs/theme/md_dev/img/search.png | Bin 0 -> 432 bytes htdocs/theme/md_dev/img/searchclear.png | Bin 0 -> 436 bytes htdocs/theme/md_dev/img/setup.png | Bin 0 -> 702 bytes htdocs/theme/md_dev/img/sort_asc.png | Bin 0 -> 176 bytes htdocs/theme/md_dev/img/sort_asc_disabled.png | Bin 0 -> 176 bytes htdocs/theme/md_dev/img/sort_desc.png | Bin 0 -> 176 bytes .../theme/md_dev/img/sort_desc_disabled.png | Bin 0 -> 168 bytes htdocs/theme/md_dev/img/split.png | Bin 0 -> 195 bytes htdocs/theme/md_dev/img/star.png | Bin 0 -> 381 bytes htdocs/theme/md_dev/img/stats.png | Bin 0 -> 640 bytes htdocs/theme/md_dev/img/statut0.png | Bin 0 -> 92 bytes htdocs/theme/md_dev/img/statut1.png | Bin 0 -> 190 bytes htdocs/theme/md_dev/img/statut3.png | Bin 0 -> 119 bytes htdocs/theme/md_dev/img/statut4.png | Bin 0 -> 190 bytes htdocs/theme/md_dev/img/statut5.png | Bin 0 -> 164 bytes htdocs/theme/md_dev/img/statut6.png | Bin 0 -> 212 bytes htdocs/theme/md_dev/img/statut7.png | Bin 0 -> 178 bytes htdocs/theme/md_dev/img/statut8.png | Bin 0 -> 78 bytes htdocs/theme/md_dev/img/statut9.png | Bin 0 -> 203 bytes htdocs/theme/md_dev/img/stcomm-1.png | Bin 0 -> 431 bytes htdocs/theme/md_dev/img/stcomm-1_grayed.png | Bin 0 -> 223 bytes htdocs/theme/md_dev/img/stcomm0.png | Bin 0 -> 782 bytes htdocs/theme/md_dev/img/stcomm0_grayed.png | Bin 0 -> 456 bytes htdocs/theme/md_dev/img/stcomm1.png | Bin 0 -> 874 bytes htdocs/theme/md_dev/img/stcomm1_grayed.png | Bin 0 -> 472 bytes htdocs/theme/md_dev/img/stcomm2.png | Bin 0 -> 870 bytes htdocs/theme/md_dev/img/stcomm2_grayed.png | Bin 0 -> 343 bytes htdocs/theme/md_dev/img/stcomm3.png | Bin 0 -> 832 bytes htdocs/theme/md_dev/img/stcomm3_grayed.png | Bin 0 -> 488 bytes htdocs/theme/md_dev/img/stcomm4.png | Bin 0 -> 922 bytes htdocs/theme/md_dev/img/stcomm4_grayed.png | Bin 0 -> 488 bytes htdocs/theme/md_dev/img/switch_off.png | Bin 0 -> 1252 bytes htdocs/theme/md_dev/img/switch_on.png | Bin 0 -> 1228 bytes htdocs/theme/md_dev/img/tab_background.png | Bin 0 -> 129 bytes htdocs/theme/md_dev/img/tick.png | Bin 0 -> 227 bytes htdocs/theme/md_dev/img/title.gif | Bin 0 -> 1275 bytes htdocs/theme/md_dev/img/title.png | Bin 0 -> 1607 bytes htdocs/theme/md_dev/img/tmenu.jpg | Bin 0 -> 540 bytes htdocs/theme/md_dev/img/tmenu2.jpg | Bin 0 -> 569 bytes htdocs/theme/md_dev/img/tmenu3.jpg | Bin 0 -> 571 bytes htdocs/theme/md_dev/img/tmenu_inverse.jpg | Bin 0 -> 535 bytes htdocs/theme/md_dev/img/unlock.png | Bin 0 -> 686 bytes htdocs/theme/md_dev/img/uparrow.png | Bin 0 -> 194 bytes htdocs/theme/md_dev/img/vcard.png | Bin 0 -> 566 bytes htdocs/theme/md_dev/img/view.png | Bin 0 -> 708 bytes htdocs/theme/md_dev/img/warning.png | Bin 0 -> 480 bytes htdocs/theme/md_dev/img/working.gif | Bin 0 -> 2483 bytes htdocs/theme/md_dev/img/working2.gif | Bin 0 -> 673 bytes htdocs/theme/md_dev/index.html | 0 htdocs/theme/md_dev/style.css.php | 3235 +++++++++++++++++ htdocs/theme/md_dev/thumb.png | Bin 0 -> 3839 bytes htdocs/theme/md_dev/tpl/README | 3 + htdocs/theme/md_dev/tpl/index.html | 0 275 files changed, 3853 insertions(+) create mode 100644 htdocs/theme/eldy/img/menus_black/agenda.png create mode 100644 htdocs/theme/eldy/img/menus_black/agenda_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/bank.png create mode 100644 htdocs/theme/eldy/img/menus_black/bank_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/commercial.png create mode 100644 htdocs/theme/eldy/img/menus_black/commercial_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/company.png create mode 100644 htdocs/theme/eldy/img/menus_black/company_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/ecm.png create mode 100644 htdocs/theme/eldy/img/menus_black/ecm_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/externalsite.png create mode 100644 htdocs/theme/eldy/img/menus_black/externalsite_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/ftp.png create mode 100644 htdocs/theme/eldy/img/menus_black/ftp_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/generic1.png create mode 100644 htdocs/theme/eldy/img/menus_black/generic1_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/generic2.png create mode 100644 htdocs/theme/eldy/img/menus_black/generic2_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/generic3.png create mode 100644 htdocs/theme/eldy/img/menus_black/generic3_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/generic4.png create mode 100644 htdocs/theme/eldy/img/menus_black/generic4_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/globe.png create mode 100644 htdocs/theme/eldy/img/menus_black/globe_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/home.png create mode 100644 htdocs/theme/eldy/img/menus_black/home_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/mail.png create mode 100644 htdocs/theme/eldy/img/menus_black/mail_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/members.png create mode 100644 htdocs/theme/eldy/img/menus_black/members_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/money.png create mode 100644 htdocs/theme/eldy/img/menus_black/money_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/pointofsale.png create mode 100644 htdocs/theme/eldy/img/menus_black/pointofsale_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/products.png create mode 100644 htdocs/theme/eldy/img/menus_black/products_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/project.png create mode 100644 htdocs/theme/eldy/img/menus_black/project_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/shop.png create mode 100644 htdocs/theme/eldy/img/menus_black/shop_over.png create mode 100644 htdocs/theme/eldy/img/menus_black/tools.png create mode 100644 htdocs/theme/eldy/img/menus_black/tools_over.png create mode 100644 htdocs/theme/md_dev/.gitignore create mode 100644 htdocs/theme/md_dev/AUTHOR create mode 100644 htdocs/theme/md_dev/ckeditor/config.js create mode 100644 htdocs/theme/md_dev/ckeditor/index.html create mode 100644 htdocs/theme/md_dev/graph-color.php create mode 100644 htdocs/theme/md_dev/img/1downarrow.png create mode 100644 htdocs/theme/md_dev/img/1downarrow_selected.png create mode 100644 htdocs/theme/md_dev/img/1leftarrow.png create mode 100644 htdocs/theme/md_dev/img/1leftarrow_selected.png create mode 100644 htdocs/theme/md_dev/img/1rightarrow.png create mode 100644 htdocs/theme/md_dev/img/1rightarrow_selected.png create mode 100644 htdocs/theme/md_dev/img/1uparrow.png create mode 100644 htdocs/theme/md_dev/img/1uparrow_selected.png create mode 100644 htdocs/theme/md_dev/img/1updownarrow.png create mode 100644 htdocs/theme/md_dev/img/addfile.png create mode 100644 htdocs/theme/md_dev/img/background.png create mode 100644 htdocs/theme/md_dev/img/bg-bas-rubrique.png create mode 100644 htdocs/theme/md_dev/img/bg-rubrique.png create mode 100644 htdocs/theme/md_dev/img/bg-titre-rubrique.png create mode 100644 htdocs/theme/md_dev/img/button_bg.png create mode 100644 htdocs/theme/md_dev/img/button_edit.png create mode 100644 htdocs/theme/md_dev/img/calc.png create mode 100644 htdocs/theme/md_dev/img/calendar.png create mode 100644 htdocs/theme/md_dev/img/call.png create mode 100644 htdocs/theme/md_dev/img/call_out.png create mode 100644 htdocs/theme/md_dev/img/close.png create mode 100644 htdocs/theme/md_dev/img/close_title.png create mode 100644 htdocs/theme/md_dev/img/delete.png create mode 100644 htdocs/theme/md_dev/img/detail.png create mode 100644 htdocs/theme/md_dev/img/disable.png create mode 100644 htdocs/theme/md_dev/img/edit.png create mode 100644 htdocs/theme/md_dev/img/edit_add.png create mode 100644 htdocs/theme/md_dev/img/edit_remove.png create mode 100644 htdocs/theme/md_dev/img/editdelete.png create mode 100644 htdocs/theme/md_dev/img/error.png create mode 100644 htdocs/theme/md_dev/img/favicon.ico create mode 100644 htdocs/theme/md_dev/img/file.png create mode 100644 htdocs/theme/md_dev/img/filenew.png create mode 100644 htdocs/theme/md_dev/img/filter.png create mode 100644 htdocs/theme/md_dev/img/folder-open.png create mode 100644 htdocs/theme/md_dev/img/folder.png create mode 100644 htdocs/theme/md_dev/img/gradient.gif create mode 100644 htdocs/theme/md_dev/img/grip.png create mode 100644 htdocs/theme/md_dev/img/grip_title.png create mode 100644 htdocs/theme/md_dev/img/headbg.jpg create mode 100644 htdocs/theme/md_dev/img/headbg2.jpg create mode 100644 htdocs/theme/md_dev/img/help.png create mode 100644 htdocs/theme/md_dev/img/helpdoc.png create mode 100644 htdocs/theme/md_dev/img/high.png create mode 100644 htdocs/theme/md_dev/img/history.png create mode 100644 htdocs/theme/md_dev/img/index.html create mode 100644 htdocs/theme/md_dev/img/info.png create mode 100644 htdocs/theme/md_dev/img/liste_titre.png create mode 100644 htdocs/theme/md_dev/img/liste_titre2.png create mode 100644 htdocs/theme/md_dev/img/lock.png create mode 100644 htdocs/theme/md_dev/img/login_background.png create mode 100644 htdocs/theme/md_dev/img/logo_setup.svg create mode 100644 htdocs/theme/md_dev/img/logout.png create mode 100644 htdocs/theme/md_dev/img/menus/README.md create mode 100644 htdocs/theme/md_dev/img/menus/agenda.png create mode 100644 htdocs/theme/md_dev/img/menus/agenda_over.png create mode 100644 htdocs/theme/md_dev/img/menus/bank.png create mode 100644 htdocs/theme/md_dev/img/menus/bank_over.png create mode 100644 htdocs/theme/md_dev/img/menus/chart.png create mode 100644 htdocs/theme/md_dev/img/menus/commercial.png create mode 100644 htdocs/theme/md_dev/img/menus/commercial_over.png create mode 100644 htdocs/theme/md_dev/img/menus/company.png create mode 100644 htdocs/theme/md_dev/img/menus/company_over.png create mode 100644 htdocs/theme/md_dev/img/menus/ecm.png create mode 100644 htdocs/theme/md_dev/img/menus/ecm_over.png create mode 100644 htdocs/theme/md_dev/img/menus/externalsite.png create mode 100644 htdocs/theme/md_dev/img/menus/externalsite_over.png create mode 100644 htdocs/theme/md_dev/img/menus/ftp.png create mode 100644 htdocs/theme/md_dev/img/menus/ftp_over.png create mode 100644 htdocs/theme/md_dev/img/menus/generic1.png create mode 100644 htdocs/theme/md_dev/img/menus/generic1_over.png create mode 100644 htdocs/theme/md_dev/img/menus/generic2.png create mode 100644 htdocs/theme/md_dev/img/menus/generic2_over.png create mode 100644 htdocs/theme/md_dev/img/menus/generic3.png create mode 100644 htdocs/theme/md_dev/img/menus/generic3_over.png create mode 100644 htdocs/theme/md_dev/img/menus/generic4.png create mode 100644 htdocs/theme/md_dev/img/menus/generic4_over.png create mode 100644 htdocs/theme/md_dev/img/menus/globe.png create mode 100644 htdocs/theme/md_dev/img/menus/globe_over.png create mode 100644 htdocs/theme/md_dev/img/menus/holiday.png create mode 100644 htdocs/theme/md_dev/img/menus/home.png create mode 100644 htdocs/theme/md_dev/img/menus/home_over.png create mode 100644 htdocs/theme/md_dev/img/menus/index.html create mode 100644 htdocs/theme/md_dev/img/menus/mail.png create mode 100644 htdocs/theme/md_dev/img/menus/mail_over.png create mode 100644 htdocs/theme/md_dev/img/menus/members.png create mode 100644 htdocs/theme/md_dev/img/menus/members_over.png create mode 100644 htdocs/theme/md_dev/img/menus/money.png create mode 100644 htdocs/theme/md_dev/img/menus/money_over.png create mode 100644 htdocs/theme/md_dev/img/menus/pointofsale.png create mode 100644 htdocs/theme/md_dev/img/menus/pointofsale_over.png create mode 100644 htdocs/theme/md_dev/img/menus/products.png create mode 100644 htdocs/theme/md_dev/img/menus/products_over.png create mode 100644 htdocs/theme/md_dev/img/menus/project.png create mode 100644 htdocs/theme/md_dev/img/menus/project_over.png create mode 100644 htdocs/theme/md_dev/img/menus/shop.png create mode 100644 htdocs/theme/md_dev/img/menus/shop_over.png create mode 100644 htdocs/theme/md_dev/img/menus/tools.png create mode 100644 htdocs/theme/md_dev/img/menus/tools_over.png create mode 100644 htdocs/theme/md_dev/img/menutab-r.png create mode 100644 htdocs/theme/md_dev/img/nav-overlay.png create mode 100644 htdocs/theme/md_dev/img/nav-overlay3.png create mode 100644 htdocs/theme/md_dev/img/next.png create mode 100644 htdocs/theme/md_dev/img/object_account.png create mode 100644 htdocs/theme/md_dev/img/object_accounting.png create mode 100644 htdocs/theme/md_dev/img/object_action.png create mode 100644 htdocs/theme/md_dev/img/object_action_rdv.png create mode 100644 htdocs/theme/md_dev/img/object_address.png create mode 100644 htdocs/theme/md_dev/img/object_askpricesupplier.png create mode 100644 htdocs/theme/md_dev/img/object_barcode.png create mode 100644 htdocs/theme/md_dev/img/object_bill.png create mode 100644 htdocs/theme/md_dev/img/object_billa.png create mode 100644 htdocs/theme/md_dev/img/object_billd.png create mode 100644 htdocs/theme/md_dev/img/object_billr.png create mode 100644 htdocs/theme/md_dev/img/object_book.png create mode 100644 htdocs/theme/md_dev/img/object_bookmark.png create mode 100644 htdocs/theme/md_dev/img/object_calendar.png create mode 100644 htdocs/theme/md_dev/img/object_calendarday.png create mode 100644 htdocs/theme/md_dev/img/object_calendarperuser.png create mode 100644 htdocs/theme/md_dev/img/object_calendarweek.png create mode 100644 htdocs/theme/md_dev/img/object_category-expanded.png create mode 100644 htdocs/theme/md_dev/img/object_category.png create mode 100644 htdocs/theme/md_dev/img/object_commercial.png create mode 100644 htdocs/theme/md_dev/img/object_company.png create mode 100644 htdocs/theme/md_dev/img/object_contact.png create mode 100644 htdocs/theme/md_dev/img/object_contact_all.png create mode 100644 htdocs/theme/md_dev/img/object_contract.png create mode 100644 htdocs/theme/md_dev/img/object_cron.png create mode 100644 htdocs/theme/md_dev/img/object_dir.png create mode 100644 htdocs/theme/md_dev/img/object_email.png create mode 100644 htdocs/theme/md_dev/img/object_energie.png create mode 100644 htdocs/theme/md_dev/img/object_generic.png create mode 100644 htdocs/theme/md_dev/img/object_globe.png create mode 100644 htdocs/theme/md_dev/img/object_group.png create mode 100644 htdocs/theme/md_dev/img/object_holiday.png create mode 100644 htdocs/theme/md_dev/img/object_intervention.png create mode 100644 htdocs/theme/md_dev/img/object_invoice.png create mode 100644 htdocs/theme/md_dev/img/object_label.png create mode 100644 htdocs/theme/md_dev/img/object_list.png create mode 100644 htdocs/theme/md_dev/img/object_margin.png create mode 100644 htdocs/theme/md_dev/img/object_opensurvey.png create mode 100644 htdocs/theme/md_dev/img/object_order.png create mode 100644 htdocs/theme/md_dev/img/object_payment.png create mode 100644 htdocs/theme/md_dev/img/object_phoning.png create mode 100644 htdocs/theme/md_dev/img/object_phoning_fax.png create mode 100644 htdocs/theme/md_dev/img/object_product.png create mode 100644 htdocs/theme/md_dev/img/object_project.png create mode 100644 htdocs/theme/md_dev/img/object_projectpub.png create mode 100644 htdocs/theme/md_dev/img/object_projecttask.png create mode 100644 htdocs/theme/md_dev/img/object_propal.png create mode 100644 htdocs/theme/md_dev/img/object_reduc.png create mode 100644 htdocs/theme/md_dev/img/object_resource.png create mode 100644 htdocs/theme/md_dev/img/object_rss.png create mode 100644 htdocs/theme/md_dev/img/object_sending.png create mode 100644 htdocs/theme/md_dev/img/object_service.png create mode 100644 htdocs/theme/md_dev/img/object_skype.png create mode 100644 htdocs/theme/md_dev/img/object_stock.png create mode 100644 htdocs/theme/md_dev/img/object_task.png create mode 100644 htdocs/theme/md_dev/img/object_task_time.png create mode 100644 htdocs/theme/md_dev/img/object_technic.png create mode 100644 htdocs/theme/md_dev/img/object_trip.png create mode 100644 htdocs/theme/md_dev/img/object_user.png create mode 100644 htdocs/theme/md_dev/img/off.png create mode 100644 htdocs/theme/md_dev/img/on.png create mode 100644 htdocs/theme/md_dev/img/pdf2.png create mode 100644 htdocs/theme/md_dev/img/pdf3.png create mode 100644 htdocs/theme/md_dev/img/play.png create mode 100644 htdocs/theme/md_dev/img/previous.png create mode 100644 htdocs/theme/md_dev/img/printer.png create mode 100644 htdocs/theme/md_dev/img/puce.png create mode 100644 htdocs/theme/md_dev/img/recent.png create mode 100644 htdocs/theme/md_dev/img/redstar.png create mode 100644 htdocs/theme/md_dev/img/refresh.png create mode 100644 htdocs/theme/md_dev/img/reload.png create mode 100644 htdocs/theme/md_dev/img/rightarrow.png create mode 100644 htdocs/theme/md_dev/img/search.png create mode 100644 htdocs/theme/md_dev/img/searchclear.png create mode 100644 htdocs/theme/md_dev/img/setup.png create mode 100644 htdocs/theme/md_dev/img/sort_asc.png create mode 100644 htdocs/theme/md_dev/img/sort_asc_disabled.png create mode 100644 htdocs/theme/md_dev/img/sort_desc.png create mode 100644 htdocs/theme/md_dev/img/sort_desc_disabled.png create mode 100644 htdocs/theme/md_dev/img/split.png create mode 100644 htdocs/theme/md_dev/img/star.png create mode 100644 htdocs/theme/md_dev/img/stats.png create mode 100644 htdocs/theme/md_dev/img/statut0.png create mode 100644 htdocs/theme/md_dev/img/statut1.png create mode 100644 htdocs/theme/md_dev/img/statut3.png create mode 100644 htdocs/theme/md_dev/img/statut4.png create mode 100644 htdocs/theme/md_dev/img/statut5.png create mode 100644 htdocs/theme/md_dev/img/statut6.png create mode 100644 htdocs/theme/md_dev/img/statut7.png create mode 100644 htdocs/theme/md_dev/img/statut8.png create mode 100644 htdocs/theme/md_dev/img/statut9.png create mode 100644 htdocs/theme/md_dev/img/stcomm-1.png create mode 100644 htdocs/theme/md_dev/img/stcomm-1_grayed.png create mode 100644 htdocs/theme/md_dev/img/stcomm0.png create mode 100644 htdocs/theme/md_dev/img/stcomm0_grayed.png create mode 100644 htdocs/theme/md_dev/img/stcomm1.png create mode 100644 htdocs/theme/md_dev/img/stcomm1_grayed.png create mode 100644 htdocs/theme/md_dev/img/stcomm2.png create mode 100644 htdocs/theme/md_dev/img/stcomm2_grayed.png create mode 100644 htdocs/theme/md_dev/img/stcomm3.png create mode 100644 htdocs/theme/md_dev/img/stcomm3_grayed.png create mode 100644 htdocs/theme/md_dev/img/stcomm4.png create mode 100644 htdocs/theme/md_dev/img/stcomm4_grayed.png create mode 100644 htdocs/theme/md_dev/img/switch_off.png create mode 100644 htdocs/theme/md_dev/img/switch_on.png create mode 100644 htdocs/theme/md_dev/img/tab_background.png create mode 100644 htdocs/theme/md_dev/img/tick.png create mode 100644 htdocs/theme/md_dev/img/title.gif create mode 100644 htdocs/theme/md_dev/img/title.png create mode 100644 htdocs/theme/md_dev/img/tmenu.jpg create mode 100644 htdocs/theme/md_dev/img/tmenu2.jpg create mode 100644 htdocs/theme/md_dev/img/tmenu3.jpg create mode 100644 htdocs/theme/md_dev/img/tmenu_inverse.jpg create mode 100644 htdocs/theme/md_dev/img/unlock.png create mode 100644 htdocs/theme/md_dev/img/uparrow.png create mode 100644 htdocs/theme/md_dev/img/vcard.png create mode 100644 htdocs/theme/md_dev/img/view.png create mode 100644 htdocs/theme/md_dev/img/warning.png create mode 100644 htdocs/theme/md_dev/img/working.gif create mode 100644 htdocs/theme/md_dev/img/working2.gif create mode 100644 htdocs/theme/md_dev/index.html create mode 100644 htdocs/theme/md_dev/style.css.php create mode 100644 htdocs/theme/md_dev/thumb.png create mode 100644 htdocs/theme/md_dev/tpl/README create mode 100644 htdocs/theme/md_dev/tpl/index.html diff --git a/htdocs/theme/eldy/img/menus_black/agenda.png b/htdocs/theme/eldy/img/menus_black/agenda.png new file mode 100644 index 0000000000000000000000000000000000000000..eb4c8d2bea24113f1edcecffeaeec78d3f0b8b87 GIT binary patch literal 750 zcmVPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KXg}q}Xi$00M4FL_t(o!|j>BYZO5g$3Nd-FgZ~$CP4{e5|AJYMhkxhB?tk|7$ z?wgsnb22l^YF(7rI`AF%qTwY?CR`gYi}EidElL`fG%0BnxYsWD18sw5h|vQ~1G&TRc#1Pt#A@RU ze!a}_-;00`JjEF-GyHCu(IU$CNp9Az`ki#ry3W{);=-NV6l7?qocf=v+A5U~csKhX2|`!PJ)lUv*ER zFC*3uukdD8mGlef{*Rh%)qS4INWrys)HX|dEO7xg%&ZQ-opLS{0yQ)H)0Pu6N!Ng5 zdw98+GqX+K<#(&K%{>2(Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KW#B8GT{^00G2FL_t(o!|j>TZNe}RhQGh+d)c7bfOLXpgE9i$fDK@Sc7vuHWQ25r zrW-IqnBe+iq$mPv2PZU=Pl|+MVt-uDzW)xH8FRHeW^4&Q!QUEQQgPy5J{QmLBsG$9 zNrj|6uo?^geuO!fz;}xIsXQ-f2V^IP3O9Di8lW|^I%v&U8CFt^i4H(vX3ZSK<^fpG zIp*^@!?y|kMwTUQli(Bl$na(+GZXLxyaHdN)0^377f?9eVgXm}JO5zMOUfkeB-N7k zl3Mq@RAn5=8AP5B^`BoIko2tS14R##}lZD6*|7~F?ugW zuV$UB0QZG2-KOr_HsH;*vEhAlMtNq>Y94lMq1TwYx)=$8|EubM z_Q(-Fy~};n4QpmqgcG9bBr2cp#cMiA+5m3@!GD}U<3jhW1u8S!hitMCZBqxzTXRtP zD3UvpFq<4a7{2o(b`I>KIs~#Yi=DxZR;PDXE^}tRQ>F54mR@5@|HCHuaQg+SkLCMB SJiG}20000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KW_Tedxge00R6;L_t(o!|j<(NEJ~O$A5nVV40Og;^a`1K1j+aJh>rm#m^Af%&4KIPY!{^~I6 zmedODh>`qgp(1Z%I3JnJkESj-(b~E>IJ5)C-cZ z!N@KG4*7L4rqF^;mARlFXahQd&>25dZ0@kxzy6uai`6WLVu#J`yuhF@MbPn`T@$MiR;r0@qanR175 S%WJ;?0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KXAJaWQiM00I6!AMY|_yYV@l!P0AL_>qZ z0g#dt;G6(Mk7RC;Kt;7Q<7l;V91|yT41UrUYme=x-M4RM*J6yJs@S2zsL9vlYw{Js zZq`i^X#+ut{6b?)xDnaqXnqffL}UmwfnL?zrUjh+{O% z7ce>71PGkxLrw8XzpdBuzO$djZ9)vb3S8@g4sAyQB5jF7HLY4@ zv<EEoX&~e z2adI@NH8o@^KPwuw;)$1fZ#5n0JeS5fkhy66(*-7;P~&$P;L z8{dh)ToC`6@{LJZ3)Xk~_rO<1{E1VUdPR0)g~=ymtOWFsqWy2+NNXHBk)4;Fq>>VO zmVm71y*a)f<$U*AlhiC(xx~{7vz&=(WD*ylh literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/commercial.png b/htdocs/theme/eldy/img/menus_black/commercial.png new file mode 100644 index 0000000000000000000000000000000000000000..19abbd54356cf2e23b7dbf63cc82859549bbb0e1 GIT binary patch literal 898 zcmV-|1AY97P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KXQrz)j8o00RO^L_t(o!_}F|YZO5g#($p}w=6D91fwB}xSMDM6AUOWU=%MJ1aIm= z@F)rjg8zUgK|Be15j=VDAc6?u!5s7ylo)Tu%tRC71QQbzjru&Kgr@1~&eGF8^WZ^O zy{f6NYrc9*wakoil?9Zslr{K;#rRQ4=YfO3df*$-1$3F&<5(9mv)B~a4fFz5Kzo6c zv8@*)@N>ZL8S4Ew)>ItcMp6^-dY04fnAz2Nts4{gPM~oPl&wh>yrf3pWyG*fr>{JH zqd>ixJx$ZwR0F>X*t&sBKo&R-v;#Yxtp?a3sm08)X@TzphTThe<&l|Pk#rfj5MT$G z0*(UrQUPyfIZ69~R$#m9eh%a$Jps0PfCfob+Cl0puny>PTs{nR0Cgdt|I6mI!M_JC z0w)4!5hdMegZ~h6Xrm;XDtI&dEa?r_5r_bW-rX_BXGlKYnN1865t(>HXpz(o+0f4-ln5eINuf!s9GhB0$*M3 z6J&p2WK7%&v#>yM;OnrcGnW{Y=g?E+281vo+D3 zm(<`kpinN~?|J?bk@MHPYr({5voWGt8usM;pCpBi-Hzx;3Cm8U)scOj(%}Z7gEf2Lk$rBIf)l74SiB z_-DkNze)M|VWvM86bk!Ql3F}xqypF#QIO{otzji)n7-1>6d2M6ymk4{@&Nmkivc~e zO^stKz$MkVK$8h@hf_d>ubp@2V!+I%=Co!pzQa0-)HuM)J%C4miMbXZiGWW^%KAI( YKeiV)SXx#(xc~qF07*qoM6N<$f~d!j0{{R3 literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/commercial_over.png b/htdocs/theme/eldy/img/menus_black/commercial_over.png new file mode 100644 index 0000000000000000000000000000000000000000..6671810c5deaa7447b9e6fe41a32f6b57066791c GIT binary patch literal 650 zcmV;50(Jd~P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KXu?qO`OC00Ih0L_t(o!_`^Aje{@{oIT|qO5iHMCD6f90wquaC8UIuKnbCO^L60s zfK;&e*+?A1hQNXWX&(`Gc0Afyk1;Vb&iZ`d#Lub0U$*#DA}Rso08#)Q01Ln}bEBGw znbiV-0pI|zCmeu6EuSLrG5~rQ_rrh}#`(>-t<6gst&)f=fNVj@(yF{`!4r`I@I5iC z1@Mq~Jsp5_jfge6O%izbBU*3(3JKGjml4q?GrK6=rq>QfMG2txynjWtH1|cJ)jA?d zrLVtOZ2-8LT1aB=u$7cV*DH~^A~sPsDFMq1qh6XA@B*? zoF3&cl7>V%var>n)dXMr4jmIBPNE7{#8-JB^09*s$L-wJJZOm+-EOHqW z>ib2MvXNt8Hp8^F+U#qTO(^lR=Uqaj^R;Bt+8Vrl!}=Dxf+wOpAk-oFDbJtp&HNNw zuGbhIhhlyPTSK;g17oiu{_Vkwz_Pi_&n%sEFXks%8u^%H*Z${TmkX`(L48;7iN`9$ zzg!S-&D?XUjJKLLLBrSN^7YrdfC=E8j7ekqc_ZH4dH@c8H?lh?Q7;!fZPW0dCgj%@yM{6#xJL07*qoM6N<$f{ThDTmS$7 literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/company.png b/htdocs/theme/eldy/img/menus_black/company.png new file mode 100644 index 0000000000000000000000000000000000000000..d6381eab1e41f524107e303325e672a155ec7959 GIT binary patch literal 602 zcmV-g0;TPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KX)@&v2~(00G)bL_t(o!|j=|N-IGWhQFhNB8Uhg*mxs|peQJa+(K-^1>eIr5cDCe zZEXb~!a@Wq3q?!8Ab5))sAYCFzs(e3$&8!LCfVQ~*kEttF4P0Gw_z@H4EA3#OY`yjHwRktPW-E+tH9fNb$&_HpvA|)=MO%g&aZIf8y;cF2W%9T{IZ#y1$>r^ zN+G z(sn$=;v$iMl62jsOKuNC&3~ovFKo@H5nq!3wdCUt#m9kzS>MIK0J9y4Z?uSgYq?(s ornCIsBdH#8u=0P{Qhew34bOPk)`eDFO8@`>07*qoM6N<$f|_;*hyVZp literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/company_over.png b/htdocs/theme/eldy/img/menus_black/company_over.png new file mode 100644 index 0000000000000000000000000000000000000000..ca172c460ace873c61891c80fec10981c428c47f GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?zuQ z<8E$q08guZc&)!#1Me)}Q);O#c@ugr2wHLFOvrICR}h}F??b@S2UBLN{W&r1PlL{E z<=1zT?`KbnSY^90f%^la-2wI=$8UVzTc40-IYE7i*(9m$-}bgonQ7`UZ9)}Wk>}ef zTTTjnHan0PbgQI{>E7HQ>>rG*&y`>ES|yXURdK4~)cv{XX;a1L8~@<_uq))&l}R}# z8m;)=Xz{I?In`liz-Nt@MGCoR*Ax_O^L(ND)oOwCo*(b6YU_M+vl2WW6+L*{Z~KeM zZf?cQEzGem{~YWTSGJ0;lzk&*vg`9gv*K8OFL%{r8b?%KJC+?zO)`D$SYUTR|EH0W zN$GcQhImh_FFHlP7x*^t1O35SGdJQhk4$~d{Gitr{w*IG)ZZ;QD|N7*xw`ppWW(Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Kf54GD3I&00T)$L_t(o!|j>fYZPY`#($6GqM}u)NYQ8-KU#`VL6p{r5R0_ERYcTM zLam^dUK9kuOaB8~FA4>P-n6~awiHS~wchw`{Xnc5joPX)C77sD*sS{W<}8fEMt630 zHwomxVds5$X6DB;XU;n_E8C3L7{@4%G59g~G57|Dq*h5^NxGJKXWPS)z;fVEz=>?l za*S~ec6o}V55wgHKzmBEe8f2qv;sST{*=?{{65oh>kQov>;a02`~&Dn&6Tou*x`W> zfS-YZM1Bb@NN5Iz$OR3D2POj_180H0$m_s%prwqyFO_G3_fwi>z}LX`y1)aofL%Z* z&=YwQSO-i_=$3|VX^fxJrcBrr^Ciu;a_4T!(K*_HjljE!>4U&d+lLdnHKCgyQ{PIO z3G@QHZSM@-OkgYU9`Isl3-SA?979tT(5rz@f##Sh0{ei^ZQlsZBwz!uI;8`60^9@I zY~PdgPH5jsoTivM?UP*ak~)A-Qm$MCI&9w$O><~gCUz~PyL05KIOdEYbjir={HwqV zDOc{;zAtHU+^ma-a4s2}f!BeF6=-YYJa9DXkusO}iwfK;#Tyy4HFN%C8J8Yqa4%2f zbKZ8hq&{Fm8Ti3E!#}P?w>bf{l_{H%2`_00u*CLfz$swSh<9Gn+rV02T8zJmC46u+ zI6pO(>JnIs?Gus)M?=m31grqY$N06V`7_a{lhB1a!)I%iwjWB`8>Is>iL{R(^pw8Z#Qbfa23-w*7!eX0_1Mew$-O6mk&NnFlF zHFUlJ{9^k|mYuRZ9{d1ok<Q5iG2PE}B1O7qO^o@EgyG=Rw?=1uW5IAr9dcD6o=YqF=IRRe;uG+px rgQBTM$GHS_*)Gz+(Ab~I!xaAmR}QKNP1d=^00000NkvXXu0mjff}+Ox literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/ecm_over.png b/htdocs/theme/eldy/img/menus_black/ecm_over.png new file mode 100644 index 0000000000000000000000000000000000000000..a44830798aa930020e65ad3587bb58c0e201ec75 GIT binary patch literal 672 zcmV;R0$=@!P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KfHHgbq^x00JOML_t(o!|j>daic&GMNhl*Z!*}~2&@cD2+m-&87KstfkMC$tTHgp zfXx7Bz(&yf(^QSyVDpx!QdiA~q*2%5PS0=~L{-^p+_B-f!QbF-@GFOi1QE$aq#FEZ zRlUdnQlJ1d8evF|yOmW=MC4#9zXFeLN_ut50|Cf@+9~bFc~IUJN+WlG1#swquP+X7 zaK4^%U?0utQh&cXJdglKpo*2WatST-J#+;eT2}51WQ)LCJ?E~TD^ovdDWTNCe}L`~ zVP5!16<^P3O9_?HoYXG3j-fh4m>1q)s+M{VPQ9#UUIU*rs{%Z=?2mcjZ7IDfr7Mll za=LWEA3H9tH~enEEnyGbyYFgMtwkg?r5}6b$vSc^>TQZIetYc+j?KGY+n5!bb(N}G z0sppaiHl9ai^!9RagdsyXRv%8J+^MHY7{_)pe)3ViBdPYc0+ z>ZWFC0~_@t4?ZV+Jp_6Td~kkz4*2FoOU86_Lyg&s)nX0&op^#gTlbY&zQv7MW-HKa z+A;A0{G0+k3f|N&N8YU74EkVsrpLrb9(`)Q*ReNd>?T}v_041Hci^b1=WBgFUv@zM zR@Ja1IDpLYDpN$%9Oy|^v$YJ*Zl*lX241sb$n7Qah2lTjpB|6-OGY`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?zuQ z!`7SGQJ`(UAh&d&%LTViji%NKPS%14kKMXgKWTnyYN}#ahG4Y)2j)Lc9D+QZoK|MV ziLux3bcU9QwcVXt{d}+b>_%(9kg0XD%wIkhRJ4~Pq5pp+c+8bHiRHW&TdEMwdTOCt z=xU`PHn-{*>)up_FJ84JmJfSN=C-so{hM1~{z*4Mvg1#eO1)!edmtc*K$pfjMx&loAF!7 z*FcxBhMyMlS9}??uVwWgn7K->^TeLN8!}g0hh4qAAde$r`|I^Hx8GI&T+QYeTKZmi jb$v!DQaG0Xi0|jODAfA=f#ZD!D6TzS{an^LB{Ts58w>Le literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/externalsite_over.png b/htdocs/theme/eldy/img/menus_black/externalsite_over.png new file mode 100644 index 0000000000000000000000000000000000000000..2435f2fed0e677252c104136e7aadee5fd4aee0d GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?zo@L{uPIW=Y42Vw|U6v|Ksbn?~NT>^v*mx_*AIjMRtg3rw7XgpDVUG ze?u3q+S}2x^PeeO=vn8<)0qRF+cvB_u{E{#<*%8$)~zwToAW>F?19tyAfx`&A84Oh zapqA|oOj9DC3#8n;~yQitN$C8z3VamcbU7-^W*pJ42hY3>#zIWf~auy_}MOUGjrGk ze8hFGo#Kp~eed91Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Kfnq=JzQ800PWOL_t(o!|j;AYg9oH$3G*{peQy`#6XNjL1NGpHZ~>@EJQ*70I?G6 zjG*`fL_#bSwFoH$jh&6+kHRK}5bXpTHEJv(@d!jwi4aJN%e~}lv&yo*yL&nB&OCSv z%dzurW^n_a+&FH34G>7kC$X-psxMHznP0;|^dD*cB{h zNYbTZ@T#)sH+c5OB;9uqah{Ldvwgr_U|r0Aj+@ygNhkh-m-N!xrfM{Q@-{OY2aXj9 zn+5lK6~X=lOh0_ha7gk(o6EO`dET=m$oF|8~cPjUQhp-EQ3e2l%-2 z6PIlcOZsAFdjt6+N%zd`BXGx)Z!8J#ZDX~I+W@5tTnwbs6WV_X7b_m!X$bT*w z-ptkl+Y>;~O8OLdaZFOLv-3R2BwK(z!0SM#2{;$Ci!aK-M=`QC;Ccf1QQ&OgEk8pI z13kdDU_Qm@ga>y*(r^;b_n29`Qy8k?5{reGG;3yOTxQwo&9_(v{xfi~Se_3(zuxsi zg*Wg8Pc|2%DVQ{=!lUvvTl1fF}tcrYnS>1KxY%?>#j1(qJmyq{?~T z%r*l@64;%R^z?tiM=^)95ooTkEU3HZo6YR9%L@HV$Trb(fX~-C+f)^PLej$;zG>Ao z<_k4`)2d&#ku(L|O2Zekg?f3g7Vyz>hc9)*t^rm`nn@je8d~;=JA=>QGx!X?Z2JYx W%a#Xk;+)0+0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Kfvcf?|pQ00HDlL_t(o!|j;eaoaEugulz=J?g-81!f0kI#3C61#voHI#35u3GBdB z2UG=S333IS7chfCKnbEEMpCddH^X0WdDy)JX_B~AeBy?Y$!GGJ{0-r=zhh=4uuizI zlk}SU5Hl-)3RnU)Py)qpUQ#`Yy`g~YxS4Ebk&)T?<8#`?T=)8@WfN( z^fxnWqK5t3F=F;V4C|tH_w)$`V|j7IPSm(RTOYu8U>97vJZRWKgOh9UX?T>>JIVOi zNLoAnzj?=txjXC!umxh8Zz9A27G|~r!iKm%xm23jB2qzO*h}gnUAc1OG{CcW?#c54 zL56?EUUo{IFN5hD!`6`*!v-hxqz>mc1reN>P zo-~e){kL&VsyatDSC#ooeQC`ln?=xEuKEM~*{!v&@}J;c|N7WUGD(&*|1S;eI;Q2! y|L^1vb=U$}L_R96pL~{0CZEY?@|pZykpBf!nqHR8#s*IS0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Kf*ZG%le400HAkL_t(o!|j=p1HSoQ?v4I zY$IvY%yPg=%HXvmefY{|N>a_trhp>w2AB*8y#s7Z+Pdj0B>X4fK+=B8xg3ylgIIK@ z7dkX`)Z(>U+I$Lpk+h7bBsx0q5hw$nfk~e_Nga3#Yy)NAI=%^e;i|t z4@qZTEOJ>O3(NzrfhX=#GibsBmu-zsJ1;sAfN$>F8Bl4fKMFi|Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?F=>bj2@^oHM`I`VgqEHMISytEq&FP=s@R^gFl=k*WVWw5 za|KQuoB#Il_OHsTP6eH2=GNo;AO7^Cl)mUh(SX~z>sS2^{WbIV!7dMG6Nl75W`9m! z{{svx3)m06Ik+;bNFpbDZuY?!4YC_fJvzyd&&^yf&Kw}#x;^ruwCjAX`K!zh$DZDu~+h=I(}(g$bZ1>own+vB|$FV)G`&T!e-lqEpuX6zkkoG%WU`DjU?56 zI|p3d6>*E9diFxI^faT?3hQ+lS+noRmNDnJJW27EZSV_imz;fPM-lG^zdH}QWccHB z?(wobkkAY^UnwsyuJz#Oy>n)T`}Y4_dFi3-JycY8^21%;nSCcsjn{OVK0UiEb4!ZF z(c-^TnV;so>)Xsd{Vn@R)q3W$)ho|j>v-Ec|5Qdd&z!&W3OwsN|DP)PQP1|D)mcmK U!7P?d+d#48>FVdQ&MBb@0BA+begFUf literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/generic2.png b/htdocs/theme/eldy/img/menus_black/generic2.png new file mode 100644 index 0000000000000000000000000000000000000000..39c3cb2a249f0e1e1b4e55d9da15753c2eaa5781 GIT binary patch literal 611 zcmV-p0-XJcP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Kg2`SBsPY00HAkL_t(o!|j=p1HSoQ?v4I zY$IvY%yPg=%HXvmefY{|N>a_trhp>w2AB*8y#s7Z+Pdj0B>X4fK+=B8xg3ylgIIK@ z7dkX`)Z(>U+I$Lpk+h7bBsx0q5hw$nfk~e_Nga3#Yy)NAI=%^e;i|t z4@qZTEOJ>O3(NzrfhX=#GibsBmu-zsJ1;sAfN$>F8Bl4fKMFi|Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?HM`I`VgqEHMISytEq&FP=s@R^gFl=k*WVWw5 za|KQuoB#Il_OHsTP6eH2=GNo;AO7^Cl)mUh(SX~z>sS2^{WbIV!7dMG6Nl75W`9m! z{{svx3)m06Ik+;bNFpbDZuY?!4YC_fJvzyd&&^yf&Kw}#x;^ruwCjAX`K!zh$DZDu~+h=I(}(g$bZ1>own+vB|$FV)G`&T!e-lqEpuX6zkkoG%WU`DjU?56 zI|p3d6>*E9diFxI^faT?3hQ+lS+noRmNDnJJW27EZSV_imz;fPM-lG^zdH}QWccHB z?(wobkkAY^UnwsyuJz#Oy>n)T`}Y4_dFi3-JycY8^21%;nSCcsjn{OVK0UiEb4!ZF z(c-^TnV;so>)Xsd{Vn@R)q3W$)ho|j>v-Ec|5Qdd&z!&W3OwsN|DP)PQP1|D)mcmK U!7P?d+d#48>FVdQ&MBb@0KEy!wg3PC literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/generic3.png b/htdocs/theme/eldy/img/menus_black/generic3.png new file mode 100644 index 0000000000000000000000000000000000000000..9555adba72ce3dde032ccc06232cfb20bc73a86d GIT binary patch literal 611 zcmV-p0-XJcP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KgWH?H&yP00HAkL_t(o!|j=p1HSoQ?v4I zY$IvY%yPg=%HXvmefY{|N>a_trhp>w2AB*8y#s7Z+Pdj0B>X4fK+=B8xg3ylgIIK@ z7dkX`)Z(>U+I$Lpk+h7bBsx0q5hw$nfk~e_Nga3#Yy)NAI=%^e;i|t z4@qZTEOJ>O3(NzrfhX=#GibsBmu-zsJ1;sAfN$>F8Bl4fKMFi|Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?@^oHM`I`VgqEHMISytEq&FP=s@R^gFl=k*WVWw5 za|KQuoB#Il_OHsTP6eH2=GNo;AO7^Cl)mUh(SX~z>sS2^{WbIV!7dMG6Nl75W`9m! z{{svx3)m06Ik+;bNFpbDZuY?!4YC_fJvzyd&&^yf&Kw}#x;^ruwCjAX`K!zh$DZDu~+h=I(}(g$bZ1>own+vB|$FV)G`&T!e-lqEpuX6zkkoG%WU`DjU?56 zI|p3d6>*E9diFxI^faT?3hQ+lS+noRmNDnJJW27EZSV_imz;fPM-lG^zdH}QWccHB z?(wobkkAY^UnwsyuJz#Oy>n)T`}Y4_dFi3-JycY8^21%;nSCcsjn{OVK0UiEb4!ZF z(c-^TnV;so>)Xsd{Vn@R)q3W$)ho|j>v-Ec|5Qdd&z!&W3OwsN|DP)PQP1|D)mcmK U!7P?d+d#48>FVdQ&MBb@00#lg<^TWy literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/generic4.png b/htdocs/theme/eldy/img/menus_black/generic4.png new file mode 100644 index 0000000000000000000000000000000000000000..bd6c5196431499007559a2e0c094fc19d84312f1 GIT binary patch literal 611 zcmV-p0-XJcP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Kgu6freWE00HAkL_t(o!|j=p1HSoQ?v4I zY$IvY%yPg=%HXvmefY{|N>a_trhp>w2AB*8y#s7Z+Pdj0B>X4fK+=B8xg3ylgIIK@ z7dkX`)Z(>U+I$Lpk+h7bBsx0q5hw$nfk~e_Nga3#Yy)NAI=%^e;i|t z4@qZTEOJ>O3(NzrfhX=#GibsBmu-zsJ1;sAfN$>F8Bl4fKMFi|Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?+Ys<>}%W5^?zL z%!|3r1_EvSSO2<~6JVwxJ%x7`?b;z2`xPjavaPSNN+g!Rk1x~Vc6Er$!uSB z<_erRHvjG8?O&BwoeDb5%&o`wKm6%ODSgq2q5-#a*RT2;`fKLzgIylXCJw2A%>JCd z{s$OX7O)?Bb8ux=kwi}R-0Xud8e}(|dUTQ@pPRW}oH;h; zcB|%2(zW#y&8}8#b^Ox0kpF<$J8jiTOM+a!sbwlwh0V4JTjs>De*d0Vm)Y*Q8%e7D zb`H3@E8-SI_3VXa>1jr(71rxAvS#0rEo07cd6MES+u#@4E;;+ojw0R-es>;p$?(VN z+~Z|=AfXv-zEWOZTPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z03|yOnhSma00b9FL_t(o!|j;yYnD|M$3LsKGI3kILmJ!LG-)f%wxU*A)T$p6L@+Rl zAQJ?CRj@yxs2}_#5Q>b*h>FOc5<<$Xbg-bdtmz!)RyGo9&D7~MeBXhmU%n3>@1Ez` zv-hRx;5~4;&pr2^bH2~_J@?-8yj5n#T$SsX!%_iX0bc>1EcL(^V8j1_Bl5j=MpkB) zrFEIvh+UR(Gux8Ub~?X{>G-N3KFxY}-@9~c1+B=}jR)*+u= zKpoHxJO+FSv;&XJUq?C2*Q+5WJ`h72)UpU-ayscZvlcVkZf36paT7770q--jVKZAF z%(X~g$j~seeHqq;aq7+NJ;=A3U#ctxo&}x;nw;;In%m{pey^8H1iuY< z#*HWR#&-c9rGWSa=oLdhIDM}`H92ycfKK4#4xI@F+=i|VK0WOspyj<|b1n|YAqjFA(Xa3z_?hW7=@UnJ(DYB^y z`_I+dfUQp754;_M|IJ+{K5Yhd?ay}FOsH=R?0=7Aegwz`yLuS-<0|F+A$RI{`=L1S zhk<2od?&C^zsNXn(=37?1SkIIx*pvu_~ zByCvqxwp!VSE$PDPS|uORi=)qC@bjM%U<9{pcYuD)|>+Tq_P0uq2O2RP6I!v`k_JN zC3^lx)ndCg%yIQu7#$1zM{)Rzo%TFm7NMjy3->;O33~Lmy2+Y?NomUD>C%Kq)XMn%; ztDMlO7L_COfu|hflltf(3wV?kmjw1t=kx+lt&5{NW7-sB*4?a>S*&WdPq~g_^eRQ8 zJiideuG$1m-z*&bdC4V>*5tWD_TYBCA&UKLq?Ma;o)Aso-mY`&{r* zy#V@1IF%M4##e)gr~`hMeOqvv^(juO%%m`DQ}EI7E51y5(0wUQ>X*pm|5~Xk^V$c; p^#aT#@Rk4PE8r{OE8wqT`470EiOhy-AhiGh002ovPDHLkV1i?dCo2E| literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/globe_over.png b/htdocs/theme/eldy/img/menus_black/globe_over.png new file mode 100644 index 0000000000000000000000000000000000000000..e3676a44faafe9dfb8452f634f0e359769c550be GIT binary patch literal 847 zcmV-V1F-ywP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Kh2RRBuH900PfRL_t(o!|hqok(@9LeM$qNgHS=n9fbVngAPJEpafDuD1j141#t)Q zbwCMR1-c(Oqt)5qJvO&@GkC_cGk~RMS$dYV#LRfF;{)FDIKiLbPw<&RL=_SBMAY3H zgp%D}wUC*2Cx8aP0)S<%0Q!=(1#)YV7iD_@blUdqikeKFh&f%S{^xOZi#3V zcZ2)}@#)p9kM1}N_~=Ri@F?<@EZZa^p8<>s3$CJ|J;*lk^emHA38L_umM5YKz<0H` zN7;}A@MnW@A7pc@{6@ogBGRW(E7oxUK4#?oWafd0Jb*9i`B!H4&nz#ywSGCsySXGl z4+QM9c*xMSPX?^;uN6{>rTCS>v-mg?%=V8yb$Za4qx&sE)!Zp{iK)VDo;Ru7#)6E# z_e>!zDf|(m48m=fryrjZO3`MOE<36*tvba!R;>#O8A2v!rTM(_eLVW93 zJ1txVuPbGr!hl_D%S3dqGTqU>jW+@85~Z7$QySt_u@W}G_e$oZj8wg-^^stUVBJV& zSK8fDvSQO|*$B?|CLJ@Sc!*4Mw9RMa&gKM*<-dunQrM=JPQ_Zh?)*>c1b>1*!Jpvw Z#uL=(^0yEKr#b)t002ovPDHLkV1h#1f8ziE literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/home.png b/htdocs/theme/eldy/img/menus_black/home.png new file mode 100644 index 0000000000000000000000000000000000000000..c210b4f8dcdaf6964689b6fab0cb93729cd36cc7 GIT binary patch literal 716 zcmV;-0yF)IP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z04V`yBb~qi00K-&L_t(o!|j7sYD^R~wWd|SXpU|%}*8EDylUYg!^ z@BqevBs+3^TEOg5e(7ixVdx#J3;xywSO|PeM}Y^xwsfkW-+f7m?U|y&7lk*_&Vk+w z+yRcHQ|*A~PD`4#{USE}LLcajz-{1kj?(??p`;1h?_cuB{B z^T1fcI^YYo-{xhTDPYYqicKs_LQ>@yU}uA%KLIaozblh%_M|;ao%Y!FqbiD&2M|Jw zRaMwz0Psmw@LA>OfL{TA+kw&a`a{mWV?BqKN|n#T&-|-o_w1Fc-B!Z(t(<#z16S%$ zKD3AK6bQHM8qs1ti2z?}jsITxvha(`fUi{fPD%Jq0r<{J*yL=cW0L*^_-$_DhTT-4 zQZ{14wux)mHHNCUN$Scrv6QbR+r)yerAXBQUzzehhE{poZAo8&Ej4b~?;%b>pZg?@ yq=$u(QnKds|B^;~4kN#9&s7HBR2%C5VgCXID2)I`4Zm>!0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KoLpAR>bR00CM_L_t(o!|j>dZG$irhQCwwy^N3z!Ukc4jKBu%2+anJkWt76bOX8p z8=Srvi69aV#9XZUNWX+EUp~;e*jQARQ0SeAeKJOMS`t7Qk8OG+o z7jSeAobo9QcXKZV@A^K2e)$Ew!viT$8lk(&HiHKe z;5q}kRRg4}!@EFiUI1@Z0m<6%K2=(I_E@A&B2t80VLwIW>@Ckbm#J288*>0#pc7YB zbpzGU0vJPeY&HTP4d6%6hna= zJNRRCn+PA_Bm5%pRj}}?+8FlZzOD3`=g;n!NU{)Y4P4r1>phjkOXQ904^L8r#{ED; Q#Q*>R07*qoM6N<$f*aez@c;k- literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/mail.png b/htdocs/theme/eldy/img/menus_black/mail.png new file mode 100644 index 0000000000000000000000000000000000000000..ee3d9d81ddabad1dbad46eb31081aebdd88d432a GIT binary patch literal 787 zcmV+u1MK{XP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KoVpkzPIk00NUqL_t(o!|mA5i%nr1$MN@vX*MWjfksS}EXah-P&SO+SZVU3nKVgO z5`~QoO3h|U6voJpq}2QYGKvK$(PT;ES41+J{J8EN#>eKl^>n(I>&&^g=sa~go##2{ z`M%D%&-p&jxw6f_TBh+2mmHttb9|1^@qa8$wVWiW6=-d+ZN&EYl<`0haHPTbjli8O z@IQcJgYiEz88-g|zEq+9KG19XQyQJ5cAy_vkOn{PFYw=h_hDb&Rsy#rb)y;`ek`1;; zCG7`x0Gp$xRlp!HBZ2w~4A>s76033ea06c@HCLDmrdO$({7tN4)~RwbWPph(FXA4c z9T*NviIGGmDFN3)+f!hdr1e!|Wu9%mhumAL0Ph9X0Jm(Pv0boz9Jm;+`3M}fJ!HE8 z90Q&JJ(AW{h*fi*Z~Dt8|2+Zk237-iY+p$XrJIr-0R`LNqWXfQL0})SUDBlO`-vw{ z-BM+MZw1n{p+wS7za8fwWLXvsqm840xN*$!09yWnlK@q3jOvsH=;jHlEVG-5H^2Z^m{4eetpW}0Uj?eKqKF9w@_+OvDJ!5;? Rtakta002ovPDHLkV1hr~XY>F7 literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/mail_over.png b/htdocs/theme/eldy/img/menus_black/mail_over.png new file mode 100644 index 0000000000000000000000000000000000000000..61333228ef42d66e851db45c1ac6d585c7d1e5f3 GIT binary patch literal 533 zcmV+w0_y#VP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KoY@^7{(_00EUrL_t(o!|j;uO~Wt{hMyPlzwHEcgls^W05%{SkPRpk&<$E9pc~L` zkZw>m2osn;j$}p7S4mt2`6U0a&mYe@cV{~?#xPa6VZsvOBYcF9@DaXMZo71nv;>xc z*>Yn{(b&Tn(^`NvU;>v_8&~xCslp$Dg)v5#6yO2)4h8>Hsow)7C`IoSFf*n2WW4kQipq(I>rw|4q;&Ndgp zJMCEwOjhYvXY9FZY%qAMOYDwU!S)t9v5;Q9XTEUo&dzQ;fJIGP+OSsGL&_fGzF?ho zY`fkeC20pd10TS`W{#@7S=|ZPN=k>=wZHoO&gyoaU@qNcRdKO0M$)VKd>y!>U)BU= z;>1H59Nq!XyUfvGK;fp#(F0aeW_|nwtS)rd+!=e2l#Cv*HqhQn@YV;zhz9h9Pk`+Z z;B^KJ{tWcw=mU^R8uEI603OGLFXd%24{&=oIR<8HbxFlv+z~#)NB9UI;Uj#6|3~n@ XJYRA<%y~^*00000NkvXXu0mjfG``>a literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/members.png b/htdocs/theme/eldy/img/menus_black/members.png new file mode 100644 index 0000000000000000000000000000000000000000..1421309370058deffdf66e7c323035127988ffa0 GIT binary patch literal 1134 zcmV-!1d;oRP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Kojz`>L@300ZtxL_t(o!|j<*h*eb_$3Nd3r<`VVMlHt#Ge(;lrzQ$h5}FYjYDQ>L z3$+Mz*Dlw!s717BQ>}|^5lEN_74F1|kVKNGR|svd#}ulJ5}!D4wfeQCiy1$|3D;dkTjHgqM1c2Fa#U`j=LTK z_U2h5u~sMWHZTj^PUvx9C~A!y8yx~}r06N2GY9bjU_4{J8^CL!bre&iBpn2H24EFn z)Xc6$tak!w zfx%R6A2ct*NUP5RUrHJV_GI8*4f2X? z58m_YnI?Y$9|HFRZv=2}x<7vsVYj!;tWu^u*bF=z2*?(oYGxNC4Q5o>AI0c%#=y}E(60+w%+)NN)};IyA! zmfR0q36htzCW6dazxJ2tDEqy*RVCHDtxl7USj)FY5W48s4JF7YUEw^?lY#vwmi%q^ zwKSPBvzwBZ1Iq%~Ea^<#S3Sq@VJWnT3?U}l$rOBqj8;|o0w zwxsm$HQ=zM_1>#AT4d6%T_vpEXwk;go&nAQ7tQQ??yl0zCV&Y^t-u;5+vP8j>V7z1 zlDs9z9`${%Mx9!jZ&H$$0#AEdEh3Y^DKq=C(Ef|@LCs&`^#I+#(ugTl;5RdyDz)!o ze+~5RaPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Kot^{l;hj00Lb}L_t(o!|hqoZ5uHReJc7NZ%}oDYJ*%ha5uOS+6_E{N4RXDZgAP) zvcZj@PQd=qfMVFv<4J81G2J=D@ zp#{JIU;;3!L;#~jN2col-~=E6kW6L(1Es@YC|()KWdU$701p7xf<9qLVU5L#A=3tQ zt`IUbfd?>>hSJ5Du8FtYOHc7k>RejEv#fh{hZ3vv<#Y_B_!jVqVB9OCi-k?Su$x_n z0bf&oG5~pV8Fj^oaAv0+2x7ja=4>&sTx7ZUYgC0G{vs{6jx~8QdmjYj3&RgKnU` zw$b=qj0nV>>(E+@^HZ<#U?u<^2|!6V>Hk%EFp!1$&CDvQmPg}vS2G*yIK7=Uf@fo3*aY!uOc#v$a+2DGw}$C`bNFf>>*>m=U4zdsa?+hw=_u&JPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Ko(}kOFZ400iqvL_t(o!|j<%Y?VbE#eaVlL0*+Yfl}TrQ3Rnjlsg~kLT zE=)+=7-Mwj!i9;(n22$q5?!DP3AiH0goxG_MF>*Rpn$dVXes4cEb=TS$IZFPm&@1Q z+xB`5rjz{Bd+#@M=FH50&YW)=lDJXJP29j`fcyaY0rCUn2gv`w$=}l31`$yW+zueA z{=Xz2J=ueZmWf@jilCyI17v@0QT0R>U>00 z0B-|b{fx7~$3-PCsSUUQJPYjWBk>>HenQc8J|gOYHIkYlq6SzF)Bxo@;Ispcz!#Dl zBVswQT+*6ilV1nSw$5*q)Sh@YF9oAX(gi;+2c8EW2R2Dso5zVgFAb}&_TY2iW?%)d zA|kc}dx7RO@QA36h$`S7V1a-B5vWTcIv#k;b?0_77=WMM=N3sPdNcDM0L_HVjPU&}?{MM)=fkzWZs<*&a2-vYl#I@Lqo4g=-`OMqGSIBO;C zj);$dvI6YSU6S6)mGcvTmx0y5UBCo55)z@Na-0+8R6PtLCdmI9Z7?ZDTP&Lq4~ zlE@`Vt$sEJc-V?_8}Nyw9TBkvSk+JBmx1>sHRU4zgpc>9O#+|;I0m$)08g?DElqUv zDKJ`6T|_Jenv6H255#}Bd{30LGgsO?0&K8i)H*7FJ00DX!$5;=MXmQs9k2{&k@T+5 zgIcFuX%AQ(PQ_i4nj@kXxEIJtzQt-Y6WA)L!7EY;49W5==N!i+U3Q)4EUOt;*#@kM zh(_QmNgEQYT$y5{|42L^6%o(ao_wEA&R4tgH2-wMvw8@)0<=rI;=0p3py{qZ-fi{* z`z0MP-onJQ1IBAlVi|9UJyf~zW+vJ+N;;Tp<{!1xjk7#W@e`$g9c3vmB4>f)z!A^zvVNOuPU9002ovPDHLkV1moEgP#BZ literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/money_over.png b/htdocs/theme/eldy/img/menus_black/money_over.png new file mode 100644 index 0000000000000000000000000000000000000000..fba1c91e05b51765ed8c8c0352840b3db978f614 GIT binary patch literal 952 zcmV;p14sOcP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Ko>RFCX9l00THlL_t(o!|hqIj?+L8eS@fINJD*==)rsd($XS|P*Gfgkr3^rMil80 zlJ5`v3FZ%c5(OPbqCejs_zGx;=B;jSZ<5%-$>~rmjpW$722r z0R8~}0R8~}0RI05e}8NT5y=6}06|2RS3O8{T?3Z5hX2fzyeKexw@(h z_7{L3B613#RMo=JDmd+1RqZ3~M5F@n7QpF1#|~buZAbnXKx-urz=E?dbJ_>qx2Dzr zc)r5?mb|}iCL6ZP#_D{_wM(&u=6CFuS)J$aW@^V?#rf9oH|HqS1kf87ZFqf|)JY$~ z@6xe7@Sl?DD>hEw)l4*dCCYqt!T+Xc(nA?;O590Z=iYP8CDI$0D8aCCa3L zy=d7kC%@Y$l@m~A)X0A}Q(s!j5L_^kCq-Eru*baqVFKX2r(WJ?;BNr$czy!lTtqq% zsrgZ2!Oumc7Lkq%x)b($4d4;a9{_kp=bhHESJ0*)Z59J4W2s~NS=xkMIJO7=yWxGF zn9-cF7^AS}#q(I`OJ4hC^g444?pipeRcucIG(to1qRnGlk+& zqe<2|R*#nej*P>ua_m0IwJPT|#~#A@hHoFaTCI`HmiMDfdJa38V{Zaqn31WhTyB`^ zJejTFmG8*3 zE!=(44Wn6%*!HXWkfF=wA+lSn+d7n?|HGQy;f&EmX|tm|Vz)V%nX|In58Zv1!=K2v abo>SV&pCCPmUb@?P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Ko{pA%4sN00F&8L_t(o!|j;8O2beb#eaXPpa_0Ibr7whi@1oR2);odKyVQUA3|{Q z0s0QUfZ#JYxTxUZCMYTt)J2yjsmCRS5~!HmYp#VH2=s&e^W)_7^xl{xhE*dBu`2iq zzJjmdEBFe&g0J8+s<{p@vuU6OEIW=mlhn#}h9sv0I0j-*$3~uO*F4<4E)aQ2!eptj z0TQ4CTu5pbjNUo04XErNY&V6E9cIMojIR*zkq7uF1bpJrd4+O5aWo(b6`PJ@<3vR= z@3U>{W_D0;M!iUEY95`R0rni`1abZfXaW<@_0f|)%@y8h3xc?6b#hs^iw9{6vZzbFB?0W4;mPk>0$ zY2nOE`g3?Q>jHD>+qE?BZiotu`&#$ZJ)tZ00000 LNkvXXu0mjfak}{9 literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/pointofsale_over.png b/htdocs/theme/eldy/img/menus_black/pointofsale_over.png new file mode 100644 index 0000000000000000000000000000000000000000..4549e2c4611487ebf624e1817b13fb589f07d3ce GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?lFzi8%ar z=EmH^1|lx^`Ar&bg?!|=r*KO}N^z#bDK@!-$`vfTJl^w6P-A8(nEU9`i3UZDHVv*t zEq|Ep7C5QMuTZXR@e#_tDyu#1u=O4os&RMCVowWWvQC(M<2wycz zd$aWBvNKPAE>@8aK5(&Iy1l%@ehFK4a@yG&+jc&bZ@9korW(U@&R;(#h@|zh3%j&t zy{T9ox1n}(xWB}fBrTWvmvTQQaNY}ky5DAr+T@wJw{J&=t9zc`E|%kWK3wPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KpD`EvJ3}00EInL_t(o!|j-{PQx$|hCic73~amtREUL{r4l>511!7%5(5jcF);8X zs7o1`c>-WSVyKwdkSGgn-Q-w2cu3XsoY1)PNs+9JeE#(3a=D8U5n{D9BDMsd;1hg; zPw;as3k_h5IRLJe+fPK~Lw&f21YJN6$d%Vs$k|y9Pj3U50O!Dq=f4H^=IqUvnl``` zu)wp3JbCH#<@~LOp8&-Sf2-lGgOnNmDAMNA7&G+zI~CHVXiM5`mE4OaZ8X-J7dBdW zo0N}C`K4Ez@0gXp2iBE)AA>sD^xvk9!-z3v7r0Qy?ukgx#pwd4$~ZS7@}|l8PQc5! z?XC9%;&cENeBsLAgNXFKCvpTFE>KBw7w1ky-n}?y4o+20vkCx{l9HBJP|}w4KSiBw zbCdAXlCQATIk2p}@)qd2iZKhWit-jXHpZ}EoM7d(Jx`;}Ta)m%>4BwcsSG_dZ=&;D zY2`x{n>IadRe>MZr2P25;YR_A{d(&mu&InQ(!vh{+U8Gh{R;dj;|$U;(l+}8*;yu6 TF*CVa00000NkvXXu0mjfiA?8m literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/products_over.png b/htdocs/theme/eldy/img/menus_black/products_over.png new file mode 100644 index 0000000000000000000000000000000000000000..100edf445f129bfc7d97186aea3337af6f07f4b2 GIT binary patch literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?zuQ z;~{U815aywFY^x0zJk0%Tz(8W2RM2Tu)SjId%%(R;m_ietw&<^$T6O&KFR8I>7Kjh z(xVd}}!@Z;ra>sqxe8_%!lYXGq?-l!hhBmKW ze6@b|(kU;lI(Np&I=uZLyzk>uC3%^`&fM2db(=0NQ_h^vy5Ka6rSG3RA literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/project.png b/htdocs/theme/eldy/img/menus_black/project.png new file mode 100644 index 0000000000000000000000000000000000000000..b015297bf0d7e546f4459f6387bea78bff605e41 GIT binary patch literal 477 zcmV<30V4j1P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KpXLP6A5+00CV|L_t(o!|j-{N&`U@MbFa&L5nESS}<4&f=$3CVCg4W+xr=Ub$Y?Z zQpCz&FQ|o0z|AJtW`#upd9!3=CeCYi2IkHl?%rkIu1O-+S|j30@CiP_C-}uwV_qAX z*%fd+Yn`Ot(!m2qz-g4u10&!oX80^QpWwqPiy1yong1`bv6#Q48nwA%)&aJPmf-PE zoj0?~z`YNE&0_o%B9wG7Z|4t->l<+ESicRd7vl%V`W~=XS8T3-;3eHTp40}gUpRT= zSpOOdzj`mMnRS7-Bb)t_rVVr*_k5N#DCy1}nh#0$-q@S~9ml5q(s&0rbDqS5(%hqY z0o?FaPRof?GyXOAXhtC~Y?a=8;?#_%oXm5F4|QHnO}+@{qm4~gBYYL-vk>?yy}4@4 ze4b*nOtG2T9++7RXgW^V_mZXwv>YHqNyCzE*WY`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?e`cFYZEQcYl=lAsy0H=syu!C z&4k(uXEt1kNIa-magaOi!~4#Zb*&y@44YQk7@ywHXV>uls#%lxo(HV@KW_3JQ~mF$ zs=u0RCgTkj?|}L(pHz}4+zSe9HoyCBa`Mtb$@{s+)e;O@3}&Wmv+gWr z4B#t~^R+#;QaJ1b$m)9Oe>1mRmZ@nft@HbSgXf*?tZ&cv^j5`zCDkAEl`{8Tc*?or RCNLZrJYD@<);T3K0RSj%n5_T+ literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/shop.png b/htdocs/theme/eldy/img/menus_black/shop.png new file mode 100644 index 0000000000000000000000000000000000000000..fd1fe4b5785494ee9735591d9e7ff79c2e46278e GIT binary patch literal 715 zcmV;+0yO=JP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KpoGo9k5o00K)%L_t(o!|j+oh!ar|$A6;+3&VMwm6&*fc=&-L9%7k7u23w_((0@% z#cR&OLTj5V?8L%eu(FF_qhRCtg^HYlVh}9EoLs=fn7_>g!eKVMdv8M`JMehyd$W_@ z{@=`GS(C)L+7`yxa`+rRhtJ`2_#8fm9~pQvyJ2RZ%uGJ&zBV~bcuVqP=5STuSRa>H zz?`J|D8fGhj`l45^m(FZ?KN;#(%Q(RjhQV0Ge8qq0nSJ&Nh$$HfJeSJ11t?CZzK&I zuIxLY1}sPTExS(*D94GtnGsj{IiLW11g=L2u?Rc|egWqrPI1D_PWd>Lweq)sH^6)h z-;?fpzt8?W@YH>}qY4~Ms(h@1HM3{Hx}-|X`gj2BmNdIzeHOUwm+Qb+uaWNcB}wmt z6|9*Ry%4Jj4)h_=G_w;M){g_b(&{L{cT&XdjEeHZfj6`1(4D5|oqx^SaAwMPGElzg^Opp@yaaqs z10P!Xw$H5uvD;~sFJz#6JH`J;D)`9^;CK4`1DJ|=&(<{X?F`_%R!C&bLy; xZl!@2@F$}_pCooC*ms-%;&WdPpTm!_{RLu!q1BeX(jWi;002ovPDHLkV1o5!MOFX+ literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/shop_over.png b/htdocs/theme/eldy/img/menus_black/shop_over.png new file mode 100644 index 0000000000000000000000000000000000000000..aad451b8f4ac46bc8ff815ac140ce4dcb77ed1b9 GIT binary patch literal 510 zcmVPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KpwvZG$inhTn_&zaD{15Rc#yx%m2 zk3c54{^(h%2!LmN1fX)}+~T?LA^0TzCjsPu_W_{s_H_Vm-u_E5@FEwN;cH~v z)eE321^z5Rc1aSRwEBf)7;*h*_(6cq31f|uRwNN&o!B)&q{1_RDWg8@ZzG!x%oY0> ztY-yqNa*RVcMlmIc#vaFu-yQ-1NdNO#mpMO5x^IKR{)n?`h3t`w))MR^KGG4%x2km zI^V-bSE!NmbxYkWM>c!j>Q8c&r-%Zq$VaD6`tr<25viXToCWaiYK56^#lQ>rXTmr) zhN8)s`(j2!dw)thiWI*ynhBNiJl`?%m?<;UUPh{cU%FgtWh2XbjhT1wIlBLUnpZW$ z>j#`mdw0=PQ>Dm8t$^39&zES_{suPq249c;0HMwm3RmphAOHXW07*qoM6N<$g7bOX AkN^Mx literal 0 HcmV?d00001 diff --git a/htdocs/theme/eldy/img/menus_black/tools.png b/htdocs/theme/eldy/img/menus_black/tools.png new file mode 100644 index 0000000000000000000000000000000000000000..fff7aa2baa82c551b08f5fb8548f52705ecc4a56 GIT binary patch literal 1148 zcmV-?1cUpDP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4Kp*hl-4!?00aC=fbi<*~$3Rdw!R8VQ~O??PRP-!X$Xo;_5wg*Z>Z#$O&>j9@^0BA|swE&L*A5^h7Fa~s|{iY)- zLJuT$0J~D^f6YK-dVQk5J!DlazZuPZBC~zKA1S#bhu_*NzQ=%_)18He8d<(5qiYJ7 zOv#lwlC;zz5zh>Y8;DDs7OQ|-J?gGAu&$Rv;U?L@h1!np|;9$ys5zr&)sxnID zx(K>cQfC0~j44h7AGZB&!K8gzCC(z?`659YGxW_75MaBc?eRQO#kRNLS#b`qA|uu% zlC}b$0l(P(xp1AAv>Di(6VDM~Kd{I4o*dwNfXj2n?g!qmy}t-l8NIDDH z0$d8T0v`cy1LMG3HIntT?e`LKHUb+{HYb5Cw!aITy&17KRc!KZ*vbt220WE9u%BY% zRcnt*I$`@0NjC!TN+z>FDpr6|AF8e0cSOV}1frnF> zPF9wKw!6dbe&E%5$NsD=8%Y-c4*`p7P=}Y}c^hzU@c5T(ADOea2a*;8_ePA#3>l28 zUng*8=o)}dNv(4NK7e;5*k_iU0#*X&rSt;sleBU!GJj88v?uDw_rPBneE@e$S}|)I zR?;m2e6o(|*S3EQ{yrX;jsJuLHb??E1njeYd`32`q#J-Ma+v;*yj@8;AGi}ZqmJJs z&|`bJ?3Yfhz^yqe{NGn-Xd$R{)d&+6q~cc`G;+f%qgFr%{H(9*7+N8%9Z14ZKv=6 O0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^-6 z4KWQw!>Jzt00LA=L_t(o!|hq&ah)&>{+!GIutC@$-k@&;M(_q@1V(rply1NX?gn%N zx&fU){SoDkI2KsO?j?8lPWKLDi%&-SB=igs;j4}ZeBp6{zrbJMFYuobyfLOV#yDe) z{S4quYLYU>+yQ*wO#KFMBck z#&BPb7)^O#jBx;d1k>-{0H1WXxo=sX_x4pi`OV43PP9wdcZ=*@0o-%n!rsGL1^7W> z{3y7REdm~ZW2H`*SD$>KXDMNTqa?Rl=30x-k%CPCL+0=&c&F&UM>8)hj<-@x(F z=7Jv-;1~AeE)o2!&^<9DslYeNhfpj=5`*e5VQ{!GJg5 zl5y^UiRNVHI$PNVAXknDHSnUf%?V=~0r*(@S&v1&XkN?Ufq}OGo`NMmiO3cIlq&2t zG4Y#qOHTFpKLa)vyv>FR*HQ+Y_3b0BAB0R@#DIrPA8)wwd`?(y0lWlrPXPScE<|qM z#zz22>!fksfDCsTHFZ9-&ze~N+G;+p06r-LJ1Z76z;B7b=U6vDFu-&D<2LuE8sLXq z;5!C1v5)(zY$J@nM@=Md_1*dMSFm=e$u|BB@Ce9n0n_yS`=<)qlxP@53O64lyP;Z! zW#9BHQ%oCm-KoUhWKzy8)KJpKU{$dvALyAYND0000 diff --git a/htdocs/theme/md_dev/ckeditor/config.js b/htdocs/theme/md_dev/ckeditor/config.js new file mode 100644 index 00000000000..cffaadfba6e --- /dev/null +++ b/htdocs/theme/md_dev/ckeditor/config.js @@ -0,0 +1,92 @@ +/* +Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +For licensing, see LICENSE.html or http://ckeditor.com/license +*/ + +CKEDITOR.editorConfig = function( config ) +{ + // Define changes to default configuration here. + // http://docs.cksource.com/CKEditor_3.x/Developers_Guide + // http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html + config.enterMode = CKEDITOR.ENTER_BR; + config.resize_enabled = false; + //config.resize_maxHeight = 3000; + //config.resize_maxWidth = 3000; + //config.height = '300px'; + //config.resize_dir = 'vertical'; // horizontal, vertical, both + config.removePlugins = 'elementspath,save'; // config.removePlugins = 'elementspath,save,font'; + config.removeDialogTabs = 'flash:advanced'; // config.removeDialogTabs = 'flash:advanced;image:Link'; + config.protectedSource.push( /<\?[\s\S]*?\?>/g ); // Prevent PHP Code to be formatted + //config.menu_groups = 'clipboard,table,anchor,link,image'; // for context menu 'clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea' + //config.language = 'de'; + //config.defaultLanguage = 'en'; + //config.contentsLanguage = 'fr'; + config.fullPage = false; // Not a full html page string, just part of it + config.dialog_backgroundCoverColor = 'rgb(255, 254, 253)'; + //config.contentsCss = '/css/mysitestyles.css'; + config.image_previewText=' '; // Must no be empty + + config.toolbar_Full = + [ + ['Source','-','Save','NewPage','Preview','-','Templates'], + ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'], + ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'], + ['Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'], + '/', + ['Bold','Italic','Underline','Strike','-','Subscript','Superscript'], + ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['BidiLtr', 'BidiRtl'], + ['Link','Unlink','Anchor'], + ['Image','Flash','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'], + '/', + ['Styles','Format','Font','FontSize'], + ['TextColor','BGColor'], + ['Maximize', 'ShowBlocks','-','About'] + ]; + + // Used for mailing fields + config.toolbar_dolibarr_mailings = + [ + ['Source','Maximize'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Format','Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent','CreateDiv'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Anchor','Image','Table','HorizontalRule','SpecialChar'] + ]; + + // Used for notes fields + config.toolbar_dolibarr_notes = + [ + ['Source','Maximize'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Undo','Redo','-','Find','Replace'], + ['Format','Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','Image','Table','HorizontalRule','SpecialChar'] + ]; + + // Used for details lines + config.toolbar_dolibarr_details = + [ + ['Source','Maximize'], + ['Cut','Copy','Paste','-','SpellChecker'], + ['Format','Font','FontSize'], + ['Bold','Italic','Underline','Strike','Subscript','Superscript','-','TextColor','RemoveFormat'], + ['NumberedList','BulletedList','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], + ['Link','Unlink','SpecialChar'] + ]; + + // Used for mailing fields + config.toolbar_dolibarr_readonly = + [ + ['Source','Maximize'], + ['Find'] + ]; +}; diff --git a/htdocs/theme/md_dev/ckeditor/index.html b/htdocs/theme/md_dev/ckeditor/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/theme/md_dev/graph-color.php b/htdocs/theme/md_dev/graph-color.php new file mode 100644 index 00000000000..0c091a1ede3 --- /dev/null +++ b/htdocs/theme/md_dev/graph-color.php @@ -0,0 +1,34 @@ + + * Copyright (C) 2004-2012 Laurent Destailleur + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/theme/eldy/graph-color.php + * \brief File to declare colors to use to build graphics with theme Eldy + * \ingroup core + * + * To include file, do this: + * $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php'; + * if (is_readable($color_file)) include_once $color_file; + */ + +global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; +$theme_bordercolor = array(235,235,224); +$theme_datacolor = array(array(190,190,220), array(200,160,180), array(125,135,150), array(170,140,190), array(190,190,170), array(190,170,190), array(170,190,190), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150)); +$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4')); +$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC')); + diff --git a/htdocs/theme/md_dev/img/1downarrow.png b/htdocs/theme/md_dev/img/1downarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..1d134ab3e4e52167abaa33369164ffb8fd3bf060 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZdQ2{<7uK)l4FP}KOX6~x=y0+-7 zg6f$|x;G!Jm@*%T5=*KYmu;H5?=+CCowEX{0H|`pj$`esw^vVH02Ha8w;Cu|JYi;R zPSJ)7x6j>wcI@uc9hdL*?>Ye#oWGCj9ncoWk|4ie28U-i(tsROPZ!4!j_Bl+21Yj) z@1~FT!pe`u<=osF@8|Rg95}$bY~Me|RmrRy_cfO?T>ablD)mo)5*I^qHHTgA{^DOi P0~kDA{an^LB{Ts5Q-5JO literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/1downarrow_selected.png b/htdocs/theme/md_dev/img/1downarrow_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..5caf8ead52d3673720fa0f03631ef47ea04bf86e GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZddL^zACC){ui6xo&c?uz!xv31r ziMe_TMy3i`rI~pOMg|6^3Pwg&rsh^gh6>sSh6V=qS3gt$b+VUu`ns}T=jP^@XT2KK z%MCKQz$3Dlfr0A-2s1jZF_{4rWJ!1Qb!1@J*w6hZkrl{~4e$wZ{r~@e`NY{Zb62I; zwMAzYRL@+}z4>6pl=(oESW?xvY}3?zr-5YcoE1O?K$R1A9BW^_y?W{bph*3^)j+}G z2{U7JiZ)!heeV9VV|SnKxO}gF*9oBDvuDrJG~WsXEn+MQ@(X5gcy=QV$T9JBaSY+O zo}6%iNkv6<$&yr-loUyp9Zww`eC9MZavyn;&UkY3rjvyQPE(8wHymdKI;Vst04aZdD*ylh literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/1leftarrow.png b/htdocs/theme/md_dev/img/1leftarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..554cdc3d76c3543d9c08f56aa3dd64d06bbddbf1 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZdQ2{<7uK)l4FP}KOX6~x=y0+-7 zg6f$|x;G!Jm@*%T5=*KYmu;H5?=+CCowEX{0H|`pj$`esw^vVH02Ha8w;Cu|JYi;R zPSJ)7x6j>wcI@uc9hdL*?>Ye#oWGCj9ncoWk|4ie28U-i(tsQbPZ!4!4q4WNhFpgj z7+g2*;kW8=c7I>*cJ!c=?}3kpKKy7cd|j6q#=BbU%_^?qu>79)%hlU9e_&S*;cz{6 SZ}vo>84RATelF{r5}E+X17s%v literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/1leftarrow_selected.png b/htdocs/theme/md_dev/img/1leftarrow_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..554cdc3d76c3543d9c08f56aa3dd64d06bbddbf1 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZdQ2{<7uK)l4FP}KOX6~x=y0+-7 zg6f$|x;G!Jm@*%T5=*KYmu;H5?=+CCowEX{0H|`pj$`esw^vVH02Ha8w;Cu|JYi;R zPSJ)7x6j>wcI@uc9hdL*?>Ye#oWGCj9ncoWk|4ie28U-i(tsQbPZ!4!4q4WNhFpgj z7+g2*;kW8=c7I>*cJ!c=?}3kpKKy7cd|j6q#=BbU%_^?qu>79)%hlU9e_&S*;cz{6 SZ}vo>84RATelF{r5}E+X17s%v literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/1rightarrow.png b/htdocs/theme/md_dev/img/1rightarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..95fdc377ee90c3b9d7c8fade2197c941571f3142 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>3?#4ne^UZdQ2{<7uK)l4FP}KOX6~x=y0+-7 zg6f$|x;G!Jm@*%T5=*KYmu;H5?=+CCowEX{0H|`pj$`esw^vVH02Ha8w;Cu|JYi;R zPSJ)7x6j>wcI@uc9hdL*?>Ye#oWGCj9ncoWk|4ie28U-i(tsRmPZ!4!4q4WN7kQfk zL>xBG`+bG~5yPAP$`@BK-acAaefUCo^TVo=;|5m^LZ&WUbvo%3?#4ne^UZdQ2{<7uK)l4FP}KOX6~x=y0+-7 zg6f$|x;G!Jm@*%T5=*KYmu;H5?=+CCowEX{0H|`pj$`esw^vVH02Ha8w;Cu|JYi;R zPSJ)7x6j>wcI@uc9hdL*?>Ye#oWGCj9ncoWk|4ie28U-i(tsRmPZ!4!4q4WN7kQfk zL>xBG`+bG~5yPAP$`@BK-acAaefUCo^TVo=;|5m^LZ&WUbvo%4b%t} z1d0GPMrRcO6)!q|xnjzEAWAH$I(GMI|E?1|F5gQE-*g>lBV$RBUoeBivm0qZj)A9( zV+hCf3N6tbnWCl=>CEd~2k%3`jKlh(RRv8vm0(6Bs;Q{an^LB{Ts5sY-xS literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/1updownarrow.png b/htdocs/theme/md_dev/img/1updownarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..871ac1c1f290dd7098702eba8b5bf707b71b49e8 GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRa!3-oB#YF9alw^r(L`iUdT1k0gQ7VIDN`6wR zf@f}GdTLN=VoGJ<$y6JlBJTj75ZC|z|3_yP#O4$wmQof*Bm1-ADs+LOfj@LpZL7_IdL)C)hWWt(>g;bM62D literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/addfile.png b/htdocs/theme/md_dev/img/addfile.png new file mode 100644 index 0000000000000000000000000000000000000000..1cb7af0ad8a4db9aa8a5b07dcbef05ccd55862f9 GIT binary patch literal 593 zcmV-X0#R7epa{~XD1zWB+?>;(Ar20V3)<9jiK0as zgboDAm{tWwYrC{p4-^^s2ob z_NMd``YHW{ewThiKh*)?L42cX4cp|3@;(3n0Kgc?!_+m^t*SaKevo!S%Vn`2n*aa+ zo#aXCmg)}bx)%+z@1?z|MhBFOI4>?>5dZ+js%|MWHF`<>VK#$b$SQR|HYFd4hwu(2 z0ML;iae%z6aL+RGv(}DE9;c3|+K{Y?Ej$1K9d%rMstsRBHdHYhqkbZXl+^fSas(m|Iu!$`Vhylf?$jq0|4MRa!6~}aY;8mW4e1()oDx1|C-Oo zlJ8Uv$QS?s@V8i#_O* literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/background.png b/htdocs/theme/md_dev/img/background.png new file mode 100644 index 0000000000000000000000000000000000000000..fb63f12299c1e94af1bdccaf930065b210b834dc GIT binary patch literal 25628 zcmWKXc{~&TAIG~(emW>B-LA@2Um_4%8+qP{omUnO2ZQHi}-*Nl4 zeLMdR@K>it|Hke6_a5C|US6J`pP!qXTUl9|ot<4>U7eYknVz0rTU(o&nwp%P6bJ+p z6BB$spUGq{EG+!_^Jj5!k;mh)*=#PCyR@{#;c#{Z1`hnY@c6UaPR||&`#gg^3H9D~ z!zZA8iLbYv_Y<$kr=8x$+qQW^EN|U-6tR8R#P%xhv8r929B3Vrmv#1W>f4aQ zt^3{rpxy#x-~_nRe!svpjFkwuC{}gS%#0scB;~IzIir(4s;ZJ$gJ0FW(w8KDj<0)Q zCm65#(hFV(q@&R>X=j~<_4DAb^(LdNhd#50Q@~Z`Y!sXFb{s#_B)n-W6?u??64#~@ zr>W_XYM9CG9G;da>kCFuqB);wZ9X{UZiijeb-tFiBhnU8#Hk%?h|GJ=bVFE}P5ONG>Dpz0R2RAA4Zjaw#4u07xOc_-&5>?64 zf=jS*ISaI-gINJ=OKe%<$3EJbk7rN8$NoB87QJR7i=}+dSsJ%ES6_N(zx1{x#$taa z^Tt~fR4~Kcrqt3lJhKwQwvQw{yQ8NYMk*@^`~(_678`f^zDlo5C>OVtL7E7&KONY| z;R^OC^8LGZXCJ639gHn14~E!@fJc=lsIxFt-LMm9mlJR$zC{#J*=fd?)1rd03tW%aN8AjLUB2OX0vm|8fBJ9Enel<)`p8=QZey& zxLMXqNAlU_rz$$B0aPCml?dAIkw|EIq&{`0cxKHwKdli(Hn^T=FbB$5_jZ-V#Kd{I9%%srQ}Sf; zH+28oLQ+GLGHmLk)@<0R!uLk_?TE4-x4J5mjLP1`NRjJzqx<-Cw3P8Ic`tUA#@_uf zH^p+|OPa94J}CMT6g22iIhiOzoULS9%lz$+pnS5D*Z=tF?CwmCO5wtoQ6MW?*iaSu zo1YePAS-vXL*CGRFh1Nc8_5nizrNs(BiGm0P|Gf;+lkkHHF$TD!ogs!2TgUqKm_9+ z)VyWa96bJc@0~9Ql0rF-b5TzpoEh{ctzJrB?FkL~*-qvtsrlkM(#&OvX8mWM({Wev zO!73zsJgF*tkWs^ul{b!2zg0x4oB_rkBrd#&+Dz$IHGw0p@Pkuio zvUL+^(t?5}wd8P@`KXARn=1ah9Yrx$Vt(ivwg&<^)fGS-7moo56KGng7%FBZSPo#yayFc_nP@&)9+27h0Fd7nL06!DfbdO?|$4$pkp20yEtx2w_CbLt*RU&CFKQbp#&8+#B0j_w^Rp|mH?Nj;q8`(VMyr|c`t;0(nKj`k#DUmD zHM%ku)&v_%^Mi`-*)Q(>#wb$;zy`hLfHC#;;~<3MsC~ce}9p8 zjG%F7!q4cL5}>cCal)3<+|K;s^{z)F)Hv?Jz-a7`0-Tm3ENRV3z(400lOyLjK5`Pj zqhS6mtV9i#eWdb=S$9P|ywT@HEvdX$WkSIK$>WL# zHeoEP18^x?^eg0Ry@NA4TRr7n)Y@BnUhQ)2`(i2*?+T3s`xyH0`{VnSj;Nocx=i~# zx6(DSQ<%Ctt^GS{rRv?q@O>qE4!>NFBG!N6((5b7kp5jc;01q#<2ROHshiGfl8Fy2 zcm;FXnLFqi*=c(PJ!&-cBS9Q4I@QU|-SxOqyNJpp6$Sa_0G`d9ggU~9MK>$HP)d%R zm0ho_F*!yP+OWO)M?a;1FC!L+?200}+}@(fj_wDO@B1vPKT(+?VW$w88VFj-&@`Y0 zwG03AzOpU4nP2ZsYw4*yyu=<+GK0FaKYOC!p|DKbzAMfsRMD^gbPxc*u%>)D3 zDcF|2S9(UhHOLjOo!3qGu8JE++X1C~2NzPHBkJL+_Bznqz`I>_bpVi3y=WX9cFT1m zA2uBF`mTUH{d7jFxnR9{CiSf*?B}mK7E2f`udzK>xorPOhMHP!O}x5^e$=bk(!Jbx zW7Zq>%;;|gIm{5x;3V)#c{*i*)Ft6z4fTG6n)k>lu=g}}ou*_((x*%Jau$X1S4+PV#53uo2`JjZm} zv=I{?wj$%mbw2^l><8*)-5KW*_09{+UhZB`qJ6A_gc?w49B6D zd=iVteCKcYC5SF-LDvnSo!a4C^%s*jGR7}jmNw#XCW=kBdZs6Vfpt%x&^^ulY(Ej>T)gf zp=D``kS6mjJ7S_^)@iftM>+^RNT_wPulsc@-~7}3Bjv7YM@T6|u8Sh!*qrO@{i;i5 z@yzJs^vo~LpjR=K*FI4Q6d><|H{h>?!U)|@1V{5kFv2lIwfEU0I@*Aol)@(9z##n@ zE1;#3&Coq(Jv!WH-aA+gMnViLYd$KZ4xBz3c&R0*GQa2UrTopb9Q4L-^&UKXQ-Zi> zYy0h;z`jp??9#c-*UXDUJ|Y7srOgP=To)pBmSkmq>9FrbD=rN~!d8!xJQ)gA3Jhz$ z{6K7*h2fz9z`@3~H@XpbE&!TVk7;&f-X5n+k6s((Pa0a@lQGGFSdOnS_}*#D0Z{3D3SGDCo_c(L6{OTI{feDvRvZtn|c7O1t2(>%&!U-CUB{9SnWeoo$U;t|tyd`X)5w)BMw%)vo z@=_3@SQ5$i$+)%Irdi>R)yx7x6~T{BL-XGB*Gm-LyhqAfKLAxBHH6_cIv?@0krm$bPYwq&4NU zg!K~n+gW&Z_@=le>Y+W2fJAV4!NXZ%Z!2+gdN}vd4I#<@n^h~eIi|9bNKn1;+*2|U zro*4*;uKmwhu{BC7vEpSk957ZXgfuowNQk^+a43$FJ^(NeH#k<>>bSA{Dkf8w?& z@Z17LTViRV2V&$RkLbRlP||di8}Xu~*gf+beZpk+YVE}LlKTi4CinJHXd(J0s3|8j zwS6btJyRq+3hLDZy7=S4+2Na&?^+di0A}8nY)~>wF2m8`8U-D05*|;w;O+^V>!5vG z!o4k69KRdUys1IZObq@RuB&F5wsfj%?ajw=H&^uqYhtdFN)~A3Wn&kz_|=nDDTUru z$x{lCH2&NP?h-JaJwUevMo>XeS=zdO>4N>)lssz}w8QF_cuD`j74vOgC_+B@OustB zbtN2?CQZ{DX8YB)X(SB?Z;im*siFXH^o2 z{kTbFJpQGTK|OS@bJQdGIeNR3QEm?sLU9PAZljPCzVB}M&e2X7gZyA_8sTIQB2>_r z!rFwH2)tl`iQNkPOvmruy%aa7c8+e+n}ov_+Z(+9JjnJ$GjCRr$)ZKDKW#Y;3WYhU z3~s>RqZ`P9vS9NXIOk~;bo%&`mXwt3Uz1P>mI8CZOy;dv1 zS+mF3l%wW{ZvRk)*1tGP$3@;`yOqp8BI8|p1FNoUa9AkKd(|Au@p~iqhYJjHV~npi z40z+KU4>XR+WoZ#1u!`g`n~Ph#oKb@%33sBCH?O;sKpo%aCPxU)|5EQ3Bl>+Uvisy z^Unh;u40hM8ht4^G{%FW zoe(?A(KfvQ+RI!cU(Sh8+u2qSkv?-5EK-VjPJJYQMMS-`h$RmG5x@cFA2l8Bz8(5v z!lop^UiocN_zqgz_y6^i1gDO#8n)I!QOtRn<|z+^OYN1?$~aFYS@L(SIWCQBg)ny1 zk0n&x>A-$Xa2bpRf6c#Tzm3>Zala15^dN)D=P+Ys%N>+Vu$&6r67XvEWIgQD9U~Us z;iksPPImSd?zw(66* zdM}Vy4lzmmddTCQ=!n_hG8+y#7krYMGg>kQlxqohJYhnNPM{^zx56>i7<@|DJ(nXyvv-`LKZ#OR-UPaO0Df80p5zIm+9?dZ>u zLvI1{u6cDjD{F5~K_O4+%;s+Rps{Q@ppf z3K?%Mtt80!9?*msrx>+zqj>H1dY_Wo)#qPwoZU)4WqCmBJMAJTg=ZVxmUL1EMt^PnE= z*yFDy{m+uY+g&+hL0dvfiEKxZ3Qi^UowZ!8nMvum?KRg?;bv9UA-(f`!Si@;GqRuV z;f@VUHzSJbV2FH&3_8|26ZiH|836a{I-FQ?)7DY*Qj9)?x8lOR)ER??$UW<++ZDTb zYAq;8_RI_s`p_6xRLP*Xb#+B0hfi0;RggADynaG zxyi|Lj#i@!=%=)aw~9QT-h=_Y^gCY#VJ?HIr zybzU0vXWM!iSY3^B!iDloVYEkX{zshcSbzp7L8ez zq0jdb2%n&KX9e7wO5yUsjl`)Fb%Y;mq_4G}v&KG5ct8b*!l_bB%CAURK+>O+sl#lR zp7@f_AmKD+PrtND5{x>dkbPRLTGK}(Ubi;%4Xu1}v-TN^PYNs)KJb&=!g*48Mxq7VM* z7%MxuK#HL-`sk%&vdB)j%p7;+8d76@5cvLV=6XTTqiGvg6B9;Zs)T$TQ)q9=L;{3DJ1jn{1yIKYVQ%gOn{lr^rW9!%@SdZBpeGW{P* zF6qn~2;PM>t8IB#s(_ls!1S#?-5RVvShagoX#a7B%LDIf z=n{1mLopqU~-})p3=v(FekxqYKYlQve_H?IJQ|Rux)ZJg`TXbQED5OXJJU`Nx`v|d$SA@B$ z;BjiQWBIZhGTN*8=YEs7fGLEwH~PjKG*g#?jOoZ>3ew)i?~Uitj?695*j2TeGW~3T z2dy^T<)fN=uvi4M{0)|{PH{#Nj_;))tkaQfx^lWQOC zq9FW|kR+?MdXpFRth@R0w}K-%t6dB7~0Wx8n}tLjQ+>)rziME;{_Vj`Fy4x)p*2 z`yQ*qo&m}(*h9=cK_Iicr+;OXS%p4K6KVO)iRmCdQMG1lb(W2EPZA4Lju~5RKJN;8 zbDf(p;%6k9^4VBGq1L0|%#5aaG! zwA{5Cq%dovp*avp`feJ3zX=}38!R#*w(6NxfwBmPxLND4tcyA5Xqf_CA@V2;T70-F z^WEV1RHQziCk!SPni#&aoF2da=!N15p8F@0sZbJq2v-pu25~a}U-a25uEsKHPt)M(sE{_(K;TlT;Sag*eRJmp4>F9OVXUS$@zH6;6ff}|_1*57Qg-nMk^wk}c7BgtOvC<$vbUinABQF@`nXDXR_ z8cBp9mvW^w-~=ahxcE%BQbY1m53r3J~4*?~#hnZ;8umQ*?Ff44vt z&+PQB3BSR_S5m74m+aC4dd+3zrBn5s8%%qUJTM;nSNi%w=&Nw5-bH+@nzbdQ@(OX8 zKq4b6h@jfavv}E9A8J2bVurf80XS!QA@Aw57SPC)*MLVYK6<-3^Hn2QI?P7z1-{f% z^jY_7G!>K(o`U&&j5{W5o5)m`rO(C85M(d18L>m2n2Z5Lh3^ZM$=@t$}LZZEFF z`nKW?4xiI%<<-I_@kn;=9U^gfPD#bYbDvVi41sV0 z;SojNn^~+Yg>{^nUP260+;;d57@@$QN8=d*GL6CdCV?}x{-K(~SzMfMKqnBYNfA|M zB6C$pz2m$N$%rtUF|5-Rmy0zI>GlY&PwU8krxQt{BK@1Rmh57RmMDj?<&9gK!%ZNK zuB0Ro`(&WOs&$NR52r;6P(Aje5d;W->EW7&d7Ki_a?p1ls0Nyp`^^1*Z3&}0+bsnt z@)K&;J_Hq%s|a;pENI=k-3MF{6TIShxEpnTS1z8RtKv* znvkfxcEpf_j~5U;s$ZN2L+tJJU+n9E#pgZA&1~>;4}gTYEDS*%)7Ekg0qpJj2dv@F zOY_vf)g}k5k8q>p=N@uSJ(>ORsG1Bb!J0gA1q=jQ2jLfjuBFl^9%OGQ`MG@TIl2Ic z5r>X9ql-*Rvy?0$apH&xv|Fv>eZAnMMQ3~N1utFnM$Uotu&-2$gU;dmh)>#9NzJQw zexI$@)!EWYn0tT9g4=^5>(a&-CmHnA+OfJKGM`N3EmGht}+^`bE*C$3`=JtxDVmgKm-P2Ar!ozMF4*IJoRUeqd`x zcFP^(L15sFoXt)&ExYw6ehF~VEv1Ki5pWef_=}>CdpcC%-e6_XNDR!&F_PRRfsC%w z0u9Hq$xYq)k0lxnW?iPGQ1yhxMc4A*Lv^g7oFFo&(pof*(zMP&HKypA;O%;g=Hh{U zJ?-*C(gpciPu%O2cW5MGiD-gi!BP@nJpDh`$F4DyJLCAIee04d9xR@zWl7(5mw7uD zOQsSYrkNT?p_Ip&ZN7mD3M*-kT~nAC9ZHgY<|^NPhRxiPAR{sTIXj;OS=EVf&A3}1 ze7hI&WFp!4?JXN$hM3(MdvFDoG0BW|tqnM_m#+W8IYHlt|Xilc%+-6@|j- zK9I+g$eim5fT3;vou-#CC;nCm{=9+gamH|o>s0%PG(vGmAr;634B+}bH2djf%Ti}O zMsa-mN!O62Q%4)Dx=z5Up70wsXmo{^Vpt^y=bzK1pmz}R{^9kREs6BePkU%f!C<-O zTN!I^SvHj>yKG2p&A)!4+eE%w3_^spE4fzHw^I@k4AUoCK@e?!IsV!Q@5wsoyMcGG zBANJ{9hyb+lzd`PZCVeOBN?dntGNDh8M)eNTGRaIdPnffqxaus)SEx(C;r+KSy_45 zRqkwAC{U6~=m*W2QjLtiC7AZUcMp$5i;4e)LNyvr!yA|LR2nNFyzjrl0w=%hHWii= zZ5C>@FH)IHT|uefy(bh$$vk(+nEZnsgyjy^xFp91Xlr)Dd19B=1k8TJGngyCy3}8C zt&qcr+~Pf>_~Vt@6n+A4vckt$0d zs@M!)E8jhma}zvruNzGRtK4wK?5gZlK{@=pAoq~1^in)RE+gCBHrux+OYlqoNLb0A zQwLz#s*29mF~P1BlDm~HjCfI%Ao$htF|S!kKM=D2Ay~1L!m*)pDaRZdYHlP1)@=Y2 zf03dPRKlL#?`b$PSyLH*+RZF+KVoe3KdW`3a*#%<@sYd6zinJACqyLpE55|BOi_I- zt*bCVk$FaKRQz;`531YbCQ%8WRm#2@TVII$uKTSI^N4qMmH_G;GpKZ?g0nJMRc?sC zBAwEgg)c%p3in_18^%Fi* zjJ%=ZOsdgZR%~=`$HRr6asOow*J_Y9B;(g!x&&+e2|eO!dqRX9Z)1*%qQXK->QNIG zGj9;>!_)PMQ$LIp^-gwH3Chv* zy?c4_n0)AG<18VoK+ti!drY!};Oopy%W)^sJ5$ln;0D&K5uQ z4ch=%RJDa|)v<3lPvmZN)mSD*MpIsHnO2r}SJLUn4z^=kN%fBm+vE4Vr4D<~tthAh z1gQpx>#kz{=(0B+?u?$@7UajXQJjB7^G|yNUEq~~X5O@Bekc7V#l>{;$jY0=7URGN z|Fvhi-_+q=+Enb;=4h8sJI!_#3i~UI-#j$p^q=cMLZWSl)8BWDxb2>wPI-~%@x?Ll zJm!AZpauSpTzaAnKL9X-5d^|+*BeCfF}td7cWaSgy#CAYmJ-eXn*hM;<)sLd;h_u# zB^3bZ&htK6hj>QawD;~3&^3SL*6&Sk_a`A3(Gp?l?fB9eXfL~NUqL*^Nk?vj%qu>& zSFe^>3Gr0vA0U|HPB2iCImKk4=cQi25AK$i4qH5Kd>=SP}zo7`$8{_IxhA zlIU1{Dy{o{Q{aF0*4Sw3&bqb+@|IWJ0ZXamh#;`hvD`z)&*>pSg%iZ?Bq`m5v2JoN zSq3qT3o9$_Fw1W5Vt7m0@8J0+TvN3V-*Clxnd|u;UXR5iiz&MifL^Lf&`)gtPU5)Pj!Gm1Uy?xgmom7pIz`Zh^Jt7H0FouEf zqWp)GEyWNT`fH@t@KUe(ixB-g(HFN&{a{KUm9717sS1PCcuitqi~j(@gQA)#g5BNW z`*WnCYg}1W?#0@AdBQL|;tzlAfcnz_ZM>jD(PkrK*rs;V_GGOkZ$|WU2#a;3XhR_B z8wdpK%nJQXrR|F0UO@gGJ(=?OA9iUA!|QWwE!w~YF;}qh*yJ0Gh!pM2bA99{dtCv?YAQi?X~&F0Y)$c%tb@SVvGwNc=Ff>WpKy#vanue2ZUg8t*Dnsj)KUriXRzIRw*^QE&RIRj2zQa zP=@D$J@Vu|h?bZAA?+0DF$-PtwC3q}kY(&Q-m-@T)+&+zxPr4c0nu0`s|$!RMjl}U zfmzd9F!PLpfS}TOHSMbb6DjOrD!9JXZo$vq%??ybQ)~-V}?UWQ{y)sdK~;0$2mbO|B(AqTOQ)My-}w?qNJc zw3BWFRmuwwuDDL1Z56l&xC9m{d*?>=a$JE>)aApgipAwnb#gHvx;Jyg1+{-nIHV#U(Nw@;*1;h$i5Ph zMEKLS*79_F&}D$-z;PqTCZyEU2=H=plJ%_n=ieQ?Y(wIRPw(wc<_!~_&EJJHx#64^ zipkB-@5J7td1#iYrC{aSh&osMb5qglAE-hc#t7Nd-5jKT$Zg=#Ec0~U$d4l|)_T2r zDBLB7o=GkXH3n?_9{TbHg9i${Zdq!u2s|UXRtjh*#0EB@0suj0@)Hl0^Bmoy-IuCT z8u2c0{O&qSsm3;}1uc$j3EaNSfn!-VA( zq3XUnG*QnFU~geS^N{SI!O}f8%;m52hJ&)Y*|}(nKo-G~j6)U7;I}rVt$g-zC3goF zc}F$w_?6ybMzuMoDU&MQ(Wx6O8nfS~GakZe=x%aH9mK#oMxL*BzAX5yIVq{9@s_1h zLe)I7M00gk{=+?$Zp$R2K;E?3TeEZ8aVnq~?QwaEZMcz>VyDOF;uRfo-t^*>(6D67 z=|F`RV=!ZSCAU}@hnkxp@`nT~9a;jkXD2F%dC=$H^)J(?!d@n9ANV2}CQ-KE=jqqq zGIKMXUj%hqCVX~J>DC|o^J+_kI%CPiDPP4;+5fFQ46vMidQOM?R%R z{=V_W-y98cddX}i;{k!JMWDzvXoc3(4P?4^^N40_SL6OF9)jLI7E^>|r&ENoN3oS_ zHYVq~2pbID5Qy#aFQh^jkI(jC$kbdMkE!7>L|3TMEomLYW#3X*hLiNrjy9(D!>h{2 zZvP51A2H~-Ci(++{*m3osG$+m$>08lZ@tXCc?~HJB=<`@Y>JM8_5~*I1?w_}ysEvA zSK*wDY=2w7Iip<=iTqA2?S9RppY|6MjGG1#HyTzCLQ#dVzK(o%AO8i+Ao2DyYYA?1Z24oH6&gJk(+rs9=3G=?UNiJ^5D6QCKbs0 zbYb0~{7+Vi1=i7FL}~edqUimDD2sTpUpAMS#9g_xwBpL%p{W?O$d{d%wff4O(~fH! zaNf_#i%dy8&{^`S2y;iDeo|X^fy0~_o5iQxqaEu1te0mg#}g%!+^@GvFp9TU=NS60 zauvc|18=jK8k48i{lANHPYBE-BPB-GK~VcvD_w*Gg9y^$7&+%Qq83C(&>|8wAf`XT8N-5*DWal@+m)>-Vb z2;cY8Y8;^A0Xx_M^ItsDahXFy|$a}V~{_pX%6^DSMYr8gR z>O%-L_?oHZm0(7<*QqlvjMpQD^-Cj|g*JMz=}1s5NORc`=T%Xx8?yr7?ILEK4uK93 zT0C%wSB-y{k{m%NgZZ*rW%pdUB&D2|pk&=6bpiGZ(w4nJ6VLMyrsE}AZI2LOMkd=q}DqVw~1*wOG_{Q>F z)W6wOD^6Q5Ymd>mSVu_p8GUzs_{G_d+^@TMCyi+@)Q03di^Qq7oqe4Qz28-FeR^ zKiMq3>TLSD9*F@S>ucrJqwjiPNBe@D?Grhy&4Wl*E)l`0e|wz?NwMKn_U-x>bi+JPK!s7l-=3pD1VV7i|1{?q=^ zj9e^bpkTzv$ed4VNq8QsKc+G-tf9Y_*Yx?U#(`bvmi`Ct7fEhofxkyL8@fD5RD(tM z$64-qV(3!%TG8Ee2}Fars$tbfQ!NCe23LOkQ}YSM;1e_1#}RQWhTn$x`pC zo5*!Nm7^j|;`yR0w^DdpH85+!f_B-RTV7E2gO8fiKHxxzYbAc;v%6`^ql4xj;mk}T zdNDuJHCpRUW59mS#Rf-8sY#697|Jy)+P zZr!~)ll2sWa?rE&7(`do$;;=G6CkgjKt98$gSD?Vu+-XAKy_9&Fjy>EkLD~3o-)mV zTrFo7O5Da;;oWp!yhAKWW4CdNi7TR?V7XW3+c8Of7w6m(Gx*s+3*zb zOgBHxV(rRn*0H2mh=oTDwe3p5@HIhI+kV}?(WRPZQM?Syv^IF+HJ{x*W3o=-nF@v< zhpIlz1Q%Sq-plH3?9G|Lf?AJtZ-ln*36Pg5a&(y+4}eTj9s`2vJD)-f%ug@)|GmM> zcCI?l79KX#|BVMBy7AX!K06}%u$a-wkuwThc5ZYMkl`L9M8dXuGzsoJqcL}7P0*Ll z)71-7arMKEHGbm-1UA-(#Z0{CzG-sRz>l|N{jc;>;6P`YnwIG+!`7Y5E&s;xBo2-N z;U!cB+h0j##KFJ!D>%(==DfU@dK-4Z24B@VhR}5m95%S4b5^w4Q;TZDseHI1?O&S3 zAe8%N;pU?vBL-=I^>7S~$U*AyoL77nPV-2}sG3Jm`OnX7Gf&q{ez}gFz@BOZ1ouQE zVY{cqF^l>z=Aj-?wFmMBPhb%oMPIQlLs^zW3B;y3m>ExRHrTa&IvKnJ1KXEzdcNjT zQhF&BpVw8z8F)h|`>5~U^h&KKZ{PB0SNX+}x+sgEXT%sn>V17dMI8P*?*J4Wvz9x< z-Js-mp2`PRw=sSQHbkzk_RLyYNFsV_G&@-+7Fk4)QALp}rcGTu1}4v~t=Xh1XX>Gn zdm@hRKc};I5_ld+xRO8JNY~eh>8M zuP_A@VyN$4NcH_z0Gv2CxHPeoY!vRVIdo;BXojIR2Q497xpZshtWpGu5%Oe8 zVEjuWc2;8#|Fs=JHsFZSbAS>j0{JT@RNPOEU>{eyX5+V6YbN@nE0l7mmpj zHgzEBeR)~rJMuj$YKuNUK#-11B({)Pmtx8(mu`AWJuBhRqMuKczYjUPMdYz1AkQh& zh;!Zsi;Q86GOV3c*bz|SY1g0)s8(KBUOG>+eERKs@vDsi)t<;*`$`uz2me$XPA7oP z6}ox$Z>*M1Xmn$Eb?~8OQt*zX8-6|s>5@r{ST-aJg0Ih^?tbMqY z7i*~6$&6i`)QL_cbv{LDl0-Yv#zW& zc(Bd}BCJn7#s5?d;{b+?t@3VKKhi6W;N`!u?tg0s^isNtG6QJ97*sjyk@z9so^^hA zm#XSpx@w$9@RU5DI=j6Fsv#q~0O5@bEsVBA5;&}su=noit&)Mn_q*BYpLJ8Ho&hr{ zK%-UufKha4+EDJFFX3>K3OGryNtB)IG572}z{YF0{p)<7ryP5fVv``sH7Q%jc2fPX zS(|8ee=OInei(PU*YbY?!2=8o#&c|#s?)!{GbV24J?c=d%)^wE|2ufurpjx*-A4jE zNVbW5CQ2>(GnctRfq6|Gni!{%y-A`welW~n6D0EKPoi9D3h&ZER|VckTB(?2mM(OC z*P-ftFSFq10J@;|XA)C#;tlb*B$@xR8uP->13Q#oE$g1f9%{^S)tZ=`(1IEqMnH)z zuB3x^SF($VPxn8UQD4a4EY|nr=9UbyIaRvslH1ZRC<~yq6^r7cS&JhmkW19yWfPd zbF72itW$A#l(DsK18#xK-*Mwis;g%;L%~VirT6)kl%0S4{eQmxO)-{=v?7M&0*p7T6$uJkwX4IEN?M!>ajI zS36?*4nM8Y=yTheu2{EUYp;={tW zaG%;iVGc&`xUuI(=tAE{EkWERaf)KMei*9tuR^2$4P-t}N5 zLUA_S*=Lb#04-$(wcdgW$IimSN~)F@!}f$|ui1CV z6avKKkJXRs3?L7q>x6`I;;v~XZx(11ugt<{7Y0!7{Z6Hw+pDq4M1?n4WH$Xw*Rl?RF~vC&KEnlG?0W2T}1+ab6p@d)x3Tq*}FV~ z@-f%&^*ye#kI<5rvn=coSA>lPzZo@-eo_JqcH5E(vA9Zu)TB``gHRSsVv+HTq=a!g z&uKgU#M+2jpz4nZfk7b*vORvMKqx$eSHH=-5U2+TWrc+*^fLM2uw373gSwf`GPk6b zGEbw`FH;W{(mrxXW?)fF5=3%SB50$~feK$8^sMi}&jmjWUL*;}B&h|Xu{iri&?9WE zA*i=tDEKt&GjXI#`y*gFdsF-+Wa0ftpdd1Bp~%sZD3Zt!?|k{91-hkd^Ex~%0`W%B zcm+9Zv<}hYj~;5@)OzH`I5LnMuFw;mQXL-WZ$p7idLyKxJ(xm< zg@11&IM|*0eJYq|F4CTqy4f}C<@z`~3;9PT5e29vR9dL4dgs_?T1ywWoig#GJ<|fA zDKsDh3y4Mq&Q0&xsg2}cBEIPe`n1*4HiG#yw(ZZrSx1AUOouea!wV-@z6}pZE;v_3 zZ`=G(x^|*9t>?%Urj%CDd6C#`i!)L$k{>TWjiv)$6hTq~x*}iQ#oOZMq^C?_tV}IZ z_U%jWcQ3%Hc8C{H;gvxhs{j|8Mu3yCG5mGu;4cI_uVOEOO#k9hDD&UU9z7U&W>0YL z*+f_@L-4+;K6YkGL>*H>e=YeulT0UfDkUsFFfz~Aicp0NFkN}!tIX;Mm~^Kp{4q=$ zpqmf+awUtAM7=s~6Z&(uxKC^%rC<4>fU04E9MW0;=`ze{Xs&?z)OpFlBf#GnYO(x1 za|d9Rgs7+~F74em&d+yUry>;*1@r`%x991nJDnznIWxLNN)hp;+b0{qGV;2R8Xxx) zvc6Tr4k!5Y%%iYnortzwQMy+C>jf5f~g~LcZf<# z(&bDLugazQV?(6BN3UDT&Axf;$=TvDNbwl%>~=VeJMxW^QpI&=~vNcr-Hi#4N z=8Yy>k4|6kCFA0K8_o-y?%sWqo2+-quK|A4rMiclQuimcUxz|WKZsnB@Uz;(X^YF@SN`pz z7+a$QB^423rsPW4 zT-&fKAvrc8#%5c&XSO-F*067X!~2K#`|*0cp078u#8qu&=jDb|j*%Ctr_no?(Eqiv zjDLPz?WLU}<5NBrS{L2!j~QS`%0*)Z-sLO86Ab8lo))(-R$b)w0!o!;th{m0ZH>tar!y)63)qEjB zjpZHW;#`jx4rA6{07Thpzxv*yt~~a5g<}ZQ@X(x*$Gw(38D<4CDRg{-X%vUUjlfy@ z1k|S@H+T^v#p@%C0FR02HqE0%{PKz@4|?IMy43$OVT?l)Owt`vy?NL7YN;EWYFLG=Aqzc z$t!R4zp{hptp(2mWA&Kh#-3g z=ob;M1RFi>s0bU~Qy$4kuI9^ zwkcT(!^C!M)migw55EMnl#=^-!MPq-vi_54LxaLPYOq;YXaSNvt+N3*$Y-UOdorn- zUs$0B$!=(DsjeGJub>B)O#11_0pO~E>+8$`-?13_k>6c-*PAMS9{Z;;H_Wjr{Xfng z`)l>Ksg2|p08heDFW!@>qTG%tBG*eFq5jR= zB@zw;JRxT}RyL>(Kqd$bU-JpEqywEF@xiRLcma&Pb0sv;Y^`j7sLMHk@<Y~eRk>NDuQFUXT!0h{;gTAKhj3-TVo1(G#x_d(NL+Te2md<}Ggzu>SN zE1B@^exxkOF_ihlue`TJu?y}QHI={*K*MB<{f@FZ5_%z-5~CZ?&irR|EAsRiKi zx(q|fecJT;n@AE;YhwSu8FYm@qAd6}@ofQ>`V-V^xjjVxkgr~!?~u{a_!-EYw}g68 zGpI=joG!x$4=g&WN(OVFuhhIm*WugFIf1E?!YvrDo#3$kNqDI)U3(9fXPz8KkMZlc z<&v?cTr?R}-|58qco8?&R13|>|C<2(J0d;!w>J17csdTg$|SkjUe-phu9;^YArb{E z7u+Li)~j`;mez&0ACGmyw@l}IOXUxZ_HH6)Z3=^TFhToNEonf9)vcZ15(Eedy4tmh z`kw{m3*-a$z+$emeM~$5BXb7wcQEo`<#x4CXo}>Qr`zL$Cps4qoK$UnXeYNb;PWL0%I(#O%dsLyg`fQ>$1(Z&{g&%#ytfK?S|%;-!v5mM4s93a<&>wX$Zx2y-b%ocnk*G)Joq38$4+ zxjT)2`56Vpy%p;{C&r|udxyb#`O%-u&WaurrVm}C8JaU{FODA`Js}bprQfZ9{bm6paU>IMmgh&^ym- zCCEp{95buNkEoc?+D9r?x1GN34?w_%Pws!>@fU&LJGi=LeJ?b7`cl~Rc#Es7TVnKZ zTGrwSuiu&W0QW7bmjh;7#R+BY5H1*2{bmxaSN)faq5OJNa0jwt?e{lJW+TNL!;D_bE2;;jIFQyoZ{T$jp>U>)JV z**AAUg-_uYaI?+h|Ka4i%YU&D%u~)`s$aeY+DDadB;X-SVosr-dZLt;-=Slh~b;eG@VZO^Q7zdJXQR0ql}k(V`gQ}&V9*R6h*EGmF6 zHB+xTh96&LwVld={tpy6AcN3%aYSifUh4g&2J!HCMbw@CJ+&4vL6JzzOUi$ruSzvZ z?9|dis{P^pW?;3C%#hOwWfi9d`h?THU ze4iHmQ6R*PZf`jR3@;umca{blmUORgkAyulPp2gt7A+8IuRawnpGsa$nEbp^l3bld zB_$QYEI4@yD?(i|mO_Pz@!C`Fb>J}4`8}hY2Ndb2RwE%t!9=>&Y2wJXGaI&!2N3kt zLLSHwZcRiVgZrOz973_=Q{O>;`Z8I3mh;{L)|JM*oU7)VQ71CFy~ItM_isW+%7@B0 z4Ps*cOdQv~gKgp~(#d7;!x7y#XV}#uuMp~bCDBLB+#Gii1d6_w)7<@|J6$hokWZ3- zb3Lfy_A3xxykCa%O*QK@Oqu)VWGA_qo^e<(9IhoEo(xZrmp;?J|LGkVNx_|WE4?x> zpvpuZMZi-2l8OZl`L_k$P=7-iO%9C>>V0r~bRV#0X#Q3#?ip2e*-Eyared92rrwUS zjMOTdzEgAV;@J$Cu2&;JB1xzdH5Q~B_IaN;G7(Et5n>e11!NU;d1q3avp9OwB#cNx^oi#`Vpug07P=UDsm!5-Wvj8dzod+5-!r-X?25XqT^ro8EXQJ z*A}>o*8c_T_v%BFe>pN=AlhAf|4ZB?)K}I5a?bu!h zz0QU1z^l`AAK8LT`K6hWrn_P}kSb7jrP!z62 z{(%FK#AImn1>UZGAoMufr1}N-ndNV0}u$B3#N~3@pZ31{&dFUvZ+N)-G zcH7aj$BN6^3$$HW*mTa#4O%={c4I?D(himAvUigo#2~y}jr=1TtS++T5U9Q^(w|67 z-qyX(A+qk5V?Yzm3PuL+BSzfXvkx*#K0{CKh|aqH;rLB8Mk2;yG`pI}0RuO-DKw~H zBl=dlTm}QO0JliS_Oq^4gdPP?B35h$aSpf~3k?T^?P+*uTu=C`?!!*wF-`s?< z%3PDm?60f>=TzDu{XkFk?H+cR9({LlyW$th=jE z@iRW9s^eC@Su6|5!@z>DN(SDVs(KxV!;Z%mkF*w{SO%|9g@`M&|1CP) zxau-_vNQ96U!|EV;$vVWw-cFivIV^qGTWaMcFe(ejb0+$oLyk7X` zYRJCd3gBI1x$HlLW+^yy#{ZtWfxx37W9QQNo-5xDg&FO4oC_lC$C_BDT|@{E=4*iH zdYm`>evS}u7A7#AbVUk7fYX#B&JhUNt0p3uhhmzUeq{gf; zw}=i=-oB+GnO{ldp?FwGY zF(iDunf$}Vn&83?j=$;6f!Xh4tH=1RC8xF2d6VWD)gtg24YJn^V^e?|$v43zVMM2B zLL&US9yT4@QGQ!!32_qJp>Ubb$sw#@*>60jCs*g@ytf=53_J3Z=OZDA#($*!K%T6% z&Z0Xh(L`zo+;xh09w8?v6Dm7i^bv2F!f3MWN_NBl5b){4;4R+a2tOSvvO9bEujB;i z&plG2=#>JON%Vjr<~RN;eByPR0GZogkKfj8;ZLghkK271V3OuUt+1G$srU|#**TW^ z!uG_ADE|$c=LT<8#&-kknQXXS_UZG|qHN#2=QQHT`p+Ff? zTT|C^Ub25H|A%5FN0*gwgs|X2$=Yo!+m_19O^&)3KflEHfinpAvG4d!p84k6=bu_V z*WkNmzxcNmA>rC#o#<dC|#*5w2=mDY0$n=3fQv?lV4xVm6`tRB-;|`aZJRN%I zsGfcFG;Z7U#^ui~@9_ugvqfAs)cV~ThbS6$w}Ijk*O>hZzv|AMA+n>?_cO5Pm?{fU57BL;LC=3Oc z{>UHeCyHduDn+x^3wKioUy*;Eqyxz2vCuhCJ*KWAr_@v1>3W0POuU(a%U@bgcJ!M{ zXT%z&O{RO3UJIEXpuPDTDOqW#YnkgMoqsl+B-GVTjbTjX`e`LPmLKY*5ZxN9VC0m^ z2szBSs5(miM^}~;r{V&xjfDuWT^`OjVkk@r9%yn^Le34TTJ#T8q`{Va(9F}|DGKqx zW4gTTv)KDrH{M1nxW<%j8|k=!+z1ZAOe7yt?vb^0Q(zwwiwZuVKqiWOb{=kE84`tI zhCQU zQe`?~Jjom+DYso^T9Sx(U!7*B;%b<#gpD?#zd1=h*`5~;M54P5+3eXgo9!Wb+NI(u z-!~EYNjTBknz%^rgvdQ#e1Ei$vp}lyK7&5(6rwy`7+cs7Oc5%7# zW5G?f10Ra-pUwzeqqye)WqbI;!HJt*I&c$%j@_!v>=#Q4K!Ynak8 zR#IidX)ZbpswvJnaQI%3h;*UDC!pmKUN@4FX#5^j-gZgo4xbOHI=3-IdoMNC70j)B2KuNDDMRzv zNk#PxD`qg_S>LL}dT>VzEj+lsqM#5CNMT$^)eoV`ZKbDjXtFtjncDWN^G(-6PjGNl)covv(i(@x50HaM!E{u9D%NO|Te>v56J zE_f}>Jm-Vh%lLnQ=0J-J*|$mw;{f;{@_u?rol(uW&1=scLRx7R#0S;6|WpNA)uFEj-0gce|{rYu!%R4Wzw|8RK6PY;vxL zrQfYBIezn8JnuMnSQR_k65VIGdNzIy^Di6~{vgI%BEKspTVwfO4lx1Z&dMx0iGYzne>@lJmfsp= z5`Lc|qoNt%F$Rq?wfIsnu>ZiBI$!2w`44=MnZ&jJHCu4F^PR5Amxn}m`$f6zU6bcd z!GVrkW2gIFrW$ZQRS_J0`-5$urtz&S1J}ME)=8<~cxA*7sftxTalO`OMktQjiY;e^ zFHGGRuIJiYA;d(UTbVsF>b%mgyMq(XPhcXG=6&6{xH zh!33RLmW++b@T}@f=yU2pU|f}L~*y*#r)2SH;r*1wVxxj}OKmsWEx^0=p;M`HS%-yjp}6@A zwO7O?{4WyN!zZbqE&+3&s*qw|n=EuOmsY}6Ot;@f7W~6dV<`8ozEsc-xnY|bszG3- z;6jG{B3VQPxcGWTtbzWVqDlFE_%o!@QuLtBSnXpMRhjtQfuN)gHqPryiG=+T$koiw z-Cwhpuap`+&K_Lyk9gGvX7A3_YEz>=8K7@Ty<{5ScF06^cz$ROV&)eU)GD1PC2qTm zc~1V|z(F+GQf=Vil{ZJj;yuDmN0ZGYlFDRbu1*(ZJ=?+SD@U@l>!b95bj$nW<=`+? z%hC|EqwINn(@B-@woyl$TCXGI&X?2j)l!yUZnI6IUNpLIiZ=BW&Ze0?ZI{gysr2}a z_`StNH{VdF$MqAUTUET4=0v?OlA8GSt+H0)=IMv4$V!i!enetdY=mBe(l_Y`jkg?N zy^)S5wx;cPpT@G@IzR05U<&etK|^B`UM9O-elPg+R0Uh$uV|c`ms!0mOz8FT0||dt z4O%K@^i0Kh+Qp+KOYa{;C}%GOKa`hl5je?LRc4+KBF&*4c%AAKNq+!tOUzj#9ix#+ zdgYn_W|J#?&--9~&pnXGUMUH*JWiJ(Vsj)Y8@Z!_RE!wfm{9Z4NGTFW-@#S)0c9qMDYpdB2mrXJ~fc zPv#5{{f#9*Ew!6UGo#qSJ)(`>-Pmrx&I6cR#EO{QD%g$+B~PvMlh-p3>2s6I@O4Qv zq}kFC$X57OocJ#q_R(rN&b`m{Er8z-CBI14RbIDfRu})GL#s#k^|mLxPtB>ZxbRBb z+kZhge3W5H_@T9o8p5&l&5(k>`#@@TW&`f|#O=B*E5nw_G#@RGN`qwnUM8_pgqvKr zgj`SjrxH&KD@2r&H%jdAph1jkeRJKY@^hjcA7?aFHpjj;4f>j`LNKk=5#NQ(_6lmB1JgIPuv%T&36nHCVp!(xz*Ow?G?w=)Ei=O{aQY3dg-yCT z#~swkm`QV`Er2=`V3k!UrW`|Ng6^z@@5eOUTP!Yv^{=fXX&V;G?mNtR2AQ1(h@2`$9_#R6u4OhlnxHGzxXg-?QYbp;k zTY(YTnw$aK-frB@g9vxj<=&qJgK99;ZAPOl%J-wklN8pX?$T?4k|%u-$Q0wTaz4q~W~Vd!M{K*e)bF;fSF`I?a{RdW$S zMTQTyEUO!QHxOplfK`{kroc}CFY7HvVWz#YOm9ihPK6g&qBZzF2GaZGf`@bKZ^h>u znU!GeW%7YYuLi~^gJ^Ji@jr+u;qhf`9p^11>-Kzd&W-Wk-*jnk?v8h;r=R_+U|Y2B z-+SfRBa$v~_Vzy!*i&tdSc>VyACt*S>USRk=W+%s+S?P$3+8Of(HTUsB2M~_os8=5zMxRP4Dr%@RHWdiG$G*p;XZ3lJo%Y> zQ^7dp*scf*AJe16&0J?e9#U#}+{;Um*2ykS`bi8!R73XmaA5nG;=bP^Sczm1^y@Vh zHuck?V1WLBr!bsV2nb9&F$$>mUd`2Rx=#l6PHmXF@=13>LNJzC`^VS*F(Idq#>9aC zw!i9jyncObYIbI-Io@DpD!{Vzhl6z|ynMy^6L4Va_T~ckB=!B!gMysWHL_)dGFJVy zFEMn(RV$ra3kTEb%S>V!AZMYJHge3<$LQwM4N{TZSC&Tt?}hpx+D-p1Zo()SEe0Hc z%vVjW&?n0{CYv#v!hVwmw7KUehbLMITUB>iEF7<-Du-ZAxz8~I-ixTVkZ z7kiM9vn*6K;P}L-0cp1;%ff%#g34DVxxSidv3^~YLKt~zHpNGD%;t!W`15rveGrdU zEr&7KFNsDs2H7(Ofcb69>#mEk#I;1Zd`rujjjgA5ZmKdT=jfW2u5;5BIStBg3WlY U`K5o~IsRvV)%gm>_U@Da1L(V|nAum2Gp^w9i{ReeLcU z>-NmvxPSh(qw}{PU$Fhy!X3vK?mW3@*Qq6Y&Met`=Kufyx~DsD1I=M93GxeOaCmkj z4a7Eu%N9}Ei0Pi8z?sb^u{aLk;+U7y1)S7-CRAJv{`lGSo=FD%KL s?qwVr8*kEU_eJ&Wx)1RgmQ(LBc5|wJmD6jV2eg#I)78&qol`;+0Ah%AF8}}l literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/bg-rubrique.png b/htdocs/theme/md_dev/img/bg-rubrique.png new file mode 100644 index 0000000000000000000000000000000000000000..0eb3cc2603cdde831a7384a8330ddedd9c76e105 GIT binary patch literal 89 zcmeAS@N?(olHy`uVBq!ia0vp^TY#96gAGWQpKAF6q!c_|978mMlUK~!_2vKi`2B7l nHRMDjrpR$J%FD~M#Yixer>*YV*-#S;RLkJ$>gTe~DWM4f&A}Lq literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/bg-titre-rubrique.png b/htdocs/theme/md_dev/img/bg-titre-rubrique.png new file mode 100644 index 0000000000000000000000000000000000000000..17b35d88823569c82695eb73b99f620d98e2a667 GIT binary patch literal 374 zcmV-+0g3*JP)!KKRENmoaw2yyQ|a{V}+u^WohY&nwqKI7~hY@|0s zoh{b%R&s9m$+_hx=Z>G8dwy~r_{n+XC+CTuoM(P=Uiis*#S6pRcEOce~xtxPPej13gD4GawoY*_vY0d=yMc>21sU*(b)Fl77x zwQ?~~h_k>WvY3H^>jMZgI;}C80Tg6Ocl32+VA$Bt{U?zX$d~bSaSW-rmHgxE7kM7Z n8UGwV)@yWf{cn62&%wsv$S=;981ljhsE)zY)z4*}Q$iB}dh9hc literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/button_edit.png b/htdocs/theme/md_dev/img/button_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..894b4cfd78e0b5ad8a07621669fb204881b9c1e5 GIT binary patch literal 961 zcmV;y13vtTP)|u>foH*lbiu{b!+2f9$koMCAjr(w z$<5ly&f3b)+sx41&9Sh}&)Ch;-OpMZ&(PY>(b~_`-q6z9(bL@0Z9vkDY0}Tr($?V9 z)!oz8-qY6K)7IkD*51_DZ-R9hK zD%{`c-gqnC(bV4B-`?Qp--#jLnPA`I>)_(*;N$DyG9~UIOyu}>bQ~W?epvH^zHBV?(p~UvQF^v`0(=h@xzYs z)VuNX`0{29^08m@_4)P6iS^N}_4oSr`1<#?9{0Bh_r`$t>D>4D`}leq_`(7B#sK)q ziTKNL_|~=f`TP07Ir-9{`TG3&&H(%T{rvXs{oY0W;xGOF{{D0h{(u$!hz0(QFaD4S z{*xsBlP~_B0REl<{+|{8p$h(@0RE*m{-s6!rvm<`1^%lF{;(weu@U~V3;wkj{ef9%LD$)PX5bb{?9M|(NX@?TK?4#{?<|c*h&7| z0RG%1{@(!p;imrL2ma!B{^uJ0=RyAG$^P$R|NsA9tKL8W000kkQchC<0|f{R5EB*` z89-ohHWEP%k;24I6Mw=_ z@++*3C5fRlYDIF5ogp?t0T>bC4t8&5$M?c|0vCDcx5DQ#1H!X+Fg@zKz1JI8KYTm~ z32^;ybN}gnT@OG6o-d7?d#Cwww*V2K%`fI**jol7z~y8X^8T-W0wN$?yqtydX=SB? z2qSb7LKaN-ChjodN631NI`WM5|=KSD9g(k7YSq@=m{&Uuc42B5$rv3hH zwWJUml)g*g*zWtgK*+h0z?ZM1H5u*l!2%Mfajjr{=SB%2(evnGF`VCydFX+}E#5e- jWl~D05lExA008hGX5N1JoV$=|00000NkvXXu0mjfh{hve literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/calc.png b/htdocs/theme/md_dev/img/calc.png new file mode 100644 index 0000000000000000000000000000000000000000..5e6471408d875064b8a38104922f6b70e67287f7 GIT binary patch literal 734 zcmV<40wMj0P)XxSK zX6?K&e2+J6Q<7zm)GeFm?gca z0F0)v*5Mp9>IN?kh^R%Dbo@K-ExuvjZt=8ed((>YbMse?6Q@e?q^V$&gea&n><>5| z8|ITa<7a!ELB2#*suQ3|zvbl4e$E%+q;RSg9z!`0_ zih+nTrFDphH+R;#d?hAO!n?OFaW+0e)izip9xsA6+EoBis23uhJQLD+iFHjzN2fge z@erZGv)}e8t-=`N75M5G#2Ks*1cuRz1@>^p#v48IWJFkt*ywhdOkpk#rM3Le4M*T+iOJ2hJ(LOxY)bEZvTksSskw%Xsx_b%2f@l1cFn}c?Jg)RIq}$I!_)AXm>gc z5BexKW2-sOt!5o-(Fkm+zrC;4{K%S-1!Fl15X1~N$F|M QEC2ui07*qoM6N<$f(RT|lK=n! literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/calendar.png b/htdocs/theme/md_dev/img/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..bbe6c27f041005fec8f47099cdfc7ebb1053af89 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF-L1;Fyx1l&avFo0y&&l$w}QS$Hzl2B=6bz$e6Yj$!i5ng7$$&KMidOiN1x z3eTK5^URqu|Ns97vEQ<#04c7LAirRs2m~-}I-_$QDC*m6etrEsGhoSd$f&1eESHS~9)aVU~6?Hw(kkO9vFD hCT3}{7@TQgVz@7DWWGTr!y0HVgQu&X%Q~loCIG~bR}%mL literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/call.png b/htdocs/theme/md_dev/img/call.png new file mode 100644 index 0000000000000000000000000000000000000000..ddfc1b7bd905e5d43d62734cff1a7d2138687db4 GIT binary patch literal 286 zcmV+(0pb3MP)i0000OP)t-s|Ns9f zmllk?gk-K)K%X$9#hu5}#sB~RO`4n(00001bW%=J06^y0W&i*Hv`IukR0!8S%rQ@c zP#8wxBPDd@1Dd-QD{;jTy(=}bti{H3zIEtYdI|5}cTvy&99A&iShpmID_Ol|?QUc( z`0~g}J^O3UDgy8KT}!I!ZQ^ShG?Rvn8pygWkaS1LhD(4{=5l;2eS@34BCeJqgLyTi zd#4cg>h<&G10Wm}%^pig3N2>l=bi_z(azFRFrF9NNK!}e(FRFNK~l_S&(hq( krG6@ literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/call_out.png b/htdocs/theme/md_dev/img/call_out.png new file mode 100644 index 0000000000000000000000000000000000000000..b5a22eb827b46edf53625bcd7a82a1db04ae3485 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzs&H|6fVg?3oArNM~bhqvgP>{XE z)7O>#3JV9HqIkjF<1>Il5&=FTu0T3HJ-w`~tgo+c`SRu4wrx9m_U!-v|6Oaki-2;B zB|(0{3=Yq3q=7g|-tI2!Vu>BEft>lCE{-7_*M0lXayK~$99fHYO(b_NO)}1*%+uX%v?^aRWD!1p=`}nu`X2-{UR^DKJ;z&%^gUks{ zH$}~ZHde6pS>KZQVr+eebL||HJ6%6!%nB>g4Pg5+hh@uwnP->Z+L`HiX5HEDuL?}; zqWx#Ka@1(n78o2hebvo<=Gg?s?ue*K6T4RB-}|p$SHM%&9FuVNq2sSKX3elF{r G5}E)rk9xHL literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/close.png b/htdocs/theme/md_dev/img/close.png new file mode 100644 index 0000000000000000000000000000000000000000..ec4338e8bca2ad6905cee379100a8b0becfa5c9d GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~jKx9jP7LeL$-D$|I14-?iy0WW zg+Z8+Vb&Z8pdfpRr>`sf9cDpZZRUqP%yB>=-2k5u*9j9Q{Qv(SND>1Q&YblEYUC>k z@(Tu9%EZjV%ErOT#UmnV`TC3^P=+zd+ueonKa=h~ASd3_#W95Ada^(Q1EU+;vEbEW zPu2+~y+{)g5t%aU&;f2PY<8T@`xzsDz6okAy^sBxB$|;k(yA$2|pF#o+1c=d#Wzp$Pzd CFk~nI literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/close_title.png b/htdocs/theme/md_dev/img/close_title.png new file mode 100644 index 0000000000000000000000000000000000000000..bebb74d98611e818118d81d55d5dfc5eb62f15cb GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCj01c^TqjJJ@c;jRAW0AabpX`> z6*G2wc!SI;3GxeOU|?ioW?^OH;N;>Fk+gh$MiD3z=jq}Y!f`#e&ynwt0}pe$*KS?5 zDS!TNmDwgLTHN*Kh+&cQhq)>}{*MlQJT%!Rd;#~tb(QArnoPG+r_VB8xBE%a!qqIy zPqzONpL%f8?Zu3i>!dbp=9>A2@6H3p1DhU-hp908`MOQ81=_^m>FVdQ&MBb@0C+cC ALjV8( literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/delete.png b/htdocs/theme/md_dev/img/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..8ad73597be74e4690e6a5b354ceb560c5542ab0b GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^d?3sLBp9rei+F()Q%R6tFvI`oiAr06yk<`q#}E!# z)`N;s%!VRt2X58~MvBW+v*_@tY%141&JfP&u95fn-uqK$zMc4W(rWVb(+k!cR|mxJ z^m$tzFB)-O`mf#b8~&o4w%=oy2BluOzi)Zy>p#)*>$g1q`B&nYoy=r2mSb}+tZ)&! zpu&2Rw^#Ima4(nE#@t;xldeSO+&+AnL+J;5+70jW&LcYOL5}ov^>bP0l+XkKHit`# literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/detail.png b/htdocs/theme/md_dev/img/detail.png new file mode 100644 index 0000000000000000000000000000000000000000..05562bef842a0baafa8813f528fe2c5012d6fd94 GIT binary patch literal 589 zcmV-T0wRYO-ohip7(X ze=8`hu5U?zBmvU!)LO(Wl_^}9aQtAcuZSru{-Def(a4sqU`Mi#Eag){GC46aviG2<0j)vW{ z%E57lhF3%X!h!KQ1)yLQae7yRg9BE+E<%wOw`?WnSwJoxE*d(t1Qiuo5gW_qMLk!sLB9=US b1W11Xqa0`;be&vu00000NkvXXu0mjfwBr_V literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/disable.png b/htdocs/theme/md_dev/img/disable.png new file mode 100644 index 0000000000000000000000000000000000000000..f8c84994d473348e27391c7095c451fdfac9e0fb GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCTmyVUT>t<7A5^?{&enU+-+#Y$ z@BKL-y7vCqwfB3^J#S%Pc>n(U`|9j-PKK62#rK|n|9|Y5SN2k`mdKI;Vst0EA$6kN^Mx literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/edit.png b/htdocs/theme/md_dev/img/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..4e916fe1fb095017458fcdd1093c1efb8cc8afca GIT binary patch literal 818 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>a4GV=%;&YExV7AVA7 z;1OBOz`*qZgc+UIn9KkQvZOouIx;Y9?C1WI$jZRL*c{*!;ws9^Atk^mDJ~)_Dj+7O zsU|CJpr@&B=3yC7=3!@E7o;EN?HCdoUJ~VA9PN{kkdU69?w#D@m%A{yctuXz#;opx z4Z-@2AqEX0#?xwY*OY~Bu5{R3<+Q8LxvQyiPpk9ZR+qgkZu?uj_ILQ~@AX;Kl)Jb& zXH{$Z>b8tEz2)0m^0xHVZt1T-(CK@i%fG#?rMYiGOaH?5iHlk%E$g1Tq;LAtsSCEu zS+a52%Jti}ZJ)L2_L2=pSM9yKW8cZ`hp+89a&gCzn>$ZE+kN`k-qTO^oq4|R?DK<5 zr(9mz^XT;2C&#uvKC|KR*$t1+1JS1I7p@#U|Ki|<7e_C>I(GT>u`91nUVC%;`kS*i zUY)u5_WZ4P=WoBebm#r0yYH{ueSh!X(;E-o-+uV!)}!~=AAGp+@Z;^rpYA>V{N~2V zw|CAwzkBV)qlXV)e0lux%i~vHp1k_{?Df}YZ@#{K`|ahsZ?E2cfA#+R>kmKPe*E$7 z)6Xw&AAfoG@WbbyAHV$i{PowDZ@<6&`2F+epP#?}{QCX(|NsB|svmCvqo=VX$S)Yk z9ZBM7ypktPLx;Tb#Tu;u(*wDoEkgYVIO=0`KT}tXUM^3q&brwIfcGZbq4#B{$ zSA!XfwY9mD4w=+W6-{xtbL&*sAq#VTS5`?wf$hsSEz($gCf0LSx8RYrdS}mTeZMkk zQbHa>p||&@KU;p@sE}znc&Dq0#nO+lI^A87!~FE5lh@AOIx~a$jBe-k?FOcXMkWmf z-IIkDJ2x}O%vGrRJV|J=Q}dr#nS(KjEEx<8C2Opk4=Sa713H+&)78&qol`;+02Orb Ay#N3J literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/edit_add.png b/htdocs/theme/md_dev/img/edit_add.png new file mode 100644 index 0000000000000000000000000000000000000000..ae205e9d77050e9de7990790a6328bb58b008ad7 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=%3?!FCJ6-`&>?NMQuIyKMSVXkt-|s8^4;11o z@Q5sCVBq=y!i-L9OlANDS<)SS9T^xl_H+M9WCik70(?STfiwdL2nYyB0D&b4I9WP@ zffoq;|Np;V+Ho~d8Ba-&Uoemh0}Mj<&z%E`D|@;)hHzX@zOlEu{M);`JPxa*#kcC} k)>cMI#i=^1l5%2XWMJB4D7$wV=Qfaap00i_>zopr0O{62WB>pF literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/edit_remove.png b/htdocs/theme/md_dev/img/edit_remove.png new file mode 100644 index 0000000000000000000000000000000000000000..bc4bdb360faaf5046d321966748582f0d44e9551 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=%3?!FCJ6-`&`~f~8u9hI+Wa$I~|NsAwewbtg zlwvIj@(TuX|1yM~K^3K%?H L{an^LB{Ts5Ee|4s literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/editdelete.png b/htdocs/theme/md_dev/img/editdelete.png new file mode 100644 index 0000000000000000000000000000000000000000..f8c84994d473348e27391c7095c451fdfac9e0fb GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCTmyVUT>t<7A5^?{&enU+-+#Y$ z@BKL-y7vCqwfB3^J#S%Pc>n(U`|9j-PKK62#rK|n|9|Y5SN2k`mdKI;Vst0EA$6kN^Mx literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/error.png b/htdocs/theme/md_dev/img/error.png new file mode 100644 index 0000000000000000000000000000000000000000..f41dd8a3bc02959bdf97c4334d9df8eb5b3209d7 GIT binary patch literal 489 zcmVPx#?NCfqMdcnttpFfd_QR%cjO@G~>&H8$!tHtRMv={Ps- zKR)V0K<-RU?M_H?Z*A{SP4!Pt^H5OlS5Wd+Qtnty@mNyvTu_31dhlRZ!)B^sueV!oK>pvHQ5P`N6;N z&C2l3%Kg{W@88?@-rMis-0$Px@8sb6GbaG_3rHY^z#IstXTj600DGTPE!Ct z=GbNc0004EOGiWihy@);00009a7bBm000W`000W`0Ya=am;e9(2XskIMF-am0uKZV zBlF0b0001JNklDR+_rF92*d*T)HS;g%%s|0EQvrejC=G$_Mopky_Bj+lv(H6rYcazSbIY&K$) zuN9+GCPKMPj0%}6)N&W7O=|jiJmYdc|nupi<)FlR403*E=7Xc6fe}Jdcv6Mjha*+7}LB^o92r>X+Ee= zXE}Wi4C?|>pTW9}xoBAL2jhky?Az$a#vl7L1K0$@oIMW>SyHzB(UctsQ%(??bLK1`vvA0ejU!bV=-!=&W5!$@HRj{!UIluZigDajiWBBi95 z<7A5ppSM=vivyK7)mDkqZEBo8sKyyKU$$#;rd@}#9a^00)S=g^!+EP7UmY^w>#izX z?5;&`cRjxO)P%mCR$MuG5Z6w1;M%z(=s*7n2CtmO;MHCXes=*w{TFbf|00Hd_!dJy z_TiVG`Y=p$3B%Vf;n(YzF*?BZz-5fE86LQb(ZTO=YvgC#8ohx#H%D;y_D$UT{Wk91 zy~E}=Jh=Y{9{hP9e?5GNv9U3XkB>j;wfw*TkNg8qIpAprJmY|89q=6Cy><;_*{qbb zqz|1Y@Q$C)6Pbby<0@KvGA8oYb~+OqNN88nvIzTDyvTcJ=Sjpy61oUlf?yGnU*clY z6e5fJs7Ib%kaIERO(L6wUS{`##Waxoy<%kms-OsuTOq?PC38P z^a2?dViR>$Z`i_XW&FbXWZa3(R8>!-5XgNx1qqQyRn6NJUTvn7Pr-{Q;9f-Gtwu^) zDfkeD)YOW3q9ClN;7e?ws?N<8-YMZehRi%-8&x&4-}UtH-^sPvm5d*;ox1(13Uvdw zg0O2YnfXMKy|r(PS;~!+P}uuN+ajcLAzermKkhBUx&>S;3?Y<{``yutcpnn7nAq_T rUtby*#9Q0Bl!#1BAmU@g1A>?Ej-SgN5bA)H4*0+UVGj7WKQn&=2N5!r literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/file.png b/htdocs/theme/md_dev/img/file.png new file mode 100644 index 0000000000000000000000000000000000000000..73c66e9b2b33cb54953d608d06896218ebe6dc44 GIT binary patch literal 505 zcmVcs?$o~S)xOTo&eh4l*U!n`-rn%p z#qit5@!H4n+sE?V%i`eP=iu4$;Lq~l(DUKZ^yAg^gxCF;rHy~`0V2N?c@3G=K1gE`tj=e@$35X?E3TU`t$Aj_3!re_51em`}Xqt z_w)St_5Atu{rma;{QLa;{Qmv?{{8*_{{H{|{{R2~F46lN00003bW%=J|Nj8j$_+sP z004bSL_t&t*JEH}QUn4ne-0)PU;uLc{ryc@Abcp-i&f5_g8|O`1p5#;CPhHx3+fQbnJkq;FBHu+v{00000NkvXXu0mjf4ImsM literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/filenew.png b/htdocs/theme/md_dev/img/filenew.png new file mode 100644 index 0000000000000000000000000000000000000000..8680cce82bff07a3c3aa496e6280d871bcc50e27 GIT binary patch literal 397 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBh4=Q9dL23ay-Kpb%$) zM`SSr1J?%-W^`I(G6N{clJ4m1$iT3%pZiZDE0CWY;1lA?Az>(B7$jgAWm)~bx@FGV zt>@P6J+~Ezj$PY(?Aoz&Ky>fiH6VI^4T$bNzXwFmf$05nAbJl(-`~Ig4hH}KPht3f zjN$)(iU0qj{{Qd!|9|WM|L6Yy|DTex{x8rv#gZVuU?3MSV3>dKf+A3HgQtsQh{Wa4 zbGP|g6nIzydX|0fpc76wmOKbLh*2~7Yy7Qm|j literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/filter.png b/htdocs/theme/md_dev/img/filter.png new file mode 100644 index 0000000000000000000000000000000000000000..917715107bde9b14abbe77024e805b1a03d40153 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CH!VDx|PJVD7NNEN5gt!7}Mn*;v5fO25aambe zAQu7}8X6WXSaA68;iE^79y@mI&Ye5$jrD9mIrfquzhJN$Udfh)Hdld6A5Ry@5RU7m zM-2rV3vq+CoUK~H7~vtEB6V#~9mon#S3j3^P6uLOet000SaNLh0L01EH`01EH{Laa2H00004XF*Lt006O%3;baP00088NklN@N0II}yuGrygg4pDTd@9A^-+&*7||4r~iYQN=fiiP9h zpsQa_esycI_F-xA@;hDmw8n!IP#$O|l1maSBS)FZOv;ObD{(H|-5oz2s0|&_4StVR zlJe=5`8HTH59!Wfip` zkqE#GeCMv3-5t^L<9;8h63RqUfap)Afkhc)bqi250>gCRScH-?w~x?J)PdK{5xdx4 z?cu#3AhrXT41^L8wFnd$;8*~d4O2G&Dv93eP(pO?3GkGu0#7-Ix{NOL$4o0;y2QTL96dP9BifKH`K-62F{z)~8>Xh2?ZVCQYr`wW~p zl*2%;hBBJR?95D(%4vnQbR67W8K~N2*c{!`fwe54sDNMr`|3&<=q@_(P|lj3{l4+= z@$2E~sWf3z81qawKetWi?PW^j~?8boqBss zSLf%bZJCy)Wb>hDS7Li07`MT34SwM8PM|edu*WCnR`1?_{^Z${p(`tk@1I*Nl>%&= z0)XX^f+a*qsJ5ZCv$10Pz6gj51@rpt(ec5XLsut0yc|+9^Roae{x0&D$c)mKYAAd~ zw7Ml)laQ0^>Ww=i!-H2YTwMP4@s&}KHvr4}J7w~RIEe;geO>KcJ*TwIrMaoG(UF`o fvkbug*9U$A&+a%yVRe1!00000NkvXXu0mjf8@zTZ literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/folder.png b/htdocs/theme/md_dev/img/folder.png new file mode 100644 index 0000000000000000000000000000000000000000..04a24af2e22a3ef25a986218506e1cbf0147db71 GIT binary patch literal 935 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD!lvNA9*UJvjIaRrKVaq%&5NOSWD^YV-F z2}lSCii?WLGH@s|bE`3MX)$tZG4g6N^J=m1YAGt~DXSWY>iVf^Ir#)vv#NG*YjtvJ z_3&tS^6GT)>2&k!^$6(q3hMU>8uW=jr7}^)jD2ht6{eo$DCAH7>b5K4(f``Zni`i(%zQBC8Jg z*E}k2SY6q+vASiKXUo;F?yHd#Z%0qQ6*J|Id&_(O{*M7&ALA!H$((gJd*-{G1^2TS zf6ra=BX|AZx|I(r*M4g1+uk*GU)$VsJ(CYim~n9OtfSNBo|rcObj!k9?JMt3S#W&r zigOdz-JQ4WLgSi;Eh`_itbNqK_EF3FuPqy1we9-Tx${fMou)UCaAn2jtGjofU9$VphTV_a5B!~R@aL>Ezjq(Fz3&%;7XWs6(_-^CH54*2@*!uYI?kE5DKmBv$=+$%Q?;Jbz=)jpb z=dQjwd-KzU%P(%+cyjB`+cR%|-F*7<>X-jFfBb*)||Nq}mvhV;#?c97?Y5;TL;@{F-lWpgI zHMu%9w6SaNZ>iJVkM8RDY~AW`XGY{@^>1Zco~F9BN-*tA+?;-Xo@J_2xOZ_M=Y;He qbLY+#6@2$RJ2jKFcKtUp{~N z`t|GgAK!od`uXS2?|*;)|NH-!VHAvpz#t9*9gy2Vd4YlB76T&(i$FudK?V+Ctr!W1 zhQsXw%3KN`3L1`fi*fQ?@K~_;ct5LC7f)uw6GmqCpjAGd3znXqZXkSOj%RSA535D7 zR>X$M&zt5uG;^_@N?>eW>@Ka4x?qYXGe^K;s{)3Djx8Jk>$CQ1Ij(M5pK!QquEVx9 zkzB$W3qntCTN}+KsuME9d%NCUZm~~M2MQMIv++nWaf_{4xZ&a9HuH=d2X<_Hd|XD! zd!EnE=G4>jdgVV3?A-kP`~v50Ip1AdUS3`iygKgeuC1@HZ%95p&v*B>x3_l`zrJ^N M_xAkrjEoG{0QtGQ+5i9m literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/grip.png b/htdocs/theme/md_dev/img/grip.png new file mode 100644 index 0000000000000000000000000000000000000000..8053007e9ddc69c0e5adb53ad1cc5fe511ab7a43 GIT binary patch literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh0wlLOK8*rWik>cxArhC9|D11-HZTm(u>AP{ n$o~~8j&pndx6j^~;=#l)kz2v^P&CIwpkfA3S3j3^P6cxArhC9f1GcSHVV-BS%0YB nL`cz+QK!L&FF4tAItxSR?As|PT~pTp6*G9c`njxgN@xNAn@ku= literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/headbg.jpg b/htdocs/theme/md_dev/img/headbg.jpg new file mode 100644 index 0000000000000000000000000000000000000000..160821354cc45e249353e69ab85ed7ca7423c8ef GIT binary patch literal 12151 zcmd6NXIK+m*Y3~*1PQ%K2^}c{0Yo~XNRuYgRFKe{fKo&{1Pr~3ROwg%se*#^j&!7{ zG(ka%^iGm*c%JwD&UOBuA7@XlnaS)uYpuQZTKB$Z&){e9ivUbVQ(F@tARqwhzzx8E z2h;!}Lc+@*Sct(N350}%n3#lujEoclrGP>yDJUtauF%4$uFzbeq=YfTXz1t}7#N_` zOw5e*%(V0j^!N^d5(4}ndqF@z1K_&=)=T-91^C}WKzJz_{|$irbCm#ljkQ6Y)`jJz z4I`rbfi27C{4@LVWtQgE?AV2R&04Xz$34x`R2QhTH3I| z>$*9q2pb1)`w>6X+aB#?Ip{+vX;}Xm3z!LACV=7h-j3{L@|2%l=b&%Y0 zr#|q>#J3S;g^hs53Of}Rf|9W`2eJ2|BKEM@bj!xZz9{bsbHXGNawB(J-WM??!?nLw zrppQkVg-?5O_0Lx+UY2(muU`egsuq(?-kB>_Objo6y~#kjZ_xzdwFj(0!{!ll}EQA z?Tci}I-JW(15V0rL>Mwf-u`e0V z7a@{+pd05Q;eXnkVmbWj>Cm|o0FatVzsPDZ4f8?dc$ECgc|atGC`$;~3n;Tv%Gx~- z@DI!lQY5l)6(tgNv>0U>B`oZO7o?enUXzTFf#*IjglC)Ss1&okOtpCNdk;&+JLR*w z&))nvG!3W{QPK2avK)0;zBzq=zZ1EP{5WitYxZ(tWxAogb7H}v1{BH#5UBumQ^r}< znNm`Ooq{|(qU)hZQI~uZ_x|#MU4JY`SJBYwL~A|(5H9-`q!6+^`1{Vm<9?|(qSU9i zLBw~`bNlDP!i&u#U_y|OBuvxWRZv(XEV&@LB$FUt1e!m10HS z^Fv3~uS`SAgP@fSuzvW#SI zd$GFt_fu`PS5Jek%r1An@_)29lraDI^Q!0uyaWJvzozLJB9V?dvlNgQ-YjFOnrfP; z2n*KgBm$u6^EZX7iY+-Q`@5NkM}#RIp;u&hk-QEF%O+QS1+4ti?}OzizVru{HCT=x zwef$%5D380SK7zN(vA;)twfD?u(9#&HMFB{J~Yct%7Ia+JRX|WM_f@g_Inq5?TXSp zj`t<$g0Vt^4BWbDyq{{24ugZ|yT95Qt`Sa;&);0tTmO&?O=3~Cbhji(qO#++6@Bo) zj(|T4V409}RO7LbB6tYRYT)Wk{Q=!wx-(fd<^4rvxMoz^2%g4re^x{r@xI0F$B!`) z*p0ta_xDSv3<-5!q>+rTnM;l$%A+%e8@x$=Lcss+N<@j1eZ(f%ezEY}XyO||$ghEOpGXzJ7YZAEdGCikF(c`R-UR+L zXB8NKmLzKd^7lZfRG6Xp{iM59gzb;q0FtnWQ>N0n(0SpR!OSVY5=Y}GZz4H>)O)yw zK$RlyLn9ZVc8(p@ZD$n~dUDNt=NDlQS)o~^PW^7?tdgSu;HdINh45h$zvi3&Ou7U* z)kX-KhlGWZ0I?HXJ96{!+_->xMI>0O%Sb|35AN-yJ|o za190!5`gpqAOwlVzr28kfDlGY#3e342Up=XBvzGtNRRML`VU1QAR&wivLzKq3EMe1 z$gb$E^=&_|&c*zlAe58m)<3SEm4q{xB=o1`-YhST^Ozrw;un_J8}~<1i{ARhPs$G# zZpO(^+nZfThNN;d9D;1pGzJB+Ptevf4i-$5^u zu?r6Aj(IrzhR1L~AdH>GD+I;<;%&B{Q-iN9%d8&vyXfRJr|3s(sM@;qJ7np%OkN>~ zXeggV2u8>m@N#G=JWtx=Q0sGWaImvelD31pnId6mI2DT?OJ-O6wv#P0?#7Of-`>Wp zUmOX2k!-1T->d0weT}rY|6uWeX3Y`B_|^MH_YB$>UQ{E~k9a0@?Ja{gPJ`8D&~5GS zpq^>2<-@&6egv;GGo`Jj7g-9m(8{}8hNXJyVE;fp%ot>C#??#~7HFUr5>{UTb~-~+ zl5KH)u&*zqG9WmF=$u4#TI%2$tmxWBGnX-iM? zt%eW%gj^)O4N*-kEIRG(`{29Dg&Gi@(=HBkg;bt5dR<+b+@QjLwElP3Be8XFH1ZR~ z6lv<9)#njikO|$iraUcmtHi!gi)TLmROW3~gE=b|MjQNKxEa#)N6EiB=EuY*MY z=23v+toG$Tu5Yk!fY-JL7HKCOzm%r%z`Ei#-a4?j*gzl*V?uJP@j7NeLeQ}O^o2Msm!LvT@Bd!q)-8!iSgY^ zY5KLnWOa?wH{q2lER#kNJbGQa>quCfo}PN5t)!%6O%20~tlHX{V_*0qaKy_8;}TBp zW-<339oIJJQpZ&K+AIC$SueG>=XU_D3hPcni^kcqCq??kMbZlUdMjetXB9DPdG_LF zf`y5^C3f7+c1A_g1{#)|@hs(~Xm7I$n101wX1(O%$TM#^rL82#SK(%i+6m1JS{NZw zy;CM7kx9M%{;r&Ku+9M1>a9F1M(N{5WTtjzX4)08dU%Dkc}sX4Z@XgXD!GBDZaS)B4LpZ zc5xXeFJ=axAG-S7dY3(ieR24VXCtA7)WN}?(bTrCt%89nrqA~;c6)tc&N^p;VvA1N z^|n+uP1*Y)<>g!kJRrt(aj4@>Gu?rcQLd%&_`4nH35F2!VASc%@X1`M_Ckena*0^; z;8!_@H}TsMEn1aRYOw`@(7`V*429;I5)zILO>JY+G<;T=C=CHeHRRqE!RU7twgx&< zL$_VLf4Y9fslL8==DZldp79qAr+oa&bbZivY5VcYM&zF88d8oWX$HsCE)c-5{?e!b zcW>k6jiSnTJmXC)$;nBZkzg`xiF?Z%6eO(ASrnq|x+w;I*DUB{GlmObMP{dboV{74 zLNOr^=8}>|dk`%Q)%OZ2qbs8!$XZEB+Y`B&-j+`$-;v6qgMZgvPfxSEo0>UjI;hP= zexTTlDM#Po?Sv&n#SQjs)(=8`*ScTarB|!GKQZ>&Ah(EzhX>xb@;KmX!Y!WU{+xd@ zSkZ0U162d-L9|YTrZZ&p;HZ^W683o zUBa>vvO*~y;_3+##yr}y&4aez{_jk!W$x+ioj(wkz@@fET0r#Fn1^wS9zK?dCR_GF zR(W%&1F#B7W;q%BoK=52B5yT{PqTOAAq&=4QBpkg# zp^poXd7_^tpH)={&EhElJ)%Vp5J+TCT$V3`@-9PWZsu36K9XcpJk=jf+1^0-NjeWCAD z9^vV4mbdznPQ4X_errXWn1e`ryMGan8Dr{T>`x76$W+Y|Fv-=H+8CJB!s3Cx3;`>< ztkOs2kq+`@>Tf3|?Pj6(SP=?Q4#slNO=U)~jVQg~fZ|G&UC`R)RN;2H z1ChHN?L6`K)8T(Q24Xi1tzH;Y6aD#&B{`|bP9iRZu!aT$4sGH(QUV5MYF5*a=N~Aa zg}5x~Hy>^$eu(P}82v|5$`#2s57qCP7PpGzicQ;ker_=7m`|AyXEdWdez>UN<1*npoTawRJrcVH)yy%odMvQZ{zZEK zJ7g4N+TuJvXdWbE{x#M?9=u-5+}qcx*NY3oR__#MV8>yRZoOc8vwwXfAs5Y03@?J` zUSN<+=V^yd+jfUFJjZ=V*h+xmKT^tjZl{91rNjf|xs^vc|2P(cWTItQX!|(YQYU67 zTITW-31%O~8WKe60=N4R)BBVz^Pj+8fj7OvU#^u1!NA25Qc^+!lK=88H~u^ zA)tZ5xg=DL#BIF7RFVq}AGVJrRWJRQ$tlCtojJ|Vl3FkmquEGrp&f(5$ZJ6gNLzC> z*B5(+9p*jGEXF&Owxt5$YqoOcHj9nXBM^_i-MApQa8Y3*7NW|XkJW+vv90#tI-`*B zF4#i#DC#L$sYoR?5mbT3NOm3% z*x$f~tB>~V6309rZ57cvqZjnM zI29{DzmSeoxaV$C9*oZ)l9x;ySPen430g_27Q!+!XLXP6sPhXQofJTjsA>x>h^_-tT#(&$%z5w(4?q>h3KM)<2IZ$^aWG{?*^R@)v|DEh|PS|ZO`nNIw(ddHC1`fm6& z`e^$~2W4?PEUe!{plV>arS-T9VyIICU&7V5vBn)>lr7hwp z+f#*$J)~g~9XnD;Dk?UpmVlM|E6ta;NWWYsia4b6g(<*Ep1(%3vPba_z@1-_%nPBs zbl%c;Og{*qD|hqss}G_Q8|ny=XR7+}9dj#Ear2mxTr;ZohwYAAkovv8AKV|YEVN0g z#Lu`A)nTf{o?E*YP|0dz5o=@6y;cbWM0J%anibj=jF_-zKwnpBHWognXg7QIHR8Ot!5?*77p7xdrz&-(Ac<7zt9`RU0yZHe3-es9aG zZjdqW2@im+cdo5T%uIZCoIBt(Nj~$qJ6c?Z+M+enJrk|yM7EB_yL30xuy4Q`jj&$I zE`mDf7UJb6O3{a%{yBO5FCF9GFMofG(C0wdKW!() zAZ-h3lB_=)QwV+zL352s$mTy4T&Nj4R>yQLLG)xmZ^N82B87A_kSJ7IA*zE-0b|Q3 zf~e!9%dakoo}f7p zE;L*TqYBZqp}H`mgP{dxEp#-wGDgcwy1U>td*MtN0}RQz2p=ri%MLDC{vnQLn~si6 z@S{Fux%czYs-3D`v+ClW3R(C8*O1Qe5;!#{WzoViz%&4nC}W{o?oagRXoa*hsgW_R z@FG3kHBV_$IG5{*l;r1|P_+rhXVh+ZAckh7OXtA1Ps*~NU9maYnL!s1(6r>8^fEou z@}guA_CailO_)-g3TPAd@;s;POoR>GASlZN|UlLbd$g>*5R64_!x7N(Z; z6Tc)9VG+Nf#&iWiT6^;QJ012iR??5%O1kJdo*1*N?4vCeZJNk3B%sO`a?(bWOxK0m z11ogU;a;!DB&9p3=xF1?X}XU8i2p&fc~iCtI>7dHN-1U@Wa^B-WicZm4k(p zkPNOdSE1ud-131lb)&*ek#4XBYQDExka2n@<$=(!tg2U~hQq*7aN^jRvN}kuj*tj& z{u!>7h?^$nH?L7-sxy#_5(Ry8Q6lYd(bn+k_H2#J8SMv@-d&w1KD&7P?iDzTM_ zIZ(zp;j+cRSVGb*QXstqwf8$wX?m6kH9aDRj`KJ2s99__Po!)|dRKE+$1*UOstB6s zI!n58+G^ozcKlEzike8Xo11eqmz~7WbIrvoUx?sebRuDCDHRL#R`m@Ms7iZYD zTlWq29%x=L?z)O&Fqv@X!%dI{o2O~1?WvEHQWMKCxYILLn`@0_tut^pN6R!vyQ8et zZH`B8dlk*3|Du~JsHFSS9%7HEKYfE)t+~n zM-8RD3Gu4cjE-j$g^d5IjM^&^tR|1S?~#4tngC9TUaEUQj4SyL9F7U{R9ovU;QA;5 zy>VqEAsR>2vQ226d}D+5I$83XKHurJVD)M8VLC|PFnYdgqc4~Kf?TIL%hqpnxVxyq z=FOxPIci!LT3s^M%!~)3+4Qsj9Q0~Mu>|Okt!s4ilRbZ`9MvDVBPL|<=WIv_D`S=m zB0(R4<4THbhYiRdO7}@^s&aS?rxaj0{K_R=a9Jx@)R(?lL@-2k2T7M~bt9#7o0{^o zcac$2=*McP$Ca8wPC0|{iw8^vSds^cA$B*&Hf9a^U#Ul4M_F?_CiCp^9+`}lOG0&( zAV_#cQU=dAjBFjExTvJ8$WyK0jMJGzjl}%hlY)kt0FtuVz<8sw2T9Ek-L}ze!bRqp zbJoQLdbor{AuOD;2H`LubRy*CuZq!!8^`vj2lVcsW!#Jz;4J)}jebIa z`zH+TkOvI?{7HxIT9(z*8&7*3R~=1V6VYF_qXZQty>aEeA9{H;hUxmDW<(pVG|<5+CnGMJ7PhG~-#NTv_4d(HJD+X(^_Q=SFPrncgr@ zU!{G~9-m!+6r6$~$!XS$lwTN1UySlX3kwwnUWtzRlJ=!PfQda7jSBS4Kw6HtJ$Fly z3@P`!wZP9Y5>eUJ+VS;5u!f$mdK%b8Xn8lXsZurI0m5d+*4veQe6EFNcmMu-5eXkqt3#8{H`V9F7Iq1ZHH*ZHKldIp^H=3x=^ zrgzRvg-Z2V<$JJsZo!X*W{Kgi2}^$I_(dT-1$xj5JUui&gXq!~mfMp0ly0PrFPdlM zFfj~K%9+>7lJ!%!lgqzMOgH!>-5p^z<{Ur75VB?*l$3^^(5;?2?+t{DCnN<>L=`|( z`7xuJW`$4_=3ns~Pl96CV*Ic7rKlG#pZ35mIKvffm|z#XCmwzJ<}HOrLOPcQ3$VmE zjY(W|!O7Z$=o1@3xX&p4xQ3Rwqxl7cq(k3G{PP*t-E6Opj+{OXYC$}mw_9>5PLPkxo5#AUyx+EL`-wm?k!EugsD_U-eF7}$l|ntRIQ zh*t%BO&zd9$^~vOtTu0+-8s*!ZagbUaA~rYpYMzjuaek1uG~5>ekqQFoI>(xB&?t<>BC2f^C3=R6DSC>WZjcORC~;b3AKOkte%*@kK#-Nn_#wc{p$JXU9e z%|0RTV7o4>7Knn^EWd~4z-2oE5s}y1Tl(9VvTNultDofk^5)0Vf`Z_ZIDqTxt$AuY zb@UE`Of62%u8#MSlibM|`h;lQBm-XdbB=t3~)H+q)JmpPv zJk9~v2E4%$8|o1JTyS#`JcEnR7{oXsz0jvNEy^8izY6K%;5EMk%VKF~2Zv`7j;FP- zoHw6CWcx`pG&HP+0;D&mYpq6q!W8;Rj!3o(-d272Ma*>)_FI#hm~pC)YJzU>m5lR& zata`0bRu<&W7cscPo4EReh1_*;6sR7pp5Y@`o=J*7v#irtK=Q9%#6>gvihDmHcF1q zyCVg)c6NHlAgXvEhhN}C{IVG=N2$=AGh9ofT{#U9riXHT*5AE7YPAAB3j8Am7B%qY zz$t-)O<2gNG72>RrtuznS@yD$Dy@v}XO5}k$W4RrKyLv#G+YAdm3Pnw)-93uzD&~E zhp2KwN~_8_+k;qYuuT8zL&M4AS1ch2M>^a_AzG0tf;kh zg(y@k)MOCphhdLG9Yh)*wvn};geY$}I>G5OXLr7=aX8Ms{JeN)CvaSaRR6)wH4XxA z%Aq^#ZR~i!FTK51kq{3&&3Mxg8j_q6$`5tfl_Cla$~fvkhhy-7%6@0vgU{2>jZ*FlImQFW zrK)6MCo1MN)_7pv;Xc}Wdm*d^NEy&B_BeCI0}bcrby4AAr=e2D3wYr78Fu7S>$%pG zZbrJSg|F0jAYt|#4>*TKL~JMRTUX53?p}5RCkv>zD!=mkbH;q)e{q5{BzjK$o!}9( zLAjEiQb@>mwpjG=p0BjOdwdzq41|FrEgD&XF3pvQ3g|#*FlI$)5g6f>1 z3;wMt01&W1H2xI0Xjl*=JLyp(ln@7~w_`h$@c`(AiGLKF*kI2oWeMKYseV=<`h2O9 zWuXo103N_@gF|@=w*7b8RPJrxJ@8r-+yc!by1bSP)?u-r@9@A_N8-P&rY{dC=zuM^ zyc1clD&*qy@6y8YOFXdMT*obqCME=kTNgb8+k~)ri<}FmEx0ShiY?;c8{#%VVi8Of zfEWx3(rN3~{S$z>jR4IBRq`5Cb%LlQbShB4mB{;7&E@_GR3G$z{{DY_)&&S(zI7!e zApyWwu0;QSjs>pOg>gw3*?7UlRa6ZhChrt@R_`W_{qJHO>|4!2$O`8v67*fNvcc%V z#=$e`Gqy|(s5F*cPnI>ny}}R=5LcdV2Hq9eu=Y7_ZEf5Q3G#RlbA05*Cck(x;^D`u z9+10z#B`^wp|%m5^D+LhK9KeJRpF<9$LS8^=v3TTR9aB*hpI-E#bhIOl!_Z z&%fLKtH2p$rD1vrfAtPC7JDx!`{%dp?N;kkEY>=)X`A`@wKcqdc5AyL_vL2WRQjnY zq;3l9d;DShn0|J}@9ggpXH{)y>w+Aoa_6hEL;A&E5mz3BlCcuoX+P#+;}}ZHyFQ5^ zo=!emG5+0o`sUWURq*j4=i&7BhX6d_)5-{@{#M0@9kHYN`eQ`~4m{BO<ijW@*Rlko!t&d21{Pb=iI0^YeQF zU|3oo&WP2vZD7sjz|gs!>d0o<#NY4i>=E#N2%KXST0eHUi|#$`G+Q`1J5$bUIQhOk z{6vXPxveEYZ}bh%2gMXAkw0RE3<8>57S+u56`-~y87C>x`fsDFDAA&_rTiaCIOF3tp==rKnTOJ2Oe0i z%&x(SaqqDrk_S@T=rK(|7b(mnN)BVM$TG?LqG2g}qh#s9sev^JAO9djD|RHW^;z!m zj>mUOd0njjkDvz==ZPt=TMJsYC*6HJhL4X?*jLos--AOE52L=2mfxCM<9@g`S}r{VD#HMANH;X<(ccwpgt7n?_UUK@c2p6vYH zK57bPZD}RA`{=l(xs^QN{JeEOP;oYJ16N|=2~T?4lfYZ7mHZ|q>=^-7asM+~Xa_(F z{h2u}J&B{vaN)Eq4M{w1vBvI%jI=g{oQL3A@PLP3!}6$N z-=8jU!_REmdEp+ek^_vYzl(D_$Ci~?FE3xJ`RjLD=JtXX9&P&%Vw26jw+erMd<@PV zMAtJLE1nmBliMmxmmZ?o94$!BsV0`o(HEfQrN7@kj%no5l}nYQ4|j&YRbRv^7tZLID{rEH|32&4Z6h^3Nel=0OMH53F z=yZ*er)0ghI|M{{ho%*e1M+GE4>jxRq4UZGJdo*knh&jat@5+^)!jXL9Bg*k2PT`Q z^#Fq7ZJ*Qo^VZ!VXL1F{Y7#{(2tNB_DP^CZ*G+=gu;aY?-t`Gh+N$Z|Dg@7HlOBZw zGdyk!zc~*UjQV<$ifxmn{8@5oEg*ITUz7A=%Q!|aa`u1aDR^}4w)QQ6!~Eg>7E`e3 zvH$kT`O9Zk%KVS;z^*&zfzv3a4IrAmg1(Voh8U{`uId#_1rJ9=_tZppC9JC44Wo66 zL`FHUxU||KkTGA@Z!mO_jla>9rY8hACwbUzTAsd3z8x~#UFq1}YCHQ^VgB#pQLyR4 z`u@t?J_xCsi)X7Ra#-CkJYWt)8Zy3dA~PT>7urWht54-mcy8?NdH>nG+M+ zJoF2GbT)Uqi6a5AqCwPS3riaD^ygz}zFsE6IFn2TI_mgNO*{-HM8tiwnuSUi0x@}M zJRm!i^AH&2aw4aqAcy%xr8x5a+0w^870=f6ygQhd=KEcm!DkLkz!RgLrt^S?fXU{> zKAA_Yt4DZX!|#NqrbBR3Jw3rLnzn>4yoBB5sR>a$!8kOM3k?ZJlX}7pJ^A$-!=D0A z3LR9{%FH=-c}fiQfB&5`#VO$d&+JwF~ST2Zw$Q8!V|1aB*zT+E$pei*~(2u$STPymt?aRUBbS$&-;YWL^JiKxMC69Q76k;riuPu4e zlLve+-?w5AZWp$;^JL_^pk3u%jTV;Zd#uej1CUM6{ zOLt4Uz2Igg^tqk@PjXvS+{)vdsH>99Gx6-+5$|Y#19p08p+Sc?B3v}w>d`dg&pQid zt?eWV-DIq-flbCF?qP3Jb7){HomE2A%E9rga{js#zzVdwr&FG8_B_$;!gu8>Yud2%3 zZ_)J+?~MS~z%4K~@WAXniQwVCvPH{X(X_IGuAF75yPSalp#fZ;`9y=W8%KK~V6KA$c&X^}pcu}ph0_7~q&@hL6Bp8spZy=6Ltcmg literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/headbg2.jpg b/htdocs/theme/md_dev/img/headbg2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0bc44f0ea99e8f70fba0c19ea6015d1a7693821a GIT binary patch literal 30553 zcmbSyby!qg+wTSj7!YNMp}R{O=@`1ZB?Kf@q(M3c3F#2&kQh=Clu{6+I|UIXr4f*j z=Ir5l-uL^?U+22cp3R;eYu)S4-+iyOnd_PB1pub5tfmZLU|<3?;0L(=4k&PvbWRCPd=f|*LO+$ml`X&SVNozEedvM7QS0fbJ^QKi zTG?UquH*NF6CYQ%;*I#N2AYG9I(~5hNB+(^p6}DjbPU(?jPFw`S&P1G&DUPYf9`Sa zd6F-*ag}_xzeHBuijOe!@RLjy>T!uwwyBYNB}3smmQ3Cz_PgqNSrg7I2ajSyb1|Fv zb=g?lXHa@Is|JBTpX{9MCR_jTmK+I451h}|*a#ZW>`0Z^5D|)G|8_{@IS`Rx)?w-Y zq}85sHNUj3c)y9O&zdlMV?1niUt`1MAeesg()kqiCUXPqy?SOfujMTK@uzeDBS~HS zzQ$^g_XYTDDXyF{2I>JiO3sEK5LyKoa<6n%qSoOM&wxN0%ZaqA!M4rG=|G>#^k#Qdu4q>G}nbR9E*t;kqEM3DeB15@!ibT}^Cu zd9PROYM)5i*V65|1{Q)-o`}z#$};WN?b7bgld{VZOpK{`t$iB$9k`#okU<%utxW5f z^|JWDjd(vGh!F$Lo##G$HRJoT~BI(k839 zFw}~(BQo@KxYft&9D36YjZ-n?A8?QqxfobE-}8JuprYbY)ruSTbksjB-<33%|63Z? z#I#u6@fPRLzctLsi@5<3d;2N*Wrzg6gCLPv$D#e8r>TEJTn_vl_ho*_K-v&H`JJb4 zp0-SAQC2+xfMjv}mbWka)ys7;?&i^WP77s&BbU1U_%Z$7f4BV4a;s5UpnK;@zE$4E+(6fQwZp>=KAp_XzKh6U z_H7@l{N$xe_SIi!Iy!wPsb{hp6IIl57;K|>V`}BXDRZ+%W@>kbO5{kh)P6sn8m%Tw+gUNCVT5)%-NjDu3jvw8?tt{LyLKK@scMFOP9|Use_UDIMW$-5-eXiFe@nT2sgHOOc`&|PsPKJ!7mr5vMtcJVHrwIFepkd4a?ELKcqfx zv%WlFlFw<~@vOCN<6hA4yNe6hC2ninC}jb`Y~WQ{h3}8%o%SBdFR9Vq^KT|xFRpZ~ zU#~oqChP8Qb@q4U({kGP4`!dgXdAkG?}=b@su87f7=MiOmir#7L}j|ZjRa&5#ahb6 zs>`m%Cgv$r<81B(=x|8?bUtHWEgjewJi7);gkqnCh>}~Q8UiGMAsi=zz8Rf_XJwY- zxyNpcIr}406Vp3Of!1sNtSvBge@rGMo_&&ic^+c*_^X@4(tVat>hz-eM^rCO zJk89A^TyNlZSSj%vYL&O40V*FFj)T5=m!o-m~d+mjAeBh9%yGD$ljHmyp)=(Ts)CF zn%_j#Q_DsU^(3?;Xda%resgWv%~=h6c$HY$#$$J2Z(X9zI#Rly^U-SZLiS0K z{#G8+5Wq|26yd1Iav0zeg*5h$SFqusNbKeB#}{`Sam7%xl?^?_AAdKiS^THS^H5gw z^zTlU%^w-FkkKcAuf!l`cu2zG^w^_`*3Tr!aXQZ+BrsOQ1RY!JhQSDOaEkQ-lzFN!D zb72{3L2WTla@w!oHyW(+ntum*Y?Yq|wh~TXat7`uFDFJ!O+S~+J`6F~{iE|`qiS!~ zUQQHeb?KS2U6rF*y+GYiKFgXCU5Y)<%A9XHN*fuQich@ES@nd?-dT8XZdB7Q;BcZR zU6%DgR^xb8JCA5*kilS*`TMD4l+p)Tod?e$Tx^pID(s>^IG<|Kk zRdTuc@Ap>8%d)Y(o}rBo4yPsJnvft%k7{o9F~f*hp@_V9= zp*nC)do`_3`$OJpwR&vh=9pe18YAg4^lP$DEaqf<+qW`){Cxyc=5oZ>`K0|^q{eU9 zZ$wK9*^=ag%nrEC|V&6Cx^UDYzDe}?|H`n(=VY6Y{bLxmm&F5dLvK|C$k(^%@6t8E6=Camf zA7#r>(k}E#)kRe z#Fp=fc}xoq^WBlU1S9nh?cP(2^~>ArAmEBTloqMMFE=-Y#1D18XI1CYWy5Au6ErZG zk^@LNvb^xpav@!8x&XGmzTMCUVLv@169ifanlxvB`4Z+VIx(~!H z_QVSLzxNtuZ{40|0C`EdQOab+5}HfkfG{0n*a@qBP=SyLbHbgFL5R@8#vc zS=H6VpMdmFb6d<|G-_hIBknCKc8;^Fe@`m@%t6fx*@_wc#>uY>kZS!2`kA+?)2T7B z16F<1*`XK`nwSquMtqL^#nirthBXcid|wUR6~2_2tqdh0s2NQ%&W^;gR~zGpKX`<* z_>S#~=cg~GqL`_30M3FdzE)%LI(wUlPLZ}}y5FJRtk?3}TmV!@E=locVTwmc|2L%x zzR!WxXKM$l_`gsEc%e0-coXif@-YoqZupRXO#iJ`zx;q~?Z!-b7XW~)hEsVBl30q>Fg(Sy8DteUd4g=d$v6rXQ~m)N3Npbqtpqn&;Fhz-gl(6m_1MNR6JLx)iYpN+4XQM;n{A9 zpri`rw57wUqs9Kb*pQ?6!@su&w`wwFn&*Dycz^Z&*t{#A=NtO7;iY$7{Xxe4uWOX^ zyv@IwGP_6@Wy*V~M*@28PkRnI82fp*G)2U3FM5-wefuM~Us!T;wW1e|$r!vG8jCb(l_fzu2uG$jm7 zB4R8UBZP#3iC;hvflVsMtji)F`tM8x0~^!z-t_yp9brxT2TC4z>Ah@zk~=(IENPYq zs-sDmTvhD=q@TUvbJ01OETbv=hrBU!_KGXjo?AP`XL>rt@QxPM0RnpxHuKmIbO-d> z7h8!~?(Abs=PtM7o#yz4iJ5zWuEXMON#a#2>FiaVJvT2YL(+9fHN4v-`z839(~?eTqI!7 zfo-Sb5Pj~4%8Cz`uP;BvAEPz8NDhzYJoo!c%=v;S^{!^(ue<4PUPBJ)qh`ahB!8rJ zO_~(#W80a}s(8pN1`pmRZw{xU*l-Hs!bn_>>n#SIK51ZYMs9kFwc2z2rEQ?C`@oD( z%As2*A9?4Se58);h;v|+w_^X8V10{*+OZpAxHy*!?rfX}Pk#E%VvU? zUL;N9hM)?EN@uBONS3*mWFa6lCnIq%&vKUhJ5mgwI@D~{rm1sF(;8$SQL8s@2?z)r z_K9PYXq3o0I2z@B37-6%r?=1sIpL(%sqy7NVAdB@GZ@Ympp2EAVa#*k4hX#(a;ieA z%ezVs5K$w!*sH2v}?YiMqN z?$Wcw{bqpVV-n~P4w&uin-;zXRvanE;y!lwElaZ0dSZ*BGj z+9UiT7U$F1*f>w5y#bq#t!A#>&+_q4TZttu(C)&M7wOTmHII}wg}^NQE+$mdhy)f_ zuADTnKUe=Ug*(Tr>mA)%)9-+!603l`wI=afjlY}joF{B)Z_$9Erd~2Hz^ZNw|^y<2&x%%en|`FpQ+T2I^lnhC{_CQ-2vJ zA-1zp)L^;obewO-n~N?v!Y};<((c3eF8NmS)t4pCH`@GKKfq`&ao z9m!bgU-Foy>7$C?8sm@Yh6^Wz2{OHiPavnN)8)2co*SQ7E&g`PjINjDTbwWE<^8zW z`#HfelSd-_4}5%I-;W`5jP4b*cfhemZD!En)Y7NFN@cgWD3yudHGW`63=1~q@4JZ5 zwYXH);}`!T;S&>sVx}6Ga&%LPk|oE*Hs?0iE2=GXE_2#}d#d$X_Ocl?Pc%-1S2Gl< zF_dqc4Y9mTF$Il1%-&74XsRy)A*$E_@zmhkEpbTya`U+PB9z$;fvp2V2pT{lK;%eW zgV3a?v81@87_>Ob?e&63t!;c-Q3)=l1GYmy77JNEG|;TDQa`62igV3^@Z|C&TTO8wmeiE0oPRlHF-!PmYJ;B+XX6tG`zNn zXr(B2Qg5c~F};FCHPQN_d8~A7m(0=RGdjg*0kOR`k0^Jh9@sr@B|L~;wN0&L{86>31H4ozz@h~aochN=_O{l-Q_k{h zK*8WEL%0YyA_N}^Q*I*qjSv#k?DeH61J}SHZV6&~LrU;sxw%;88!xxVqk?cG$5sCimutlFp!Y@>@wf#wSf3Dgz^BQ<*XCzxU#VZq8 zO++;=L$Q~l#;e9s&INj*nnY@fA?S`TUq0<(IZ;n>L(mbcNkn`Y2d%ALoX%SFqabxE zu%Pf3iotTST)(KkE=i>c(r;EHb49`IR3n+dt6}-8k7X0$Mc>fq2WG0vXz!YwDD}UR zg1@n0Cba7LF$U|Of5No1r@rSyWciXaKN&D9dXgULtHuFG zmQU|1pVoL?nRZ##mxm9wO_LK!XsS#p)DmI9drVPKvL7Y^SnQO_IV zE%Qvoixs|0gn(Cu>g} zt5prscoylFn->LRz$99sm}KJKh~~tQ$Oz(JRBCHpB(6>Bsia;Zn^=2Q>8dxIXVh%1 z2MIFT?%fvL5hwolp!1< zF9PxNTAA6W@_VI zeQ$QE74Q-PfhlhqmRp+jqO*Ms(a`C_u`^3_k!+;bjuMGku7&?PRXN%vfGN7s%;^nHjxac}$a8{Iv9vb&n zEmP-2WO`M=Wr?f}TE~PA9Hlg%U-JtMbe?i7jaP7uk-#(9j33yxly7B}uJ0XgG|io8 z7pLqv|8Sw5XfE^a`a|Ap%_x3rg)gaY06gqU{cikS{)0C%OD77K`a;K6jkRX3oP9+> zNj_3TOeKT0Mr`g;ez=H?5K87fRWfNl%YJSos3A3RJBS(36 zT9~2^lmQ7B564eXa{65<$nD=nQSI*u<$h@4pd&xzwmsW2 zVtMPGaQEt}UF~EQp?%5}(dKC2_YM^2aWS z8?zo&#SLBUMHR86ui_U}N6cu}C~6n>9H&Dz&Dnf7f4EeSzT=3^4i}CZtthIB?Soh6 z<>Lz^MRU(Q*DjBzo%-|XzL8~aY{r*|o4OXqD&m%JzSes4b~H+K|1zl$+gYSxnlTZ+ zNHpXL5UWJm$b(pSvr#Re6FHPo=ZV^;QFA!y@#LxUvNsqA={zNKQC^zW`a{wd2yBaS z!7@r}Ck7XqPpb`!lH{XvDj$L==q;*>3&m{@uY^uCFbS%2(e;}3 z#()ObEjwm#^(p_+U9|d0@A7`h4~5Z<17D?u{u7=LIxB(#wA1!(7l|HK<@oZkk@zvJ zNViHB)%aifIL!$gXZ8N#!qu!DBFzz#ChyCF%8u`xy-5FcKsLBM7l#z90IT6^Kz>9r zGvT+5;K$t+67hNGdFLOGke+JJpwluWLia!|v}1#@3r?7lnq$&b>W|zp>yKHEtSK0b z)7`nWONLmE^rggPj<)X)PqCbHjYIEJUDUs1?^lyKEQT4kB*sI?RfCZdmtKRVLdU_$ z*n$!i0Z;MWPj*D85+VCK!X#iSQ3A{Fba)9q2odGjurgu&XfUcGiCuVE^kZYI3>u(u zb+yZ{JzBBT^>Ze{c&@{2NOLNOfXf6Z`GQ#W+g^NH$$|oA_$cY9I*q0-t1{i~P<9#Pgc2XtxOC$3f_wbfRp$~{NDcX%< z=sX)K-LPp?Ov>fcpU$NbnVgicksSBmAf zV?U@TSp*Fy0nX&OZJ~28WpHNv%tL#*Lj+S)!0RV>nj3n2*i=<1km%9tXp^SkH;YgS+ z>ZLOmC<#kG1;g4fbP@(ak8!$m7C4c%=NW&8=#vD+S;-e;SnGy?W;t4f_#x={Rld*> z>wNAG=n3CY`SVu!RZdw>NaeZ;M}h*{y3pDBa)>LG!KC)imi97EQi3WRiT@4$*6(Bq1j-kYx&w@BXAs1in1!HWtmZoB1D=TvomEvgUW2?wWrBC5{cCGAO% zP8!h~xRij_5|{xR8)K(oDse=A+DFo8PW_Wq;$Wbn zf9b%9cJc@M)c+V7P(Ql{9=bsPyvxx4HIO0StD)w6m-P;~VIyf?!lNFS!`M{nH6xyJ zGrdJ?xLh9!N9R#)Fi_Ar6~|UdT7-ZrJ-Vm_zXYW@m=S*Azv6D1zDpo2iA65}>60F_ ztF+y+&PR;=NhF8wkN z57RW(J5pj|JZeIX3_D3T0>HU^hQC3c-JGK-BIt~`5RgD`?qzGL3nT7jQ2zMIaymE{ zNKAQa&#P>FMA0vW%YLC>EvJVNT?1v1kay67_?{~%7b&}y zL{J;@qL_tf4#7TQs{iPkx#LFT;3^avp8jWes(88Z8_uZF%Db6jflr-bhX0xfeHXoh z({vEI(*9RZh%*Q;%-!HaDP~=8EU+)rKac(XhdhJ`h3>o%1`8JjIf4+OD|?QAw1oZw z9nkPU+SmUFxBs;TSo5W!YrY$GqQ8<5`jKeW{(CFD7<86@!VP^J4PO5~LSX-=S=!A= zs$5`0eE5GJ|A)Z;B8~2ft)BLOwIJm(49EX3O|Vn(zZB2`{$Hm4ZIFBo{6?>Q%fkQw z3mY4P4aLL4{$~XpQvd@-%p^#}z{oF$h0xW9$m_W$lRU7o4J&LPV>WQ}2(Nutw@50K zq7a%?H2&{`IF2kPPl^0*Qu5FGBN%FdxF(;OrEqpJG_ZO0D1_~v2H@aKc3P71rfD+L zln}Q~wcOn}PR6?h`}{U0J|(jr*;gi5rfG%CcS~p>&F+!LoJ9%6No|orL*q=G&tuWz zI=p^c|Hl-fTu%tZlV!gW(O*Csevwd)$HYU=+8G&0D3%^)MamZ%Y(Qc9oI&Pixf&G{ zQ^8M|HkdfA^jESiw}%levnx*J-w!FAZ22Qc(-fWKgY^b~>lrE&lM%(lJvyK;+)&?) zRBqCKB44J@>21O_Wwc7rg(I%P&*`TiS??l1{9$?r8e=}U7`YuzUv66*u7yqn1xy7I;DO)N=0`t<& zUsjTbLq0sInoOd{ovhr29GRmjcF=_R&l~a3sMi_$(FuYH}^J9i1phK0mKG^oShlnrH848+^g!sOW-F*W*XlH#5J|IJ{598A1`= zjZ_#LIO)7^r)Z;5%AZtwM^9L%j4fH~Xlx=^H+u-$h;SES4Q9&VKyhQfWtjIo9qbG= zl{Cx0y`D={4tu#mE&gFHV!$g^(G?*a$q?~6qyN=2?IgRPc1|Vva%3d3h?(NTqpE(S ze1bfhq66z;wv~0WMI=7FS0H%txl4dbkJ@ImhUZyu{K;_#SNya%vO7CT(eId=PNxc% zR!l@8uNEh+sO2pY>+S6pTceS0j4D~f=8uZVXl%x&5VjSdO}O7^x&5?hZ_U3Lb`6vw zG?w_I9C^RwZ$Vf&uJT`#_wTele&(9;l)L`2R=9*A!q%G0hG?1dnW8drM(9L=MaiOY zY@`Jlor+e{{bZMcN22f(r%Bsi_|rZXwevJhNEWXm*Ty4jBINk?HQ?rv7JfUfMW(5< zB)i6)D4ri#6=lmLBCr1?S7Q^7A1Pls<>c&b;aVu*M;W*5=5aYbr(4sb{F?06ljZ@- zQ&H|TdDa$KO#L4T=7G8u*r@K4L}k9TS;D&$x5-hAoHnCIIfbs{oc^l@1r-;wtV?YC zG2QnN?|=PvPn(4~$Zgseg--P?=~H)Xh$8uN zMqfZ3a&x{%Ci9zjpIdVvN05=x9WqHyag4l5q7}E&wV!CK7?R)h3wLX@(AD4b(3<4i zfZzFwBx}G3Ef4cjhxh*SDssGUS3NiHS;Bo~^C35`UfGl4>UqHrPG6i4qhBc-skVpH znhcw(Vk1plCfHmyOa^Zu;+E+uv3XI3q=sDlC=NZnNcpmYvWSVKCXEc;%<+A}XoN=Kv__SqyQkjw zyuunp^piLr!uM@Ulp6&0FL7#P$rTeKTOt#pHCZ`OM*i7pu}Y#FpA0r8*(|!I-w+{7 zuovkD%1hr5HB_uFKN(rP$|&WN%h-AF?puvITa(5lN9Da_ZCi=T4OF%QXWhnPvWHu` zleOENXkFvo+*8g1r`n=vwp5_|`wL#pQ%!N?cTsg4T|Lfx)siXvIs@L^VAcbM?#1sH zDo*o7U9HR^wGn>vI}c)B`qqAZxclh^rp25nguux`>=^2P933Ar1xr5?r!_jW)U_7o zT!iflKbRx=DT;hD^}yIK@-O&#a7x&hA$pFp`Zw;$gCD3@z7mCa$fm=UaiXc9+>59| z_6QFW6^?8*omsv=0`vrL7U#cQDfm2*eH1$o`?==y8t4*il8-qU|a+E_%aaqAoL4| zL|!QBloKN`rELH7#_6xc58pRIK-TGm;S6F$uO4 zYTr@xmuDpEO;GgLqlsR2FN`cCArKiIcm6^TZIrFZ>Q($5(zEM%)$Fe&_R&6SBJqz8 zeVd<@-qkT}PF|_MJTs+p-SRaMOuzSPQZW$ldfF@#=}10#>m@?z6F;;<0{6LSNL#a` zai{Cg5x)6s1GCklE21<$cep>1+fIZj`{)Z@OWtFCj$$S%)q&be7N!YWEw&tbq75`l z9?TO&y@@~ZF{N$`FT&zlWGN@u%5;)PMt*Nw7f&qy*rvtG%WtM{cDe?n%-{Uv`<>>3 zeInfEs!Z`17&ViBt|%wpUvx1}KxGiAAN-Kb^4T~b@wGCvPgMff6yqeQ)T;-3M03WC1uX-9 ziO9Kry3>Ps@k#Myx1znKV=R&L#0&7o*XR|M&Y)yU9~tJ!Ct^*@G9%Dd zwrk)jzu%!dX?ZV2n$%r{gVWD5Vmr#$Zgl3bk?h zfq%ov#9vNP@1$x_>M<2o1Cu(oc!$sq=#-4)kfSe%*Az9-UZlC#bY~#OUt$-cbb(B0 zE|}Dawm`Q?rpNRip1fk76rMmTsFi)X`e;3|aCKSdDC-x}9P;C_@_`#XsP@*IanW@L zC}%aK!&@-TAJ@9jKQ<_Cf`RWdH-)2Z&}ifEuR#Rs!)Fm$tGRW>NA1pA z%gk)10$DumUsvu)*eA=p!M$M0tD@7^&877GHL%sSJ15T`an-tZpcB<9T2_04 zcD-c!u7rh;&OOXhR#$F`=dwYUuL6_lho@HU|G4E{3=%+S2H7iZI3 zB3XMP$5M;rErVO_Z(n@72I5+>JJ{{wTIdckZ@?gsjq>-NZwISDhVOLkl@HI;znUjl ze3{Kke3M61?C&IG-492S^+T*+AH#wr)k3|*=>76Uo{=|wazjqs64cT&u-4qRH?m#SAt?NaWLc>*x&JtD~~(R z|5p*GxQh9^6eB++ilm?JHk|KE8?|=FGB{rYvjT6jSYI!o2;YkS&NanI(_J5%g;Unb zF_HE9%N^||85*TS6K8C+h_3AVpIzj;ETO*AzYvM%{=xtw%^@U1#^kI?szm7x` zec747`;qLU_}51w)5jrrpv>JtQC74;`O!yXbVwC2sy~Lvfs+TciLuuj>u2#q-*nsW%1k}*f)JP>fJ>~9=W|8*1f*67r6i2O zbz~pDP{GQJm?@>nfu93+^qCjxRhVS>P_VG{oj>MzNDpPm1q-8!Aw+n;>( zZ2pp2mU&w65?` zPwQT+enE*+@3~E8ww!+Ri3%qM)<~_~Oo=0NEVrokqCSJ-W2eN~zZ+c#V_L(1=TwSS zn56ks+`4*xL>&1Fx5aJ5ee4*Scr%0!?~#b@(5$t65X6IqSjy#@qgic@#s{g6=(V_+ zNeOJHdm$1wN)8Oj3ElDxd?&*|O(H0MY(Z1R{+?;|A8OQSk0z(ukzJ6u58G&`3my16 z)F{ZI&aCR|qte#DXNM=2`!qK;Id_?f3tl#RQ#bb41gSm0pON48>nMc!T+x;)b$alk zwwl&v6JM83>e(>~g_}9UYDYe434euxQx9WPt*#b{58jsgQt)@5TR}!d6lcoxa?zKh zcPO^tce$AYEh`3Cn=83S>2cqSH@){44DRA*`TNZJCv!3lsQTi0yko)hZ{JVd(~Y@Q zb{`aypHj8tCmzscZ-aKLW*~n6@AnqtkdLl?&MQeKR#lXNo&sXVcTDm&|wVR(DT6>OP z8_{L$(?#Embq&=13b_CcO+?=@L7$usRs8MU!3k~Taa>xv26WO7yb=#ie7~#vFkk92 z1?%E-%aoa$@$nV9WbE_>&w&RNsH~cP!Pvt3;KSGf6&ik%1uxxmyf_CTT^Hg47Ye7b z*UB%NP3RqYt)6QvWEU;E5a?xuT>~eHW^=zoK-rp^7eot*YlLw%FN6)jA48!JM2%xQhReLIR=zG(UBXE2=q2Uoy&mZl5; zMVCXzJlS!Vhv~MCj^m|eV%(nd_EkRCHSnfqWM}(+e5>Q1w$y{GY~|CC3vc1^Sc9T> zNR4cyPA`#8GF>iweb9vuC8$4j7rl3ZN51bVQw4GYzw~~XRrqZ!e|dTh{Gf!zsu-x1 z=K9H&z5DsM-jyxBWA1j(xkkc!>agb>Kf691FFm#SgxdJ=C7Vk0R>&*RM)A~PuU%C1 z$X-kosQp#ovueZ%qDvij5~jk*#nO(DtH`%8*o%f+C+p12M_=7*y9PFDa;ztQh>`^Q z#1k>GrE_aIMJN+pO1+X@iJoaTwqEJ<2dkr-So&W&xI`r=x|1-BvVX(9GCdw+Dq4A? zTx4`FKwAFIub=bll(YBZsf5ukgZ`S+1M6?)_#KeWV)TivtP7ZU2~=ROl}9c~t3jfj zoVlcE)te?-zD%aC1 z&NZp%{-f}1;c%F)B5}I3lWtUjVxhVrgEt2$gYzW6b?72Y(Z)>ajq>eta@-HkDdY-q z^mN_w-HX0T`E9O~Wh*`CXL?S-e9IeOm%)*m0zXR6seZQ*|57F4Ga;Rn+x}9OH%FH4 zT?kL18#nZoq)hoon@?U6fdt`4M5Z$SR@NGvPW5A??7CmlDiU2NT~JHN&8^UPdbQLX zX+$`;&)_;rPR$wmvqU&V{1AL9_Bpvmx>@1~X1yzvIR_=okO;>H2QI-;LjlK3Q?8he zHY`-6dM^1wskPJbj>dZLVsftlvGX8^D8F6U$8(mbr{4|KI_-;bTkmGs{|^xy;;Skit$A-}mGPIVm7j zmh2R*KAe>Zuse9V(*&QF{O9x%Y?Jcuf%iN31brF#_j}6if9aw}@R^G{2cNz8z?;85 z@~MgPFE|8x;I12X&Tn{vp{wlFf7nCwacigHUr`)?q5%tMWdkimYshPvW4;-1YIJ$S zdJ4K*8(LWO03g?B;n8feqRHOy3O>1Ea0lr)d?Ojy9Bhd$>nZ=D)D-@!=n~KuJJ`t)GB4M3Vq}-H@~dSx>e+KyxShJER272FTX`@OEP= z^6eXgS<8;!sC_5WcX%%PCr!q-+Ko2Q+=4n^u?_@!v< zzZ)>9(O!k=UKWc)eg-6a^#I5cmo|SWMExfd$N?bsm@m;($Bd{)7@z>KW;_5~Ij007 z0Mls!YXt+qwCR>=$M7QN4h1^FHT4-+0Iz_U4y0kI&<%FhrIJVRmwzw|1*gJW4**KB zN5JjR+gMNth2qLO695D5Y{cTwHiX{B+Qyi~C|v9YZin*YN#K(vVF01Tc@)@@y5DVK zq8~6`*(?EAVNf~xP+dTV02~Qmz~BL>dsPc;l{&2wFw{FCm_Q>S1n9~;6au3F00p*` zL}Bz6VuZ(`)R4t!00{pa`dF9)iV=_guXhhXFiYa)y$z-3Dxrk8i$*a*Z-)am?d=eo z_OQ^i>D3s_Wfgs=|*A9n;J?}Ba-KaIuzXp2w z5&%*@GF{LTm{5>m$gKkK1;ya;%bBy0?p*g1HxC$)0D2chx=nEVvE;8TF{8ptLTm~{ChR|Uc9jliUv1Aqt&WDf4gmM0)BW=C$Tcv!34DpbAzEgDssb=M zxjUqbXzBoc9RFwbGr|RoQPB4QEJ4$oy8zZ(^fwH^0j8d{wc}m`3u53kKN)}>ihdw- zTN9KHmk47OAd;Z4O19%t+#1az}5J+P5eT9*H%Ao8Qg_+1-EM}uGc^>n$(n3e< z)fskCs2-R7r*|2)%MB z^5~F_$|e3|WR^GsKlgdmp5LkkftG+@j_9Mj9U2VY(lY`Ghio^lgz{hdhl_y``~z$U z*d*lnb`kC|I)hRY6Dfo=1EKqajpRCcR}4iy)xBbTf*-pD55w0OU$wlNl;)v-H$US} zuJEz@;bLpYNyXJ;*6+3Ky8vo3{Ix!r%AV2F0vnGhWp3L|j7XO5Tkn2ZvF%0k-;2nc@h^4UF5s*(m+~DgBlHBV~V4*6Mb~Y z;KxpiTsE-sn7>;Ck<2R+6G>azx4y*C)6s~NGcISk$t3J1I}|Qu?vb(|CDfA9wN);; z1vi|2E5sGzuak$6!QD$d6mjIM23FPyw>0M#f^3BiBv8Yi z9mK(>==HmBc0rFgiJ%wEr;B>!eq0TsE`I|O8#2ADFxvxTSNJWD{X+4YYCN4rMLsip zaV>}_4`{tzD$d@wDUvu`GT7;08Q2XLRyf7 z!$z<0RxH`C`D`!@z;-u$kqMiQE~=gqzF+tf$-Fi=p~b&8^QCMCj8i}G4_g^2K&v(V zgmPeNS&((-V}yWI&@;c%z+1w6WG;dnUIGrU!$u+ycdu~B{VuG;Gw3B-emUgBm61H7 zT*3?sU)yY+aXi?Q>=})z#f3gwtUc*ky?=IVu;GwA^Xa-)gRRLF-?~{09m_+u0*g;k zB(_v0MQjUW5BB_KaP4VGFa?h2OFloKPW?(A)vi~LEwR^LoGNT(*%+|KYpnC zVC(222=${TprM_^bz1uSg6>1_{$e&hnJ+tjH}C;^EX_ceL)gx(6dLN7`a3i)lB?^s zRXzOqFt=*mhNKgPvOC_>lQ(q43kgQIy9RxBz56)LRhlQwGJ|VBOfMgGyH7Rjoy#j9 zidNCLul%KL?=q|5&hV(2F+6Yfpb4_3JGNq7Y1l2vic7q<6DP>+Y>OYvdtIb+7g}o11>>lr}{hd zT{nO+#QP)0XPb#sHZuMM#GRls{CL%WU|qmLDTUkG6F(lxCCnEWt$Wd^FB2%{!K+d< z!mY=UVc~ZOr^-mz>oe7U2i5T*TZ|6o8I8=Me<93wqy0R7Y-LT$#nl`FyJ#=jkra?` zDNkP6@YnL_Z%~W_PoOr;t_)#UCVy{jTMHFc>rW(_htMrQr;kD*uY$iIrS@jfID-xP z5R`w4Y%RKuSW30m;jwvQ*LrT~+&AIq;~rar`>ar3+4ksGN-FmGH)Jjp>lV*ppD49d zrWV5>B>ud&ZPB;^dQ1I{ST_jvycMRk-Y61_7yf;|@zt+$6NynQs7uFOI*%M7D@Z z+Ug6_mr41tFRu$VY#vsO-*N1ikr{EVc8g5EBtUxGOF+rYqv2;{!e)e{ogyuBMo5 ztQE}iNnR{%`-2>($`7)r;MMAJ6e6xjaS9A1rQ;4GZ)TTBk z4fM>O?epQ!9|8*6yr!>B5UT&))a#=7S4OLX!}JN${@3xBPEj{J{+%H8PaQLqLR=1f zP|)PQoxziwF*9^#9z~w;L$2v4-@5A(I$nU?{`RJK@XE%j-`AC_Ms1|} z0A1C3c(!v1QZVrrMrw=!%KWJGDGC?@`yyre#ZM3`rZ7$n58guVEje!2&HzNot8_l& zwwA52n<)okZZIi_*NG;cRt9^oGp&EA7X2$KXs?E6i=}Dvrg^IDgt158%Ga7-rcd;E z5O4V+VGXOj;zkPDmHi5iis1`jbQs2uFR^guw>=~VLB2o_`MI4Xkw;D9Rg4;k~t?7zkyT$g{r@E{0n>QCi>3OyCaxJ&7FjXu2wmMk{gAVJCb0Zau278 zJ||N4R#PVb5s@#2Q4-r^HJm6}1C$#l*4bxxJ4;9=9<>ubJGAe;4=<1)Zc7tSGkQVY z2JQ9%6JOCjTh|_#Txok#r48#aIEyp-s zulfQ7vsbl-b-lZWMxzdhXZ87{jaV-~B-f<+5{@^QS4NvYwV#7z%AP0r0A`@LfE?N( zV@1P+t7m-8Y98z_3KQhqt|CZ{((?z8r$r!qZ?5)w1_&2^S#a#wYw31m5EpUdk-S6= zLBnc0dQ%NF3+X&Ak?~pWi-5F5-YbulsLQzfZ7 zC(ix&*&VCJhB$LyU#!$o1{wD8W~7KnVXsH*lNWQ+r-t&a%8u5zNqn4KJHUI7lo3+) zjFK6%P4{zhJwPxr_?6i2A9|1jrX8oezl2MQ8qWVV@@6=n-DX*3-l5ebi$mToau&jl zxnk)D9(@o`Q;1tra3_{q>&rHmUNca&-sCzaq_;=pU51(eTG9D@JP6cW6TSP2i4*drJwXUD1GlPzt}&ncV+G_t8((4aO)3#kX;=>KaKh0 zHrLQxHGq%o?CBYVl;krCD%Xm?)8sz(b4E{nT(ljPo;5kuA7cEP8Iuj zTBz;USP1sXsng{$H`S>d?k*=IdkwTw&Cq}Osa+xl-<^aKVvO5wO+l+6w2i%JlXGhu zAr({+5ZID+A8!5H!TctWJ%0T@6TE%zDHf!ryT&-pCzHK=sFsjagW5w&gQeA4#1MvhKjd|e?1k7uV@+m(?%4FyzR9HBzXfyoeyH~-b6uhR-8B5i( z`&4q)Ud}0#+xC(ao`xjsZ^Y!Mhm?H`7YZ#bLBQKBfB~9ftgdd8NObBcwH$ms;-r>$ z=q}0$f2RXc__^~$X%pUTnbX0^aWb*&aX*hH<^-U45CUL@B0YKm?t_9;g+?576arsn zO05aP5~Aznky}m=EEmR@^y2G0>2Nit+o2YyQK?KDhDJzD5@@%e7)rwM?LWS1EjQ7L zwAJ@ht$ZmNgEsSuQxCGepcV(TEQ34jOkg;#$OFHd3xs_Z*4%+|+|T-(gow1|$z;E| z4fimgKm3Aq?ix_{|0)LvO;i_BEZh=MM*LX#eSDMPz(%1o5?q=9?M`1k7VsKS!v)(w zx7UE*Lf;&H&=@gw;I3likiAq94qAZyzjvlQ}ay6YfRFAO|&K%OLKaZJ{T6(iDad@#YphP$O{*B4>-0*^B5wF z;@D)9@9F#LP&Na_Gsw73W-Jv%h99H`cZOZtJDk4obps46Bu9par9y{zd8iP)h-Bc_ zM72*$I@j<{47__bWVLc+YtnIVp@Vz%Gd7v?Vq=VJtA=&G{VERW+z$V-nD!M*Q>@>q z`Nq+07_C#Usmf)=2pBV13;kFF#fJqosu(%0#_b4;Ql#gT(VDg0f-0B=X8S50&IqNh+uVRpodJzJcg(u%qBmjcjM7wV%sTT58B@|!<>H^1b!WLI z>ntB@PViq6?Elh-)hnxR5V9usd5#rlD##uxl1c2g8ME0*S1v}>9sZBSdg1i*(^*q@ zb9YQWpj=6k1iMG=*s}I63cqH3_(+y z%;#TU9+J*64A5i8V&0^cU#78%KadU`EU>?6d=`Yw_+qhmzl?g?w9efhlKq}Z7O7uj zx4q>$?>n2HAqK6Zz6ERz1U}Y2z)==Ig{^npQ3Ev1giHIokh-G-!7Zrb2SrYXd55Xz z!DcrIr9b?!n0p8ok`CbBX?SH zub?(DjZo1;FM=Vdv_Btqd~Wp+z;sUAtkfz<7%jg*r#>b`0I_fU7{p#XC9H@gN9p}K zlV}dQrd;Q>GowL*;qr&4*4qn^PoitpUIUU2N#p}>!+(k_WL3$nba%m|HU_{53N-cl zBB8Uu$B^4A7WxkJ7ZiOpFhYQNX?l#rOFr`TeNAnp@i+nE?Bi}RTKg{$`d&Z`@$Mns zNl%+=)bh9?nI?H>^bD8)?JIgDn(OeRrnS=RJ7Q~X+Xa+Ilb|!d?={U)G?X2Y-u(c_ zt0I}52<^#CUfzT)v#rg#BN(PM?lI%r&ShidMJsLps*(S&NKnhk*wX%!bOUzatiW(< zvo(fA_?vvQk$H7}z8+2mmpCDUiA;03s0<-hVc=ckLc^KXrbXuio7S_2$ zzbGi@$z2g7>7Qo*X5T{ZfX<4J2UL)7po7&~!H}3QhBadW&FAx_iQKag@egheD4OXk z`#xWKH1=i{qI;G6@D=jsC@34Wg+^0@sx{~&mh7Q~Hdhge;JWibJ4(}BYLgADiSsuj zGFr#+J{Hn7txmUwqGtZRmY# zN{WupQAWUnYU`EI1_hI(($U+iF@gEF=^$12>hRYsgIp95t%%nnIrgNhV&*+xO!2xh zXq9OYr-H*~Ne{(0b>yGJV~^>Kum4j_EUIT`C*EUIu9pnMC~e#_t1*Dsn!jte(wL)6 z%w#%+y9R&{xA+REU2thlgRDcq(%Bj={#JQh2}V#%N7G%4|G5X{1W&p^(p)_dV`#n_ ziJ-YrzGTiHpWj&mCWkDDj9!m)t1@y1rz42>hEG=_(1#wN!e>v%0O+v4n-n}lnN@88 z+zhrAJL5q22jl~j`XSScnH^A_L*CbUO+72>W{&aH0Qd&Y_RO}ZolkkTuC{{7y9fn( zZlquMw?&x=%)Xzy#uS9#8R=IAdFdfj7q`$66GDyBYl+J-BW;!&lHuzgNN;#_aezqI-GkW^lb zP}o+_U_BB9GBcGr8Xa$zY{B#4(}!My92F+Sk#roCjcBPgaT$~jGv_Tty1m{FOWj!P z7IEl7T6q&!&xsB#`Y5+@JZL>%-5>Z#p5NNL4)dKKC)bP}DsP4#PDJJbzy@*s2EzNT z%WFLZWCd14#n1BZHYYt5KbmB|y`rcPRJ7rW+;H!VSDkC*(FVYbR5gs=LX-Uzr-S&hL#t*^SK3Ur}$*rx_k+i&b%yq};MC zgzr0e)!7}X{&YDyOMR0+_uk4T87Ca7SO3w?rwdD3cI+zq)% zROd-GNv5Tv$Q}STInRTZ83}f6HpY;flrnCP);^M_(yUCguTOhWJ(k z56Cx*=j8~j+HuQ+3Y9Me*W3ti+FPbvA_)~AXBO(u7HB15+$xA0lgB~WfOJ+f&}I_6 z_N9)sTRxnz3m$;UpqGFihpq|0H|`c7S@Dt-Is2kFjZ8DfB#pu25LW`AUG$$=072XU zH#+-l_{0tkCUFQnWb7KUslbcRWnWuLdmHnMtm$t_n}(r)ZB;rO5=`Aw+6A3J;?1IlGu>| z>UUm*!e2M`fs^SD(nIxf7SdCPzu3%*wV9?7gHA}YJ=x4oGmd(-iIS-4`$MU%o?}1%?5teNe}b<#tiOq{cww;ADA=tI@@uc-=bL3+ECuiciOMeX-=6@s<;u zp!;qnrTc&V(Hrt*AQ>3uAm@SN;ox)xbhRqXL%KCwx-Y5EIVeoDHts^$EBuOzJ%g!x zfP_l(oV0Y`Jfg3fM8t31kHjjn)U;rorpB>XMj*eg_z7uc%=NykfiH5h1_>k;M~=wSE>eS31@EThPQ7g(+YTkc2gp6u z`=3^f3W0c-kFfP+kQRVi%9-swP-p-jL{5F=tpVoRX+~l*Lb5v4#LFxyjWGn<|C0keWTxdqC zh|BYxDa9MJ6<^C^=@l8Vq>aJ^ESwB`gQUw$3Hj4Q5!NdNwc!9{p3*v{pYb2dKWx<7 zPf0{+H!+C;2F8>n&WV} z#au)zQLJEEiPfAee>Yt*?CBRaP9NXYj0opQi%vL4)X=ArWvj?fxSKGl0K+81l&@w1 z@Ap2v&q5&hNR;j?y{5Ou($zp-7PNee0oFUhvpHh(WtSO!#pkLb>=-V z>%e|*X$sd;Vb&D4ga$ZaXCOyHBPvJYkE{X1yQ{T;B0jkTi7|pE-vo%Wk~?i?78pJ5 zP}zcU2kNIB%p7wocoQ2HqRiN*@lj~WtV8v~9p=nr6VrUs1XTNJt2_}MFyR7HZ8w|Z zY2k_e0PVAx2oG9s;MWK<-FUJkklxvezjnCv2cLqxizi!x3Lh!lg6g~hEMf*v=P @@ -111,7 +113,7 @@ This page is a sample of page using tables. It is designed to make test with
-

Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd => Use this for tables that are edited forms

+

Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd => Use this for tables that are edited forms (drag and drop of lines does not work for this case, also height of title can't be forced to a minimum)

- + snake trans('zzz'),1,$_SERVER["PHP_SELF"],'','','','align="center" class="tagtd"',$sortfield,$sortorder); ?> @@ -248,62 +250,62 @@ $('xxxth').replaceWith( line1 dfsdf - xxx + xxx line2 dfsdf - xxx + xxx line3 dfsdf - xxx + xxx line4 dfsdf - xxx + xxx line5 dfsdf - xxx + xxx line6 dfsdf - xxx + xxx line7 dfsdf - xxx + xxx line8 dfsdf - xxx + xxx line9 dfsdf - xxx + xxx line10 dfsdf - xxx + xxx line11 dfsdf - xxx + xxx line12 dfsdf - xxx + xxx @@ -313,14 +315,20 @@ $('xxxth').replaceWith(

Example 3 : Standard table => Use this if you need the drag and drop for lines
use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; +$sortfield='aaa'; +$sortorder='ASC'; +$tasksarray=array(1,2,3); // To force having several lines +$tagidfortablednd='tablelines3'; +if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; ?> - - - - +
title1title2
a1b1
a2b2
+ +trans('title1'),0,$_SERVER["PHP_SELF"],'aaa','','','align="left"',$sortfield,$sortorder); ?> +trans('title2'),0,$_SERVER["PHP_SELF"],'bbb','','','align="right"',$sortfield,$sortorder); ?> +trans('title3'),0,$_SERVER["PHP_SELF"],'ccc','','','align="center"',$sortfield,$sortorder); ?> + + +
a1b1c1
a2b2c2

diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 42bf78a0745..4744f7b630c 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -443,11 +443,13 @@ textarea.centpercent { .movable { cursor: move; } - .borderrightlight { border-right: 1px solid #DDD; } +#formuserfile_link { + margin-left: 1px; +} /* ============================================================================== */ /* Styles to hide objects */ @@ -1906,7 +1908,12 @@ table.liste td { color: #202020; } - +div.liste_titre .tagtd { + vertical-align: middle; +} +div.liste_titre { + min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */ +} tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr { height: 26px !important; @@ -2921,7 +2928,10 @@ div.dolEventError h1, div.dolEventError h2 { { text-decoration: underline !important; } - +.paginate_button +{ + font-weight: normal !important; +} /* For jquery plugin combobox */ /* Disable this. It breaks wrapping of boxes .ui-corner-all { white-space: nowrap; } */ diff --git a/htdocs/theme/md_dev/style.css.php b/htdocs/theme/md_dev/style.css.php index 4d3e0937e4d..7d171d25c3a 100644 --- a/htdocs/theme/md_dev/style.css.php +++ b/htdocs/theme/md_dev/style.css.php @@ -455,6 +455,10 @@ textarea.centpercent { { border-right: 1px solid #DDD; } +#formuserfile_link { + margin-left: 1px; +} + /* ============================================================================== */ /* Styles to hide objects */ @@ -1990,6 +1994,12 @@ table.liste td { } +div.liste_titre .tagtd { + vertical-align: middle; +} +div.liste_titre { + min-height: 26px !important; +} tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr { height: 26px !important; @@ -3019,6 +3029,10 @@ div.dolEventError h1, div.dolEventError h2 { { text-decoration: underline !important; } +.paginate_button +{ + font-weight: normal !important; +} /* For jquery plugin combobox */ /* Disable this. It breaks wrapping of boxes From 2632b8e25bb7a2b2e31ebe43927974a88f7450e7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 21:26:13 +0100 Subject: [PATCH 174/412] Update test page to prepare datatables architecture. --- htdocs/public/test/test_arrays.php | 110 +++++++++++++++-------------- 1 file changed, 57 insertions(+), 53 deletions(-) diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index ea0791dc984..7cbd9898204 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -113,47 +113,27 @@ This page is a sample of page using tables. It is designed to make test with
-

Example 1 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd => Use this for tables that are edited forms (drag and drop of lines does not work for this case, also height of title can't be forced to a minimum)

+

Example 1 : Standard table => Use this if you need the drag and drop for lines
+ use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; +$sortfield='aaa'; +$sortorder='ASC'; +$tasksarray=array(1,2,3); // To force having several lines +$tagidfortablednd='tablelines3'; +if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; ?> -
-
-
line3
-
dfsdf
-
ffdsfsd
-
aaaa
-
-
-
line4
-
dfsdf
-
-
bbbb
-
-
-
line5
-
dfsdf
-
-
bbbb
-
- - -
+ + +trans('title1'),0,$_SERVER["PHP_SELF"],'aaa','','','align="left"',$sortfield,$sortorder); ?> +trans('title2'),0,$_SERVER["PHP_SELF"],'bbb','','','align="right"',$sortfield,$sortorder); ?> +trans('title3'),0,$_SERVER["PHP_SELF"],'ccc','','','align="center"',$sortfield,$sortorder); ?> + + + +
a1b1c1
a2b2c2
+
@@ -312,25 +292,49 @@ $('xxxth').replaceWith(
-

Example 3 : Standard table => Use this if you need the drag and drop for lines
+

Example 3 : Table using tags: div.tagtable+div.tagtr+div or div.tagtable+div.tagtr+div.tagtd => Use this, but AVOID IT if possible, for tables that need to have a different form for each line (drag and drop of lines does not work for this case, also height of title can't be forced to a minimum)

+ use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; + $tasksarray=array(1,2,3); // To force having several lines + $tagidfortablednd='tablelines'; + if (! empty($conf->use_javascript_ajax)) include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php'; ?> - - -trans('title1'),0,$_SERVER["PHP_SELF"],'aaa','','','align="left"',$sortfield,$sortorder); ?> -trans('title2'),0,$_SERVER["PHP_SELF"],'bbb','','','align="right"',$sortfield,$sortorder); ?> -trans('title3'),0,$_SERVER["PHP_SELF"],'ccc','','','align="center"',$sortfield,$sortorder); ?> - - - -
a1b1c1
a2b2c2
-
+
+
+
line3
+
dfsdf
+
ffdsfsd
+
aaaa
+
+
+
line4
+
dfsdf
+
+
bbbb
+
+
+
line5
+
dfsdf
+
+
bbbb
+
+ + +
+ + Date: Sun, 22 Mar 2015 22:25:26 +0100 Subject: [PATCH 175/412] css fix --- htdocs/theme/eldy/style.css.php | 2 +- htdocs/theme/md_dev/style.css.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 4744f7b630c..a6de7baa28d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -682,7 +682,7 @@ div.tmenuleft dol_optimize_smallscreen)) { ?> width: 5px; height: px; - background: url() 0 0 no-repeat; + background: url() 0 -6px no-repeat; } div.tmenucenter diff --git a/htdocs/theme/md_dev/style.css.php b/htdocs/theme/md_dev/style.css.php index 7d171d25c3a..927a0c35266 100644 --- a/htdocs/theme/md_dev/style.css.php +++ b/htdocs/theme/md_dev/style.css.php @@ -1998,7 +1998,7 @@ div.liste_titre .tagtd { vertical-align: middle; } div.liste_titre { - min-height: 26px !important; + min-height: 26px !important; /* We cant use height because it's a div and it should be higher if content is more. but min-height doe not work either for div */ } tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr { From 5c36bb94f269deda3edbfe2ed7fd16172480d2a9 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 22:29:52 +0100 Subject: [PATCH 176/412] Work on theme material design --- htdocs/core/lib/usergroups.lib.php | 5 +++-- htdocs/theme/md_dev/thumb.png | Bin 3839 -> 0 bytes htdocs/theme/{md_dev => md_exp}/.gitignore | 0 htdocs/theme/{md_dev => md_exp}/AUTHOR | 0 .../theme/{md_dev => md_exp}/ckeditor/config.js | 0 .../theme/{md_dev => md_exp}/ckeditor/index.html | 0 htdocs/theme/{md_dev => md_exp}/graph-color.php | 0 .../theme/{md_dev => md_exp}/img/1downarrow.png | Bin .../img/1downarrow_selected.png | Bin .../theme/{md_dev => md_exp}/img/1leftarrow.png | Bin .../img/1leftarrow_selected.png | Bin .../theme/{md_dev => md_exp}/img/1rightarrow.png | Bin .../img/1rightarrow_selected.png | Bin htdocs/theme/{md_dev => md_exp}/img/1uparrow.png | Bin .../{md_dev => md_exp}/img/1uparrow_selected.png | Bin .../{md_dev => md_exp}/img/1updownarrow.png | Bin htdocs/theme/{md_dev => md_exp}/img/addfile.png | Bin .../theme/{md_dev => md_exp}/img/background.png | Bin .../{md_dev => md_exp}/img/bg-bas-rubrique.png | Bin .../theme/{md_dev => md_exp}/img/bg-rubrique.png | Bin .../{md_dev => md_exp}/img/bg-titre-rubrique.png | Bin .../theme/{md_dev => md_exp}/img/button_bg.png | Bin .../theme/{md_dev => md_exp}/img/button_edit.png | Bin htdocs/theme/{md_dev => md_exp}/img/calc.png | Bin htdocs/theme/{md_dev => md_exp}/img/calendar.png | Bin htdocs/theme/{md_dev => md_exp}/img/call.png | Bin htdocs/theme/{md_dev => md_exp}/img/call_out.png | Bin htdocs/theme/{md_dev => md_exp}/img/close.png | Bin .../theme/{md_dev => md_exp}/img/close_title.png | Bin htdocs/theme/{md_dev => md_exp}/img/delete.png | Bin htdocs/theme/{md_dev => md_exp}/img/detail.png | Bin htdocs/theme/{md_dev => md_exp}/img/disable.png | Bin htdocs/theme/{md_dev => md_exp}/img/edit.png | Bin htdocs/theme/{md_dev => md_exp}/img/edit_add.png | Bin .../theme/{md_dev => md_exp}/img/edit_remove.png | Bin .../theme/{md_dev => md_exp}/img/editdelete.png | Bin htdocs/theme/{md_dev => md_exp}/img/error.png | Bin htdocs/theme/{md_dev => md_exp}/img/favicon.ico | Bin htdocs/theme/{md_dev => md_exp}/img/file.png | Bin htdocs/theme/{md_dev => md_exp}/img/filenew.png | Bin htdocs/theme/{md_dev => md_exp}/img/filter.png | Bin .../theme/{md_dev => md_exp}/img/folder-open.png | Bin htdocs/theme/{md_dev => md_exp}/img/folder.png | Bin htdocs/theme/{md_dev => md_exp}/img/gradient.gif | Bin htdocs/theme/{md_dev => md_exp}/img/grip.png | Bin .../theme/{md_dev => md_exp}/img/grip_title.png | Bin htdocs/theme/{md_dev => md_exp}/img/headbg.jpg | Bin htdocs/theme/{md_dev => md_exp}/img/headbg2.jpg | Bin htdocs/theme/{md_dev => md_exp}/img/help.png | Bin htdocs/theme/{md_dev => md_exp}/img/helpdoc.png | Bin htdocs/theme/{md_dev => md_exp}/img/high.png | Bin htdocs/theme/{md_dev => md_exp}/img/history.png | Bin htdocs/theme/{md_dev => md_exp}/img/index.html | 0 htdocs/theme/{md_dev => md_exp}/img/info.png | Bin .../theme/{md_dev => md_exp}/img/liste_titre.png | Bin .../{md_dev => md_exp}/img/liste_titre2.png | Bin htdocs/theme/{md_dev => md_exp}/img/lock.png | Bin .../{md_dev => md_exp}/img/login_background.png | Bin .../theme/{md_dev => md_exp}/img/logo_setup.svg | 0 htdocs/theme/{md_dev => md_exp}/img/logout.png | Bin .../theme/{md_dev => md_exp}/img/menus/README.md | 0 .../{md_dev => md_exp}/img/menus/agenda.png | Bin .../{md_dev => md_exp}/img/menus/agenda_over.png | Bin .../theme/{md_dev => md_exp}/img/menus/bank.png | Bin .../{md_dev => md_exp}/img/menus/bank_over.png | Bin .../theme/{md_dev => md_exp}/img/menus/chart.png | Bin .../{md_dev => md_exp}/img/menus/commercial.png | Bin .../img/menus/commercial_over.png | Bin .../{md_dev => md_exp}/img/menus/company.png | Bin .../img/menus/company_over.png | Bin .../theme/{md_dev => md_exp}/img/menus/ecm.png | Bin .../{md_dev => md_exp}/img/menus/ecm_over.png | Bin .../img/menus/externalsite.png | Bin .../img/menus/externalsite_over.png | Bin .../theme/{md_dev => md_exp}/img/menus/ftp.png | Bin .../{md_dev => md_exp}/img/menus/ftp_over.png | Bin .../{md_dev => md_exp}/img/menus/generic1.png | Bin .../img/menus/generic1_over.png | Bin .../{md_dev => md_exp}/img/menus/generic2.png | Bin .../img/menus/generic2_over.png | Bin .../{md_dev => md_exp}/img/menus/generic3.png | Bin .../img/menus/generic3_over.png | Bin .../{md_dev => md_exp}/img/menus/generic4.png | Bin .../img/menus/generic4_over.png | Bin .../theme/{md_dev => md_exp}/img/menus/globe.png | Bin .../{md_dev => md_exp}/img/menus/globe_over.png | Bin .../{md_dev => md_exp}/img/menus/holiday.png | Bin .../theme/{md_dev => md_exp}/img/menus/home.png | Bin .../{md_dev => md_exp}/img/menus/home_over.png | Bin .../{md_dev => md_exp}/img/menus/index.html | 0 .../theme/{md_dev => md_exp}/img/menus/mail.png | Bin .../{md_dev => md_exp}/img/menus/mail_over.png | Bin .../{md_dev => md_exp}/img/menus/members.png | Bin .../img/menus/members_over.png | Bin .../theme/{md_dev => md_exp}/img/menus/money.png | Bin .../{md_dev => md_exp}/img/menus/money_over.png | Bin .../{md_dev => md_exp}/img/menus/pointofsale.png | Bin .../img/menus/pointofsale_over.png | Bin .../{md_dev => md_exp}/img/menus/products.png | Bin .../img/menus/products_over.png | Bin .../{md_dev => md_exp}/img/menus/project.png | Bin .../img/menus/project_over.png | Bin .../theme/{md_dev => md_exp}/img/menus/shop.png | Bin .../{md_dev => md_exp}/img/menus/shop_over.png | Bin .../theme/{md_dev => md_exp}/img/menus/tools.png | Bin .../{md_dev => md_exp}/img/menus/tools_over.png | Bin .../theme/{md_dev => md_exp}/img/menutab-r.png | Bin .../theme/{md_dev => md_exp}/img/nav-overlay.png | Bin .../{md_dev => md_exp}/img/nav-overlay3.png | Bin htdocs/theme/{md_dev => md_exp}/img/next.png | Bin .../{md_dev => md_exp}/img/object_account.png | Bin .../{md_dev => md_exp}/img/object_accounting.png | Bin .../{md_dev => md_exp}/img/object_action.png | Bin .../{md_dev => md_exp}/img/object_action_rdv.png | Bin .../{md_dev => md_exp}/img/object_address.png | Bin .../img/object_askpricesupplier.png | Bin .../{md_dev => md_exp}/img/object_barcode.png | Bin .../theme/{md_dev => md_exp}/img/object_bill.png | Bin .../{md_dev => md_exp}/img/object_billa.png | Bin .../{md_dev => md_exp}/img/object_billd.png | Bin .../{md_dev => md_exp}/img/object_billr.png | Bin .../theme/{md_dev => md_exp}/img/object_book.png | Bin .../{md_dev => md_exp}/img/object_bookmark.png | Bin .../{md_dev => md_exp}/img/object_calendar.png | Bin .../img/object_calendarday.png | Bin .../img/object_calendarperuser.png | Bin .../img/object_calendarweek.png | Bin .../img/object_category-expanded.png | Bin .../{md_dev => md_exp}/img/object_category.png | Bin .../{md_dev => md_exp}/img/object_commercial.png | Bin .../{md_dev => md_exp}/img/object_company.png | Bin .../{md_dev => md_exp}/img/object_contact.png | Bin .../img/object_contact_all.png | Bin .../{md_dev => md_exp}/img/object_contract.png | Bin .../theme/{md_dev => md_exp}/img/object_cron.png | Bin .../theme/{md_dev => md_exp}/img/object_dir.png | Bin .../{md_dev => md_exp}/img/object_email.png | Bin .../{md_dev => md_exp}/img/object_energie.png | Bin .../{md_dev => md_exp}/img/object_generic.png | Bin .../{md_dev => md_exp}/img/object_globe.png | Bin .../{md_dev => md_exp}/img/object_group.png | Bin .../{md_dev => md_exp}/img/object_holiday.png | Bin .../img/object_intervention.png | Bin .../{md_dev => md_exp}/img/object_invoice.png | Bin .../{md_dev => md_exp}/img/object_label.png | Bin .../theme/{md_dev => md_exp}/img/object_list.png | Bin .../{md_dev => md_exp}/img/object_margin.png | Bin .../{md_dev => md_exp}/img/object_opensurvey.png | Bin .../{md_dev => md_exp}/img/object_order.png | Bin .../{md_dev => md_exp}/img/object_payment.png | Bin .../{md_dev => md_exp}/img/object_phoning.png | Bin .../img/object_phoning_fax.png | Bin .../{md_dev => md_exp}/img/object_product.png | Bin .../{md_dev => md_exp}/img/object_project.png | Bin .../{md_dev => md_exp}/img/object_projectpub.png | Bin .../img/object_projecttask.png | Bin .../{md_dev => md_exp}/img/object_propal.png | Bin .../{md_dev => md_exp}/img/object_reduc.png | Bin .../{md_dev => md_exp}/img/object_resource.png | Bin .../theme/{md_dev => md_exp}/img/object_rss.png | Bin .../{md_dev => md_exp}/img/object_sending.png | Bin .../{md_dev => md_exp}/img/object_service.png | Bin .../{md_dev => md_exp}/img/object_skype.png | Bin .../{md_dev => md_exp}/img/object_stock.png | Bin .../theme/{md_dev => md_exp}/img/object_task.png | Bin .../{md_dev => md_exp}/img/object_task_time.png | Bin .../{md_dev => md_exp}/img/object_technic.png | Bin .../theme/{md_dev => md_exp}/img/object_trip.png | Bin .../theme/{md_dev => md_exp}/img/object_user.png | Bin htdocs/theme/{md_dev => md_exp}/img/off.png | Bin htdocs/theme/{md_dev => md_exp}/img/on.png | Bin htdocs/theme/{md_dev => md_exp}/img/pdf2.png | Bin htdocs/theme/{md_dev => md_exp}/img/pdf3.png | Bin htdocs/theme/{md_dev => md_exp}/img/play.png | Bin htdocs/theme/{md_dev => md_exp}/img/previous.png | Bin htdocs/theme/{md_dev => md_exp}/img/printer.png | Bin htdocs/theme/{md_dev => md_exp}/img/puce.png | Bin htdocs/theme/{md_dev => md_exp}/img/recent.png | Bin htdocs/theme/{md_dev => md_exp}/img/redstar.png | Bin htdocs/theme/{md_dev => md_exp}/img/refresh.png | Bin htdocs/theme/{md_dev => md_exp}/img/reload.png | Bin .../theme/{md_dev => md_exp}/img/rightarrow.png | Bin htdocs/theme/{md_dev => md_exp}/img/search.png | Bin .../theme/{md_dev => md_exp}/img/searchclear.png | Bin htdocs/theme/{md_dev => md_exp}/img/setup.png | Bin htdocs/theme/{md_dev => md_exp}/img/sort_asc.png | Bin .../{md_dev => md_exp}/img/sort_asc_disabled.png | Bin .../theme/{md_dev => md_exp}/img/sort_desc.png | Bin .../img/sort_desc_disabled.png | Bin htdocs/theme/{md_dev => md_exp}/img/split.png | Bin htdocs/theme/{md_dev => md_exp}/img/star.png | Bin htdocs/theme/{md_dev => md_exp}/img/stats.png | Bin htdocs/theme/{md_dev => md_exp}/img/statut0.png | Bin htdocs/theme/{md_dev => md_exp}/img/statut1.png | Bin htdocs/theme/{md_dev => md_exp}/img/statut3.png | Bin htdocs/theme/{md_dev => md_exp}/img/statut4.png | Bin htdocs/theme/{md_dev => md_exp}/img/statut5.png | Bin htdocs/theme/{md_dev => md_exp}/img/statut6.png | Bin htdocs/theme/{md_dev => md_exp}/img/statut7.png | Bin htdocs/theme/{md_dev => md_exp}/img/statut8.png | Bin htdocs/theme/{md_dev => md_exp}/img/statut9.png | Bin htdocs/theme/{md_dev => md_exp}/img/stcomm-1.png | Bin .../{md_dev => md_exp}/img/stcomm-1_grayed.png | Bin htdocs/theme/{md_dev => md_exp}/img/stcomm0.png | Bin .../{md_dev => md_exp}/img/stcomm0_grayed.png | Bin htdocs/theme/{md_dev => md_exp}/img/stcomm1.png | Bin .../{md_dev => md_exp}/img/stcomm1_grayed.png | Bin htdocs/theme/{md_dev => md_exp}/img/stcomm2.png | Bin .../{md_dev => md_exp}/img/stcomm2_grayed.png | Bin htdocs/theme/{md_dev => md_exp}/img/stcomm3.png | Bin .../{md_dev => md_exp}/img/stcomm3_grayed.png | Bin htdocs/theme/{md_dev => md_exp}/img/stcomm4.png | Bin .../{md_dev => md_exp}/img/stcomm4_grayed.png | Bin .../theme/{md_dev => md_exp}/img/switch_off.png | Bin .../theme/{md_dev => md_exp}/img/switch_on.png | Bin .../{md_dev => md_exp}/img/tab_background.png | Bin htdocs/theme/{md_dev => md_exp}/img/tick.png | Bin htdocs/theme/{md_dev => md_exp}/img/title.gif | Bin htdocs/theme/{md_dev => md_exp}/img/title.png | Bin htdocs/theme/{md_dev => md_exp}/img/tmenu.jpg | Bin htdocs/theme/{md_dev => md_exp}/img/tmenu2.jpg | Bin htdocs/theme/{md_dev => md_exp}/img/tmenu3.jpg | Bin .../{md_dev => md_exp}/img/tmenu_inverse.jpg | Bin htdocs/theme/{md_dev => md_exp}/img/unlock.png | Bin htdocs/theme/{md_dev => md_exp}/img/uparrow.png | Bin htdocs/theme/{md_dev => md_exp}/img/vcard.png | Bin htdocs/theme/{md_dev => md_exp}/img/view.png | Bin htdocs/theme/{md_dev => md_exp}/img/warning.png | Bin htdocs/theme/{md_dev => md_exp}/img/working.gif | Bin htdocs/theme/{md_dev => md_exp}/img/working2.gif | Bin htdocs/theme/{md_dev => md_exp}/index.html | 0 htdocs/theme/{md_dev => md_exp}/style.css.php | 0 htdocs/theme/{md_dev => md_exp}/tpl/README | 0 htdocs/theme/{md_dev => md_exp}/tpl/index.html | 0 234 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 htdocs/theme/md_dev/thumb.png rename htdocs/theme/{md_dev => md_exp}/.gitignore (100%) rename htdocs/theme/{md_dev => md_exp}/AUTHOR (100%) rename htdocs/theme/{md_dev => md_exp}/ckeditor/config.js (100%) rename htdocs/theme/{md_dev => md_exp}/ckeditor/index.html (100%) rename htdocs/theme/{md_dev => md_exp}/graph-color.php (100%) rename htdocs/theme/{md_dev => md_exp}/img/1downarrow.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/1downarrow_selected.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/1leftarrow.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/1leftarrow_selected.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/1rightarrow.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/1rightarrow_selected.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/1uparrow.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/1uparrow_selected.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/1updownarrow.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/addfile.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/background.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/bg-bas-rubrique.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/bg-rubrique.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/bg-titre-rubrique.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/button_bg.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/button_edit.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/calc.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/calendar.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/call.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/call_out.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/close.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/close_title.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/delete.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/detail.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/disable.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/edit.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/edit_add.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/edit_remove.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/editdelete.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/error.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/favicon.ico (100%) rename htdocs/theme/{md_dev => md_exp}/img/file.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/filenew.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/filter.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/folder-open.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/folder.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/gradient.gif (100%) rename htdocs/theme/{md_dev => md_exp}/img/grip.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/grip_title.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/headbg.jpg (100%) rename htdocs/theme/{md_dev => md_exp}/img/headbg2.jpg (100%) rename htdocs/theme/{md_dev => md_exp}/img/help.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/helpdoc.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/high.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/history.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/index.html (100%) rename htdocs/theme/{md_dev => md_exp}/img/info.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/liste_titre.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/liste_titre2.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/lock.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/login_background.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/logo_setup.svg (100%) rename htdocs/theme/{md_dev => md_exp}/img/logout.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/README.md (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/agenda.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/agenda_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/bank.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/bank_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/chart.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/commercial.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/commercial_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/company.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/company_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/ecm.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/ecm_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/externalsite.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/externalsite_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/ftp.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/ftp_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/generic1.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/generic1_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/generic2.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/generic2_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/generic3.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/generic3_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/generic4.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/generic4_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/globe.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/globe_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/holiday.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/home.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/home_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/index.html (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/mail.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/mail_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/members.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/members_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/money.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/money_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/pointofsale.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/pointofsale_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/products.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/products_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/project.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/project_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/shop.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/shop_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/tools.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menus/tools_over.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/menutab-r.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/nav-overlay.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/nav-overlay3.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/next.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_account.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_accounting.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_action.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_action_rdv.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_address.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_askpricesupplier.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_barcode.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_bill.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_billa.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_billd.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_billr.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_book.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_bookmark.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_calendar.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_calendarday.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_calendarperuser.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_calendarweek.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_category-expanded.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_category.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_commercial.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_company.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_contact.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_contact_all.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_contract.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_cron.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_dir.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_email.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_energie.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_generic.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_globe.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_group.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_holiday.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_intervention.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_invoice.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_label.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_list.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_margin.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_opensurvey.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_order.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_payment.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_phoning.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_phoning_fax.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_product.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_project.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_projectpub.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_projecttask.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_propal.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_reduc.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_resource.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_rss.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_sending.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_service.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_skype.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_stock.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_task.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_task_time.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_technic.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_trip.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/object_user.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/off.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/on.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/pdf2.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/pdf3.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/play.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/previous.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/printer.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/puce.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/recent.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/redstar.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/refresh.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/reload.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/rightarrow.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/search.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/searchclear.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/setup.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/sort_asc.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/sort_asc_disabled.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/sort_desc.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/sort_desc_disabled.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/split.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/star.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stats.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/statut0.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/statut1.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/statut3.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/statut4.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/statut5.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/statut6.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/statut7.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/statut8.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/statut9.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm-1.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm-1_grayed.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm0.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm0_grayed.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm1.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm1_grayed.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm2.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm2_grayed.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm3.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm3_grayed.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm4.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/stcomm4_grayed.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/switch_off.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/switch_on.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/tab_background.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/tick.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/title.gif (100%) rename htdocs/theme/{md_dev => md_exp}/img/title.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/tmenu.jpg (100%) rename htdocs/theme/{md_dev => md_exp}/img/tmenu2.jpg (100%) rename htdocs/theme/{md_dev => md_exp}/img/tmenu3.jpg (100%) rename htdocs/theme/{md_dev => md_exp}/img/tmenu_inverse.jpg (100%) rename htdocs/theme/{md_dev => md_exp}/img/unlock.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/uparrow.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/vcard.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/view.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/warning.png (100%) rename htdocs/theme/{md_dev => md_exp}/img/working.gif (100%) rename htdocs/theme/{md_dev => md_exp}/img/working2.gif (100%) rename htdocs/theme/{md_dev => md_exp}/index.html (100%) rename htdocs/theme/{md_dev => md_exp}/style.css.php (100%) rename htdocs/theme/{md_dev => md_exp}/tpl/README (100%) rename htdocs/theme/{md_dev => md_exp}/tpl/index.html (100%) diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 41b7996cbfd..b70c1e2517a 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -339,8 +339,9 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.' && substr($subdir, 0, 3) <> 'CVS' && ! preg_match('/common|phones/i',$subdir)) { - // Disable not stable themes - //if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/bureau2crea/i',$subdir)) continue; + // Disable not stable themes (dir ends with _exp or _dev) + if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i',$subdir)) continue; + if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i',$subdir)) continue; print '
'; $file=$dirtheme."/".$subdir."/thumb.png"; diff --git a/htdocs/theme/md_dev/thumb.png b/htdocs/theme/md_dev/thumb.png deleted file mode 100644 index 6b4c467bead7e991a22ad47a394bd135b8837094..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3839 zcmV|4I3mR z)+{ZAg@q6j28>GX0oqN2+g(*zSvkI!Z@%*sd=Zg(JF{|nm6@ixQC*d?-f&;U`Of&A z6PNtyU;bdN&YnEpwN}>Fms*-uS~SZFt{<%%p@8T)Z3{?7Fp<<9KkcPI$;I8X$&hp2Y%k(3B^o|tgc~GF3XKy>{FrO)y3?xLy`di^c@~GY(I>Ih z;>~qJnRas*=bCHjzxnHL*p>kl{%pG6J0O4fXMg=0Z@=NX&fov@e=N0YfD^}~I2kva zcL{!i9}!xwJDzKgCw?5KP(qj%NgUKYk5QVJ1uZj1O^#nOA?`tMr&e#;jwiM(OF}8< zWfUG{Mc8b78J`t-v9`Ln+HF1B+#65BGK&Wv{uAr0x4(3s>H3WV=AL7G=bK-1Y?DhU zoaf~GfAkl?0Igf5VH;Ev@@a;y7iE#>h0bVE^1LW)3kD}il9s%5Y#54WsW3YT@C)gbQVRaMl@*0V0xBkc&%aYW4B=;h=V)D=bYc5g=?<)+u!=S z>zHcQvPj4u|M_3lJQv&gK@3r9uFG_qBrqBQ;G!&Ru7l5kj%Y;J+06ILl6#(;WqBAy zt_!cxDb)t!spHtTX)#9fqQruL0gv!p2fCw_VnOU$6h)k5wr#=9!Z3={464-e8v@Pd zz8_&njoc96l6P8--~YYu0$`;_GPg!?8_~Xi7gP+4q)JFxmg%~VG&P%rmZgu!Guwux znDB?1o97uq_v5DlGxV;dw z_-&e|Wm$;NG+y^?I5UxU#@k9~Up&CDa9Nf?5Fn^b)4*$h@jTD6EGVLPF#Pxzo4vsV zP=PVYOQaa>IniRxwWan~@7?<7=Nsc$2*ojqoQ6L_l|>1RzLO$o*AXHw%q%hc}JShoDlkmY$-<$bSqgh8*UA}$iwO8&|;=;nvNUyg)91ILYUs+jg zwL6-sDf}5Z$kx`=qR4|NxwX35Y&QAv+e9hi2eb5(otYjFTXq5S;%3iv(=7A6dbiuv zWm%fnGl>=_F|^-oHh@XchbRn#E!T5wXVv$^$z&3zsi~Xm>+7=MWl{)TSQvqNUg1V0 z8wP{s@n7{JT!0>3&-g7?!`|vE+=kb-ZCAQWl30~T1PkIwxe}2VetUYsOTz@0e#BL< z8nO)pCd^2a1fQraz#Z_V_V`Z-*wLLoAZZ-_?GJwhFI`(~!Z`JM{k7NcFD-V|Dv0m| zzeuq{a!MDvX`07VS1D?20--AmLR*YgE&%_+J@^%6x*|TXs8CHQSPmAnY@5!V9ZDI; z)%qf&lQAWwZnpAVY{ca~5IzVaQugTVZ)$7bmoY3i&gGU|2qiA=M9f=t7LIFkIFcNV&>R%?E=lAnpoaU4}<(=<=QN0!Mg@9yr-K^TR|6d*!t zYirZ#bmj-h#f_#%vNYb<+=iDM$eF@}8Dc>r%ysO=#YO08w?BOUzaIAc1CS+v7IeRO z-XtwD)2-#scfR>mgOLPOJc%hPyUwySg}4raxK^k1`4-LLeiHDZGp1P*4=md>%r=Uv z@6WI)+y`E!oKATGK{2YNm&uh&-xGh8&3gx)vU?Awnr6wVo=m=q9m{H|kD&{+fl}Xtd z{5dbQjqToO8VJTHdkooTXi_{LP6tk{O|Lq9JL*C>NXYB2-1^1FZk*-300uD$6Gc$& zh?|HkW~Ceqik3j5{E(q@)#A@Xzo{y=%CPUf_wIN!&~@kbowc+eZ{B}hapwL0;K5Hn z7!C)NF-|~Lb2Ma0nt(TyyxiKKXv|cA$w?%KHSXy3c``u;uo2fbfA_oJ`teU53?~8J z!cC#ww9ptYyqX<_sb%YFR)XTXUM-FzKjBHn=L`<%?Znc>m{9;eGp>$P0<<+3xEfsJ z!}s5f%VIW*Y;+pXiWpH5$EhW0T!{IuVO#cFZ@sCMd#3JD{Lp4ReE28~#{Hqc*y+6b z>b)C@c8K@iAAPj5zk_O`!&A-^;&@ampFcs2Dc#xL4x)&u{ziJa$Q)99r7YC|sV`wJ z{8L>!I!8fTj|!o>Pz68|13#$Mz42%QstJbM>2$6S7&7#GJy0%5q~-v8UQNP6v)OEE zX=$FG&i9k;t@jD9N%o^cwAUt8rFZ=6RMouC4lNd#T5uivWXGZ#hNe|``I5n2?H`K|_7A%x~C3!e#C z5Yhm~D;qTy&Vt5bCz5pSJixy1i=n^4{G<>GD$5oZ7GUUWdiCz^F4R zx7(cqaIvu9Dm#VpIukHlT5?ZYRHCEJ)GXnIh4Uf~lV+!06<+1r7gPcDty<@bfbkju z3@9rrE0+Pr0!63eRDes{5~O;o)F_wtj7Gb$$ygz({rQ-e-0}lj1n;5B}j_gD@?NTyQ=ym7>yY z6gD2*4@F+=EmY3=IWk~|g0T>omju*-6w1rjDilbSY z6;YJnhhTw07>TK}JYl|C^Q)Ela6Cg^DDvENT%z-<0|pM{pJfU7MzSyE^xp1Xv)L%6`@tE-69$s%BfOt?rdgd4XSt-toa?5!HNJ*RCrRx4VL0>8jWZ2>XAzaSzfAuwOu!p!mIZ^bDNI#~E}c4wmJ>gbAW9M_&Rw1$<3D8GsJcI6ZKO7-$v7 zqXR6s+aHF$|MoZDX7t)~g(BPB?UOQtV>K3*MrrSIz)6-5M&SIZtcr&tcz*1_RK31V zC&$H+CtY4>4tm@0z=;?(kT?v#^2UAi64$XOI_LepeH22%%f`ZTFWtTbFr09AzyITZ ze|L9pfUPZqg-I?RPcaQtR|?uwkcLZVQ9kf5sQu>_6E2TnOr1Ek`Of#gty8$h;c=80 zAtIEn?ZZqwK%yG^f^a%lKa8Ayu?6wvY&K2O9GL~qtRDZ#axSJ8No>2dR-;~?uMjZ+ zh!fj!Zg!@5_FnVEFq#-7m5b*Oh}&vTz}4Zpd`=5nFhe&kLjtWXEG$UM@j?NM$I#+* zyEmEz2_>KL(xV_2C!lJSLC6&g$KlkP(Yv>oY|FUuIqvfTMhx%u`v3Oe{hhr5quexT z6lXA*DL84NQ>0xp4r8z8=4rAw$MkSuUj56aS%2{{oTSCUG_eiZs_AM92NES7ULv|M93@XTc5dBX zMXpkhv#6Q&#YdZ`8uVg1-SNDxX*!<+z*#x=(>NGsu@9J*Y2}61^7@^{uTWhWB=E;s zu7RAC^4JlDbY*$zMA}Q!UcV1u^4L*Vq^e#&H0F3bGEJ*2Bg1gP)n0VcBHAR(KH3;& zvxAPES+mHMG;RWfNWD zlgFD&D_wE)&X{_T59!+VyeiqElaJy=vN53m^{`9zSdc7un(uFW-m+=BFCK7~ Date: Mon, 23 Mar 2015 01:39:12 +0100 Subject: [PATCH 177/412] Revert "Revert "Refactor 1"" --- htdocs/comm/propal/class/propal.class.php | 6 +- htdocs/commande/class/commande.class.php | 74 +++++----- htdocs/compta/facture/class/facture.class.php | 36 +---- htdocs/core/class/commoninvoice.class.php | 95 ++++++++++++ htdocs/core/class/commonobject.class.php | 30 ++-- htdocs/core/class/commonobjectline.class.php | 13 ++ htdocs/core/class/commonorder.class.php | 136 +++++++++++++++++- htdocs/core/lib/functions.lib.php | 4 +- htdocs/core/tpl/objectline_create.tpl.php | 2 +- htdocs/core/tpl/objectline_edit.tpl.php | 4 +- htdocs/core/tpl/objectline_view.tpl.php | 16 +-- htdocs/fichinter/class/fichinter.class.php | 1 - htdocs/filefunc.inc.php | 1 - .../class/fournisseur.commande.class.php | 98 +++++++------ .../fourn/class/fournisseur.facture.class.php | 122 ++++++++++------ htdocs/fourn/commande/card.php | 2 +- htdocs/fourn/facture/card.php | 2 +- htdocs/margin/admin/margin.php | 3 - htdocs/projet/admin/project.php | 7 +- htdocs/societe/admin/societe.php | 5 +- 20 files changed, 449 insertions(+), 208 deletions(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 8909441b9c1..533df89b773 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -107,6 +107,9 @@ class Propal extends CommonObject var $products=array(); var $extraparams=array(); + /** + * @var PropaleLigne[] + */ var $lines = array(); var $line; @@ -2801,9 +2804,6 @@ class Propal extends CommonObject */ class PropaleLigne extends CommonObject { - var $db; - var $error; - public $element='propaldet'; public $table_element='propaldet'; diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 1bcfa1ee7cb..2d377758aa5 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -104,7 +104,10 @@ class Commande extends CommonOrder var $user_author_id; - var $lines = array(); + /** + * @var OrderLine[] + */ + var $lines = array(); //Incorterms var $fk_incoterms; @@ -1635,12 +1638,12 @@ class Commande extends CommonOrder $line = new OrderLine($this->db); - $line->rowid = $objp->rowid; // \deprecated + $line->rowid = $objp->rowid; $line->id = $objp->rowid; $line->fk_commande = $objp->fk_commande; - $line->commande_id = $objp->fk_commande; // \deprecated + $line->commande_id = $objp->fk_commande; $line->label = $objp->custom_label; - $line->desc = $objp->description; // Description ligne + $line->desc = $objp->description; $line->product_type = $objp->product_type; $line->qty = $objp->qty; $line->tva_tx = $objp->tva_tx; @@ -1666,11 +1669,11 @@ class Commande extends CommonOrder $line->special_code = $objp->special_code; $line->fk_parent_line = $objp->fk_parent_line; - $line->ref = $objp->product_ref; // TODO deprecated + $line->ref = $objp->product_ref; $line->product_ref = $objp->product_ref; - $line->libelle = $objp->product_label; // TODO deprecated + $line->libelle = $objp->product_label; $line->product_label = $objp->product_label; - $line->product_desc = $objp->product_desc; // Description produit + $line->product_desc = $objp->product_desc; $line->fk_product_type = $objp->fk_product_type; // Produit ou service $line->date_start = $this->db->jdate($objp->date_start); @@ -3175,6 +3178,7 @@ class Commande extends CommonOrder $this->lines[$i] = new OrderLine($this->db); $this->lines[$i]->id = $obj->rowid; + $this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->label = $obj->custom_label; $this->lines[$i]->description = $obj->description; $this->lines[$i]->fk_product = $obj->fk_product; @@ -3261,56 +3265,44 @@ class Commande extends CommonOrder */ class OrderLine extends CommonOrderLine { - var $db; - var $error; - public $element='commandedet'; public $table_element='commandedet'; var $oldline; + /** + * Id of parent order + * @var int + */ + public $fk_commande; + + /** + * Id of parent order + * @var int + * @deprecated Use fk_commande + */ + public $commande_id; + // From llx_commandedet - var $rowid; var $fk_parent_line; var $fk_facture; var $label; - var $desc; // Description ligne - var $fk_product; // Id produit predefini - var $product_type = 0; // Type 0 = product, 1 = Service - - var $qty; // Quantity (example 2) - var $tva_tx; // VAT Rate for product/service (example 19.6) - var $localtax1_tx; // Local tax 1 - var $localtax2_tx; // Local tax 2 - var $localtax1_type; // Local tax 1 type - var $localtax2_type; // Local tax 2 type - var $subprice; // U.P. HT (example 100) - var $remise_percent; // % for line discount (example 20%) var $fk_remise_except; var $rang = 0; var $fk_fournprice; + + /** + * Buy price without taxes + * @var float + */ var $pa_ht; var $marge_tx; var $marque_tx; - var $info_bits = 0; // Bit 0: 0 si TVA normal - 1 si TVA NPR - // Bit 1: 0 ligne normale - 1 si ligne de remise fixe - var $special_code = 0; - var $total_ht; // Total HT de la ligne toute quantite et incluant la remise ligne - var $total_tva; // Total TVA de la ligne toute quantite et incluant la remise ligne - var $total_localtax1; // Total local tax 1 for the line - var $total_localtax2; // Total local tax 2 for the line - var $total_ttc; // Total TTC de la ligne toute quantite et incluant la remise ligne - // Ne plus utiliser - var $remise; - var $price; - - // From llx_product - var $ref; // deprecated - var $libelle; // deprecated - var $product_ref; - var $product_label; // Label produit - var $product_desc; // Description produit + /** + * @deprecated + */ + var $remise; // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) // Start and end date of the line diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 48955652ac5..38fab4c217c 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3408,6 +3408,7 @@ class Facture extends CommonInvoice $this->lines[$i] = new FactureLigne($this->db); $this->lines[$i]->id = $obj->rowid; + $this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->label = $obj->custom_label; // deprecated $this->lines[$i]->description = $obj->description; $this->lines[$i]->fk_product = $obj->fk_product; @@ -3606,16 +3607,12 @@ class Facture extends CommonInvoice */ class FactureLigne extends CommonInvoiceLine { - var $db; - var $error; - public $element='facturedet'; public $table_element='facturedet'; var $oldline; //! From llx_facturedet - var $rowid; //! Id facture var $fk_facture; //! Id parent line @@ -3623,17 +3620,9 @@ class FactureLigne extends CommonInvoiceLine var $label; // deprecated //! Description ligne var $desc; - var $fk_product; // Id of predefined product - var $product_type = 0; // Type 0 = product, 1 = Service - var $qty; // Quantity (example 2) - var $tva_tx; // Taux tva produit/service (example 19.6) - var $localtax1_tx; // Local tax 1 - var $localtax2_tx; // Local tax 2 var $localtax1_type; // Local tax 1 type var $localtax2_type; // Local tax 2 type - var $subprice; // P.U. HT (example 100) - var $remise_percent; // % de la remise ligne (example 20%) var $fk_remise_except; // Link to line into llx_remise_except var $rang = 0; @@ -3642,10 +3631,6 @@ class FactureLigne extends CommonInvoiceLine var $marge_tx; var $marque_tx; - var $info_bits = 0; // Liste d'options cumulables: - // Bit 0: 0 si TVA normal - 1 si TVA NPR - // Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) - var $special_code; // Liste d'options non cumulabels: // 1: frais de port // 2: ecotaxe @@ -3654,15 +3639,6 @@ class FactureLigne extends CommonInvoiceLine var $origin; var $origin_id; - //! Total HT de la ligne toute quantite et incluant la remise ligne - var $total_ht; - //! Total TVA de la ligne toute quantite et incluant la remise ligne - var $total_tva; - var $total_localtax1; //Total Local tax 1 de la ligne - var $total_localtax2; //Total Local tax 2 de la ligne - //! Total TTC de la ligne toute quantite et incluant la remise ligne - var $total_ttc; - var $fk_code_ventilation = 0; var $date_start; @@ -3691,16 +3667,6 @@ class FactureLigne extends CommonInvoiceLine */ public $fk_prev_id; - /** - * Constructor - * - * @param DoliDB $db Database handler - */ - function __construct($db) - { - $this->db = $db; - } - /** * Load invoice line from database * diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index 6087a5a0adb..1a7ebfc34c8 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -400,5 +400,100 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php'; */ abstract class CommonInvoiceLine extends CommonObjectLine { + /** + * Quantity + * @var int + */ + public $qty; + + /** + * Unit price before taxes + * @var float + */ + public $subprice; + + /** + * Type of the product. 0 for product 1 for service + * @var int + */ + public $product_type = 0; + + /** + * Id of corresponding product + * @var int + */ + public $fk_product; + + /** + * VAT % + * @var float + */ + public $tva_tx; + + /** + * Local tax 1 % + * @var float + */ + public $localtax1_tx; + + /** + * Local tax 2 % + * @var float + */ + public $localtax2_tx; + + /** + * Percent of discount + * @var float + */ + public $remise_percent; + + /** + * Total amount before taxes + * @var float + */ + public $total_ht; + + /** + * Total VAT amount + * @var float + */ + public $total_tva; + + /** + * Total local tax 1 amount + * @var float + */ + public $total_localtax1; + + /** + * Total local tax 2 amount + * @var float + */ + public $total_localtax2; + + /** + * Total amount with taxes + * @var float + */ + public $total_ttc; + + /** + * Liste d'options cumulables: + * Bit 0: 0 si TVA normal - 1 si TVA NPR + * Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) + * @var int + */ + public $info_bits = 0; + + /** + * Constructor + * + * @param DoliDB $db Database handler + */ + public function __construct(DoliDB $db) + { + $this->db = $db; + } } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 97157c6d408..5dc524d964c 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2685,10 +2685,9 @@ abstract class CommonObject * @param string $buyer Object of buyer third party * @param string $selected Object line selected * @param int $dateSelector 1=Show also date range input fields - * @param int $permtoedit Permission to edit line * @return void */ - function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0, $permtoedit=0) + function printObjectLines($action, $seller, $buyer, $selected=0, $dateSelector=0) { global $conf, $hookmanager, $inputalsopricewithtax, $usemargins, $langs, $user; @@ -2781,7 +2780,7 @@ abstract class CommonObject } else { - $this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline,$permtoedit); + $this->printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected,$extrafieldsline); } $i++; @@ -2793,7 +2792,7 @@ abstract class CommonObject * TODO Move this into an output class file (htmlline.class.php) * * @param string $action GET/POST action - * @param array $line Selected object line to output + * @param CommonObjectLine $line Selected object line to output * @param string $var Is it a an odd line (true) * @param int $num Number of line (0) * @param int $i I @@ -2802,13 +2801,14 @@ abstract class CommonObject * @param string $buyer Object of buyer third party * @param string $selected Object line selected * @param object $extrafieldsline Object of extrafield line attribute - * @param int $permtoedit Permission to edit * @return void */ - function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0,$permtoedit=0) + function printObjectLine($action,$line,$var,$num,$i,$dateSelector,$seller,$buyer,$selected=0,$extrafieldsline=0) { global $conf,$langs,$user,$object,$hookmanager; - global $form,$bc,$bcdd; + global $form,$bc,$bcdd, $object_rights; + + $object_rights = $this->getRights(); $element=$this->element; @@ -2821,7 +2821,7 @@ abstract class CommonObject if (! empty($line->date_end)) $type=1; // deprecated // Ligne en mode visu - if ($action != 'editline' || $selected != $line->id) + if ($action != 'editline' || $selected != $line->rowid) { // Product if ($line->fk_product > 0) @@ -2879,7 +2879,7 @@ abstract class CommonObject } // Ligne en mode update - if ($this->statut == 0 && $action == 'editline' && $selected == $line->id) + if ($this->statut == 0 && $action == 'editline' && $selected == $line->rowid) { $label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : '')); if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("Label").'"'; @@ -3883,4 +3883,16 @@ abstract class CommonObject return $out; } + /** + * Returns the rights used for this class + * @return stdClass + */ + public function getRights() + { + global $user; + + return $user->rights->{$this->element}; + } + + } diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index c3c8d823a34..b88dfabe83d 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -28,6 +28,19 @@ */ abstract class CommonObjectLine extends CommonObject { + /** + * Id of the line + * @var int + * @deprecated Use $rowid + */ + public $id; + + /** + * Id of the line + * @var int + */ + public $rowid; + // TODO // Currently we need function at end of file CommonObject for all object lines. Should find a way to avoid duplicate code. diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php index 469e1676a53..b4882af8a58 100644 --- a/htdocs/core/class/commonorder.class.php +++ b/htdocs/core/class/commonorder.class.php @@ -22,6 +22,7 @@ */ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; +require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php'; /** * \class CommonOrder @@ -36,8 +37,141 @@ abstract class CommonOrder extends CommonObject * \class CommonOrderLine * \brief Superclass for orders classes */ -abstract class CommonOrderLine extends CommonObject +abstract class CommonOrderLine extends CommonObjectLine { + /** + * Product ref + * @var string + * @deprecated Use product_ref + */ + public $ref; + + /** + * Product ref + * @var string + */ + public $product_ref; + + /** + * Product label + * @var string + * @deprecated Use product_label + */ + public $libelle; + + /** + * Product label + * @var string + */ + public $product_label; + + /** + * Product description + * @var string + */ + public $product_desc; + + /** + * Quantity + * @var int + */ + public $qty; + + /** + * @deprecated + */ + var $price; + + /** + * Unit price before taxes + * @var float + */ + public $subprice; + + /** + * Type of the product. 0 for product 1 for service + * @var int + */ + public $product_type = 0; + + /** + * Description of the line + * @var string + */ + public $desc; + + /** + * Id of corresponding product + * @var int + */ + public $fk_product; + + /** + * Percent line discount + * @var float + */ + public $remise_percent; + + /** + * VAT % + * @var float + */ + public $tva_tx; + + /** + * Local tax 1 % + * @var float + */ + public $localtax1_tx; + + /** + * Local tax 2 % + * @var float + */ + public $localtax2_tx; + + public $localtax1_type; + public $localtax2_type; + + /** + * Total amount before taxes + * @var float + */ + public $total_ht; + + /** + * Total VAT amount + * @var float + */ + public $total_tva; + + /** + * Total local tax 1 amount + * @var float + */ + public $total_localtax1; + + /** + * Total local tax 2 amount + * @var float + */ + public $total_localtax2; + + /** + * Total amount with taxes + * @var float + */ + public $total_ttc; + + /** + * Liste d'options cumulables: + * Bit 0: 0 si TVA normal - 1 si TVA NPR + * Bit 1: 0 si ligne normal - 1 si bit discount (link to line into llx_remise_except) + * @var int + */ + public $info_bits = 0; + + public $special_code = 0; } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index cb3752f817c..c75387210aa 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3929,9 +3929,7 @@ function dol_htmlcleanlastbr($stringtodecode) */ function dol_html_entity_decode($a,$b,$c='UTF-8') { - // We use @ to avoid warning on PHP4 that does not support entity decoding to UTF8; - $ret=@html_entity_decode($a,$b,$c); - return $ret; + return html_entity_decode($a,$b,$c); } /** diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 027e6b3d816..84cc158515d 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -286,7 +286,7 @@ else { $newline = new CommandeFournisseurLigne($this->db); } elseif ($this->table_element_line=='facture_fourn_det') { - $newline = new FactureFournisseurLigne($this->db); + $newline = new SupplierInvoiceLine($this->db); } if (is_object($newline)) { print $newline->showOptionals($extrafieldsline, 'edit', array('style'=>$bcnd[$var], 'colspan'=>$coldisplay+8)); diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 5b895a69da3..6be8a82d69a 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -53,9 +53,9 @@ $coldisplay=-1; // We remove first td ?> > global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>global->MAIN_VIEW_LINE_NUMBER))?2:1; ?> -
+
- + diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 8da915ddd9a..c283f846d0f 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -48,11 +48,11 @@ if (empty($usemargins)) $usemargins=0; ?> -> +> global->MAIN_VIEW_LINE_NUMBER)) { ?> -
+
info_bits & 2) == 2) { ?> tva_tx,'%',$line->info_bits); ?> - pu_ht)?price($line->pu_ht):price($line->subprice)); ?> + pu_ht); ?> pu_ttc)?price($line->pu_ttc):price($line->subprice)); ?> @@ -179,11 +179,11 @@ if (empty($usemargins)) $usemargins=0; total_ht); ?> - statut == 0 && ($user->rights->$element->creer || $permtoedit)) { ?> + statut == 0 && ($object_rights->creer)) { ?> info_bits & 2) == 2) { ?> - id.'#line_'.$line->id; ?>"> + rowid.'#line_'.$line->rowid; ?>"> @@ -192,7 +192,7 @@ if (empty($usemargins)) $usemargins=0; situation_counter == 1 || !$this->situation_cycle_ref) { - print 'id . '">'; + print 'rowid . '">'; print img_delete(); print ''; } @@ -202,12 +202,12 @@ if (empty($usemargins)) $usemargins=0; 1 && empty($conf->browser->phone) && ($this->situation_counter == 1 || !$this->situation_cycle_ref)) { ?> 0) { ?> - id; ?>"> + rowid; ?>"> - id; ?>"> + rowid; ?>"> diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php index 51d37dcc8ae..baf2555a905 100644 --- a/htdocs/fichinter/class/fichinter.class.php +++ b/htdocs/fichinter/class/fichinter.class.php @@ -1022,7 +1022,6 @@ class FichinterLigne extends CommonObjectLine var $error; // From llx_fichinterdet - var $rowid; var $fk_fichinter; var $desc; // Description ligne var $datei; // Date intervention diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index 7343e65c854..15bee891775 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -83,7 +83,6 @@ if (! empty($dolibarr_strict_mode)) } else { - if (! defined('E_DEPRECATED')) define('E_DEPRECATED',0); // For PHP < 5.3.0 compatibility error_reporting(E_ALL & ~(E_STRICT|E_NOTICE|E_DEPRECATED)); } diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 8b7d81fdda0..e52b98b7e53 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -93,13 +93,16 @@ class CommandeFournisseur extends CommonOrder var $extraparams=array(); + /** + * @var CommandeFournisseurLigne[] + */ + public $lines = array(); //Ajout pour askpricesupplier var $origin; var $origin_id; var $linked_objects=array(); - var $lines = array(); - /** + /** * Constructor * * @param DoliDB $db Database handler @@ -110,7 +113,6 @@ class CommandeFournisseur extends CommonOrder $this->db = $db; $this->products = array(); - $this->lines = array(); // List of language codes for status $this->statuts[0] = 'StatusOrderDraft'; @@ -258,14 +260,15 @@ class CommandeFournisseur extends CommonOrder $line = new CommandeFournisseurLigne($this->db); $line->id = $objp->rowid; - $line->desc = $objp->description; // Description ligne - $line->description = $objp->description; // Description ligne + $line->rowid = $objp->rowid; + $line->desc = $objp->description; + $line->description = $objp->description; $line->qty = $objp->qty; $line->tva_tx = $objp->tva_tx; $line->localtax1_tx = $objp->localtax1_tx; $line->localtax2_tx = $objp->localtax2_tx; - $line->subprice = $objp->subprice; // deprecated - $line->pu_ht = $objp->subprice; // Unit price HT + $line->subprice = $objp->subprice; + $line->pu_ht = $objp->subprice; $line->remise_percent = $objp->remise_percent; $line->total_ht = $objp->total_ht; $line->total_tva = $objp->total_tva; @@ -274,16 +277,16 @@ class CommandeFournisseur extends CommonOrder $line->total_ttc = $objp->total_ttc; $line->product_type = $objp->product_type; - $line->fk_product = $objp->fk_product; // Id du produit + $line->fk_product = $objp->fk_product; - $line->libelle = $objp->product_label; // TODO deprecated - $line->product_label = $objp->product_label; // Label produit - $line->product_desc = $objp->product_desc; // Description produit + $line->libelle = $objp->product_label; + $line->product_label = $objp->product_label; + $line->product_desc = $objp->product_desc; - $line->ref = $objp->product_ref; // TODO deprecated - $line->product_ref = $objp->product_ref; // Internal reference - $line->ref_fourn = $objp->ref_supplier; // TODO deprecated - $line->ref_supplier = $objp->ref_supplier; // Reference supplier + $line->ref = $objp->product_ref; + $line->product_ref = $objp->product_ref; + $line->ref_fourn = $objp->ref_supplier; + $line->ref_supplier = $objp->ref_supplier; $line->date_start = $this->db->jdate($objp->date_start); $line->date_end = $this->db->jdate($objp->date_end); @@ -1621,7 +1624,6 @@ class CommandeFournisseur extends CommonOrder } } - /** * Return array of dispathed lines waiting to be approved for this order * @@ -2326,6 +2328,18 @@ class CommandeFournisseur extends CommonOrder if ($nb === 0) return $langs->trans('Undefined'); else return $nb.' '.$langs->trans('Days'); } + + /** + * Returns the rights used for this class + * @return stdClass + */ + public function getRights() + { + global $user; + + return $user->rights->fournisseur->commande; + } + } @@ -2335,42 +2349,32 @@ class CommandeFournisseur extends CommonOrder */ class CommandeFournisseurLigne extends CommonOrderLine { - var $db; - var $error; - public $element='commande_fournisseurdet'; public $table_element='commande_fournisseurdet'; + + /** + * Unit price without taxes + * @var float + */ + public $pu_ht; - var $oldline; - - // From llx_commandedet - var $qty; - var $tva_tx; - var $localtax1_tx; - var $localtax2_tx; - var $localtax1_type; - var $localtax2_type; - var $subprice; - var $remise_percent; - var $desc; // Description ligne - var $fk_product; // Id of predefined product - var $product_type = 0; // Type 0 = product, 1 = Service - var $total_ht; - var $total_tva; - var $total_localtax1; - var $total_localtax2; - var $total_ttc; - var $info_bits; - var $special_code; - var $date_start; + var $date_start; var $date_end; - // From llx_product - var $libelle; // Label produit - var $product_desc; // Description produit - // From llx_product_fournisseur_price - var $ref_fourn; // Ref supplier + + /** + * Supplier ref + * @var string + * @deprecated Use ref_supplier + */ + public $ref_fourn; + + /** + * Supplier reference + * @var string + */ + public $ref_supplier; /** @@ -2430,7 +2434,7 @@ class CommandeFournisseurLigne extends CommonOrderLine $this->date_start = $this->db->jdate($objp->date_start); $this->date_end = $this->db->jdate($objp->date_end); - + $this->db->free($result); return 1; } diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 9cc6b237c41..19cb26cf17b 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -89,9 +89,12 @@ class FactureFournisseur extends CommonInvoice var $mode_reglement_id; var $mode_reglement_code; - var $lines; + /** + * Invoice lines + * @var SupplierInvoiceLine[] + */ + public $lines = array(); var $fournisseur; // deprecated - var $thirdparty; // To store thirdparty //Incorterms var $fk_incoterms; @@ -100,31 +103,6 @@ class FactureFournisseur extends CommonInvoice var $extraparams=array(); - /** - * Standard invoice - */ - const TYPE_STANDARD = 0; - - /** - * Replacement invoice - */ - const TYPE_REPLACEMENT = 1; - - /** - * Credit note invoice - */ - const TYPE_CREDIT_NOTE = 2; - - /** - * Deposit invoice - */ - const TYPE_DEPOSIT = 3; - - /** - * Proforma invoice - */ - const TYPE_PROFORMA = 4; - /** * Constructor * @@ -145,7 +123,6 @@ class FactureFournisseur extends CommonInvoice $this->propalid = 0; $this->products = array(); - $this->lines = array(); } /** @@ -496,7 +473,7 @@ class FactureFournisseur extends CommonInvoice */ function fetch_lines() { - $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx, f.tva'; + $sql = 'SELECT f.rowid, f.ref as ref_supplier, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx'; $sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 '; $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line'; $sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc'; @@ -517,7 +494,7 @@ class FactureFournisseur extends CommonInvoice { $obj = $this->db->fetch_object($resql_rows); - $this->lines[$i] = new FactureFournisseurLigne($this->db); + $this->lines[$i] = new SupplierInvoiceLine($this->db); $this->lines[$i]->id = $obj->rowid; $this->lines[$i]->rowid = $obj->rowid; @@ -527,6 +504,7 @@ class FactureFournisseur extends CommonInvoice $this->lines[$i]->ref_supplier = $obj->ref_supplier; // Reference product supplier TODO Rename field ref to ref_supplier into table llx_facture_fourn_det and llx_commande_fournisseurdet and update fields it into updateline $this->lines[$i]->libelle = $obj->label; // This field may contains label of product (when invoice create from order) $this->lines[$i]->product_desc = $obj->product_desc; // Description du produit + $this->lines[$i]->subprice = $obj->pu_ht; $this->lines[$i]->pu_ht = $obj->pu_ht; $this->lines[$i]->pu_ttc = $obj->pu_ttc; $this->lines[$i]->tva_tx = $obj->tva_tx; @@ -534,7 +512,7 @@ class FactureFournisseur extends CommonInvoice $this->lines[$i]->localtax2_tx = $obj->localtax2_tx; $this->lines[$i]->qty = $obj->qty; $this->lines[$i]->remise_percent = $obj->remise_percent; - $this->lines[$i]->tva = $obj->tva; + $this->lines[$i]->tva = $obj->total_tva; $this->lines[$i]->total_ht = $obj->total_ht; $this->lines[$i]->total_tva = $obj->total_tva; $this->lines[$i]->total_localtax1 = $obj->total_localtax1; @@ -1313,7 +1291,7 @@ class FactureFournisseur extends CommonInvoice if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used { - $linetmp = new FactureFournisseurLigne($this->db); + $linetmp = new SupplierInvoiceLine($this->db); $linetmp->id=$this->rowid; $linetmp->array_options = $array_options; $result=$linetmp->insertExtraFields(); @@ -1858,6 +1836,18 @@ class FactureFournisseur extends CommonInvoice return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } + /** + * Returns the rights used for this class + * @return stdClass + */ + public function getRights() + { + global $user; + + return $user->rights->fournisseur->facture; + } + + } @@ -1865,20 +1855,70 @@ class FactureFournisseur extends CommonInvoice /** * Class to manage line invoices */ -class FactureFournisseurLigne extends CommonInvoice +class SupplierInvoiceLine extends CommonInvoice { - var $db; - var $error; - - var $pu_ht; - var $pu_ttc; - public $element='facture_fourn_det'; public $table_element='facture_fourn_det'; - var $oldline; + var $oldline; - /** + public $ref; + public $product_ref; + public $ref_supplier; + public $libelle; + public $product_desc; + + /** + * Unit price before taxes + * @var float + * @deprecated Use $subprice + */ + public $pu_ht; + + /** + * Unit price included taxes + * @var float + */ + public $pu_ttc; + + /** + * Total VAT amount + * @var float + * @deprecated Use $total_tva instead + */ + public $tva; + + /** + * Id of the corresponding supplier invoice + * @var int + */ + var $fk_facture_fourn; + + /** + * Product label + * @var string + */ + var $label; // deprecated + + /** + * Description of the line + * @var string + */ + var $description; + + var $skip_update_total; // Skip update price total for special lines + + /** + * @var int Situation advance percentage + */ + public $situation_percent; + + /** + * @var int Previous situation line id reference + */ + public $fk_prev_id; + + /** * Constructor * * @param DoliDB $db Database handler diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 26a0b5a5438..3ca8aae79d5 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2015,7 +2015,7 @@ elseif (! empty($object->id)) // Show object lines $inputalsopricewithtax=0; if (! empty($object->lines)) - $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1, $user->rights->fournisseur->commande->creer); + $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1); $num = count($object->lines); diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index a48534b4c24..e93d06ad530 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -2092,7 +2092,7 @@ else // Show object lines if (! empty($object->lines)) - $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1, $user->rights->fournisseur->facture->creer); + $ret = $object->printObjectLines($action, $soc, $mysoc, $lineid, 1); $num=count($object->lines); diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php index f8beb7cd1ca..b031a190f44 100644 --- a/htdocs/margin/admin/margin.php +++ b/htdocs/margin/admin/margin.php @@ -72,7 +72,6 @@ if ($action == 'remises') { if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', $_POST['MARGIN_METHODE_FOR_DISCOUNT'], 'chaine', 0, '', $conf->entity) > 0) { - $conf->global->MARGIN_METHODE_FOR_DISCOUNT = $_POST['MARGIN_METHODE_FOR_DISCOUNT']; setEventMessage($langs->trans("RecordModifiedSuccessfully")); } else @@ -85,7 +84,6 @@ if ($action == 'typemarges') { if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0) { - $conf->global->MARGIN_METHODE_FOR_DISCOUNT = $_POST['MARGIN_TYPE']; setEventMessage($langs->trans("RecordModifiedSuccessfully")); } else @@ -98,7 +96,6 @@ if ($action == 'contact') { if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0) { - $conf->global->AGENT_CONTACT_TYPE = $_POST['AGENT_CONTACT_TYPE']; setEventMessage($langs->trans("RecordModifiedSuccessfully")); } else diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 915d4ef69ef..a29bb9a2d63 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -237,12 +237,7 @@ if ($action == 'deltask') // Set default model else if ($action == 'setdoc') { - if (dolibarr_set_const($db, "PROJECT_ADDON_PDF",$value,'chaine',0,'',$conf->entity)) - { - // La constante qui a ete lue en avant du nouveau set - // on passe donc par une variable pour avoir un affichage coherent - $conf->global->PROJECT_ADDON_PDF = $value; - } + dolibarr_set_const($db, "PROJECT_ADDON_PDF",$value,'chaine',0,'',$conf->entity); // On active le modele $ret = delDocumentModel($value, $type); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 8fec81c686c..881946cb1cd 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -165,10 +165,7 @@ if ($action == 'setdoc') $db->begin(); - if (dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity)) - { - $conf->global->COMPANY_ADDON_PDF = $value; - } + dolibarr_set_const($db, "COMPANY_ADDON_PDF",$value,'chaine',0,'',$conf->entity); // On active le modele $type='company'; From 3d50b41b8e4dd85e02d76c0cec0e149478a2f6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 23 Mar 2015 01:17:43 +0100 Subject: [PATCH 178/412] Reverted $rowid instead of $id property --- htdocs/commande/class/commande.class.php | 1 - htdocs/compta/facture/class/facture.class.php | 1 - htdocs/core/class/commonobject.class.php | 4 ++-- htdocs/core/class/commonobjectline.class.php | 2 +- htdocs/core/tpl/objectline_edit.tpl.php | 4 ++-- htdocs/core/tpl/objectline_view.tpl.php | 12 ++++++------ htdocs/fourn/class/fournisseur.commande.class.php | 1 - 7 files changed, 11 insertions(+), 14 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 2d377758aa5..ac567742f0f 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -3178,7 +3178,6 @@ class Commande extends CommonOrder $this->lines[$i] = new OrderLine($this->db); $this->lines[$i]->id = $obj->rowid; - $this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->label = $obj->custom_label; $this->lines[$i]->description = $obj->description; $this->lines[$i]->fk_product = $obj->fk_product; diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php index 38fab4c217c..9cacb6389ac 100644 --- a/htdocs/compta/facture/class/facture.class.php +++ b/htdocs/compta/facture/class/facture.class.php @@ -3408,7 +3408,6 @@ class Facture extends CommonInvoice $this->lines[$i] = new FactureLigne($this->db); $this->lines[$i]->id = $obj->rowid; - $this->lines[$i]->rowid = $obj->rowid; $this->lines[$i]->label = $obj->custom_label; // deprecated $this->lines[$i]->description = $obj->description; $this->lines[$i]->fk_product = $obj->fk_product; diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 5dc524d964c..d240c13110b 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2821,7 +2821,7 @@ abstract class CommonObject if (! empty($line->date_end)) $type=1; // deprecated // Ligne en mode visu - if ($action != 'editline' || $selected != $line->rowid) + if ($action != 'editline' || $selected != $line->id) { // Product if ($line->fk_product > 0) @@ -2879,7 +2879,7 @@ abstract class CommonObject } // Ligne en mode update - if ($this->statut == 0 && $action == 'editline' && $selected == $line->rowid) + if ($this->statut == 0 && $action == 'editline' && $selected == $line->id) { $label = (! empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : '')); if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $placeholder=' placeholder="'.$langs->trans("Label").'"'; diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php index b88dfabe83d..b252a690da6 100644 --- a/htdocs/core/class/commonobjectline.class.php +++ b/htdocs/core/class/commonobjectline.class.php @@ -31,13 +31,13 @@ abstract class CommonObjectLine extends CommonObject /** * Id of the line * @var int - * @deprecated Use $rowid */ public $id; /** * Id of the line * @var int + * @deprecated Try to use id property as possible */ public $rowid; diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php index 6be8a82d69a..5b895a69da3 100644 --- a/htdocs/core/tpl/objectline_edit.tpl.php +++ b/htdocs/core/tpl/objectline_edit.tpl.php @@ -53,9 +53,9 @@ $coldisplay=-1; // We remove first td ?> > global->MAIN_VIEW_LINE_NUMBER) ? ' colspan="2"' : ''); ?>>global->MAIN_VIEW_LINE_NUMBER))?2:1; ?> -
+
- + diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index c283f846d0f..7b4f27ae87e 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -48,11 +48,11 @@ if (empty($usemargins)) $usemargins=0; ?> -> +> global->MAIN_VIEW_LINE_NUMBER)) { ?> -
+
info_bits & 2) == 2) { ?> info_bits & 2) == 2) { ?> - rowid.'#line_'.$line->rowid; ?>"> + id.'#line_'.$line->id; ?>"> @@ -192,7 +192,7 @@ if (empty($usemargins)) $usemargins=0; situation_counter == 1 || !$this->situation_cycle_ref) { - print 'rowid . '">'; + print 'id . '">'; print img_delete(); print ''; } @@ -202,12 +202,12 @@ if (empty($usemargins)) $usemargins=0; 1 && empty($conf->browser->phone) && ($this->situation_counter == 1 || !$this->situation_cycle_ref)) { ?> 0) { ?> - rowid; ?>"> + id; ?>"> - rowid; ?>"> + id; ?>"> diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index e52b98b7e53..52c215de6a4 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -260,7 +260,6 @@ class CommandeFournisseur extends CommonOrder $line = new CommandeFournisseurLigne($this->db); $line->id = $objp->rowid; - $line->rowid = $objp->rowid; $line->desc = $objp->description; $line->description = $objp->description; $line->qty = $objp->qty; From f4b1d95b3ef460bd30be09d0b554014c81261f70 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 02:39:41 +0100 Subject: [PATCH 179/412] Some fix for multicompany module --- htdocs/conf/conf.php.example | 6 ++---- htdocs/user/card.php | 10 +++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 67147a6d06b..9982e91095e 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -313,10 +313,8 @@ $dolibarr_main_db_prefix=''; // multicompany_transverse_mode // Prerequisite: Need external module "multicompany" -// Pyramidal (0): The rights and groups are managed in each entity, -// users belong to the entity for their rights. -// Transversal (1): The groups can belong only to the master entity -// and that the user belongs to a particular entity +// Pyramidal (0): The rights and groups are managed in each entity. Each user belongs to the entity he was created into. +// Transversal (1): The user is managed only into master entity and belongs to all entities or only one dedicated entity. // Default value: 0 (pyramidal) // Examples: // $multicompany_transverse_mode='1'; diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 0bcba1caca8..67fe45d4c5c 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -984,7 +984,7 @@ if (($action == 'create') || ($action == 'adduserldap')) print ''; print ''; print "\n"; - + // Accountancy code if ($conf->salaries->enabled) { @@ -1337,7 +1337,7 @@ else print ''.$langs->trans("AccountancyCode").''; print ''.$object->accountancy_code.''; } - + // Color user if (! empty($conf->agenda->enabled)) { @@ -1425,7 +1425,7 @@ else if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity) { print ''.$langs->trans("Entity").''; - if ($object->admin && ! $object->entity) + if (empty($object->entity)) { print $langs->trans("AllEntities"); } @@ -2049,7 +2049,7 @@ else } print ''; print ""; - } + } // User color if (! empty($conf->agenda->enabled)) @@ -2119,7 +2119,7 @@ else if (empty($conf->multicompany->transverse_mode) && $conf->entity == 1 && $user->admin && ! $user->entity) { print "".''.$langs->trans("Entity").''; - print "".$mc->select_entities($object->entity); + print "".$mc->select_entities($object->entity, 'entity', '', 0, 1); // last parameter 1 means, show also a choice 0=>'all entities' print "\n"; } else From 042556a9cf84ca356020c41d0dbbdfb1a77613b2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 03:50:55 +0100 Subject: [PATCH 180/412] Better comments --- htdocs/conf/conf.php.example | 2 +- htdocs/core/login/functions_ldap.php | 6 +++++- htdocs/user/card.php | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 9982e91095e..e6d3ba0d73c 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -314,7 +314,7 @@ $dolibarr_main_db_prefix=''; // multicompany_transverse_mode // Prerequisite: Need external module "multicompany" // Pyramidal (0): The rights and groups are managed in each entity. Each user belongs to the entity he was created into. -// Transversal (1): The user is managed only into master entity and belongs to all entities or only one dedicated entity. +// Transversal (1): The user is created and managed only into master entity but can login to all entities. // Default value: 0 (pyramidal) // Examples: // $multicompany_transverse_mode='1'; diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php index 88a5f55de19..993249f3126 100644 --- a/htdocs/core/login/functions_ldap.php +++ b/htdocs/core/login/functions_ldap.php @@ -173,7 +173,11 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) global $mc; $ret=$mc->checkRight($user->id, $entitytotest); - if ($ret < 0) $login=false; // provoque l'echec de l'identification + if ($ret < 0) + { + dol_syslog("Failed to checkRight by module multicompany for user id = ".$user->id." into entity ".$entitytotest); + $login=false; // force error of authentication + } } diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 67fe45d4c5c..b77022fed4e 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -213,7 +213,7 @@ if ($action == 'add' && $canadduser) $ret = $extrafields->setOptionalsFromPost($extralabels,$object); if ($ret < 0) $error++; - // If multicompany is off, admin users must all be on entity 0. + // Set entity property $entity=GETPOST('entity','int'); if (! empty($conf->multicompany->enabled)) { From e269aa83b5a84e8bc18d95208eeaef5849530c7c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 04:16:58 +0100 Subject: [PATCH 181/412] More comments --- htdocs/core/login/functions_dolibarr.php | 2 +- htdocs/core/login/functions_ldap.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php index 8e5a8b13ea9..0a0ab1e8bfe 100644 --- a/htdocs/core/login/functions_dolibarr.php +++ b/htdocs/core/login/functions_dolibarr.php @@ -101,7 +101,7 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= if ($passok && ! empty($obj->entity) && (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))) { - $ret=$mc->checkRight($obj->rowid, $entitytotest); + $ret=$mc->checkRight($obj->rowid, $entitytotest); // The module multicompany check here user belong to at least one group into company. This is a bugged behaviour, so you must hack module to make thing working. if ($ret < 0) $passok=false; } diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php index 993249f3126..a67bc040e2f 100644 --- a/htdocs/core/login/functions_ldap.php +++ b/htdocs/core/login/functions_ldap.php @@ -169,10 +169,11 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) dol_syslog("functions_ldap::check_user_password_ldap Sync user found id=".$user->id); // On verifie si le login a change et on met a jour les attributs dolibarr - if ($conf->multicompany->enabled) { + if ($conf->multicompany->enabled) + { global $mc; - $ret=$mc->checkRight($user->id, $entitytotest); + $ret=$mc->checkRight($user->id, $entitytotest, $user); // The module multicompany check here user belong to at least one group into company. This is a bugged behaviour, so you must hack module to make thing working. if ($ret < 0) { dol_syslog("Failed to checkRight by module multicompany for user id = ".$user->id." into entity ".$entitytotest); From 7ad0a325599776231ca235afc65493ffba6e7e33 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 04:51:24 +0100 Subject: [PATCH 182/412] Fix for multicompany users. --- htdocs/user/home.php | 2 +- htdocs/user/index.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/user/home.php b/htdocs/user/home.php index c9b3693f1ac..ffc71ae8798 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -161,7 +161,7 @@ if ($resql) { if (! empty($conf->multicompany->enabled)) { - if ($obj->admin && ! $obj->entity) + if (empty($obj->entity)) { print ' ('.$langs->trans("AllEntities").')'; } diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 5d0b0ac77e4..9e3e40b2e59 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -125,9 +125,11 @@ if ($result) print ' '; print "\n"; - //SearchBar + // SearchBar + $colspan=7; + if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode)) $colspan++; print ''; - print ' '; + print ' '; // Status print ''; From 994606dbc9a21b538474111c3aaac5a581b7d296 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 05:09:55 +0100 Subject: [PATCH 183/412] More space for tables (=> to follow css bootsrap rules) --- htdocs/theme/eldy/style.css.php | 49 ++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index a6de7baa28d..40ca7d92699 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1741,24 +1741,24 @@ table.noborder, table.formdoc, div.noborder { border-collapse: separate !important; border-spacing: 0px; - +/* border-right-width: 1px; border-right-color: #BBBBBB; border-right-style: solid; - border-left-width: 1px; - border-left-color: #B0B0B0; - border-left-style: solid; - border-bottom-width: 1px; border-bottom-color: #BBBBBB; border-bottom-style: solid; +*/ + border-left-width: 1px; + border-left-color: #DDDDDD; + border-left-style: solid; margin: 0px 0px 2px 0px; - -moz-box-shadow: 2px 2px 4px #DDD; - -webkit-box-shadow: 2px 2px 4px #DDD; - box-shadow: 2px 2px 4px #DDD; + -moz-box-shadow: 3px 3px 4px #ddd; + -webkit-box-shadow: 3px 3px 4px #ddd; + box-shadow: 3px 3px 4px #ddd; -moz-border-radius: 0.2em; -webkit-border-radius: 0.2em; @@ -1775,7 +1775,7 @@ table.noborder tr, div.noborder form { border-left-width: 1px; border-left-color: #BBBBBB; border-left-style: solid; - height: 20px; + height: 26px; } table.noborder th, table.noborder td, div.noborder form, div.noborder form div { @@ -1799,9 +1799,10 @@ table.nobordernopadding td { table.liste { width: 100%; + border-collapse: collapse; border-top-color: #FEFEFE; - +/* border-right-width: 1px; border-right-color: #BBBBBB; border-right-style: solid; @@ -1809,7 +1810,7 @@ table.liste { border-left-width: 1px; border-left-color: #CCCCCC; border-left-style: solid; - +*/ border-bottom-width: 1px; border-bottom-color: #BBBBBB; border-bottom-style: solid; @@ -1817,9 +1818,9 @@ table.liste { margin-bottom: 2px; margin-top: 0px; - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD; + -moz-box-shadow: 0px 3px 4px #DDD; + -webkit-box-shadow: 0px 3px 4px #DDD; + box-shadow: 0px 3px 4px #DDD; } table.liste td { padding-right: 2px; @@ -1893,6 +1894,7 @@ table.liste td { } .pair, .nohover .pair:hover, tr.pair td.nohover { +/* background: linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); @@ -1902,12 +1904,18 @@ table.liste td { background: #ffffff; +*/ font-family: ; border: 0px; margin-bottom: 1px; color: #202020; -} + background-color: #f9f9f9; +} +tr.pair td, tr.impair td { + padding: 4px; + border-bottom: 1px solid #ddd; +} div.liste_titre .tagtd { vertical-align: middle; } @@ -2067,8 +2075,9 @@ tr.box_impair { font-family: ; } + tr.box_pair { - +/* background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); @@ -2077,7 +2086,15 @@ tr.box_pair { background: #ffffff; +*/ font-family: ; + + background-color: #f9f9f9; +} + +tr.box_pair td, tr.box_impair td { + padding: 4px; + border-bottom: 1px solid #ddd; } .formboxfilter { From f6d8d2eb23de0d54bf9199a80aa68e45864a9a32 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 23 Mar 2015 06:56:12 +0100 Subject: [PATCH 184/412] Correct stats --- .../donations/class/donationstats.class.php | 24 +++++++------------ htdocs/donations/stats/index.php | 4 ++-- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/htdocs/donations/class/donationstats.class.php b/htdocs/donations/class/donationstats.class.php index 74fd4d3d6f1..b26617d651b 100644 --- a/htdocs/donations/class/donationstats.class.php +++ b/htdocs/donations/class/donationstats.class.php @@ -63,19 +63,14 @@ class DonationStats extends Stats $this->cachefilesuffix = $mode; $object=new Don($this->db); - $this->from = MAIN_DB_PREFIX.$object->table_element." as c"; + $this->from = MAIN_DB_PREFIX.$object->table_element." as d"; //$this->from.= ", ".MAIN_DB_PREFIX."societe as s"; //$this->field='weight'; // Warning, unit of weight is NOT USED AND MUST BE - $this->where.= " c.fk_statut > 0"; // Not draft and not cancelled + $this->where.= " d.fk_statut > 0"; // Not draft and not cancelled //$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity; - $this->where.= " AND c.entity = ".$conf->entity; - if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " .$user->id; - if ($this->socid) - { - $this->where.=" AND c.fk_soc = ".$this->socid; - } - if ($this->userid > 0) $this->where.=' AND c.fk_user_author = '.$this->userid; + $this->where.= " AND d.entity = ".$conf->entity; + if ($this->userid > 0) $this->where.=' WHERE c.fk_user_author = '.$this->userid; } /** @@ -88,10 +83,9 @@ class DonationStats extends Stats { global $user; - $sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb"; + $sql = "SELECT date_format(d.datedon,'%m') as dm, COUNT(*) as nb"; $sql.= " FROM ".$this->from; - if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; - $sql.= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'"; + $sql.= " WHERE d.datedon BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'"; $sql.= " AND ".$this->where; $sql.= " GROUP BY dm"; $sql.= $this->db->order('dm','DESC'); @@ -110,9 +104,8 @@ class DonationStats extends Stats { global $user; - $sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")"; + $sql = "SELECT date_format(d.datedon,'%Y') as dm, COUNT(*) as nb, SUM(d.".$this->field.")"; $sql.= " FROM ".$this->from; - if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE ".$this->where; $sql.= " GROUP BY dm"; $sql.= $this->db->order('dm','DESC'); @@ -129,9 +122,8 @@ class DonationStats extends Stats { global $user; - $sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg"; + $sql = "SELECT date_format(d.datedon,'%Y') as year, COUNT(*) as nb, SUM(d.".$this->field.") as total, AVG(".$this->field.") as avg"; $sql.= " FROM ".$this->from; - if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql.= " WHERE ".$this->where; $sql.= " GROUP BY year"; $sql.= $this->db->order('year','DESC'); diff --git a/htdocs/donations/stats/index.php b/htdocs/donations/stats/index.php index f6fc43ce90a..0a58751b8ed 100644 --- a/htdocs/donations/stats/index.php +++ b/htdocs/donations/stats/index.php @@ -213,12 +213,12 @@ if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear; $h=0; $head = array(); -$head[$h][0] = DOL_URL_ROOT . '/commande/stats/index.php?mode='.$mode; +$head[$h][0] = DOL_URL_ROOT . '/donations/stats/index.php?mode='.$mode; $head[$h][1] = $langs->trans("ByMonthYear"); $head[$h][2] = 'byyear'; $h++; -$type='shipment_stats'; +$type='donation_stats'; complete_head_from_modules($conf,$langs,null,$head,$h,$type); From 5617fb14b26e0ded136cf88eb2f3bf822fa71871 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 23 Mar 2015 09:52:05 +0100 Subject: [PATCH 185/412] fix skeletton --- dev/skeletons/skeleton_class.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/skeletons/skeleton_class.class.php b/dev/skeletons/skeleton_class.class.php index c59b3986a08..ff0c2f61200 100644 --- a/dev/skeletons/skeleton_class.class.php +++ b/dev/skeletons/skeleton_class.class.php @@ -221,7 +221,7 @@ class Skeleton_Class extends CommonObject $line->prop1 = $obj->field1; $line->prop2 = $obj->field2; - $this->line[]=$line; + $this->lines[]=$line; //... } $this->db->free($resql); From 5d2e09ec5146b366dc8fb99f6277887d065baad1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 12:31:32 +0100 Subject: [PATCH 186/412] Fix: navigation in page was wrong and typo errors. --- htdocs/product/popuprop.php | 74 ++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 29 deletions(-) diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php index 92ad4cfbe1f..376647834b5 100644 --- a/htdocs/product/popuprop.php +++ b/htdocs/product/popuprop.php @@ -44,6 +44,8 @@ if ($page < 0) $page = 0; if (! $sortfield) $sortfield="c"; if (! $sortorder) $sortorder="DESC"; +$conf->liste_limit = 3; + if ($page == -1) $page = 0; $limit = $conf->liste_limit; $offset = $limit * $page ; @@ -57,36 +59,28 @@ $staticproduct=new Product($db); */ $helpurl=''; -if ($type == 0) +if ($type == '0') { $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos'; + //$title=$langs->trans("StatisticsOfProducts"); + $title=$langs->trans("Statistics"); } -else if ($type == 1) +else if ($type == '1') { $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; + $title=$langs->trans("StatisticsOfServices"); + $title=$langs->trans("Statistics"); } llxHeader('','',$helpurl); -//On n'affiche le lien page suivante que s'il y a une page suivante ... -$sql = "SELECT count(*) as c"; -$sql.= " FROM ".MAIN_DB_PREFIX."product"; -$sql.= ' WHERE entity IN ('.getEntity('product', 1).')'; -if ($type !== '') { - $sql.= " AND fk_product_type = ".$type; -} +print_fiche_titre($title, $mesg); -$result=$db->query($sql); -if ($result) -{ - $obj = $db->fetch_object($result); - $num = $obj->c; -} $param = ''; $title = $langs->trans("ListProductServiceByPopularity"); -if ($type !== '') { - $param = '&type='.$type; +if ($type != '') { + $param = '&type='.$type; if ($type == 1) { $title = $langs->trans("ListServiceByPopularity"); @@ -95,17 +89,17 @@ if ($type !== '') { } } -print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$param,"","","",$num); +$h=0; +$head = array(); +$head[$h][0] = $_SERVER['PHP_SELF']; +$head[$h][1] = $title; +$head[$h][2] = 'product'; +$h++; + +dol_fiche_head($head,'product',$langs->trans("Statistics")); -print ''; -print ""; -print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], 'p.ref', '', '', '', $sortfield, $sortorder); -print_liste_field_titre($langs->trans('Type'), $_SERVER["PHP_SELF"], 'p.type', '', '', '', $sortfield, $sortorder); -print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label', '', '', '', $sortfield, $sortorder); -print_liste_field_titre($langs->trans('NbOfProposals'), $_SERVER["PHP_SELF"], 'c', '', '', 'align="right"', $sortfield, $sortorder); -print "\n"; $sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type as type, count(*) as c"; $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as pd"; @@ -116,8 +110,15 @@ if ($type !== '') { $sql.= " AND fk_product_type = ".$type; } $sql.= " GROUP BY (p.rowid)"; + +$result=$db->query($sql); +if ($result) +{ + $totalnboflines = $db->num_rows($result); +} + $sql.= $db->order($sortfield,$sortorder); -$sql.= $db->plimit($limit, $offset); +$sql.= $db->plimit($limit+1, $offset); $result=$db->query($sql); if ($result) @@ -125,6 +126,18 @@ if ($result) $num = $db->num_rows($result); $i = 0; + print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,"",$num, $totalnboflines, ''); + + print '
'; + + print ""; + print_liste_field_titre($langs->trans('Ref'), $_SERVER["PHP_SELF"], 'p.ref', '', '', '', $sortfield, $sortorder); + print_liste_field_titre($langs->trans('Type'), $_SERVER["PHP_SELF"], 'p.type', '', '', '', $sortfield, $sortorder); + print_liste_field_titre($langs->trans('Label'), $_SERVER["PHP_SELF"], 'p.label', '', '', '', $sortfield, $sortorder); + print_liste_field_titre($langs->trans('NbOfProposals'), $_SERVER["PHP_SELF"], 'c', '', '', 'align="right"', $sortfield, $sortorder); + print "\n"; + + $var=True; while ($i < $num) { @@ -155,8 +168,8 @@ if ($result) print " "; print $objp->ref.''; print ''; print ''; print ''; @@ -165,9 +178,12 @@ if ($result) } $db->free(); + + print "
'; - if ($objp->type==1) print $langs->trans("ShowService"); - else print $langs->trans("ShowProduct"); + if ($objp->type==1) print $langs->trans("Service"); + else print $langs->trans("Product"); print ''.$objp->label.''.$objp->c.'
"; } -print ""; + +dol_fiche_end(); llxFooter(); From cbadfa50751354327bbf9ecc449f95296e996131 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 12:44:41 +0100 Subject: [PATCH 187/412] NEW: Title of page project contains project ref and label --- htdocs/projet/card.php | 6 ++++-- htdocs/projet/contact.php | 4 +++- htdocs/projet/document.php | 6 +++++- htdocs/projet/element.php | 2 ++ htdocs/projet/ganttview.php | 4 +++- htdocs/projet/note.php | 4 +++- htdocs/projet/tasks.php | 4 +++- 7 files changed, 23 insertions(+), 7 deletions(-) diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 990640f0fee..a971f9b51dd 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -371,9 +371,11 @@ $form = new Form($db); $formfile = new FormFile($db); $userstatic = new User($db); - +$title=$langs->trans("Project").' - '.$object->ref.' '.$object->name; +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->ref.' '.$object->name; $help_url="EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"; -llxHeader("",$langs->trans("Projects"),$help_url); + +llxHeader("",$title,$help_url); if ($action == 'create' && $user->rights->projet->creer) diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 594ed1feffe..9c3d5e61364 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -120,8 +120,10 @@ if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->pr * View */ +$title=$langs->trans("ProjectContact").' - '.$object->ref.' '.$object->name; +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->ref.' '.$object->name.' - '.$langs->trans("ProjectContact"); $help_url="EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"; -llxHeader('', $langs->trans("Project"), $help_url); +llxHeader('', $title, $help_url); $form = new Form($db); $formcompany= new FormCompany($db); diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php index bb381ae8b38..b33a7e40287 100644 --- a/htdocs/projet/document.php +++ b/htdocs/projet/document.php @@ -77,7 +77,11 @@ include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php * View */ -llxHeader('',$langs->trans('Project'),'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes'); +$title=$langs->trans("Project").' - '.$langs->trans("Document").' - '.$object->ref.' '.$object->name; +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->ref.' '.$object->name.' - '.$langs->trans("Document"); +$help_url="EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"; + +llxHeader('',$title,$help_url); $form = new Form($db); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 3075d128066..b688f365e38 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -94,6 +94,8 @@ $result = restrictedArea($user, 'projet', $projectid); * View */ +$title=$langs->trans("ProjectReferers").' - '.$object->ref.' '.$object->name; +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->ref.' '.$object->name.' - '.$langs->trans("ProjectReferers"); $help_url="EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"; llxHeader("",$langs->trans("Referers"),$help_url); diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php index 181aeca032a..5f1589d59dc 100644 --- a/htdocs/projet/ganttview.php +++ b/htdocs/projet/ganttview.php @@ -77,8 +77,10 @@ if (! empty($conf->use_javascript_ajax)) ); } +$title=$langs->trans("Project").' - '.$langs->trans("Gantt").' - '.$object->ref.' '.$object->name; +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->ref.' '.$object->name.' - '.$langs->trans("Gantt"); $help_url="EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"; -llxHeader("",$langs->trans("Tasks"),$help_url,'',0,0,$arrayofjs,$arrayofcss); +llxHeader("",$title,$help_url,'',0,0,$arrayofjs,$arrayofcss); if ($id > 0 || ! empty($ref)) { diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php index 6e7b0e28595..583326b3e34 100644 --- a/htdocs/projet/note.php +++ b/htdocs/projet/note.php @@ -58,8 +58,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, * View */ +$title=$langs->trans("Project").' - '.$langs->trans("Note").' - '.$object->ref.' '.$object->name; +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->ref.' '.$object->name.' - '.$langs->trans("Note"); $help_url="EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"; -llxHeader("",$langs->trans("Project"),$help_url); +llxHeader("",$title,$help_url); $form = new Form($db); $userstatic=new User($db); diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 96618fc83d4..b3549d3a727 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -177,8 +177,10 @@ $formother=new FormOther($db); $taskstatic = new Task($db); $userstatic=new User($db); +$title=$langs->trans("Project").' - '.$langs->trans("Tasks").' - '.$object->ref.' '.$object->name; +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->ref.' '.$object->name.' - '.$langs->trans("Tasks"); $help_url="EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"; -llxHeader("",$langs->trans("Tasks"),$help_url); +llxHeader("",$title,$help_url); if ($id > 0 || ! empty($ref)) { From c6ad35e00185375d53d84c7e8b39d45f0af36513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 23 Mar 2015 13:40:55 +0100 Subject: [PATCH 188/412] Implemented statuses submenu for List menu of supplier and customer invoices. Menu "Pending payment" has been moved to the "List" submenu. --- htdocs/core/menus/standard/eldy.lib.php | 18 ++++++++++++++++-- htdocs/fourn/facture/list.php | 7 +++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 7c6ef944f7c..cc97470a310 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -3,6 +3,7 @@ * Copyright (C) 2010 Regis Houssin * Copyright (C) 2012-2014 Juanjo Menent * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2015 Marcos García * * 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 @@ -738,8 +739,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("BillsCustomers"),0,$user->rights->facture->lire, '', $mainmenu, 'customers_bills'); $newmenu->add("/compta/facture.php?action=create&leftmenu=customers_bills",$langs->trans("NewBill"),1,$user->rights->facture->creer); $newmenu->add("/compta/facture/fiche-rec.php?leftmenu=customers_bills",$langs->trans("Repeatables"),1,$user->rights->facture->lire); + $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire); - $newmenu->add("/compta/facture/impayees.php?leftmenu=customers_bills",$langs->trans("Unpaid"),1,$user->rights->facture->lire); + if (empty($leftmenu) || ($leftmenu == 'customers_bills')) { + $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills&search_status=0",$langs->trans("BillShortStatusDraft"),2,$user->rights->facture->lire); + $newmenu->add("/compta/facture/impayees.php?leftmenu=customers_bills",$langs->trans("BillShortStatusNotPaid"),2,$user->rights->facture->lire); + $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills&search_status=2",$langs->trans("BillShortStatusPaid"),2,$user->rights->facture->lire); + $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills&search_status=3",$langs->trans("BillShortStatusCanceled"),2,$user->rights->facture->lire); + } $newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payments",$langs->trans("Payments"),1,$user->rights->facture->lire); @@ -758,7 +765,14 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $langs->load("bills"); $newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"),0,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills'); $newmenu->add("/fourn/facture/card.php?action=create",$langs->trans("NewBill"),1,$user->rights->fournisseur->facture->creer); - $newmenu->add("/fourn/facture/impayees.php", $langs->trans("Unpaid"),1,$user->rights->fournisseur->facture->lire); + $newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"),1,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills'); + + if (empty($leftmenu) || ($leftmenu == 'suppliers_bills')) { + $newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills&search_status=0", $langs->trans("BillShortStatusDraft"),2,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills'); + $newmenu->add("/fourn/facture/impayees.php", $langs->trans("BillShortStatusNotPaid"),2,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills'); + $newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills&search_status=2", $langs->trans("BillShortStatusPaid"),2,$user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills'); + } + $newmenu->add("/fourn/facture/paiement.php", $langs->trans("Payments"),1,$user->rights->fournisseur->facture->lire); $newmenu->add("/compta/facture/stats/index.php?leftmenu=suppliers_bills&mode=supplier", $langs->trans("Statistics"),1,$user->rights->fournisseur->facture->lire); diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 66ad20e4c05..3c1b0f06cb6 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -5,6 +5,7 @@ * Copyright (C) 2013 Philippe Grand * Copyright (C) 2013 Florian Henry * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2015 Marcos García * * 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 @@ -70,6 +71,7 @@ $search_label = GETPOST("search_label","alpha"); $search_company = GETPOST("search_company","alpha"); $search_amount_no_tax = GETPOST("search_amount_no_tax","alpha"); $search_amount_all_tax = GETPOST("search_amount_all_tax","alpha"); +$search_status=GETPOST('search_status','alpha'); $month = GETPOST("month","int"); $year = GETPOST("year","int"); $filter = GETPOST("filtre"); @@ -188,6 +190,11 @@ if ($search_amount_all_tax != '') $sql .= natural_search('fac.total_ttc', $search_amount_all_tax, 1); } +if ($search_status != '') +{ + $sql.= " AND fac.fk_statut = '".$db->escape($search_status)."'"; +} + $nbtotalofrecords = 0; if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { From b7a466c95fd0408abb64a082467e3992c631cacb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 13:50:14 +0100 Subject: [PATCH 189/412] Fix bad style for total --- htdocs/core/boxes/box_activity.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php index d118bc8a4bc..5268cc0625e 100644 --- a/htdocs/core/boxes/box_activity.php +++ b/htdocs/core/boxes/box_activity.php @@ -282,11 +282,11 @@ class box_activity extends ModeleBoxes } // Add the sum in the bottom of the boxes - $this->info_box_contents[$i][1] = array('td' => 'align="left" ', 'text' => $langs->trans("Total")." ".$textHead); - $this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => $totalnb); - $this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => price($totalMnt,1,$langs,0,0,-1,$conf->currency)); - $this->info_box_contents[$i][4] = array('td' => 'align="right" ', 'text' => ""); - $this->info_box_contents[$i][5] = array('td' => 'align="right"', 'text' => ""); + $this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"'); + $this->info_box_contents[$i][1] = array('td' => 'align="left" class="liste_total" ', 'text' => $langs->trans("Total")." ".$textHead); + $this->info_box_contents[$i][2] = array('td' => 'align="right" class="liste_total" ', 'text' => $totalnb); + $this->info_box_contents[$i][3] = array('td' => 'align="right" class="liste_total" ', 'text' => price($totalMnt,1,$langs,0,0,-1,$conf->currency)); + $this->info_box_contents[$i][4] = array('td' => 'align="right" class="liste_total" ', 'text' => ""); } /** From b9c3c074b105d089fb05fa59e33487033473f5cd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 14:43:19 +0100 Subject: [PATCH 190/412] Fix: a line was inserted when making update Fix: missing message into notification admin page --- htdocs/admin/notification.php | 2 +- htdocs/fourn/commande/card.php | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php index 6de3cc09665..b9c163972ce 100644 --- a/htdocs/admin/notification.php +++ b/htdocs/admin/notification.php @@ -240,7 +240,7 @@ foreach($listofnotifiedevents as $notifiedevent) } // New entry input fields $s=''; // Do not use type="email" here, we must be able to enter a list of email with , separator. - print $form->textwithpicto($s,$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients"),1,'help','',0,2); + print $form->textwithpicto($s,$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'
'.$langs->trans("YouCanAlsoUseSupervisorKeyword"),1,'help','',0,2); print ''; print ''; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 26a0b5a5438..b593d6c6c19 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -448,14 +448,12 @@ if (empty($reshook)) { $price_base_type = 'HT'; $ht = price2num(GETPOST('price_ht')); - $result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, 0, $type,'','', $date_start, $date_end); } else { $ttc = price2num(GETPOST('price_ttc')); $ht = $ttc / (1 + ($tva_tx / 100)); $price_base_type = 'HT'; - $result=$object->addline($desc, $ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', $remise_percent, $price_base_type, $ttc, $type,'','', $date_start, $date_end); } if ($lineid) From dc0d3504dd48243856791c07297f81448bbe5e14 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 14:52:47 +0100 Subject: [PATCH 191/412] Fix: Bad notification key --- htdocs/fourn/commande/card.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index d42c649f044..a6ac9c42b56 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1393,7 +1393,7 @@ elseif (! empty($object->id)) require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; $notify=new Notify($db); $text.='
'; - $text.=$notify->confirmMessage('ORDER_SUPPLIER_APPROVE', $object->socid); + $text.=$notify->confirmMessage('ORDER_SUPPLIER_VALIDATE', $object->socid); } print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_valid', '', 0, 1); @@ -1428,8 +1428,16 @@ elseif (! empty($object->id)) array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockIncrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse'),'idwarehouse','',1)) ); } + $text=$langs->trans("ConfirmApproveThisOrder",$object->ref); + if (! empty($conf->notification->enabled)) + { + require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php'; + $notify=new Notify($db); + $text.='
'; + $text.=$notify->confirmMessage('ORDER_SUPPLIER_APPROVE', $object->socid, $object); + } - print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("ApproveThisOrder"),$langs->trans("ConfirmApproveThisOrder",$object->ref),"confirm_approve", $formquestion, 1, 1, 240); + print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ApproveThisOrder"), $text, "confirm_approve", $formquestion, 1, 1, 240); } From 72ce60ff366a3a23e271473aa70e39d0dd22f6f8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 14:53:21 +0100 Subject: [PATCH 192/412] Enhance themes --- htdocs/theme/eldy/style.css.php | 36 +++++++++------- htdocs/theme/md_exp/style.css.php | 72 +++++++++++++++++++------------ 2 files changed, 64 insertions(+), 44 deletions(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 40ca7d92699..7a96d672024 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -319,6 +319,7 @@ fieldset { border: 1px solid #AAAAAA !important; box-shadow: 2px 2px 3px #DDD; } display: inline-block; padding: 4px 14px; margin-bottom: 0; + margin-top: 0; text-align: center; cursor: pointer; color: #333333; @@ -1741,24 +1742,25 @@ table.noborder, table.formdoc, div.noborder { border-collapse: separate !important; border-spacing: 0px; -/* + border-right-width: 1px; - border-right-color: #BBBBBB; + border-right-color: #CCC; border-right-style: solid; +/* border-bottom-width: 1px; border-bottom-color: #BBBBBB; border-bottom-style: solid; */ border-left-width: 1px; - border-left-color: #DDDDDD; + border-left-color: #CCC; border-left-style: solid; margin: 0px 0px 2px 0px; - -moz-box-shadow: 3px 3px 4px #ddd; - -webkit-box-shadow: 3px 3px 4px #ddd; - box-shadow: 3px 3px 4px #ddd; + -moz-box-shadow: 2px 2px 4px #CCC; + -webkit-box-shadow: 2px 2px 4px #CCC; + box-shadow: 2px 2px 4px #CCC; -moz-border-radius: 0.2em; -webkit-border-radius: 0.2em; @@ -1802,25 +1804,26 @@ table.liste { border-collapse: collapse; border-top-color: #FEFEFE; -/* + border-right-width: 1px; - border-right-color: #BBBBBB; + border-right-color: #CCC; border-right-style: solid; - border-left-width: 1px; - border-left-color: #CCCCCC; - border-left-style: solid; -*/ +/* border-bottom-width: 1px; border-bottom-color: #BBBBBB; border-bottom-style: solid; +*/ + border-left-width: 1px; + border-left-color: #CCC; + border-left-style: solid; margin-bottom: 2px; margin-top: 0px; - -moz-box-shadow: 0px 3px 4px #DDD; - -webkit-box-shadow: 0px 3px 4px #DDD; - box-shadow: 0px 3px 4px #DDD; + -moz-box-shadow: 0px 3px 4px #CCC; + -webkit-box-shadow: 0px 3px 4px #CC; + box-shadow: 0px 3px 4px #CCC; } table.liste td { padding-right: 2px; @@ -1982,6 +1985,7 @@ input.liste_titre { color: #332266; font-weight: normal; white-space: nowrap; + padding: 4px; } @@ -2039,7 +2043,7 @@ div.tabBar .noborder { } tr.box_titre { - height: 20px; + height: 26px; background: rgb(); background-repeat: repeat-x; diff --git a/htdocs/theme/md_exp/style.css.php b/htdocs/theme/md_exp/style.css.php index 927a0c35266..d7b3deb75fb 100644 --- a/htdocs/theme/md_exp/style.css.php +++ b/htdocs/theme/md_exp/style.css.php @@ -1516,13 +1516,6 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { text-decoration: none; white-space: nowrap; - /*border-bottom: none; - border-right: 1px solid #CCCCCC; - border-left: 1px solid #D0D0D0; - border-top: 1px solid #D8D8D8; - */ - - /* -moz-border-radius:6px 6px 0px 0px; -webkit-border-radius:6px 6px 0px 0px; border-radius:6px 6px 0px 0px; @@ -1531,6 +1524,13 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { -webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1); box-shadow: 0 -1px 4px rgba(0,0,0,.1); + /*border-bottom: none; + border-right: 1px solid #CCCCCC; + border-left: 1px solid #D0D0D0; + border-top: 1px solid #D8D8D8; + */ + + /* background: rgb(); /*background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); @@ -1570,7 +1570,8 @@ a.tab:hover { /* background: rgba(, 0.5) url() 50% 0 repeat-x; - color: #;*/ + color: #; + */ text-decoration: underline; } a.tab:link, a.tab:visited @@ -1828,22 +1829,23 @@ table.noborder, table.formdoc, div.noborder { border-spacing: 0px; border-right-width: 1px; - border-right-color: #BBBBBB; + border-right-color: #CCC; border-right-style: solid; - border-left-width: 1px; - border-left-color: #B0B0B0; - border-left-style: solid; - +/* border-bottom-width: 1px; border-bottom-color: #BBBBBB; border-bottom-style: solid; +*/ + border-left-width: 1px; + border-left-color: #CCC; + border-left-style: solid; margin: 0px 0px 2px 0px; - -moz-box-shadow: 2px 2px 4px #DDD; - -webkit-box-shadow: 2px 2px 4px #DDD; - box-shadow: 2px 2px 4px #DDD; + -moz-box-shadow: 2px 2px 4px #CCC; + -webkit-box-shadow: 2px 2px 4px #CCC; + box-shadow: 2px 2px 4px #CCC; -moz-border-radius: 0.2em; -webkit-border-radius: 0.2em; @@ -1860,7 +1862,7 @@ table.noborder tr, div.noborder form { border-left-width: 1px; border-left-color: #BBBBBB; border-left-style: solid; - height: 20px; + height: 26px; } table.noborder th, table.noborder td, div.noborder form, div.noborder form div { @@ -1888,23 +1890,24 @@ table.liste { border-top-color: #FEFEFE; border-right-width: 1px; - border-right-color: #BBBBBB; + border-right-color: #CCC; border-right-style: solid; - border-left-width: 1px; - border-left-color: #CCCCCC; - border-left-style: solid; - +/* border-bottom-width: 1px; border-bottom-color: #BBBBBB; border-bottom-style: solid; - +*/ + border-left-width: 1px; + border-left-color: #CCC; + border-left-style: solid; + margin-bottom: 2px; margin-top: 0px; - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD; + -moz-box-shadow: 0px 3px 4px #CCC; + -webkit-box-shadow: 0px 3px 4px #CC; + box-shadow: 0px 3px 4px #CCC; } table.liste td { padding-right: 2px; @@ -1978,6 +1981,7 @@ table.liste td { } .pair, .nohover .pair:hover, tr.pair td.nohover { +/* background: linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; @@ -1987,13 +1991,17 @@ table.liste td { background: #ffffff; +*/ font-family: ; border: 0px; margin-bottom: 1px; color: #202020; + background-color: #f9f9f9; +} +tr.pair td, tr.impair td { + padding: 4px; + border-bottom: 1px solid #ddd; } - - div.liste_titre .tagtd { vertical-align: middle; } @@ -2062,6 +2070,7 @@ input.liste_titre { color: #332266; font-weight: normal; white-space: nowrap; + padding: 4px; } @@ -2180,6 +2189,13 @@ tr.box_pair { background: #ffffff; font-family: ; + + background-color: #f9f9f9; +} + +tr.box_pair td, tr.box_impair td { + padding: 4px; + border-bottom: 1px solid #ddd; } .formboxfilter { From 1a59b7b4479a10b6c0b294e632584769a332dad6 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 15:23:44 +0100 Subject: [PATCH 193/412] Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE --- htdocs/fourn/commande/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index e83dec0330c..6b07f6bbe75 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2567,7 +2567,7 @@ elseif (! empty($object->id)) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->supplier_order_advance->validate))) { $tmpbuttonlabel=$langs->trans('Validate'); - if ($user->rights->fournisseur->commande->approuver) $tmpbuttonlabel = $langs->trans("ValidateAndApprove"); + if ($user->rights->fournisseur->commande->approuver && empty($conf->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) $tmpbuttonlabel = $langs->trans("ValidateAndApprove"); print ''; print $tmpbuttonlabel; From 6f22243104f725bcffc6886fe6c5c291f63ebed0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 15:25:21 +0100 Subject: [PATCH 194/412] Add option SUPPLIER_ORDER_NO_DIRECT_APPROVE --- htdocs/fourn/commande/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 6b07f6bbe75..ff3d4b5d955 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -2567,7 +2567,7 @@ elseif (! empty($object->id)) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->supplier_order_advance->validate))) { $tmpbuttonlabel=$langs->trans('Validate'); - if ($user->rights->fournisseur->commande->approuver && empty($conf->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) $tmpbuttonlabel = $langs->trans("ValidateAndApprove"); + if ($user->rights->fournisseur->commande->approuver && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) $tmpbuttonlabel = $langs->trans("ValidateAndApprove"); print ''; print $tmpbuttonlabel; From ea7f00e77756dad0980ad0d1254c3232755c1f98 Mon Sep 17 00:00:00 2001 From: Fab Date: Mon, 23 Mar 2015 20:05:31 +0100 Subject: [PATCH 195/412] Fix displaying of the warning image. Since last commit, $objp->date_livraison returns nothing ; max() will then returns wrong result, and the warning image will be displayed when it should not. --- htdocs/commande/liste.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index 9f5f1e7fe58..6f009fa2eb0 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -341,7 +341,7 @@ if ($resql) print ''; print ''; - if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_livraison)) < ($now - $conf->commande->client->warning_delay)) + if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && max($db->jdate($objp->date_commande),$db->jdate($objp->date_delivery)) < ($now - $conf->commande->client->warning_delay)) print img_picto($langs->trans("Late"),"warning"); if(!empty($objp->note_private)) { From 1202d63f9896abda9cdd97cc5b331ff16b1f6608 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 23:25:07 +0100 Subject: [PATCH 196/412] Indent --- .../webservices/server_productorservice.php | 110 +++++++++--------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/htdocs/webservices/server_productorservice.php b/htdocs/webservices/server_productorservice.php index 08eb76b834b..474988fa6e8 100644 --- a/htdocs/webservices/server_productorservice.php +++ b/htdocs/webservices/server_productorservice.php @@ -379,43 +379,43 @@ function getProductOrService($authentication,$id='',$ref='',$ref_ext='',$lang='' if (! empty($product->multilangs[$langs->defaultlang]["description"])) $product->description = $product->multilangs[$langs->defaultlang]["description"]; if (! empty($product->multilangs[$langs->defaultlang]["note"])) $product->note = $product->multilangs[$langs->defaultlang]["note"]; - $productorservice_result_fields = array( - 'id' => $product->id, - 'ref' => $product->ref, - 'ref_ext' => $product->ref_ext, - 'label' => $product->label, - 'description' => $product->description, - 'date_creation' => dol_print_date($product->date_creation,'dayhourrfc'), - 'date_modification' => dol_print_date($product->date_modification,'dayhourrfc'), - 'note' => $product->note, - 'status_tosell' => $product->status, - 'status_tobuy' => $product->status_buy, - 'type' => $product->type, - 'barcode' => $product->barcode, - 'barcode_type' => $product->barcode_type, - 'country_id' => $product->country_id>0?$product->country_id:'', - 'country_code' => $product->country_code, - 'custom_code' => $product->customcode, + $productorservice_result_fields = array( + 'id' => $product->id, + 'ref' => $product->ref, + 'ref_ext' => $product->ref_ext, + 'label' => $product->label, + 'description' => $product->description, + 'date_creation' => dol_print_date($product->date_creation,'dayhourrfc'), + 'date_modification' => dol_print_date($product->date_modification,'dayhourrfc'), + 'note' => $product->note, + 'status_tosell' => $product->status, + 'status_tobuy' => $product->status_buy, + 'type' => $product->type, + 'barcode' => $product->barcode, + 'barcode_type' => $product->barcode_type, + 'country_id' => $product->country_id>0?$product->country_id:'', + 'country_code' => $product->country_code, + 'custom_code' => $product->customcode, - 'price_net' => $product->price, - 'price' => $product->price_ttc, - 'price_min_net' => $product->price_min, - 'price_min' => $product->price_min_ttc, - 'price_base_type' => $product->price_base_type, - 'vat_rate' => $product->tva_tx, - //! French VAT NPR - 'vat_npr' => $product->tva_npr, - //! Spanish local taxes - 'localtax1_tx' => $product->localtax1_tx, - 'localtax2_tx' => $product->localtax2_tx, + 'price_net' => $product->price, + 'price' => $product->price_ttc, + 'price_min_net' => $product->price_min, + 'price_min' => $product->price_min_ttc, + 'price_base_type' => $product->price_base_type, + 'vat_rate' => $product->tva_tx, + //! French VAT NPR + 'vat_npr' => $product->tva_npr, + //! Spanish local taxes + 'localtax1_tx' => $product->localtax1_tx, + 'localtax2_tx' => $product->localtax2_tx, - 'stock_real' => $product->stock_reel, - 'stock_alert' => $product->seuil_stock_alerte, - 'pmp' => $product->pmp, - 'import_key' => $product->import_key, - 'dir' => $pdir, - 'images' => $product->liste_photos($dir,$nbmax=10) - ); + 'stock_real' => $product->stock_reel, + 'stock_alert' => $product->seuil_stock_alerte, + 'pmp' => $product->pmp, + 'import_key' => $product->import_key, + 'dir' => $pdir, + 'images' => $product->liste_photos($dir,$nbmax=10) + ); //Retreive all extrafield for thirdsparty // fetch optionals attributes and labels @@ -515,11 +515,11 @@ function createProductOrService($authentication,$product) $newobject->price_base_type=$product['price_base_type']; $newobject->date_creation=$now; - if ($product['barcode']) - { - $newobject->barcode = $product['barcode']; - $newobject->barcode_type = $product['barcode_type']; - } + if ($product['barcode']) + { + $newobject->barcode = $product['barcode']; + $newobject->barcode_type = $product['barcode_type']; + } $newobject->stock_reel=$product['stock_real']; $newobject->pmp=$product['pmp']; @@ -547,12 +547,12 @@ function createProductOrService($authentication,$product) //var_dump($product['lines'][0]['type']); $extrafields=new ExtraFields($db); - $extralabels=$extrafields->fetch_name_optionals_label('product',true); - foreach($extrafields->attribute_label as $key=>$label) - { - $key='options_'.$key; - $newobject->array_options[$key]=$product[$key]; - } + $extralabels=$extrafields->fetch_name_optionals_label('product',true); + foreach($extrafields->attribute_label as $key=>$label) + { + $key='options_'.$key; + $newobject->array_options[$key]=$product[$key]; + } $db->begin(); @@ -622,7 +622,7 @@ function updateProductOrService($authentication,$product) { $errror++; $errorcode='KO' ; $errorlabel="You must set a barcode type when setting a barcode."; } - + if (! $error) { include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; @@ -645,7 +645,7 @@ function updateProductOrService($authentication,$product) $newobject->price_base_type=$product['price_base_type']; $newobject->date_creation=$now; - if ($product['barcode']) + if ($product['barcode']) { $newobject->barcode = $product['barcode']; $newobject->barcode_type = $product['barcode_type']; @@ -676,13 +676,13 @@ function updateProductOrService($authentication,$product) //var_dump($product['ref_ext']); //var_dump($product['lines'][0]['type']); - $extrafields=new ExtraFields($db); - $extralabels=$extrafields->fetch_name_optionals_label('product',true); - foreach($extrafields->attribute_label as $key=>$label) - { - $key='options_'.$key; - $newobject->array_options[$key]=$product[$key]; - } + $extrafields=new ExtraFields($db); + $extralabels=$extrafields->fetch_name_optionals_label('product',true); + foreach($extrafields->attribute_label as $key=>$label) + { + $key='options_'.$key; + $newobject->array_options[$key]=$product[$key]; + } $db->begin(); From b884b28991da0b0f98d5087b34593a0ecc66a991 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 23 Mar 2015 23:39:14 +0100 Subject: [PATCH 197/412] Include module loan --- build/rpm/dolibarr_fedora.spec | 1 + build/rpm/dolibarr_generic.spec | 1 + build/rpm/dolibarr_mandriva.spec | 1 + build/rpm/dolibarr_opensuse.spec | 1 + 4 files changed, 4 insertions(+) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 0682f400b98..1a6371b1bf8 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -186,6 +186,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/install %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt %_datadir/dolibarr/htdocs/livraison +%_datadir/dolibarr/htdocs/loan %_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/margin %_datadir/dolibarr/htdocs/opensurvey diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 884e883d86c..59569c2c9fd 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -266,6 +266,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/install %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt %_datadir/dolibarr/htdocs/livraison +%_datadir/dolibarr/htdocs/loan %_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/margin %_datadir/dolibarr/htdocs/opensurvey diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index e2b5309b572..0c7050ef049 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -183,6 +183,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/install %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt %_datadir/dolibarr/htdocs/livraison +%_datadir/dolibarr/htdocs/loan %_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/margin %_datadir/dolibarr/htdocs/opensurvey diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 3cf98a83375..34833025e81 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -194,6 +194,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/install %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt %_datadir/dolibarr/htdocs/livraison +%_datadir/dolibarr/htdocs/loan %_datadir/dolibarr/htdocs/mailmanspip %_datadir/dolibarr/htdocs/margin %_datadir/dolibarr/htdocs/opensurvey From f75c11514026e57b5436d711132e4cfb0374b20c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 24 Mar 2015 11:19:51 +0100 Subject: [PATCH 198/412] Fix translation Fix permission not managed into get_menudiv.php --- htdocs/core/get_menudiv.php | 2 +- htdocs/core/menus/standard/auguria_menu.php | 48 +++++++++++++----- htdocs/core/menus/standard/eldy_menu.php | 54 ++++++++++++++------- htdocs/cron/list.php | 6 +-- htdocs/langs/en_US/admin.lang | 10 ++-- htdocs/langs/en_US/cron.lang | 17 ++++--- 6 files changed, 91 insertions(+), 46 deletions(-) diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php index b52c1f73c98..b8eae83d4eb 100644 --- a/htdocs/core/get_menudiv.php +++ b/htdocs/core/get_menudiv.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2005-2015 Laurent Destailleur * * This file is a modified version of datepicker.php from phpBSM to fix some * bugs, to add new features and to dramatically increase speed. diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php index 88052f380c0..ec70253641f 100644 --- a/htdocs/core/menus/standard/auguria_menu.php +++ b/htdocs/core/menus/standard/auguria_menu.php @@ -218,18 +218,42 @@ class MenuManager } foreach($submenu->liste as $key2 => $val2) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' { - $relurl2=dol_buildpath($val2['url'],1); - $relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2); - $relurl2=preg_replace('/__USERID__/',$user->id,$relurl2); - $canonurl2=preg_replace('/\?.*$/','',$val2['url']); - //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']); - if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2=''; - if ($val2['level']==0) print str_pad('',$val2['level']+1).''; // ui-btn to highlight on clic - else print str_pad('',$val2['level']+1).'
  • '; // ui-btn to highlight on clic - if ($relurl2) print ''; - print $val2['titre']; - if ($relurl2) print ''; - print '
    • '."\n"; + $showmenu=true; + if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false; + + if ($showmenu) // Visible (option to hide when not allowed is off or allowed) + { + $relurl2=dol_buildpath($val2['url'],1); + $relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2); + $relurl2=preg_replace('/__USERID__/',$user->id,$relurl2); + $canonurl2=preg_replace('/\?.*$/','',$val2['url']); + //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']); + if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2=''; + if ($val2['level']==0) print str_pad('',$val2['level']+1).''; // ui-btn to highlight on clic + else print str_pad('',$val2['level']+1).'
  • '; // ui-btn to highlight on clic + if ($relurl2) + { + if ($val2['enabled']) // Allowed + { + print ''; + } + else // Not allowed but visible (greyed) + { + print ''; + } + } + print $val2['titre']; + if ($relurl2) + { + if ($val2['enabled']) // Allowed + print ''; + else + print ''; + } + print '
    • '."\n"; + } } //var_dump($submenu); print ''; diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php index af85537d455..31e83c808a8 100644 --- a/htdocs/core/menus/standard/eldy_menu.php +++ b/htdocs/core/menus/standard/eldy_menu.php @@ -150,6 +150,7 @@ class MenuManager { print '
      '; print '
    • '; + if ($val['enabled'] == 1) { $relurl=dol_buildpath($val['url'],1); @@ -184,23 +185,42 @@ class MenuManager } foreach($submenu->liste as $key2 => $val2) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'] { - $relurl2=dol_buildpath($val2['url'],1); - $relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2); - $relurl2=preg_replace('/__USERID__/',$user->id,$relurl2); - $canonurl2=preg_replace('/\?.*$/','',$val2['url']); - //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']); - if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2=''; - if ($val2['level']==0) print str_pad('',$val2['level']+1).''; // ui-btn to highlight on clic - else print str_pad('',$val2['level']+1).'
    • '; // ui-btn to highlight on clic - if ($relurl2) - { - print ''; - } - print $val2['titre']; - if ($relurl2) print ''; - print '
      • '."\n"; + $showmenu=true; + if (! empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu=false; + + if ($showmenu) // Visible (option to hide when not allowed is off or allowed) + { + $relurl2=dol_buildpath($val2['url'],1); + $relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2); + $relurl2=preg_replace('/__USERID__/',$user->id,$relurl2); + $canonurl2=preg_replace('/\?.*$/','',$val2['url']); + //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']); + if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2=''; + if ($val2['level']==0) print str_pad('',$val2['level']+1).''; // ui-btn to highlight on clic + else print str_pad('',$val2['level']+1).'
    • '; // ui-btn to highlight on clic + if ($relurl2) + { + if ($val2['enabled']) // Allowed + { + print ''; + } + else // Not allowed but visible (greyed) + { + print ''; + } + } + print $val2['titre']; + if ($relurl2) + { + if ($val2['enabled']) // Allowed + print ''; + else + print ''; + } + print '
      • '."\n"; + } } //var_dump($submenu); print '
    '; diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 3c2844f3fe4..e543c269fb4 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -100,7 +100,7 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex if ($result < 0) { setEventMessage($object->error,'errors'); } - else + else { $res = $object->reprogram_jobs($user->login); if ($res > 0) @@ -314,11 +314,11 @@ print "\n
    \n"; if (! $user->rights->cron->create) { - print ''.$langs->trans("New").''; + print ''.$langs->trans("CronCreateJob").''; } else { - print ''.$langs->trans("New").''; + print ''.$langs->trans("CronCreateJob").''; } print '
    '; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index e39486e242a..b70f9fa8a84 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -497,7 +497,7 @@ Module1780Desc=Category management (products, suppliers and customers) Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor Module2300Name=Cron -Module2300Desc=Scheduled task management +Module2300Desc=Scheduled job management Module2400Name=Agenda Module2400Desc=Events/tasks and agenda management Module2500Name=Electronic Content Management @@ -733,10 +733,10 @@ Permission1237=Export supplier orders and their details Permission1251=Run mass imports of external data into database (data load) Permission1321=Export customer invoices, attributes and payments Permission1421=Export customer orders and attributes -Permission23001 = Read Scheduled task -Permission23002 = Create/update Scheduled task -Permission23003 = Delete Scheduled task -Permission23004 = Execute Scheduled task +Permission23001=Read Scheduled job +Permission23002=Create/update Scheduled job +Permission23003=Delete Scheduled job +Permission23004=Execute Scheduled job Permission2401=Read actions (events or tasks) linked to his account Permission2402=Create/modify actions (events or tasks) linked to his account Permission2403=Delete actions (events or tasks) linked to his account diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang index 31e701f1e2d..bba9584012a 100644 --- a/htdocs/langs/en_US/cron.lang +++ b/htdocs/langs/en_US/cron.lang @@ -26,15 +26,15 @@ CronLastOutput=Last run output CronLastResult=Last result code CronListOfCronJobs=List of scheduled jobs CronCommand=Command -CronList=Jobs list -CronDelete= Delete cron jobs -CronConfirmDelete= Are you sure you want to delete this cron job ? -CronExecute=Launch job -CronConfirmExecute= Are you sure to execute this job now -CronInfo= Jobs allow to execute task that have been planned -CronWaitingJobs=Wainting jobs +CronList=Scheduled job +CronDelete=Delete scheduled jobs +CronConfirmDelete=Are you sure you want to delete this scheduled jobs ? +CronExecute=Launch scheduled jobs +CronConfirmExecute=Are you sure to execute this scheduled jobs now ? +CronInfo=Scheduled job module allow to execute job that have been planned +CronWaitingJobs=Waiting jobs CronTask=Job -CronNone= None +CronNone=None CronDtStart=Start date CronDtEnd=End date CronDtNextLaunch=Next execution @@ -75,6 +75,7 @@ CronObjectHelp=The object name to load.
    For exemple to fetch method of Doli CronMethodHelp=The object method to launch.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is is fecth CronArgsHelp=The method arguments.
    For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef CronCommandHelp=The system command line to execute. +CronCreateJob=Create new Scheduled Job # Info CronInfoPage=Information # Common From a32fc9efcecbe646e2e44ea2ce5740fcbdee10b1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 24 Mar 2015 14:08:56 +0100 Subject: [PATCH 199/412] Hide logo when option MAIN_OPTIMIZEFORTEXTBROWSER is set. Avoid logo to overwrap box with css. Add help text. --- htdocs/core/class/conf.class.php | 17 ++++---------- htdocs/core/menus/standard/auguria.lib.php | 25 ++++++++++++-------- htdocs/core/menus/standard/eldy.lib.php | 27 +++++++++++++--------- htdocs/core/modules/modResource.class.php | 2 +- htdocs/langs/en_US/main.lang | 1 + htdocs/theme/eldy/style.css.php | 5 ++-- 6 files changed, 41 insertions(+), 36 deletions(-) diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index b6cc390ca33..6370062a6a9 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -379,16 +379,6 @@ class Conf $this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER=1; } - if (! empty($conf->productbatch->enabled)) - { - $this->global->STOCK_CALCULATE_ON_BILL=0; - $this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER=0; - $this->global->STOCK_CALCULATE_ON_SHIPMENT=1; - $this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL=0; - $this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER=0; - $this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER=1; - } - // conf->currency if (empty($this->global->MAIN_MONNAIE)) $this->global->MAIN_MONNAIE='EUR'; $this->currency=$this->global->MAIN_MONNAIE; @@ -448,6 +438,9 @@ class Conf // Default pdf use dash between lines if (! isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) $this->global->MAIN_PDF_DASH_BETWEEN_LINES=1; + // Set default value to MAIN_SHOW_LOGO + if (! isset($this->global->MAIN_SHOW_LOGO)) $this->global->MAIN_SHOW_LOGO=1; + // Default max file size for upload $this->maxfilesize = (empty($this->global->MAIN_UPLOAD_DOC) ? 0 : $this->global->MAIN_UPLOAD_DOC * 1024); @@ -455,8 +448,8 @@ class Conf if (! isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL='user,askpricesupplier,facture,categorie,commande,fournisseur,contact,propal,projet,contrat,societe,ficheinter,expedition,agenda,adherent'; // '' means 'all'. Note that contact is added here as it should be a module later. // Enable select2 - if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT)) $conf->global->MAIN_USE_JQUERY_MULTISELECT='select2'; - + if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT)) $this->global->MAIN_USE_JQUERY_MULTISELECT='select2'; + // Timeouts if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT=10; if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT=30; diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php index cbc73b2767d..59c0329b172 100644 --- a/htdocs/core/menus/standard/auguria.lib.php +++ b/htdocs/core/menus/standard/auguria.lib.php @@ -220,22 +220,27 @@ function print_left_auguria_menu($db,$menu_array_before,$menu_array_after,&$tabM $leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"])); // Show logo company - if (empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO)) + if (empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { $mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI; if (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) { $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=companylogo&file='.urlencode('thumbs/'.$mysoc->logo_mini); - print "\n".''."\n"; - print '
    '."\n"; - print ''; - print ''; - print ''; - print ''; - print '
    '."\n"; } + else + { + $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png'; + } + $title=$langs->trans("GoIntoSetupToChangeLogo"); + print "\n".''."\n"; + print '
    '."\n"; + print ''; + print ''; + print ''; + print ''; + print '
    '."\n"; } // We update newmenu with entries found into database diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 75edbfc1e10..32fc9a07aed 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -426,22 +426,27 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $leftmenu=($forceleftmenu?'':(empty($_SESSION["leftmenu"])?'none':$_SESSION["leftmenu"])); // Show logo company - if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO)) + if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && ! empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { $mysoc->logo_mini=$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI; if (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) { $urllogo=DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=companylogo&file='.urlencode('thumbs/'.$mysoc->logo_mini); - print "\n".''."\n"; - print '
    '."\n"; - print ''; - print ''; - print ''; - print ''; - print '
    '."\n"; } + else + { + $urllogo=DOL_URL_ROOT.'/theme/dolibarr_logo.png'; + } + $title=$langs->trans("GoIntoSetupToChangeLogo"); + print "\n".''."\n"; + print '
    '."\n"; + print ''; + print ''; + print ''; + print ''; + print '
    '."\n"; } /** @@ -824,7 +829,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (empty($leftmenu) || preg_match('/^tax_salary/i',$leftmenu)) $newmenu->add("/compta/salaries/card.php?leftmenu=tax_salary&action=create",$langs->trans("NewPayment"),2,$user->rights->salaries->write); if (empty($leftmenu) || preg_match('/^tax_salary/i',$leftmenu)) $newmenu->add("/compta/salaries/index.php?leftmenu=tax_salary",$langs->trans("Payments"),2,$user->rights->salaries->read); } - + // Loan if (! empty($conf->loan->enabled)) { diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php index 9acebd5d90d..e63f44c3945 100644 --- a/htdocs/core/modules/modResource.class.php +++ b/htdocs/core/modules/modResource.class.php @@ -59,7 +59,7 @@ class modResource extends DolibarrModules // Module description // used if translation string 'ModuleXXXDesc' not found // (where XXX is value of numeric property 'numero' of module) - $this->description = "Description of module Resource"; + $this->description = "Manage resources (printers, cars, room, ...) you can then share into events"; // Possible values for version are: 'development', 'experimental' or version $this->version = 'development'; // Key used in llx_const table to save module status enabled/disabled diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 551807aad59..b160c4303a0 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -694,6 +694,7 @@ AddBox=Add box SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s ShowTransaction=Show transaction +GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. # Week day Monday=Monday Tuesday=Tuesday diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 7a96d672024..1d9905cd37a 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1006,6 +1006,7 @@ div.vmenu, td.vmenu { } .menu_contenu { padding-top: 1px; } +#menu_contenu_logo { padding-right: 4px; } a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:px; font-family: ; text-align: ; font-weight: bold; } font.vmenudisabled { font-size:px; font-family: ; text-align: ; font-weight: bold; color: #93a5aa; } @@ -1393,10 +1394,10 @@ div.tabsElem { margin-top: 8px; } /* To avoid overlap of tabs when not browser div.tabBar { color: #; - padding-top: 9px; + padding-top: px; padding-left: px; padding-right: px; - padding-bottom: 12px; + padding-bottom: px; margin: 0px 0px 14px 0px; -moz-border-radius:6px; -webkit-border-radius: 6px; From f0fb6f1b2cf825f6eef5220815f2204b7cffbcf5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 24 Mar 2015 22:24:15 +0100 Subject: [PATCH 200/412] Work on md theme --- htdocs/main.inc.php | 5 ++- htdocs/theme/eldy/style.css.php | 8 +++++ htdocs/theme/md_exp/style.css.php | 55 ++++++++++++++++++++++--------- htdocs/user/class/user.class.php | 5 +-- 4 files changed, 55 insertions(+), 18 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index cf5df4eb21c..da0296e4b00 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1391,6 +1391,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a if (empty($conf->dol_hide_topmenu)) { + print '
    '; + // Show menu entries print '
    '."\n"; $menumanager->atarget=$target; @@ -1431,8 +1433,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a print '
    '; unset($form); } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 1d9905cd37a..74d94d5b98c 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2203,6 +2203,13 @@ div.dolgraph div.legend table tbody tr { height: auto; } margin-bottom: 2px; margin-top: 2px; } +.photointooltip { + -webkit-box-shadow: -1px -1px 5px #777; + -moz-box-shadow: -1px -1px 5px #777; + box-shadow: -1px -1px 5px #777; + margin-top: 6px; + float: left; +} .logo_setup { @@ -2323,6 +2330,7 @@ border-radius: 6px; #tiptip_content { background-color: rgb(252,248,246); background-color: rgba(252,248,246,0.95); + line-height: 1.4em; } /* ============================================================================== */ diff --git a/htdocs/theme/md_exp/style.css.php b/htdocs/theme/md_exp/style.css.php index d7b3deb75fb..4b8ebe8d178 100644 --- a/htdocs/theme/md_exp/style.css.php +++ b/htdocs/theme/md_exp/style.css.php @@ -114,14 +114,15 @@ $fontsizesmaller='11'; // Eldy colors if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) { + // 90A4AE, 607D8B, 455A64, 37474F //$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474f')); // topmenu #607D8B - $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#607D8B')); // topmenu #607D8B + $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F')); // topmenu #607D8B //$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('000')); // topmenu #607D8B $conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236'; $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu $conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232'; // vmenu (not menu) $conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240'; - $conf->global->THEME_ELDY_BACKTITLE1=join(',',colorStringToArray('607D8B')); // title of arrays + $conf->global->THEME_ELDY_BACKTITLE1=join(',',colorStringToArray('#607D8B')); // title of arrays $conf->global->THEME_ELDY_BACKTITLE2='230,230,230'; $conf->global->THEME_ELDY_BACKTABCARD2='255,255,255'; // card $conf->global->THEME_ELDY_BACKTABCARD1='234,234,234'; @@ -512,19 +513,25 @@ td.showDragHandle { table-layout: fixed; } #id-right, #id-left { - padding-top: 8px; display: table-cell; float: none; vertical-align: top; } +#id-top { +/* min-width: 100%; + position: relative; + heigth: 52px; + background: #f00;*/ +} #id-left { min-height: 100%; position: relative; - width: 184px; + width: 183px; } -#id-right { /* This must stay id-right ant not be replaced with echo $right */ +#id-right { /* This must stay id-right and not be replaced with echo $right */ width: 100%; padding-left: 184px; + padding-top: 12px; } .side-nav { @@ -537,7 +544,6 @@ td.showDragHandle { left: 0; position: fixed; top: 50px; - width: 192px; z-index: 4; -webkit-transform: translateZ(0); -moz-transform: translateZ(0); @@ -565,10 +571,13 @@ td.showDragHandle { overflow-x: hidden; overflow-y: auto; } +.side-nav-vert { + margin-left: 184px; +} div.fiche { - margin-: global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px; + margin-: global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'12'):'24')); ?>px; margin-: dol_optimize_smallscreen)?'12':'4')); ?>px; dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> } @@ -619,7 +628,7 @@ div#tmenu_tooltip { display:none; - padding-: 100px; + /* padding-: 100px; */ background: ; /*box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;*/ @@ -978,11 +987,19 @@ table.login_table_securitycode tr td { } div.login_block { + padding-top: 8px; position: absolute; - : 5px; - top: 3px; + : 5px; + left: 0; + top: 0px; + position: fixed; font-weight: bold; - max-width: 110px; + z-index: 10; + text-align: center; + vertical-align: middle; + background: #FFF; + width: 183px; + height: 42px; display: none; @@ -1049,7 +1066,7 @@ div.vmenu, td.vmenu { float: left; padding: 0px; padding-bottom: 0px; - padding-top: 1px; + padding-top: 0px; width: 174px; } @@ -1516,7 +1533,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { text-decoration: none; white-space: nowrap; - -moz-border-radius:6px 6px 0px 0px; + /*-moz-border-radius:6px 6px 0px 0px; -webkit-border-radius:6px 6px 0px 0px; border-radius:6px 6px 0px 0px; @@ -1524,7 +1541,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { -webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1); box-shadow: 0 -1px 4px rgba(0,0,0,.1); - /*border-bottom: none; + border-bottom: none; border-right: 1px solid #CCCCCC; border-left: 1px solid #D0D0D0; border-top: 1px solid #D8D8D8; @@ -1901,7 +1918,7 @@ table.liste { border-left-width: 1px; border-left-color: #CCC; border-left-style: solid; - + margin-bottom: 2px; margin-top: 0px; @@ -2299,6 +2316,13 @@ div.dolgraph div.legend table tbody tr { height: auto; } margin-bottom: 2px; margin-top: 2px; } +.photointooltip { + -webkit-box-shadow: 0px 0px 5px #777; + -moz-box-shadow: 0px 0px 5px #777; + box-shadow: 0px 0px 6px #777; + margin-top: 8px; + float: left; +} .logo_setup { @@ -2419,6 +2443,7 @@ border-radius: 6px; #tiptip_content { background-color: rgb(252,248,246); background-color: rgba(252,248,246,0.95); + line-height: 1.4em; } /* ============================================================================== */ diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 9ffa762afd1..d8d8a1f071c 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1808,12 +1808,13 @@ class User extends CommonObject } $type=($this->societe_id?$langs->trans("External").$company:$langs->trans("Internal")); $label.= '
    ' . $langs->trans("Type") . ': ' . $type; + $label.='
    '; if (! empty($this->photo)) { - $label.= '
    '; + $label.= '
    '; $label.= Form::showphoto('userphoto', $this, 80); + $label.= '
    '; } - $label.= '
    '; // Info Login if ($infologin) From 456b11d148ebdfd676a945ada134bed221bb3759 Mon Sep 17 00:00:00 2001 From: fmarcet Date: Wed, 25 Mar 2015 11:23:05 +0100 Subject: [PATCH 201/412] Fix: Not using where on sellist --- htdocs/core/class/extrafields.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index cc602d08ed5..821ada820dc 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -766,7 +766,7 @@ class ExtraFields $sqlwhere.= ' WHERE 1'; } if (in_array($InfoFieldList[0],array('tablewithentity'))) $sqlwhere.= ' AND entity = '.$conf->entity; // Some tables may have field, some other not. For the moment we disable it. - //$sql.=preg_replace('/^ AND /','',$sqlwhere); + $sql.=$sqlwhere; //print $sql; dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG); From cc2d86bd58552df3c80fe4b0e87c5d6f34a1adb5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 25 Mar 2015 14:31:04 +0100 Subject: [PATCH 202/412] Status of project was not visible on thirdparty card --- htdocs/core/lib/company.lib.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index cfa5a945841..8abdf32c635 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -471,7 +471,7 @@ function show_projects($conf,$langs,$db,$object,$backtopage='') print_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"),$buttoncreate,''); print "\n".''; - $sql = "SELECT p.rowid,p.title,p.ref,p.public, p.dateo as do, p.datee as de"; + $sql = "SELECT p.rowid as id, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status"; $sql .= " FROM ".MAIN_DB_PREFIX."projet as p"; $sql .= " WHERE p.fk_soc = ".$object->id; $sql .= " ORDER BY p.dateo DESC"; @@ -483,23 +483,24 @@ function show_projects($conf,$langs,$db,$object,$backtopage='') print ''; print ''; + print ''; print ''; if ($num > 0) { require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; - $projectstatic = new Project($db); + $projecttmp = new Project($db); $i=0; $var=false; while ($i < $num) { $obj = $db->fetch_object($result); - $projectstatic->fetch($obj->rowid); + $projecttmp->fetch($obj->id); // To verify role of users - $userAccess = $projectstatic->restrictedProjectArea($user); + $userAccess = $projecttmp->restrictedProjectArea($user); if ($user->rights->projet->lire && $userAccess > 0) { @@ -507,13 +508,15 @@ function show_projects($conf,$langs,$db,$object,$backtopage='') print ""; // Ref - print ''; + print ''; // Label print ''; // Date start print ''; // Date end print ''; + // Status + print ''; print ''; } From 21b1f7cc265ac0f7e5fe3be7ac36ca0ebc934ead Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 25 Mar 2015 14:51:12 +0100 Subject: [PATCH 203/412] Fix bad calculation of email for notifications --- htdocs/core/class/notify.class.php | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index aa92e6ee50f..8d54d05a810 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -91,7 +91,8 @@ class Notify $error=0; $num=0; - $valueforthreshold = $object->total_ht; + $valueforthreshold = 0; + if (is_object($object)) $valueforthreshold = $object->total_ht; if (! $error) { @@ -103,8 +104,11 @@ class Notify $sql.= " WHERE n.fk_contact = c.rowid"; $sql.= " AND a.rowid = n.fk_action"; $sql.= " AND n.fk_soc = s.rowid"; - if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode; // Old usage - else $sql.= " AND a.code = '".$notifcode."'"; // New usage + if ($notifcode) + { + if (is_numeric($notifcode)) $sql.= " AND n.fk_action = ".$notifcode; // Old usage + else $sql.= " AND a.code = '".$notifcode."'"; // New usage + } $sql.= " AND s.entity IN (".getEntity('societe', 1).")"; if ($socid > 0) $sql.= " AND s.rowid = ".$socid; @@ -125,16 +129,21 @@ class Notify if (! $error) { + // List of notifications enabled for fixed email foreach($conf->global as $key => $val) { - if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue; + if ($notifcode) + { + if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_'.$notifcode.'_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue; + } + else + { + if ($val == '' || ! preg_match('/^NOTIFICATION_FIXEDEMAIL_.*_THRESHOLD_HIGHER_(.*)$/', $key, $reg)) continue; + } $threshold = (float) $reg[1]; - if ($valueforthreshold <= $threshold) - { - continue; - } + if ($valueforthreshold < $threshold) continue; $tmpemail=explode(',',$val); $num+=count($tmpemail); From b250c5588ecb612df124c2a70c454bbe6509baa5 Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Wed, 25 Mar 2015 16:11:36 +0100 Subject: [PATCH 204/412] Fix : Quantity displayed for virtual stock explanations was wrong --- htdocs/product/stock/product.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 338169a6154..400c3c1f006 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -343,7 +343,7 @@ if ($id > 0 || $ref) if (! empty($conf->commande->enabled)) { if ($found) print '
    '; else $found=1; - print $langs->trans("CustomersOrdersRunning").': '.($product->stats_commande['qty']-$product->stats_sendings['qty']); + print $langs->trans("CustomersOrdersRunning").': '.($product->stats_commande['qty']-$product->stats_expedition['qty']); $result=$product->load_stats_commande(0,'0'); if ($result < 0) dol_print_error($db,$product->error); print ' ('.$langs->trans("Draft").': '.$product->stats_commande['qty'].')'; From 19540b14b59bfc64d5db481a22e97dbdcb57864b Mon Sep 17 00:00:00 2001 From: frederic34 Date: Wed, 25 Mar 2015 16:38:18 +0100 Subject: [PATCH 205/412] Add last shipments to company card --- htdocs/comm/card.php | 70 ++++++++++++++++++++++++++++++++ htdocs/langs/en_US/sendings.lang | 1 + 2 files changed, 71 insertions(+) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 3ea63caf256..14bf6e42fe8 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -7,6 +7,7 @@ * Copyright (C) 2008 Raphael Bertrand (Resultic) * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2013 Alexandre Spangaro + * Copyright (C) 2015 Frederic France * * 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 @@ -37,6 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; if (! empty($conf->facture->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; +if (! empty($conf->expedition->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; if (! empty($conf->contrat->enabled)) require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php'; if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'; if (! empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php'; @@ -44,6 +46,7 @@ if (! empty($conf->ficheinter->enabled)) require_once DOL_DOCUMENT_ROOT.'/fichin $langs->load("companies"); if (! empty($conf->contrat->enabled)) $langs->load("contracts"); if (! empty($conf->commande->enabled)) $langs->load("orders"); +if (! empty($conf->expedition->enabled)) $langs->load("sendings"); if (! empty($conf->facture->enabled)) $langs->load("bills"); if (! empty($conf->projet->enabled)) $langs->load("projects"); if (! empty($conf->ficheinter->enabled)) $langs->load("interventions"); @@ -661,6 +664,73 @@ if ($id > 0) } } + /* + * Last sendings + */ + if (! empty($conf->expedition->enabled) && $user->rights->expedition->lire) { + $sendingstatic = new Expedition($db); + + $sql = 'SELECT e.rowid as id'; + $sql.= ', e.ref'; + $sql.= ', e.date_creation'; + $sql.= ', e.fk_statut as statut'; + $sql.= ', s.nom'; + $sql.= ', s.rowid as socid'; + $sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e"; + $sql.= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id; + $sql.= " AND e.entity = ".$conf->entity; + $sql.= ' GROUP BY e.rowid'; + $sql.= ', e.ref'; + $sql.= ', e.date_creation'; + $sql.= ', e.fk_statut'; + $sql.= ', s.nom'; + $sql.= ', s.rowid'; + $sql.= " ORDER BY e.date_creation DESC"; + + $resql = $db->query($sql); + if ($resql) { + $var = true; + $num = $db->num_rows($resql); + $i = 0; + if ($num > 0) { + print '
    '.$langs->trans("Ref").''.$langs->trans("Name").''.$langs->trans("DateStart").''.$langs->trans("DateEnd").''.$langs->trans("Status").'
    '.img_object($langs->trans("ShowProject"),($obj->public?'projectpub':'project'))." ".$obj->ref.''.img_object($langs->trans("ShowProject"),($obj->public?'projectpub':'project'))." ".$obj->ref.''.$obj->title.''.dol_print_date($db->jdate($obj->do),"day").''.dol_print_date($db->jdate($obj->de),"day").''.$projecttmp->getLibStatut(5).'
    '; + + $tableaushown=1; + print ''; + print ''; + print ''; + } + + while ($i < $num && $i < $MAXLIST) { + $objp = $db->fetch_object($resql); + $var = ! $var; + print ""; + print ''; + if ($objp->date_creation > 0) { + print ''; + } else { + print ''; + } + + print ''; + print "\n"; + $i++; + } + $db->free($resql); + + if ($num > 0) + print "
    '; + print ''; + print '
    '.$langs->trans("LastSendings",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllSendings").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
    '; + $sendingstatic->id = $objp->id; + $sendingstatic->ref = $objp->ref; + print $sendingstatic->getNomUrl(1); + print ''.dol_print_date($db->jdate($objp->date_creation),'day').'!!!' . $sendingstatic->LibStatut($objp->statut, 5) . '
    "; + } else { + dol_print_error($db); + } + } + /* * Last linked contracts */ diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang index b1ff55f71c1..84088c3e023 100644 --- a/htdocs/langs/en_US/sendings.lang +++ b/htdocs/langs/en_US/sendings.lang @@ -2,6 +2,7 @@ RefSending=Ref. shipment Sending=Shipment Sendings=Shipments +AllSendings=All Shipments Shipment=Shipment Shipments=Shipments ShowSending=Show Sending From 8be08c692fb6720f11580bffe55e25e6375734fc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 25 Mar 2015 18:10:45 +0100 Subject: [PATCH 206/412] Fix some secuity tests were not done. --- htdocs/core/login/functions_dolibarr.php | 26 ++++--- htdocs/core/login/functions_ldap.php | 92 +++++++++++++----------- 2 files changed, 66 insertions(+), 52 deletions(-) diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php index 0a0ab1e8bfe..69aec814413 100644 --- a/htdocs/core/login/functions_dolibarr.php +++ b/htdocs/core/login/functions_dolibarr.php @@ -36,9 +36,6 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest=1) { global $db,$conf,$langs; - global $mc; - - dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest); // Force master entity in transversal mode $entity=$entitytotest; @@ -48,6 +45,8 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= if (! empty($usertotest)) { + dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest); + // If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko $table = MAIN_DB_PREFIX."user"; $usernamecol1 = 'login'; @@ -60,7 +59,6 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'"; $sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")"; - dol_syslog("functions_dolibarr::check_user_password_dolibarr", LOG_DEBUG); $resql=$db->query($sql); if ($resql) { @@ -99,12 +97,6 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= } } - if ($passok && ! empty($obj->entity) && (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode))) - { - $ret=$mc->checkRight($obj->rowid, $entitytotest); // The module multicompany check here user belong to at least one group into company. This is a bugged behaviour, so you must hack module to make thing working. - if ($ret < 0) $passok=false; - } - // Password ok ? if ($passok) { @@ -112,12 +104,24 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= } else { - dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password pour '".$usertotest."'"); + dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'"); sleep(1); $langs->load('main'); $langs->load('errors'); $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword"); } + + if ($passok && ! empty($conf->multicompany->enabled)) // We must check entity + { + global $mc; + + $ret=$mc->checkRight($obj->rowid, $entitytotest); + if ($ret < 0) + { + dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '".$entitytotest."' not allowed for user '".$obj->rowid."'"); + $login=''; // force authentication failure + } + } } else { diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php index a67bc040e2f..208ccd0c37c 100644 --- a/htdocs/core/login/functions_ldap.php +++ b/htdocs/core/login/functions_ldap.php @@ -34,7 +34,8 @@ */ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) { - global $_POST,$db,$conf,$langs; + global $db,$conf,$langs; + global $_POST; global $dolibarr_main_auth_ldap_host,$dolibarr_main_auth_ldap_port; global $dolibarr_main_auth_ldap_version,$dolibarr_main_auth_ldap_servertype; global $dolibarr_main_auth_ldap_login_attribute,$dolibarr_main_auth_ldap_dn; @@ -42,6 +43,13 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) global $dolibarr_main_auth_ldap_filter; global $dolibarr_main_auth_ldap_debug; + // Force master entity in transversal mode + $entity=$entitytotest; + if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $entity=1; + + $login=''; + $resultFetchUser=''; + if (! function_exists("ldap_connect")) { dol_syslog("functions_ldap::check_user_password_ldap Authentification ko failed to connect to LDAP. LDAP functions are disabled on this PHP"); @@ -52,11 +60,10 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) return; } - $login=''; - $resultFetchUser=''; - - if (!empty($_POST["username"]) || $usertotest) + if ($usertotest) { + dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./','*',$passwordtotest)." entitytotest=".$entitytotest); + // If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko $ldaphost=$dolibarr_main_auth_ldap_host; $ldapport=$dolibarr_main_auth_ldap_port; @@ -80,7 +87,6 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) $ldap->searchUser=$ldapadminlogin; $ldap->searchPassword=$ldapadminpass; - dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest); if ($ldapdebug) { dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',',$ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType); @@ -146,52 +152,56 @@ function check_user_password_ldap($usertotest,$passwordtotest,$entitytotest) $login=$usertotest; // ldap2dolibarr synchronisation - if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') + if ($login && ! empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') // ldap2dolibarr synchronisation { - dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr"); + dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr"); - // On charge les attributs du user ldap - if ($ldapdebug) print "DEBUG: login ldap = ".$login."
    \n"; - $resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter); + // On charge les attributs du user ldap + if ($ldapdebug) print "DEBUG: login ldap = ".$login."
    \n"; + $resultFetchLdapUser = $ldap->fetch($login,$userSearchFilter); - if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."
    \n"; - if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."
    \n"; - if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."
    \n"; + if ($ldapdebug) print "DEBUG: UACF = ".join(',',$ldap->uacf)."
    \n"; + if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset,'day')."
    \n"; + if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime,'day')."
    \n"; - // On recherche le user dolibarr en fonction de son SID ldap - $sid = $ldap->getObjectSid($login); - if ($ldapdebug) print "DEBUG: sid = ".$sid."
    \n"; + // On recherche le user dolibarr en fonction de son SID ldap + $sid = $ldap->getObjectSid($login); + if ($ldapdebug) print "DEBUG: sid = ".$sid."
    \n"; - $user=new User($db); - $resultFetchUser=$user->fetch('',$login,$sid); - if ($resultFetchUser > 0) - { - dol_syslog("functions_ldap::check_user_password_ldap Sync user found id=".$user->id); - // On verifie si le login a change et on met a jour les attributs dolibarr - - if ($conf->multicompany->enabled) + $usertmp=new User($db); + $resultFetchUser=$usertmp->fetch('',$login,$sid); + if ($resultFetchUser > 0) { - global $mc; + dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id); + // On verifie si le login a change et on met a jour les attributs dolibarr - $ret=$mc->checkRight($user->id, $entitytotest, $user); // The module multicompany check here user belong to at least one group into company. This is a bugged behaviour, so you must hack module to make thing working. - if ($ret < 0) + if ($usertmp->login != $ldap->login && $ldap->login) { - dol_syslog("Failed to checkRight by module multicompany for user id = ".$user->id." into entity ".$entitytotest); - $login=false; // force error of authentication + $usertmp->login = $ldap->login; + $usertmp->update($usertmp); + // TODO Que faire si update echoue car on update avec un login deja existant. } + + //$resultUpdate = $usertmp->update_ldap2dolibarr($ldap); } - - - if ($user->login != $ldap->login && $ldap->login) - { - $user->login = $ldap->login; - $user->update($user); - // TODO Que faire si update echoue car on update avec un login deja existant. - } - - //$resultUpdate = $user->update_ldap2dolibarr($ldap); - } + unset($usertmp); } + + if (! empty($conf->multicompany->enabled)) // We must check entity (even if sync is not active) + { + global $mc; + + $usertmp=new User($db); + $usertmp->fetch('',$login); + $ret=$mc->checkRight($usertmp->id, $entitytotest); + if ($ret < 0) + { + dol_syslog("functions_ldap::check_user_password_ldap Authentification ko entity '".$entitytotest."' not allowed for user '".$usertmp->id."'"); + $login=''; // force authentication failure + } + unset($usertmp); + } + } if ($result == 1) { From f7b8a2b036473bc08ce42f8a9e3b78fa37dbd54b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 25 Mar 2015 18:13:53 +0100 Subject: [PATCH 207/412] Restore align=right --- htdocs/theme/eldy/style.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 74d94d5b98c..aa9cc9fe862 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -948,7 +948,7 @@ div.login a:hover { text-decoration:underline; } div.login_block_user, div.login_block_other { clear: both; } -div.login_block_other { padding-top: 3px; } +div.login_block_other { padding-top: 3px; text-align: right; } .login_block_elem { float: right; vertical-align: top; From f778f470492aa5ec84270c8e891b2dd5a9370cee Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 25 Mar 2015 21:46:08 +0100 Subject: [PATCH 208/412] Add dirs --- build/rpm/dolibarr_fedora.spec | 1 + build/rpm/dolibarr_generic.spec | 1 + build/rpm/dolibarr_mandriva.spec | 1 + build/rpm/dolibarr_opensuse.spec | 1 + 4 files changed, 4 insertions(+) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 1a6371b1bf8..463f3e94e86 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -172,6 +172,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/contrat %_datadir/dolibarr/htdocs/core %_datadir/dolibarr/htdocs/cron +%_datadir/dolibarr/htdocs/donations %_datadir/dolibarr/htdocs/ecm %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 59569c2c9fd..adc5abbfd58 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -252,6 +252,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/contrat %_datadir/dolibarr/htdocs/core %_datadir/dolibarr/htdocs/cron +%_datadir/dolibarr/htdocs/donations %_datadir/dolibarr/htdocs/ecm %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 0c7050ef049..ecc5fb76b0c 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -169,6 +169,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/contrat %_datadir/dolibarr/htdocs/core %_datadir/dolibarr/htdocs/cron +%_datadir/dolibarr/htdocs/donations %_datadir/dolibarr/htdocs/ecm %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 34833025e81..129f6dc8f0a 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -180,6 +180,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/contrat %_datadir/dolibarr/htdocs/core %_datadir/dolibarr/htdocs/cron +%_datadir/dolibarr/htdocs/donations %_datadir/dolibarr/htdocs/ecm %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport From 2b2b43afb6b670944cfa21fbc663957b814ea94a Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 25 Mar 2015 22:37:14 +0100 Subject: [PATCH 209/412] Dir "Don" --- build/rpm/dolibarr_fedora.spec | 2 +- build/rpm/dolibarr_generic.spec | 2 +- build/rpm/dolibarr_mandriva.spec | 2 +- build/rpm/dolibarr_opensuse.spec | 2 +- htdocs/compta/bank/account.php | 2 +- htdocs/compta/index.php | 4 +- htdocs/compta/resultat/clientfourn.php | 2 +- htdocs/core/lib/donation.lib.php | 10 +- htdocs/core/menus/init_menu_auguria.sql | 8 +- htdocs/core/menus/standard/eldy.lib.php | 8 +- .../modules/dons/html_cerfafr.modules.php | 2 +- htdocs/core/modules/dons/modules_don.php | 2 +- htdocs/{donations => don}/admin/donation.php | 4 +- .../admin/donation_extrafields.php | 2 +- htdocs/{donations => don/admin}/index.html | 0 htdocs/don/admin/index.php | 117 ++++++++++++++++++ htdocs/{donations => don}/card.php | 54 ++++---- htdocs/{donations => don}/class/don.class.php | 78 ++++++------ .../class/donationstats.class.php | 4 +- htdocs/don/class/index.html | 0 .../class/paymentdonation.class.php | 8 +- htdocs/{donations => don}/document.php | 6 +- htdocs/don/index.html | 0 htdocs/{donations => don}/index.php | 4 +- htdocs/{donations => don}/info.php | 4 +- htdocs/{donations => don}/list.php | 4 +- htdocs/{donations => don}/payment/card.php | 10 +- htdocs/don/payment/index.html | 0 htdocs/{donations => don}/payment/payment.php | 12 +- htdocs/{donations => don}/stats/index.php | 8 +- htdocs/install/filelist.xml | 2 +- htdocs/product/class/product.class.php | 2 +- 32 files changed, 239 insertions(+), 126 deletions(-) rename htdocs/{donations => don}/admin/donation.php (99%) rename htdocs/{donations => don}/admin/donation_extrafields.php (98%) rename htdocs/{donations => don/admin}/index.html (100%) create mode 100644 htdocs/don/admin/index.php rename htdocs/{donations => don}/card.php (93%) rename htdocs/{donations => don}/class/don.class.php (93%) rename htdocs/{donations => don}/class/donationstats.class.php (96%) create mode 100644 htdocs/don/class/index.html rename htdocs/{donations => don}/class/paymentdonation.class.php (97%) rename htdocs/{donations => don}/document.php (92%) create mode 100644 htdocs/don/index.html rename htdocs/{donations => don}/index.php (98%) rename htdocs/{donations => don}/info.php (93%) rename htdocs/{donations => don}/list.php (98%) rename htdocs/{donations => don}/payment/card.php (95%) create mode 100644 htdocs/don/payment/index.html rename htdocs/{donations => don}/payment/payment.php (95%) rename htdocs/{donations => don}/stats/index.php (97%) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 463f3e94e86..c34cd4e9d61 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -172,7 +172,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/contrat %_datadir/dolibarr/htdocs/core %_datadir/dolibarr/htdocs/cron -%_datadir/dolibarr/htdocs/donations +%_datadir/dolibarr/htdocs/don %_datadir/dolibarr/htdocs/ecm %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index adc5abbfd58..c3c3b2a7939 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -252,7 +252,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/contrat %_datadir/dolibarr/htdocs/core %_datadir/dolibarr/htdocs/cron -%_datadir/dolibarr/htdocs/donations +%_datadir/dolibarr/htdocs/don %_datadir/dolibarr/htdocs/ecm %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index ecc5fb76b0c..efe55e2aa7a 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -169,7 +169,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/contrat %_datadir/dolibarr/htdocs/core %_datadir/dolibarr/htdocs/cron -%_datadir/dolibarr/htdocs/donations +%_datadir/dolibarr/htdocs/don %_datadir/dolibarr/htdocs/ecm %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 129f6dc8f0a..6a86f9e3ffa 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -180,7 +180,7 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/contrat %_datadir/dolibarr/htdocs/core %_datadir/dolibarr/htdocs/cron -%_datadir/dolibarr/htdocs/donations +%_datadir/dolibarr/htdocs/don %_datadir/dolibarr/htdocs/ecm %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index a4bfe4c0c37..3213709a54e 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php' require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 9af8296f84d..698676829d1 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -127,7 +127,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) if (! empty($conf->don->enabled) && $user->rights->don->lire) { $langs->load("donations"); - print ''; + print ''; print ''; print ''; print ''; @@ -497,7 +497,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- // Last donations if (! empty($conf->don->enabled) && $user->rights->societe->lire) { - include_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; + include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; $langs->load("boxes"); $donationstatic=new Don($db); diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php index 4f1ff225417..a9e14030388 100644 --- a/htdocs/compta/resultat/clientfourn.php +++ b/htdocs/compta/resultat/clientfourn.php @@ -651,7 +651,7 @@ if ($conf->donation->enabled) $var = !$var; print ""; - print "\n"; + print "\n"; if ($modecompta == 'CREANCES-DETTES') print ''; print ''; diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php index 93cbe889e4d..4155d5ce60e 100644 --- a/htdocs/core/lib/donation.lib.php +++ b/htdocs/core/lib/donation.lib.php @@ -34,7 +34,7 @@ function donation_admin_prepare_head() $h = 0; $head = array (); - $head[$h][0] = DOL_URL_ROOT . '/donations/admin/donation.php'; + $head[$h][0] = DOL_URL_ROOT . '/don/admin/donation.php'; $head[$h][1] = $langs->trans("Miscellaneous"); $head[$h][2] = 'general'; $h ++; @@ -45,7 +45,7 @@ function donation_admin_prepare_head() // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation_admin'); - $head[$h][0] = DOL_URL_ROOT . '/donations/admin/donation_extrafields.php'; + $head[$h][0] = DOL_URL_ROOT . '/don/admin/donation_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFields"); $head[$h][2] = 'attributes'; $h++; @@ -68,7 +68,7 @@ function donation_prepare_head($object) $h = 0; $head = array (); - $head[$h][0] = DOL_URL_ROOT . '/donations/card.php?id=' . $object->id; + $head[$h][0] = DOL_URL_ROOT . '/don/card.php?id=' . $object->id; $head[$h][1] = $langs->trans("Card"); $head[$h][2] = 'card'; $h ++; @@ -79,12 +79,12 @@ function donation_prepare_head($object) // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation'); - $head[$h][0] = DOL_URL_ROOT . '/donations/document.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT . '/don/document.php?id='.$object->id; $head[$h][1] = $langs->trans("Documents"); $head[$h][2] = 'documents'; $h++; - $head[$h][0] = DOL_URL_ROOT . '/donations/info.php?id=' . $object->id; + $head[$h][0] = DOL_URL_ROOT . '/don/info.php?id=' . $object->id; $head[$h][1] = $langs->trans("Info"); $head[$h][2] = 'info'; $h++; diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 00579ab5f6d..3eab01619f1 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -172,10 +172,10 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left -- Accountancy - Orders to bill insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'accountancy', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__); -- Donations -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled', __HANDLER__, 'left', 2000__+MAX_llx_menu__, 'accountancy', 'donations', 6__+MAX_llx_menu__, '/donations/index.php?leftmenu=donations&mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/donations/card.php?leftmenu=donations&mainmenu=accountancy&action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/donations/list.php?leftmenu=donations&mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/donations/stats/index.php?leftmenu=donations&mainmenu=accountancy', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled', __HANDLER__, 'left', 2000__+MAX_llx_menu__, 'accountancy', 'donations', 6__+MAX_llx_menu__, '/don/index.php?leftmenu=donations&mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/don/card.php?leftmenu=donations&mainmenu=accountancy&action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/don/list.php?leftmenu=donations&mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/don/stats/index.php?leftmenu=donations&mainmenu=accountancy', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__); -- Special expenses insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled || $conf->salaries->enabled', __HANDLER__, 'left', 2200__+MAX_llx_menu__, 'accountancy', 'tax', 6__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy', 'MenuSpecialExpenses', 0, 'compta', '(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)', '', 0, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled', __HANDLER__, 'left', 2210__+MAX_llx_menu__, 'accountancy', 'tax_sal', 2200__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary&mainmenu=accountancy', 'Salaries', 1, 'salaries', '$user->rights->salaries->read', '', 0, 1, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index b6122c095a2..1d35db720b7 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -807,10 +807,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->don->enabled)) { $langs->load("donations"); - $newmenu->add("/donations/index.php?leftmenu=donations&mainmenu=accountancy",$langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations'); - if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/donations/card.php?action=create",$langs->trans("NewDonation"), 1, $user->rights->don->creer); - if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/donations/list.php",$langs->trans("List"), 1, $user->rights->don->lire); - if ($leftmenu=="donations") $newmenu->add("/donations/stats/index.php",$langs->trans("Statistics"), 1, $user->rights->don->lire); + $newmenu->add("/don/index.php?leftmenu=donations&mainmenu=accountancy",$langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations'); + if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/don/card.php?action=create",$langs->trans("NewDonation"), 1, $user->rights->don->creer); + if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/don/list.php",$langs->trans("List"), 1, $user->rights->don->lire); + if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->rights->don->lire); } // Taxes and social contributions diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php index 0efaf8c4524..8730b1041de 100644 --- a/htdocs/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -25,7 +25,7 @@ * \brief Form of donation */ require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php'; diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php index abb7dd105ae..14045f20d11 100644 --- a/htdocs/core/modules/dons/modules_don.php +++ b/htdocs/core/modules/dons/modules_don.php @@ -25,7 +25,7 @@ * \brief File of class to manage donation document generation */ require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; diff --git a/htdocs/donations/admin/donation.php b/htdocs/don/admin/donation.php similarity index 99% rename from htdocs/donations/admin/donation.php rename to htdocs/don/admin/donation.php index fa785763cc0..41ea0a3d542 100644 --- a/htdocs/donations/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -19,14 +19,14 @@ */ /** - * \file htdocs/donations/admin/dons.php + * \file htdocs/don/admin/dons.php * \ingroup donations * \brief Page to setup the donation module */ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $langs->load("admin"); diff --git a/htdocs/donations/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php similarity index 98% rename from htdocs/donations/admin/donation_extrafields.php rename to htdocs/don/admin/donation_extrafields.php index f93b48bafca..6c964b46321 100644 --- a/htdocs/donations/admin/donation_extrafields.php +++ b/htdocs/don/admin/donation_extrafields.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/donations/admin/donation_extrafields.php + * \file htdocs/don/admin/donation_extrafields.php * \ingroup donations * \brief Page to setup extra fields of donations */ diff --git a/htdocs/donations/index.html b/htdocs/don/admin/index.html similarity index 100% rename from htdocs/donations/index.html rename to htdocs/don/admin/index.html diff --git a/htdocs/don/admin/index.php b/htdocs/don/admin/index.php new file mode 100644 index 00000000000..78ff3b48f9a --- /dev/null +++ b/htdocs/don/admin/index.php @@ -0,0 +1,117 @@ + + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +/** + * \file htdocs/admin/index.php + * \ingroup Donations + * \brief Setup page to configure donations module + */ + +require '../main.inc.php'; + +// Class +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; + +$langs->load("admin"); +$langs->load("donations"); + +// Security check +if (!$user->admin) + accessforbidden(); + +$action = GETPOST('action', 'alpha'); + +// Other parameters DONATIONS_* +$list = array ( + 'DONATIONS_ACCOUNTING_ACCOUNT_PRODUCT' +); + +/* + * Actions + */ + +if ($action == 'update') +{ + $error = 0; + + foreach ($list as $constname) { + $constvalue = GETPOST($constname, 'alpha'); + + if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) { + $error++; + } + } + + if (! $error) + { + setEventMessage($langs->trans("SetupSaved")); + } + else + { + setEventMessage($langs->trans("Error"),'errors'); + } +} + +/* + * View + */ + +llxHeader('',$langs->trans('DonationsSetup')); + +$form = new Form($db); + +$linkback=''.$langs->trans("BackToModuleList").''; +print_fiche_titre($langs->trans('DonationsSetup'),$linkback,'setup'); + +print ''; +print ''; +print ''; + +/* + * Params + */ +print '
    '.$langs->trans("SearchADonation").'
     ".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."".$langs->trans("Donation")." name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."'.price($obj->amount).''.price($obj->amount).'
    '; +print ''; +print ''; +print "\n"; + +foreach ($list as $key) +{ + $var=!$var; + + print ''; + + // Param + $label = $langs->trans($key); + print ''; + + // Value + print ''; +} + +print ''; + +print ''; +print "
    ' . $langs->trans('Options') . '
    '; + print ''; + print '
    \n"; + +print '
    '; + +llxFooter(); +$db->close(); \ No newline at end of file diff --git a/htdocs/donations/card.php b/htdocs/don/card.php similarity index 93% rename from htdocs/donations/card.php rename to htdocs/don/card.php index 6c2bd28a2d0..7e4039f760f 100644 --- a/htdocs/donations/card.php +++ b/htdocs/don/card.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/donations/card.php + * \file htdocs/don/card.php * \ingroup donations * \brief Page of donation card */ @@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'; if (! empty($conf->projet->enabled)) @@ -111,7 +111,7 @@ if ($action == 'update') $object->note_public = GETPOST("note_public"); // Fill array 'array_options' with data from add form - $ret = $extrafields->setOptionalsFromPost($extralabels,$object); + $ret = $extrafields->setOptionalsFromPost($extralabels,$object); if ($ret < 0) $error++; if ($object->update($user) > 0) @@ -164,7 +164,7 @@ if ($action == 'add') $object->fk_project = GETPOST("fk_project"); // Fill array 'array_options' with data from add form - $ret = $extrafields->setOptionalsFromPost($extralabels,$object); + $ret = $extrafields->setOptionalsFromPost($extralabels,$object); if ($ret < 0) $error++; if ($object->create($user) > 0) @@ -355,13 +355,13 @@ if ($action == 'create') } // Other attributes - $parameters=array(); - $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook - if (empty($reshook) && ! empty($extrafields->attribute_label)) - { - print $object->showOptionals($extrafields,'edit'); - } - + $parameters=array('colspan' => 3); + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + print $object->showOptionals($extrafields,'edit',$parameters); + } + print "\n"; print '
       
    '; print "\n"; @@ -461,13 +461,13 @@ if (! empty($id) && $action == 'edit') } // Other attributes - $parameters=array(); - $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook - if (empty($reshook) && ! empty($extrafields->attribute_label)) - { - print $object->showOptionals($extrafields,'edit'); - } - + $parameters=array('colspan' => ' colspan="2"'); + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + print $object->showOptionals($extrafields,'edit'); + } + print "\n"; print '
       
    '; @@ -502,7 +502,7 @@ if (! empty($id) && $action != 'edit') print ''; print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; $nbrows=12; if (! empty($conf->projet->enabled)) $nbrows++; @@ -570,7 +570,7 @@ if (! empty($id) && $action != 'edit') $objp = $db->fetch_object($resql); $var=!$var; print "'; + print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''; print '\n"; $labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->paiement_type; print "\n"; @@ -639,12 +639,12 @@ if (! empty($id) && $action != 'edit') } // Other attributes - $parameters=array(); - $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook - if (empty($reshook) && ! empty($extrafields->attribute_label)) - { - print $object->showOptionals($extrafields); - } + $parameters=array('colspan' => ' colspan="2"'); + $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook + if (empty($reshook) && ! empty($extrafields->attribute_label)) + { + print $object->showOptionals($extrafields); + } print "
    "; - print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''.dol_print_date($db->jdate($objp->dp),'day')."".$labeltype.' '.$object->num_paiement."
    \n"; print "\n"; @@ -679,7 +679,7 @@ if (! empty($id) && $action != 'edit') } else { - print '
    ' . $langs->trans('DoPayment') . '
    '; + print '
    ' . $langs->trans('DoPayment') . '
    '; } } diff --git a/htdocs/donations/class/don.class.php b/htdocs/don/class/don.class.php similarity index 93% rename from htdocs/donations/class/don.class.php rename to htdocs/don/class/don.class.php index e02ecefccbc..c9f776e5ce6 100644 --- a/htdocs/donations/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/donations/class/don.class.php + * \file htdocs/don/class/don.class.php * \ingroup Donation * \brief File of class to manage donations */ @@ -369,24 +369,22 @@ class Don extends CommonObject $result = $this->db->query($sql); if ($result) { - // Actions on extra fields (by external module) - /*$hookmanager->initHooks(array('dondao')); - $parameters=array('id'=>$this->id); - $action=''; - $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - if (empty($reshook)) - { - if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used - { - $result=$this->insertExtraFields(); - if ($result < 0) - { - $error++; - } - } - } - else if ($reshook < 0) $error++; - */ + // Actions on extra fields (by external module or standard code) + $hookmanager->initHooks(array('donationdao')); + $parameters=array('id'=>$this->id); + $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) + { + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + { + $result=$this->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } + } + else if ($reshook < 0) $error++; $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."don"); @@ -448,23 +446,22 @@ class Don extends CommonObject $result = $this->db->query($sql); if ($result) { - // Actions on extra fields (by external module) - $hookmanager->initHooks(array('dondao')); - $parameters=array('id'=>$this->id); - $action=''; - $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - if (empty($reshook)) - { - if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used - { - $result=$this->insertExtraFields(); - if ($result < 0) - { - $error++; - } - } - } - else if ($reshook < 0) $error++; + // Actions on extra fields (by external module or standard code) + $hookmanager->initHooks(array('donationdao')); + $parameters=array('id'=>$this->id); + $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks + if (empty($reshook)) + { + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + { + $result=$this->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } + } + else if ($reshook < 0) $error++; // Call trigger $result=$this->call_trigger('DON_UPDATE',$user); @@ -500,15 +497,14 @@ class Don extends CommonObject { if ( $this->db->affected_rows($resql) ) { - // Removed extrafields - if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + // Remove extrafields + if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used { $result=$this->deleteExtraFields(); if ($result < 0) { $error++; - $errorflag=-4; - dol_syslog(get_class($this)."::delete error ".$errorflag." ".$this->error, LOG_ERR); + dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); } } @@ -779,7 +775,7 @@ class Don extends CommonObject $result=''; $label=$langs->trans("ShowDonation").': '.$this->id; - $link = ''; + $link = ''; $linkend=''; $picto='generic'; diff --git a/htdocs/donations/class/donationstats.class.php b/htdocs/don/class/donationstats.class.php similarity index 96% rename from htdocs/donations/class/donationstats.class.php rename to htdocs/don/class/donationstats.class.php index b26617d651b..63105da07d2 100644 --- a/htdocs/donations/class/donationstats.class.php +++ b/htdocs/don/class/donationstats.class.php @@ -19,13 +19,13 @@ */ /** - * \file htdocs/donations/class/donationstats.class.php + * \file htdocs/don/class/dontats.class.php * \ingroup donations * \brief File of class to manage donations statistics */ include_once DOL_DOCUMENT_ROOT . '/core/class/stats.class.php'; -include_once DOL_DOCUMENT_ROOT . '/donations/class/don.class.php'; +include_once DOL_DOCUMENT_ROOT . '/don/class/don.class.php'; include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php'; diff --git a/htdocs/don/class/index.html b/htdocs/don/class/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/donations/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php similarity index 97% rename from htdocs/donations/class/paymentdonation.class.php rename to htdocs/don/class/paymentdonation.class.php index 9125ea68d57..4a42c677ec9 100644 --- a/htdocs/donations/class/paymentdonation.class.php +++ b/htdocs/don/class/paymentdonation.class.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/donations/class/paymentdonation.class.php + * \file htdocs/don/class/paymentdonation.class.php * \ingroup Donation * \brief File of class to manage payment of donations */ @@ -510,7 +510,7 @@ class PaymentDonation extends CommonObject // Add link 'payment', 'payment_supplier', 'payment_donation' in bank_url between payment and bank transaction $url=''; - if ($mode == 'payment_donation') $url=DOL_URL_ROOT.'/donations/payment/card.php?rowid='; + if ($mode == 'payment_donation') $url=DOL_URL_ROOT.'/don/payment/card.php?rowid='; if ($url) { $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode); @@ -529,7 +529,7 @@ class PaymentDonation extends CommonObject { $don = new Don($this->db); $don->fetch($key); - $result=$acc->add_url_line($bank_line_id, $don->rowid, DOL_URL_ROOT.'/donations/card.php?rowid=', $don->type_libelle.(($don->lib && $don->lib!=$don->type_libelle)?' ('.$don->lib.')':''),'donation'); + $result=$acc->add_url_line($bank_line_id, $don->rowid, DOL_URL_ROOT.'/don/card.php?rowid=', $don->type_libelle.(($don->lib && $don->lib!=$don->type_libelle)?' ('.$don->lib.')':''),'donation'); if ($result <= 0) dol_print_error($this->db); } } @@ -593,7 +593,7 @@ class PaymentDonation extends CommonObject if (!empty($this->id)) { - $link = ''; + $link = ''; $linkend=''; if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' '); diff --git a/htdocs/donations/document.php b/htdocs/don/document.php similarity index 92% rename from htdocs/donations/document.php rename to htdocs/don/document.php index 0cfb0447630..200e4180252 100644 --- a/htdocs/donations/document.php +++ b/htdocs/don/document.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/donations/document.php + * \file htdocs/don/document.php * \ingroup donations * \brief Page of linked files into donations */ require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; @@ -96,7 +96,7 @@ if ($object->id) print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print ''; - print ''; + print ''; print '\n"; print ''; diff --git a/htdocs/donations/stats/index.php b/htdocs/don/stats/index.php similarity index 97% rename from htdocs/donations/stats/index.php rename to htdocs/don/stats/index.php index 0a58751b8ed..798b1b5a392 100644 --- a/htdocs/donations/stats/index.php +++ b/htdocs/don/stats/index.php @@ -18,14 +18,14 @@ */ /** - * \file htdocs/donations/stats/index.php + * \file htdocs/don/stats/index.php * \ingroup donations * \brief Page with donations statistics */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/donationstats.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/dontats.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $WIDTH=DolGraph::getDefaultGraphSizeForStats('width'); @@ -213,7 +213,7 @@ if (! count($arrayyears)) $arrayyears[$nowyear]=$nowyear; $h=0; $head = array(); -$head[$h][0] = DOL_URL_ROOT . '/donations/stats/index.php?mode='.$mode; +$head[$h][0] = DOL_URL_ROOT . '/don/stats/index.php?mode='.$mode; $head[$h][1] = $langs->trans("ByMonthYear"); $head[$h][2] = 'byyear'; $h++; diff --git a/htdocs/install/filelist.xml b/htdocs/install/filelist.xml index e9ae4ec5dd1..7b7ed9c36ef 100644 --- a/htdocs/install/filelist.xml +++ b/htdocs/install/filelist.xml @@ -5893,7 +5893,7 @@ d41d8cd98f00b204e9800998ecf8427e8ea20800d43bbdfdb20363355521c20c - + 9029f09e1592da49626e9fb5b6399e1e d71afb404b4f1946d241bc44ab27df8b 823e0c612e7de62db2d41adf37214bea diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index f66a007e93a..d08ed699b7f 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1563,7 +1563,7 @@ class Product extends CommonObject $this->db->free($resql); - // Retreive all extrafield for thirdparty + // Retrieve all extrafield for thirdparty // fetch optionals attributes and labels require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php'); $extrafields=new ExtraFields($this->db); From 8d4ceadd7e19861b8998d7c865206a2c56cb8f0a Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 25 Mar 2015 22:38:44 +0100 Subject: [PATCH 210/412] Dir "Don" --- htdocs/donations/admin/index.html | 0 htdocs/donations/admin/index.php | 117 ---------------------------- htdocs/donations/class/index.html | 0 htdocs/donations/payment/index.html | 0 4 files changed, 117 deletions(-) delete mode 100644 htdocs/donations/admin/index.html delete mode 100644 htdocs/donations/admin/index.php delete mode 100644 htdocs/donations/class/index.html delete mode 100644 htdocs/donations/payment/index.html diff --git a/htdocs/donations/admin/index.html b/htdocs/donations/admin/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/donations/admin/index.php b/htdocs/donations/admin/index.php deleted file mode 100644 index 78ff3b48f9a..00000000000 --- a/htdocs/donations/admin/index.php +++ /dev/null @@ -1,117 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/admin/index.php - * \ingroup Donations - * \brief Setup page to configure donations module - */ - -require '../main.inc.php'; - -// Class -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; - -$langs->load("admin"); -$langs->load("donations"); - -// Security check -if (!$user->admin) - accessforbidden(); - -$action = GETPOST('action', 'alpha'); - -// Other parameters DONATIONS_* -$list = array ( - 'DONATIONS_ACCOUNTING_ACCOUNT_PRODUCT' -); - -/* - * Actions - */ - -if ($action == 'update') -{ - $error = 0; - - foreach ($list as $constname) { - $constvalue = GETPOST($constname, 'alpha'); - - if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) { - $error++; - } - } - - if (! $error) - { - setEventMessage($langs->trans("SetupSaved")); - } - else - { - setEventMessage($langs->trans("Error"),'errors'); - } -} - -/* - * View - */ - -llxHeader('',$langs->trans('DonationsSetup')); - -$form = new Form($db); - -$linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans('DonationsSetup'),$linkback,'setup'); - -print '
    '; -print ''; -print ''; - -/* - * Params - */ -print '
    '.$langs->trans("Ref").''; diff --git a/htdocs/don/index.html b/htdocs/don/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/donations/index.php b/htdocs/don/index.php similarity index 98% rename from htdocs/donations/index.php rename to htdocs/don/index.php index ac64d6b2dde..b276e21dc50 100644 --- a/htdocs/donations/index.php +++ b/htdocs/don/index.php @@ -18,13 +18,13 @@ */ /** - * \file htdocs/donations/index.php + * \file htdocs/don/index.php * \ingroup donations * \brief Home page of donation module */ require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; $langs->load("donations"); diff --git a/htdocs/donations/info.php b/htdocs/don/info.php similarity index 93% rename from htdocs/donations/info.php rename to htdocs/don/info.php index a85b734fcf6..04cbae7a587 100644 --- a/htdocs/donations/info.php +++ b/htdocs/don/info.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/donations/info.php + * \file htdocs/don/info.php * \ingroup donations * \brief Page to show a donation information */ @@ -24,7 +24,7 @@ require '../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; $langs->load("donations"); diff --git a/htdocs/donations/list.php b/htdocs/don/list.php similarity index 98% rename from htdocs/donations/list.php rename to htdocs/don/list.php index f277dc0b671..ee7a6f5e6f9 100644 --- a/htdocs/donations/list.php +++ b/htdocs/don/list.php @@ -19,13 +19,13 @@ */ /** - * \file htdocs/donations/list.php + * \file htdocs/don/list.php * \ingroup donations * \brief List of donations */ require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; if (! empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; $langs->load("companies"); diff --git a/htdocs/donations/payment/card.php b/htdocs/don/payment/card.php similarity index 95% rename from htdocs/donations/payment/card.php rename to htdocs/don/payment/card.php index 6b30fdcc89b..5cdb7f20446 100644 --- a/htdocs/donations/payment/card.php +++ b/htdocs/don/payment/card.php @@ -16,14 +16,14 @@ */ /** - * \file htdocs/donations/payment/card.php + * \file htdocs/don/payment/card.php * \ingroup donations * \brief Tab payment of a donation */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/paymentdonation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; @@ -61,7 +61,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->don->supp if ($result > 0) { $db->commit(); - header("Location: ".DOL_URL_ROOT."/donations/index.php"); + header("Location: ".DOL_URL_ROOT."/don/index.php"); exit; } else @@ -121,7 +121,7 @@ $form = new Form($db); $h=0; -$head[$h][0] = DOL_URL_ROOT.'/donations/payment/card.php?id='.$id; +$head[$h][0] = DOL_URL_ROOT.'/don/payment/card.php?id='.$id; $head[$h][1] = $langs->trans("Card"); $hselected = $h; $h++; diff --git a/htdocs/don/payment/index.html b/htdocs/don/payment/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/donations/payment/payment.php b/htdocs/don/payment/payment.php similarity index 95% rename from htdocs/donations/payment/payment.php rename to htdocs/don/payment/payment.php index 871bbaa1056..52cf8f38a12 100644 --- a/htdocs/donations/payment/payment.php +++ b/htdocs/don/payment/payment.php @@ -16,14 +16,14 @@ */ /** - * \file htdocs/donations/payment.php + * \file htdocs/don/payment.php * \ingroup donations * \brief Page to add payment of a donation */ require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/paymentdonation.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("bills"); @@ -50,7 +50,7 @@ if ($action == 'add_payment') if ($_POST["cancel"]) { - $loc = DOL_URL_ROOT.'/donations/card.php?rowid='.$chid; + $loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid; header("Location: ".$loc); exit; } @@ -129,7 +129,7 @@ if ($action == 'add_payment') if (! $error) { $db->commit(); - $loc = DOL_URL_ROOT.'/donations/card.php?rowid='.$chid; + $loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid; header('Location: '.$loc); exit; } @@ -180,7 +180,7 @@ if (GETPOST("action") == 'create') print '
    '.$langs->trans("Donation").'
    '.$langs->trans("Ref").''.$chid.'
    '.$langs->trans("Ref").''.$chid.'
    '.$langs->trans("Date")."".dol_print_date($don->date,'day')."
    '.$langs->trans("Amount")."".price($don->amount,0,$outputlangs,1,-1,-1,$conf->currency).'
    '; -print ''; -print ''; -print "\n"; - -foreach ($list as $key) -{ - $var=!$var; - - print ''; - - // Param - $label = $langs->trans($key); - print ''; - - // Value - print ''; -} - -print ''; - -print ''; -print "
    ' . $langs->trans('Options') . '
    '; - print ''; - print '
    \n"; - -print '
    '; - -llxFooter(); -$db->close(); \ No newline at end of file diff --git a/htdocs/donations/class/index.html b/htdocs/donations/class/index.html deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/htdocs/donations/payment/index.html b/htdocs/donations/payment/index.html deleted file mode 100644 index e69de29bb2d..00000000000 From b60f1e33d6767e5bb94568cc7453b72d0f0d7c5a Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 26 Mar 2015 06:29:16 +0100 Subject: [PATCH 211/412] Debug --- htdocs/compta/bank/account.php | 1 + htdocs/core/modules/modDon.class.php | 2 +- htdocs/projet/element.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 3213709a54e..cd7478bf36c 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -730,6 +730,7 @@ if ($id > 0 || ! empty($ref)) } $donstatic->ref=$donstatic->lib; print $donstatic->getNomUrl(1,16); + } else if ($links[$key]['type']=='loan') { $loanstatic->id=$links[$key]['url_id']; diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php index 6d67b625f91..8c7425ceed2 100644 --- a/htdocs/core/modules/modDon.class.php +++ b/htdocs/core/modules/modDon.class.php @@ -64,7 +64,7 @@ class modDon extends DolibarrModules $this->requiredby = array(); // Config pages - $this->config_page_url = array("donation.php@donations"); + $this->config_page_url = array("donation.php@don"); // Constants $this->const = array (); diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 000b759e091..23c3cc6f8b1 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -53,7 +53,7 @@ if (! empty($conf->propal->enabled)) $langs->load("propal"); if (! empty($conf->ficheinter->enabled)) $langs->load("interventions"); if (! empty($conf->deplacement->enabled)) $langs->load("trips"); if (! empty($conf->expensereport->enabled)) $langs->load("trips"); -if (! empty($conf->expensereport->enabled)) $langs->load("donations"); +if (! empty($conf->don->enabled)) $langs->load("donations"); $id=GETPOST('id','int'); $ref=GETPOST('ref','alpha'); From 50a3563f0320c9fcd46b4ea50cefb1646b71f897 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 26 Mar 2015 10:57:13 +0100 Subject: [PATCH 212/412] Minor correction to the product list of a supplier --- htdocs/fourn/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 40d51c89b90..97004783ae6 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -351,7 +351,7 @@ if ($object->id > 0) print ''; print $productstatic->getNomUrl(1); print ''; - print ''; + print ''; print dol_trunc(dol_htmlentities($objp->label), 30); print ''; print ''.dol_print_date($objp->tms).''; From e59fed9f380fc9b24437de735feef6329072c0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Thu, 26 Mar 2015 11:08:34 +0100 Subject: [PATCH 213/412] Corrected search box alignment in Customer orders list --- htdocs/commande/liste.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index 6f009fa2eb0..21194f8b104 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -307,11 +307,11 @@ if ($resql) print ''; print ''; print ''; - print ''; + print ''; if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; print ''; $formother->select_year($orderyear?$orderyear:-1,'orderyear',1, 20, 5); - print ''; + print ''; if (! empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print ''; print ''; $formother->select_year($deliveryyear?$deliveryyear:-1,'deliveryyear',1, 20, 5); From ce8bd7a5155aefae7d3ccfc1951c2168d62be0ae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 26 Mar 2015 11:20:39 +0100 Subject: [PATCH 214/412] Fix pb during export of agenda events --- htdocs/core/modules/modAgenda.class.php | 12 ++++++------ htdocs/exports/export.php | 2 +- htdocs/langs/en_US/agenda.lang | 2 ++ htdocs/langs/en_US/main.lang | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index 165b547dff4..73a8390c9e6 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -367,24 +367,24 @@ class modAgenda extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]="ExportDataset_event1"; $this->export_permission[$r]=array(array("agenda","export")); - $this->export_fields_array[$r]=array('ac.id'=>"ActionId",'ac.ref_ext'=>"ExternalRef",'ac.datec'=>"ActionDateCreation",'ac.datep'=>"DateActionBegin", - 'ac.datep2'=>"DateActionEnd",'ac.label'=>"Title",'ac.note'=>"Note",'ac.percent'=>"Percent",'ac.durationp'=>"durationp", + $this->export_fields_array[$r]=array('ac.id'=>"IdAgenda",'ac.ref_ext'=>"ExternalRef",'ac.datec'=>"DateCreation",'ac.datep'=>"DateActionBegin", + 'ac.datep2'=>"DateActionEnd",'ac.label'=>"Title",'ac.note'=>"Note",'ac.percent'=>"Percent",'ac.durationp'=>"Duration", 'cac.libelle'=>"ActionType", 's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town', - 'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4', + 'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6', 's.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra'); $this->export_TypeFields_array[$r]=array('ac.ref_ext'=>"Text",'ac.datec'=>"Date",'ac.datep'=>"Date", 'ac.datep2'=>"Date",'ac.label'=>"Text",'ac.note'=>"Text",'ac.percent'=>"Number", 'ac.durationp'=>"Duree", - 'cac.libelle'=>"List:c_actioncomm:libelle:rowid", + 'cac.libelle'=>"List:c_actioncomm:libelle:id", 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text', - 'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text', + 'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text', 's.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text'); $this->export_entities_array[$r]=array('ac.id'=>"action",'ac.ref_ext'=>"action",'ac.datec'=>"action",'ac.datep'=>"action", 'ac.datep2'=>"action",'ac.label'=>"action",'ac.note'=>"action",'ac.percent'=>"action",'ac.durationp'=>"action", 'cac.libelle'=>"action", 's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company', - 'co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company', + 'co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company', 's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company',); $this->export_sql_start[$r]='SELECT DISTINCT '; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index ca997f0eb59..5c3400e5375 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -97,7 +97,7 @@ $entitytolang = array( 'project' => 'Projects', 'projecttask' => 'Tasks', 'task_time' => 'TaskTimeSpent', - 'action' => 'Action', + 'action' => 'Event', 'expensereport'=> 'ExpenseReport', 'expensereport_line'=> 'ExpenseReportLine', ); diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 13de82c602f..48c284e2022 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -91,3 +91,5 @@ WorkingTimeRange=Working time range WorkingDaysRange=Working days range AddEvent=Create event MyAvailability=My availability +ActionType=Event type +DateActionBegin=Start event date \ No newline at end of file diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index b160c4303a0..36fbd6c659b 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -352,6 +352,7 @@ Status=Status Favorite=Favorite ShortInfo=Info. Ref=Ref. +ExternalRef=Ref. extern RefSupplier=Ref. supplier RefPayment=Ref. payment CommercialProposalsShort=Commercial proposals From 1ca95acbd704568855903321462bb584587eeb10 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 26 Mar 2015 11:23:21 +0100 Subject: [PATCH 215/412] Fix pb during export of agenda events Conflicts: htdocs/exports/export.php --- htdocs/core/modules/modAgenda.class.php | 12 ++++++------ htdocs/exports/export.php | 2 +- htdocs/langs/en_US/agenda.lang | 2 ++ htdocs/langs/en_US/main.lang | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php index c633734b227..9573ca5f018 100644 --- a/htdocs/core/modules/modAgenda.class.php +++ b/htdocs/core/modules/modAgenda.class.php @@ -367,24 +367,24 @@ class modAgenda extends DolibarrModules $this->export_code[$r]=$this->rights_class.'_'.$r; $this->export_label[$r]="ExportDataset_event1"; $this->export_permission[$r]=array(array("agenda","export")); - $this->export_fields_array[$r]=array('ac.id'=>"ActionId",'ac.ref_ext'=>"ExternalRef",'ac.datec'=>"ActionDateCreation",'ac.datep'=>"DateActionBegin", - 'ac.datep2'=>"DateActionEnd",'ac.label'=>"Title",'ac.note'=>"Note",'ac.percent'=>"Percent",'ac.durationp'=>"durationp", + $this->export_fields_array[$r]=array('ac.id'=>"IdAgenda",'ac.ref_ext'=>"ExternalRef",'ac.datec'=>"DateCreation",'ac.datep'=>"DateActionBegin", + 'ac.datep2'=>"DateActionEnd",'ac.label'=>"Title",'ac.note'=>"Note",'ac.percent'=>"Percent",'ac.durationp'=>"Duration", 'cac.libelle'=>"ActionType", 's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town', - 'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4', + 'co.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6', 's.code_compta'=>'CustomerAccountancyCode','s.code_compta_fournisseur'=>'SupplierAccountancyCode','s.tva_intra'=>'VATIntra'); $this->export_TypeFields_array[$r]=array('ac.ref_ext'=>"Text",'ac.datec'=>"Date",'ac.datep'=>"Date", 'ac.datep2'=>"Date",'ac.label'=>"Text",'ac.note'=>"Text",'ac.percent'=>"Number", 'ac.durationp'=>"Duree", - 'cac.libelle'=>"List:c_actioncomm:libelle:rowid", + 'cac.libelle'=>"List:c_actioncomm:libelle:id", 's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text', - 'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text', + 'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text', 's.code_compta'=>'Text','s.code_compta_fournisseur'=>'Text','s.tva_intra'=>'Text'); $this->export_entities_array[$r]=array('ac.id'=>"action",'ac.ref_ext'=>"action",'ac.datec'=>"action",'ac.datep'=>"action", 'ac.datep2'=>"action",'ac.label'=>"action",'ac.note'=>"action",'ac.percent'=>"action",'ac.durationp'=>"action", 'cac.libelle'=>"action", 's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company', - 'co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company', + 'co.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company', 's.code_compta'=>'company','s.code_compta_fournisseur'=>'company','s.tva_intra'=>'company',); $this->export_sql_start[$r]='SELECT DISTINCT '; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index 45e78b2ecd3..d76350e878f 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -95,7 +95,7 @@ $entitytolang = array( 'project' => 'Projects', 'projecttask' => 'Tasks', 'task_time' => 'TaskTimeSpent', - 'action' => 'Action' + 'action' => 'Event' ); $array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array(); diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 13de82c602f..48c284e2022 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -91,3 +91,5 @@ WorkingTimeRange=Working time range WorkingDaysRange=Working days range AddEvent=Create event MyAvailability=My availability +ActionType=Event type +DateActionBegin=Start event date \ No newline at end of file diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index e53f0df5585..ddf581de1c0 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -347,6 +347,7 @@ Status=Status Favorite=Favorite ShortInfo=Info. Ref=Ref. +ExternalRef=Ref. extern RefSupplier=Ref. supplier RefPayment=Ref. payment CommercialProposalsShort=Commercial proposals From 42c2c81e28eb5a267fb375ff30c42a2d5797adf7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 26 Mar 2015 12:05:52 +0100 Subject: [PATCH 216/412] Fix detection of html was wrong with img --- htdocs/core/lib/functions.lib.php | 7 ++++--- test/phpunit/FunctionsLibTest.php | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index e31c69a6d0c..de5ddc560b2 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3972,9 +3972,10 @@ function dol_textishtml($msg,$option=0) if (preg_match('//i',$msg)) return true; - elseif (preg_match('/<(br|div|font|img|li|span|strong|table)>/i',$msg)) return true; - elseif (preg_match('/<(br|div|font|img|li|span|strong|table)\s+[^<>\/]*>/i',$msg)) return true; - elseif (preg_match('/<(br|div|font|img|li|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) return true; + elseif (preg_match('/<(br|div|font|li|span|strong|table)>/i',$msg)) return true; + elseif (preg_match('/<(br|div|font|li|span|strong|table)\s+[^<>\/]*>/i',$msg)) return true; + elseif (preg_match('/<(br|div|font|li|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) return true; + elseif (preg_match('/<(img)\s+[^<>]*>/i',$msg)) return true; // must accept elseif (preg_match('//i',$msg)) return true; elseif (preg_match('/&[A-Z0-9]{1,6};/i',$msg)) return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp) elseif (preg_match('/&#[0-9]{2,3};/i',$msg)) return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp) diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php index 68ebd5d1703..746a41d3c96 100755 --- a/test/phpunit/FunctionsLibTest.php +++ b/test/phpunit/FunctionsLibTest.php @@ -204,6 +204,9 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase $input='

    abc

    '; $after=dol_textishtml($input); $this->assertTrue($after); + $input=''; + $after=dol_textishtml($input); + $this->assertTrue($after,'Failure on test of img tag'); // False $input='xxx < br>'; From 26c29216d95787bccea56b05d952ca21528cc3b7 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Thu, 26 Mar 2015 16:55:13 +0100 Subject: [PATCH 217/412] syntax --- htdocs/comm/action/class/actioncomm.class.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 9a9417a4dac..bc66514940d 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -413,7 +413,8 @@ class ActionComm extends CommonObject $resql=$this->db->query($sql); if ($resql) { - if ($this->db->num_rows($resql)) + $num=$this->db->num_rows($resql); + if ($num) { $obj = $this->db->fetch_object($resql); @@ -469,13 +470,15 @@ class ActionComm extends CommonObject $this->elementtype = $obj->elementtype; } $this->db->free($resql); - return 1; } else { $this->error=$this->db->lasterror(); return -1; } + + return $num; + } From 059bb403450eb0ce48d70ac7e4e3e37bf0b37c83 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 26 Mar 2015 20:43:34 +0100 Subject: [PATCH 218/412] Debug --- htdocs/don/card.php | 44 ++-- htdocs/don/class/don.class.php | 320 +++++++++++++----------- htdocs/install/mysql/tables/llx_don.sql | 6 +- htdocs/langs/en_US/donations.lang | 2 + htdocs/projet/class/project.class.php | 2 +- 5 files changed, 211 insertions(+), 163 deletions(-) diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 7e4039f760f..8f33ee7fb1b 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -47,25 +47,25 @@ $id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int'); $action=GETPOST('action','alpha'); $cancel=GETPOST('cancel'); $amount=GETPOST('amount'); +$donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); $object = new Don($db); $extrafields = new ExtraFields($db); -// fetch optionals attributes and labels -$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); - -$donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); - // Security check $result = restrictedArea($user, 'don', $id); +// fetch optionals attributes and labels +$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); + // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array('doncard','globalcard')); - /* * Actions */ +$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some +if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($action == 'update') { @@ -174,17 +174,21 @@ if ($action == 'add') } } } - -if ($action == 'delete') +if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->don->supprimer) { - $object->delete($id); - header("Location: list.php"); - exit; -} -if ($action == 'commentaire') -{ - $object->fetch($id); - $object->update_note(GETPOST("commentaire")); + $object->fetch($id); + $result=$object->delete($user); + if ($result > 0) + { + header("Location: index.php"); + exit; + } + else + { + dol_syslog($object->error,LOG_DEBUG); + setEventMessage($object->error,'errors'); + setEventMessage($object->errors,'errors'); + } } if ($action == 'valid_promesse') { @@ -486,6 +490,13 @@ if (! empty($id) && $action == 'edit') /* ************************************************************ */ if (! empty($id) && $action != 'edit') { + // Confirmation delete + if ($action == 'delete') + { + $text=$langs->trans("ConfirmDeleteADonation"); + print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id,$langs->trans("DeleteADonation"),$text,"confirm_delete",'','',1); + } + $result=$object->fetch($id); if ($result < 0) { dol_print_error($db,$object->error); exit; @@ -689,6 +700,7 @@ if (! empty($id) && $action != 'edit') print '
    '.$langs->trans("ClassifyPaid")."
    "; } + // Delete if ($user->rights->don->supprimer) { print '
    '.$langs->trans("Delete")."
    "; diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index c9f776e5ce6..bddd5c9e533 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -34,8 +34,10 @@ require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; */ class Don extends CommonObject { - public $element='don'; - public $table_element='don'; + public $element='don'; // Id that identify managed objects + public $table_element='don'; // Name of table without prefix where object is stored + public $fk_element = 'fk_don'; + protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe var $id; var $ref; @@ -299,14 +301,19 @@ class Don extends CommonObject /** * Create donation record into database * - * @param User $user Objet utilisateur qui cree le don - * @return int Id don cree si ok, <0 si ko + * @param User $user User who created the donation + * @param int $notrigger Disable triggers + * @return int <0 if KO, id of created donation if OK * TODO add numbering module for Ref */ function create($user) { - global $conf; - + global $conf, $langs; + + $error = 0; + $ret = 0; + $now=dol_now(); + // Clean parameters $this->address=($this->address>0?$this->address:$this->address); $this->zip=($this->zip>0?$this->zip:$this->zip); @@ -314,8 +321,6 @@ class Don extends CommonObject $this->country_id=($this->country_id>0?$this->country_id:$this->country_id); $this->country=($this->country?$this->country:$this->country); - $now=dol_now(); - $this->db->begin(); $sql = "INSERT INTO ".MAIN_DB_PREFIX."don ("; @@ -365,41 +370,54 @@ class Don extends CommonObject $sql.= ", '".$this->db->escape($this->phone_mobile)."'"; $sql.= ")"; - dol_syslog("Don::create", LOG_DEBUG); - $result = $this->db->query($sql); - if ($result) + dol_syslog(get_class($this)."::create", LOG_DEBUG); + $resql = $this->db->query($sql); + if ($resql) { - // Actions on extra fields (by external module or standard code) - $hookmanager->initHooks(array('donationdao')); - $parameters=array('id'=>$this->id); - $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - if (empty($reshook)) - { - if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used - { - $result=$this->insertExtraFields(); - if ($result < 0) - { - $error++; - } - } - } - else if ($reshook < 0) $error++; - - $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."don"); + $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."don"); + $ret = $this->id; - // Call trigger - $result=$this->call_trigger('DON_CREATE',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } - // End call triggers + if (!$notrigger) + { + // Call trigger + $result=$this->call_trigger('DON_CREATE',$user); + if ($result < 0) { $error++; } + // End call triggers + } + } + else + { + $this->error = $this->db->lasterror(); + $this->errno = $this->db->lasterrno(); + $error++; + } + + // Update extrafield + if (!$error) { + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + { + $result=$this->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } + } + + if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS)) + { + $res = $this->setValid($user); + if ($res < 0) $error++; + } + if (!$error) + { $this->db->commit(); - return $this->id; + return $ret; } else { $this->db->rollback(); - dol_print_error($this->db); return -1; } } @@ -410,8 +428,12 @@ class Don extends CommonObject * @param User $user Objet utilisateur qui met a jour le don * @return int >0 if OK, <0 if KO */ - function update($user) + function update($user, $notrigger=0) { + global $langs, $conf; + + $error=0; + // Clean parameters $this->address=($this->address>0?$this->address:$this->address); $this->zip=($this->zip>0?$this->zip:$this->zip); @@ -440,91 +462,126 @@ class Don extends CommonObject $sql .= ",phone='".$this->phone."'"; $sql .= ",phone_mobile='".$this->phone_mobile."'"; $sql .= ",fk_statut=".$this->statut; - $sql .= " WHERE rowid = $this->id"; - - dol_syslog("Don::update", LOG_DEBUG); - $result = $this->db->query($sql); - if ($result) - { - // Actions on extra fields (by external module or standard code) - $hookmanager->initHooks(array('donationdao')); - $parameters=array('id'=>$this->id); - $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks - if (empty($reshook)) - { - if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used - { - $result=$this->insertExtraFields(); - if ($result < 0) - { - $error++; - } - } - } - else if ($reshook < 0) $error++; - - // Call trigger - $result=$this->call_trigger('DON_UPDATE',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } - // End call triggers - - $this->db->commit(); - return 1; - } - else - { - $this->db->rollback(); - dol_print_error($this->db); - return -1; - } - } - - /** - * Delete a donation - * - * @param int $rowid Id of donation to delete - * @return int <0 if KO, >0 if OK - */ - function delete($rowid) - { - - $this->db->begin(); - - $sql = "DELETE FROM ".MAIN_DB_PREFIX."don WHERE rowid = $rowid AND fk_statut = 0;"; + $sql .= " WHERE rowid = '".$this->id."'"; + dol_syslog(get_class($this)."::Update", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { - if ( $this->db->affected_rows($resql) ) + if (!$notrigger) { - // Remove extrafields - if ((! $error) && (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED))) // For avoid conflicts if trigger used - { - $result=$this->deleteExtraFields(); - if ($result < 0) - { - $error++; - dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); - } - } - - // Call trigger - $result=$this->call_trigger('DON_DELETE',$user); - if ($result < 0) { $error++; $this->db->rollback(); return -1; } + // Call trigger + $result=$this->call_trigger('DON_MODIFY',$user); + if ($result < 0) { $error++; } // End call triggers + } + // Update extrafield + if (!$error) + { + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used + { + $result=$this->insertExtraFields(); + if ($result < 0) + { + $error++; + } + } + } + + if (! $error ) + { $this->db->commit(); - return 1; + $result = 1; } else { $this->db->rollback(); - return -1; + $result = -1; } } else + { + $this->error = $this->db->lasterror(); + $this->errors[] = $this->error; + $this->db->rollback(); + dol_syslog(get_class($this)."::Update error -2 " . $this->error, LOG_ERR); + $result = -2; + } + return $result; + } + + /** + * Delete a donation from database + * + * @param User $user User + * @param int $notrigger Disable triggers + * @return int <0 if KO, 0 if not possible, >0 if OK + */ + function delete($user, $notrigger=0) + { + global $conf, $langs; + require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php'; + + $error = 0; + + $this->db->begin(); + + // Delete donation + if (! $error) { - dol_print_error($this->db); + $sql = "DELETE FROM " . MAIN_DB_PREFIX . "don"; + $sql.= " WHERE rowid=" . $this->id; + + $resql = $this->db->query($sql); + if (!$resql) + { + $this->errors[] = $this->db->lasterror(); + $error++; + } + } + + if (! $error) + { + $sql = "DELETE FROM " . MAIN_DB_PREFIX . "don_extrafields"; + $sql.= " WHERE fk_object=" . $this->id; + + $resql = $this->db->query($sql); + if (! $resql) + { + $this->errors[] = $this->db->lasterror(); + $error++; + } + } + + if (! $error) + { + if (!$notrigger) + { + // Call trigger + $result=$this->call_trigger('DON_DELETE',$user); + + if ($result < 0) { + $error++; + } + // End call triggers + } + } + + if (! $error) + { + $this->db->commit(); + return 1; + } + else + { + foreach ( $this->errors as $errmsg ) + { + dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR); + $this->error .= ($this->error ? ', ' . $errmsg : $errmsg); + } + dol_syslog(get_class($this) . "::delete " . $this->error, LOG_ERR); + $this->db->rollback(); return -1; } } @@ -536,7 +593,7 @@ class Don extends CommonObject * @param string $ref Ref of donation to load * @return int <0 if KO, >0 if OK */ - function fetch($rowid,$ref='') + function fetch($id,$ref='') { global $conf; @@ -550,7 +607,15 @@ class Don extends CommonObject $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_project"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid"; - $sql.= " WHERE d.rowid = ".$rowid." AND d.entity = ".$conf->entity; + if (! empty($id)) + { + $sql.= " WHERE d.rowid=".$id; + } + else if (! empty($ref)) + { + $sql.= " WHERE ref='".$this->db->escape($ref)."'"; + } + $sql.= " AND d.entity = ".$conf->entity; dol_syslog(get_class($this)."::fetch", LOG_DEBUG); $resql=$this->db->query($sql); @@ -615,10 +680,10 @@ class Don extends CommonObject * @param int $userid User who validate the promise * @return int <0 if KO, >0 if OK */ - function valid_promesse($rowid, $userid) + function valid_promesse($id, $userid) { - $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = $userid WHERE rowid = $rowid AND fk_statut = 0"; + $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = ".$userid." WHERE rowid = ".$id." AND fk_statut = 0"; $resql=$this->db->query($sql); if ($resql) @@ -646,7 +711,7 @@ class Don extends CommonObject * @param int $modepaiement mode de paiement * @return int <0 if KO, >0 if OK */ - function set_paye($rowid, $modepaiement='') + function set_paid($id, $modepaiement='') { $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2"; if ($modepaiement) @@ -674,46 +739,15 @@ class Don extends CommonObject } } - - /** - * Classe le don comme encaisse - * - * @param int $rowid id du don a modifier - * @return int <0 if KO, >0 if OK - */ - function set_encaisse($rowid) - { - - $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 3 WHERE rowid = $rowid AND fk_statut = 2"; - - $resql=$this->db->query($sql); - if ($resql) - { - if ( $this->db->affected_rows($resql) ) - { - return 1; - } - else - { - return 0; - } - } - else - { - dol_print_error($this->db); - return -1; - } - } - /** * Set donation to status canceled * * @param int $rowid id of donation * @return int <0 if KO, >0 if OK */ - function set_cancel($rowid) + function set_cancel($id) { - $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = -1 WHERE rowid = ".$rowid; + $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = -1 WHERE rowid = ".$id; $resql=$this->db->query($sql); if ($resql) diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index a3882fc6f99..d33467f9a7b 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -26,7 +26,7 @@ create table llx_don ref varchar(30) DEFAULT NULL, -- Ref donation (TODO change to NOT NULL) entity integer DEFAULT 1 NOT NULL, -- multi company id tms timestamp, - fk_statut smallint NOT NULL DEFAULT 0, -- etat du don promesse/valid + fk_statut smallint NOT NULL DEFAULT 0, -- Status of donation promise or validate datec datetime, -- date de creation de l'enregistrement datedon datetime, -- date du don/promesse amount real DEFAULT 0, @@ -43,8 +43,8 @@ create table llx_don email varchar(255), phone varchar(24), phone_mobile varchar(24), - public smallint DEFAULT 1 NOT NULL, -- le don est-il public (0,1) - fk_project integer NULL, -- projet auquel est fait le don + public smallint DEFAULT 1 NOT NULL, -- Donation is public ? (0,1) + fk_project integer NULL, -- Donation is given for a project ? fk_user_author integer NOT NULL, fk_user_valid integer NULL, note_private text, diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index 13634f98380..627cc9a076c 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -6,6 +6,8 @@ Donor=Donor Donors=Donors AddDonation=Create a donation NewDonation=New donation +DeleteADonation=Delete a donation +ConfirmDeleteADonation=Are you sure you want to delete this donation ? ShowDonation=Show donation DonationPromise=Gift promise PromisesNotValid=Not validated promises diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 681abb411ce..e78e9de0c63 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -506,7 +506,7 @@ class Project extends CommonObject // Set fk_projet into elements to null $listoftables=array( 'facture'=>'fk_projet','propal'=>'fk_projet','commande'=>'fk_projet','facture_fourn'=>'fk_projet','commande_fournisseur'=>'fk_projet', - 'expensereport_det'=>'fk_projet','contrat'=>'fk_projet','fichinter'=>'fk_projet' + 'expensereport_det'=>'fk_projet','contrat'=>'fk_projet','fichinter'=>'fk_projet','don'=>'fk_project' ); foreach($listoftables as $key => $value) { From a39f81b1a627b779732b9e4f2a157c0e752cecff Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 26 Mar 2015 20:51:27 +0100 Subject: [PATCH 219/412] FIXED: Correct path of loan class --- htdocs/compta/bank/account.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 80fd211634e..c84909cb216 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php' require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/salaries/class/paymentsalary.class.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; +require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; @@ -611,7 +611,7 @@ if ($id > 0 || ! empty($ref)) } elseif ($links[$key]['type']=='payment_loan') { - print ''; + print ''; print ' '.img_object($langs->trans('ShowPayment'),'payment').' '; print ''; } From 6a0916b3faaf46f3ba48ff50d0c88df13a0f0a48 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 26 Mar 2015 21:03:56 +0100 Subject: [PATCH 220/412] Correct path --- htdocs/don/class/don.class.php | 2 +- htdocs/public/donations/donateurs_code.php | 2 +- htdocs/public/donations/therm.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index bddd5c9e533..c4f9d66a3ec 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -36,7 +36,7 @@ class Don extends CommonObject { public $element='don'; // Id that identify managed objects public $table_element='don'; // Name of table without prefix where object is stored - public $fk_element = 'fk_don'; + public $fk_element = 'fk_donation'; protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe var $id; diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php index ad42b7e0e7f..0fef24df949 100644 --- a/htdocs/public/donations/donateurs_code.php +++ b/htdocs/public/donations/donateurs_code.php @@ -39,7 +39,7 @@ function llxHeaderVierge() { print 'Export agenda cal function llxFooterVierge() { print ''; } require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT .'/donations/class/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT .'/don/class/don.class.php'; // Security check if (empty($conf->don->enabled)) accessforbidden('',1,1,1); diff --git a/htdocs/public/donations/therm.php b/htdocs/public/donations/therm.php index 36bdec4637f..7c24253dd71 100644 --- a/htdocs/public/donations/therm.php +++ b/htdocs/public/donations/therm.php @@ -27,7 +27,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/donations/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; // Security check if (empty($conf->don->enabled)) accessforbidden('',1,1,1); From f0823a215b98f95ce934d2e3aa9e36159a3fbd31 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 26 Mar 2015 21:16:52 +0100 Subject: [PATCH 221/412] Add language key --- htdocs/langs/en_US/projects.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index ef270909120..40b1c2e308d 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit ListContractAssociatedProject=List of contracts associated with the project ListFichinterAssociatedProject=List of interventions associated with the project ListExpenseReportsAssociatedProject=List of expense reports associated with the project +ListDonationsAssociatedProject=List of donations associated with the project ListActionsAssociatedProject=List of events associated with the project ActivityOnProjectThisWeek=Activity on project this week ActivityOnProjectThisMonth=Activity on project this month From cb16e069dfc37285890b4423013d35358a19021d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Mar 2015 01:17:21 +0100 Subject: [PATCH 222/412] Better explanation --- htdocs/conf/conf.php.example | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example index 414b5c84ab7..c1a374ceec2 100644 --- a/htdocs/conf/conf.php.example +++ b/htdocs/conf/conf.php.example @@ -315,8 +315,10 @@ $dolibarr_main_db_prefix=''; // multicompany_transverse_mode // Prerequisite: Need external module "multicompany" -// Pyramidal (0): The rights and groups are managed in each entity. Each user belongs to the entity he was created into. -// Transversal (1): The user is created and managed only into master entity but can login to all entities. +// Pyramidal (0): The rights and groups are managed in each entity. Each user belongs to the entity he was created into. +// Transversal (1): The user is created and managed only into master entity but can login to all entities if he is admmin +// of entity or belongs to at least one user group created into entity. + // Default value: 0 (pyramidal) // Examples: // $multicompany_transverse_mode='1'; From f6df1d6380b9052f2ed940bf622fcdff5e562e05 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 27 Mar 2015 02:26:12 +0100 Subject: [PATCH 223/412] Update to match new issue tracker --- CONTRIBUTING.md | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef6dd3a834a..a872a4593ba 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,17 +40,30 @@ Please don't edit the ChangeLog file. A project manager will update it from your Use clear commit messages with the following structure: 
    -KEYWORD Short description
+KEYWORD Short description (may be the bug number #456)
 
 Long description (Can span accross multiple lines).
    Where KEYWORD is one of: -- "FIXED:" for bug fixes. In upper case to appear into ChangeLog. (May be followed by the bug number i.e: #456) -- "NEW:" for new features. In upper case to appear into ChangeLog. (May be followed by the task number i.e: #123) +- "Fixed" for bug fixes (May be followed by the bug number i.e: #456) +- "Closed" for a commit to close a feature request issue (May be followed by the bug number i.e: #456) - void, don't put a keyword if the commit is not introducing feature or closing a bug. +### Pull Requests +When submitting a pull request, use following syntax: + +
    +KEYWORD Short description (may be the bug number #456)
+
    + +Where KEYWORD is one of: + +- "FIXED" or "Fixed" for bug fixes. In upper case to appear into ChangeLog. (May be followed by the bug number i.e: #456) +- "NEW" or "New" for new features. In upper case to appear into ChangeLog. (May be followed by the task number i.e: #123) + + ### Resources [Developer documentation](http://wiki.dolibarr.org/index.php/Developer_documentation) From 9d25a1c7edeec19b47a7667d61b98fbee2eeac99 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Fri, 27 Mar 2015 06:59:21 +0100 Subject: [PATCH 224/412] Fix: Missing language key --- htdocs/compta/paiement_charge.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 1c452bc0b02..420fbd7af69 100644 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -178,7 +178,7 @@ if ($_GET["action"] == 'create') print ''; - print ""; + print ""; print ''; print '\n"; From 375e0b7e2a47d3cc4c9c922ab7614afca1efd801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Fri, 27 Mar 2015 08:32:51 +0100 Subject: [PATCH 225/412] PhotoInTooltip for getNomUrl company --- htdocs/societe/class/societe.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 9af32e0756f..c3d86f4fae3 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1797,9 +1797,10 @@ class Societe extends CommonObject if (! empty($this->logo)) { - $label.= '
    '; - //if (! is_object($form)) $form = new Form($db); + $label.= '
    '; + //if (! is_object($form)) $form = new Form($db); $label.= Form::showphoto('societe', $this, 80); + $label.= '
    '; } $label.= '
    '; From 82b8fe6b7d2d16aa09804ccc41e2f6f54d756071 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Fri, 27 Mar 2015 17:13:52 +0100 Subject: [PATCH 226/412] Note private and Note public for loan --- .../install/mysql/migration/3.7.0-3.8.0.sql | 6 ++- htdocs/install/mysql/tables/llx_loan.sql | 6 ++- .../install/mysql/tables/llx_payment_loan.sql | 4 +- htdocs/loan/card.php | 52 ++++++++++++------- htdocs/loan/class/loan.class.php | 23 ++++---- htdocs/loan/class/paymentloan.class.php | 29 ++++++----- htdocs/loan/payment/card.php | 7 ++- htdocs/loan/payment/payment.php | 18 ++++--- 8 files changed, 91 insertions(+), 54 deletions(-) diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 34974d3ebd4..bf0fb5dcdbd 100644 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -32,7 +32,8 @@ create table llx_loan dateend date, nbterm real, rate double NOT NULL, - note text, + note_private text, + note_public text, capital_position real default 0, date_position date, paid smallint default 0 NOT NULL, @@ -56,7 +57,8 @@ create table llx_payment_loan amount_interest real DEFAULT 0, fk_typepayment integer NOT NULL, num_payment varchar(50), - note text, + note_private text, + note_public text, fk_bank integer NOT NULL, fk_user_creat integer, fk_user_modif integer diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql index bc152099a04..21e9e09d8b7 100644 --- a/htdocs/install/mysql/tables/llx_loan.sql +++ b/htdocs/install/mysql/tables/llx_loan.sql @@ -1,5 +1,6 @@ -- ======================================================================== -- Copyright (C) 2014 Alexandre Spangaro +-- Copyright (C) 2015 Frederic France -- -- 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 @@ -32,7 +33,8 @@ create table llx_loan nbterm real, rate double NOT NULL, - note text, + note_private text, + note_public text, capital_position real default 0, -- If not a new loan, just have the position of capital date_position date, @@ -46,4 +48,4 @@ create table llx_loan fk_user_author integer DEFAULT NULL, fk_user_modif integer DEFAULT NULL, active tinyint DEFAULT 1 NOT NULL -)ENGINE=innodb; \ No newline at end of file +)ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql index 0fb6b566ca5..4a0ba519c78 100644 --- a/htdocs/install/mysql/tables/llx_payment_loan.sql +++ b/htdocs/install/mysql/tables/llx_payment_loan.sql @@ -1,5 +1,6 @@ -- =================================================================== -- Copyright (C) 2014 Alexandre Spangaro +-- Copyright (C) 2015 Frederic France -- -- 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 @@ -28,7 +29,8 @@ create table llx_payment_loan amount_interest real DEFAULT 0, fk_typepayment integer NOT NULL, num_payment varchar(50), - note text, + note_private text, + note_public text, fk_bank integer NOT NULL, fk_user_creat integer, -- creation user fk_user_modif integer -- last modification user diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index 6a62ffe09ea..89b8459ef7a 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2014 Alexandre Spangaro + * Copyright (C) 2015 Frederic France * * 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 @@ -101,10 +102,12 @@ if ($action == 'add' && $user->rights->loan->write) $object->dateend = $dateend; $object->nbterm = $_POST["nbterm"]; $object->rate = $_POST["rate"]; - + $object->note_private = GETPOST('note_private'); + $object->note_public = GETPOST('note_public'); + $object->account_capital = $_POST["accountancy_account_capital"]; $object->account_insurance = $_POST["accountancy_account_insurance"]; - $object->account_interest = $_POST["accountancy_account_interest"]; + $object->account_interest = $_POST["accountancy_account_interest"]; $id=$object->create($user); if ($id <= 0) @@ -135,7 +138,7 @@ else if ($action == 'update' && $user->rights->loan->write) $object->nbterm = GETPOST("nbterm"); $object->rate = GETPOST("rate"); } - + $result = $object->update($user); if ($result > 0) @@ -180,7 +183,7 @@ if ($action == 'create') print ''; print '
    Charge
    ".$langs->trans("SocialContribution")."
    '.$langs->trans("Ref").''.$chid.'
    '.$langs->trans("Type")."".$charge->type_libelle."
    '; - + // Label print ''; @@ -197,7 +200,7 @@ if ($action == 'create') print $langs->trans("NoBankAccountDefined"); print ''; } - + // Capital print ''; @@ -206,35 +209,44 @@ if ($action == 'create') print ''; - + // Date End print ""; print ''; - + // Number of terms print ''; - + // Rate print ''; - // Note + // Note Private print ''; - print ''; + print ''; print ''; + + // Note Public + print ''; + print ''; + print ''; + print '
    '.$langs->trans("Label").'
    '.$langs->trans("Capital").'
    '.$langs->trans("DateStart").''; print $form->select_date($datestart?$datestart:-1,'start','','','','add',1,1); print '
    '.$langs->trans("DateEnd").''; print $form->select_date($dateend?$dateend:-1,'end','','','','add',1,1); print '
    '.$langs->trans("Nbterms").'
    '.$langs->trans("Rate").' %
    '.$langs->trans('Note').''.$langs->trans('NotePrivate').''; - $doleditor = new DolEditor('note', GETPOST('note', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100); + $doleditor = new DolEditor('note_private', GETPOST('note_private', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100); print $doleditor->Create(1); print '
    '.$langs->trans('NotePublic').''; + $doleditor = new DolEditor('note_public', GETPOST('note_public', 'alpha'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, 100); + print $doleditor->Create(1); + print '
    '; - + print '
    '; // Accountancy print ''; - + if ($conf->accounting->enabled) { print ''; @@ -265,7 +277,7 @@ if ($action == 'create') } print '
    '.$langs->trans("LoanAccountancyCapitalCode").'
    '; - + print '
        '; print '
    '; @@ -322,7 +334,7 @@ if ($id > 0) { print ''.$langs->trans("Label").''.$object->label.''; } - + // Capital print ''.$langs->trans("Capital").''.price($object->capital,0,$outputlangs,1,-1,-1,$conf->currency).''; @@ -351,10 +363,10 @@ if ($id > 0) print dol_print_date($object->dateend,"day"); } print ""; - + // Nbterms print ''.$langs->trans("Nbterms").''.$object->nbterm.''; - + // Rate print ''.$langs->trans("Rate").''.$object->rate.' %'; @@ -446,7 +458,7 @@ if ($id > 0) } print ""; print ""; - + /* * Buttons actions */ @@ -490,4 +502,4 @@ if ($id > 0) llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index 9ab8a690494..1cdc99633cd 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -1,5 +1,6 @@ + * Copyright (C) 2015 Frederic France * * 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 @@ -41,7 +42,8 @@ class Loan extends CommonObject var $capital; var $nbterm; var $rate; - var $note; + var $note_private; + var $note_public; var $paid; var $account_capital; var $account_insurance; @@ -73,7 +75,7 @@ class Loan extends CommonObject */ function fetch($id) { - $sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note,"; + $sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note_private, l.note_public,"; $sql.= " l.paid"; $sql.= " FROM ".MAIN_DB_PREFIX."loan as l"; $sql.= " WHERE l.rowid = ".$id; @@ -93,9 +95,10 @@ class Loan extends CommonObject $this->label = $obj->label; $this->capital = $obj->capital; $this->nbterm = $obj->nbterm; - $this->rate = $obj->rate; - $this->note = $obj->note; - $this->paid = $obj->paid; + $this->rate = $obj->rate; + $this->note_private = $obj->note_private; + $this->note_public = $obj->note_public; + $this->paid = $obj->paid; return 1; } @@ -129,7 +132,8 @@ class Loan extends CommonObject // clean parameters $newcapital=price2num($this->capital,'MT'); - if (isset($this->note)) $this->note = trim($this->note); + if (isset($this->note_private)) $this->note_private = trim($this->note_private); + if (isset($this->note_public)) $this->note_public = trim($this->note_public); if (isset($this->account_capital)) $this->account_capital = trim($this->account_capital); if (isset($this->account_insurance)) $this->account_insurance = trim($this->account_insurance); if (isset($this->account_interest)) $this->account_interest = trim($this->account_interest); @@ -151,7 +155,7 @@ class Loan extends CommonObject $this->db->begin(); - $sql = "INSERT INTO ".MAIN_DB_PREFIX."loan (label, fk_bank, capital, datestart, dateend, nbterm, rate, note"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."loan (label, fk_bank, capital, datestart, dateend, nbterm, rate, note_private, note_public"; $sql.= " ,accountancy_account_capital, accountancy_account_insurance, accountancy_account_interest, entity"; $sql.= " ,datec, fk_user_author)"; $sql.= " VALUES ('".$this->db->escape($this->label)."',"; @@ -161,7 +165,8 @@ class Loan extends CommonObject $sql.= " '".$this->db->idate($this->dateend)."',"; $sql.= " '".$this->db->escape($this->nbterm)."',"; $sql.= " '".$this->db->escape($this->rate)."',"; - $sql.= " '".$this->db->escape($this->note)."',"; + $sql.= " '".$this->db->escape($this->note_private)."',"; + $sql.= " '".$this->db->escape($this->note_public)."',"; $sql.= " '".$this->db->escape($this->account_capital)."',"; $sql.= " '".$this->db->escape($this->account_insurance)."',"; $sql.= " '".$this->db->escape($this->account_interest)."',"; @@ -484,4 +489,4 @@ class Loan extends CommonObject return -1; } } -} \ No newline at end of file +} diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php index bb94a86d945..65379f6011d 100644 --- a/htdocs/loan/class/paymentloan.class.php +++ b/htdocs/loan/class/paymentloan.class.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2014 Alexandre Spangaro + * Copyright (C) 2015 Frederic France * * 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 @@ -45,7 +46,8 @@ class PaymentLoan extends CommonObject var $amount_interest; var $fk_typepayment; var $num_payment; - var $note; + var $note_private; + var $note_public; var $fk_bank; var $fk_user_creat; var $fk_user_modif; @@ -89,7 +91,8 @@ class PaymentLoan extends CommonObject if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest); if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment); if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment); - if (isset($this->note)) $this->note = trim($this->note); + if (isset($this->note_private)) $this->note = trim($this->note_private); + if (isset($this->note_public)) $this->note = trim($this->note_public); if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank); if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat); if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif); @@ -112,11 +115,11 @@ class PaymentLoan extends CommonObject if ($totalamount != 0) { $sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_loan (fk_loan, datec, datep, amount_capital, amount_insurance, amount_interest,"; - $sql.= " fk_typepayment, num_payment, note, fk_user_creat, fk_bank)"; - $sql.= " VALUES ($this->chid, '".$this->db->idate($now)."',"; + $sql.= " fk_typepayment, num_payment, note_private, note_public, fk_user_creat, fk_bank)"; + $sql.= " VALUES (".$this->chid.", '".$this->db->idate($now)."',"; $sql.= " '".$this->db->idate($this->datepaid)."',"; $sql.= " ".$totalamount.","; - $sql.= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note)."', ".$user->id.","; + $sql.= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', ".$this->db->escape($this->note_public)."', ".$user->id.","; $sql.= " 0)"; dol_syslog(get_class($this)."::create", LOG_DEBUG); @@ -167,7 +170,8 @@ class PaymentLoan extends CommonObject $sql.= " t.amount_interest,"; $sql.= " t.fk_typepayment,"; $sql.= " t.num_payment,"; - $sql.= " t.note,"; + $sql.= " t.note_private,"; + $sql.= " t.note_public,"; $sql.= " t.fk_bank,"; $sql.= " t.fk_user_creat,"; $sql.= " t.fk_user_modif,"; @@ -197,7 +201,8 @@ class PaymentLoan extends CommonObject $this->amount_interest = $obj->amount_interest; $this->fk_typepayment = $obj->fk_typepayment; $this->num_payment = $obj->num_payment; - $this->note = $obj->note; + $this->note_private = $obj->note_private; + $this->note_public = $obj->note_public; $this->fk_bank = $obj->fk_bank; $this->fk_user_creat = $obj->fk_user_creat; $this->fk_user_modif = $obj->fk_user_modif; @@ -239,7 +244,8 @@ class PaymentLoan extends CommonObject if (isset($this->amount_interest)) $this->amount_interest=trim($this->amount_interest); if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment); if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); - if (isset($this->note)) $this->note=trim($this->note); + if (isset($this->note_private)) $this->note=trim($this->note_private); + if (isset($this->note_public)) $this->note=trim($this->note_public); if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); @@ -259,7 +265,8 @@ class PaymentLoan extends CommonObject $sql.= " amount_interest=".(isset($this->amount_interest)?$this->amount_interest:"null").","; $sql.= " fk_typepayment=".(isset($this->fk_typepayment)?$this->fk_typepayment:"null").","; $sql.= " num_payment=".(isset($this->num_payment)?"'".$this->db->escape($this->num_payment)."'":"null").","; - $sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").","; + $sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").","; + $sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").","; $sql.= " fk_bank=".(isset($this->fk_bank)?$this->fk_bank:"null").","; $sql.= " fk_user_creat=".(isset($this->fk_user_creat)?$this->fk_user_creat:"null").","; $sql.= " fk_user_modif=".(isset($this->fk_user_modif)?$this->fk_user_modif:"null").""; @@ -522,5 +529,3 @@ class PaymentLoan extends CommonObject return $result; } } - - diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php index f75a2244154..eb048ce15a6 100644 --- a/htdocs/loan/payment/card.php +++ b/htdocs/loan/payment/card.php @@ -167,8 +167,11 @@ print ''.$langs->trans('Capital').''.p print ''.$langs->trans('Insurance').''.price($payment->amount_insurance, 0, $outputlangs, 1, -1, -1, $conf->currency).''; print ''.$langs->trans('Interest').''.price($payment->amount_interest, 0, $outputlangs, 1, -1, -1, $conf->currency).''; -// Note -print ''.$langs->trans('Note').''.nl2br($payment->note).''; +// Note Private +print ''.$langs->trans('NotePrivate').''.nl2br($payment->note_private).''; + +// Note Public +print ''.$langs->trans('NotePublic').''.nl2br($payment->note_public).''; // Bank account if (! empty($conf->banque->enabled)) diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index 9a087d60633..c3dd2658051 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2014 Alexandre Spangaro + * Copyright (C) 2015 Frederic France * * 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 @@ -107,7 +108,8 @@ if ($action == 'add_payment') $payment->amount_interest = $_POST["amount_interest"]; $payment->paymenttype = $_POST["paymenttype"]; $payment->num_payment = $_POST["num_payment"]; - $payment->note = $_POST["note"]; + $payment->note_private = GETPOST('note_private'); + $payment->note_public = GETPOST('public'); if (! $error) { @@ -236,10 +238,14 @@ if ($_GET["action"] == 'create') print ''."\n"; print ''; - print ''.$langs->trans("Comments").''; - print ''; + print ''.$langs->trans("NotePrivate").''; + print ''; print ''; + print ''; + print ''.$langs->trans("NotePublic").''; + print ''; + print ''; print ''; print '
    '; @@ -296,7 +302,7 @@ if ($_GET["action"] == 'create') { print '-'; } - print '
    '; + print '
    '; if ($sumpaid < $objp->capital) { $namea = "amount_insurance_".$objp->id; @@ -306,7 +312,7 @@ if ($_GET["action"] == 'create') { print '-'; } - print '
    '; + print '
    '; if ($sumpaid < $objp->capital) { $namei = "amount_interest_".$objp->id; From 631c3d72e35c374208cf57389853f5adff557edd Mon Sep 17 00:00:00 2001 From: frederic34 Date: Fri, 27 Mar 2015 17:23:27 +0100 Subject: [PATCH 227/412] Correction for notes --- htdocs/loan/card.php | 6 ++++++ htdocs/loan/payment/payment.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index 89b8459ef7a..90b17d6e408 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -370,6 +370,12 @@ if ($id > 0) // Rate print ''.$langs->trans("Rate").''.$object->rate.' %'; + // Note Private + print ''.$langs->trans('NotePrivate').''.nl2br($object->note_private).''; + + // Note Public + print ''.$langs->trans('NotePublic').''.nl2br($object->note_public).''; + // Status print ''.$langs->trans("Status").''.$object->getLibStatut(4, $totalpaye).''; diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index c3dd2658051..e57ce652fa4 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -109,7 +109,7 @@ if ($action == 'add_payment') $payment->paymenttype = $_POST["paymenttype"]; $payment->num_payment = $_POST["num_payment"]; $payment->note_private = GETPOST('note_private'); - $payment->note_public = GETPOST('public'); + $payment->note_public = GETPOST('note_public'); if (! $error) { From a0c7cedaf1b11851d72bc3dc5142ce49ab84b8e2 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Fri, 27 Mar 2015 18:09:00 +0100 Subject: [PATCH 228/412] Tooltip for loan --- htdocs/loan/class/loan.class.php | 14 ++++++++++---- htdocs/loan/index.php | 10 +++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index 1cdc99633cd..cf58bb1d2c4 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -395,12 +395,18 @@ class Loan extends CommonObject $result=''; - $link = ''; - $linkend=''; + $tooltip = '' . $langs->trans("ShowLoan") . ''; + if (! empty($this->ref)) + $tooltip .= '
    ' . $langs->trans('Ref') . ': ' . $this->ref; + if (! empty($this->label)) + $tooltip .= '
    ' . $langs->trans('Label') . ': ' . $this->label; + $link = ''; + $linkend = ''; - if ($withpicto) $result.=($link.img_object($langs->trans("ShowLoan").': '.$this->label,'bill').$linkend.' '); + if ($withpicto) $result.=($link.$linkclose.img_object($langs->trans("ShowLoan").': '.$this->label,'bill', 'class="classfortooltip"').$linkend.' '); if ($withpicto && $withpicto != 2) $result.=' '; - if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->label,$maxlen):$this->label).$linkend; + if ($withpicto != 2) $result.=$link.$linkclose.($maxlen?dol_trunc($this->label,$maxlen):$this->label).$linkend; return $result; } diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index 082e5d0d0c2..924fa698364 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2014 Alexandre Spangaro + * Copyright (C) 2015 Frederic France * * 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 @@ -117,12 +118,15 @@ if ($resql) while ($i < min($num,$limit)) { $obj = $db->fetch_object($resql); + $loan_static->id = $obj->rowid; + $loan_static->ref = $obj->rowid; + $loan_static->label = $obj->label; $var = !$var; print ""; // Ref - print ''.img_object($langs->trans("ShowLoan"),"label").' '.$obj->rowid.''; + print ''.$loan_static->getLinkUrl(1, 42).''; // Label print ''.dol_trunc($obj->label,42).''; @@ -150,4 +154,4 @@ else } llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); From 1791631976c9f5a89135b1dd25a27b15e2b4c494 Mon Sep 17 00:00:00 2001 From: Ion Agorria Date: Sat, 28 Mar 2015 03:44:16 +0100 Subject: [PATCH 229/412] check if $mc is a valid global --- htdocs/core/login/functions_dolibarr.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php index 69aec814413..8654c866969 100644 --- a/htdocs/core/login/functions_dolibarr.php +++ b/htdocs/core/login/functions_dolibarr.php @@ -111,15 +111,22 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword"); } - if ($passok && ! empty($conf->multicompany->enabled)) // We must check entity + // We must check entity + if ($passok) { global $mc; - $ret=$mc->checkRight($obj->rowid, $entitytotest); - if ($ret < 0) - { - dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '".$entitytotest."' not allowed for user '".$obj->rowid."'"); - $login=''; // force authentication failure + if (!isset($mc)) { + //Global not available, disable $conf->multicompany->enabled for safety + $conf->multicompany->enabled = false; + } + + if (! empty($conf->multicompany->enabled)) { + $ret = $mc->checkRight($obj->rowid, $entitytotest); + if ($ret < 0) { + dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'"); + $login = ''; // force authentication failure + } } } } From 680317f250700548b4afa67b48723eb354946702 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Sat, 28 Mar 2015 10:02:33 +0100 Subject: [PATCH 230/412] Trans in Loan Calculator --- htdocs/langs/en_US/loan.lang | 12 ++++++++ htdocs/loan/calc.php | 54 ++++++++++++++++++------------------ 2 files changed, 39 insertions(+), 27 deletions(-) diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 4922c0fc0a1..056ce1d0b48 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -18,6 +18,18 @@ ErrorLoanCapital=Loan amount has to be numeric and greate ErrorLoanLength=Loan length has to be numeric and greater than zero. ErrorLoanInterest=Annual interest has to be numeric and greater than zero. # Calc +LoanCalc=Bank Loans Calculator +PurchaseFinanceInfo=Purchase & Financing Information +SalePriceOfAsset=Sale Price of Asset +PercentageDown=Percentage Down +LengthOfMortgage=Length of Mortgage +AnnualInterestRate=Annual Interest Rate +ExplainCalculations=Explain Calculations +ShowMeCalculationsAndAmortization=Show me the calculations and amortization +MortgagePaymentInformation=Mortgage Payment Information +DownPayment=Down Payment +AmountFinanced=Amount Financed +AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years Totalsforyear=Totals for year MonthlyPayment=Monthly Payment LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
    This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php index 0a5ee21923a..06b62231a67 100644 --- a/htdocs/loan/calc.php +++ b/htdocs/loan/calc.php @@ -56,13 +56,13 @@ if (isset($_REQUEST['form_complete'])) { $show_progress = (isset($_REQUEST['show_progress'])) ? $_REQUEST['show_progress'] : false; $form_complete = $_REQUEST['form_complete']; } - + // This function does the actual mortgage calculations // by plotting a PVIFA (Present Value Interest Factor of Annuity) // table... function get_interest_factor($year_term, $monthly_interest_rate) { global $base_rate; - + $factor = 0; $base_rate = 1 + $monthly_interest_rate; $denominator = $base_rate; @@ -71,7 +71,7 @@ function get_interest_factor($year_term, $monthly_interest_rate) { $denominator *= $base_rate; } return $factor; -} +} // If the form is complete, we'll start the math if ($form_complete) { @@ -109,18 +109,19 @@ if ($form_complete) { if (!$down_percent) { $down_percent = $default_down_percent; } if (!$show_progress) { $show_progress = $default_show_progress; } } - + if (! empty($errors)) { setEventMessages('', $errors, 'errors'); $form_complete = false; } - + /* * View */ llxHeader(); +print_fiche_titre($langs->trans("LoanCalc")); print $langs->trans('LoanCalcDesc'); print '
    '; @@ -131,33 +132,33 @@ print ''; //print ''; //print ''; print ''; -print ''; +print ''; print ''; print ''; -print ''; +print ''; print '';print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; -print ''; +print ''; if (! empty($show_progress)) { - print ''; + print ''; } else { - print ''; + print ''; } print ''; @@ -173,18 +174,18 @@ if ($form_complete && $monthly_payment) print '
    '; print '
    Purchase & Financing Information'.$langs->trans('PurchaseFinanceInfo').'
    Sale Price of Home:'.$langs->trans('SalePriceOfAsset').': '.$langs->trans("Currency".$conf->currency).'
    Percentage Down:'.$langs->trans('PercentageDown').':%
    Length of Mortgage:'.$langs->trans('LengthOfMortgage').':years
    Annual Interest Rate:'.$langs->trans('AnnualInterestRate').':%
    Explain Calculations:'.$langs->trans('ExplainCalculations').':Show me the calculations and amortization'.$langs->trans('ShowMeCalculationsAndAmortization').'Show me the calculations and amortization'.$langs->trans('ShowMeCalculationsAndAmortization').'
    '; print ''; - print ''; + print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -203,7 +204,7 @@ if ($form_complete && $monthly_payment) print ''; print ''; print ''; - print ''; + print ''; print ''; print ''; @@ -243,7 +244,7 @@ if ($form_complete && $monthly_payment) print '
    Mortgage Payment Information'.$langs->trans('MortgagePaymentInformation').'
    Down Payment:'.$langs->trans('DownPayment').':' . number_format($down_payment, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '
    Amount Financed:'.$langs->trans('AmountFinanced').':' . number_format($financing_price, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '
    Monthly Payment:'.$langs->trans('MonthlyPayment').':' . number_format($monthly_payment, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '
    (Principal & Interest ONLY)
    Monthly Payment:'.$langs->trans('MonthlyPayment').':' . number_format(($monthly_payment + $pmi_per_month), "2", ".", ",") . $langs->trans("Currency".$conf->currency) . '
    '; print '(Principal & Interest, and PMI)
    '; print '
    '; -// This prints the calculation progress and +// This prints the calculation progress and // the instructions of HOW everything is figured // out if ($form_complete && $show_progress) { @@ -256,7 +257,7 @@ if ($form_complete && $show_progress) { print ''; echo 'The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)

    - ' . number_format($down_payment,"2",".",",") . ' ' . $langs->trans("Currency".$conf->currency) . ' = '.number_format($sale_price,"2",".",",") . ' ' . $langs->trans("Currency".$conf->currency) . ' X + ' . number_format($down_payment,"2",".",",") . ' ' . $langs->trans("Currency".$conf->currency) . ' = '.number_format($sale_price,"2",".",",") . ' ' . $langs->trans("Currency".$conf->currency) . ' X ('.$down_percent.' / 100)'; print ''; print ''; @@ -290,7 +291,6 @@ if ($form_complete && $show_progress) { print '' . $step++ . ''; print ''; print 'The montly payment is figured out using the following formula:
    '; - print 'Monthly Payment = ' . number_format($financing_price, "2", "", "") . ' * '; print $langs->trans('MonthlyPayment').' = ' . number_format($financing_price, "2", "", "") . ' * '; print '(1 - ((1 + ' . number_format($monthly_interest_rate, "4", "", "") . ')'; print '-(' . $month_term . '))))'; @@ -313,7 +313,7 @@ if ($form_complete && $show_progress) { $denom = pow((1 + $monthly_interest_rate), $power); $monthly_payment = $principal * ($monthly_interest_rate / (1 - $denom)); - print "

    Amortization For Monthly Payment: " . number_format($monthly_payment, "2", ".", ",") . " over " . $year_term . " years
    \n"; + print '

    '.$langs->trans('AmortizationMonthlyPaymentOverYears', number_format($monthly_payment, "2", ".", ","), $year_term)."
    \n"; print ''; @@ -327,17 +327,17 @@ if ($form_complete && $show_progress) { print $legend; - // Loop through and get the current month's payments for - // the length of the loan + // Loop through and get the current month's payments for + // the length of the loan while ($current_month <= $month_term) - { + { $interest_paid = $principal * $monthly_interest_rate; $principal_paid = $monthly_payment - $interest_paid; $remaining_balance = $principal - $principal_paid; - + $this_year_interest_paid = $this_year_interest_paid + $interest_paid; $this_year_principal_paid = $this_year_principal_paid + $principal_paid; - + $var = !$var; print ""; print ''; From 7282a6faf24d08762993af285b10b8217085b6c8 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Sat, 28 Mar 2015 10:59:10 +0100 Subject: [PATCH 231/412] Trans in Loan Calculator --- htdocs/langs/en_US/loan.lang | 10 ++++++++++ htdocs/loan/calc.php | 28 +++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 056ce1d0b48..98a7fb4ed93 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -28,11 +28,21 @@ ExplainCalculations=Explain Calculations ShowMeCalculationsAndAmortization=Show me the calculations and amortization MortgagePaymentInformation=Mortgage Payment Information DownPayment=Down Payment +DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05) +InterestRateDesc=The interest rate = The annual interest percentage divided by 100 +MonthlyFactorDesc=The monthly factor = The result of the following formula +MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year) +MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12 +MonthlyPaymentDesc=The montly payment is figured out using the following formula +AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan. AmountFinanced=Amount Financed AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years Totalsforyear=Totals for year MonthlyPayment=Monthly Payment LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
    This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    +GoToInterest=%s will go towards INTEREST +GoToPrincipal=%s will go towards PRINCIPAL +YouWillSpend=You will spend %s on your house in year %s # Admin ConfigLoan=Configuration of the module loan LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php index 06b62231a67..bb6fe9451b6 100644 --- a/htdocs/loan/calc.php +++ b/htdocs/loan/calc.php @@ -255,48 +255,46 @@ if ($form_complete && $show_progress) { print '    '; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print ''; print '
    ' . $current_month . '
    '. $step++ .''; - echo 'The down payment - = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)

    - ' . number_format($down_payment,"2",".",",") . ' ' . $langs->trans("Currency".$conf->currency) . ' = '.number_format($sale_price,"2",".",",") . ' ' . $langs->trans("Currency".$conf->currency) . ' X - ('.$down_percent.' / 100)'; + print $langs->trans('DownPaymentDesc').'

    '; + print number_format($down_payment,"2",".",",") . ' ' . $langs->trans("Currency".$conf->currency) . ' = '; + print number_format($sale_price,"2",".",",") . ' ' . $langs->trans("Currency".$conf->currency) . ' X (' . $down_percent . ' / 100)'; print '
    ' . $step++ . ''; - print 'The interest rate = The annual interest percentage divided by 100

    '; + print $langs->trans('InterestRateDesc') . '

    '; print $annual_interest_rate . ' = ' . $annual_interest_percent . '% / 100'; print '
    '; - print 'The monthly factor = The result of the following formula:'; + print $langs->trans('MonthlyFactorDesc') . ':'; print '
    ' . $step++ . ''; - print 'The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)

    '; + print $langs->trans('MonthlyInterestRateDesc') . '

    '; print $monthly_interest_rate . ' = ' . $annual_interest_rate . ' / 12'; print '
    ' . $step++ . ''; - print 'The month term of the loan in months = The number of years you\'ve taken the loan out for times 12

    '; - print $month_term . ' Months = ' . $year_term . ' Years X 12'; + print $langs->trans('MonthTermDesc') . '

    '; + print $month_term . ' '. $langs->trans('Months') . ' = ' . $year_term . ' '. $langs->trans('Years') . ' X 12'; print '
    ' . $step++ . ''; - print 'The montly payment is figured out using the following formula:
    '; + print $langs->trans('MonthlyPaymentDesc') . ':
    '; print $langs->trans('MonthlyPayment').' = ' . number_format($financing_price, "2", "", "") . ' * '; print '(1 - ((1 + ' . number_format($monthly_interest_rate, "4", "", "") . ')'; print '-(' . $month_term . '))))'; print '

    '; - print 'The amortization breaks down how much of your monthly payment goes towards the bank\'s interest,'; - print 'and how much goes into paying off the principal of your loan.'; + print $langs->trans('AmortizationPaymentDesc'); print '
    '; @@ -357,9 +355,9 @@ if ($form_complete && $show_progress) { print ''; print ' '; print ''; - print 'You will spend ' . number_format($total_spent_this_year, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . ' on your house in year ' . $current_year . '
    '; - print number_format($this_year_interest_paid, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . ' will go towards INTEREST
    '; - print number_format($this_year_principal_paid, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . ' will go towards PRINCIPAL
    '; + print $langs->trans('YouWillSpend', number_format($total_spent_this_year, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency), $current_year) . '
    '; + print $langs->trans('GoToInterest', number_format($this_year_interest_paid, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency)) . '
    '; + print $langs->trans('GoToPrincipal', number_format($this_year_principal_paid, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency)) . '
    '; print ''; print ''; From 91632ea431b051cc4e1e81a51072a036cd98d644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Sat, 28 Mar 2015 16:01:33 +0100 Subject: [PATCH 232/412] Added GitHub for issue tracking to contribution guidelines --- CONTRIBUTING.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a872a4593ba..40da55e3f55 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,13 +3,15 @@ How to contribute to Dolibarr Bug reports and feature requests -------------------------------- -Issues are tracked at [Doliforge](https://doliforge.org/projects/dolibarr) +** NEW ** -*You need to create an account before being able to use the "Bugs & Tasks" feature.* +Issues are now managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues). -1. Use the search engine to check if nobody's already reported your problem. -2. Choose the right section. (Bugs or Task and Feature Request). -3. Report with as much detail as possible (Use screenshots or even screencasts whenever possible). +1. Please [use the search engine](https://help.github.com/articles/searching-issues/) to check if nobody's already reported your problem. +2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request. +3. Report with as much detail as possible ([Use screenshots or even screencasts whenever possible](https://help.github.com/articles/issue-attachments)). + +We're still figuring out how to migrate old issues to GitHub. In the meantime, they are still available at [Doliforge](https://doliforge.org/projects/dolibarr). Code ---- From ad8214884d2b395adec2e4d9171f2f665ff0985f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Sat, 28 Mar 2015 16:10:29 +0100 Subject: [PATCH 233/412] Added documentation to contribution guidelines --- CONTRIBUTING.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 40da55e3f55..e3a97fe358e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,26 +7,26 @@ Bug reports and feature requests Issues are now managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues). -1. Please [use the search engine](https://help.github.com/articles/searching-issues/) to check if nobody's already reported your problem. +1. Please [use the search engine](https://help.github.com/articles/searching-issues) to check if nobody's already reported your problem. 2. [Create an issue](https://help.github.com/articles/creating-an-issue). Choose an appropriate title. Prepend appropriately with Bug or Feature Request. 3. Report with as much detail as possible ([Use screenshots or even screencasts whenever possible](https://help.github.com/articles/issue-attachments)). We're still figuring out how to migrate old issues to GitHub. In the meantime, they are still available at [Doliforge](https://doliforge.org/projects/dolibarr). -Code ----- +Code +--------------------- ### Basic workflow -1. Fork the [GitHub repository](https://github.com/Dolibarr/dolibarr). +1. [Fork](https://help.github.com/articles/fork-a-repo) the [GitHub repository](https://github.com/Dolibarr/dolibarr). 2. Clone your fork. -3. Choose a branch(See the Branches section below). +3. Choose a branch(See the [Branches](#branches) section below). 4. Commit and push your changes. -5. Make a pull request. +5. [Make a pull request](https://help.github.com/articles/creating-a-pull-request). -### Branches +### Branches -Unless you're fixing a bug, all pull request should be made against the *develop* branch. +Unless you're fixing a bug, all pull requests should be made against the *develop* branch. If you're fixing a bug, it is preferred that you cook your fix and pull request it against the oldest version affected that's still supported. @@ -71,7 +71,7 @@ Where KEYWORD is one of: Translations ------------ -en_US and delta languages (i.e: fr_XX) are maintained in the repository. See Code section above. +The source language (en_US) is maintained in the repository. See the [Code](#code) section above. All other translations are managed online at [Transifex](https://www.transifex.com/projects/p/dolibarr). From 5e33068e298c34e580ea9bd2f7ff55a078398f0d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 28 Mar 2015 16:51:25 +0100 Subject: [PATCH 234/412] Update doc --- build/README | 3 --- build/makepack-howto.txt | 11 +++++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/README b/build/README index 897a59c4eef..4816be8bc3a 100644 --- a/build/README +++ b/build/README @@ -28,9 +28,6 @@ Note: Prerequisites to build autoexe DoliWamp package: recommanded), open file build/exe/doliwamp.iss and click on button "Compile". The .exe file will be build into directory build. -- To build a translaction package, launch the script -> perl makepack-dolibarrlang.pl - - To build a theme package, launch the script > perl makepack-dolibarrtheme.pl diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt index 9e5004f4ba7..4e52c6a50eb 100644 --- a/build/makepack-howto.txt +++ b/build/makepack-howto.txt @@ -8,7 +8,7 @@ This files describe steps made by Dolibarr packaging team to make a beta version of Dolibarr, step by step. - Check all files are commited. -- Update version/info in /ChangeLog +- Update version/info in ChangeLog. To generate a changelog, you can do "git log x.y.z..HEAD --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIXED\|NEW'" - Update version number with x.y.z-w in htdocs/filefunc.inc.php - Update version number with x.y.z-w in build/debian/changelog - Update version number with x.y.z-w in build/rpm/*.spec @@ -17,10 +17,11 @@ beta version of Dolibarr, step by step. - Create a branch (x.y). - Run makepack-dolibarr.pl to generate all packages. + - Move build files into www.dolibarr.org web site (/home/dolibarr/wwwroot/files/lastbuild). -- Post a news on dolibarr.org/dolibarr.fr +- Post a news on dolibarr.org/dolibarr.fr + social networks - Send mail on mailings-list @@ -35,14 +36,16 @@ complete release of Dolibarr, step by step. - Update version number with x.y.z in build/rpm/*.spec - Commit all changes. -- Build Dolibarr and DoliWamp packages with makepack-dolibarr.pl +- Run makepack-dolibarr.pl to generate all packages. + - Check content of built packages. - Move build files into www.dolibarr.org web site (/home/dolibarr/wwwroot/files/stable). + - Run makepack-dolibarr.pl again with option to publish files on sourceforge. This will also add official tag. - Edit symbolic links in directory "/home/dolibarr/wwwroot/files/stable/xxx" on server to point to new files (used by some web sites). +- Post a news on dolibarr.org/dolibarr.fr + social networks - Send mail on mailings-list -- Send news on OpenSource web sites (if major beta or release) From ffe1ee0d84844cbab4fd50954fe491ff808203b5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 28 Mar 2015 17:12:31 +0100 Subject: [PATCH 235/412] Target 98 to publish of dolibarr sevrer is now working --- build/makepack-dolibarr.pl | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 27af49cb6f4..90f055da9df 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \author (c)2004-2014 Laurent Destailleur +# \author (c)2004-2015 Laurent Destailleur # # This is list of constant you can set to have generated packages moved into a specific dir: #DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild' @@ -15,8 +15,12 @@ use Cwd; + +# Change this to defined target for option 98 and 99 $PROJECT="dolibarr"; -$RPMSUBVERSION="auto"; # auto use value found into BUILD +$PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr"; +$PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/httpdocs/files"; + @LISTETARGET=("TGZ","ZIP","RPM_GENERIC","RPM_FEDORA","RPM_MANDRIVA","RPM_OPENSUSE","DEB","APS","EXEDOLIWAMP","SNAPSHOT"); # Possible packages %REQUIREMENTPUBLISH=( @@ -41,6 +45,7 @@ $RPMSUBVERSION="auto"; # auto use value found into BUILD "makensis.exe"=>"NSIS" ); +$RPMSUBVERSION="auto"; # auto use value found into BUILD if (-d "/usr/src/redhat") { $RPMDIR="/usr/src/redhat"; } # redhat if (-d "/usr/src/packages") { $RPMDIR="/usr/src/packages"; } # opensuse if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake @@ -59,8 +64,6 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/; $SOURCE="$DIR/.."; $DESTI="$SOURCE/build"; -$PUBLISHSTABLE="eldy,dolibarr\@frs.sourceforge.net:/home/frs/project/dolibarr"; -$PUBLISHBETARC="ldestailleur\@asso.dolibarr.org:/home/dolibarr/dolibarr.org/files"; if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"}) { print "Error: Missing environment variables.\n"; @@ -210,9 +213,9 @@ else { printf(" %2d - %-14s (%s)\n",$cpt,$target,"Need ".$REQUIREMENTTARGET{$target}); } $cpt=98; - printf(" %2d - %-14s (%s)\n",$cpt,"ASSO (publish)","Need ".join(",",values %REQUIREMENTPUBLISH)); + printf(" %2d - %-14s (%s)\n",$cpt,"ASSO (publish)","Need ".$REQUIREMENTPUBLISH{"ASSO"}); $cpt=99; - printf(" %2d - %-14s (%s)\n",$cpt,"SF (publish)","Need ".join(",",values %REQUIREMENTPUBLISH)); + printf(" %2d - %-14s (%s)\n",$cpt,"SF (publish)","Need ".$REQUIREMENTPUBLISH{"SF"}); # Ask which target to build print "Choose one package number or several separated with space (0 - ".$cpt."): "; @@ -1026,9 +1029,16 @@ if ($nboftargetok) { if (! $filesize) { next; } print "\n"; - print "Publish file ".$file." to ".$filestoscan{$file}."\n"; - $destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD; + if ($target eq 'SF') { + $destFolder="$NEWPUBLISH/$filestoscan{$file}/".$MAJOR.'.'.$MINOR.'.'.$BUILD; + print "Publish file ".$file." to $NEWPUBLISH/".$filestoscan{$file}."\n"; + } + else + { + $destFolder="$NEWPUBLISH"; + print "Publish file ".$file." to $NEWPUBLISH\n"; + } # mkdir #my $ssh = Net::SSH::Perl->new("frs.sourceforge.net"); From af92174ae2b4f8e14a3b64dcacaf2d2442340ec0 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Sat, 28 Mar 2015 15:31:09 +0100 Subject: [PATCH 236/412] Small correction but unable to make loan payment --- htdocs/langs/en_US/loan.lang | 7 ++++--- htdocs/loan/card.php | 11 ++++++----- htdocs/loan/class/paymentloan.class.php | 3 ++- htdocs/loan/index.php | 2 +- htdocs/loan/payment/payment.php | 26 ++++++++++++------------- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 98a7fb4ed93..449afa5afbd 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -13,10 +13,11 @@ LoanAccountancyInsuranceCode=Accountancy code insurance LoanAccountancyInterestCode=Accountancy code interest LoanPayment=Loan payment ConfirmDeleteLoan=Confirm deleting this loan +LoanDeleted=Loan Deleted Successfully ConfirmPayLoan=Confirm classify paid this loan -ErrorLoanCapital=Loan amount has to be numeric and greater than zero. -ErrorLoanLength=Loan length has to be numeric and greater than zero. -ErrorLoanInterest=Annual interest has to be numeric and greater than zero. +ErrorLoanCapital=Loan amount has to be numeric and greater than zero. +ErrorLoanLength=Loan length has to be numeric and greater than zero. +ErrorLoanInterest=Annual interest has to be numeric and greater than zero. # Calc LoanCalc=Bank Loans Calculator PurchaseFinanceInfo=Purchase & Financing Information diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index 90b17d6e408..cd222ea4365 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -61,6 +61,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') $result=$object->delete($user); if ($result > 0) { + setEventMessage($langs->trans('LoanDeleted')); header("Location: index.php"); exit; } @@ -129,7 +130,7 @@ else if ($action == 'update' && $user->rights->loan->write) if (! $cancel) { $result = $object->fetch($id); - + if ($object->fetch($id)) { $object->label = GETPOST("label"); @@ -475,25 +476,25 @@ if ($id > 0) // Edit if ($user->rights->loan->write) { - print "id&action=edit\">".$langs->trans("Modify").""; + print ''.$langs->trans("Modify").''; } // Emit payment if ($object->paid == 0 && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write) { - print "id&action=create\">".$langs->trans("DoPayment").""; + print ''.$langs->trans("DoPayment").''; } // Classify 'paid' if ($object->paid == 0 && round($staytopay) <=0 && $user->rights->loan->write) { - print "id&action=paid\">".$langs->trans("ClassifyPaid").""; + print ''.$langs->trans("ClassifyPaid").''; } // Delete if ($user->rights->loan->delete) { - print "id&action=delete\">".$langs->trans("Delete").""; + print ''.$langs->trans("Delete").''; } print "
    "; diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php index 65379f6011d..41b64bcd865 100644 --- a/htdocs/loan/class/paymentloan.class.php +++ b/htdocs/loan/class/paymentloan.class.php @@ -119,7 +119,7 @@ class PaymentLoan extends CommonObject $sql.= " VALUES (".$this->chid.", '".$this->db->idate($now)."',"; $sql.= " '".$this->db->idate($this->datepaid)."',"; $sql.= " ".$totalamount.","; - $sql.= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', ".$this->db->escape($this->note_public)."', ".$user->id.","; + $sql.= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', '".$this->db->escape($this->note_public)."', ".$user->id.","; $sql.= " 0)"; dol_syslog(get_class($this)."::create", LOG_DEBUG); @@ -130,6 +130,7 @@ class PaymentLoan extends CommonObject } else { + $this->error=$this->db->lasterror(); $error++; } diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index 924fa698364..557d1fa5e00 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -31,7 +31,7 @@ $langs->load("banks"); $langs->load("bills"); // Security check -$socid = isset($_GET["socid"])?$_GET["socid"]:''; +$socid = GETPOST('socid', int); if ($user->societe_id) $socid=$user->societe_id; $result = restrictedArea($user, 'loan', '', '', ''); diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index e57ce652fa4..1d503649c60 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -56,21 +56,21 @@ if ($action == 'add_payment') exit; } - $datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $datepaid = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); if (! $_POST["paymenttype"] > 0) { - $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode")); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode")), 'errors'); $error++; } if ($datepaid == '') { - $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("Date")); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Date")), 'errors'); $error++; } if (! empty($conf->banque->enabled) && ! $_POST["accountid"] > 0) { - $mesg = $langs->trans("ErrorFieldRequired",$langs->transnoentities("AccountToCredit")); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("AccountToCredit")), 'errors'); $error++; } @@ -90,8 +90,8 @@ if ($action == 'add_payment') if (count($amounts) <= 0) { + setEventMessage($langs->trans('ErrorNoPaymentDefined'), 'errors'); $error++; - $errmsg='ErrorNoPaymentDefined'; } if (! $error) @@ -103,11 +103,11 @@ if ($action == 'add_payment') $payment->chid = $chid; $payment->datepaid = $datepaid; $payment->amounts = $amounts; // Tableau de montant - $payment->amount_capital = $_POST["amount_capital"]; - $payment->amount_insurance = $_POST["amount_insurance"]; - $payment->amount_interest = $_POST["amount_interest"]; - $payment->paymenttype = $_POST["paymenttype"]; - $payment->num_payment = $_POST["num_payment"]; + $payment->amount_capital = GETPOST('amount_capital'); + $payment->amount_insurance = GETPOST('amount_insurance'); + $payment->amount_interest = GETPOST('amount_interest'); + $payment->paymenttype = GETPOST('paymenttype'); + $payment->num_payment = GETPOST('num_payment'); $payment->note_private = GETPOST('note_private'); $payment->note_public = GETPOST('note_public'); @@ -116,17 +116,17 @@ if ($action == 'add_payment') $paymentid = $payment->create($user); if ($paymentid < 0) { - $errmsg=$payment->error; + setEventMessage($payment->error, 'errors'); $error++; } } if (! $error) { - $result=$payment->addPaymentToBank($user,'payment_loan','(LoanPayment)',$_POST['accountid'],'',''); + $result=$payment->addPaymentToBank($user, 'payment_loan', '(LoanPayment)', GETPOST('accountid', 'int'), '', ''); if (! $result > 0) { - $errmsg=$payment->error; + setEventMessage($payment->error, 'errors'); $error++; } } From b60a56dc94e7d7d620346b598d8e28324554f977 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 28 Mar 2015 17:17:55 +0100 Subject: [PATCH 237/412] Fix search on command --- htdocs/commande/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php index 59df993b686..1fe0a728a22 100644 --- a/htdocs/commande/list.php +++ b/htdocs/commande/list.php @@ -43,7 +43,7 @@ $orderyear=GETPOST("orderyear","int"); $ordermonth=GETPOST("ordermonth","int"); $deliveryyear=GETPOST("deliveryyear","int"); $deliverymonth=GETPOST("deliverymonth","int"); -$search_ref=GETPOST('search_ref','alpha'); +$search_ref=GETPOST('search_ref','alpha')!=''?GETPOST('search_ref','alpha'):GETPOST('sref','alpha'); $search_ref_customer=GETPOST('search_ref_customer','alpha'); $search_company=GETPOST('search_company','alpha'); $sall=GETPOST('sall'); From be1595a1876ec4293f3e90162351ca4da0fc10a2 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Sat, 28 Mar 2015 17:42:33 +0100 Subject: [PATCH 238/412] Add tab for notes --- htdocs/core/lib/loan.lib.php | 43 ++++++++------ htdocs/langs/en_US/loan.lang | 3 +- htdocs/loan/card.php | 8 +++ htdocs/loan/note.php | 99 +++++++++++++++++++++++++++++++++ htdocs/loan/payment/payment.php | 5 -- 5 files changed, 136 insertions(+), 22 deletions(-) create mode 100644 htdocs/loan/note.php diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php index 323516bbbd6..be04beb1d9a 100644 --- a/htdocs/core/lib/loan.lib.php +++ b/htdocs/core/lib/loan.lib.php @@ -1,5 +1,6 @@ + * Copyright (C) 2015 Frederic France * * 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 @@ -32,35 +33,45 @@ function loan_prepare_head($object) { global $langs, $conf; - $h = 0; + $tab = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/loan/card.php?id='.$object->id; - $head[$h][1] = $langs->trans('Card'); - $head[$h][2] = 'card'; - $h++; + $head[$tab][0] = DOL_URL_ROOT.'/loan/card.php?id='.$object->id; + $head[$tab][1] = $langs->trans('Card'); + $head[$tab][2] = 'card'; + $tab++; + + if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) + { + $nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1); + $head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id; + $head[$tab][1] = $langs->trans("Notes"); + if($nbNote > 0) $head[$tab][1].= ' '.$nbNote.''; + $head[$tab][2] = 'note'; + $tab++; + } // Show more tabs from modules // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname); to remove a tab - complete_head_from_modules($conf,$langs,$object,$head,$h,'loan'); + complete_head_from_modules($conf, $langs, $object, $head, $tab,'loan'); require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $upload_dir = $conf->loan->dir_output . "/" . dol_sanitizeFileName($object->ref); $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); - $head[$h][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id; - $head[$h][1] = $langs->trans("Documents"); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; - $head[$h][2] = 'documents'; - $h++; + $head[$tab][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id; + $head[$tab][1] = $langs->trans("Documents"); + if($nbFiles > 0) $head[$tab][1].= ' ('.$nbFiles.')'; + $head[$tab][2] = 'documents'; + $tab++; - $head[$h][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id; - $head[$h][1] = $langs->trans("Info"); - $head[$h][2] = 'info'; - $h++; + $head[$tab][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id; + $head[$tab][1] = $langs->trans("Info"); + $head[$tab][2] = 'info'; + $tab++; - complete_head_from_modules($conf,$langs,$object,$head,$h,'loan','remove'); + complete_head_from_modules($conf,$langs,$object,$head,$tab,'loan','remove'); return $head; } \ No newline at end of file diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 449afa5afbd..4aba2de625c 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -14,7 +14,8 @@ LoanAccountancyInterestCode=Accountancy code interest LoanPayment=Loan payment ConfirmDeleteLoan=Confirm deleting this loan LoanDeleted=Loan Deleted Successfully -ConfirmPayLoan=Confirm classify paid this loan +ConfirmPayLoan=Confirm classify paid this loan +LoanPaid=Loan Paid ErrorLoanCapital=Loan amount has to be numeric and greater than zero. ErrorLoanLength=Loan length has to be numeric and greater than zero. ErrorLoanInterest=Annual interest has to be numeric and greater than zero. diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index cd222ea4365..8e280b2da75 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -52,6 +52,14 @@ if ($action == 'confirm_paid' && $confirm == 'yes') { $object->fetch($id); $result = $object->set_paid($user); + if ($result > 0) + { + setEventMessage($langs->trans('LoanPaid')); + } + else + { + setEventMessage($loan->error, 'errors'); + } } // Delete loan diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php new file mode 100644 index 00000000000..a87cd3870d8 --- /dev/null +++ b/htdocs/loan/note.php @@ -0,0 +1,99 @@ + + * Copyright (C) 2004-2007 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2013 Florian Henry + * Copyright (C) 2015 Frederic France + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/loan/note.php + * \brief Tab for notes on loan + * \ingroup loan + */ + +require '../main.inc.php'; +require_once(DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'); +require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; + +$action = GETPOST('action'); + +$langs->load('loan'); + +// Security check +$id = GETPOST('id','int'); +$result = restrictedArea($user, 'loan', $id, '&loan'); + +$object = new Loan($db); +if ($id > 0) $object->fetch($id); + +$permissionnote=$user->rights->loan->read; // Used by the include of actions_setnotes.inc.php + + +/* + * Actions + */ + +include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once + + +/* + * View + */ + +$form = new Form($db); + +llxHeader('',$langs->trans("LoanArea").' - '.$langs->trans("Notes"),''); + +if ($id > 0) +{ + /* + * Affichage onglets + */ + + $head = loan_prepare_head($object); + + dol_fiche_head($head, 'note', $langs->trans("Loan"),0,'loan'); + + + print '
    '; + print ''; + + print ''; + + // Ref + print ''; + print ''; + // Name + print ''; + print ''; + + print "
    '.$langs->trans('Ref').''; + print $form->showrefnav($object,'id','','','rowid','ref'); + print '
    '.$langs->trans("Name").''.$object->label.'
    "; + + print '
    '; + + $colwidth='25'; + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; + + + dol_fiche_end(); +} + +llxFooter(); +$db->close(); + diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index 1d503649c60..52921bc6b18 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -170,11 +170,6 @@ if ($_GET["action"] == 'create') print_fiche_titre($langs->trans("DoPayment")); print "
    \n"; - if ($mesg) - { - print "
    $mesg
    "; - } - print ''; print ''; print ''; From 043d11d78564ee0fb5c286e5ba4e4963eea93d79 Mon Sep 17 00:00:00 2001 From: Ion Agorria Date: Sat, 28 Mar 2015 03:44:16 +0100 Subject: [PATCH 239/412] check if $mc is a valid global --- htdocs/core/login/functions_dolibarr.php | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php index 69aec814413..8654c866969 100644 --- a/htdocs/core/login/functions_dolibarr.php +++ b/htdocs/core/login/functions_dolibarr.php @@ -111,15 +111,22 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= $_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword"); } - if ($passok && ! empty($conf->multicompany->enabled)) // We must check entity + // We must check entity + if ($passok) { global $mc; - $ret=$mc->checkRight($obj->rowid, $entitytotest); - if ($ret < 0) - { - dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '".$entitytotest."' not allowed for user '".$obj->rowid."'"); - $login=''; // force authentication failure + if (!isset($mc)) { + //Global not available, disable $conf->multicompany->enabled for safety + $conf->multicompany->enabled = false; + } + + if (! empty($conf->multicompany->enabled)) { + $ret = $mc->checkRight($obj->rowid, $entitytotest); + if ($ret < 0) { + dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'"); + $login = ''; // force authentication failure + } } } } From b8bd27009e2a8ad6ad773abe18a5f6c3b8a00199 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 28 Mar 2015 18:32:53 +0100 Subject: [PATCH 240/412] Simplify code --- htdocs/core/login/functions_dolibarr.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php index 8654c866969..74da1f97ff0 100644 --- a/htdocs/core/login/functions_dolibarr.php +++ b/htdocs/core/login/functions_dolibarr.php @@ -112,18 +112,16 @@ function check_user_password_dolibarr($usertotest,$passwordtotest,$entitytotest= } // We must check entity - if ($passok) + if ($passok && ! empty($conf->multicompany->enabled)) // We must check entity { global $mc; - if (!isset($mc)) { - //Global not available, disable $conf->multicompany->enabled for safety - $conf->multicompany->enabled = false; - } - - if (! empty($conf->multicompany->enabled)) { + if (! isset($mc)) $conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety + else + { $ret = $mc->checkRight($obj->rowid, $entitytotest); - if ($ret < 0) { + if ($ret < 0) + { dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko entity '" . $entitytotest . "' not allowed for user '" . $obj->rowid . "'"); $login = ''; // force authentication failure } From ce6df7c022446ec68a803f7616faaa35bfc15aa6 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 29 Mar 2015 09:20:32 +0200 Subject: [PATCH 241/412] Debug --- htdocs/compta/bank/account.php | 22 +-- htdocs/core/lib/donation.lib.php | 5 - htdocs/core/menus/init_menu_auguria.sql | 2 +- htdocs/core/menus/standard/eldy.lib.php | 2 +- htdocs/don/card.php | 33 +++-- htdocs/don/class/don.class.php | 4 +- ...tionstats.class.php => donstats.class.php} | 0 htdocs/don/class/paymentdonation.class.php | 83 +++++------- htdocs/don/document.php | 125 ------------------ htdocs/don/payment/card.php | 21 +-- htdocs/don/stats/index.php | 3 +- htdocs/langs/en_US/donations.lang | 1 + 12 files changed, 71 insertions(+), 230 deletions(-) rename htdocs/don/class/{donationstats.class.php => donstats.class.php} (100%) delete mode 100644 htdocs/don/document.php diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 329ba2149cf..20ef8bcc3cc 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -47,6 +47,7 @@ $langs->load("categories"); $langs->load("bills"); $langs->load("companies"); $langs->load("loan"); +$langs->load("donations"); $id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int')); $ref = GETPOST('ref','alpha'); @@ -617,6 +618,12 @@ if ($id > 0 || ! empty($ref)) print ' '.img_object($langs->trans('ShowPayment'),'payment').' '; print ''; } + elseif ($links[$key]['type']=='payment_donation') + { + print ''; + print ' '.img_object($langs->trans('ShowPayment'),'payment').' '; + print ''; + } elseif ($links[$key]['type']=='banktransfert') { // Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail. @@ -716,21 +723,6 @@ if ($id > 0 || ! empty($ref)) $chargestatic->ref=$chargestatic->lib; print $chargestatic->getNomUrl(1,16); } - else if ($links[$key]['type']=='donation') - { - $donstatic->id=$links[$key]['url_id']; - if (preg_match('/^\((.*)\)$/i',$links[$key]['label'],$reg)) - { - if ($reg[1]=='donation') $reg[1]='Donation'; - $donstatic->lib=$langs->trans($reg[1]); - } - else - { - $donstatic->lib=$links[$key]['label']; - } - $donstatic->ref=$donstatic->lib; - print $donstatic->getNomUrl(1,16); - } else if ($links[$key]['type']=='loan') { $loanstatic->id=$links[$key]['url_id']; diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php index 4155d5ce60e..ed6407b1e84 100644 --- a/htdocs/core/lib/donation.lib.php +++ b/htdocs/core/lib/donation.lib.php @@ -78,11 +78,6 @@ function donation_prepare_head($object) // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'donation'); - - $head[$h][0] = DOL_URL_ROOT . '/don/document.php?id='.$object->id; - $head[$h][1] = $langs->trans("Documents"); - $head[$h][2] = 'documents'; - $h++; $head[$h][0] = DOL_URL_ROOT . '/don/info.php?id=' . $object->id; $head[$h][1] = $langs->trans("Info"); diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 3eab01619f1..ffb33138bcc 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -175,7 +175,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled', __HANDLER__, 'left', 2000__+MAX_llx_menu__, 'accountancy', 'donations', 6__+MAX_llx_menu__, '/don/index.php?leftmenu=donations&mainmenu=accountancy', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2001__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/don/card.php?leftmenu=donations&mainmenu=accountancy&action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/don/list.php?leftmenu=donations&mainmenu=accountancy', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/don/stats/index.php?leftmenu=donations&mainmenu=accountancy', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__); +-- insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'accountancy', '', 2000__+MAX_llx_menu__, '/don/stats/index.php?leftmenu=donations&mainmenu=accountancy', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__); -- Special expenses insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled || $conf->salaries->enabled', __HANDLER__, 'left', 2200__+MAX_llx_menu__, 'accountancy', 'tax', 6__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax&mainmenu=accountancy', 'MenuSpecialExpenses', 0, 'compta', '(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && $user->rights->salaries->read)', '', 0, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled', __HANDLER__, 'left', 2210__+MAX_llx_menu__, 'accountancy', 'tax_sal', 2200__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary&mainmenu=accountancy', 'Salaries', 1, 'salaries', '$user->rights->salaries->read', '', 0, 1, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 1d35db720b7..9eba6b79dd6 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -810,7 +810,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/don/index.php?leftmenu=donations&mainmenu=accountancy",$langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations'); if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/don/card.php?action=create",$langs->trans("NewDonation"), 1, $user->rights->don->creer); if (empty($leftmenu) || $leftmenu=="donations") $newmenu->add("/don/list.php",$langs->trans("List"), 1, $user->rights->don->lire); - if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->rights->don->lire); + // if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->rights->don->lire); } // Taxes and social contributions diff --git a/htdocs/don/card.php b/htdocs/don/card.php index 8f33ee7fb1b..d3ce60a5381 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -214,7 +214,7 @@ if ($action == 'set_cancel') } if ($action == 'set_paid') { - if ($object->set_paye($id, $modepayment) >= 0) + if ($object->set_paid($id, $modepayment) >= 0) { header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); exit; @@ -223,17 +223,6 @@ if ($action == 'set_paid') setEventMessage($object->error, 'errors'); } } -if ($action == 'set_encaisse') -{ - if ($object->set_encaisse($id) >= 0) - { - header("Location: ".$_SERVER['PHP_SELF']."?id=".$id); - exit; - } - else { - setEventMessage($object->error, 'errors'); - } -} /* * Build doc @@ -398,6 +387,7 @@ if (! empty($id) && $action == 'edit') print ''; print ''; + print ''; // Ref print "".''.$langs->trans("Ref").''; @@ -408,13 +398,22 @@ if (! empty($id) && $action == 'edit') $nbrows=12; if (! empty($conf->projet->enabled)) $nbrows++; - // Date + // Date print "".''.$langs->trans("Date").''; $form->select_date($object->date,'','','','',"update"); print ''; // Amount - print "".''.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->currency).''; + if ($object->statut == 0) + { + print "".''.$langs->trans("Amount").' '.$langs->trans("Currency".$conf->currency).''; + } + else + { + print ''.$langs->trans("Amount").''; + print price($object->amount,0,$langs,0,0,-1,$conf->currency); + print ''; + } print ''.$langs->trans("PublicDonation").""; print $form->selectyesno("public",1,1); @@ -549,7 +548,7 @@ if (! empty($id) && $action != 'edit') /* * Payments */ - $sql = "SELECT p.rowid, p.num_payment, datep as dp, p.amount,"; + $sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount,"; $sql.= "c.code as type_code,c.libelle as paiement_type"; $sql.= " FROM ".MAIN_DB_PREFIX."payment_donation as p"; $sql.= ", ".MAIN_DB_PREFIX."c_paiement as c "; @@ -558,7 +557,7 @@ if (! empty($id) && $action != 'edit') $sql.= " AND p.fk_donation = d.rowid"; $sql.= " AND d.entity = ".$conf->entity; $sql.= " AND p.fk_typepayment = c.id"; - $sql.= " ORDER BY dp DESC"; + $sql.= " ORDER BY dp"; //print $sql; $resql = $db->query($sql); @@ -581,7 +580,7 @@ if (! empty($id) && $action != 'edit') $objp = $db->fetch_object($resql); $var=!$var; print ""; - print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''; + print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''; print ''.dol_print_date($db->jdate($objp->dp),'day')."\n"; $labeltype=$langs->trans("PaymentType".$object->type_code)!=("PaymentType".$object->type_code)?$langs->trans("PaymentType".$object->type_code):$object->paiement_type; print "".$labeltype.' '.$object->num_paiement."\n"; diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index c4f9d66a3ec..ce041351eed 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -718,7 +718,7 @@ class Don extends CommonObject { $sql .= ", fk_payment=$modepayment"; } - $sql .= " WHERE rowid = $rowid AND fk_statut = 1"; + $sql .= " WHERE rowid = $id AND fk_statut = 1"; $resql=$this->db->query($sql); if ($resql) @@ -809,7 +809,7 @@ class Don extends CommonObject $result=''; $label=$langs->trans("ShowDonation").': '.$this->id; - $link = ''; + $link = ''; $linkend=''; $picto='generic'; diff --git a/htdocs/don/class/donationstats.class.php b/htdocs/don/class/donstats.class.php similarity index 100% rename from htdocs/don/class/donationstats.class.php rename to htdocs/don/class/donstats.class.php diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php index 4a42c677ec9..a6c56f9f235 100644 --- a/htdocs/don/class/paymentdonation.class.php +++ b/htdocs/don/class/paymentdonation.class.php @@ -82,14 +82,14 @@ class PaymentDonation extends CommonObject } // Clean parameters - if (isset($this->fk_donation)) $this->fk_donation=trim($this->fk_donation); - if (isset($this->amount)) $this->amount=trim($this->amount); - if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment); - if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); - if (isset($this->note)) $this->note=trim($this->note); - if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); - if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); - if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); + if (isset($this->fk_donation)) $this->fk_donation=trim($this->fk_donation); + if (isset($this->amount)) $this->amount=trim($this->amount); + if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment); + if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); + if (isset($this->note)) $this->note=trim($this->note); + if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); + if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); + if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); $totalamount = 0; foreach ($this->amounts as $key => $value) // How payment is dispatch @@ -183,23 +183,23 @@ class PaymentDonation extends CommonObject $this->id = $obj->rowid; $this->ref = $obj->rowid; - $this->fk_donation = $obj->fk_donation; - $this->datec = $this->db->jdate($obj->datec); - $this->tms = $this->db->jdate($obj->tms); - $this->datep = $this->db->jdate($obj->datep); - $this->amount = $obj->amount; - $this->fk_typepayment = $obj->fk_typepayment; - $this->num_payment = $obj->num_payment; - $this->note = $obj->note; - $this->fk_bank = $obj->fk_bank; - $this->fk_user_creat = $obj->fk_user_creat; - $this->fk_user_modif = $obj->fk_user_modif; + $this->fk_donation = $obj->fk_donation; + $this->datec = $this->db->jdate($obj->datec); + $this->tms = $this->db->jdate($obj->tms); + $this->datep = $this->db->jdate($obj->datep); + $this->amount = $obj->amount; + $this->fk_typepayment = $obj->fk_typepayment; + $this->num_payment = $obj->num_payment; + $this->note = $obj->note; + $this->fk_bank = $obj->fk_bank; + $this->fk_user_creat = $obj->fk_user_creat; + $this->fk_user_modif = $obj->fk_user_modif; - $this->type_code = $obj->type_code; - $this->type_libelle = $obj->type_libelle; + $this->type_code = $obj->type_code; + $this->type_libelle = $obj->type_libelle; - $this->bank_account = $obj->fk_account; - $this->bank_line = $obj->fk_bank; + $this->bank_account = $obj->fk_account; + $this->bank_line = $obj->fk_bank; } $this->db->free($resql); @@ -227,14 +227,14 @@ class PaymentDonation extends CommonObject // Clean parameters - if (isset($this->fk_donation)) $this->fk_donation=trim($this->fk_donation); - if (isset($this->amount)) $this->amount=trim($this->amount); - if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment); - if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); - if (isset($this->note)) $this->note=trim($this->note); - if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); - if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); - if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); + if (isset($this->fk_donation)) $this->fk_donation=trim($this->fk_donation); + if (isset($this->amount)) $this->amount=trim($this->amount); + if (isset($this->fk_typepayment)) $this->fk_typepayment=trim($this->fk_typepayment); + if (isset($this->num_payment)) $this->num_payment=trim($this->num_payment); + if (isset($this->note)) $this->note=trim($this->note); + if (isset($this->fk_bank)) $this->fk_bank=trim($this->fk_bank); + if (isset($this->fk_user_creat)) $this->fk_user_creat=trim($this->fk_user_creat); + if (isset($this->fk_user_modif)) $this->fk_user_modif=trim($this->fk_user_modif); @@ -482,14 +482,14 @@ class PaymentDonation extends CommonObject $acc->fetch($accountid); $total=$this->total; - if ($mode == 'payment_donation') $total=-$total; + if ($mode == 'payment_donation') $amount=$total; // Insert payment into llx_bank $bank_line_id = $acc->addline( $this->datepaid, $this->paymenttype, // Payment mode id or code ("CHQ or VIR for example") $label, - $total, + $amount, $this->num_payment, '', $user, @@ -520,19 +520,6 @@ class PaymentDonation extends CommonObject dol_print_error($this->db); } } - - // Add link 'thirdparty' in bank_url between donation and bank transaction (for each donation concerned by payment) - $linkaddedforthirdparty=array(); - foreach ($this->amounts as $key => $value) - { - if ($mode == 'payment_donation') - { - $don = new Don($this->db); - $don->fetch($key); - $result=$acc->add_url_line($bank_line_id, $don->rowid, DOL_URL_ROOT.'/don/card.php?rowid=', $don->type_libelle.(($don->lib && $don->lib!=$don->type_libelle)?' ('.$don->lib.')':''),'donation'); - if ($result <= 0) dol_print_error($this->db); - } - } } else { @@ -553,7 +540,7 @@ class PaymentDonation extends CommonObject /** - * Mise a jour du lien entre le paiement de charge et la ligne dans llx_bank generee + * Update link between the donation payment and the generated line in llx_bank * * @param int $id_bank Id if bank * @return int >0 if OK, <=0 if KO @@ -593,7 +580,7 @@ class PaymentDonation extends CommonObject if (!empty($this->id)) { - $link = ''; + $link = ''; $linkend=''; if ($withpicto) $result.=($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' '); diff --git a/htdocs/don/document.php b/htdocs/don/document.php deleted file mode 100644 index 200e4180252..00000000000 --- a/htdocs/don/document.php +++ /dev/null @@ -1,125 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/** - * \file htdocs/don/document.php - * \ingroup donations - * \brief Page of linked files into donations - */ - -require '../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; -require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; - -$langs->load("other"); -$langs->load("donations"); -$langs->load("companies"); -$langs->load("interventions"); - -$id = GETPOST('id','int'); -$ref = GETPOST('ref', 'alpha'); -$action = GETPOST('action','alpha'); -$confirm = GETPOST('confirm','alpha'); - -// Security check -if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'don', $id, ''); - -// Get parameters -$sortfield = GETPOST('sortfield','alpha'); -$sortorder = GETPOST('sortorder','alpha'); -$page = GETPOST('page','int'); -if ($page == -1) { $page = 0; } -$offset = $conf->liste_limit * $page; -$pageprev = $page - 1; -$pagenext = $page + 1; -if (! $sortorder) $sortorder="ASC"; -if (! $sortfield) $sortfield="name"; - -$object = new Don($db); -$object->fetch($id, $ref); - -$upload_dir = $conf->dons->dir_output.'/'.dol_sanitizeFileName($object->ref); -$modulepart='don'; - - -/* - * Actions - */ - -include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; - - -/* - * View - */ - -$form = new Form($db); - -llxHeader("","",$langs->trans("Don")); - - -if ($object->id) -{ - $object->fetch_thirdparty(); - - $head=donation_prepare_head($object); - - dol_fiche_head($head, 'documents', $langs->trans("Don"), 0, 'bill'); - - - // Built files list - $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); - $totalsize=0; - foreach($filearray as $key => $file) - { - $totalsize+=$file['size']; - } - - - print ''; - - $linkback = ''.$langs->trans("BackToList").''; - - // Ref - print ''; - - print ''; - print ''; - print '
    '.$langs->trans("Ref").''; - print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', ''); - print '
    '.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
    '.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
    '; - - print ''; - - $modulepart = 'don'; - $permission = $user->rights->don->creer; - $param = '&id=' . $object->id; - include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; - -} -else -{ - print $langs->trans("ErrorUnknown"); -} - -llxFooter(); - -$db->close(); diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php index 5cdb7f20446..4c59f566ba5 100644 --- a/htdocs/don/payment/card.php +++ b/htdocs/don/payment/card.php @@ -126,7 +126,7 @@ $head[$h][1] = $langs->trans("Card"); $hselected = $h; $h++; -dol_fiche_head($head, $hselected, $langs->trans("PaymentDonation"), 0, 'payment'); +dol_fiche_head($head, $hselected, $langs->trans("DonationPayment"), 0, 'payment'); /* * Confirmation de la suppression du paiement @@ -151,19 +151,19 @@ if ($action == 'valide') print ''; // Ref -print ''; +print ''; print ''; // Date -print ''; +print ''; // Mode print ''; // Number -print ''; +print ''; // Amount print ''; @@ -196,7 +196,7 @@ print '
    '.$langs->trans('Ref').'
    '.$langs->trans('Ref').''; print $form->showrefnav($payment,'id','',1,'rowid','id'); print '
    '.$langs->trans('Date').''.dol_print_date($payment->datep,'day').'
    '.$langs->trans('Date').''.dol_print_date($payment->datep,'day').'
    '.$langs->trans('Mode').''.$langs->trans("PaymentType".$payment->type_code).'
    '.$langs->trans('Number').''.$payment->num_paiement.'
    '.$langs->trans('Number').''.$payment->num_payment.'
    '.$langs->trans('Amount').''.price($payment->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'
    '; */ $disable_delete = 0; -$sql = 'SELECT d.rowid as did, d.libelle, d.paid, d.amount as d_amount, pd.amount, pd.libelle as d_type'; +$sql = 'SELECT d.rowid as did, d.paid, d.amount as d_amount, pd.amount'; $sql.= ' FROM '.MAIN_DB_PREFIX.'payment_donation as pd,'.MAIN_DB_PREFIX.'don as d'; $sql.= ' WHERE pd.fk_donation = d.rowid'; $sql.= ' AND d.entity = '.$conf->entity; @@ -213,9 +213,7 @@ if ($resql) print '
    '; print ''; print ''; - print ''; - print ''; - print ''; + print ''; print ''; print ''; print "\n"; @@ -235,13 +233,6 @@ if ($resql) $don->fetch($objp->did); print $don->getNomUrl(1); print "\n"; - // Type - print '\n"; - // Label - print ''; // Expected to pay print ''; // Status diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php index 798b1b5a392..91f4465f376 100644 --- a/htdocs/don/stats/index.php +++ b/htdocs/don/stats/index.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2003 Rodolphe Quiedeville * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -25,7 +26,7 @@ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; -require_once DOL_DOCUMENT_ROOT.'/don/class/dontats.class.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/donstats.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php'; $WIDTH=DolGraph::getDefaultGraphSizeForStats('width'); diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index 627cc9a076c..8b4c2ca8756 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -40,3 +40,4 @@ FrenchOptions=Options for France DONATION_ART200=Show article 200 from CGI if you are concerned DONATION_ART238=Show article 238 from CGI if you are concerned DONATION_ART885=Show article 885 from CGI if you are concerned +DonationPayment=Donation payment From c733249c7583dfd3bbe0cfa241d9d86d181276a6 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 29 Mar 2015 09:23:39 +0200 Subject: [PATCH 242/412] Don Remove old file --- htdocs/don/admin/index.php | 117 ------------------------------------- 1 file changed, 117 deletions(-) delete mode 100644 htdocs/don/admin/index.php diff --git a/htdocs/don/admin/index.php b/htdocs/don/admin/index.php deleted file mode 100644 index 78ff3b48f9a..00000000000 --- a/htdocs/don/admin/index.php +++ /dev/null @@ -1,117 +0,0 @@ - - * - * 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 - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/** - * \file htdocs/admin/index.php - * \ingroup Donations - * \brief Setup page to configure donations module - */ - -require '../main.inc.php'; - -// Class -require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; - -$langs->load("admin"); -$langs->load("donations"); - -// Security check -if (!$user->admin) - accessforbidden(); - -$action = GETPOST('action', 'alpha'); - -// Other parameters DONATIONS_* -$list = array ( - 'DONATIONS_ACCOUNTING_ACCOUNT_PRODUCT' -); - -/* - * Actions - */ - -if ($action == 'update') -{ - $error = 0; - - foreach ($list as $constname) { - $constvalue = GETPOST($constname, 'alpha'); - - if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) { - $error++; - } - } - - if (! $error) - { - setEventMessage($langs->trans("SetupSaved")); - } - else - { - setEventMessage($langs->trans("Error"),'errors'); - } -} - -/* - * View - */ - -llxHeader('',$langs->trans('DonationsSetup')); - -$form = new Form($db); - -$linkback=''.$langs->trans("BackToModuleList").''; -print_fiche_titre($langs->trans('DonationsSetup'),$linkback,'setup'); - -print ''; -print ''; -print ''; - -/* - * Params - */ -print '
    '.$langs->trans('Donation').''.$langs->trans('Type').''.$langs->trans('Label').''.$langs->trans('ExpectedToPay').''.$langs->trans('ExpectedToPay').''.$langs->trans('Status').''.$langs->trans('PayedByThisPayment').'
    '; - print $don->type_libelle; - /*print $don->type;*/ - print "'.$objp->libelle.''.price($objp->d_amount).'
    '; -print ''; -print ''; -print "\n"; - -foreach ($list as $key) -{ - $var=!$var; - - print ''; - - // Param - $label = $langs->trans($key); - print ''; - - // Value - print ''; -} - -print ''; - -print ''; -print "
    ' . $langs->trans('Options') . '
    '; - print ''; - print '
    \n"; - -print '
    '; - -llxFooter(); -$db->close(); \ No newline at end of file From bf3e78a63df84025b1bfda7ce16b254ebfc31312 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Sun, 29 Mar 2015 11:39:55 +0200 Subject: [PATCH 243/412] Debug payment loan --- htdocs/loan/class/loan.class.php | 2 +- htdocs/loan/class/paymentloan.class.php | 30 ++--- htdocs/loan/note.php | 3 +- htdocs/loan/payment/payment.php | 163 +++++++++--------------- 4 files changed, 76 insertions(+), 122 deletions(-) diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index cf58bb1d2c4..c2c0bba6381 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2014 Alexandre Spangaro * Copyright (C) 2015 Frederic France * * This program is free software; you can redistribute it and/or modify diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php index 41b64bcd865..a4e5aa4ad61 100644 --- a/htdocs/loan/class/paymentloan.class.php +++ b/htdocs/loan/class/paymentloan.class.php @@ -86,24 +86,18 @@ class PaymentLoan extends CommonObject // Clean parameters if (isset($this->fk_loan)) $this->fk_loan = trim($this->fk_loan); - if (isset($this->amount_capital)) $this->amount_capital = trim($this->amount_capital); - if (isset($this->amount_insurance)) $this->amount_insurance = trim($this->amount_insurance); - if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest); + if (isset($this->amount_capital)) $this->amount_capital = trim($this->amount_capital?$this->amount_capital:0); + if (isset($this->amount_insurance)) $this->amount_insurance = trim($this->amount_insurance?$this->amount_insurance:0); + if (isset($this->amount_interest)) $this->amount_interest = trim($this->amount_interest?$this->amount_interest:0); if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment); if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment); - if (isset($this->note_private)) $this->note = trim($this->note_private); - if (isset($this->note_public)) $this->note = trim($this->note_public); + if (isset($this->note_private)) $this->note_private = trim($this->note_private); + if (isset($this->note_public)) $this->note_public = trim($this->note_public); if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank); if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat); if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif); - $totalamount = 0; - foreach ($this->amounts as $key => $value) // How payment is dispatch - { - $newvalue = price2num($value,'MT'); - $this->amounts[$key] = $newvalue; - $totalamount += $newvalue; - } + $totalamount = $this->amount_capital + $this->amount_insurance + $this->amount_interest; $totalamount = price2num($totalamount); // Check parameters @@ -118,7 +112,9 @@ class PaymentLoan extends CommonObject $sql.= " fk_typepayment, num_payment, note_private, note_public, fk_user_creat, fk_bank)"; $sql.= " VALUES (".$this->chid.", '".$this->db->idate($now)."',"; $sql.= " '".$this->db->idate($this->datepaid)."',"; - $sql.= " ".$totalamount.","; + $sql.= " ".$this->amount_capital.","; + $sql.= " ".$this->amount_insurance.","; + $sql.= " ".$this->amount_interest.","; $sql.= " ".$this->paymenttype.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', '".$this->db->escape($this->note_public)."', ".$user->id.","; $sql.= " 0)"; @@ -145,7 +141,7 @@ class PaymentLoan extends CommonObject } else { - $this->error=$this->db->error(); + $this->error=$this->db->lasterror(); $this->db->rollback(); return -1; } @@ -190,8 +186,8 @@ class PaymentLoan extends CommonObject { $obj = $this->db->fetch_object($resql); - $this->id = $obj->rowid; - $this->ref = $obj->rowid; + $this->id = $obj->rowid; + $this->ref = $obj->rowid; $this->fk_loan = $obj->fk_loan; $this->datec = $this->db->jdate($obj->datec); @@ -509,7 +505,7 @@ class PaymentLoan extends CommonObject * @param int $maxlen Max length label * @return string Chaine with URL */ - function getNameUrl($withpicto=0,$maxlen=0) + function getNomUrl($withpicto=0,$maxlen=0) { global $langs; diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php index a87cd3870d8..28f2a0f4918 100644 --- a/htdocs/loan/note.php +++ b/htdocs/loan/note.php @@ -40,7 +40,7 @@ $result = restrictedArea($user, 'loan', $id, '&loan'); $object = new Loan($db); if ($id > 0) $object->fetch($id); -$permissionnote=$user->rights->loan->read; // Used by the include of actions_setnotes.inc.php +$permissionnote=$user->rights->loan->write; // Used by the include of actions_setnotes.inc.php /* @@ -88,6 +88,7 @@ if ($id > 0) print '
    '; $colwidth='25'; + $permission = $user->rights->loan->write; // Used by the include of notes.tpl.php include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index 52921bc6b18..ece4a5e0271 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -32,7 +32,6 @@ $langs->load("loan"); $chid=GETPOST('id','int'); $action=GETPOST('action'); -$amounts = array(); $cancel=GETPOST('cancel','alpha'); // Security check @@ -58,7 +57,7 @@ if ($action == 'add_payment') $datepaid = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); - if (! $_POST["paymenttype"] > 0) + if (! GETPOST('paymenttype', 'int') > 0) { setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("PaymentMode")), 'errors'); $error++; @@ -68,7 +67,7 @@ if ($action == 'add_payment') setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Date")), 'errors'); $error++; } - if (! empty($conf->banque->enabled) && ! $_POST["accountid"] > 0) + if (! empty($conf->banque->enabled) && ! GETPOST('accountid', 'int') > 0) { setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("AccountToCredit")), 'errors'); $error++; @@ -78,17 +77,8 @@ if ($action == 'add_payment') { $paymentid = 0; - // Read possible payments - foreach ($_POST as $key => $value) - { - if (substr($key,0,7) == 'amount_') - { - $other_chid = substr($key,7); - $amounts[$other_chid] = price2num($_POST[$key]); - } - } - - if (count($amounts) <= 0) + $amount = GETPOST('amount_capital') + GETPOST('amount_insurance') + GETPOST('amount_interest'); + if ($amount == 0) { setEventMessage($langs->trans('ErrorNoPaymentDefined'), 'errors'); $error++; @@ -102,7 +92,6 @@ if ($action == 'add_payment') $payment = new PaymentLoan($db); $payment->chid = $chid; $payment->datepaid = $datepaid; - $payment->amounts = $amounts; // Tableau de montant $payment->amount_capital = GETPOST('amount_capital'); $payment->amount_insurance = GETPOST('amount_insurance'); $payment->amount_interest = GETPOST('amount_interest'); @@ -123,7 +112,7 @@ if ($action == 'add_payment') if (! $error) { - $result=$payment->addPaymentToBank($user, 'payment_loan', '(LoanPayment)', GETPOST('accountid', 'int'), '', ''); + $result = $payment->addPaymentToBank($user, 'payment_loan', '(LoanPayment)', GETPOST('accountid', 'int'), '', ''); if (! $result > 0) { setEventMessage($payment->error, 'errors'); @@ -185,9 +174,9 @@ if ($_GET["action"] == 'create') print ''.$langs->trans("Label").''.$loan->label."\n"; print ''.$langs->trans("Amount").''.price($loan->capital,0,$outputlangs,1,-1,-1,$conf->currency).''; - $sql = "SELECT sum(p.amount) as total"; - $sql.= " FROM ".MAIN_DB_PREFIX."payment_loan as p"; - $sql.= " WHERE p.fk_loan = ".$chid; + $sql = "SELECT SUM(amount_capital + amount_insurance + amount_interest) as total"; + $sql.= " FROM ".MAIN_DB_PREFIX."payment_loan"; + $sql.= " WHERE fk_loan = ".$chid; $resql = $db->query($sql); if ($resql) { @@ -195,23 +184,23 @@ if ($_GET["action"] == 'create') $sumpaid = $obj->total; $db->free(); } - print ''.$langs->trans("AlreadyPaid").''.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).''; - print ''.$langs->trans("RemainderToPay").''.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).''; + print ''.$langs->trans("AlreadyPaid").''.price($sumpaid, 0, $outputlangs, 1, -1, -1, $conf->currency).''; + print ''.$langs->trans("RemainderToPay").''.price($total-$sumpaid, 0, $outputlangs, 1, -1, -1, $conf->currency).''; print ''; print ''; - + print '
    '; - + print ''; print ''; print ''; print ''; print '"; print ''; @@ -227,7 +216,7 @@ if ($_GET["action"] == 'create') print ''; // Number - print ''; print ''."\n"; @@ -245,12 +234,6 @@ if ($_GET["action"] == 'create') print '
    '; - /* - * Other loan unpaid - */ - $num = 1; - $i = 0; - print '
    '.$langs->trans("Payment").'
    '.$langs->trans("Date").''; - $datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); + $datepaid = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int')); $datepayment = empty($conf->global->MAIN_AUTOFILL_DATE)?(empty($_POST["remonth"])?-1:$datepaye):0; - $form->select_date($datepayment,'','','','',"add_payment",1,1); + $form->select_date($datepayment, '', '', '', '', "add_payment", 1, 1); print "
    '.$langs->trans('Number'); + print '
    '.$langs->trans('Numero'); print ' ('.$langs->trans("ChequeOrTransferNumber").')'; print '
    '; print ''; print ''; @@ -261,83 +244,57 @@ if ($_GET["action"] == 'create') print "\n"; $var=True; - $total=0; - $totalrecu=0; - while ($i < $num) + + print ""; + + if ($loan->datestart > 0) { - $objp = $loan; - - $var=!$var; - - print ""; - - if ($objp->datestart > 0) - { - print ''; - } - else - { - print ''; - } - - print '"; - - print '"; - - print '"; - - print '"; - - print "\n"; - $total+=$objp->total; - $total_ttc+=$objp->total_ttc; - $totalrecu+=$objp->am; - $i++; + print ''; } - if ($i > 1) + else { - // Print total - print ""; - print ''; - print ''; - print ''; - print ''; - print ''; - print "\n"; + print ''; } - print "
    '.$langs->trans("DateDue").'
    '.dol_print_date($objp->datestart,'day').'!!!'.price($objp->capital)."'.price($sumpaid)."'.price($objp->capital - $sumpaid)."'; - if ($sumpaid < $objp->capital) - { - $namec = "amount_capital_".$objp->id; - print $langs->trans("Capital") .': '; - } - else - { - print '-'; - } - print '
    '; - if ($sumpaid < $objp->capital) - { - $namea = "amount_insurance_".$objp->id; - print $langs->trans("Insurance") .': '; - } - else - { - print '-'; - } - print '
    '; - if ($sumpaid < $objp->capital) - { - $namei = "amount_interest_".$objp->id; - print $langs->trans("Interest") .': '; - } - else - { - print '-'; - } - print "
    '.dol_print_date($loan->datestart,'day').'
    '.$langs->trans("Total").':"'.price($total_ttc).'""'.price($totalrecu).'""'.price($total_ttc - $totalrecu).'" 
    !!!
    "; + print ''.price($loan->capital).""; + + print ''.price($sumpaid).""; + + print ''.price($loan->capital - $sumpaid).""; + + print ''; + if ($sumpaid < $loan->capital) + { + print $langs->trans("Capital") .': '; + } + else + { + print '-'; + } + print '
    '; + if ($sumpaid < $loan->capital) + { + print $langs->trans("Insurance") .': '; + } + else + { + print '-'; + } + print '
    '; + if ($sumpaid < $loan->capital) + { + print $langs->trans("Interest") .': '; + } + else + { + print '-'; + } + print ""; + + print "\n"; + + print ''; print '
    '; From 7b9ba4bd26313a3010cb02552e9fa33ebf61e032 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Sun, 29 Mar 2015 13:37:17 +0200 Subject: [PATCH 244/412] debug payment --- htdocs/loan/class/paymentloan.class.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php index a4e5aa4ad61..5c24621d802 100644 --- a/htdocs/loan/class/paymentloan.class.php +++ b/htdocs/loan/class/paymentloan.class.php @@ -445,16 +445,11 @@ class PaymentLoan extends CommonObject } // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment) - $linkaddedforthirdparty=array(); - foreach ($this->amounts as $key => $value) + //$linkaddedforthirdparty=array(); + if ($mode == 'payment_loan') { - if ($mode == 'payment_loan') - { - $loan = new Loan($this->db); - $loan->fetch($key); - $result=$acc->add_url_line($bank_line_id, $loan->id, DOL_URL_ROOT.'/loan/card.php?id=', $loan->type_libelle.(($loan->lib && $loan->lib!=$loan->type_libelle)?' ('.$loan->lib.')':''),'loan'); - if ($result <= 0) dol_print_error($this->db); - } + $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/loan/card.php?id=', $this->type_libelle.(($this->label && $this->label!=$this->type_libelle)?' ('.$this->label.')':''),'loan'); + if ($result <= 0) dol_print_error($this->db); } } else From ed493b651b8b6719064d1b6d929476dd75dde2a4 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 29 Mar 2015 14:29:53 +0200 Subject: [PATCH 245/412] Icons & fr_FR options not show --- htdocs/don/admin/donation.php | 5 +++-- htdocs/don/admin/donation_extrafields.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php index 41ea0a3d542..b7fb9c2b74a 100644 --- a/htdocs/don/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -184,7 +184,7 @@ print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup'); $head = donation_admin_prepare_head(); -dol_fiche_head($head, 'general', $langs->trans("Donations"), 0, 'donation'); +dol_fiche_head($head, 'general', $langs->trans("Donations"), 0, 'payment'); /* * Params @@ -215,7 +215,8 @@ print ''; /* * French params */ -if (preg_match('/fr/i',$outputlangs->defaultlang)) +print $outputlangs->defaultlang; +if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY)) { print '
    '; print_titre($langs->trans("FrenchOptions")); diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php index 6c964b46321..2d08c36873f 100644 --- a/htdocs/don/admin/donation_extrafields.php +++ b/htdocs/don/admin/donation_extrafields.php @@ -66,7 +66,7 @@ print_fiche_titre($langs->trans("DonationsSetup"),$linkback,'setup'); $head = donation_admin_prepare_head(); -dol_fiche_head($head, 'attributes', $langs->trans("Donations"), 0, 'donation'); +dol_fiche_head($head, 'attributes', $langs->trans("Donations"), 0, 'payment'); require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; From 96b7cac93fac2c2dc43862ecc8804cb220ad8bf8 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 29 Mar 2015 14:30:43 +0200 Subject: [PATCH 246/412] Delete useless line --- htdocs/don/admin/donation.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php index b7fb9c2b74a..af00f2dbbcc 100644 --- a/htdocs/don/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -215,7 +215,6 @@ print ''; /* * French params */ -print $outputlangs->defaultlang; if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY)) { print '
    '; From a715ccfcb8a20b74ff44f9073da0d6f13f7a7f88 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 29 Mar 2015 15:11:41 +0200 Subject: [PATCH 247/412] Fixed: HRM menu is not activated when only Expense Report module is activated --- htdocs/core/menus/init_menu_auguria.sql | 2 +- htdocs/core/menus/standard/eldy.lib.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index c385eaab4bf..270774c6464 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -17,7 +17,7 @@ insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, left insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project', '', 0, '/projet/index.php?mainmenu=project&leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 70, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('mailing|export|import|opensurvey', '$conf->mailing->enabled || $conf->export->enabled || $conf->import->enabled || $conf->opensurvey->enabled', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools', '', 0, '/core/tools.php?mainmenu=tools&leftmenu=', 'Tools', -1, 'other', '$user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run || $user->rights->opensurvey->read', '', 2, 90, __ENTITY__); insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('adherent', '$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members', '', 0, '/adherents/index.php?mainmenu=members&leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 110, __ENTITY__); -insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('hrm', '$conf->holiday->enabled || $conf->deplacement->enabled', 15__+MAX_llx_menu__, __HANDLER__, 'top', 'hrm', '', 0, '/compta/hrm.php?mainmenu=hrm&leftmenu=', 'HRM', -1, 'holiday', '$user->rights->holiday->write || $user->rights->deplacement->lire', '', 0, 80, __ENTITY__); +insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('hrm', '$conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled', 15__+MAX_llx_menu__, __HANDLER__, 'top', 'hrm', '', 0, '/compta/hrm.php?mainmenu=hrm&leftmenu=', 'HRM', -1, 'holiday', '$user->rights->holiday->write || $user->rights->deplacement->lire || $user->rights->expensereport->lire', '', 0, 80, __ENTITY__); -- Home - Setup insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', 'setup', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 32fc9a07aed..6cf203bbc89 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -196,9 +196,9 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) } // HRM - $tmpentry=array('enabled'=>(! empty($conf->holiday->enabled) || ! empty($conf->deplacement->enabled)), - 'perms'=>(! empty($user->rights->holiday->write) || ! empty($user->rights->deplacement->lire)), - 'module'=>'holiday|deplacement'); + $tmpentry=array('enabled'=>(! empty($conf->holiday->enabled) || ! empty($conf->deplacement->enabled) || ! empty($conf->expensereport->enabled)), + 'perms'=>(! empty($user->rights->holiday->write) || ! empty($user->rights->deplacement->lire) || ! empty($user->rights->expensereport->lire)), + 'module'=>'holiday|deplacement|expensereport'); $showmode=dol_eldy_showmenu($type_user, $tmpentry, $listofmodulesforexternal); if ($showmode) { From 018a0d779f0b63dc931fc7d9087add1da1dd38c4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Mar 2015 15:18:10 +0200 Subject: [PATCH 248/412] Fix translation --- htdocs/langs/en_US/admin.lang | 4 +- htdocs/langs/en_US/categories.lang | 152 ++++++++++++++--------------- htdocs/langs/en_US/main.lang | 4 +- 3 files changed, 79 insertions(+), 81 deletions(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index b70f9fa8a84..353deba7c88 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -492,8 +492,8 @@ Module1200Name=Mantis Module1200Desc=Mantis integration Module1400Name=Accounting Module1400Desc=Accounting management (double parties) -Module1780Name=Categories -Module1780Desc=Category management (products, suppliers and customers) +Module1780Name=Tags/Categories +Module1780Desc=Create tags/category on products, customers, suppliers, contacts or members Module2000Name=WYSIWYG editor Module2000Desc=Allow to edit some text area using an advanced editor Module2300Name=Cron diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang index 7a3c7f0c288..11b1dc8eac0 100644 --- a/htdocs/langs/en_US/categories.lang +++ b/htdocs/langs/en_US/categories.lang @@ -1,64 +1,62 @@ # Dolibarr language file - Source file is en_US - categories -Category=Category -Categories=Categories -Rubrique=Category -Rubriques=Categories -categories=categories -TheCategorie=The category -NoCategoryYet=No category of this type created +Rubrique=Tag/Category +Rubriques=Tags/Categories +categories=tags/categories +TheCategorie=The tag/category +NoCategoryYet=No tag/category of this type created In=In AddIn=Add in modify=modify Classify=Classify -CategoriesArea=Categories area -ProductsCategoriesArea=Products/Services categories area -SuppliersCategoriesArea=Suppliers categories area -CustomersCategoriesArea=Customers categories area -ThirdPartyCategoriesArea=Third parties categories area -MembersCategoriesArea=Members categories area -ContactsCategoriesArea=Contacts categories area -MainCats=Main categories +CategoriesArea=Tags/Categories area +ProductsCategoriesArea=Products/Services tags/categories area +SuppliersCategoriesArea=Suppliers tags/categories area +CustomersCategoriesArea=Customers tags/categories area +ThirdPartyCategoriesArea=Third parties tags/categories area +MembersCategoriesArea=Members tags/categories area +ContactsCategoriesArea=Contacts tags/categories area +MainCats=Main tags/categories SubCats=Subcategories CatStatistics=Statistics -CatList=List of categories -AllCats=All categories -ViewCat=View category -NewCat=Add category -NewCategory=New category -ModifCat=Modify category -CatCreated=Category created -CreateCat=Create category -CreateThisCat=Create this category +CatList=List of tags/categories +AllCats=All tags/categories +ViewCat=View tag/category +NewCat=Add tag/category +NewCategory=New tag/category +ModifCat=Modify tag/category +CatCreated=Tag/category created +CreateCat=Create tag/category +CreateThisCat=Create this tag/category ValidateFields=Validate the fields NoSubCat=No subcategory. SubCatOf=Subcategory -FoundCats=Found categories -FoundCatsForName=Categories found for the name : -FoundSubCatsIn=Subcategories found in the category -ErrSameCatSelected=You selected the same category several times -ErrForgotCat=You forgot to choose the category +FoundCats=Found tags/categories +FoundCatsForName=Tags/categories found for the name : +FoundSubCatsIn=Subcategories found in the tag/category +ErrSameCatSelected=You selected the same tag/category several times +ErrForgotCat=You forgot to choose the tag/category ErrForgotField=You forgot to inform the fields ErrCatAlreadyExists=This name is already used -AddProductToCat=Add this product to a category? -ImpossibleAddCat=Impossible to add the category -ImpossibleAssociateCategory=Impossible to associate the category to +AddProductToCat=Add this product to a tag/category? +ImpossibleAddCat=Impossible to add the tag/category +ImpossibleAssociateCategory=Impossible to associate the tag/category to WasAddedSuccessfully=%s was added successfully. -ObjectAlreadyLinkedToCategory=Element is already linked to this category. -CategorySuccessfullyCreated=This category %s has been added with success. -ProductIsInCategories=Product/service owns to following categories -SupplierIsInCategories=Third party owns to following suppliers categories -CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories -CompanyIsInSuppliersCategories=This third party owns to following suppliers categories -MemberIsInCategories=This member owns to following members categories -ContactIsInCategories=This contact owns to following contacts categories -ProductHasNoCategory=This product/service is not in any categories -SupplierHasNoCategory=This supplier is not in any categories -CompanyHasNoCategory=This company is not in any categories -MemberHasNoCategory=This member is not in any categories -ContactHasNoCategory=This contact is not in any categories -ClassifyInCategory=Classify in category +ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category. +CategorySuccessfullyCreated=This tag/category %s has been added with success. +ProductIsInCategories=Product/service owns to following tags/categories +SupplierIsInCategories=Third party owns to following suppliers tags/categories +CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories +CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories +MemberIsInCategories=This member owns to following members tags/categories +ContactIsInCategories=This contact owns to following contacts tags/categories +ProductHasNoCategory=This product/service is not in any tags/categories +SupplierHasNoCategory=This supplier is not in any tags/categories +CompanyHasNoCategory=This company is not in any tags/categories +MemberHasNoCategory=This member is not in any tags/categories +ContactHasNoCategory=This contact is not in any tags/categories +ClassifyInCategory=Classify in tag/category NoneCategory=None -NotCategorized=Without category +NotCategorized=Without tag/category CategoryExistsAtSameLevel=This category already exists with this ref ReturnInProduct=Back to product/service card ReturnInSupplier=Back to supplier card @@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card ContentsVisibleByAll=The contents will be visible by all ContentsVisibleByAllShort=Contents visible by all ContentsNotVisibleByAllShort=Contents not visible by all -CategoriesTree=Categories tree -DeleteCategory=Delete category -ConfirmDeleteCategory=Are you sure you want to delete this category ? -RemoveFromCategory=Remove link with categorie -RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ? -NoCategoriesDefined=No category defined -SuppliersCategoryShort=Suppliers category -CustomersCategoryShort=Customers category -ProductsCategoryShort=Products category -MembersCategoryShort=Members category -SuppliersCategoriesShort=Suppliers categories -CustomersCategoriesShort=Customers categories +CategoriesTree=Tags/categories tree +DeleteCategory=Delete tag/category +ConfirmDeleteCategory=Are you sure you want to delete this tag/category ? +RemoveFromCategory=Remove link with tag/categorie +RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ? +NoCategoriesDefined=No tag/category defined +SuppliersCategoryShort=Suppliers tags/category +CustomersCategoryShort=Customers tags/category +ProductsCategoryShort=Products tags/category +MembersCategoryShort=Members tags/category +SuppliersCategoriesShort=Suppliers tags/categories +CustomersCategoriesShort=Customers tags/categories CustomersProspectsCategoriesShort=Custo./Prosp. categories -ProductsCategoriesShort=Products categories -MembersCategoriesShort=Members categories -ContactCategoriesShort=Contacts categories +ProductsCategoriesShort=Products tags/categories +MembersCategoriesShort=Members tags/categories +ContactCategoriesShort=Contacts tags/categories ThisCategoryHasNoProduct=This category does not contain any product. ThisCategoryHasNoSupplier=This category does not contain any supplier. ThisCategoryHasNoCustomer=This category does not contain any customer. @@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact. AssignedToCustomer=Assigned to a customer AssignedToTheCustomer=Assigned to the customer InternalCategory=Internal category -CategoryContents=Category contents -CategId=Category id -CatSupList=List of supplier categories -CatCusList=List of customer/prospect categories -CatProdList=List of products categories -CatMemberList=List of members categories -CatContactList=List of contact categories and contact -CatSupLinks=Links between suppliers and categories -CatCusLinks=Links between customers/prospects and categories -CatProdLinks=Links between products/services and categories -CatMemberLinks=Links between members and categories -DeleteFromCat=Remove from category +CategoryContents=Tag/category contents +CategId=Tag/category id +CatSupList=List of supplier tags/categories +CatCusList=List of customer/prospect tags/categories +CatProdList=List of products tags/categories +CatMemberList=List of members tags/categories +CatContactList=List of contact tags/categories and contact +CatSupLinks=Links between suppliers and tags/categories +CatCusLinks=Links between customers/prospects and tags/categories +CatProdLinks=Links between products/services and tags/categories +CatMemberLinks=Links between members and tags/categories +DeleteFromCat=Remove from tags/category DeletePicture=Picture delete ConfirmDeletePicture=Confirm picture deletion? ExtraFieldsCategories=Complementary attributes -CategoriesSetup=Categories setup -CategorieRecursiv=Link with parent category automatically +CategoriesSetup=Tags/categories setup +CategorieRecursiv=Link with parent tag/category automatically CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory AddProductServiceIntoCategory=Add the following product/service -ShowCategory=Show category \ No newline at end of file +ShowCategory=Show tag/category \ No newline at end of file diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index ddf581de1c0..083154f5936 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -390,8 +390,8 @@ Available=Available NotYetAvailable=Not yet available NotAvailable=Not available Popularity=Popularity -Categories=Categories -Category=Category +Categories=Tags/categories +Category=Tag/category By=By From=From to=to From b5690142aa97c5cfa9894034444cabeb06ed0504 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Mar 2015 16:26:31 +0200 Subject: [PATCH 249/412] Prepare 3.6.3 --- build/debian/changelog | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/build/debian/changelog b/build/debian/changelog index 4a711c9868c..75f4734ea3c 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,20 +1,6 @@ -dolibarr (3.6.2-3) unstable; urgency=low +dolibarr (3.6.3-3) UNRELEASED; urgency=low [ Laurent Destailleur (eldy) ] * New upstream release. - -- Laurent Destailleur (eldy) Sat, 27 dec 2014 12:00:00 +0100 - -dolibarr (3.6.1-3) unstable; urgency=low - - [ Laurent Destailleur (eldy) ] - * New upstream release. - - -- Laurent Destailleur (eldy) Tue, 23 Sep 2014 12:00:00 +0100 - -dolibarr (3.6.0-3) unstable; urgency=low - - [ Laurent Destailleur (eldy) ] - * New upstream release. - - -- Laurent Destailleur (eldy) Tue, 15 July 2014 12:00:00 +0100 + -- Laurent Destailleur (eldy) Sun, 21 March 2015 12:00:00 +0100 \ No newline at end of file From fd8d09c8c084a13ec6af0868670038573933d285 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Mar 2015 17:53:05 +0200 Subject: [PATCH 250/412] Fix avoid warning --- htdocs/admin/index.php | 1 + htdocs/core/class/hookmanager.class.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index bbedab346d1..9e6d316c9ee 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -100,6 +100,7 @@ print '
    '; print '
    '; // Add hook to add information +$parameters=array(); $reshook=$hookmanager->executeHooks('addHomeSetup',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks print $hookmanager->resPrint; if (empty($reshook)) diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php index 906c1e6c4ae..6b50cc68cbd 100644 --- a/htdocs/core/class/hookmanager.class.php +++ b/htdocs/core/class/hookmanager.class.php @@ -184,7 +184,7 @@ class HookManager }*/ } - if (is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results); + if (isset($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results); if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints; } // Generic hooks that return a string or array (printSearchForm, printLeftBlock, formAddObjectLine, formBuilddocOptions, ...) From b6b161774122623c73645d38d584027f6b395f11 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Sun, 29 Mar 2015 17:53:36 +0200 Subject: [PATCH 251/412] Work on payment loan --- htdocs/compta/bank/ligne.php | 13 +++++++++++++ htdocs/langs/en_US/loan.lang | 1 + htdocs/loan/class/paymentloan.class.php | 4 ++-- htdocs/loan/payment/payment.php | 8 ++++---- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index ac9fa10ff12..978681d348b 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -33,6 +33,7 @@ $langs->load("categories"); $langs->load("compta"); $langs->load("bills"); if (! empty($conf->adherent->enabled)) $langs->load("members"); +if (! empty($conf->loan->enabled)) $langs->load("loan"); $id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int')); @@ -345,6 +346,18 @@ if ($result) print $langs->trans("SalaryPayment"); print ''; } + else if ($links[$key]['type']=='payment_loan') { + print ''; + print img_object($langs->trans('ShowLoanPayment'),'payment').' '; + print $langs->trans("PaymentLoan"); + print ''; + } + else if ($links[$key]['type']=='loan') { + print ''; + print img_object($langs->trans('ShowLoan'),'bill').' '; + print $langs->trans("Loan"); + print ''; + } else if ($links[$key]['type']=='member') { print ''; print img_object($langs->trans('ShowMember'),'user').' '; diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index 4aba2de625c..e082f166959 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -4,6 +4,7 @@ Loans=Loans NewLoan=New Loan ShowLoan=Show Loan PaymentLoan=Loan payment +ShowLoanPayment=Show Loan Payment Capital=Capital Insurance=Insurance Interest=Interest diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php index 5c24621d802..51961e37e6e 100644 --- a/htdocs/loan/class/paymentloan.class.php +++ b/htdocs/loan/class/paymentloan.class.php @@ -391,7 +391,7 @@ class PaymentLoan extends CommonObject * @param string $emetteur_banque Name of bank * @return int <0 if KO, >0 if OK */ - function addPaymentToBank($user,$mode,$label,$accountid,$emetteur_nom,$emetteur_banque) + function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque) { global $conf; @@ -448,7 +448,7 @@ class PaymentLoan extends CommonObject //$linkaddedforthirdparty=array(); if ($mode == 'payment_loan') { - $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/loan/card.php?id=', $this->type_libelle.(($this->label && $this->label!=$this->type_libelle)?' ('.$this->label.')':''),'loan'); + $result=$acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/loan/card.php?id=', ($this->label?$this->label:''),'loan'); if ($result <= 0) dol_print_error($this->db); } } diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php index ece4a5e0271..32e6ed57d2d 100644 --- a/htdocs/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -41,6 +41,9 @@ if ($user->societe_id > 0) $socid = $user->societe_id; } +$loan = new Loan($db); +$loan->fetch($chid); + /* * Actions */ @@ -92,6 +95,7 @@ if ($action == 'add_payment') $payment = new PaymentLoan($db); $payment->chid = $chid; $payment->datepaid = $datepaid; + $payment->label = $loan->label; $payment->amount_capital = GETPOST('amount_capital'); $payment->amount_insurance = GETPOST('amount_insurance'); $payment->amount_interest = GETPOST('amount_interest'); @@ -150,10 +154,6 @@ $form=new Form($db); // Form to create loan's payment if ($_GET["action"] == 'create') { - - $loan = new Loan($db); - $loan->fetch($chid); - $total = $loan->capital; print_fiche_titre($langs->trans("DoPayment")); From bcd7516e25dd6e5f2bf5f89759348942bfa506cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 29 Mar 2015 18:22:45 +0200 Subject: [PATCH 252/412] Fix for donation.lib.php --- htdocs/core/lib/donation.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php index ed6407b1e84..1fdd2399610 100644 --- a/htdocs/core/lib/donation.lib.php +++ b/htdocs/core/lib/donation.lib.php @@ -27,7 +27,7 @@ * @param Donation $object Donation * @return array Array of tabs to show */ -function donation_admin_prepare_head() +function donation_admin_prepare_head($object) { global $langs, $conf; From 6c26063fc8d810f2781a3b7fc5c7da19c769c5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sun, 29 Mar 2015 18:29:09 +0200 Subject: [PATCH 253/412] Travis Fix don.clss.php --- htdocs/don/class/don.class.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index ce041351eed..5e36037738f 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -306,7 +306,7 @@ class Don extends CommonObject * @return int <0 if KO, id of created donation if OK * TODO add numbering module for Ref */ - function create($user) + function create($user, $notrigger) { global $conf, $langs; @@ -426,6 +426,7 @@ class Don extends CommonObject * Update a donation record * * @param User $user Objet utilisateur qui met a jour le don + * @param int $notrigger Disable triggers * @return int >0 if OK, <0 if KO */ function update($user, $notrigger=0) @@ -589,11 +590,11 @@ class Don extends CommonObject /** * Load donation from database * - * @param int $rowid Id of donation to load + * @param int $id Id of donation to load * @param string $ref Ref of donation to load * @return int <0 if KO, >0 if OK */ - function fetch($id,$ref='') + function fetch($id, $ref='') { global $conf; @@ -676,7 +677,7 @@ class Don extends CommonObject /** * Validate a promise of donation * - * @param int $rowid id of donation + * @param int $id id of donation * @param int $userid User who validate the promise * @return int <0 if KO, >0 if OK */ @@ -707,7 +708,7 @@ class Don extends CommonObject /** * Classe le don comme paye, le don a ete recu * - * @param int $rowid id du don a modifier + * @param int $id id du don a modifier * @param int $modepaiement mode de paiement * @return int <0 if KO, >0 if OK */ @@ -742,7 +743,7 @@ class Don extends CommonObject /** * Set donation to status canceled * - * @param int $rowid id of donation + * @param int $id id of donation * @return int <0 if KO, >0 if OK */ function set_cancel($id) From c22a5634220f66122e2b7769090861edcddc9a9b Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 29 Mar 2015 21:04:20 +0200 Subject: [PATCH 254/412] New: Add management for accounting account in admin donation & correct bugs --- htdocs/compta/bank/ligne.php | 10 +++++- htdocs/compta/bank/search.php | 4 +-- htdocs/core/modules/modDon.class.php | 7 ++++ htdocs/don/admin/donation.php | 53 +++++++++++++++++++++++----- htdocs/don/payment/card.php | 10 +++--- 5 files changed, 68 insertions(+), 16 deletions(-) diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index ac9fa10ff12..69fa076c584 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -4,6 +4,7 @@ * Copyright (C) 2004-2014 Laurent Destailleur * Copyright (C) 2004 Christophe Combelles * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -21,7 +22,7 @@ /** * \file htdocs/compta/bank/ligne.php - * \ingroup compta + * \ingroup bank * \brief Page to edit a bank transaction record */ @@ -33,6 +34,7 @@ $langs->load("categories"); $langs->load("compta"); $langs->load("bills"); if (! empty($conf->adherent->enabled)) $langs->load("members"); +if (! empty($conf->don->enabled)) $langs->load("donations"); $id = (GETPOST('id','int') ? GETPOST('id','int') : GETPOST('account','int')); @@ -350,6 +352,12 @@ if ($result) print img_object($langs->trans('ShowMember'),'user').' '; print $links[$key]['label']; print ''; + } + else if ($links[$key]['type']=='payment_donation') { + print ''; + print img_object($langs->trans('ShowDonation'),'payment').' '; + print $langs->trans("DonationPayment"); + print ''; } else if ($links[$key]['type']=='banktransfert') { print ''; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 534a9bb0e95..a1e114430ce 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php'; require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php'; -require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; $langs->load("banks"); $langs->load("categories"); @@ -128,7 +128,7 @@ if (! empty($type)) { $sql.= " AND b.fk_type = '".$db->escape($type)."' "; } -//Search period criteria +// Search period criteria if (dol_strlen($search_dt_start)>0) { $sql .= " AND b.dateo >= '" . $db->idate($search_dt_start) . "'"; } diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php index 8c7425ceed2..e25bd6d3bf9 100644 --- a/htdocs/core/modules/modDon.class.php +++ b/htdocs/core/modules/modDon.class.php @@ -104,6 +104,13 @@ class modDon extends DolibarrModules "Message affiché sur le récépissé de versements ou dons", "0" ); + $this->const[5] = array ( + "DONATION_ACCOUNTINGACCOUNT", + "chaine", + "7581", + "Compte comptable de remise des versements ou dons", + "0" + ); // Boxes $this->boxes = array(); diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php index af00f2dbbcc..bd4683ec3c7 100644 --- a/htdocs/don/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $langs->load("admin"); $langs->load("donations"); +$langs->load("accountancy"); $langs->load('other'); if (!$user->admin) accessforbidden(); @@ -114,7 +115,25 @@ else if ($action == 'del') } } -// Option +// Options +if ($action == 'set_DONATION_ACCOUNTINGACCOUNT') +{ + $account = GETPOST('DONATION_ACCOUNTINGACCOUNT'); // No alpha here, we want exact string + + $res = dolibarr_set_const($db, "DONATION_ACCOUNTINGACCOUNT",$account,'chaine',0,'',$conf->entity); + + if (! $res > 0) $error++; + + if (! $error) + { + setEventMessage($langs->trans("SetupSaved")); + } + else + { + setEventMessage($langs->trans("Error"),'errors'); + } +} + if ($action == 'set_DONATION_MESSAGE') { $freemessage = GETPOST('DONATION_MESSAGE'); // No alpha here, we want exact string @@ -191,24 +210,42 @@ dol_fiche_head($head, 'general', $langs->trans("Donations"), 0, 'payment'); */ print_titre($langs->trans("Options")); -print '
    '; -print ''; -print ''; print ''; print ''; -print ''; -print ''; +print ''; +//print ''; print "\n"; $var=true; -$var=! $var; +print ''; +print ''; +print ''; -print ''; + +print ''; +print '\n"; +print ''; + +print ''; +print ''; +print ''; + +$var=! $var; +print '\n"; + print "
    '.$langs->trans("Parameters").' '.$langs->trans("Parameters").' 
    '; +$var=! $var; +print '
    '; +$label = $langs->trans(AccountAccounting); +print ''; +print ''; +print ''; +print ''; +print "
    '; print $langs->trans("FreeTextOnDonations").'
    '; print ''; print '    		'; print ''; print "
    \n"; print ''; diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php index 4c59f566ba5..3abff69a624 100644 --- a/htdocs/don/payment/card.php +++ b/htdocs/don/payment/card.php @@ -33,7 +33,7 @@ $langs->load('banks'); $langs->load('companies'); // Security check -$id=GETPOST("id"); +$id=GETPOST('rowid')?GETPOST('rowid','int'):GETPOST('id','int'); $action=GETPOST("action"); $confirm=GETPOST('confirm'); if ($user->societe_id) $socid=$user->societe_id; @@ -129,7 +129,7 @@ $h++; dol_fiche_head($head, $hselected, $langs->trans("DonationPayment"), 0, 'payment'); /* - * Confirmation de la suppression du paiement + * Confirm deleting of the payment */ if ($action == 'delete') { @@ -138,7 +138,7 @@ if ($action == 'delete') } /* - * Confirmation de la validation du paiement + * Confirm validation of the payment */ if ($action == 'valide') { @@ -192,7 +192,7 @@ print ''; /* - * List of donations payed + * List of donations paid */ $disable_delete = 0; @@ -262,7 +262,7 @@ print ''; /* - * Boutons Actions + * Actions buttons */ print '
    '; From 831177ef99c29f87a3d08a12f45a590e00ade445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 30 Mar 2015 03:14:07 +0200 Subject: [PATCH 255/412] Implemented constants for Product class --- dev/examples/create_product.php | 2 +- htdocs/categories/categorie.php | 2 +- htdocs/core/class/html.form.class.php | 2 +- htdocs/core/photos_resize.php | 4 +- htdocs/margin/tabs/productMargins.php | 2 +- .../product/actions_card_product.class.php | 2 +- .../service/actions_card_service.class.php | 2 +- htdocs/product/card.php | 18 ++++---- htdocs/product/class/product.class.php | 41 ++++++++++++++----- htdocs/product/composition/card.php | 6 +-- htdocs/product/document.php | 4 +- htdocs/product/fournisseurs.php | 2 +- htdocs/product/photos.php | 6 +-- htdocs/product/price.php | 2 +- htdocs/product/stats/card.php | 2 +- htdocs/product/stats/commande.php | 2 +- htdocs/product/stats/commande_fournisseur.php | 2 +- htdocs/product/stats/contrat.php | 2 +- htdocs/product/stats/facture.php | 2 +- htdocs/product/stats/facture_fournisseur.php | 2 +- htdocs/product/stats/propal.php | 2 +- .../stock/class/mouvementstock.class.php | 2 +- htdocs/product/stock/product.php | 3 +- htdocs/product/traduction.php | 2 +- 24 files changed, 68 insertions(+), 48 deletions(-) diff --git a/dev/examples/create_product.php b/dev/examples/create_product.php index 8fe36260c98..cdb6cdae9e2 100755 --- a/dev/examples/create_product.php +++ b/dev/examples/create_product.php @@ -70,7 +70,7 @@ $myproduct->libelle = 'libelle'; $myproduct->price = '10'; $myproduct->price_base_type = 'HT'; $myproduct->tva_tx = '19.6'; -$myproduct->type = 0; +$myproduct->type = Product::TYPE_PRODUCT; $myproduct->status = 1; $myproduct->description = 'Description'; $myproduct->note = 'Note'; diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index e116ac668ab..76af3708c8b 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -343,7 +343,7 @@ else if ($id || $ref) $head=product_prepare_head($product, $user); $titre=$langs->trans("CardProduct".$product->type); - $picto=($product->type==1?'service':'product'); + $picto=($product->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'category', $titre,0,$picto); diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index ae7b0e2d1e8..eb63f76319f 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3872,7 +3872,7 @@ class Form { $prodstatic=new Product($this->db); $prodstatic->fetch($idprod); - if ($prodstatic->type == 1) // We know product is a service + if ($prodstatic->type == Product::TYPE_SERVICE) // We know product is a service { $code_country.=",'".$societe_acheteuse->country_code."'"; } diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php index 3a51a5f7567..80f849a0494 100644 --- a/htdocs/core/photos_resize.php +++ b/htdocs/core/photos_resize.php @@ -70,8 +70,8 @@ if ($id > 0) $result = $object->fetch($id); if ($result <= 0) dol_print_error($db,'Failed to load object'); $dir=$conf->product->multidir_output[$object->entity]; // By default - if ($object->type == 0) $dir=$conf->product->multidir_output[$object->entity]; - if ($object->type == 1) $dir=$conf->service->multidir_output[$object->entity]; + if ($object->type == Product::TYPE_PRODUCT) $dir=$conf->product->multidir_output[$object->entity]; + if ($object->type == Product::TYPE_SERVICE) $dir=$conf->service->multidir_output[$object->entity]; } /* diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index d811f898c0b..2123f683c21 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -79,7 +79,7 @@ if ($id > 0 || ! empty($ref)) { $head=product_prepare_head($object, $user); $titre=$langs->trans("CardProduct".$object->type); - $picto=($object->type==1?'service':'product'); + $picto=($object->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'margin', $titre, 0, $picto); print ''; diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index 3537dc288a9..84140ee3f6a 100644 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -143,7 +143,7 @@ class ActionsCardProduct $this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref'); $titre=$langs->trans("CardProduct".$this->object->type); - $picto=($this->object->type==1?'service':'product'); + $picto=($this->object->type==Product::TYPE_SERVICE?'service':'product'); $this->tpl['showhead']=dol_get_fiche_head($head, 'card', $titre, 0, $picto); $this->tpl['showend']=dol_get_fiche_end(); diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index cbb9e10750c..b36e7b317c6 100644 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -142,7 +142,7 @@ class ActionsCardService $this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref'); $titre=$langs->trans("CardProduct".$this->object->type); - $picto=($this->object->type==1?'service':'product'); + $picto=($this->object->type==Product::TYPE_SERVICE?'service':'product'); $this->tpl['showhead']=dol_get_fiche_head($head, 'card', $titre, 0, $picto); $this->tpl['showend']=dol_get_fiche_end(); diff --git a/htdocs/product/card.php b/htdocs/product/card.php index 0a74845a763..eecec0705f7 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -461,7 +461,7 @@ if (empty($reshook)) if ($action == 'confirm_delete' && $confirm != 'yes') { $action=''; } if ($action == 'confirm_delete' && $confirm == 'yes') { - if (($object->type == 0 && $user->rights->produit->supprimer) || ($object->type == 1 && $user->rights->service->supprimer)) + if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer)) { $result = $object->delete($object->id); } @@ -768,8 +768,8 @@ if (GETPOST("cancel") == $langs->trans("Cancel")) */ $helpurl=''; -if (GETPOST("type") == '0' || ($object->type == '0')) $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos'; -if (GETPOST("type") == '1' || ($object->type == '1')) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; +if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) $helpurl='EN:Module_Products|FR:Module_Produits|ES:Módulo_Productos'; +if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) $helpurl='EN:Module_Services_En|FR:Module_Services|ES:Módulo_Servicios'; if (isset($_GET['type'])) $title = $langs->trans('CardProduct'.GETPOST('type')); else $title = $langs->trans('ProductServiceCard'); @@ -1193,7 +1193,7 @@ else }*/ // Nature - if($object->type!=1) + if($object->type!= Product::TYPE_SERVICE) { print ''; // Nature - if($object->type!=1) + if($object->type!= Product::TYPE_SERVICE) { print ''; // Nature - if($object->type!=1) + if($object->type!=Product::TYPE_SERVICE) { print ''; + // Status + $alreadypaid=$object->getSommePaiement(); + print ''; + + // Amount + print ''; + print ''; + + // Amount Local Taxes + //TODO: Place into a function to control showing by country or study better option + if ($societe->localtax1_assuj=="1") //Localtax1 + { + print ''; + print ''; + print ''; + } + if ($societe->localtax2_assuj=="1") //Localtax2 + { + print ''; + print ''; + print ''; + } + print ''; + print '
    '.$langs->trans("Nature").''; $statutarray=array('-1'=>' ', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial")); @@ -1308,7 +1308,7 @@ else { $head=product_prepare_head($object, $user); $titre=$langs->trans("CardProduct".$object->type); - $picto=($object->type==1?'service':'product'); + $picto=($object->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'card', $titre, 0, $picto); $showphoto=$object->is_photo_available($conf->product->multidir_output[$object->entity]); @@ -1331,7 +1331,7 @@ else $nblignes=7; if (! empty($conf->produit->enabled) && ! empty($conf->service->enabled)) $nblignes++; if ($showbarcode) $nblignes+=2; - if ($object->type!=1) $nblignes++; + if ($object->type!= Product::TYPE_SERVICE) $nblignes++; if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) $nblignes+=2; if ($object->isservice()) $nblignes++; else $nblignes+=4; @@ -1464,7 +1464,7 @@ else print '
    '.$langs->trans("Nature").''; print $object->getLibFinished(); @@ -1628,8 +1628,8 @@ if (empty($reshook)) } $object_is_used = $object->isObjectUsed($object->id); - if (($object->type == 0 && $user->rights->produit->supprimer) - || ($object->type == 1 && $user->rights->service->supprimer)) + if (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) + || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer)) { if (empty($object_is_used) && (! isset($object->no_button_delete) || $object->no_button_delete <> 1)) { diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index d08ed699b7f..8c811a57a1a 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -61,8 +61,12 @@ class Product extends CommonObject var $libelle; // TODO deprecated var $label; var $description; - //! Type 0 for regular product, 1 for service (Advanced feature: 2 for assembly kit, 3 for stock kit) - var $type; + + /** + * Check TYPE constants + * @var int + */ + var $type = self::TYPE_PRODUCT; //! Selling price var $price; // Price net var $price_ttc; // Price with tax @@ -171,6 +175,23 @@ class Product extends CommonObject var $fk_price_expression; + /** + * Regular product + */ + const TYPE_PRODUCT = 0; + /** + * Service + */ + const TYPE_SERVICE = 1; + /** + * Advanced feature: assembly kit + */ + const TYPE_ASSEMBLYKIT = 2; + /** + * Advanced feature: stock kit + */ + const TYPE_STOCKKIT = 3; + /** * Constructor * @@ -233,7 +254,6 @@ class Product extends CommonObject // Clean parameters $this->ref = dol_string_nospecial(trim($this->ref)); $this->libelle = trim($this->libelle); - if (empty($this->type)) $this->type=0; $this->price_ttc=price2num($this->price_ttc); $this->price=price2num($this->price); $this->price_min_ttc=price2num($this->price_min_ttc); @@ -795,7 +815,7 @@ class Product extends CommonObject $this->error = "Object must be fetched before calling delete"; return -1; } - if (($this->type == 0 && empty($user->rights->produit->supprimer)) || ($this->type == 1 && empty($user->rights->service->supprimer))) + if (($this->type == Product::TYPE_PRODUCT && empty($user->rights->produit->supprimer)) || ($this->type == Product::TYPE_SERVICE && empty($user->rights->service->supprimer))) { $this->error = "ErrorForbidden"; return 0; @@ -2932,8 +2952,8 @@ class Product extends CommonObject $result=''; $newref=$this->ref; if ($maxlength) $newref=dol_trunc($newref,$maxlength,'middle'); - if ($this->type == 0) $label = '' . $langs->trans("ShowProduct") . ''; - if ($this->type == 1) $label = '' . $langs->trans("ShowService") . ''; + if ($this->type == Product::TYPE_PRODUCT) $label = '' . $langs->trans("ShowProduct") . ''; + if ($this->type == Product::TYPE_SERVICE) $label = '' . $langs->trans("ShowService") . ''; if (! empty($this->ref)) $label .= '
    ' . $langs->trans('ProductRef') . ': ' . $this->ref; if (! empty($this->label)) @@ -2968,8 +2988,8 @@ class Product extends CommonObject } if ($withpicto) { - if ($this->type == 0) $result.=($link.img_object($langs->trans("ShowProduct").' '.$this->label, 'product', 'class="classfortooltip"').$linkend.' '); - if ($this->type == 1) $result.=($link.img_object($langs->trans("ShowService").' '.$this->label, 'service', 'class="classfortooltip"').$linkend.' '); + if ($this->type == Product::TYPE_PRODUCT) $result.=($link.img_object($langs->trans("ShowProduct").' '.$this->label, 'product', 'class="classfortooltip"').$linkend.' '); + if ($this->type == Product::TYPE_SERVICE) $result.=($link.img_object($langs->trans("ShowService").' '.$this->label, 'service', 'class="classfortooltip"').$linkend.' '); } $result.=$link.$newref.$linkend; return $result; @@ -3666,7 +3686,7 @@ class Product extends CommonObject */ function isproduct() { - return ($this->type != 1 ? true : false); + return ($this->type != Product::TYPE_PRODUCT ? true : false); } /** @@ -3676,7 +3696,7 @@ class Product extends CommonObject */ function isservice() { - return ($this->type == 1 ? true : false); + return ($this->type == Product::TYPE_SERVICE ? true : false); } /** @@ -3733,7 +3753,6 @@ class Product extends CommonObject $this->tosell=1; $this->tobuy=1; $this->tobatch=0; - $this->type=0; $this->note='This is a comment (private)'; $this->barcode=-1; // Create barcode automatically diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 53f79266c25..96f2a589429 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -176,7 +176,7 @@ llxHeader("","",$langs->trans("CardProduct".$object->type)); $head=product_prepare_head($object, $user); $titre=$langs->trans("CardProduct".$object->type); -$picto=($object->type==1?'service':'product'); +$picto=($object->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'subproduct', $titre, 0, $picto); @@ -207,7 +207,7 @@ if ($id > 0 || ! empty($ref)) print '
    '.$langs->trans("Nature").''; print $object->getLibFinished(); @@ -474,7 +474,7 @@ if ($id > 0 || ! empty($ref)) // check if a product is not already a parent product of this one $prod_arbo=new Product($db); $prod_arbo->id=$objp->rowid; - if ($prod_arbo->type==2 || $prod_arbo->type==3) + if ($prod_arbo->type==Product::TYPE_ASSEMBLYKIT || $prod_arbo->type== Product::TYPE_STOCKKIT) { $is_pere=0; $prod_arbo->get_sousproduits_arbo(); diff --git a/htdocs/product/document.php b/htdocs/product/document.php index e46dc0384b2..9a71eac4f55 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -102,7 +102,7 @@ if ($object->id) { $head=product_prepare_head($object, $user); $titre=$langs->trans("CardProduct".$object->type); - $picto=($object->type==1?'service':'product'); + $picto=($object->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'documents', $titre, 0, $picto); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -146,7 +146,7 @@ if ($object->id) print ''; $modulepart = 'produit'; - $permission = (($object->type == 0 && $user->rights->produit->creer) || ($object->type == 1 && $user->rights->service->creer)); + $permission = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer)); $param = '&id=' . $object->id; include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; } diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index b360829a341..c2196aba00b 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -259,7 +259,7 @@ if ($id || $ref) $head=product_prepare_head($product, $user); $titre=$langs->trans("CardProduct".$product->type); - $picto=($product->type==1?'service':'product'); + $picto=($product->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'suppliers', $titre, 0, $picto); diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php index 0ae65a7dec6..8a6e2ddbd6b 100644 --- a/htdocs/product/photos.php +++ b/htdocs/product/photos.php @@ -102,7 +102,7 @@ if ($object->id) */ $head=product_prepare_head($object, $user); $titre=$langs->trans("CardProduct".$object->type); - $picto=($object->type==1?'service':'product'); + $picto=($object->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'photos', $titre, 0, $picto); /* @@ -145,8 +145,8 @@ if ($object->id) $permtoedit=0; - if ($user->rights->produit->creer && $object->type == 0) $permtoedit=1; - if ($user->rights->service->creer && $object->type == 1) $permtoedit=1; + if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoedit=1; + if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoedit=1; if (empty($conf->global->MAIN_UPLOAD_DOC)) $permtoedit=0; /* ************************************************************************** */ diff --git a/htdocs/product/price.php b/htdocs/product/price.php index f6cd6187e85..da61ccc45b8 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -347,7 +347,7 @@ llxHeader("", "", $langs->trans("CardProduct" . $object->type)); $head = product_prepare_head($object, $user); $titre = $langs->trans("CardProduct" . $object->type); -$picto = ($object->type == 1 ? 'service' : 'product'); +$picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); dol_fiche_head($head, 'price', $titre, 0, $picto); print ''; diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index 9600e6c0a44..788068ea5ec 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -69,7 +69,7 @@ if (! empty($id) || ! empty($ref)) { $head=product_prepare_head($object, $user); $titre=$langs->trans("CardProduct".$object->type); - $picto=($object->type==1?'service':'product'); + $picto=($object->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'stats', $titre, 0, $picto); diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 49a443938ab..a1e538f4559 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -91,7 +91,7 @@ if ($id > 0 || ! empty($ref)) { $head=product_prepare_head($product, $user); $titre=$langs->trans("CardProduct".$product->type); - $picto=($product->type==1?'service':'product'); + $picto=($product->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index 8cbdea41495..1b324d99bbf 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -98,7 +98,7 @@ if ($id > 0 || ! empty($ref)) { if ($result > 0) { $head = product_prepare_head($product, $user); $titre = $langs->trans("CardProduct" . $product->type); - $picto = ($product->type == 1 ? 'service' : 'product'); + $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 189ead2eaa2..aa535f02575 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -81,7 +81,7 @@ if ($id > 0 || ! empty($ref)) { $head=product_prepare_head($product,$user); $titre=$langs->trans("CardProduct".$product->type); - $picto=($product->type==1?'service':'product'); + $picto=($product->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index 2ae8164b0f9..c0fa1481269 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -92,7 +92,7 @@ if ($id > 0 || ! empty($ref)) { $head=product_prepare_head($product, $user); $titre=$langs->trans("CardProduct".$product->type); - $picto=($product->type==1?'service':'product'); + $picto=($product->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$product,$action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 2e8e84621ba..275a2ff8604 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -93,7 +93,7 @@ if ($id > 0 || ! empty($ref)) { $head = product_prepare_head($product, $user); $titre = $langs->trans("CardProduct" . $product->type); - $picto = ($product->type == 1 ? 'service' : 'product'); + $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 10fd8247204..4eae4c238e1 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -91,7 +91,7 @@ if ($id > 0 || ! empty($ref)) { $head = product_prepare_head($product, $user); $titre = $langs->trans("CardProduct" . $product->type); - $picto = ($product->type == 1 ? 'service' : 'product'); + $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php index 1994b4ad6c2..c41fe590d18 100644 --- a/htdocs/product/stock/class/mouvementstock.class.php +++ b/htdocs/product/stock/class/mouvementstock.class.php @@ -117,7 +117,7 @@ class MouvementStock extends CommonObject // Define if we must make the stock change (If product type is a service or if stock is used also for services) $movestock=0; - if ($product->type != 1 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) $movestock=1; + if ($product->type != Product::TYPE_SERVICE || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) $movestock=1; if ($movestock && $entrepot_id > 0) // Change stock for current product, change for subproduct is done after { diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 044da6c9aa4..116fff88809 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -7,6 +7,7 @@ * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2013 Juanjo Menent * Copyright (C) 2014-2015 Cédric Gross + * Copyright (C) 2015 Marcos García * * 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 @@ -385,7 +386,7 @@ if ($id > 0 || $ref) { $head=product_prepare_head($product, $user); $titre=$langs->trans("CardProduct".$product->type); - $picto=($product->type==1?'service':'product'); + $picto=($product->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'stock', $titre, 0, $picto); dol_htmloutput_events(); diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index 34b38fe8919..480f739285d 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -170,7 +170,7 @@ $formadmin=new FormAdmin($db); $head=product_prepare_head($product, $user); $titre=$langs->trans("CardProduct".$product->type); -$picto=($product->type==1?'service':'product'); +$picto=($product->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'translation', $titre, 0, $picto); print '
    '; From 1b7ffd80f1d52e99d6ac7bc9b717ac4da6f27bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Mon, 30 Mar 2015 03:19:20 +0200 Subject: [PATCH 256/412] Typo --- htdocs/commande/class/commande.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 6bc4c1f5f53..1a5d8bf2ceb 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -61,7 +61,7 @@ class Commande extends CommonOrder var $contactid; var $fk_project; /** - * Status of the commande. Check the following constants: + * Status of the order. Check the following constants: * - STATUS_CANCELED * - STATUS_DRAFT * - STATUS_ACCEPTED @@ -2893,7 +2893,7 @@ class Commande extends CommonOrder //print 'x'.$statut.'-'.$billed; if ($mode == 0) { - if ($statut==self::STATUS_CANCELED-1) return $langs->trans('StatusOrderCanceled'); + if ($statut==self::STATUS_CANCELED) return $langs->trans('StatusOrderCanceled'); if ($statut==self::STATUS_DRAFT) return $langs->trans('StatusOrderDraft'); if ($statut==self::STATUS_VALIDATED) return $langs->trans('StatusOrderValidated'); if ($statut==self::STATUS_ACCEPTED) return $langs->trans('StatusOrderSentShort'); From 9d752c6fca2912d87bdb4157b75960e38652eb4c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 30 Mar 2015 10:55:08 +0200 Subject: [PATCH 257/412] Sync from transifex --- htdocs/langs/fr_FR/donations.lang | 2 +- htdocs/langs/fr_FR/trips.lang | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang index 84081b64576..fab53285a7c 100644 --- a/htdocs/langs/fr_FR/donations.lang +++ b/htdocs/langs/fr_FR/donations.lang @@ -32,7 +32,7 @@ ThankYou=Merci IConfirmDonationReception=Le bénéficiaire reconnait avoir reçu au titre des versements ouvrant droit à réduction d'impôt, la somme de MinimumAmount=Don minimum de %s FreeTextOnDonations=Mention complémentaire sur les dons -FrenchOptions=Options propre à la france +FrenchOptions=Options propres à la france DONATION_ART200=Afficher article 200 du CGI si vous êtes concernés DONATION_ART238=Afficher article 238 du CGI si vous êtes concernés DONATION_ART885=Afficher article 885 du CGI si vous êtes concernés diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang index 3a11b7c4036..2170c579547 100644 --- a/htdocs/langs/fr_FR/trips.lang +++ b/htdocs/langs/fr_FR/trips.lang @@ -22,7 +22,7 @@ SearchATripAndExpense=Rechercher une note de frais ClassifyRefunded=Classer 'Remboursé' ExpenseReportWaitingForApproval=Une nouvelle note de frais a été soumise pour approbation ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s -TripId=Id expense report +TripId=Id note de frais AnyOtherInThisListCanValidate=Person to inform for validation. TripSociete=Information société TripSalarie=Informations utilisateur From e602c43e122d91642fc14197ba16d1c683107d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 30 Mar 2015 12:14:35 +0200 Subject: [PATCH 258/412] Add ORDER_CANCEL in interface_90_all_Demo.class.php --- htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN index c50a4afcc01..70f5e0ce3e5 100644 --- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN +++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN @@ -119,6 +119,7 @@ class InterfaceDemo extends DolibarrTriggers case 'ORDER_CLONE': case 'ORDER_VALIDATE': case 'ORDER_DELETE': + case 'ORDER_CANCEL': case 'ORDER_SENTBYMAIL': case 'ORDER_CLASSIFY_BILLED': case 'LINEORDER_INSERT': From bab04258e074fd08bb633d593728b089f0b3739e Mon Sep 17 00:00:00 2001 From: frederic34 Date: Mon, 30 Mar 2015 18:15:29 +0200 Subject: [PATCH 259/412] Add document tab for contact --- htdocs/contact/document.php | 125 ++++++++++++++++++++++++++++++++ htdocs/core/lib/contact.lib.php | 76 +++++++++++-------- 2 files changed, 170 insertions(+), 31 deletions(-) create mode 100644 htdocs/contact/document.php diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php new file mode 100644 index 00000000000..5fad4b2aa07 --- /dev/null +++ b/htdocs/contact/document.php @@ -0,0 +1,125 @@ + + * Copyright (C) 2015 Frederic France + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/contact/document.php + * \ingroup contact + * \brief Page with attached files on contact + */ + +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/contact.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; + +$langs->load("other"); +$langs->load("companies"); +$langs->load("compta"); +$langs->load("bills"); +$langs->load("contact"); + +$id = GETPOST('id','int'); +$action = GETPOST("action"); +$confirm = GETPOST('confirm', 'alpha'); + +// Security check +if ($user->societe_id) $socid=$user->societe_id; +$result = restrictedArea($user, 'contact', $id, '',''); + +// Get parameters +$sortfield = GETPOST("sortfield",'alpha'); +$sortorder = GETPOST("sortorder",'alpha'); +$page = GETPOST("page",'int'); +if ($page == -1) { + $page = 0; +} +$offset = $conf->liste_limit * $page; +$pageprev = $page - 1; +$pagenext = $page + 1; +if (! $sortorder) $sortorder="ASC"; +if (! $sortfield) $sortfield="name"; + +$object = new Contact($db); +if ($id > 0) $object->fetch($id); + +$upload_dir = $conf->societe->dir_output.'/contact/'.dol_sanitizeFileName($object->ref); +$modulepart='contact'; + + +/* + * Actions + */ + +include DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; + + +/* + * View + */ + +$form = new Form($db); + +$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; +llxHeader("",$langs->trans("Contact"), $helpurl); + +if ($object->id) +{ + $head = contact_prepare_head($object, $user); + + dol_fiche_head($head, 'documents', $langs->trans("Contact"), 0, 'contact'); + + + // Construit liste des fichiers + $filearray=dol_dir_list($upload_dir,"files",0,'','(\.meta|_preview\.png)$',$sortfield,(strtolower($sortorder)=='desc'?SORT_DESC:SORT_ASC),1); + $totalsize=0; + foreach($filearray as $key => $file) + { + $totalsize+=$file['size']; + } + + print '
    '; + + // Ref + print ''; + + // Name + print ''; + print ''; + + print ''; + print ''; + print '
    '.$langs->trans("Ref").''; + print $form->showrefnav($object, 'id', $linkback); + print '
    '.$langs->trans("Lastname").' / '.$langs->trans("Label").''.$object->lastname.''.$langs->trans("Firstname").''.$object->firstname.'
    '.$langs->trans("NbOfAttachedFiles").''.count($filearray).'
    '.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
    '; + + print ''; + + $modulepart = 'contact'; + $permission = $user->rights->societe->contact->creer; + $param = '&id=' . $object->id; + include DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php'; +} else { + print $langs->trans("ErrorUnknown"); +} + + +llxFooter(); + +$db->close(); diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php index 3eeca82c993..8cec08f5a74 100644 --- a/htdocs/core/lib/contact.lib.php +++ b/htdocs/core/lib/contact.lib.php @@ -1,6 +1,7 @@ * Copyright (C) 2010-2012 Regis Houssin + * Copyright (C) 2015 Frederic France * * 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 @@ -32,62 +33,75 @@ function contact_prepare_head(Contact $object) { global $langs, $conf, $user; - $h = 0; + $tab = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/contact/card.php?id='.$object->id; - $head[$h][1] = $langs->trans("Card"); - $head[$h][2] = 'card'; - $h++; + $head[$tab][0] = DOL_URL_ROOT.'/contact/card.php?id='.$object->id; + $head[$tab][1] = $langs->trans("Card"); + $head[$tab][2] = 'card'; + $tab++; if (! empty($conf->ldap->enabled) && ! empty($conf->global->LDAP_CONTACT_ACTIVE)) { $langs->load("ldap"); $head[$h][0] = DOL_URL_ROOT.'/contact/ldap.php?id='.$object->id; - $head[$h][1] = $langs->trans("LDAPCard"); - $head[$h][2] = 'ldap'; - $h++; + $head[$tab][1] = $langs->trans("LDAPCard"); + $head[$tab][2] = 'ldap'; + $tab++; } - $head[$h][0] = DOL_URL_ROOT.'/contact/perso.php?id='.$object->id; - $head[$h][1] = $langs->trans("PersonalInformations"); - $head[$h][2] = 'perso'; - $h++; + $head[$tab][0] = DOL_URL_ROOT.'/contact/perso.php?id='.$object->id; + $head[$tab][1] = $langs->trans("PersonalInformations"); + $head[$tab][2] = 'perso'; + $tab++; - $head[$h][0] = DOL_URL_ROOT.'/contact/exportimport.php?id='.$object->id; - $head[$h][1] = $langs->trans("ExportImport"); - $head[$h][2] = 'exportimport'; - $h++; + $head[$tab][0] = DOL_URL_ROOT.'/contact/exportimport.php?id='.$object->id; + $head[$tab][1] = $langs->trans("ExportImport"); + $head[$tab][2] = 'exportimport'; + $tab++; // Show more tabs from modules // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname); to remove a tab - complete_head_from_modules($conf,$langs,$object,$head,$h,'contact'); + complete_head_from_modules($conf,$langs,$object,$head,$tab,'contact'); // Notes - $head[$h][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id; - $head[$h][1] = $langs->trans("Note"); - $head[$h][2] = 'note'; - $h++; - + if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) { + $nbNote = (empty($object->note_private)?0:1)+(empty($object->note_public)?0:1); + $head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id; + $head[$tab][1] = $langs->trans("Note"); + if($nbNote > 0) $head[$tab][1].= ' '.$nbNote.''; + $head[$tab][2] = 'note'; + $tab++; + } + + require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + $upload_dir = $conf->societe->dir_output . "/contact/" . dol_sanitizeFileName($object->ref); + $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); + $head[$tab][0] = DOL_URL_ROOT.'/contact/document.php?id='.$object->id; + $head[$tab][1] = $langs->trans("Documents"); + if($nbFiles > 0) $head[$tab][1].= ' '.$nbFiles.''; + $head[$tab][2] = 'documents'; + $tab++; + if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire)) { $type = 4; - $head[$h][0] = DOL_URL_ROOT.'/categories/categorie.php?id='.$object->id."&type=".$type; - $head[$h][1] = $langs->trans('Categories'); - $head[$h][2] = 'category'; - $h++; + $head[$tab][0] = DOL_URL_ROOT.'/categories/categorie.php?id='.$object->id."&type=".$type; + $head[$tab][1] = $langs->trans('Categories'); + $head[$tab][2] = 'category'; + $tab++; } // Info - $head[$h][0] = DOL_URL_ROOT.'/contact/info.php?id='.$object->id; - $head[$h][1] = $langs->trans("Info"); - $head[$h][2] = 'info'; - $h++; + $head[$tab][0] = DOL_URL_ROOT.'/contact/info.php?id='.$object->id; + $head[$tab][1] = $langs->trans("Info"); + $head[$tab][2] = 'info'; + $tab++; - complete_head_from_modules($conf,$langs,$object,$head,$h,'contact','remove'); + complete_head_from_modules($conf,$langs,$object,$head,$tab,'contact','remove'); return $head; } From 65ec02bae1da37df751ab0c5c91df9f02962a1b1 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Mon, 30 Mar 2015 19:13:55 +0200 Subject: [PATCH 260/412] FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a specific year --- htdocs/exports/class/export.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index fda062952d1..7ab55fd4e53 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -328,7 +328,7 @@ class Export function conditionDate($Field, $Value, $Sens) { // TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN - if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." ".$Value; + if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'"; elseif (strlen($Value)==6) $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'"; else $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value; return $Condition; From fe6227e93f92c1ca0e056e64f57ab10b0ee93f32 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Tue, 31 Mar 2015 08:45:36 +0200 Subject: [PATCH 261/412] Typo --- htdocs/contact/document.php | 2 -- htdocs/core/lib/contact.lib.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index 5fad4b2aa07..970f3543c45 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -31,8 +31,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; $langs->load("other"); $langs->load("companies"); -$langs->load("compta"); -$langs->load("bills"); $langs->load("contact"); $id = GETPOST('id','int'); diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php index 8cec08f5a74..ba2d8ad5772 100644 --- a/htdocs/core/lib/contact.lib.php +++ b/htdocs/core/lib/contact.lib.php @@ -45,7 +45,7 @@ function contact_prepare_head(Contact $object) { $langs->load("ldap"); - $head[$h][0] = DOL_URL_ROOT.'/contact/ldap.php?id='.$object->id; + $head[$tab][0] = DOL_URL_ROOT.'/contact/ldap.php?id='.$object->id; $head[$tab][1] = $langs->trans("LDAPCard"); $head[$tab][2] = 'ldap'; $tab++; From 2d50cc92b9f68413f842364e0734f7c163c79f2a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 31 Mar 2015 11:32:47 +0200 Subject: [PATCH 262/412] Differentiate title for customer and supplier orders/invoices. --- htdocs/commande/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/compta/facture/tpl/linkedobjectblock.tpl.php | 3 +-- htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php | 2 +- htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php | 3 +-- htdocs/langs/en_US/bills.lang | 2 ++ htdocs/langs/en_US/orders.lang | 2 ++ 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php index cabb63aa2b1..2eb94d7974a 100644 --- a/htdocs/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php @@ -30,7 +30,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("orders"); echo '
    '; -print_titre($langs->trans('RelatedOrders')); +print_titre($langs->trans('RelatedCustomerOrders')); ?> diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php index 12f40f8ef97..eac0043e56f 100644 --- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php @@ -30,8 +30,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("bills"); echo '
    '; -if ($num > 1) print_titre($langs->trans("RelatedBills")); -else print_titre($langs->trans("RelatedBill")); +print_titre($langs->trans("RelatedCustomerInvoices")); ?>
    diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php index 3a9d8f5bebe..3fb22d4a101 100644 --- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php @@ -29,7 +29,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("orders"); echo '
    '; -print_titre($langs->trans('RelatedOrders')); +print_titre($langs->trans('RelatedSupplierOrders')); ?>
    diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php index a6d9164a91c..6bbee5a33fc 100644 --- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php +++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php @@ -29,8 +29,7 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock']; $langs->load("bills"); echo '
    '; -if ($num > 1) print_titre($langs->trans("RelatedBills")); -else print_titre($langs->trans("RelatedBill")); +print_titre($langs->trans("RelatedSupplierInvoices")); ?>
    diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index bcc3baadc45..ac8e6da082b 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -294,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to ConfirmRemoveDiscount=Are you sure you want to remove this discount ? RelatedBill=Related invoice RelatedBills=Related invoices +RelatedCustomerInvoices=Related customer invoices +RelatedSupplierInvoices=Related supplier invoices LatestRelatedBill=Latest related invoice WarningBillExist=Warning, one or more invoice already exist diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 602bd1bda59..71e26bc21a4 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -102,6 +102,8 @@ ClassifyBilled=Classify billed ComptaCard=Accountancy card DraftOrders=Draft orders RelatedOrders=Related orders +RelatedCustomerOrders=Related customer orders +RelatedSupplierOrders=Related supplier orders OnProcessOrders=In process orders RefOrder=Ref. order RefCustomerOrder=Ref. customer order From bba8b206a15b902dd9a6f60bc20a9e871f713951 Mon Sep 17 00:00:00 2001 From: Francis Appels Date: Tue, 31 Mar 2015 15:48:08 +0200 Subject: [PATCH 263/412] FIX: dispatch batch products Fix dispatching batch products and add error message. Make DispatchProduct method backwards comp and add missing $trigger. Add missing ORDER_SUPPLIER_DISPATCH trigger to demo class. --- .../interface_90_all_Demo.class.php-NORUN | 1 + .../class/fournisseur.commande.class.php | 3 ++- htdocs/fourn/commande/dispatch.php | 23 +++++++++++-------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN index d3abf17501d..0a65a74c4c8 100644 --- a/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN +++ b/htdocs/core/triggers/interface_90_all_Demo.class.php-NORUN @@ -134,6 +134,7 @@ class InterfaceDemo extends DolibarrTriggers case 'ORDER_SUPPLIER_REFUSE': case 'ORDER_SUPPLIER_CANCEL': case 'ORDER_SUPPLIER_SENTBYMAIL': + case 'ORDER_SUPPLIER_DISPATCH': case 'LINEORDER_SUPPLIER_DISPATCH': case 'LINEORDER_SUPPLIER_CREATE': case 'LINEORDER_SUPPLIER_UPDATE': diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 95c8c1801a7..e4f69572c0d 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1275,9 +1275,10 @@ class CommandeFournisseur extends CommonOrder * @param date $sellby sell-by date * @param string $batch Lot number * @param int $fk_commandefourndet Id of supplier order line + * @param int $notrigger 1 = notrigger * @return int <0 if KO, >0 if OK */ - function DispatchProduct($user, $product, $qty, $entrepot, $price=0, $comment='', $eatby='', $sellby='', $batch='', $fk_commandefourndet='') + function DispatchProduct($user, $product, $qty, $entrepot, $price=0, $comment='', $eatby='', $sellby='', $batch='', $fk_commandefourndet=0, $notrigger=0) { global $conf; $error = 0; diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 9874f809673..e62402feabb 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -81,7 +81,7 @@ if ($_POST["action"] == 'dispatch' && $user->rights->fournisseur->commande->rece $fk_commandefourndet = "fk_commandefourndet_".$reg[1]; if (GETPOST($ent,'int') > 0) { - $result = $commande->DispatchProduct($user, GETPOST($prod,'int'),GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), '', '', '', GETPOST($fk_commandefourndet, 'int')); + $result = $commande->DispatchProduct($user, GETPOST($prod,'int'),GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), '', '', '', GETPOST($fk_commandefourndet, 'int'), $notrigger); } else { @@ -98,35 +98,37 @@ if ($_POST["action"] == 'dispatch' && $user->rights->fournisseur->commande->rece $lot = "lot_number_".$reg[1]."_".$reg[2]; $dDLUO = dol_mktime(12, 0, 0, $_POST['dluo_'.$reg[1]."_".$reg[2].'month'], $_POST['dluo_'.$reg[1]."_".$reg[2].'day'], $_POST['dluo_'.$reg[1]."_".$reg[2].'year']); $dDLC = dol_mktime(12, 0, 0, $_POST['dlc_'.$reg[1]."_".$reg[2].'month'], $_POST['dlc_'.$reg[1]."_".$reg[2].'day'], $_POST['dlc_'.$reg[1]."_".$reg[2].'year']); - + $fk_commandefourndet = "fk_commandefourndet_".$reg[1]."_".$reg[2]; if (! (GETPOST($ent,'int') > 0)) { dol_syslog('No dispatch for line '.$key.' as no warehouse choosed'); $text = $langs->transnoentities('Warehouse').', '.$langs->transnoentities('Line').'' .($reg[1]-1); setEventMessage($langs->trans('ErrorFieldRequired',$text), 'errors'); - } + } if (!((GETPOST($qty) > 0 ) && ( $_POST[$lot] or $dDLUO or $dDLC) )) { dol_syslog('No dispatch for line '.$key.' as qty is not set or eat-by date are not set'); $text = $langs->transnoentities('atleast1batchfield').', '.$langs->transnoentities('Line').'' .($reg[1]-1); setEventMessage($langs->trans('ErrorFieldRequired',$text), 'errors'); - } else { - $result = $commande->DispatchProduct($user, GETPOST($prod,'int'),GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), $dDLC, $dDLUO, GETPOST($lot)); - } + } + else + { + $result = $commande->DispatchProduct($user, GETPOST($prod,'int'),GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), $dDLC, $dDLUO, GETPOST($lot), GETPOST($fk_commandefourndet, 'int'), $notrigger); + } } } - if (! $notrigger) + if (! $notrigger && ($result >= 0)) { global $conf, $langs, $user; - // Call trigger - $result=$commande->call_trigger('ORDER_SUPPLIER_DISPATCH',$user); + // Call trigger + $result = $commande->call_trigger('ORDER_SUPPLIER_DISPATCH', $user); // End call triggers } - if ($result > 0) + if ($result >= 0) { $db->commit(); @@ -138,6 +140,7 @@ if ($_POST["action"] == 'dispatch' && $user->rights->fournisseur->commande->rece $db->rollback(); $mesg='
    '.$langs->trans($commande->error).'
    '; + setEventMessage($mesg); } } From 2a34ec9db192f492362065d0e3a83eb7535b5bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 31 Mar 2015 16:26:32 +0200 Subject: [PATCH 264/412] Add badge --- htdocs/core/lib/tax.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php index 9040b59c85e..bee6999d183 100644 --- a/htdocs/core/lib/tax.lib.php +++ b/htdocs/core/lib/tax.lib.php @@ -57,7 +57,7 @@ function tax_prepare_head(ChargeSociales $object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id; $head[$h][1] = $langs->trans("Documents"); - if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$h][1].= ' '.$nbFiles.''; $head[$h][2] = 'documents'; $h++; From c71efc8f2eaa3677862326e5077720a0a7ff1dbb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 31 Mar 2015 16:59:40 +0200 Subject: [PATCH 265/412] Avoid pb with scrutinizer --- htdocs/core/lib/functions.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index c75387210aa..f5e5cc6f10f 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -4867,8 +4867,9 @@ function printCommonFooter($zone='private') print ''."\n"; // Add Xdebug coverage of code - if (defined('XDEBUGCOVERAGE')) { - var_dump(xdebug_get_code_coverage()); + if (defined('XDEBUGCOVERAGE')) + { + print_r(xdebug_get_code_coverage()); } } From 29e049d4f969b096793048236e8bc1953fe3f095 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 31 Mar 2015 17:22:14 +0200 Subject: [PATCH 266/412] Comment --- htdocs/index.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/index.php b/htdocs/index.php index 70950fb0b26..09c3196c7c5 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -1,9 +1,9 @@ - * Copyright (C) 2004-2013 Laurent Destailleur - * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2011-2012 Juanjo Menent - * Copyright (C) 2015 Marcos García +/* Copyright (C) 2001-2004 Rodolphe Quiedeville + * Copyright (C) 2004-2013 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2011-2012 Juanjo Menent + * Copyright (C) 2015 Marcos García * * 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 From 39d0c15c152f06acd4958526edc49dd917cf4c49 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 31 Mar 2015 17:23:07 +0200 Subject: [PATCH 267/412] Comment --- htdocs/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/index.php b/htdocs/index.php index 09c3196c7c5..d0056d0bbda 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -60,6 +60,7 @@ if (GETPOST('addbox')) // Add box (when submit is done from a form when ajax dis + /* * View */ From fc5d7e57a22ecde855a20086b340c5fc2cd512b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 31 Mar 2015 18:31:36 +0200 Subject: [PATCH 268/412] Correction for workboard in compta/bank/index.php --- htdocs/compta/bank/index.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index 9c9f0574c31..96a44ecd354 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -111,8 +111,12 @@ foreach ($accounts as $key=>$type) if ($acc->rappro) { $result=$acc->load_board($user,$acc->id); - print $acc->nbtodo; - if ($acc->nbtodolate) print ' ('.$acc->nbtodolate.img_warning($langs->trans("Late")).')'; + if ($result<0) { + setEventMessage($acc->error, 'errors'); + } else { + print $result->nbtodo; + if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')'; + } } else print $langs->trans("FeatureDisabled"); print ''; @@ -223,8 +227,12 @@ foreach ($accounts as $key=>$type) if ($acc->rappro) { $result=$acc->load_board($user,$acc->id); - print $acc->nbtodo; - if ($acc->nbtodolate) print ' ('.$acc->nbtodolate.img_warning($langs->trans("Late")).')'; + if ($result<0) { + setEventMessage($acc->error, 'errors'); + } else { + print $result->nbtodo; + if ($result->nbtodolate) print ' ('.$result->nbtodolate.img_warning($langs->trans("Late")).')'; + } } else print $langs->trans("FeatureDisabled"); print ''; From 46af2caba1e5072b15e835015a5b7ea35126cb1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 31 Mar 2015 18:51:24 +0200 Subject: [PATCH 269/412] Correction warning delay workboard propal --- htdocs/comm/propal/class/propal.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index 533df89b773..ce773b4e953 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -2415,7 +2415,7 @@ class Propal extends CommonObject } $response = new WorkboardResponse(); - $response->warning_delay = $delay_warning; + $response->warning_delay = $delay_warning/60/60/24; $response->label = $label; $response->url = DOL_URL_ROOT.'/comm/propal/list.php?viewstatut='.$statut; $response->img = img_object($langs->trans("Propals"),"propal"); From 309b05908951f17fee43a57b02f96d6364b24103 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Tue, 31 Mar 2015 21:00:22 +0200 Subject: [PATCH 270/412] New: Add a button to purge criteria in bank lines list --- htdocs/compta/bank/account.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 20ef8bcc3cc..6ba80304188 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -78,6 +78,16 @@ if ($negpage) $object = new Account($db); +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers +{ + $paiementtype=""; + $req_nb=""; + $thirdparty=""; + $req_desc=""; + $req_debit=""; + $req_credit=""; +} + /* * Action */ @@ -446,7 +456,10 @@ if ($id > 0 || ! empty($ref)) print '    '; print ''; print ''; - print ''; + print ''; print "\n"; From 9ee6fdd163cd2304ff1957a1913b9e082c16b531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 31 Mar 2015 21:07:17 +0200 Subject: [PATCH 271/412] Tooltip of actioncomm show empty ref --- htdocs/comm/action/class/actioncomm.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 37758eea2ab..900fea2d079 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -970,7 +970,10 @@ class ActionComm extends CommonObject $result=''; $tooltip = '' . $langs->trans('ShowAction'.$objp->code) . ''; - $tooltip .= '
    ' . $langs->trans('Ref') . ': ' . $this->label; + if (! empty($this->ref)) + $tooltip .= '
    ' . $langs->trans('Ref') . ': ' . $this->label; + if (! empty($this->label)) + $tooltip .= '
    ' . $langs->trans('Title') . ': ' . $this->label; $label = $this->label; if (empty($label)) $label=$this->libelle; // For backward compatibility $linkclose = '" title="'.dol_escape_htmltag($tooltip, 1).'" class="classfortooltip">'; From f0ed848609528e0aec2effdde7be5a66b727b615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 31 Mar 2015 21:38:38 +0200 Subject: [PATCH 272/412] Update actioncomm.class.php --- htdocs/comm/action/class/actioncomm.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 900fea2d079..cd91203c32e 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -971,7 +971,7 @@ class ActionComm extends CommonObject $result=''; $tooltip = '' . $langs->trans('ShowAction'.$objp->code) . ''; if (! empty($this->ref)) - $tooltip .= '
    ' . $langs->trans('Ref') . ': ' . $this->label; + $tooltip .= '
    ' . $langs->trans('Ref') . ': ' . $this->ref; if (! empty($this->label)) $tooltip .= '
    ' . $langs->trans('Title') . ': ' . $this->label; $label = $this->label; From 08e7cb2e8488b323df50a6566c5e73ec20992218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 31 Mar 2015 21:57:48 +0200 Subject: [PATCH 273/412] Correction for tooltip --- htdocs/comm/action/class/actioncomm.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index cd91203c32e..f3086408d4e 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -976,9 +976,9 @@ class ActionComm extends CommonObject $tooltip .= '
    ' . $langs->trans('Title') . ': ' . $this->label; $label = $this->label; if (empty($label)) $label=$this->libelle; // For backward compatibility - $linkclose = '" title="'.dol_escape_htmltag($tooltip, 1).'" class="classfortooltip">'; - if ($option=='birthday') $link = ''; + if ($option=='birthday') $link = 'load("companies"); From 3c2499f9a24397c66543a61f443ebca02c90df36 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Wed, 1 Apr 2015 10:10:39 +0200 Subject: [PATCH 275/412] Remove logo in initdata for admin user --- dev/initdata/generate-commande.php | 2 +- dev/initdata/generate-facture.php | 2 +- dev/initdata/generate-produit.php | 2 +- dev/initdata/generate-propale.php | 2 +- dev/initdata/generate-societe.php | 10 +++++----- dev/initdata/mysqldump_dolibarr_3.7.0.sql | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev/initdata/generate-commande.php b/dev/initdata/generate-commande.php index 967143ab4a5..785c0544876 100755 --- a/dev/initdata/generate-commande.php +++ b/dev/initdata/generate-commande.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/dev/generate-commande.php + * \file dev/initdata/generate-commande.php * \brief Script de generation de donnees aleatoires pour les commandes */ diff --git a/dev/initdata/generate-facture.php b/dev/initdata/generate-facture.php index 5c630454ba7..97f00f7d6d6 100755 --- a/dev/initdata/generate-facture.php +++ b/dev/initdata/generate-facture.php @@ -19,7 +19,7 @@ */ /** - * \file htdocs/dev/generate-facture.php + * \file dev/intdata/generate-facture.php * \brief Script de generation de donnees aleatoires pour les factures */ diff --git a/dev/initdata/generate-produit.php b/dev/initdata/generate-produit.php index d712c36e1e9..38ea93f131b 100755 --- a/dev/initdata/generate-produit.php +++ b/dev/initdata/generate-produit.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/dev/generate-produit.php + * \file dev/initdata/generate-produit.php * \brief Script de generation de donnees aleatoires pour les produits */ diff --git a/dev/initdata/generate-propale.php b/dev/initdata/generate-propale.php index a887b86b1a8..b7b76ec2c02 100755 --- a/dev/initdata/generate-propale.php +++ b/dev/initdata/generate-propale.php @@ -20,7 +20,7 @@ */ /** - * \file htdocs/dev/generate-propale.php + * \file dev/initdata/generate-propale.php * \brief Script de generation de donnees aleatoires pour les propales */ diff --git a/dev/initdata/generate-societe.php b/dev/initdata/generate-societe.php index c0c512db636..72e4d9b1e84 100755 --- a/dev/initdata/generate-societe.php +++ b/dev/initdata/generate-societe.php @@ -20,8 +20,8 @@ */ /** - * \file htdocs/dev/generate-societe.php - * \brief Script de generation de donnees aleatoires pour les societes + * \file dev/initdata/generate-societe.php + * \brief Script de generation de donnees aleatoires pour les societes */ // Test si mode batch @@ -89,7 +89,7 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++) { print "Company $s\n"; $soc = new Societe($db); - $soc->nom = "Company num ".time()."$s"; + $soc->name = "Company num ".time()."$s"; $soc->town = $listoftown[rand(0, count($listoftown)-1)]; $soc->client = rand(1,2); // Une societe sur 2 est prospect, l'autre client $soc->fournisseur = rand(0,1); // Une societe sur 2 est fournisseur @@ -101,7 +101,7 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++) // Un client sur 3 a une remise de 5% $user_remise=rand(1,3); if ($user_remise==3) $soc->remise_percent=5; print "> client=".$soc->client.", fournisseur=".$soc->fournisseur.", remise=".$soc->remise_percent."\n"; - $soc->note='Company created by the script generate-societe.php'; + $soc->note_private = 'Company created by the script generate-societe.php'; $socid = $soc->create(); if ($socid >= 0) @@ -120,7 +120,7 @@ for ($s = 0 ; $s < GEN_NUMBER_SOCIETE ; $s++) } } - print "Company ".$s." created nom=".$soc->nom."\n"; + print "Company ".$s." created nom=".$soc->name."\n"; } else { diff --git a/dev/initdata/mysqldump_dolibarr_3.7.0.sql b/dev/initdata/mysqldump_dolibarr_3.7.0.sql index 9e920813519..3dda5017828 100644 --- a/dev/initdata/mysqldump_dolibarr_3.7.0.sql +++ b/dev/initdata/mysqldump_dolibarr_3.7.0.sql @@ -7427,7 +7427,7 @@ CREATE TABLE `llx_user` ( LOCK TABLES `llx_user` WRITE; /*!40000 ALTER TABLE `llx_user` DISABLE KEYS */; -INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2012-12-12 16:54:10',NULL,NULL,'admin',0,NULL,NULL,NULL,'admin','21232f297a57a5a743894a0e4a801fc3',NULL,'SuperAdminName','Firstname','',NULL,'','','','bidon@destailleur.fr','',1,'','','',1,1,NULL,NULL,NULL,'','2014-12-21 20:52:09','2014-12-21 13:51:38',NULL,'',1,'01.jpg',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(2,'2010-07-08 13:54:48','2010-07-08 09:54:48',NULL,NULL,'demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,'John','Doe',NULL,NULL,'09123123','','','johndoe@mycompany.com',NULL,0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(3,'2010-07-11 16:18:59','2013-02-20 18:07:21',NULL,NULL,'adupont',1,NULL,NULL,NULL,'adupont','00856ab2bbb748aa29aa335a6e3a2407',NULL,'Dupont','Alain','',NULL,'','','','toto@aa.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(4,'2013-01-23 17:52:27','2013-02-20 18:48:01',NULL,NULL,'aaa',1,NULL,NULL,NULL,'aaa','47bce5c74f589f4867dbd57e9ca9f808',NULL,'aaa','','',NULL,'','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,5,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(5,'2013-01-23 17:52:37','2013-01-23 15:52:37',NULL,NULL,'bbb',0,NULL,NULL,NULL,'bbb','08f8e0260c64418510cefb2b06eee5cd',NULL,'bbb','','',NULL,'','','','','',1,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(6,'2013-02-16 20:22:40','2013-02-16 18:22:40',NULL,NULL,'aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',NULL,'aaab','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(7,'2013-02-16 20:48:15','2013-02-16 18:48:15',NULL,NULL,'zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',NULL,'zzz','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(9,'2013-02-16 20:50:07','2013-03-24 15:10:14',NULL,NULL,'zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',NULL,'zzzg','','',NULL,'','','','','fsdkkfsdf
    \r\nfsdfsd
    \r\nfsdfs',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,5,NULL,'','','',NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL); +INSERT INTO `llx_user` VALUES (1,'2010-07-08 13:20:11','2012-12-12 16:54:10',NULL,NULL,'admin',0,NULL,NULL,NULL,'admin','21232f297a57a5a743894a0e4a801fc3',NULL,'SuperAdminName','Firstname','',NULL,'','','','bidon@destailleur.fr','',1,'','','',1,1,NULL,NULL,NULL,'','2014-12-21 20:52:09','2014-12-21 13:51:38',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(2,'2010-07-08 13:54:48','2010-07-08 09:54:48',NULL,NULL,'demo',1,NULL,NULL,NULL,'demo','fe01ce2a7fbac8fafaed7c982a04e229',NULL,'John','Doe',NULL,NULL,'09123123','','','johndoe@mycompany.com',NULL,0,'','','',1,1,NULL,NULL,NULL,'','2013-03-24 16:30:29','2010-07-08 14:12:02',NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(3,'2010-07-11 16:18:59','2013-02-20 18:07:21',NULL,NULL,'adupont',1,NULL,NULL,NULL,'adupont','00856ab2bbb748aa29aa335a6e3a2407',NULL,'Dupont','Alain','',NULL,'','','','toto@aa.com','',0,'','','',1,1,NULL,NULL,2,'','2012-12-21 17:38:55',NULL,NULL,'',1,NULL,NULL,NULL,2,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(4,'2013-01-23 17:52:27','2013-02-20 18:48:01',NULL,NULL,'aaa',1,NULL,NULL,NULL,'aaa','47bce5c74f589f4867dbd57e9ca9f808',NULL,'aaa','','',NULL,'','','','','',0,'','','',1,1,17,6,NULL,'','2013-02-25 10:18:41','2013-01-23 17:53:20',NULL,'',1,NULL,NULL,NULL,5,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(5,'2013-01-23 17:52:37','2013-01-23 15:52:37',NULL,NULL,'bbb',0,NULL,NULL,NULL,'bbb','08f8e0260c64418510cefb2b06eee5cd',NULL,'bbb','','',NULL,'','','','','',1,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(6,'2013-02-16 20:22:40','2013-02-16 18:22:40',NULL,NULL,'aaab',2,NULL,NULL,NULL,'aaab','4c189b020ceb022e0ecc42482802e2b8',NULL,'aaab','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(7,'2013-02-16 20:48:15','2013-02-16 18:48:15',NULL,NULL,'zzz',2,NULL,NULL,NULL,'zzz','f3abb86bd34cf4d52698f14c0da1dc60',NULL,'zzz','','',NULL,'','','','','',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL),(9,'2013-02-16 20:50:07','2013-03-24 15:10:14',NULL,NULL,'zzzg',2,NULL,NULL,NULL,'jc28fg4h','93d789524fd223cf05eecea3f59cbe86',NULL,'zzzg','','',NULL,'','','','','fsdkkfsdf
    \r\nfsdfsd
    \r\nfsdfs',0,'','','',1,1,NULL,NULL,NULL,'',NULL,NULL,NULL,'',1,NULL,NULL,NULL,5,NULL,'','','',NULL,NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `llx_user` ENABLE KEYS */; UNLOCK TABLES; From 5fe5ec939da6dccb515b20da2b6eb4bc144dd96c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Apr 2015 10:54:24 +0200 Subject: [PATCH 276/412] Fix: delivery date must not be autofill with current date --- htdocs/commande/card.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index 27c333eec21..d205b3a603e 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -1279,7 +1279,7 @@ if ($action == 'create' && $user->rights->commande->creer) { $demand_reason_id = (!empty($objectsrc->demand_reason_id)?$objectsrc->demand_reason_id:(!empty($soc->demand_reason_id)?$soc->demand_reason_id:0)); $remise_percent = (!empty($objectsrc->remise_percent)?$objectsrc->remise_percent:(!empty($soc->remise_percent)?$soc->remise_percent:0)); $remise_absolue = (!empty($objectsrc->remise_absolue)?$objectsrc->remise_absolue:(!empty($soc->remise_absolue)?$soc->remise_absolue:0)); - $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''; + $dateorder = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER)?-1:''; $datedelivery = (! empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : ''); @@ -1300,7 +1300,7 @@ if ($action == 'create' && $user->rights->commande->creer) { $demand_reason_id = $soc->demand_reason_id; $remise_percent = $soc->remise_percent; $remise_absolue = 0; - $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''; + $dateorder = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER)?-1:''; $projectid = 0; } $absolute_discount=$soc->getAvailableDiscounts(); @@ -1368,7 +1368,8 @@ if ($action == 'create' && $user->rights->commande->creer) { } // Date print '    '; // Date de livraison @@ -1376,7 +1377,7 @@ if ($action == 'create' && $user->rights->commande->creer) { if (empty($datedelivery)) { if (! empty($conf->global->DATE_LIVRAISON_WEEK_DELAY)) $datedelivery = time() + ((7*$conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60); - else $datedelivery=empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''; + else $datedelivery=empty($conf->global->MAIN_AUTOFILL_DATE_DELIVERY)?-1:''; } $form->select_date($datedelivery, 'liv_', '', '', '', "crea_commande", 1, 1); print ""; From 293495467f5457eb92e27355efea6ca7a7c20da3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Apr 2015 11:30:48 +0200 Subject: [PATCH 277/412] Fix: Bad ref used into notification message --- htdocs/commande/class/commande.class.php | 4 +-- htdocs/core/class/notify.class.php | 34 +++++++++++++----------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 519ba8cd43f..ba581a1ca7a 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -109,7 +109,7 @@ class Commande extends CommonOrder // Pour board var $nbtodo; var $nbtodolate; - + /** * ERR Not engouch stock */ @@ -299,7 +299,7 @@ class Commande extends CommonOrder // Rename directory if dir was a temporary ref if (preg_match('/^[\(]?PROV/i', $this->ref)) { - // On renomme repertoire ($this->ref = ancienne ref, $numfa = nouvelle ref) + // On renomme repertoire ($this->ref = ancienne ref, $num = nouvelle ref) // in order not to lose the attachments $oldref = dol_sanitizeFileName($this->ref); $newref = dol_sanitizeFileName($num); diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php index ac63b3e48c5..b0d4b4e2690 100644 --- a/htdocs/core/class/notify.class.php +++ b/htdocs/core/class/notify.class.php @@ -171,6 +171,8 @@ class Notify return 0; } + $oldref=(empty($object->oldref)?$object->ref:$object->oldref); + $newref=(empty($object->newref)?$object->ref:$object->newref); // Check notification per third party $sql = "SELECT s.nom, c.email, c.rowid as cid, c.lastname, c.firstname, c.default_lang,"; @@ -215,32 +217,32 @@ class Notify $link='/compta/facture.php?facid='.$object->id; $dir_output = $conf->facture->dir_output; $object_type = 'facture'; - $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref); + $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref); break; case 'ORDER_VALIDATE': $link='/commande/card.php?id='.$object->id; $dir_output = $conf->commande->dir_output; $object_type = 'order'; - $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref); + $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$newref); break; case 'PROPAL_VALIDATE': $link='/comm/propal.php?id='.$object->id; $dir_output = $conf->propal->dir_output; $object_type = 'propal'; - $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref); + $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$newref); break; case 'FICHINTER_VALIDATE': $link='/fichinter/card.php?id='.$object->id; $dir_output = $conf->facture->dir_output; $object_type = 'ficheinter'; - $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref); + $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$newref); break; case 'ORDER_SUPPLIER_APPROVE': $link='/fourn/commande/card.php?id='.$object->id; $dir_output = $conf->fournisseur->dir_output.'/commande/'; $object_type = 'order_supplier'; $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; - $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs)); + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$newref,$user->getFullName($langs)); $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; break; case 'ORDER_SUPPLIER_REFUSE': @@ -248,16 +250,16 @@ class Notify $dir_output = $conf->fournisseur->dir_output.'/commande/'; $object_type = 'order_supplier'; $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; - $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs)); + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$newref,$user->getFullName($langs)); $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; break; case 'SHIPPING_VALIDATE': $dir_output = $conf->expedition->dir_output.'/sending/'; $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref); + $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref); break; } - $ref = dol_sanitizeFileName($object->ref); + $ref = dol_sanitizeFileName($newref); $pdf_path = $dir_output."/".$ref."/".$ref.".pdf"; if (! dol_is_file($pdf_path)) { @@ -344,32 +346,32 @@ class Notify $link='/compta/facture.php?facid='.$object->id; $dir_output = $conf->facture->dir_output; $object_type = 'facture'; - $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$object->ref); + $mesg = $langs->transnoentitiesnoconv("EMailTextInvoiceValidated",$newref); break; case 'ORDER_VALIDATE': $link='/commande/card.php?id='.$object->id; $dir_output = $conf->commande->dir_output; $object_type = 'order'; - $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$object->ref); + $mesg = $langs->transnoentitiesnoconv("EMailTextOrderValidated",$newref); break; case 'PROPAL_VALIDATE': $link='/comm/propal.php?id='.$object->id; $dir_output = $conf->propal->dir_output; $object_type = 'propal'; - $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$object->ref); + $mesg = $langs->transnoentitiesnoconv("EMailTextProposalValidated",$newref); break; case 'FICHINTER_VALIDATE': $link='/fichinter/card.php?id='.$object->id; $dir_output = $conf->facture->dir_output; $object_type = 'ficheinter'; - $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$object->ref); + $mesg = $langs->transnoentitiesnoconv("EMailTextInterventionValidated",$newref); break; case 'ORDER_SUPPLIER_APPROVE': $link='/fourn/commande/card.php?id='.$object->id; $dir_output = $conf->fournisseur->dir_output.'/commande/'; $object_type = 'order_supplier'; $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; - $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$object->ref,$user->getFullName($langs)); + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderApprovedBy",$newref,$user->getFullName($langs)); $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; break; case 'ORDER_SUPPLIER_REFUSE': @@ -377,16 +379,16 @@ class Notify $dir_output = $conf->fournisseur->dir_output.'/commande/'; $object_type = 'order_supplier'; $mesg = $langs->transnoentitiesnoconv("Hello").",\n\n"; - $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$object->ref,$user->getFullName($langs)); + $mesg.= $langs->transnoentitiesnoconv("EMailTextOrderRefusedBy",$newref,$user->getFullName($langs)); $mesg.= "\n\n".$langs->transnoentitiesnoconv("Sincerely").".\n\n"; break; case 'SHIPPING_VALIDATE': $dir_output = $conf->expedition->dir_output.'/sending/'; $object_type = 'order_supplier'; - $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$object->ref); + $mesg = $langs->transnoentitiesnoconv("EMailTextExpeditionValidated",$newref); break; } - $ref = dol_sanitizeFileName($object->ref); + $ref = dol_sanitizeFileName($newref); $pdf_path = $dir_output."/".$ref."/".$ref.".pdf"; if (! dol_is_file($pdf_path)) { From 1bc0f6c99f303336d706027782c5e83fd7c1e61b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Apr 2015 12:02:32 +0200 Subject: [PATCH 278/412] Fix: do not show end date when it is same than start date --- htdocs/core/class/html.formactions.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 333969fc3b3..ee26ca2ba7b 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -210,7 +210,10 @@ class FormActions { $tmpa=dol_getdate($action->datep); $tmpb=dol_getdate($action->datef); - if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) print '-'.dol_print_date($action->datef,'hour'); + if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) + { + if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef,'hour'); + } else print '-'.dol_print_date($action->datef,'dayhour'); } print ''; From ad1e4134a95198da3ef59405e5d8dbf1d8c5bc8b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Apr 2015 12:22:50 +0200 Subject: [PATCH 279/412] Fix: bcc was lost if notif to bcc was also forced --- htdocs/core/actions_sendmails.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php index 49de1529321..590c805b8aa 100644 --- a/htdocs/core/actions_sendmails.inc.php +++ b/htdocs/core/actions_sendmails.inc.php @@ -132,9 +132,9 @@ if (($action == 'send' || $action == 'relance') && ! $_POST['addfile'] && ! $_PO $replyto = $_POST['replytoname']. ' <' . $_POST['replytomail'].'>'; $message = $_POST['message']; $sendtobcc= GETPOST('sendtoccc'); - if ($mode == 'emailfromproposal') $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO); - if ($mode == 'emailfromorder') $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO); - if ($mode == 'emailfrominvoice') $sendtobcc = (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO)?'':$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO); + if ($mode == 'emailfromproposal') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_PROPOSAL_TO)); + if ($mode == 'emailfromorder') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_ORDER_TO)); + if ($mode == 'emailfrominvoice') $sendtobcc .= (empty($conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO) ? '' : (($sendtobcc?", ":"").$conf->global->MAIN_MAIL_AUTOCOPY_INVOICE_TO)); $deliveryreceipt = $_POST['deliveryreceipt']; From 16a620f926b4455efcc0d604bd3e15b3ed65a8db Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Apr 2015 16:07:22 +0200 Subject: [PATCH 280/412] Fix: Deadlock situation (when order were canceled, no way to make nothing on it) Fix: Don't know how I forgot this events into trigger system. --- htdocs/comm/action/class/actioncomm.class.php | 4 +-- htdocs/commande/card.php | 8 +++-- htdocs/commande/class/commande.class.php | 6 ++-- ...terface_50_modAgenda_ActionsAuto.class.php | 35 ++++++++++++++++++- .../mysql/data/llx_c_action_trigger.sql | 17 +++++---- .../install/mysql/migration/3.6.0-3.7.0.sql | 3 ++ htdocs/langs/en_US/agenda.lang | 5 ++- 7 files changed, 61 insertions(+), 17 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index bc66514940d..6ff654aadd1 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -476,9 +476,9 @@ class ActionComm extends CommonObject $this->error=$this->db->lasterror(); return -1; } - + return $num; - + } diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index d205b3a603e..a56f94e1a7e 100644 --- a/htdocs/commande/card.php +++ b/htdocs/commande/card.php @@ -138,8 +138,10 @@ if (empty($reshook)) } // Reopen a closed order - else if ($action == 'reopen' && $user->rights->commande->creer) { - if ($object->statut == 3) { + else if ($action == 'reopen' && $user->rights->commande->creer) + { + if ($object->statut == -1 || $object->statut == 3) + { $result = $object->set_reopen($user); if ($result > 0) { @@ -2181,7 +2183,7 @@ if ($action == 'create' && $user->rights->commande->creer) { } // Reopen a closed order - if ($object->statut == 3 && $user->rights->commande->creer) { + if (($object->statut == 3 || $object->statut == -1) && $user->rights->commande->creer) { print '
    ' . $langs->trans('ReOpen') . '
    '; } diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index ba581a1ca7a..0b7c6a19849 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -60,7 +60,7 @@ class Commande extends CommonOrder var $ref_int; var $contactid; var $fk_project; - var $statut; // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not) + var $statut; // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Delivered=Sent/Received, billed or not) var $facturee; // deprecated var $billed; // billed or not @@ -437,7 +437,7 @@ class Commande extends CommonOrder global $conf,$langs; $error=0; - if ($this->statut != 3) + if ($this->statut != -1 && $this->statut != 3) { dol_syslog(get_class($this)."::set_reopen order has not status closed", LOG_WARNING); return 0; @@ -461,7 +461,7 @@ class Commande extends CommonOrder else { $error++; - $this->error=$this->db->error(); + $this->error=$this->db->lasterror(); dol_print_error($this->db); } diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php index 346932ec61e..0ab64d406c8 100644 --- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php +++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php @@ -182,7 +182,40 @@ class InterfaceActionsAuto extends DolibarrTriggers $object->sendtoid=0; } - elseif ($action == 'ORDER_SENTBYMAIL') + elseif ($action == 'ORDER_CLOSE') + { + $langs->load("orders"); + + $object->actiontypecode='AC_OTH_AUTO'; + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref); + $object->actionmsg=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref); + $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; + + $object->sendtoid=0; + } + elseif ($action == 'ORDER_CLASSIFY_BILLED') + { + $langs->load("orders"); + + $object->actiontypecode='AC_OTH_AUTO'; + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr",$object->ref); + $object->actionmsg=$langs->transnoentities("OrderBilledInDolibarr",$object->ref); + $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; + + $object->sendtoid=0; + } + elseif ($action == 'ORDER_CANCEL') + { + $langs->load("orders"); + + $object->actiontypecode='AC_OTH_AUTO'; + if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref); + $object->actionmsg=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref); + $object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login; + + $object->sendtoid=0; + } + elseif ($action == 'ORDER_SENTBYMAIL') { $langs->load("orders"); diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql index 29adb70c46e..1dde6d5d37c 100644 --- a/htdocs/install/mysql/data/llx_c_action_trigger.sql +++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql @@ -32,25 +32,29 @@ -- List of all managed triggered events (used for trigger agenda and for notification) -- delete from llx_c_action_trigger; -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6); -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12); -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13); -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4); -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_SENTBYMAIL','Mails sent from third party card','Executed when you send email from third party card','societe',1); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1); -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22); @@ -58,7 +62,6 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25); -insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19); diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql index 7a432a1109e..aa3450e2ea5 100755 --- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql +++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql @@ -27,6 +27,9 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19); insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5); +insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5); -- VPGSQL8.2 ALTER TABLE llx_contrat ALTER COLUMN fk_commercial_signature DROP NOT NULL; -- VPGSQL8.2 ALTER TABLE llx_contrat ALTER COLUMN fk_commercial_suivi DROP NOT NULL; diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 48c284e2022..3a3f24e2dc1 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status InvoiceDeleteDolibarr=Invoice %s deleted -OrderValidatedInDolibarr= Order %s validated +OrderValidatedInDolibarr=Order %s validated +OrderDeliveredInDolibarr=Order %s classified delivered +OrderCanceledInDolibarr=Order %s canceled +OrderBilledInDolibarr=Order %s classified billed OrderApprovedInDolibarr=Order %s approved OrderRefusedInDolibarr=Order %s refused OrderBackToDraftInDolibarr=Order %s go back to draft status From 824d8ddb575335ae4382ae8da0995f3fdcbf0aaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 1 Apr 2015 18:57:54 +0200 Subject: [PATCH 281/412] Delete phpinfo.php --- htdocs/conf/phpinfo.php | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 htdocs/conf/phpinfo.php diff --git a/htdocs/conf/phpinfo.php b/htdocs/conf/phpinfo.php deleted file mode 100644 index 179bd651458..00000000000 --- a/htdocs/conf/phpinfo.php +++ /dev/null @@ -1,5 +0,0 @@ -Go back to index -| ">Refresh -

    - - \ No newline at end of file From d8db32a99cef66352dd1ed343eaba033a5430cae Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Apr 2015 21:00:51 +0200 Subject: [PATCH 282/412] NEW: Introduce option SUPPLIER_ORDER_DOUBLE_APPROVAL to allow 2 approvals to make a supplier order approved. Activating this option introduce a new permission to the second level approval. --- htdocs/admin/supplier_order.php | 73 +++++++++--- htdocs/core/class/html.form.class.php | 10 +- htdocs/core/class/html.formcompany.class.php | 16 ++- .../class/fournisseur.commande.class.php | 86 ++++++++++---- htdocs/fourn/commande/card.php | 112 +++++++++++++----- .../install/mysql/migration/3.7.0-3.8.0.sql | 2 + .../mysql/tables/llx_commande_fournisseur.sql | 2 + htdocs/langs/en_US/admin.lang | 1 + htdocs/langs/en_US/orders.lang | 4 +- htdocs/societe/soc.php | 3 +- 10 files changed, 230 insertions(+), 79 deletions(-) diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index fb9ac6fa39c..25f2fbb3314 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -169,29 +169,57 @@ else if ($action == 'set_SUPPLIER_ORDER_OTHER') { $freetext = GETPOST('SUPPLIER_ORDER_FREE_TEXT'); // No alpha here, we want exact string $doubleapproval = GETPOST('SUPPLIER_ORDER_DOUBLE_APPROVAL'); - $doubleapprovalgroup = GETPOST('SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP') > 0 ? GETPOST('SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP') : ''; - + //$doubleapprovalgroup = GETPOST('SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP') > 0 ? GETPOST('SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP') : ''; + $res1 = dolibarr_set_const($db, "SUPPLIER_ORDER_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity); $res2 = dolibarr_set_const($db, "SUPPLIER_ORDER_DOUBLE_APPROVAL",$doubleapproval,'chaine',0,'',$conf->entity); - if (isset($_POST["SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP"])) + /*if (isset($_POST["SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP"])) { $res3 = dolibarr_set_const($db, "SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP",$doubleapprovalgroup,'chaine',0,'',$conf->entity); } else { $res3=1; - } - - if (! $res1 > 0 || ! $res2 > 0 || ! $res3 > 0) $error++; + }*/ - if (! $error) - { - setEventMessage($langs->trans("SetupSaved")); - } - else - { - setEventMessage($langs->trans("Error"),'errors'); - } + // TODO We add/delete permission until permission can have a condition on a global var + $r_id = 1190; + $entity = $conf->entity; + $r_desc='Permission for second approval'; + $r_modul='fournisseur'; + $r_type='w'; + $r_perms='commande'; + $r_subperms='approve2'; + $r_def=0; + + if ($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL) + { + $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def"; + $sql.= " (id, entity, libelle, module, type, bydefault, perms, subperms)"; + $sql.= " VALUES "; + $sql.= "(".$r_id.",".$entity.",'".$db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')"; + + $resqlinsert=$db->query($sql,1); + if (! $resqlinsert) + { + if ($db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS") + { + setEventMessage($db->lasterror(),'errors'); + $error++; + } + } + } + else + { + $sql = "DELETE FROM ".MAIN_DB_PREFIX."rights_def"; + $sql.= " WHERE id = ".$r_id; + $resqldelete=$db->query($sql,1); + if (! $resqldelete) + { + setEventMessage($db->lasterror(),'errors'); + $error++; + } + } } @@ -467,16 +495,25 @@ print '    '; print ''; print ''; print "\n"; - +$var=false; if ($conf->global->MAIN_FEATURES_LEVEL > 0) { print '\n"; + $var=!$var; + /*print '\n"; + $var=!$var;*/ } print ''; + // Juridical type print ''; // Capital From dc89e36583b27d506ec271122bd7110258b4b279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 1 Apr 2015 21:12:08 +0200 Subject: [PATCH 283/412] Update card.php --- htdocs/don/payment/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php index 3abff69a624..ba551deea67 100644 --- a/htdocs/don/payment/card.php +++ b/htdocs/don/payment/card.php @@ -202,7 +202,7 @@ $sql.= ' WHERE pd.fk_donation = d.rowid'; $sql.= ' AND d.entity = '.$conf->entity; $sql.= ' AND pd.rowid = '.$id; -dol_syslog("donations/payment/card.php", LOG_DEBUG); +dol_syslog("don/payment/card.php", LOG_DEBUG); $resql=$db->query($sql); if ($resql) { From d8f56eb406dbf6b746bb7415e4c5a85efc9702f2 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 2 Apr 2015 06:36:32 +0200 Subject: [PATCH 284/412] New: better integration in project for donation module Fixed: Rename fk_project in fk_projet (Sic!) for better compatibility --- htdocs/don/card.php | 8 +-- htdocs/don/class/don.class.php | 26 +++++----- htdocs/don/list.php | 4 +- .../install/mysql/migration/3.7.0-3.8.0.sql | 2 +- htdocs/install/mysql/tables/llx_don.sql | 6 +-- htdocs/projet/element.php | 49 +++++++++++++++---- 6 files changed, 62 insertions(+), 33 deletions(-) diff --git a/htdocs/don/card.php b/htdocs/don/card.php index d3ce60a5381..cfe28532637 100644 --- a/htdocs/don/card.php +++ b/htdocs/don/card.php @@ -106,7 +106,7 @@ if ($action == 'update') $object->email = GETPOST("email"); $object->date = $donation_date; $object->public = GETPOST("public"); - $object->fk_project = GETPOST("fk_project"); + $object->fk_projet = GETPOST("fk_projet"); $object->note_private= GETPOST("note_private"); $object->note_public = GETPOST("note_public"); @@ -161,7 +161,7 @@ if ($action == 'add') $object->note_private= GETPOST("note_private"); $object->note_public = GETPOST("note_public"); $object->public = GETPOST("public"); - $object->fk_project = GETPOST("fk_project"); + $object->fk_projet = GETPOST("fk_projet"); // Fill array 'array_options' with data from add form $ret = $extrafields->setOptionalsFromPost($extralabels,$object); @@ -343,7 +343,7 @@ if ($action == 'create') $formproject=new FormProjets($db); print "\n"; } @@ -459,7 +459,7 @@ if (! empty($id) && $action == 'edit') $langs->load('projects'); print ''; } diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 5e36037738f..080d0adb806 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -54,7 +54,7 @@ class Don extends CommonObject var $country; var $email; var $public; - var $fk_project; + var $fk_projet; var $modepaiement; var $modepaiementid; var $note_private; @@ -337,7 +337,7 @@ class Don extends CommonObject // $sql.= ", country"; -- Deprecated $sql.= ", fk_country"; $sql.= ", public"; - $sql.= ", fk_project"; + $sql.= ", fk_projet"; $sql.= ", note_private"; $sql.= ", note_public"; $sql.= ", fk_user_author"; @@ -359,7 +359,7 @@ class Don extends CommonObject $sql.= ", '".$this->db->escape($this->town)."'"; $sql.= ", ".$this->country_id; $sql.= ", ".$this->public; - $sql.= ", ".($this->fk_project > 0?$this->fk_project:"null"); + $sql.= ", ".($this->fk_projet > 0?$this->fk_projet:"null"); $sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL"); $sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL"); $sql.= ", ".$user->id; @@ -455,7 +455,7 @@ class Don extends CommonObject $sql .= ",town='".$this->db->escape($this->town)."'"; $sql .= ",fk_country = ".$this->country_id; $sql .= ",public=".$this->public; - $sql .= ",fk_project=".($this->fk_project>0?$this->fk_project:'null'); + $sql .= ",fk_projet=".($this->fk_projet>0?$this->fk_projet:'null'); $sql .= ",note_private=".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL"); $sql .= ",note_public=".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL"); $sql .= ",datedon='".$this->db->idate($this->date)."'"; @@ -601,11 +601,11 @@ class Don extends CommonObject $sql = "SELECT d.rowid, d.datec, d.tms as datem, d.datedon,"; $sql.= " d.firstname, d.lastname, d.societe, d.amount, d.fk_statut, d.address, d.zip, d.town, "; $sql.= " d.fk_country, d.country as country_olddata, d.public, d.amount, d.fk_payment, d.paid, d.note_private, d.note_public, cp.libelle, d.email, d.phone, "; - $sql.= " d.phone_mobile, d.fk_project,"; + $sql.= " d.phone_mobile, d.fk_projet,"; $sql.= " p.title as project_label,"; $sql.= " c.code as country_code, c.label as country"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d"; - $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_project"; + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = d.fk_projet"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid"; if (! empty($id)) @@ -647,7 +647,7 @@ class Don extends CommonObject $this->phone = $obj->phone; $this->phone_mobile = $obj->phone_mobile; $this->project = $obj->project_label; - $this->fk_project = $obj->fk_project; + $this->fk_projet = $obj->fk_projet; $this->public = $obj->public; $this->modepaymentid = $obj->fk_payment; $this->modepayment = $obj->libelle; @@ -677,8 +677,8 @@ class Don extends CommonObject /** * Validate a promise of donation * - * @param int $id id of donation - * @param int $userid User who validate the promise + * @param int $id id of donation + * @param int $userid User who validate the donation/promise * @return int <0 if KO, >0 if OK */ function valid_promesse($id, $userid) @@ -706,10 +706,10 @@ class Don extends CommonObject } /** - * Classe le don comme paye, le don a ete recu + * Classify the donation as paid, the donation was received * - * @param int $id id du don a modifier - * @param int $modepaiement mode de paiement + * @param int $id id of donation + * @param int $modepayment mode de payment * @return int <0 if KO, >0 if OK */ function set_paid($id, $modepaiement='') @@ -741,7 +741,7 @@ class Don extends CommonObject } /** - * Set donation to status canceled + * Set donation to status cancelled * * @param int $id id of donation * @return int <0 if KO, >0 if OK diff --git a/htdocs/don/list.php b/htdocs/don/list.php index ee7a6f5e6f9..2fb2e066b5b 100644 --- a/htdocs/don/list.php +++ b/htdocs/don/list.php @@ -73,7 +73,7 @@ $sql = "SELECT d.rowid, d.datedon, d.firstname, d.lastname, d.societe,"; $sql.= " d.amount, d.fk_statut as statut, "; $sql.= " p.rowid as pid, p.ref, p.title, p.public"; $sql.= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p"; -$sql.= " ON p.rowid = d.fk_project WHERE 1 = 1"; +$sql.= " ON p.rowid = d.fk_projet WHERE 1 = 1"; if ($statut >= 0) { $sql .= " AND d.fk_statut = ".$statut; @@ -125,7 +125,7 @@ if ($resql) if (! empty($conf->projet->enabled)) { $langs->load("projects"); - print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_project","&page=$page&statut=$statut","","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Project"),$_SERVER["PHP_SELF"],"fk_projet","&page=$page&statut=$statut","","",$sortfield,$sortorder); } print_liste_field_titre($langs->trans("Amount"),$_SERVER["PHP_SELF"],"d.amount","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"d.fk_statut","&page=$page&statut=$statut","",'align="right"',$sortfield,$sortorder); diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index b1b4eccbf56..57cb8745502 100644 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -425,7 +425,7 @@ ALTER TABLE llx_societe_extrafields ADD UNIQUE INDEX uk_societe_extrafields (fk_ ALTER TABLE llx_don ADD COLUMN fk_country integer NOT NULL after country; ALTER TABLE llx_don CHANGE COLUMN fk_paiement fk_payment integer; ALTER TABLE llx_don ADD COLUMN paid smallint default 0 NOT NULL after fk_payment; -ALTER TABLE llx_don CHANGE COLUMN fk_don_projet fk_project integer NULL; +ALTER TABLE llx_don CHANGE COLUMN fk_don_projet fk_projet integer NULL; create table llx_don_extrafields ( diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql index d33467f9a7b..f2aa52f073d 100644 --- a/htdocs/install/mysql/tables/llx_don.sql +++ b/htdocs/install/mysql/tables/llx_don.sql @@ -27,8 +27,8 @@ create table llx_don entity integer DEFAULT 1 NOT NULL, -- multi company id tms timestamp, fk_statut smallint NOT NULL DEFAULT 0, -- Status of donation promise or validate - datec datetime, -- date de creation de l'enregistrement - datedon datetime, -- date du don/promesse + datec datetime, -- Create date + datedon datetime, -- Date of the donation/promise amount real DEFAULT 0, fk_payment integer, paid smallint default 0 NOT NULL, @@ -44,7 +44,7 @@ create table llx_don phone varchar(24), phone_mobile varchar(24), public smallint DEFAULT 1 NOT NULL, -- Donation is public ? (0,1) - fk_project integer NULL, -- Donation is given for a project ? + fk_projet integer NULL, -- Donation is given for a project ? fk_user_author integer NOT NULL, fk_user_valid integer NULL, note_private text, diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 8abddb18ce9..2d5ab0f64d6 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -254,9 +254,10 @@ $listofreferent=array( 'name'=>"Donation", 'title'=>"ListDonationsAssociatedProject", 'class'=>'Don', + 'margin'=>'add', 'table'=>'don', 'datefieldname'=>'date', - 'disableamount'=>1, + 'disableamount'=>0, 'test'=>$conf->don->enabled && $user->rights->don->lire), ); @@ -344,7 +345,7 @@ foreach ($listofreferent as $key => $value) print ''; // Thirdparty or user print ''; if (empty($value['disableamount'])) print ''; @@ -461,15 +462,26 @@ foreach ($listofreferent as $key => $value) $tmpuser=new User($db); $tmpuser->fetch($expensereport->fk_user_author); print $tmpuser->getNomUrl(1,'',48); + } + else if ($tablename == 'don') + { + $tmpuser2=new User($db); + $tmpuser2->fetch($don->fk_user_author); + print $tmpuser2->getNomUrl(1,'',48); } print ''; // Amount without tax if (empty($value['disableamount'])) { + if ($tablename == 'don') $total_ht_by_line=$element->amount; + else + { + $total_ht_by_line=$element->total_ht; + } print ''; } @@ -478,9 +490,14 @@ foreach ($listofreferent as $key => $value) // Amount inc tax if (empty($value['disableamount'])) { + if ($tablename == 'don') $total_ttc_by_line=$element->amount; + else + { + $total_ttc_by_line=$element->total_ttc; + } print ''; } @@ -496,11 +513,11 @@ foreach ($listofreferent as $key => $value) if ($qualifiedfortotal) { - $total_ht = $total_ht + $element->total_ht; - $total_ttc = $total_ttc + $element->total_ttc; + $total_ht = $total_ht + $total_ht_by_line; + $total_ttc = $total_ttc + $total_ttc_by_line; - $total_ht_by_third += $element->total_ht; - $total_ttc_by_third += $element->total_ttc; + $total_ht_by_third += $total_ht_by_line; + $total_ttc_by_third += $total_ttc_by_line; } if (canApplySubtotalOn($tablename)) @@ -619,9 +636,21 @@ foreach ($listofreferent as $key => $value) { $element->fetch($elementarray[$i]); if ($tablename != 'expensereport_det') $element->fetch_thirdparty(); + if ($tablename == 'don') $total_ht_by_line=$element->amount; + else + { + $total_ht_by_line=$element->total_ht; + } - $total_ht = $total_ht + $element->total_ht; - $total_ttc = $total_ttc + $element->total_ttc; + $total_ht = $total_ht + $total_ht_by_line; + + if ($tablename == 'don') $total_ttc_by_line=$element->amount; + else + { + $total_ttc_by_line=$element->total_ttc; + } + + $total_ttc = $total_ttc + $total_ttc_by_line; } print ''; From 115777f05dcdc42c6b757e33527dfa5fe7163086 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Thu, 2 Apr 2015 06:54:04 +0200 Subject: [PATCH 285/412] New: Module project - Elements - Show detail of amounts with a minus when the amount decrease margin --- htdocs/projet/element.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 8abddb18ce9..7e3f9d671b1 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -623,13 +623,8 @@ foreach ($listofreferent as $key => $value) $total_ht = $total_ht + $element->total_ht; $total_ttc = $total_ttc + $element->total_ttc; } - - print ''; - print ''; - print ''; - print ''; - print ''; - print ''; + + // Calculate margin if ($margin=="add") { $margin_ht+= $total_ht; @@ -640,8 +635,21 @@ foreach ($listofreferent as $key => $value) $margin_ht-= $total_ht; $margin_ttc-= $total_ttc; } - } + + // Show $total_ht & $total_ttc -- add a minus when necessary + if ($margin!="add") + { + $total_ht = -$total_ht; + $total_ttc = -$total_ttc; + } + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } } } // and the margin amount total From 29fc2652e19dc7fe09a237828168722a03164f90 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 2 Apr 2015 11:00:37 +0200 Subject: [PATCH 286/412] FIX #2519 --- htdocs/install/mysql/tables/llx_cronjob.sql | 10 +++++----- scripts/cron/cron_run_jobs.php | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_cronjob.sql b/htdocs/install/mysql/tables/llx_cronjob.sql index 61036c3bd4b..a7ed4858024 100644 --- a/htdocs/install/mysql/tables/llx_cronjob.sql +++ b/htdocs/install/mysql/tables/llx_cronjob.sql @@ -33,11 +33,11 @@ CREATE TABLE llx_cronjob md5params varchar(32), module_name varchar(255), priority integer DEFAULT 0, - datelastrun datetime, - datenextrun datetime, - datestart datetime, - dateend datetime, - datelastresult datetime, + datelastrun datetime, -- date last run and when should be next + datenextrun datetime, -- job will be run if current date higher that this date + datestart datetime, -- before this date no jobs will be run + dateend datetime, -- after this date, no more jobs will be run + datelastresult datetime, lastresult text, lastoutput text, unitfrequency integer NOT NULL DEFAULT 0, diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php index ad6f97e3d5c..81b1955d35f 100755 --- a/scripts/cron/cron_run_jobs.php +++ b/scripts/cron/cron_run_jobs.php @@ -129,9 +129,9 @@ if(is_array($object->lines) && (count($object->lines)>0)) // Loop over job foreach($object->lines as $line) { - - //If date_next_jobs is less of current dat, execute the program, and store the execution time of the next execution in database - if (($line->datenextrun < $now) && $line->dateend < $now){ + //If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database + if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now)) + { $cronjob=new Cronjob($db); $result=$cronjob->fetch($line->id); if ($result<0) { From 10f967e07a80dc6cf09e073f43ec16086f6b52ff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 2 Apr 2015 11:00:37 +0200 Subject: [PATCH 287/412] FIX #2519 --- htdocs/install/mysql/tables/llx_cronjob.sql | 10 +++++----- scripts/cron/cron_run_jobs.php | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_cronjob.sql b/htdocs/install/mysql/tables/llx_cronjob.sql index 61036c3bd4b..a7ed4858024 100644 --- a/htdocs/install/mysql/tables/llx_cronjob.sql +++ b/htdocs/install/mysql/tables/llx_cronjob.sql @@ -33,11 +33,11 @@ CREATE TABLE llx_cronjob md5params varchar(32), module_name varchar(255), priority integer DEFAULT 0, - datelastrun datetime, - datenextrun datetime, - datestart datetime, - dateend datetime, - datelastresult datetime, + datelastrun datetime, -- date last run and when should be next + datenextrun datetime, -- job will be run if current date higher that this date + datestart datetime, -- before this date no jobs will be run + dateend datetime, -- after this date, no more jobs will be run + datelastresult datetime, lastresult text, lastoutput text, unitfrequency integer NOT NULL DEFAULT 0, diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php index 94bde0fb153..a26db4c3fab 100755 --- a/scripts/cron/cron_run_jobs.php +++ b/scripts/cron/cron_run_jobs.php @@ -127,9 +127,9 @@ if(is_array($object->lines) && (count($object->lines)>0)) // Loop over job foreach($object->lines as $line) { - - //If date_next_jobs is less of current dat, execute the program, and store the execution time of the next execution in database - if (($line->datenextrun < $now) && $line->dateend < $now){ + //If date_next_jobs is less of current date, execute the program, and store the execution time of the next execution in database + if (($line->datenextrun < $now) && (empty($line->datestart) || $line->datestart <= $now) && (empty($line->dateend) || $line->dateend >= $now)) + { $cronjob=new Cronjob($db); $result=$cronjob->fetch($line->id); if ($result<0) { From fd1b6444905e258d0b57be85b563fd49cecc7f35 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 2 Apr 2015 11:14:32 +0200 Subject: [PATCH 288/412] Make things easier to remind. Same rule for commit and PR. --- CONTRIBUTING.md | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e3a97fe358e..aef8cd57b39 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -42,28 +42,19 @@ Please don't edit the ChangeLog file. A project manager will update it from your Use clear commit messages with the following structure: 
    -KEYWORD Short description (may be the bug number #456)
+FIXED|Fixed #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
+or
+CLOSED|Closed #456 Short description (where #456 is number feature request, if it exists. In upper case to appear into ChangeLog)
+or
+NEW|New Short description (In upper case to appear into ChangeLog)
+or
+Short description (when the commit is not introducing feature or closing a bug)
 
 Long description (Can span accross multiple lines).
    -Where KEYWORD is one of: - -- "Fixed" for bug fixes (May be followed by the bug number i.e: #456) -- "Closed" for a commit to close a feature request issue (May be followed by the bug number i.e: #456) -- void, don't put a keyword if the commit is not introducing feature or closing a bug. - ### Pull Requests -When submitting a pull request, use following syntax: - -
    -KEYWORD Short description (may be the bug number #456)
-
    - -Where KEYWORD is one of: - -- "FIXED" or "Fixed" for bug fixes. In upper case to appear into ChangeLog. (May be followed by the bug number i.e: #456) -- "NEW" or "New" for new features. In upper case to appear into ChangeLog. (May be followed by the task number i.e: #123) +When submitting a pull request, use same rule than Commits. With upper case keyword to appear into ChangeLog. ### Resources From d20873454cf302414e8834b950aacb9c5b5df81a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 2 Apr 2015 11:17:57 +0200 Subject: [PATCH 289/412] Follow a more standard syntax --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aef8cd57b39..7fefd5100b5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -42,9 +42,9 @@ Please don't edit the ChangeLog file. A project manager will update it from your Use clear commit messages with the following structure: 
    -FIXED|Fixed #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
+FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
 or
-CLOSED|Closed #456 Short description (where #456 is number feature request, if it exists. In upper case to appear into ChangeLog)
+CLOSE|Close #456 Short description (where #456 is number feature request, if it exists. In upper case to appear into ChangeLog)
 or
 NEW|New Short description (In upper case to appear into ChangeLog)
 or

From f89d74d6bc4415c99f5b58363d484c404d2080f9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur 
Date: Thu, 2 Apr 2015 11:44:43 +0200
Subject: [PATCH 290/412] Deletion of dir was not complete.

---
 htdocs/expedition/class/expedition.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 2eb5a61e3fc..3f96454e8de 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -1037,7 +1037,7 @@ class Expedition extends CommonObject
 								}
 								if (file_exists($dir))
 								{
-									if (!dol_delete_dir($dir))
+									if (!dol_delete_dir_recursive($dir))
 									{
 										$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
 										return 0;

From 882baa55be66bfec89f174bb67fd48702bdf346a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur 
Date: Thu, 2 Apr 2015 11:53:47 +0200
Subject: [PATCH 291/412] Deprecated test

---
 dev/codesniffer/ruleset.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
index 2cc6be74877..620da28d556 100755
--- a/dev/codesniffer/ruleset.xml
+++ b/dev/codesniffer/ruleset.xml
@@ -164,8 +164,6 @@
         0
 	
     
-    
-
 	
 	
 

From 849b94b08793538a0f5f7b63d14566df6065e344 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur 
Date: Thu, 2 Apr 2015 12:49:11 +0200
Subject: [PATCH 292/412] Fix cd not required

---
 dev/translation/txpull.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh
index 0154fb14c72..71e03cf522e 100755
--- a/dev/translation/txpull.sh
+++ b/dev/translation/txpull.sh
@@ -26,7 +26,6 @@ fi
 
 if [ "x$1" = "xall" ]
 then
-    cd htdocs/lang
 	for dir in `find htdocs/langs/* -type d`
 	do
 	    fic=`basename $dir`

From c62687d19847597c61b0af15fa85bba44cb4991e Mon Sep 17 00:00:00 2001
From: Laurent Destailleur 
Date: Thu, 2 Apr 2015 12:55:00 +0200
Subject: [PATCH 293/412] Comment

---
 dev/translation/txpull.sh              | 1 -
 htdocs/admin/supplier_order.php        | 2 +-
 htdocs/product/class/product.class.php | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh
index 0154fb14c72..71e03cf522e 100755
--- a/dev/translation/txpull.sh
+++ b/dev/translation/txpull.sh
@@ -26,7 +26,6 @@ fi
 
 if [ "x$1" = "xall" ]
 then
-    cd htdocs/lang
 	for dir in `find htdocs/langs/* -type d`
 	do
 	    fic=`basename $dir`
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 25f2fbb3314..5a3c3808201 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -185,7 +185,7 @@ else if ($action == 'set_SUPPLIER_ORDER_OTHER')
     // TODO We add/delete permission until permission can have a condition on a global var
     $r_id = 1190;
     $entity = $conf->entity;
-    $r_desc='Permission for second approval';
+    $r_desc=$langs->trans("Permission1190");
     $r_modul='fournisseur';
     $r_type='w';
     $r_perms='commande';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 8c811a57a1a..16b5a4b1e4e 100755
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1583,7 +1583,7 @@ class Product extends CommonObject
 				$this->db->free($resql);
 
 
-				// Retrieve all extrafield for thirdparty
+				// Retreive all extrafield for current object
 				// fetch optionals attributes and labels
 				require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
 				$extrafields=new ExtraFields($this->db);

From 50d77d7e6f16ae1e2b33f3444a6906c5734c4820 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur 
Date: Thu, 2 Apr 2015 12:55:44 +0200
Subject: [PATCH 294/412] Correct source lang

---
 htdocs/langs/en_US/admin.lang     | 1 +
 htdocs/langs/en_US/suppliers.lang | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index d204ca67dbb..3d767ba8524 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -754,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index 441eba9d884..6b7010439c9 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -43,4 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
-UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
\ No newline at end of file
+UseDoubleApproval=Use double approval (the second approval can be done by any user with the dedicated permission)
\ No newline at end of file

From 0f51314c7ea67822399942dc1f5376e3002916e1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur 
Date: Thu, 2 Apr 2015 13:28:20 +0200
Subject: [PATCH 295/412] Sync from transifex

---
 htdocs/langs/ar_SA/admin.lang         |  31 +-
 htdocs/langs/ar_SA/agenda.lang        |   7 +-
 htdocs/langs/ar_SA/bills.lang         |   7 +-
 htdocs/langs/ar_SA/categories.lang    | 152 +++---
 htdocs/langs/ar_SA/cron.lang          |  17 +-
 htdocs/langs/ar_SA/donations.lang     |   5 +
 htdocs/langs/ar_SA/errors.lang        |   6 +
 htdocs/langs/ar_SA/mails.lang         |   2 +
 htdocs/langs/ar_SA/main.lang          |   6 +-
 htdocs/langs/ar_SA/orders.lang        |   6 +-
 htdocs/langs/ar_SA/other.lang         |   6 +-
 htdocs/langs/ar_SA/products.lang      |  17 +-
 htdocs/langs/ar_SA/projects.lang      |   9 +-
 htdocs/langs/ar_SA/sendings.lang      |   1 +
 htdocs/langs/ar_SA/suppliers.lang     |   1 +
 htdocs/langs/bg_BG/admin.lang         |  31 +-
 htdocs/langs/bg_BG/agenda.lang        |   7 +-
 htdocs/langs/bg_BG/bills.lang         |   7 +-
 htdocs/langs/bg_BG/categories.lang    | 152 +++---
 htdocs/langs/bg_BG/cron.lang          |  17 +-
 htdocs/langs/bg_BG/donations.lang     |   5 +
 htdocs/langs/bg_BG/errors.lang        |   6 +
 htdocs/langs/bg_BG/mails.lang         |   2 +
 htdocs/langs/bg_BG/main.lang          |   6 +-
 htdocs/langs/bg_BG/orders.lang        |   6 +-
 htdocs/langs/bg_BG/other.lang         |   6 +-
 htdocs/langs/bg_BG/products.lang      |  17 +-
 htdocs/langs/bg_BG/projects.lang      |   9 +-
 htdocs/langs/bg_BG/sendings.lang      |   1 +
 htdocs/langs/bg_BG/suppliers.lang     |   1 +
 htdocs/langs/bs_BA/admin.lang         |  31 +-
 htdocs/langs/bs_BA/agenda.lang        |   7 +-
 htdocs/langs/bs_BA/bills.lang         |   7 +-
 htdocs/langs/bs_BA/categories.lang    | 152 +++---
 htdocs/langs/bs_BA/cron.lang          |  17 +-
 htdocs/langs/bs_BA/donations.lang     |   5 +
 htdocs/langs/bs_BA/errors.lang        |   6 +
 htdocs/langs/bs_BA/mails.lang         |   2 +
 htdocs/langs/bs_BA/main.lang          |   6 +-
 htdocs/langs/bs_BA/orders.lang        |   6 +-
 htdocs/langs/bs_BA/other.lang         |   6 +-
 htdocs/langs/bs_BA/products.lang      |  17 +-
 htdocs/langs/bs_BA/projects.lang      |   9 +-
 htdocs/langs/bs_BA/sendings.lang      |   1 +
 htdocs/langs/bs_BA/suppliers.lang     |   1 +
 htdocs/langs/ca_ES/admin.lang         |  31 +-
 htdocs/langs/ca_ES/agenda.lang        |   7 +-
 htdocs/langs/ca_ES/bills.lang         |   7 +-
 htdocs/langs/ca_ES/categories.lang    | 152 +++---
 htdocs/langs/ca_ES/cron.lang          |  17 +-
 htdocs/langs/ca_ES/donations.lang     |   5 +
 htdocs/langs/ca_ES/errors.lang        |   6 +
 htdocs/langs/ca_ES/mails.lang         |   2 +
 htdocs/langs/ca_ES/main.lang          |   6 +-
 htdocs/langs/ca_ES/orders.lang        |   6 +-
 htdocs/langs/ca_ES/other.lang         |   6 +-
 htdocs/langs/ca_ES/products.lang      |  17 +-
 htdocs/langs/ca_ES/projects.lang      |   9 +-
 htdocs/langs/ca_ES/sendings.lang      |   1 +
 htdocs/langs/ca_ES/suppliers.lang     |   1 +
 htdocs/langs/cs_CZ/admin.lang         |  31 +-
 htdocs/langs/cs_CZ/agenda.lang        |   7 +-
 htdocs/langs/cs_CZ/bills.lang         |   7 +-
 htdocs/langs/cs_CZ/categories.lang    | 152 +++---
 htdocs/langs/cs_CZ/cron.lang          |  17 +-
 htdocs/langs/cs_CZ/donations.lang     |   5 +
 htdocs/langs/cs_CZ/errors.lang        |   6 +
 htdocs/langs/cs_CZ/mails.lang         |   2 +
 htdocs/langs/cs_CZ/main.lang          |   6 +-
 htdocs/langs/cs_CZ/orders.lang        |   6 +-
 htdocs/langs/cs_CZ/other.lang         |   6 +-
 htdocs/langs/cs_CZ/products.lang      |  17 +-
 htdocs/langs/cs_CZ/projects.lang      |   9 +-
 htdocs/langs/cs_CZ/sendings.lang      |   1 +
 htdocs/langs/cs_CZ/suppliers.lang     |   1 +
 htdocs/langs/da_DK/admin.lang         |  31 +-
 htdocs/langs/da_DK/agenda.lang        |   7 +-
 htdocs/langs/da_DK/bills.lang         |   7 +-
 htdocs/langs/da_DK/categories.lang    | 152 +++---
 htdocs/langs/da_DK/cron.lang          |  17 +-
 htdocs/langs/da_DK/donations.lang     |   5 +
 htdocs/langs/da_DK/errors.lang        |   6 +
 htdocs/langs/da_DK/mails.lang         |   2 +
 htdocs/langs/da_DK/main.lang          |   6 +-
 htdocs/langs/da_DK/orders.lang        |   6 +-
 htdocs/langs/da_DK/other.lang         |   6 +-
 htdocs/langs/da_DK/products.lang      |  17 +-
 htdocs/langs/da_DK/projects.lang      |   9 +-
 htdocs/langs/da_DK/sendings.lang      |   1 +
 htdocs/langs/da_DK/suppliers.lang     |   1 +
 htdocs/langs/de_AT/other.lang         |   2 +-
 htdocs/langs/de_DE/admin.lang         |  31 +-
 htdocs/langs/de_DE/agenda.lang        |  11 +-
 htdocs/langs/de_DE/bills.lang         |   7 +-
 htdocs/langs/de_DE/categories.lang    | 152 +++---
 htdocs/langs/de_DE/companies.lang     |  32 +-
 htdocs/langs/de_DE/cron.lang          |  17 +-
 htdocs/langs/de_DE/donations.lang     |   5 +
 htdocs/langs/de_DE/errors.lang        |   6 +
 htdocs/langs/de_DE/mails.lang         |   2 +
 htdocs/langs/de_DE/main.lang          |   6 +-
 htdocs/langs/de_DE/orders.lang        |  24 +-
 htdocs/langs/de_DE/other.lang         |   6 +-
 htdocs/langs/de_DE/products.lang      |  31 +-
 htdocs/langs/de_DE/projects.lang      |   9 +-
 htdocs/langs/de_DE/sendings.lang      |   1 +
 htdocs/langs/de_DE/stocks.lang        |   2 +-
 htdocs/langs/de_DE/suppliers.lang     |   1 +
 htdocs/langs/el_GR/admin.lang         |  89 +--
 htdocs/langs/el_GR/agenda.lang        |   7 +-
 htdocs/langs/el_GR/banks.lang         |  10 +-
 htdocs/langs/el_GR/bills.lang         |   7 +-
 htdocs/langs/el_GR/categories.lang    | 152 +++---
 htdocs/langs/el_GR/commercial.lang    |   2 +-
 htdocs/langs/el_GR/contracts.lang     |   2 +-
 htdocs/langs/el_GR/cron.lang          |  19 +-
 htdocs/langs/el_GR/donations.lang     |   5 +
 htdocs/langs/el_GR/errors.lang        |   6 +
 htdocs/langs/el_GR/mails.lang         |   2 +
 htdocs/langs/el_GR/main.lang          |  18 +-
 htdocs/langs/el_GR/orders.lang        |  10 +-
 htdocs/langs/el_GR/other.lang         |  10 +-
 htdocs/langs/el_GR/productbatch.lang  |   2 +-
 htdocs/langs/el_GR/products.lang      |  23 +-
 htdocs/langs/el_GR/projects.lang      |  23 +-
 htdocs/langs/el_GR/salaries.lang      |   2 +-
 htdocs/langs/el_GR/sendings.lang      |   3 +-
 htdocs/langs/el_GR/suppliers.lang     |   5 +-
 htdocs/langs/el_GR/withdrawals.lang   |   2 +-
 htdocs/langs/en_GB/admin.lang         |   8 +-
 htdocs/langs/en_GB/bills.lang         |  24 +-
 htdocs/langs/en_GB/main.lang          |  30 +-
 htdocs/langs/en_GB/orders.lang        |   1 +
 htdocs/langs/en_GB/other.lang         |   5 +-
 htdocs/langs/es_AR/admin.lang         |  10 +-
 htdocs/langs/es_AR/bills.lang         |  21 +-
 htdocs/langs/es_CO/admin.lang         |   1 +
 htdocs/langs/es_CO/main.lang          |  48 +-
 htdocs/langs/es_ES/admin.lang         |  99 ++--
 htdocs/langs/es_ES/agenda.lang        |   7 +-
 htdocs/langs/es_ES/banks.lang         |  10 +-
 htdocs/langs/es_ES/bills.lang         |   5 +-
 htdocs/langs/es_ES/categories.lang    | 152 +++---
 htdocs/langs/es_ES/commercial.lang    |   2 +-
 htdocs/langs/es_ES/contracts.lang     |   2 +-
 htdocs/langs/es_ES/cron.lang          |  19 +-
 htdocs/langs/es_ES/donations.lang     |   5 +
 htdocs/langs/es_ES/errors.lang        |  12 +-
 htdocs/langs/es_ES/mails.lang         |   2 +
 htdocs/langs/es_ES/main.lang          |  18 +-
 htdocs/langs/es_ES/orders.lang        |  10 +-
 htdocs/langs/es_ES/other.lang         |  10 +-
 htdocs/langs/es_ES/productbatch.lang  |   2 +-
 htdocs/langs/es_ES/products.lang      |  23 +-
 htdocs/langs/es_ES/projects.lang      |  23 +-
 htdocs/langs/es_ES/salaries.lang      |   2 +-
 htdocs/langs/es_ES/sendings.lang      |   3 +-
 htdocs/langs/es_ES/stocks.lang        |   6 +-
 htdocs/langs/es_ES/suppliers.lang     |   3 +-
 htdocs/langs/et_EE/admin.lang         |  31 +-
 htdocs/langs/et_EE/agenda.lang        |   7 +-
 htdocs/langs/et_EE/bills.lang         |   7 +-
 htdocs/langs/et_EE/categories.lang    | 152 +++---
 htdocs/langs/et_EE/cron.lang          |  17 +-
 htdocs/langs/et_EE/donations.lang     |   5 +
 htdocs/langs/et_EE/errors.lang        |   6 +
 htdocs/langs/et_EE/mails.lang         |   2 +
 htdocs/langs/et_EE/main.lang          |   6 +-
 htdocs/langs/et_EE/orders.lang        |   6 +-
 htdocs/langs/et_EE/other.lang         |   6 +-
 htdocs/langs/et_EE/products.lang      |  17 +-
 htdocs/langs/et_EE/projects.lang      |   9 +-
 htdocs/langs/et_EE/sendings.lang      |   1 +
 htdocs/langs/et_EE/suppliers.lang     |   1 +
 htdocs/langs/eu_ES/admin.lang         |  31 +-
 htdocs/langs/eu_ES/agenda.lang        |   7 +-
 htdocs/langs/eu_ES/bills.lang         |   7 +-
 htdocs/langs/eu_ES/categories.lang    | 152 +++---
 htdocs/langs/eu_ES/cron.lang          |  17 +-
 htdocs/langs/eu_ES/donations.lang     |   5 +
 htdocs/langs/eu_ES/errors.lang        |   6 +
 htdocs/langs/eu_ES/mails.lang         |   2 +
 htdocs/langs/eu_ES/main.lang          |   6 +-
 htdocs/langs/eu_ES/orders.lang        |   6 +-
 htdocs/langs/eu_ES/other.lang         |   6 +-
 htdocs/langs/eu_ES/products.lang      |  17 +-
 htdocs/langs/eu_ES/projects.lang      |   9 +-
 htdocs/langs/eu_ES/sendings.lang      |   1 +
 htdocs/langs/eu_ES/suppliers.lang     |   1 +
 htdocs/langs/fa_IR/admin.lang         |  47 +-
 htdocs/langs/fa_IR/agenda.lang        |   7 +-
 htdocs/langs/fa_IR/bills.lang         |   7 +-
 htdocs/langs/fa_IR/categories.lang    | 154 +++---
 htdocs/langs/fa_IR/cron.lang          |  17 +-
 htdocs/langs/fa_IR/donations.lang     |   5 +
 htdocs/langs/fa_IR/errors.lang        |   6 +
 htdocs/langs/fa_IR/mails.lang         |   2 +
 htdocs/langs/fa_IR/main.lang          |   6 +-
 htdocs/langs/fa_IR/orders.lang        |   6 +-
 htdocs/langs/fa_IR/other.lang         |   6 +-
 htdocs/langs/fa_IR/products.lang      |  17 +-
 htdocs/langs/fa_IR/projects.lang      |   9 +-
 htdocs/langs/fa_IR/sendings.lang      |   1 +
 htdocs/langs/fa_IR/suppliers.lang     |   1 +
 htdocs/langs/fi_FI/admin.lang         |  31 +-
 htdocs/langs/fi_FI/agenda.lang        |   7 +-
 htdocs/langs/fi_FI/bills.lang         |   7 +-
 htdocs/langs/fi_FI/categories.lang    | 152 +++---
 htdocs/langs/fi_FI/cron.lang          |  17 +-
 htdocs/langs/fi_FI/donations.lang     |   5 +
 htdocs/langs/fi_FI/errors.lang        |   6 +
 htdocs/langs/fi_FI/mails.lang         |   2 +
 htdocs/langs/fi_FI/main.lang          |   6 +-
 htdocs/langs/fi_FI/orders.lang        |   6 +-
 htdocs/langs/fi_FI/other.lang         |   6 +-
 htdocs/langs/fi_FI/products.lang      |  17 +-
 htdocs/langs/fi_FI/projects.lang      |   9 +-
 htdocs/langs/fi_FI/sendings.lang      |   1 +
 htdocs/langs/fi_FI/suppliers.lang     |   1 +
 htdocs/langs/fr_FR/admin.lang         |  87 +--
 htdocs/langs/fr_FR/agenda.lang        |   7 +-
 htdocs/langs/fr_FR/bills.lang         |   7 +-
 htdocs/langs/fr_FR/categories.lang    | 152 +++---
 htdocs/langs/fr_FR/cron.lang          |  15 +-
 htdocs/langs/fr_FR/donations.lang     |   7 +-
 htdocs/langs/fr_FR/errors.lang        |   8 +-
 htdocs/langs/fr_FR/mails.lang         |   2 +
 htdocs/langs/fr_FR/main.lang          |   6 +-
 htdocs/langs/fr_FR/members.lang       |   2 +-
 htdocs/langs/fr_FR/orders.lang        |  10 +-
 htdocs/langs/fr_FR/other.lang         |  10 +-
 htdocs/langs/fr_FR/productbatch.lang  |   2 +-
 htdocs/langs/fr_FR/products.lang      |  23 +-
 htdocs/langs/fr_FR/projects.lang      |  23 +-
 htdocs/langs/fr_FR/sendings.lang      |   3 +-
 htdocs/langs/fr_FR/suppliers.lang     |   3 +-
 htdocs/langs/fr_FR/trips.lang         |  62 +--
 htdocs/langs/he_IL/admin.lang         |  31 +-
 htdocs/langs/he_IL/agenda.lang        |   7 +-
 htdocs/langs/he_IL/bills.lang         |   7 +-
 htdocs/langs/he_IL/categories.lang    | 152 +++---
 htdocs/langs/he_IL/cron.lang          |  17 +-
 htdocs/langs/he_IL/donations.lang     |   5 +
 htdocs/langs/he_IL/errors.lang        |   6 +
 htdocs/langs/he_IL/mails.lang         |   2 +
 htdocs/langs/he_IL/main.lang          |   6 +-
 htdocs/langs/he_IL/orders.lang        |   6 +-
 htdocs/langs/he_IL/other.lang         |   6 +-
 htdocs/langs/he_IL/products.lang      |  17 +-
 htdocs/langs/he_IL/projects.lang      |   9 +-
 htdocs/langs/he_IL/sendings.lang      |   1 +
 htdocs/langs/he_IL/suppliers.lang     |   1 +
 htdocs/langs/hr_HR/admin.lang         |  31 +-
 htdocs/langs/hr_HR/agenda.lang        |   7 +-
 htdocs/langs/hr_HR/bills.lang         |   7 +-
 htdocs/langs/hr_HR/categories.lang    | 152 +++---
 htdocs/langs/hr_HR/cron.lang          |  17 +-
 htdocs/langs/hr_HR/donations.lang     |   5 +
 htdocs/langs/hr_HR/errors.lang        |   6 +
 htdocs/langs/hr_HR/mails.lang         |   2 +
 htdocs/langs/hr_HR/main.lang          |   6 +-
 htdocs/langs/hr_HR/orders.lang        |   6 +-
 htdocs/langs/hr_HR/other.lang         |   6 +-
 htdocs/langs/hr_HR/products.lang      |  17 +-
 htdocs/langs/hr_HR/projects.lang      |   9 +-
 htdocs/langs/hr_HR/sendings.lang      |   1 +
 htdocs/langs/hr_HR/suppliers.lang     |   1 +
 htdocs/langs/hu_HU/admin.lang         |  31 +-
 htdocs/langs/hu_HU/agenda.lang        |   7 +-
 htdocs/langs/hu_HU/bills.lang         |   7 +-
 htdocs/langs/hu_HU/categories.lang    | 152 +++---
 htdocs/langs/hu_HU/cron.lang          |  17 +-
 htdocs/langs/hu_HU/donations.lang     |   5 +
 htdocs/langs/hu_HU/errors.lang        |   6 +
 htdocs/langs/hu_HU/mails.lang         |   2 +
 htdocs/langs/hu_HU/main.lang          |   6 +-
 htdocs/langs/hu_HU/orders.lang        |   6 +-
 htdocs/langs/hu_HU/other.lang         |   6 +-
 htdocs/langs/hu_HU/products.lang      |  17 +-
 htdocs/langs/hu_HU/projects.lang      |   9 +-
 htdocs/langs/hu_HU/sendings.lang      |   1 +
 htdocs/langs/hu_HU/suppliers.lang     |   1 +
 htdocs/langs/id_ID/admin.lang         |  31 +-
 htdocs/langs/id_ID/agenda.lang        |   7 +-
 htdocs/langs/id_ID/bills.lang         |   7 +-
 htdocs/langs/id_ID/categories.lang    | 152 +++---
 htdocs/langs/id_ID/cron.lang          |  17 +-
 htdocs/langs/id_ID/donations.lang     |   5 +
 htdocs/langs/id_ID/errors.lang        |   6 +
 htdocs/langs/id_ID/mails.lang         |   2 +
 htdocs/langs/id_ID/main.lang          |   6 +-
 htdocs/langs/id_ID/orders.lang        |   6 +-
 htdocs/langs/id_ID/other.lang         |   6 +-
 htdocs/langs/id_ID/products.lang      |  17 +-
 htdocs/langs/id_ID/projects.lang      |   9 +-
 htdocs/langs/id_ID/sendings.lang      |   1 +
 htdocs/langs/id_ID/suppliers.lang     |   1 +
 htdocs/langs/is_IS/admin.lang         |  31 +-
 htdocs/langs/is_IS/agenda.lang        |   7 +-
 htdocs/langs/is_IS/bills.lang         |   7 +-
 htdocs/langs/is_IS/categories.lang    | 152 +++---
 htdocs/langs/is_IS/cron.lang          |  17 +-
 htdocs/langs/is_IS/donations.lang     |   5 +
 htdocs/langs/is_IS/errors.lang        |   6 +
 htdocs/langs/is_IS/mails.lang         |   2 +
 htdocs/langs/is_IS/main.lang          |   6 +-
 htdocs/langs/is_IS/orders.lang        |   6 +-
 htdocs/langs/is_IS/other.lang         |   6 +-
 htdocs/langs/is_IS/products.lang      |  17 +-
 htdocs/langs/is_IS/projects.lang      |   9 +-
 htdocs/langs/is_IS/sendings.lang      |   1 +
 htdocs/langs/is_IS/suppliers.lang     |   1 +
 htdocs/langs/it_IT/admin.lang         |  31 +-
 htdocs/langs/it_IT/agenda.lang        |   7 +-
 htdocs/langs/it_IT/bills.lang         |   7 +-
 htdocs/langs/it_IT/categories.lang    | 152 +++---
 htdocs/langs/it_IT/cron.lang          |  17 +-
 htdocs/langs/it_IT/donations.lang     |   5 +
 htdocs/langs/it_IT/errors.lang        |   6 +
 htdocs/langs/it_IT/mails.lang         |   2 +
 htdocs/langs/it_IT/main.lang          |   6 +-
 htdocs/langs/it_IT/orders.lang        |   6 +-
 htdocs/langs/it_IT/other.lang         |   6 +-
 htdocs/langs/it_IT/products.lang      |  17 +-
 htdocs/langs/it_IT/projects.lang      |   9 +-
 htdocs/langs/it_IT/sendings.lang      |   1 +
 htdocs/langs/it_IT/suppliers.lang     |   1 +
 htdocs/langs/ja_JP/admin.lang         |  31 +-
 htdocs/langs/ja_JP/agenda.lang        |   7 +-
 htdocs/langs/ja_JP/bills.lang         |   7 +-
 htdocs/langs/ja_JP/categories.lang    | 152 +++---
 htdocs/langs/ja_JP/cron.lang          |  17 +-
 htdocs/langs/ja_JP/donations.lang     |   5 +
 htdocs/langs/ja_JP/errors.lang        |   6 +
 htdocs/langs/ja_JP/mails.lang         |   2 +
 htdocs/langs/ja_JP/main.lang          |   6 +-
 htdocs/langs/ja_JP/orders.lang        |   6 +-
 htdocs/langs/ja_JP/other.lang         |   6 +-
 htdocs/langs/ja_JP/products.lang      |  17 +-
 htdocs/langs/ja_JP/projects.lang      |   9 +-
 htdocs/langs/ja_JP/sendings.lang      |   1 +
 htdocs/langs/ja_JP/suppliers.lang     |   1 +
 htdocs/langs/ka_GE/admin.lang         |  31 +-
 htdocs/langs/ka_GE/agenda.lang        |   7 +-
 htdocs/langs/ka_GE/bills.lang         |   7 +-
 htdocs/langs/ka_GE/categories.lang    | 152 +++---
 htdocs/langs/ka_GE/cron.lang          |  17 +-
 htdocs/langs/ka_GE/donations.lang     |   5 +
 htdocs/langs/ka_GE/errors.lang        |   6 +
 htdocs/langs/ka_GE/mails.lang         |   2 +
 htdocs/langs/ka_GE/main.lang          |   6 +-
 htdocs/langs/ka_GE/orders.lang        |   6 +-
 htdocs/langs/ka_GE/other.lang         |   6 +-
 htdocs/langs/ka_GE/products.lang      |  17 +-
 htdocs/langs/ka_GE/projects.lang      |   9 +-
 htdocs/langs/ka_GE/sendings.lang      |   1 +
 htdocs/langs/ka_GE/suppliers.lang     |   1 +
 htdocs/langs/kn_IN/admin.lang         |  31 +-
 htdocs/langs/kn_IN/agenda.lang        |   7 +-
 htdocs/langs/kn_IN/bills.lang         |   7 +-
 htdocs/langs/kn_IN/categories.lang    | 152 +++---
 htdocs/langs/kn_IN/cron.lang          |  17 +-
 htdocs/langs/kn_IN/donations.lang     |   5 +
 htdocs/langs/kn_IN/errors.lang        |   6 +
 htdocs/langs/kn_IN/mails.lang         |   2 +
 htdocs/langs/kn_IN/main.lang          |   6 +-
 htdocs/langs/kn_IN/orders.lang        |   6 +-
 htdocs/langs/kn_IN/other.lang         |   6 +-
 htdocs/langs/kn_IN/products.lang      |  17 +-
 htdocs/langs/kn_IN/projects.lang      |   9 +-
 htdocs/langs/kn_IN/sendings.lang      |   1 +
 htdocs/langs/kn_IN/suppliers.lang     |   1 +
 htdocs/langs/ko_KR/admin.lang         |  31 +-
 htdocs/langs/ko_KR/agenda.lang        |   7 +-
 htdocs/langs/ko_KR/bills.lang         |   7 +-
 htdocs/langs/ko_KR/categories.lang    | 152 +++---
 htdocs/langs/ko_KR/cron.lang          |  17 +-
 htdocs/langs/ko_KR/donations.lang     |   5 +
 htdocs/langs/ko_KR/errors.lang        |   6 +
 htdocs/langs/ko_KR/mails.lang         |   2 +
 htdocs/langs/ko_KR/main.lang          |   6 +-
 htdocs/langs/ko_KR/orders.lang        |   6 +-
 htdocs/langs/ko_KR/other.lang         |   6 +-
 htdocs/langs/ko_KR/products.lang      |  17 +-
 htdocs/langs/ko_KR/projects.lang      |   9 +-
 htdocs/langs/ko_KR/sendings.lang      |   1 +
 htdocs/langs/ko_KR/suppliers.lang     |   1 +
 htdocs/langs/lo_LA/accountancy.lang   |  20 +-
 htdocs/langs/lo_LA/admin.lang         |  31 +-
 htdocs/langs/lo_LA/agenda.lang        |   7 +-
 htdocs/langs/lo_LA/banks.lang         |  16 +-
 htdocs/langs/lo_LA/bills.lang         |   7 +-
 htdocs/langs/lo_LA/categories.lang    | 152 +++---
 htdocs/langs/lo_LA/cron.lang          |  17 +-
 htdocs/langs/lo_LA/donations.lang     |   5 +
 htdocs/langs/lo_LA/errors.lang        |   6 +
 htdocs/langs/lo_LA/mails.lang         |   2 +
 htdocs/langs/lo_LA/main.lang          |   6 +-
 htdocs/langs/lo_LA/orders.lang        |   6 +-
 htdocs/langs/lo_LA/other.lang         |   6 +-
 htdocs/langs/lo_LA/products.lang      |  17 +-
 htdocs/langs/lo_LA/projects.lang      |   9 +-
 htdocs/langs/lo_LA/sendings.lang      |   1 +
 htdocs/langs/lo_LA/suppliers.lang     |   1 +
 htdocs/langs/lo_LA/users.lang         |  74 +--
 htdocs/langs/lt_LT/accountancy.lang   |  10 +-
 htdocs/langs/lt_LT/admin.lang         |  31 +-
 htdocs/langs/lt_LT/agenda.lang        |  51 +-
 htdocs/langs/lt_LT/bills.lang         |   7 +-
 htdocs/langs/lt_LT/categories.lang    | 154 +++---
 htdocs/langs/lt_LT/cron.lang          |  17 +-
 htdocs/langs/lt_LT/dict.lang          | 644 +++++++++++-----------
 htdocs/langs/lt_LT/donations.lang     |   5 +
 htdocs/langs/lt_LT/errors.lang        |   6 +
 htdocs/langs/lt_LT/link.lang          |   4 +-
 htdocs/langs/lt_LT/mails.lang         |   2 +
 htdocs/langs/lt_LT/main.lang          |   6 +-
 htdocs/langs/lt_LT/orders.lang        |   6 +-
 htdocs/langs/lt_LT/other.lang         |   6 +-
 htdocs/langs/lt_LT/products.lang      |  17 +-
 htdocs/langs/lt_LT/projects.lang      |   9 +-
 htdocs/langs/lt_LT/sendings.lang      |   1 +
 htdocs/langs/lt_LT/suppliers.lang     |  11 +-
 htdocs/langs/lv_LV/admin.lang         |  41 +-
 htdocs/langs/lv_LV/agenda.lang        |   7 +-
 htdocs/langs/lv_LV/bills.lang         |   7 +-
 htdocs/langs/lv_LV/categories.lang    | 152 +++---
 htdocs/langs/lv_LV/cron.lang          |  19 +-
 htdocs/langs/lv_LV/donations.lang     |   5 +
 htdocs/langs/lv_LV/errors.lang        |   6 +
 htdocs/langs/lv_LV/mails.lang         |   2 +
 htdocs/langs/lv_LV/main.lang          |  10 +-
 htdocs/langs/lv_LV/orders.lang        |   8 +-
 htdocs/langs/lv_LV/other.lang         |   6 +-
 htdocs/langs/lv_LV/products.lang      |  21 +-
 htdocs/langs/lv_LV/projects.lang      |   9 +-
 htdocs/langs/lv_LV/sendings.lang      |   3 +-
 htdocs/langs/lv_LV/suppliers.lang     |   1 +
 htdocs/langs/mk_MK/admin.lang         |  31 +-
 htdocs/langs/mk_MK/agenda.lang        |   7 +-
 htdocs/langs/mk_MK/bills.lang         |   7 +-
 htdocs/langs/mk_MK/categories.lang    | 152 +++---
 htdocs/langs/mk_MK/cron.lang          |  17 +-
 htdocs/langs/mk_MK/donations.lang     |   5 +
 htdocs/langs/mk_MK/errors.lang        |   6 +
 htdocs/langs/mk_MK/mails.lang         |   2 +
 htdocs/langs/mk_MK/main.lang          |   6 +-
 htdocs/langs/mk_MK/orders.lang        |   6 +-
 htdocs/langs/mk_MK/other.lang         |   6 +-
 htdocs/langs/mk_MK/products.lang      |  17 +-
 htdocs/langs/mk_MK/projects.lang      |   9 +-
 htdocs/langs/mk_MK/sendings.lang      |   1 +
 htdocs/langs/mk_MK/suppliers.lang     |   1 +
 htdocs/langs/nb_NO/admin.lang         |  31 +-
 htdocs/langs/nb_NO/agenda.lang        |   7 +-
 htdocs/langs/nb_NO/bills.lang         |  43 +-
 htdocs/langs/nb_NO/categories.lang    | 152 +++---
 htdocs/langs/nb_NO/cron.lang          |  17 +-
 htdocs/langs/nb_NO/donations.lang     |   5 +
 htdocs/langs/nb_NO/errors.lang        |   6 +
 htdocs/langs/nb_NO/mails.lang         |   2 +
 htdocs/langs/nb_NO/main.lang          |   6 +-
 htdocs/langs/nb_NO/orders.lang        |   6 +-
 htdocs/langs/nb_NO/other.lang         |   6 +-
 htdocs/langs/nb_NO/products.lang      |  17 +-
 htdocs/langs/nb_NO/projects.lang      |   9 +-
 htdocs/langs/nb_NO/sendings.lang      |   1 +
 htdocs/langs/nb_NO/suppliers.lang     |   1 +
 htdocs/langs/nl_NL/admin.lang         |  31 +-
 htdocs/langs/nl_NL/agenda.lang        |   7 +-
 htdocs/langs/nl_NL/bills.lang         |   7 +-
 htdocs/langs/nl_NL/categories.lang    | 152 +++---
 htdocs/langs/nl_NL/cron.lang          |  17 +-
 htdocs/langs/nl_NL/donations.lang     |   5 +
 htdocs/langs/nl_NL/errors.lang        |   6 +
 htdocs/langs/nl_NL/mails.lang         |   2 +
 htdocs/langs/nl_NL/main.lang          |   6 +-
 htdocs/langs/nl_NL/orders.lang        |   6 +-
 htdocs/langs/nl_NL/other.lang         |   6 +-
 htdocs/langs/nl_NL/products.lang      |  17 +-
 htdocs/langs/nl_NL/projects.lang      |   9 +-
 htdocs/langs/nl_NL/sendings.lang      |   1 +
 htdocs/langs/nl_NL/suppliers.lang     |   1 +
 htdocs/langs/pl_PL/accountancy.lang   | 252 ++++-----
 htdocs/langs/pl_PL/admin.lang         | 759 +++++++++++++-------------
 htdocs/langs/pl_PL/agenda.lang        |  53 +-
 htdocs/langs/pl_PL/banks.lang         |  42 +-
 htdocs/langs/pl_PL/bills.lang         | 153 +++---
 htdocs/langs/pl_PL/boxes.lang         |  61 ++-
 htdocs/langs/pl_PL/cashdesk.lang      |  38 +-
 htdocs/langs/pl_PL/categories.lang    | 164 +++---
 htdocs/langs/pl_PL/compta.lang        | 146 ++---
 htdocs/langs/pl_PL/contracts.lang     |  24 +-
 htdocs/langs/pl_PL/cron.lang          | 123 ++---
 htdocs/langs/pl_PL/deliveries.lang    |   4 +-
 htdocs/langs/pl_PL/dict.lang          |  60 +-
 htdocs/langs/pl_PL/donations.lang     |  31 +-
 htdocs/langs/pl_PL/ecm.lang           |  16 +-
 htdocs/langs/pl_PL/errors.lang        | 144 ++---
 htdocs/langs/pl_PL/exports.lang       |  38 +-
 htdocs/langs/pl_PL/externalsite.lang  |   2 +-
 htdocs/langs/pl_PL/ftp.lang           |   2 +-
 htdocs/langs/pl_PL/help.lang          |   4 +-
 htdocs/langs/pl_PL/holiday.lang       | 240 ++++----
 htdocs/langs/pl_PL/install.lang       |   2 +-
 htdocs/langs/pl_PL/languages.lang     |  12 +-
 htdocs/langs/pl_PL/mails.lang         |  68 +--
 htdocs/langs/pl_PL/main.lang          |  18 +-
 htdocs/langs/pl_PL/margins.lang       |  78 +--
 htdocs/langs/pl_PL/members.lang       |  32 +-
 htdocs/langs/pl_PL/opensurvey.lang    | 128 ++---
 htdocs/langs/pl_PL/orders.lang        |  68 +--
 htdocs/langs/pl_PL/other.lang         | 132 ++---
 htdocs/langs/pl_PL/paypal.lang        |  18 +-
 htdocs/langs/pl_PL/printipp.lang      |  22 +-
 htdocs/langs/pl_PL/products.lang      | 151 ++---
 htdocs/langs/pl_PL/projects.lang      | 115 ++--
 htdocs/langs/pl_PL/sendings.lang      |  43 +-
 htdocs/langs/pl_PL/stocks.lang        | 112 ++--
 htdocs/langs/pl_PL/suppliers.lang     |  13 +-
 htdocs/langs/pl_PL/trips.lang         | 184 +++----
 htdocs/langs/pl_PL/users.lang         |  20 +-
 htdocs/langs/pl_PL/withdrawals.lang   |  26 +-
 htdocs/langs/pt_BR/admin.lang         |  55 +-
 htdocs/langs/pt_BR/agenda.lang        |   6 +-
 htdocs/langs/pt_BR/bills.lang         |  33 +-
 htdocs/langs/pt_BR/categories.lang    |  34 --
 htdocs/langs/pt_BR/cron.lang          |  12 +-
 htdocs/langs/pt_BR/donations.lang     |  12 +
 htdocs/langs/pt_BR/errors.lang        |   5 +-
 htdocs/langs/pt_BR/mails.lang         |   2 +
 htdocs/langs/pt_BR/main.lang          |  37 +-
 htdocs/langs/pt_BR/orders.lang        |   9 +-
 htdocs/langs/pt_BR/other.lang         |   2 -
 htdocs/langs/pt_BR/products.lang      |  14 +-
 htdocs/langs/pt_BR/projects.lang      |   6 +-
 htdocs/langs/pt_BR/sendings.lang      |   4 -
 htdocs/langs/pt_PT/admin.lang         |  31 +-
 htdocs/langs/pt_PT/agenda.lang        |   7 +-
 htdocs/langs/pt_PT/bills.lang         |   7 +-
 htdocs/langs/pt_PT/categories.lang    | 152 +++---
 htdocs/langs/pt_PT/cron.lang          |  17 +-
 htdocs/langs/pt_PT/donations.lang     |   5 +
 htdocs/langs/pt_PT/errors.lang        |   6 +
 htdocs/langs/pt_PT/mails.lang         |   2 +
 htdocs/langs/pt_PT/main.lang          |   6 +-
 htdocs/langs/pt_PT/orders.lang        |   8 +-
 htdocs/langs/pt_PT/other.lang         |   6 +-
 htdocs/langs/pt_PT/products.lang      |  17 +-
 htdocs/langs/pt_PT/projects.lang      |   9 +-
 htdocs/langs/pt_PT/sendings.lang      |   1 +
 htdocs/langs/pt_PT/suppliers.lang     |   1 +
 htdocs/langs/ro_RO/admin.lang         |  41 +-
 htdocs/langs/ro_RO/agenda.lang        |   7 +-
 htdocs/langs/ro_RO/bills.lang         |   7 +-
 htdocs/langs/ro_RO/categories.lang    | 152 +++---
 htdocs/langs/ro_RO/commercial.lang    |   2 +-
 htdocs/langs/ro_RO/cron.lang          |  17 +-
 htdocs/langs/ro_RO/donations.lang     |   5 +
 htdocs/langs/ro_RO/errors.lang        |   6 +
 htdocs/langs/ro_RO/mails.lang         |   2 +
 htdocs/langs/ro_RO/main.lang          |   6 +-
 htdocs/langs/ro_RO/orders.lang        |   6 +-
 htdocs/langs/ro_RO/other.lang         |   6 +-
 htdocs/langs/ro_RO/products.lang      |  23 +-
 htdocs/langs/ro_RO/projects.lang      |  23 +-
 htdocs/langs/ro_RO/sendings.lang      |   1 +
 htdocs/langs/ro_RO/suppliers.lang     |   1 +
 htdocs/langs/ru_RU/accountancy.lang   | 144 ++---
 htdocs/langs/ru_RU/admin.lang         | 481 ++++++++--------
 htdocs/langs/ru_RU/agenda.lang        |  51 +-
 htdocs/langs/ru_RU/banks.lang         |  30 +-
 htdocs/langs/ru_RU/bills.lang         | 103 ++--
 htdocs/langs/ru_RU/boxes.lang         |  51 +-
 htdocs/langs/ru_RU/cashdesk.lang      |   8 +-
 htdocs/langs/ru_RU/categories.lang    | 154 +++---
 htdocs/langs/ru_RU/commercial.lang    |  40 +-
 htdocs/langs/ru_RU/companies.lang     |  76 +--
 htdocs/langs/ru_RU/compta.lang        |  48 +-
 htdocs/langs/ru_RU/contracts.lang     |  52 +-
 htdocs/langs/ru_RU/cron.lang          |  77 +--
 htdocs/langs/ru_RU/deliveries.lang    |   4 +-
 htdocs/langs/ru_RU/dict.lang          |  44 +-
 htdocs/langs/ru_RU/donations.lang     |  31 +-
 htdocs/langs/ru_RU/ecm.lang           |  74 +--
 htdocs/langs/ru_RU/errors.lang        |  88 +--
 htdocs/langs/ru_RU/exports.lang       |  16 +-
 htdocs/langs/ru_RU/ftp.lang           |  14 +-
 htdocs/langs/ru_RU/holiday.lang       | 204 +++----
 htdocs/langs/ru_RU/install.lang       |  28 +-
 htdocs/langs/ru_RU/interventions.lang |  52 +-
 htdocs/langs/ru_RU/languages.lang     |   4 +-
 htdocs/langs/ru_RU/mailmanspip.lang   |  50 +-
 htdocs/langs/ru_RU/mails.lang         |   8 +-
 htdocs/langs/ru_RU/main.lang          |  84 +--
 htdocs/langs/ru_RU/margins.lang       |  28 +-
 htdocs/langs/ru_RU/members.lang       |  32 +-
 htdocs/langs/ru_RU/orders.lang        |  66 +--
 htdocs/langs/ru_RU/other.lang         | 104 ++--
 htdocs/langs/ru_RU/paybox.lang        |  18 +-
 htdocs/langs/ru_RU/paypal.lang        |  30 +-
 htdocs/langs/ru_RU/printipp.lang      |  26 +-
 htdocs/langs/ru_RU/productbatch.lang  |  40 +-
 htdocs/langs/ru_RU/products.lang      | 247 +++++----
 htdocs/langs/ru_RU/projects.lang      |  65 +--
 htdocs/langs/ru_RU/propal.lang        |  22 +-
 htdocs/langs/ru_RU/resource.lang      |  54 +-
 htdocs/langs/ru_RU/salaries.lang      |  18 +-
 htdocs/langs/ru_RU/sendings.lang      | 131 ++---
 htdocs/langs/ru_RU/stocks.lang        |  42 +-
 htdocs/langs/ru_RU/suppliers.lang     |  31 +-
 htdocs/langs/ru_RU/trips.lang         | 196 +++----
 htdocs/langs/ru_RU/users.lang         |  44 +-
 htdocs/langs/ru_RU/withdrawals.lang   |  32 +-
 htdocs/langs/ru_RU/workflow.lang      |   8 +-
 htdocs/langs/ru_UA/ecm.lang           |   3 -
 htdocs/langs/sk_SK/admin.lang         |  31 +-
 htdocs/langs/sk_SK/agenda.lang        |   7 +-
 htdocs/langs/sk_SK/bills.lang         |   7 +-
 htdocs/langs/sk_SK/categories.lang    | 152 +++---
 htdocs/langs/sk_SK/cron.lang          |  17 +-
 htdocs/langs/sk_SK/donations.lang     |   5 +
 htdocs/langs/sk_SK/errors.lang        |   6 +
 htdocs/langs/sk_SK/mails.lang         |   2 +
 htdocs/langs/sk_SK/main.lang          |   6 +-
 htdocs/langs/sk_SK/orders.lang        |   6 +-
 htdocs/langs/sk_SK/other.lang         |   6 +-
 htdocs/langs/sk_SK/products.lang      |  17 +-
 htdocs/langs/sk_SK/projects.lang      |   9 +-
 htdocs/langs/sk_SK/sendings.lang      |   1 +
 htdocs/langs/sk_SK/suppliers.lang     |   1 +
 htdocs/langs/sl_SI/admin.lang         |  31 +-
 htdocs/langs/sl_SI/agenda.lang        |   7 +-
 htdocs/langs/sl_SI/bills.lang         |   7 +-
 htdocs/langs/sl_SI/categories.lang    | 152 +++---
 htdocs/langs/sl_SI/cron.lang          |  17 +-
 htdocs/langs/sl_SI/donations.lang     |   5 +
 htdocs/langs/sl_SI/errors.lang        |   6 +
 htdocs/langs/sl_SI/mails.lang         |   2 +
 htdocs/langs/sl_SI/main.lang          |  18 +-
 htdocs/langs/sl_SI/orders.lang        |   6 +-
 htdocs/langs/sl_SI/other.lang         |   6 +-
 htdocs/langs/sl_SI/products.lang      |  17 +-
 htdocs/langs/sl_SI/projects.lang      |   9 +-
 htdocs/langs/sl_SI/sendings.lang      |   1 +
 htdocs/langs/sl_SI/suppliers.lang     |   1 +
 htdocs/langs/sq_AL/admin.lang         |  31 +-
 htdocs/langs/sq_AL/agenda.lang        |   7 +-
 htdocs/langs/sq_AL/bills.lang         |   7 +-
 htdocs/langs/sq_AL/categories.lang    | 152 +++---
 htdocs/langs/sq_AL/cron.lang          |  17 +-
 htdocs/langs/sq_AL/donations.lang     |   5 +
 htdocs/langs/sq_AL/errors.lang        |   6 +
 htdocs/langs/sq_AL/mails.lang         |   2 +
 htdocs/langs/sq_AL/main.lang          |   6 +-
 htdocs/langs/sq_AL/orders.lang        |   6 +-
 htdocs/langs/sq_AL/other.lang         |   6 +-
 htdocs/langs/sq_AL/products.lang      |  17 +-
 htdocs/langs/sq_AL/projects.lang      |   9 +-
 htdocs/langs/sq_AL/sendings.lang      |   1 +
 htdocs/langs/sq_AL/suppliers.lang     |   1 +
 htdocs/langs/sv_SE/admin.lang         |  31 +-
 htdocs/langs/sv_SE/agenda.lang        |   7 +-
 htdocs/langs/sv_SE/bills.lang         |   7 +-
 htdocs/langs/sv_SE/categories.lang    | 152 +++---
 htdocs/langs/sv_SE/cron.lang          |  17 +-
 htdocs/langs/sv_SE/donations.lang     |   5 +
 htdocs/langs/sv_SE/errors.lang        |   6 +
 htdocs/langs/sv_SE/mails.lang         |   2 +
 htdocs/langs/sv_SE/main.lang          |   6 +-
 htdocs/langs/sv_SE/orders.lang        |   6 +-
 htdocs/langs/sv_SE/other.lang         |   6 +-
 htdocs/langs/sv_SE/products.lang      |  17 +-
 htdocs/langs/sv_SE/projects.lang      |   9 +-
 htdocs/langs/sv_SE/sendings.lang      |   1 +
 htdocs/langs/sv_SE/suppliers.lang     |   1 +
 htdocs/langs/sw_SW/admin.lang         |  31 +-
 htdocs/langs/sw_SW/agenda.lang        |   7 +-
 htdocs/langs/sw_SW/bills.lang         |   7 +-
 htdocs/langs/sw_SW/categories.lang    | 152 +++---
 htdocs/langs/sw_SW/cron.lang          |  17 +-
 htdocs/langs/sw_SW/donations.lang     |   5 +
 htdocs/langs/sw_SW/errors.lang        |   6 +
 htdocs/langs/sw_SW/mails.lang         |   2 +
 htdocs/langs/sw_SW/main.lang          |   6 +-
 htdocs/langs/sw_SW/orders.lang        |   6 +-
 htdocs/langs/sw_SW/other.lang         |   6 +-
 htdocs/langs/sw_SW/products.lang      |  17 +-
 htdocs/langs/sw_SW/projects.lang      |   9 +-
 htdocs/langs/sw_SW/sendings.lang      |   1 +
 htdocs/langs/sw_SW/suppliers.lang     |   1 +
 htdocs/langs/th_TH/admin.lang         |  31 +-
 htdocs/langs/th_TH/agenda.lang        |   7 +-
 htdocs/langs/th_TH/bills.lang         |   7 +-
 htdocs/langs/th_TH/categories.lang    | 152 +++---
 htdocs/langs/th_TH/cron.lang          |  17 +-
 htdocs/langs/th_TH/donations.lang     |   5 +
 htdocs/langs/th_TH/errors.lang        |   6 +
 htdocs/langs/th_TH/mails.lang         |   2 +
 htdocs/langs/th_TH/main.lang          |   6 +-
 htdocs/langs/th_TH/orders.lang        |   6 +-
 htdocs/langs/th_TH/other.lang         |   6 +-
 htdocs/langs/th_TH/products.lang      |  17 +-
 htdocs/langs/th_TH/projects.lang      |   9 +-
 htdocs/langs/th_TH/sendings.lang      |   1 +
 htdocs/langs/th_TH/suppliers.lang     |   1 +
 htdocs/langs/tr_TR/admin.lang         |  99 ++--
 htdocs/langs/tr_TR/agenda.lang        |   9 +-
 htdocs/langs/tr_TR/banks.lang         |  10 +-
 htdocs/langs/tr_TR/bills.lang         |  15 +-
 htdocs/langs/tr_TR/categories.lang    | 152 +++---
 htdocs/langs/tr_TR/commercial.lang    |   4 +-
 htdocs/langs/tr_TR/companies.lang     |   2 +-
 htdocs/langs/tr_TR/contracts.lang     |   2 +-
 htdocs/langs/tr_TR/cron.lang          |  19 +-
 htdocs/langs/tr_TR/donations.lang     |   5 +
 htdocs/langs/tr_TR/errors.lang        |  12 +-
 htdocs/langs/tr_TR/install.lang       |   2 +-
 htdocs/langs/tr_TR/mails.lang         |   2 +
 htdocs/langs/tr_TR/main.lang          |  18 +-
 htdocs/langs/tr_TR/orders.lang        |  10 +-
 htdocs/langs/tr_TR/other.lang         |  10 +-
 htdocs/langs/tr_TR/productbatch.lang  |   2 +-
 htdocs/langs/tr_TR/products.lang      |  23 +-
 htdocs/langs/tr_TR/projects.lang      |  23 +-
 htdocs/langs/tr_TR/salaries.lang      |   2 +-
 htdocs/langs/tr_TR/sendings.lang      |   3 +-
 htdocs/langs/tr_TR/stocks.lang        |   6 +-
 htdocs/langs/tr_TR/suppliers.lang     |   3 +-
 htdocs/langs/tr_TR/trips.lang         | 192 +++----
 htdocs/langs/uk_UA/admin.lang         |  31 +-
 htdocs/langs/uk_UA/agenda.lang        |   7 +-
 htdocs/langs/uk_UA/bills.lang         |   7 +-
 htdocs/langs/uk_UA/boxes.lang         |  45 +-
 htdocs/langs/uk_UA/categories.lang    | 152 +++---
 htdocs/langs/uk_UA/cron.lang          |  17 +-
 htdocs/langs/uk_UA/donations.lang     |   5 +
 htdocs/langs/uk_UA/errors.lang        |   6 +
 htdocs/langs/uk_UA/mails.lang         |  16 +-
 htdocs/langs/uk_UA/main.lang          |   6 +-
 htdocs/langs/uk_UA/orders.lang        |   6 +-
 htdocs/langs/uk_UA/other.lang         |   6 +-
 htdocs/langs/uk_UA/products.lang      |  17 +-
 htdocs/langs/uk_UA/projects.lang      |   9 +-
 htdocs/langs/uk_UA/sendings.lang      |   1 +
 htdocs/langs/uk_UA/suppliers.lang     |   1 +
 htdocs/langs/uz_UZ/admin.lang         |  31 +-
 htdocs/langs/uz_UZ/agenda.lang        |   7 +-
 htdocs/langs/uz_UZ/bills.lang         |   7 +-
 htdocs/langs/uz_UZ/categories.lang    | 152 +++---
 htdocs/langs/uz_UZ/cron.lang          |  17 +-
 htdocs/langs/uz_UZ/donations.lang     |   5 +
 htdocs/langs/uz_UZ/errors.lang        |   6 +
 htdocs/langs/uz_UZ/mails.lang         |   2 +
 htdocs/langs/uz_UZ/main.lang          |   6 +-
 htdocs/langs/uz_UZ/orders.lang        |   6 +-
 htdocs/langs/uz_UZ/other.lang         |   6 +-
 htdocs/langs/uz_UZ/products.lang      |  17 +-
 htdocs/langs/uz_UZ/projects.lang      |   9 +-
 htdocs/langs/uz_UZ/sendings.lang      |   1 +
 htdocs/langs/uz_UZ/suppliers.lang     |   1 +
 htdocs/langs/vi_VN/accountancy.lang   |   2 +-
 htdocs/langs/vi_VN/admin.lang         |  31 +-
 htdocs/langs/vi_VN/agenda.lang        |   7 +-
 htdocs/langs/vi_VN/bills.lang         |  33 +-
 htdocs/langs/vi_VN/categories.lang    | 152 +++---
 htdocs/langs/vi_VN/cron.lang          |  17 +-
 htdocs/langs/vi_VN/donations.lang     |   5 +
 htdocs/langs/vi_VN/errors.lang        |   6 +
 htdocs/langs/vi_VN/mails.lang         |   2 +
 htdocs/langs/vi_VN/main.lang          |   6 +-
 htdocs/langs/vi_VN/orders.lang        |   6 +-
 htdocs/langs/vi_VN/other.lang         |   6 +-
 htdocs/langs/vi_VN/products.lang      |  17 +-
 htdocs/langs/vi_VN/projects.lang      |   9 +-
 htdocs/langs/vi_VN/resource.lang      |  54 +-
 htdocs/langs/vi_VN/sendings.lang      |   5 +-
 htdocs/langs/vi_VN/suppliers.lang     |   1 +
 htdocs/langs/vi_VN/withdrawals.lang   |   4 +-
 htdocs/langs/zh_CN/admin.lang         |  39 +-
 htdocs/langs/zh_CN/agenda.lang        |   7 +-
 htdocs/langs/zh_CN/bills.lang         |   7 +-
 htdocs/langs/zh_CN/categories.lang    | 152 +++---
 htdocs/langs/zh_CN/cron.lang          |  17 +-
 htdocs/langs/zh_CN/donations.lang     |   5 +
 htdocs/langs/zh_CN/errors.lang        |   6 +
 htdocs/langs/zh_CN/mails.lang         |   2 +
 htdocs/langs/zh_CN/main.lang          |   6 +-
 htdocs/langs/zh_CN/orders.lang        |   6 +-
 htdocs/langs/zh_CN/other.lang         |   6 +-
 htdocs/langs/zh_CN/products.lang      |  17 +-
 htdocs/langs/zh_CN/projects.lang      |   9 +-
 htdocs/langs/zh_CN/sendings.lang      |   1 +
 htdocs/langs/zh_CN/suppliers.lang     |   1 +
 htdocs/langs/zh_TW/admin.lang         |  31 +-
 htdocs/langs/zh_TW/agenda.lang        |   7 +-
 htdocs/langs/zh_TW/bills.lang         |   7 +-
 htdocs/langs/zh_TW/categories.lang    | 152 +++---
 htdocs/langs/zh_TW/cron.lang          |  17 +-
 htdocs/langs/zh_TW/donations.lang     |   5 +
 htdocs/langs/zh_TW/errors.lang        |   6 +
 htdocs/langs/zh_TW/mails.lang         |   2 +
 htdocs/langs/zh_TW/main.lang          |   6 +-
 htdocs/langs/zh_TW/orders.lang        |   6 +-
 htdocs/langs/zh_TW/other.lang         |   6 +-
 htdocs/langs/zh_TW/products.lang      |  17 +-
 htdocs/langs/zh_TW/projects.lang      |   9 +-
 htdocs/langs/zh_TW/sendings.lang      |   1 +
 htdocs/langs/zh_TW/suppliers.lang     |   1 +
 809 files changed, 12012 insertions(+), 9183 deletions(-)

diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 2777d5fac6a..e96b095b5d0 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=الإخطارات
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=التبرعات
@@ -508,14 +511,14 @@ Module1400Name=المحاسبة
 Module1400Desc=المحاسبة الإدارية (ضعف الأحزاب)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=الفئات
-Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=سوغ محرر
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=جدول الأعمال
 Module2400Desc=الأعمال / الإدارة المهام وجدول الأعمال
 Module2500Name=إدارة المحتوى الإلكتروني
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=قراءة الخدمات
 Permission532=إنشاء / تعديل الخدمات
 Permission534=حذف خدمات
@@ -746,6 +754,7 @@ Permission1185=الموافقة على أوامر المورد
 Permission1186=من أجل المورد أوامر
 Permission1187=باستلام المورد أوامر
 Permission1188=وثيقة أوامر المورد
+Permission1190=Approve (second approval) supplier orders
 Permission1201=ونتيجة للحصول على التصدير
 Permission1202=إنشاء / تعديل للتصدير
 Permission1231=قراءة فواتير الموردين
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=ادارة الدمار الواردات الخارجية البيانات في قاعدة البيانات (بيانات تحميل)
 Permission1321=تصدير العملاء والفواتير والمدفوعات والصفات
 Permission1421=التصدير طلبات الزبائن وصفاته
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=قراءة الأعمال (أو أحداث المهام) مرتبطة حسابه
 Permission2402=إنشاء / تعديل أو حذف الإجراءات (الأحداث أو المهام) مرتبطة حسابه
 Permission2403=قراءة الأعمال (أو أحداث المهام) آخرين
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=عودة رمز المحاسبة التي بناها:
 ModuleCompanyCodePanicum=العودة فارغة مدونة المحاسبة.
 ModuleCompanyCodeDigitaria=قانون المحاسبة طرف ثالث يعتمد على الرمز. الشفرة تتكون من طابع "جيم" في المركز الأول يليه 5 الحروف الأولى من طرف ثالث المدونة.
 UseNotifications=استخدام الإخطارات
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=وثائق قوالب
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=علامة مائية على مشروع الوثيقة
@@ -1557,6 +1566,7 @@ SuppliersSetup=المورد الإعداد وحدة
 SuppliersCommandModel=قالب كاملة من أجل المورد (logo...)
 SuppliersInvoiceModel=كاملة قالب من فاتورة المورد (logo. ..)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind الإعداد وحدة
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index 0f766d6beaa..1e1bc134583 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=تم توثيق %s من الفاتورة
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=الفاتورة %s للذهاب بها إلى حالة المسودة
 InvoiceDeleteDolibarr=تم حذف %s من الفاتورة
-OrderValidatedInDolibarr= تم توثيق %s من الطلب
+OrderValidatedInDolibarr=تم توثيق %s من الطلب
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=تم إلغاء %s من الطلب
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=تم الموافقة على %s من الطلب
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=الطلب %s للذهاب بها إلى حالة المسودة
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index d0514e828ab..103f8dc779d 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=المدفوعات قد فعلت
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=دفع الحكم
 PaymentMode=نوع الدفع
-PaymentConditions=مدة السداد
-PaymentConditionsShort=مدة السداد
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=دفع مبلغ
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=دفع أعلى من دفع تذكرة
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=مجموعه جديدتين الخصم يج
 ConfirmRemoveDiscount=هل أنت متأكد من أنك تريد إزالة هذا الخصم؟
 RelatedBill=الفاتورة ذات الصلة
 RelatedBills=الفواتير ذات الصلة
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index 77ec72df825..967a8906157 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=الفئة
-Categories=الفئات
-Rubrique=الفئة
-Rubriques=الفئات
-categories=الفئات
-TheCategorie=فئة
-NoCategoryYet=أي فئة من هذا النوع التي أنشئت
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=في
 AddIn=أضيف في
 modify=تعديل
 Classify=تصنيف
-CategoriesArea=منطقة الفئات
-ProductsCategoriesArea=منتجات / خدمات الفئات المنطقة
-SuppliersCategoriesArea=الموردين منطقة الفئات
-CustomersCategoriesArea=العملاء منطقة الفئات
-ThirdPartyCategoriesArea=أطراف ثالثة 'منطقة الفئات
-MembersCategoriesArea=منطقة فئات الأعضاء
-ContactsCategoriesArea=Contacts categories area
-MainCats=الفئات الرئيسية
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=الفئات الفرعية
 CatStatistics=إحصائيات
-CatList=قائمة الفئات
-AllCats=جميع الفئات
-ViewCat=عرض الفئة
-NewCat=إضافة فئة
-NewCategory=فئة جديدة
-ModifCat=تعديل الفئة
-CatCreated=تم إنشاء الفئة
-CreateCat=إنشاء فئة
-CreateThisCat=إنشاء هذه الفئة
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=صحة المجالات
 NoSubCat=لا فرعية.
 SubCatOf=فرعية
-FoundCats=العثور على الفئات
-FoundCatsForName=فئات إيجاد اسم :
-FoundSubCatsIn=فرعية موجودة في الفئة
-ErrSameCatSelected=كنت قد اخترت نفس الفئة عدة مرات
-ErrForgotCat=نسيت اختيار الفئة
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=نسيت أن أبلغ المجالات
 ErrCatAlreadyExists=هذا الاسم مستخدم بالفعل
-AddProductToCat=إضافة هذا المنتج إلى الفئة؟
-ImpossibleAddCat=من المستحيل أن تضيف فئة
-ImpossibleAssociateCategory=من المستحيل المنتسبين لهذه الفئة
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=ق ٪ أضيفت بنجاح.
-ObjectAlreadyLinkedToCategory=العنصر المرتبط بالفعل في هذه الفئة.
-CategorySuccessfullyCreated=ق ٪ من هذه الفئة تم اضافة بالنجاح.
-ProductIsInCategories=المنتجات / الخدمات وتملك على الفئات التالية
-SupplierIsInCategories=لطرف ثالث يملك الموردين الفئات التالية
-CompanyIsInCustomersCategories=هذا الطرف الثالث وتملك ليلي العملاء / آفاق الفئات
-CompanyIsInSuppliersCategories=ويملك هذا الطرف الثالث على الفئات التالية الموردين
-MemberIsInCategories=يملك هذا العضو إلى الفئات التالية الأعضاء
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=هذا المنتج / الخدمة وليس في أي فئات
-SupplierHasNoCategory=هذا المورد ليست في أي فئات
-CompanyHasNoCategory=هذه الشركة ليست في أي فئات
-MemberHasNoCategory=هذا العضو غير موجود في أي فئات
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=تصنف في الفئة
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=بلا
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=هذه الفئة موجودة بالفعل في نفس المكان
 ReturnInProduct=عودة إلى المنتجات / الخدمات بطاقة
 ReturnInSupplier=عودة الى مورد بطاقة
@@ -66,22 +64,22 @@ ReturnInCompany=عودة الى الزبون / احتمال بطاقة
 ContentsVisibleByAll=محتويات سوف تكون واضحة من جانب جميع
 ContentsVisibleByAllShort=محتويات مرئية من قبل جميع
 ContentsNotVisibleByAllShort=محتويات غير مرئي من قبل جميع
-CategoriesTree=Categories tree
-DeleteCategory=حذف فئة
-ConfirmDeleteCategory=هل أنت متأكد من أنك تريد حذف هذه الفئة؟
-RemoveFromCategory=إزالة الارتباط مع catégorie
-RemoveFromCategoryConfirm=هل أنت متأكد من أنك تريد إزالة الربط بين الصفقة والفئة؟
-NoCategoriesDefined=أي فئة محددة
-SuppliersCategoryShort=فئة الموردين
-CustomersCategoryShort=فئة الزبائن
-ProductsCategoryShort=فئة المنتجات
-MembersCategoryShort=أعضاء الفئة
-SuppliersCategoriesShort=فئات الموردين
-CustomersCategoriesShort=فئات العملاء
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prosp. الفئات
-ProductsCategoriesShort=فئات المنتجات
-MembersCategoriesShort=أعضاء الفئات
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=هذه الفئة لا تحتوي على أي منتج.
 ThisCategoryHasNoSupplier=هذه الفئة لا تحتوي على أي مورد.
 ThisCategoryHasNoCustomer=هذه الفئة لا تحتوي على أي عميل.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=المخصصة للعميل
 AssignedToTheCustomer=يكلف العميل
 InternalCategory=فئة Inernal
-CategoryContents=محتويات هذه الفئة
-CategId=معرف الفئة
-CatSupList=قائمة الموردين الفئات
-CatCusList=قائمة العملاء / احتمال الفئات
-CatProdList=قائمة المنتجات فئات
-CatMemberList=قائمة بأسماء أعضاء الفئات
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index c3c9b446364..45f695fa7dc 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= بلا
+CronNone=بلا
 CronDtStart=تاريخ البدء
 CronDtEnd=نهاية التاريخ
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/ar_SA/donations.lang b/htdocs/langs/ar_SA/donations.lang
index a6bc12ad61a..fe30adb3cee 100644
--- a/htdocs/langs/ar_SA/donations.lang
+++ b/htdocs/langs/ar_SA/donations.lang
@@ -6,6 +6,8 @@ Donor=الجهات المانحة
 Donors=الجهات المانحة
 AddDonation=Create a donation
 NewDonation=منحة جديدة
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=هدية الوعد
 PromisesNotValid=وعود لم يصادق
@@ -21,6 +23,8 @@ DonationStatusPaid=تلقى تبرع
 DonationStatusPromiseNotValidatedShort=مسودة
 DonationStatusPromiseValidatedShort=صادق
 DonationStatusPaidShort=وردت
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=التحقق من صحة الوعد
 DonationReceipt=Donation receipt
 BuildDonationReceipt=بناء استلام
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 4635ed9b4be..7a6c5c79081 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 03b8db4771f..676e1e8aba6 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=أرسلت قائمة جميع اشعارات بالبر
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 45649f61d53..ed51c527393 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -352,6 +352,7 @@ Status=حالة
 Favorite=Favorite
 ShortInfo=Info.
 Ref=المرجع.
+ExternalRef=Ref. extern
 RefSupplier=المرجع. المورد
 RefPayment=المرجع. الدفع
 CommercialProposalsShort=مقترحات تجارية
@@ -394,8 +395,8 @@ Available=متاح
 NotYetAvailable=لم تتوفر بعد
 NotAvailable=غير متاحة
 Popularity=شعبية
-Categories=الفئات
-Category=الفئة
+Categories=Tags/categories
+Category=Tag/category
 By=بواسطة
 From=من
 to=إلى
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index 24a7db59d86..2424a0118b4 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=سفينة المنتج
 Discount=الخصم
 CreateOrder=خلق أمر
 RefuseOrder=رفض النظام
-ApproveOrder=قبول النظام
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=من أجل التحقق من صحة
 UnvalidateOrder=Unvalidate النظام
 DeleteOrder=من أجل حذف
@@ -102,6 +103,8 @@ ClassifyBilled=تصنيف "فواتير"
 ComptaCard=بطاقة المحاسبة
 DraftOrders=مشروع أوامر
 RelatedOrders=الأوامر ذات الصلة
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=على عملية أوامر
 RefOrder=المرجع. ترتيب
 RefCustomerOrder=المرجع. عملاء النظام
@@ -118,6 +121,7 @@ PaymentOrderRef=من أجل دفع ق ٪
 CloneOrder=استنساخ النظام
 ConfirmCloneOrder=هل أنت متأكد من أن هذا الأمر استنساخ ٪ ق؟
 DispatchSupplierOrder=%s استقبال النظام مورد
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=ممثل العميل متابعة النظام
 TypeContact_commande_internal_SHIPPING=ممثل الشحن متابعة
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 8154a44c9ea..4af940e2fdf 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=تدخل المصادق
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=فاتورة مصادق
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=من أجل الموافقة على المورد
 Notify_ORDER_SUPPLIER_REFUSE=من أجل رفض الموردين
 Notify_ORDER_VALIDATE=التحقق من صحة النظام العميل
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=اقتراح التجارية المرسلة عن طر
 Notify_BILL_PAYED=دفعت فاتورة العميل
 Notify_BILL_CANCEL=فاتورة الزبون إلغاء
 Notify_BILL_SENTBYMAIL=فاتورة الزبون إرسالها عن طريق البريد
-Notify_ORDER_SUPPLIER_VALIDATE=أجل التحقق من صحة المورد
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=النظام مزود ترسل عن طريق البريد
 Notify_BILL_SUPPLIER_VALIDATE=فاتورة المورد المصادق
 Notify_BILL_SUPPLIER_PAYED=دفعت فاتورة المورد
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=عدد الملفات المرفقة / وثائق
 TotalSizeOfAttachedFiles=اجمالى حجم الملفات المرفقة / وثائق
 MaxSize=الحجم الأقصى
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=فاتورة ٪ ق المصادق
 EMailTextProposalValidated=وقد تم اقتراح %s التحقق من صحة.
 EMailTextOrderValidated=وقد تم التحقق من صحة %s النظام.
 EMailTextOrderApproved=من أجل الموافقة على ق ٪
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=من أجل ٪ ق ق ٪ وافقت عليها
 EMailTextOrderRefused=من أجل رفض ق ٪
 EMailTextOrderRefusedBy=من أجل أن ترفض ٪ ق ق ٪
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index e79c928e86b..945757cd0ef 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index b1625a43fdf..511c52cdfe0 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=قائمة الموردين المرتبط
 ListContractAssociatedProject=قائمة العقود المرتبطة بالمشروع.
 ListFichinterAssociatedProject=قائمة التدخلات المرتبطة بالمشروع
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=قائمة الإجراءات المرتبطة بالمشروع
 ActivityOnProjectThisWeek=نشاط المشروع هذا الاسبوع
 ActivityOnProjectThisMonth=نشاط المشروع هذا الشهر
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=وهناك مشروع كامل لنموذج التقرير (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
index ba8a8febbad..56b60af94b8 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=المرجع. إرسال
 Sending=إرسال
 Sendings=الإرسال
+AllSendings=All Shipments
 Shipment=إرسال
 Shipments=شحنات
 ShowSending=Show Sending
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index 622c3c5575d..2220fa67658 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index e1d603d5a23..42ca0f9cb57 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Разделител
 ExtrafieldCheckBox=Отметка
 ExtrafieldRadio=Радио бутон
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Известия
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Дарения
@@ -508,14 +511,14 @@ Module1400Name=Счетоводство
 Module1400Desc=Управление на счетоводство (двойни страни)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Категории
-Module1780Desc=Управление на категории (продукти, доставчици и клиенти)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG редактор
 Module2000Desc=Оставя се да редактирате някакъв текст, чрез използване на усъвършенствана редактор
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Дневен ред
 Module2400Desc=Събития/задачи и управление на дневен ред
 Module2500Name=Електронно Управление на Съдържанието
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Прочети услуги
 Permission532=Създаване / промяна услуги
 Permission534=Изтриване на услуги
@@ -746,6 +754,7 @@ Permission1185=Одобряване на доставчика поръчки
 Permission1186=Поръчка доставчика поръчки
 Permission1187=Потвърдя получаването на доставчика поръчки
 Permission1188=Изтриване на доставчика поръчки
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Резултат от износ
 Permission1202=Създаване / Промяна на износ
 Permission1231=Доставчика фактури
@@ -758,10 +767,10 @@ Permission1237=EXPORT доставчик поръчки и техните дет
 Permission1251=Пусни масов внос на външни данни в базата данни (данни товара)
 Permission1321=Износ на клиентите фактури, атрибути и плащания
 Permission1421=Износ на клиентски поръчки и атрибути
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Прочетете действия (събития или задачи), свързани с неговата сметка
 Permission2402=Създаване/промяна действия (събития или задачи), свързани с неговата сметка
 Permission2403=Изтрий действия (събития или задачи), свързани с неговата сметка
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Връщане счетоводна код, постр
 ModuleCompanyCodePanicum=Връща празна код счетоводство.
 ModuleCompanyCodeDigitaria=Счетоводството код зависи от код на трето лице. Код се състои от буквата "C" на първа позиция, следван от първите 5 символа на код на трета страна.
 UseNotifications=Използвайте уведомления
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Документи шаблони
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Воден знак върху проект на документ
@@ -1557,6 +1566,7 @@ SuppliersSetup=Настройка доставчик модул
 SuppliersCommandModel=Пълна шаблон на доставчика за (logo. ..)
 SuppliersInvoiceModel=Пълна образец на фактура на доставчика (logo. ..)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind модул за настройка
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index 803c9a2ba95..3c0497e6c70 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Фактура %s валидирани
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Фактура %s се върнете в състояние на чернова
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Поръчка %s валидирани
+OrderValidatedInDolibarr=Поръчка %s валидирани
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Поръчка %s отменен
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Поръчка %s одобрен
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Поръчка %s се върне в състояние на чернова
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index 8e51c4cf697..eacfbd69a02 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Плащания направили
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Плащане правило
 PaymentMode=Начин на плащане
-PaymentConditions=Начин на плащане
-PaymentConditionsShort=Начин на плащане
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Сума за плащане
 ValidatePayment=Проверка на плащане
 PaymentHigherThanReminderToPay=Плащането по-висока от напомняне за плащане
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Общо на две нови отстъп
 ConfirmRemoveDiscount=Сигурен ли сте, че искате да премахнете тази отстъпка?
 RelatedBill=Свързани фактура
 RelatedBills=Свързани фактури
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index 9e969cad703..c38713bb228 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Категория
-Categories=Категории
-Rubrique=Категория
-Rubriques=Категории
-categories=категории
-TheCategorie=Категорията
-NoCategoryYet=Няма създадена категория от този тип
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=В
 AddIn=Добавяне в
 modify=промяна
 Classify=Добавяне
-CategoriesArea=Категории
-ProductsCategoriesArea=Категории Продукти / Услуги
-SuppliersCategoriesArea=Категории доставчици
-CustomersCategoriesArea=Категории клиенти
-ThirdPartyCategoriesArea=Категории трети страни
-MembersCategoriesArea=Категории членове
-ContactsCategoriesArea=Категории контакти
-MainCats=Основни категории
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Подкатегории
 CatStatistics=Статистика
-CatList=Списък на категории
-AllCats=Всички категории
-ViewCat=Преглед на категория
-NewCat=Добавяне на категория
-NewCategory=Нова категория
-ModifCat=Промяна на категория
-CatCreated=Категорията е създадена
-CreateCat=Създаване на категория
-CreateThisCat=Създаване
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Проверка на полетата
 NoSubCat=Няма подкатегория.
 SubCatOf=Подкатегория
-FoundCats=Открити са категории
-FoundCatsForName=Открити са категории за името:
-FoundSubCatsIn=Открити са подкатегории в категорията
-ErrSameCatSelected=Избрали сте една и съща категория няколко пъти
-ErrForgotCat=Забравили сте да изберете категория
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Забравили сте да информира полета
 ErrCatAlreadyExists=Това име вече се използва
-AddProductToCat=Добавете този продукт към категория?
-ImpossibleAddCat=Невъзможно е да добавите категория
-ImpossibleAssociateCategory=Невъзможно е да се асоциира категорията към
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s е добавен успешно.
-ObjectAlreadyLinkedToCategory=Елемента вече е свързан с тази категория.
-CategorySuccessfullyCreated=Категорията %s е добавена успешно.
-ProductIsInCategories=Продукта/услугата е в следните категории
-SupplierIsInCategories=Третото лице е в следните категории доставчици
-CompanyIsInCustomersCategories=Това трето лице е в следните категории клиенти/prospects
-CompanyIsInSuppliersCategories=Това трето лице е в следните категории доставчици
-MemberIsInCategories=Този член е в следните категории членове
-ContactIsInCategories=Този контакт принадлежи на следните категории контакти
-ProductHasNoCategory=Този продукт/услуга не е в никакви категории
-SupplierHasNoCategory=Този доставчик не е в никакви категории
-CompanyHasNoCategory=Тази фирма не е в никакви категории
-MemberHasNoCategory=Този член не е в никакви категории
-ContactHasNoCategory=Този контакт не е в категория
-ClassifyInCategory=Добавяне в категория
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Няма
-NotCategorized=Без категория
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Тази категория вече съществува с този код
 ReturnInProduct=Обратно към картата на продукта/услугата
 ReturnInSupplier=Обратно към картата на доставчика
@@ -66,22 +64,22 @@ ReturnInCompany=Обратно към картата на  клиента/prospe
 ContentsVisibleByAll=Съдържанието ще се вижда от всички
 ContentsVisibleByAllShort=Съдържанието е видимо от всички
 ContentsNotVisibleByAllShort=Съдържанието не е видимо от всички
-CategoriesTree=Категории дърво
-DeleteCategory=Изтриване на категория
-ConfirmDeleteCategory=Сигурни ли сте, че желаете да изтриете тази категория?
-RemoveFromCategory=Премахване на връзката с категория
-RemoveFromCategoryConfirm=Сигурни ли сте, че желаете да премахнете връзката между операцията и категорията?
-NoCategoriesDefined=Не е определена категория
-SuppliersCategoryShort=Категория доставчици
-CustomersCategoryShort=Категория клиенти
-ProductsCategoryShort=Категория продукти
-MembersCategoryShort=Категория членове
-SuppliersCategoriesShort=Категории доставчици
-CustomersCategoriesShort=Категории клиенти
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo / Prosp. категории
-ProductsCategoriesShort=Категории продукти
-MembersCategoriesShort=Категории членове
-ContactCategoriesShort=Категории контакти
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Тази категория не съдържа никакъв продукт.
 ThisCategoryHasNoSupplier=Тази категория не съдържа никакъв доставчик.
 ThisCategoryHasNoCustomer=Тази категория не съдържа никакъв клиент.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Тази категория не съдържа ник
 AssignedToCustomer=Възложено на клиент
 AssignedToTheCustomer=Възложено на клиента
 InternalCategory=Вътрешна категория
-CategoryContents=Съдържание на категория
-CategId=ID на категория
-CatSupList=Списък на доставчика категории
-CatCusList=Списък на потребителите / перспективата категории
-CatProdList=Списък на продуктите категории
-CatMemberList=Списък на членовете категории
-CatContactList=Лист на контактни категории и контакти
-CatSupLinks=Връзки между доставчици и категории
-CatCusLinks=Връзки между потребител/перспектива и категории
-CatProdLinks=Връзки между продукти/услуги и категории
-CatMemberLinks=Връзки между членове и категории
-DeleteFromCat=Премахване от категорията
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Изтрий снимка
 ConfirmDeletePicture=Потвърди изтриване на снимка?
 ExtraFieldsCategories=Допълнителни атрибути
-CategoriesSetup=Категории настройка
-CategorieRecursiv=Автоматично свързване с родителска категория
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Ако е активирано, продукта ще бъде свързан също и с родителската категория при добавяне в под-категория
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index 9bd0fcaa449..39c37094ded 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= Няма
+CronNone=Няма
 CronDtStart=Начална дата
 CronDtEnd=Крайна дата
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=Системния команден ред за стартиране.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Информация
 # Common
diff --git a/htdocs/langs/bg_BG/donations.lang b/htdocs/langs/bg_BG/donations.lang
index e64cf417e46..e81fdc8da28 100644
--- a/htdocs/langs/bg_BG/donations.lang
+++ b/htdocs/langs/bg_BG/donations.lang
@@ -6,6 +6,8 @@ Donor=Дарител
 Donors=Дарители
 AddDonation=Create a donation
 NewDonation=Ново дарение
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Показване на дарение
 DonationPromise=Обещано дарение
 PromisesNotValid=Няма потвърдени дарения
@@ -21,6 +23,8 @@ DonationStatusPaid=Получено дарение
 DonationStatusPromiseNotValidatedShort=Проект
 DonationStatusPromiseValidatedShort=Потвърдено
 DonationStatusPaidShort=Получено
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Потвърждаване на дарението
 DonationReceipt=Разписка за дарение
 BuildDonationReceipt=Създаване на разписка
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 6231717fdd5..aba2303da23 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index 186205e9b8b..003c2d40637 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Списък на всички имейли, изпра
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 579a2d355a3..e441743cfd0 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -352,6 +352,7 @@ Status=Състояние
 Favorite=Favorite
 ShortInfo=Инфо.
 Ref=Реф.
+ExternalRef=Ref. extern
 RefSupplier=Реф. снабдител
 RefPayment=Реф. плащане
 CommercialProposalsShort=Търговски предложения
@@ -394,8 +395,8 @@ Available=На разположение
 NotYetAvailable=Все още няма данни
 NotAvailable=Не е налично
 Popularity=Популярност
-Categories=Категории
-Category=Категория
+Categories=Tags/categories
+Category=Tag/category
 By=От
 From=От
 to=за
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Изберете елемент и натиснете Презареждане
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Понеделник
 Tuesday=Вторник
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index b68ed897256..6033e574571 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Кораб продукт
 Discount=Отстъпка
 CreateOrder=Създаване на поръчка
 RefuseOrder=Спецконтейнери за
-ApproveOrder=Приемам за
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Валидиране за
 UnvalidateOrder=Unvalidate за
 DeleteOrder=Изтрий заявка
@@ -102,6 +103,8 @@ ClassifyBilled=Класифицирайте таксувани
 ComptaCard=Счетоводството карта
 DraftOrders=Проект за поръчки
 RelatedOrders=Подобни поръчки
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=В процес поръчки
 RefOrder=Реф. ред
 RefCustomerOrder=Реф. поръчка на клиента
@@ -118,6 +121,7 @@ PaymentOrderRef=Плащане на поръчката %s
 CloneOrder=Clone за
 ConfirmCloneOrder=Сигурен ли сте, че искате да клонирате за този %s?
 DispatchSupplierOrder=Получаване %s доставчика ред
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Представител проследяване поръчка на клиента
 TypeContact_commande_internal_SHIPPING=Представител проследяване доставка
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 4e636a028f0..adb385d5a47 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Интервенция валидирани
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Клиентът фактура се заверява
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Доставчик утвърдения
 Notify_ORDER_SUPPLIER_REFUSE=Доставчик за отказа
 Notify_ORDER_VALIDATE=Клиента заявка се заверява
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Търговско предложение, изпрат
 Notify_BILL_PAYED=Фактурата на клиента е платена
 Notify_BILL_CANCEL=Фактурата на клиента е отменена
 Notify_BILL_SENTBYMAIL=Фактурата на клиента е  изпратена по пощата
-Notify_ORDER_SUPPLIER_VALIDATE=Доставчик влязлата в сила заповед
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Доставчик реда, изпратени по пощата
 Notify_BILL_SUPPLIER_VALIDATE=Доставчик фактура валидирани
 Notify_BILL_SUPPLIER_PAYED=Доставчик фактура плаща
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Брой на прикачените файлове/документи
 TotalSizeOfAttachedFiles=Общ размер на прикачените файлове/документи
 MaxSize=Максимален размер
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Фактура %s е била потвърдена.
 EMailTextProposalValidated=Предложението %s е била потвърдена.
 EMailTextOrderValidated=За %s е била потвърдена.
 EMailTextOrderApproved=За %s е одобрен.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Е бил одобрен за %s от %s.
 EMailTextOrderRefused=За %s е била отказана.
 EMailTextOrderRefusedBy=За %s е отказано от %s.
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index b742caded2a..a4a601493bd 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 76dc1909c2d..bedf0a7b8f6 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Списък на фактурите на
 ListContractAssociatedProject=Списък на договори, свързани с проекта
 ListFichinterAssociatedProject=Списък на интервенциите, свързани с проекта
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Списък на събития, свързани с проекта
 ActivityOnProjectThisWeek=Дейности в проекта тази седмица
 ActivityOnProjectThisMonth=Дейност по проект, този месец
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Прекъсни връзката към елемента
 # Documents models
 DocumentModelBaleine=Доклад за цялостния проект модел (logo. ..)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Свържете със средство за да определите времето
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index 5b7e942d65e..71f689c32dd 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Реф. пратка
 Sending=Пратка
 Sendings=Превозите
+AllSendings=All Shipments
 Shipment=Пратка
 Shipments=Превозите
 ShowSending=Show Sending
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index b98cea1ccfe..b737c270035 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Списък на нарежданията за доста
 MenuOrdersSupplierToBill=Поръчки на доставчика за фактуриране
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index d882817a90b..5f59ffde1f2 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Putanja do datoteke koja sadrži Maxmind ip do prevoda za zemlju. 
     Primjeri: 
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index d6a5c96ae01..614ec124570 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktura %s potvrđena
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Faktura %s vraćena u status izrade
 InvoiceDeleteDolibarr=Faktura %s obrisana
-OrderValidatedInDolibarr= Narudžba %s potvrđena
+OrderValidatedInDolibarr=Narudžba %s potvrđena
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Narudžba %s otkazana
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Narudžba %s odobrena
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=NArudžbu %s vratiti u status izrade
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index 1b69bd47535..2ccb041fd4f 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Izvršene uplate
 PaymentsBackAlreadyDone=Izvršeni povrati uplata
 PaymentRule=Pravilo plaćanja
 PaymentMode=Način plaćanja
-PaymentConditions=Rok plaćanja
-PaymentConditionsShort=Rok plaćanja
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Iznos plaćanja
 ValidatePayment=Potvrditi uplatu
 PaymentHigherThanReminderToPay=Uplata viša od zaostalog duga
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Ukupno za dva nova popusta mora biti jednak
 ConfirmRemoveDiscount=Jeste li sigurni da želite ukloniti ovaj popust?
 RelatedBill=Povezana faktura
 RelatedBills=Povezane fakture
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index 76e3aeecdc3..1e2151b4945 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategorija
-Categories=Kategorije
-Rubrique=Kategorija
-Rubriques=Kategorije
-categories=kategorije
-TheCategorie=Kategorija
-NoCategoryYet=Nema kreirane kategorije ovog tipa
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=U
 AddIn=Dodaj u
 modify=izmijeniti
 Classify=Svrstati
-CategoriesArea=Područje za kategorije
-ProductsCategoriesArea=Područje za kategorije proizvoda/usluga
-SuppliersCategoriesArea=Područje za kategorije dobavljača
-CustomersCategoriesArea=Područje za kategorije kupaca
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Područje za kategorije članova
-ContactsCategoriesArea=Područje za kategorije kontakata
-MainCats=Glavne kategorije
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Podkategorije
 CatStatistics=Statistika
-CatList=Lista kategorija
-AllCats=Sve kategorije
-ViewCat=Pogledaj kategoriju
-NewCat=Dodaj kategoriju
-NewCategory=Nova kategorija
-ModifCat=Izmijeni kategoriju
-CatCreated=Kategorija kreirana
-CreateCat=Kreiraj kategoriju
-CreateThisCat=Kreiraj ovu kategoriju
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Potvrdi polja
 NoSubCat=Nema podkategorije
 SubCatOf=Podkategorija
-FoundCats=Kategorije pronađene
-FoundCatsForName=Kategorije pronađene za ime :
-FoundSubCatsIn=Podkategorije pronađene u kategoriji
-ErrSameCatSelected=Izbrali ste istu kategoriju nekoliko puta
-ErrForgotCat=Zaboravili ste izabrati kategoriju
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Zaboravili ste prijaviti polja
 ErrCatAlreadyExists=Ime se već koristi
-AddProductToCat=Dodaj ovaj proizvod u kategoriju?
-ImpossibleAddCat=Nemoguće dodati kategoriju
-ImpossibleAssociateCategory=Nemoguće povezati kategoriju sa
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s je uspješno dodan/a.
-ObjectAlreadyLinkedToCategory=Element je već povezan sa ovom kategorijom.
-CategorySuccessfullyCreated=Ova kategorija %s je uspješno dodana.
-ProductIsInCategories=Proizvod/usluga pripada slijedećim kategorijama
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=Ovaj član pripada sljedećim kategorijama članova
-ContactIsInCategories=Ovaj kontakt pripada slijedećim kategorijama kontakata
-ProductHasNoCategory=Ovaj prozvod/usluga nije dodan u neku od kategorija
-SupplierHasNoCategory=Ovaj dobavljač nije dodan u neku od kategorija
-CompanyHasNoCategory=Ova kopmanija nije dodana u neku od kategorija
-MemberHasNoCategory=Ovaj član nije dodan u neku od kategorija
-ContactHasNoCategory=Ovaj kontakt nije u nekoj od kategorija
-ClassifyInCategory=Svrstaj u kategoriju
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Ništa
-NotCategorized=Bez kategorije
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Već postoji kategorija sa ovom referencom
 ReturnInProduct=Nazad na karticu proizvoda/usluge
 ReturnInSupplier=Nazad na karticu dobavljača
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=Sadržaj će biti vidljiv svima
 ContentsVisibleByAllShort=Sadržaj vidljiv svima
 ContentsNotVisibleByAllShort=Sadržaj nije vidljiv svima
-CategoriesTree=Categories tree
-DeleteCategory=Obriši kategoriju
-ConfirmDeleteCategory=Jeste li sigurni da želite obrisati ovu kategoriju?
-RemoveFromCategory=Uklonite vezu sa kategorijom
-RemoveFromCategoryConfirm=Jeste li sigurni da želite ukloniti vezu između transakcije i kategorije?
-NoCategoriesDefined=Nema definisane kategorije
-SuppliersCategoryShort=Kategorija dobavljača
-CustomersCategoryShort=Kategorija kupaca
-ProductsCategoryShort=Kategorija prozvoda
-MembersCategoryShort=Kategorija članova
-SuppliersCategoriesShort=Kategorije dobavljača
-CustomersCategoriesShort=Kategorije kupaca
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Kategorije proizvoda
-MembersCategoriesShort=Kategorije članova
-ContactCategoriesShort=Kategorije kontakata
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Ova kategorija ne sadrži nijedan proizvod.
 ThisCategoryHasNoSupplier=Ova kategorija ne sadrži nijednog dobavljača.
 ThisCategoryHasNoCustomer=Ova kategorija ne sadrži nijednog kupca.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Ova kategorija ne sadrži nijednog kontakta.
 AssignedToCustomer=Dodijeljeno nekom kupcu
 AssignedToTheCustomer=Dodijeljeno ovom kupcu
 InternalCategory=Interna kategorija
-CategoryContents=Sadržaj kategorije
-CategId=ID kategorije
-CatSupList=Lista kategorija za dobavljače
-CatCusList=List of customer/prospect categories
-CatProdList=Lista kategorija za proizvode
-CatMemberList=Lista kategorija za članove
-CatContactList=Lista kategorija kontakata i kontakata
-CatSupLinks=Veze između dobavljača i kategorija
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Veze između proizvoda/usluga i kategorija
-CatMemberLinks=Veze između članova i kategorija
-DeleteFromCat=Ukloni iz kategorije
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index db866d27f75..c3144314bef 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Izvještaj o zadnjem pokretanju
 CronLastResult=Šifra rezultat zadnjeg pokretanja
 CronListOfCronJobs=Lista redovnih poslova
 CronCommand=Komanda
-CronList=Jobs list
-CronDelete= Obriši kron posao
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Jeste li sigurni sada da izvrši ovaj posao sada
-CronInfo= Poslovi omogućavaju da se izvrše zadatci koji su planirani
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= Ništa
+CronNone=Ništa
 CronDtStart=Datum početka
 CronDtEnd=End date
 CronDtNextLaunch=Sljedeće izvršenje
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=Sistemska komanda za izvršenje
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Inromacije
 # Common
diff --git a/htdocs/langs/bs_BA/donations.lang b/htdocs/langs/bs_BA/donations.lang
index 53b847f7c5a..59840a6662e 100644
--- a/htdocs/langs/bs_BA/donations.lang
+++ b/htdocs/langs/bs_BA/donations.lang
@@ -6,6 +6,8 @@ Donor=Donator
 Donors=Donatori
 AddDonation=Create a donation
 NewDonation=Nova donacija
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Prikaži donaciju
 DonationPromise=Obećanje za poklon
 PromisesNotValid=Nepotvrđena obećanja
@@ -21,6 +23,8 @@ DonationStatusPaid=Primljena donacija
 DonationStatusPromiseNotValidatedShort=Nacrt
 DonationStatusPromiseValidatedShort=Potvrđena donacija
 DonationStatusPaidShort=Primljena donacija
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Potvrdi obećanje
 DonationReceipt=Priznanica za donaciju
 BuildDonationReceipt=Napravi priznanicu
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index 6ce54e5dbd9..b2ea4f11995 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Lista svih notifikacija o slanju emaila
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 8ccf22d049a..7b8d50fd9ef 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Poslovni prijedlozi
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index b0ee1036827..79debdf06b8 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 7f9d2c4415e..c8f591a7262 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Lista faktura dobavljača u vezi s projekt
 ListContractAssociatedProject=Lista ugovora u vezi s projektom
 ListFichinterAssociatedProject=Lista intervencija u vezi s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista događaja u vezi s projektom
 ActivityOnProjectThisWeek=Aktivnost na projektu ove sedmice
 ActivityOnProjectThisMonth=Aktivnost na projektu ovog mjeseca
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang
index 0324d02b664..4957b903f6b 100644
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Referenca pošiljke
 Sending=Pošiljka
 Sendings=Pošiljke
+AllSendings=All Shipments
 Shipment=Pošiljka
 Shipments=Pošiljke
 ShowSending=Show Sending
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index 2a329c91d10..7a367073af7 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 239694fc251..cacc980f0e3 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separador
 ExtrafieldCheckBox=Casella de verificació
 ExtrafieldRadio=Botó de selecció excloent
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notificacions
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donacions
@@ -508,14 +511,14 @@ Module1400Name=Comptabilitat experta
 Module1400Desc=Gestió experta de la comptabilitat (doble partida)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Gestió de categories (productes, proveïdors i clients)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permet l'edició de certes zones de text mitjançant un editor avançat
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Gestor de tasques programades
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Gestió de l'agenda i de les accions
 Module2500Name=Gestió Electrònica de Documents
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Consultar serveis
 Permission532=Crear/modificar serveis
 Permission534=Eliminar serveis
@@ -746,6 +754,7 @@ Permission1185=Aprovar comandes a proveïdors
 Permission1186=Enviar comandes a proveïdors
 Permission1187=Rebre comandes a proveïdors
 Permission1188=Tancar comandes a proveïdors
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Obtenir resultat d'una exportació
 Permission1202=Crear/modificar exportacions
 Permission1231=Consultar factures de proveïdors
@@ -758,10 +767,10 @@ Permission1237=Exporta comandes de proveïdors juntament amb els seus detalls
 Permission1251=Llançar les importacions en massa a la base de dades (càrrega de dades)
 Permission1321=Exporta factures a clients, atributs i cobraments
 Permission1421=Exporta comandes de clients i atributs
-Permission23001 = Veure les tasques programades
-Permission23002 = Crear/Modificar les tasques programades
-Permission23003 = Eliminar les tasques programades
-Permission23004 = Executar les tasques programades
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Llegir accions (esdeveniments o tasques) vinculades al seu compte
 Permission2402=Crear/modificar accions (esdeveniments o tasques) vinculades al seu compte
 Permission2403=Modificar accions (esdeveniments o tasques) vinculades al seu compte
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Retorna un codi comptable compost de
    %s seguit del
 ModuleCompanyCodePanicum=Retorna un codi comptable buit.
 ModuleCompanyCodeDigitaria=Retorna un codi comptable compost seguint el codi de tercer. El codi està format per caràcter 'C' en primera posició seguit dels 5 primers caràcters del codi tercer.
 UseNotifications=Utilitza notificacions
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Models de documents
 DocumentModelOdt=Generació des dels documents amb format OpenDocument (Arxiu .ODT OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Marca d'aigua en els documents esborrany
@@ -1557,6 +1566,7 @@ SuppliersSetup=Configuració del mòdul Proveïdors
 SuppliersCommandModel=Model de comandes a proveïdors complet (logo...)
 SuppliersInvoiceModel=Model de factures de proveïdors complet (logo...)
 SuppliersInvoiceNumberingModel=Models de numeració de factures de proveïdor
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuració del mòdul GeoIP  Maxmind
 PathToGeoIPMaxmindCountryDataFile=Ruta de l'arxiu Maxmind que conté les conversions IP-> País.
    Exemple: /usr/local/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index f0912920d56..09836162cf5 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Factura %s validada
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Factura %s tornada a borrador
 InvoiceDeleteDolibarr=Factura %s eliminada
-OrderValidatedInDolibarr= Comanda %s validada
+OrderValidatedInDolibarr=Comanda %s validada
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Commanda %s anul·lada
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Comanda %s aprovada
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Comanda %s tordada a borrador
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index bf96794fbdc..d1078e9f3ce 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Pagaments efectuats
 PaymentsBackAlreadyDone=Reemborsaments ja efectuats
 PaymentRule=Forma de pagament
 PaymentMode=Forma de pagament
-PaymentConditions=Condicions de pagament
-PaymentConditionsShort=Condicions pagament
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Import pagament
 ValidatePayment=Validar aquest pagament
 PaymentHigherThanReminderToPay=Pagament superior a la resta a pagar
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=La suma de l'import dels 2 nous descomptes
 ConfirmRemoveDiscount=Esteu segur de voler eliminar aquest descompte?
 RelatedBill=Factura associada
 RelatedBills=Factures associades
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index c6e5221d79e..4de38bfe254 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categoria
-Categories=categories
-Rubrique=Categoria
-Rubriques=Categories
-categories=Categoria(es)
-TheCategorie=La categoria
-NoCategoryYet=Cap categoria d'aquest tipus creada
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=En
 AddIn=Afegir en
 modify=Modificar
 Classify=Classificar
-CategoriesArea=Àrea categories
-ProductsCategoriesArea=Àrea categories de productes i serveis
-SuppliersCategoriesArea=Àrea categories de proveïdors
-CustomersCategoriesArea=Àrea categories de clients
-ThirdPartyCategoriesArea=Àrea categories de tercers
-MembersCategoriesArea=Àrea categories de membres
-ContactsCategoriesArea=Àrea categories de contactes
-MainCats=Categories principals
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Estadístiques
-CatList=Llista de categories
-AllCats=Totes les categories
-ViewCat=Veure la categoria
-NewCat=Nova categoria
-NewCategory=Nova categoria
-ModifCat=Modificar una categoria
-CatCreated=Categoria creada
-CreateCat=Afegir una categoria
-CreateThisCat=Afegir aquesta categoria
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validar els camps
 NoSubCat=Aquesta categoria no  conté cap subcategoria
 SubCatOf=Subcategories
-FoundCats=Categories trobades
-FoundCatsForName=Categories trobades amb el nom:
-FoundSubCatsIn=Subcategories trobades en  la categoria
-ErrSameCatSelected=Heu seleccionat la mateixa categoria diverses vegades
-ErrForgotCat=Ha oblidat escollir la categoria
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Ha oblidat reassignar un camp
 ErrCatAlreadyExists=Aquest nom està sent utilitzat
-AddProductToCat=Afegir aquest producte a una categoria?
-ImpossibleAddCat=Impossible afegir la categoria
-ImpossibleAssociateCategory=Impossible associar la categoria
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=s'ha afegit amb èxit.
-ObjectAlreadyLinkedToCategory=L'element ja està enllaçat a aquesta categoria
-CategorySuccessfullyCreated=La categoria %s s'ha inserit correctament.
-ProductIsInCategories=Aquest producte/servei es troba en les següents categories
-SupplierIsInCategories=Aquest proveïdor es troba en les següents categories
-CompanyIsInCustomersCategories=Aquesta empresa es troba en les següents categories
-CompanyIsInSuppliersCategories=Aquesta empresa es troba en les següents categories de proveïdors
-MemberIsInCategories=Aquest membre es troba en les següents categories de membres
-ContactIsInCategories=Aquest contacte es troba en les següents categories de contactes
-ProductHasNoCategory=Aquest producte/servei no es troba en cap categoria en particular
-SupplierHasNoCategory=Aquest proveïdor no es troba en cap categoria en particular
-CompanyHasNoCategory=Aquesta empresa no es troba en cap categoria en particular
-MemberHasNoCategory=Aquest membre no es troba en cap categoria en particular
-ContactHasNoCategory=Aquest contacte no es troba en cap categoria
-ClassifyInCategory=Classificar en la categoria
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Cap
-NotCategorized=Sense categoria
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Aquesta categoria ja existeix per aquesta referència
 ReturnInProduct=Tornar a la fitxa producte/servei
 ReturnInSupplier=Tornar a la fitxa proveïdor
@@ -66,22 +64,22 @@ ReturnInCompany=Tornar a la fitxa client/client potencial
 ContentsVisibleByAll=El contingut serà visible per tots
 ContentsVisibleByAllShort=Contingut visible per tots
 ContentsNotVisibleByAllShort=Contingut no visible per tots
-CategoriesTree=Categories tree
-DeleteCategory=Eliminar categoria
-ConfirmDeleteCategory=Esteu segur de voler eliminar aquesta categoria?
-RemoveFromCategory=Suprimir l'enllaç amb categoria
-RemoveFromCategoryConfirm=Esteu segur de voler eliminar el vincle entre la transacció i la categoria?
-NoCategoriesDefined=Cap categoria definida
-SuppliersCategoryShort=Categoria proveïdors
-CustomersCategoryShort=Categoria clients
-ProductsCategoryShort=Categoria productes
-MembersCategoryShort=Categoria membre
-SuppliersCategoriesShort=Categories proveïdors
-CustomersCategoriesShort=Categories clients
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Categories clients
-ProductsCategoriesShort=Categories productes
-MembersCategoriesShort=Categories membres
-ContactCategoriesShort=Categories contactes
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Aquesta categoria no conté cap producte.
 ThisCategoryHasNoSupplier=Aquesta categoria no conté cap proveïdor.
 ThisCategoryHasNoCustomer=Aquesta categoria no conté cap client.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Aquesta categoria no conté contactes
 AssignedToCustomer=Assignar a un client
 AssignedToTheCustomer=Assignat a un client
 InternalCategory=Categoria interna
-CategoryContents=Contingut de la categoria
-CategId=Id categoria
-CatSupList=Llista de categories de proveïdors
-CatCusList=Llista de categories de clients/potencials
-CatProdList=Llista de categories de productes
-CatMemberList=Llista de categories de membres
-CatContactList=Llistat de categories de contactes i contactes
-CatSupLinks=Proveïdors
-CatCusLinks=Clients/Clients potencials
-CatProdLinks=Productes
-CatMemberLinks=Membres
-DeleteFromCat=Eliminar de la categoria
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index eb350eaaaa9..584698000fd 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Última sortida
 CronLastResult=Últim codi tornat
 CronListOfCronJobs=Llista de tasques programades
 CronCommand=Comando
-CronList=Llistat de tasques planificades
-CronDelete= Eliminar la tasca planificada
-CronConfirmDelete= Està segur que voleu eliminar aquesta tasca planificada?
-CronExecute=Executar aquesta tasca
-CronConfirmExecute= Està segur que voleu executar ara aquesta tasca?
-CronInfo= Els treballs permeten executar les tasques a intervals regulars
-CronWaitingJobs=Els seus treballs en espera:
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Tasca
-CronNone= Ningún
+CronNone=Ningún
 CronDtStart=Data inici
 CronDtEnd=Data fi
 CronDtNextLaunch=Propera execució
@@ -75,6 +75,7 @@ CronObjectHelp=El nombre del objeto a crear. 
     Por ejemplo para llamar el mé
 CronMethodHelp=El método a lanzar. 
     Por ejemplo para llamar el método fetch del objeto Product de Dolibarr  /htdocs/product/class/product.class.php, el valor del método es fecth
 CronArgsHelp=Los argumentos del método. 
     Por ejemplo para usar el método fetch del objeto Product deDolibarr /htdocs/product/class/product.class.php, el valor del parámetro podría ser 0, RefProduit
 CronCommandHelp=El comando del sistema a executar
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informació
 # Common
diff --git a/htdocs/langs/ca_ES/donations.lang b/htdocs/langs/ca_ES/donations.lang
index 66d683b5b62..e17aaece32f 100644
--- a/htdocs/langs/ca_ES/donations.lang
+++ b/htdocs/langs/ca_ES/donations.lang
@@ -6,6 +6,8 @@ Donor=Donant
 Donors=Donants
 AddDonation=Create a donation
 NewDonation=Nova donació
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Mostrar donació
 DonationPromise=Promesa de donació
 PromisesNotValid=Promeses no validades
@@ -21,6 +23,8 @@ DonationStatusPaid=Donació pagada
 DonationStatusPromiseNotValidatedShort=No validada
 DonationStatusPromiseValidatedShort=Validada
 DonationStatusPaidShort=Pagada
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validar promesa
 DonationReceipt=Rebut de donació
 BuildDonationReceipt=Crear rebut
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 927b9a3af1e..8377ca7b49c 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 5983e04c208..5305476affb 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Llista de notificacions d'e-mails enviades
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 80bf6b6e547..bafdc982e29 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -352,6 +352,7 @@ Status=Estat
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. proveïdor
 RefPayment=Ref. pagament
 CommercialProposalsShort=Pressupostos
@@ -394,8 +395,8 @@ Available=Disponible
 NotYetAvailable=Encara no disponible
 NotAvailable=No disponible
 Popularity=Popularitat
-Categories=Categories
-Category=Categoria
+Categories=Tags/categories
+Category=Tag/category
 By=Per
 From=De
 to=a
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 2749007c0ce..5088cabc352 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Enviar producte
 Discount=Descompte
 CreateOrder=Crear comanda
 RefuseOrder=Rebutjar la comanda
-ApproveOrder=Acceptar la comanda
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validar la comanda
 UnvalidateOrder=Desvalidar la comanda
 DeleteOrder=Eliminar la comanda
@@ -102,6 +103,8 @@ ClassifyBilled=Classificar facturat
 ComptaCard=Fitxa comptable
 DraftOrders=Comandes esborrany
 RelatedOrders=Comandes adjuntes
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Comandes en procés
 RefOrder=Ref. comanda
 RefCustomerOrder=Ref. comanda client
@@ -118,6 +121,7 @@ PaymentOrderRef=Pagament comanda %s
 CloneOrder=Clonar comanda
 ConfirmCloneOrder=Esteu segur de voler clonar aquesta comanda %s?
 DispatchSupplierOrder=Recepció de la comanda a proveïdor %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable seguiment comanda client
 TypeContact_commande_internal_SHIPPING=Responsable enviament comanda client
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 316704111fa..b8b1dcf2992 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validació fitxa intervenció
 Notify_FICHINTER_SENTBYMAIL=Enviament fitxa intervenció per e-mail
 Notify_BILL_VALIDATE=Validació factura
 Notify_BILL_UNVALIDATE=Devalidació factura a client
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Aprovació comanda a proveïdor
 Notify_ORDER_SUPPLIER_REFUSE=Rebuig comanda a proveïdor
 Notify_ORDER_VALIDATE=Validació comanda client
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Enviament pressupost per e-mail
 Notify_BILL_PAYED=Cobrament factura a client
 Notify_BILL_CANCEL=Cancel·lació factura a client
 Notify_BILL_SENTBYMAIL=Enviament factura a client per e-mail
-Notify_ORDER_SUPPLIER_VALIDATE=Validació comanda a proveïdor
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Enviament comanda a proveïdor per e-mail
 Notify_BILL_SUPPLIER_VALIDATE=Validació factura de proveïdor
 Notify_BILL_SUPPLIER_PAYED=Pagament factura de proveïdor
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Número arxius/documents adjunts
 TotalSizeOfAttachedFiles=Mida total dels arxius/documents adjunts
 MaxSize=Tamany màxim
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Factura %s validada
 EMailTextProposalValidated=El pressupost %s que el concerneix ha estat validat.
 EMailTextOrderValidated=La comanda %s que el concerneix ha estat validada.
 EMailTextOrderApproved=Comanda %s aprovada
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Comanda %s aprovada per %s
 EMailTextOrderRefused=Comanda %s rebutjada
 EMailTextOrderRefusedBy=Comanda %s rebutjada per %s
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 5c3a7e7b2d1..3714e0bff6a 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 694c1c3a732..4aae30221f4 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Llistat de factures de proveïdor associad
 ListContractAssociatedProject=Llistatde contractes associats al projecte
 ListFichinterAssociatedProject=Llistat d'intervencions associades al projecte
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Llista d'esdeveniments associats al projecte
 ActivityOnProjectThisWeek=Activitat en el projecte aquesta setmana
 ActivityOnProjectThisMonth=Activitat en el projecte aquest mes
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Model d'informe de projecte complet (logo...)
-PlannedWorkload = Càrrega de treball prevista
-WorkloadOccupation= Percentatge afectat
+PlannedWorkload=Càrrega de treball prevista
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Objectes vinculats
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 21562f914cc..3fafdaa9e63 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref enviament
 Sending=Enviament
 Sendings=Enviaments
+AllSendings=All Shipments
 Shipment=Enviament
 Shipments=Enviaments
 ShowSending=Show Sending
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index d0b6422c8e8..a06046334e5 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index e857b9ee394..3233222e753 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Oddělovač
 ExtrafieldCheckBox=Zaškrtávací políčko
 ExtrafieldRadio=Přepínač
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Zvláštní náklady (daně, sociální příspěvky a dividendy)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Upozornění
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Dary
@@ -508,14 +511,14 @@ Module1400Name=Účetnictví
 Module1400Desc=Vedení účetnictví (dvojité strany)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorie
-Module1780Desc=Category management (produkty, dodavatelé a odběratelé)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Nechte upravit některé textové pole pomocí pokročilého editoru
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Plánované správu úloh
+Module2300Desc=Scheduled job management
 Module2400Name=Pořad jednání
 Module2400Desc=Události / úkoly a agendy vedení
 Module2500Name=Elektronický Redakční
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Přečtěte služby
 Permission532=Vytvořit / upravit služby
 Permission534=Odstranit služby
@@ -746,6 +754,7 @@ Permission1185=Schválit dodavatelských objednávek
 Permission1186=Objednávky Objednat dodavatel
 Permission1187=Potvrzení přijetí dodavatelských objednávek
 Permission1188=Odstranit dodavatelských objednávek
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Získejte výsledek exportu
 Permission1202=Vytvořit / Upravit vývoz
 Permission1231=Přečtěte si dodavatelské faktury
@@ -758,10 +767,10 @@ Permission1237=Export dodavatelské objednávky a informace o nich
 Permission1251=Spustit Hmotné dovozy externích dat do databáze (načítání dat)
 Permission1321=Export zákazníků faktury, atributy a platby
 Permission1421=Export objednávek zákazníků a atributy
-Permission23001 = Přečtěte si naplánovaná úloha
-Permission23002 = Vytvořit / aktualizovat naplánovanou úlohu
-Permission23003 = Odstranit naplánovaná úloha
-Permission23004 = Provést naplánované úlohy,
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Přečtěte akce (události nebo úkoly) které souvisí s jeho účet
 Permission2402=Vytvořit / upravit akce (události nebo úkoly) které souvisí s jeho účet
 Permission2403=Odstranit akce (události nebo úkoly) které souvisí s jeho účet
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Vrátit evidence kód postavený podle: 
     %s násle
 ModuleCompanyCodePanicum=Zpět prázdný evidence kód.
 ModuleCompanyCodeDigitaria=Účetnictví kód závisí na kódu třetích stran. Kód se skládá ze znaku "C" na prvním místě následuje prvních 5 znaků kódu třetích stran.
 UseNotifications=Použití oznámení
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Dokumenty šablony
 DocumentModelOdt=Generování dokumentů z OpenDocuments šablon (. ODT nebo ODS. Soubory OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vodoznak na návrhu dokumentu
@@ -1557,6 +1566,7 @@ SuppliersSetup=Dodavatel modul nastavení
 SuppliersCommandModel=Kompletní šablona se s dodavately řádu (logo. ..)
 SuppliersInvoiceModel=Kompletní šablona dodavatelské faktury (logo. ..)
 SuppliersInvoiceNumberingModel=Dodavatelských faktur číslování modelů
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul nastavení
 PathToGeoIPMaxmindCountryDataFile=Cesta k souboru obsahující Maxmind IP pro země překladu. 
     Příklady: 
     / Usr / local / share / GeoIP / GeoIP.dat 
     / Usr / share / GeoIP / GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
index 8a2d630df34..4d1d71528a4 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktura %s ověřena
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Faktura %s vrátit do stavu návrhu
 InvoiceDeleteDolibarr=Faktura %s smazána
-OrderValidatedInDolibarr= Objednat %s ověřena
+OrderValidatedInDolibarr=Objednat %s ověřena
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Objednat %s zrušen
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Objednat %s schválen
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Objednat %s vrátit do stavu návrhu
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index e40c3cbdffd..56e82e77ef4 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Platby neučinily
 PaymentsBackAlreadyDone=Platby zpět neučinily
 PaymentRule=Platba pravidlo
 PaymentMode=Typ platby
-PaymentConditions=Termín vyplacení
-PaymentConditionsShort=Termín vyplacení
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Částka platby
 ValidatePayment=Ověření platby
 PaymentHigherThanReminderToPay=Platební vyšší než upomínce k zaplacení
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Celkem dva nové slevy musí být roven pů
 ConfirmRemoveDiscount=Jste si jisti, že chcete odstranit tuto slevu?
 RelatedBill=Související faktura
 RelatedBills=Související faktury
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
index fe5121d4974..f4249b7c085 100644
--- a/htdocs/langs/cs_CZ/categories.lang
+++ b/htdocs/langs/cs_CZ/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategorie
-Categories=Kategorie
-Rubrique=Kategorie
-Rubriques=Kategorie
-categories=kategorie
-TheCategorie=Kategorie
-NoCategoryYet=Žádné kategorii tohoto typu vytvořeného
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=V
 AddIn=Přidejte
 modify=upravit
 Classify=Klasifikovat
-CategoriesArea=Kategorie plocha
-ProductsCategoriesArea=Produkty / služby kategorie oblasti
-SuppliersCategoriesArea=Dodavatelé kategorie oblastí
-CustomersCategoriesArea=Zákazníci kategorie oblastí
-ThirdPartyCategoriesArea=Třetí strany Kategorie plocha
-MembersCategoriesArea=Členové kategorie oblastí
-ContactsCategoriesArea=Kontakty Kategorie plocha
-MainCats=Hlavní kategorie
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Podkategorie
 CatStatistics=Statistika
-CatList=Seznam kategorií
-AllCats=Všechny kategorie
-ViewCat=Zobrazit kategorii
-NewCat=Přidat kategorii
-NewCategory=Nová kategorie
-ModifCat=Změnit kategorii
-CatCreated=Kategorie vytvořil
-CreateCat=Vytvoření kategorie
-CreateThisCat=Vytvoření této kategorie
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Ověření pole
 NoSubCat=Podkategorie.
 SubCatOf=Podkategorie
-FoundCats=Nalezené kategorie
-FoundCatsForName=Kategorie nalezených pro výraz názvu:
-FoundSubCatsIn=Podkategorie nalezené v kategorii
-ErrSameCatSelected=Vybrali jste stejné kategorie několikrát
-ErrForgotCat=Zapomněli jste si vybrat kategorii
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Zapomněli jste informovat pole
 ErrCatAlreadyExists=Tento název je již používán
-AddProductToCat=Přidat tento produkt do kategorie?
-ImpossibleAddCat=Nelze přidat kategorii
-ImpossibleAssociateCategory=Nelze přiřadit kategorii
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s bylo úspěšně přidáno.
-ObjectAlreadyLinkedToCategory=Element je již připojen do této kategorie.
-CategorySuccessfullyCreated=Tato kategorie %s byla přidána s úspěchem.
-ProductIsInCategories=Produktu / služby je vlastníkem následujících kategoriích
-SupplierIsInCategories=Třetí strana vlastní následování dodavatelů kategorií
-CompanyIsInCustomersCategories=Tato třetí strana vlastní pro následující zákazníků / vyhlídky kategorií
-CompanyIsInSuppliersCategories=Tato třetí strana vlastní následování dodavatelů kategorií
-MemberIsInCategories=Tento člen je vlastníkem, aby tito členové kategorií
-ContactIsInCategories=Tento kontakt je vlastníkem do následujících kategorií kontakty
-ProductHasNoCategory=Tento produkt / služba není v žádné kategorii
-SupplierHasNoCategory=Tento dodavatel není v žádném kategoriích
-CompanyHasNoCategory=Tato společnost není v žádném kategoriích
-MemberHasNoCategory=Tento člen není v žádném kategoriích
-ContactHasNoCategory=Tento kontakt není v žádném kategoriích
-ClassifyInCategory=Zařazení do kategorie
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Nikdo
-NotCategorized=Bez kategorii
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Tato kategorie již existuje s tímto čj
 ReturnInProduct=Zpět na produkt / službu kartu
 ReturnInSupplier=Zpět na dodavatele karty
@@ -66,22 +64,22 @@ ReturnInCompany=Zpět na zákazníka / Vyhlídka karty
 ContentsVisibleByAll=Obsah bude vidět všichni
 ContentsVisibleByAllShort=Obsah viditelné všemi
 ContentsNotVisibleByAllShort=Obsah není vidět všichni
-CategoriesTree=Categories tree
-DeleteCategory=Odstranit kategorii
-ConfirmDeleteCategory=Jste si jisti, že chcete smazat tuto kategorii?
-RemoveFromCategory=Odstraňte spojení s kategoriích
-RemoveFromCategoryConfirm=Jste si jisti, že chcete odstranit vazbu mezi transakce a kategorie?
-NoCategoriesDefined=Žádné definované kategorie
-SuppliersCategoryShort=Dodavatelé kategorie
-CustomersCategoryShort=Zákazníci kategorie
-ProductsCategoryShort=Kategorie produktů
-MembersCategoryShort=Členové kategorie
-SuppliersCategoriesShort=Dodavatelé kategorie
-CustomersCategoriesShort=Zákazníci kategorie
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prosp. kategorie
-ProductsCategoriesShort=Kategorie produktů
-MembersCategoriesShort=Členové kategorie
-ContactCategoriesShort=Kontakty kategorie
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Tato kategorie neobsahuje žádný produkt.
 ThisCategoryHasNoSupplier=Tato kategorie neobsahuje žádné dodavatele.
 ThisCategoryHasNoCustomer=Tato kategorie neobsahuje žádné zákazníka.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Tato kategorie neobsahuje žádný kontakt.
 AssignedToCustomer=Účelově vázané k zákazníkovi
 AssignedToTheCustomer=Přiřazené zákazníkovi
 InternalCategory=Vnitřní kategorie
-CategoryContents=Kategorie obsah
-CategId=Kategorie id
-CatSupList=Seznam dodavatelských kategorií
-CatCusList=Seznam zákazníků / vyhlídky kategorií
-CatProdList=Seznam kategorií produktů
-CatMemberList=Seznam členů kategorií
-CatContactList=Seznam kontaktních kategorií a kontakt
-CatSupLinks=Vazby mezi dodavateli a kategorií
-CatCusLinks=Vazby mezi zákazníky / vyhlídky a kategorií
-CatProdLinks=Vazby mezi produktů / služeb a kategorií
-CatMemberLinks=Vazby mezi členy a kategorií
-DeleteFromCat=Odebrat z kategorie
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Nastavení kategorií
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index 83947327da5..b9411cbeda2 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Poslední běh výstup
 CronLastResult=Poslední kód výsledku
 CronListOfCronJobs=Seznam naplánovaných úloh
 CronCommand=Příkaz
-CronList=Jobs list
-CronDelete= Odstranit cron
-CronConfirmDelete= Jste si jisti, že chcete smazat tento cron?
-CronExecute=Zahájení práce
-CronConfirmExecute= Opravdu chcete provést tuto práci nyní
-CronInfo= Práce umožňují provádět úlohy, které byly plánované
-CronWaitingJobs=Wainting pracovních míst
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Práce
-CronNone= Nikdo
+CronNone=Nikdo
 CronDtStart=Datum zahájení
 CronDtEnd=Datum ukončení
 CronDtNextLaunch=Další provedení
@@ -75,6 +75,7 @@ CronObjectHelp=Název objektu načíst. 
     Např načíst metody objektu výro
 CronMethodHelp=Objekt způsob startu. 
     Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, hodnota metody je fecth
 CronArgsHelp=Metoda argumenty. 
     Např načíst metody objektu výrobku Dolibarr / htdocs / produktu / třída / product.class.php, může být hodnota paramters být 0, ProductRef
 CronCommandHelp=Systém příkazového řádku spustit.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informace
 # Common
diff --git a/htdocs/langs/cs_CZ/donations.lang b/htdocs/langs/cs_CZ/donations.lang
index ac953ea4487..609c56121a8 100644
--- a/htdocs/langs/cs_CZ/donations.lang
+++ b/htdocs/langs/cs_CZ/donations.lang
@@ -6,6 +6,8 @@ Donor=Dárce
 Donors=Dárci
 AddDonation=Create a donation
 NewDonation=Nový dárcovství
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Zobrazit dar
 DonationPromise=Dárkové slib
 PromisesNotValid=Nevaliduje sliby
@@ -21,6 +23,8 @@ DonationStatusPaid=Dotace přijaté
 DonationStatusPromiseNotValidatedShort=Návrh
 DonationStatusPromiseValidatedShort=Ověřené
 DonationStatusPaidShort=Přijaté
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Ověřit slib
 DonationReceipt=Darování příjem
 BuildDonationReceipt=Build přijetí
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index d2570c905ce..9443bb8c683 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index 443430caaea..43b66651949 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Vypsat všechny e-maily odesílané oznámení
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 17e4c56569f..a712b705f4b 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -352,6 +352,7 @@ Status=Postavení
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. dodavatel
 RefPayment=Ref. platba
 CommercialProposalsShort=Komerční návrhy
@@ -394,8 +395,8 @@ Available=Dostupný
 NotYetAvailable=Zatím není k dispozici
 NotAvailable=Není k dispozici
 Popularity=Popularita
-Categories=Kategorie
-Category=Kategorie
+Categories=Tags/categories
+Category=Tag/category
 By=Podle
 From=Z
 to=na
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Pondělí
 Tuesday=Úterý
diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang
index 6aa596baa1b..860d43d75b6 100644
--- a/htdocs/langs/cs_CZ/orders.lang
+++ b/htdocs/langs/cs_CZ/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Loď produkt
 Discount=Sleva
 CreateOrder=Vytvořit objednávku
 RefuseOrder=Odmítnout objednávku
-ApproveOrder=Přijmout objednávku
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Potvrzení objednávky
 UnvalidateOrder=Unvalidate objednávku
 DeleteOrder=Smazat objednávku
@@ -102,6 +103,8 @@ ClassifyBilled=Klasifikovat účtovány
 ComptaCard=Účetnictví karty
 DraftOrders=Návrh usnesení
 RelatedOrders=Související objednávky
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=V procesu objednávky
 RefOrder=Ref. objednávka
 RefCustomerOrder=Ref. objednávka zákazníka
@@ -118,6 +121,7 @@ PaymentOrderRef=Platba objednávky %s
 CloneOrder=Clone, aby
 ConfirmCloneOrder=Jste si jisti, že chcete kopírovat tuto objednávku %s?
 DispatchSupplierOrder=Příjem %s dodavatelských objednávek
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Zástupce následující-up, aby zákazník
 TypeContact_commande_internal_SHIPPING=Zástupce následující-up doprava
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index f0e4b814a04..475e40fdbad 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervence ověřena
 Notify_FICHINTER_SENTBYMAIL=Intervence poštou
 Notify_BILL_VALIDATE=Zákazník faktura ověřena
 Notify_BILL_UNVALIDATE=Zákazník faktura unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Dodavatel aby schválila
 Notify_ORDER_SUPPLIER_REFUSE=Dodavatel aby odmítl
 Notify_ORDER_VALIDATE=Zákazníka ověřena
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Komerční návrh zaslat poštou
 Notify_BILL_PAYED=Zákazník platí faktury
 Notify_BILL_CANCEL=Zákazník faktura zrušena
 Notify_BILL_SENTBYMAIL=Zákazník faktura zaslána poštou
-Notify_ORDER_SUPPLIER_VALIDATE=Dodavatel validovány, aby
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Dodavatel odeslaná poštou
 Notify_BILL_SUPPLIER_VALIDATE=Dodavatel fakturu ověřena
 Notify_BILL_SUPPLIER_PAYED=Dodavatel fakturu platí
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Počet připojených souborů / dokumentů
 TotalSizeOfAttachedFiles=Celková velikost připojených souborů / dokumentů
 MaxSize=Maximální rozměr
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Faktura %s byl ověřen.
 EMailTextProposalValidated=Návrh %s byl ověřen.
 EMailTextOrderValidated=Aby %s byl ověřen.
 EMailTextOrderApproved=Aby %s byl schválen.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Aby %s byl schválen %s.
 EMailTextOrderRefused=Aby %s byla zamítnuta.
 EMailTextOrderRefusedBy=Aby %s bylo odmítnuto podle %s.
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 7fc24c7a1a3..ac390130cb1 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 3e8b7a046b0..515e20fac14 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Seznam dodavatelských faktur souvisejíc
 ListContractAssociatedProject=Seznam zakázek souvisejících s projektem
 ListFichinterAssociatedProject=Seznam zákroků spojených s projektem
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Seznam událostí spojených s projektem
 ActivityOnProjectThisWeek=Týdenní projektová aktivita
 ActivityOnProjectThisMonth=Měsíční projektová aktivita
@@ -130,13 +131,15 @@ AddElement=Odkaz na prvek
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Kompletní projektový report (logo. ..)
-PlannedWorkload = Plánované vytížení
-WorkloadOccupation= Zábor vytížení
+PlannedWorkload=Plánované vytížení
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Odkazující objekty
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang
index f794bceaa84..31a10e77e1b 100644
--- a/htdocs/langs/cs_CZ/sendings.lang
+++ b/htdocs/langs/cs_CZ/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. náklad
 Sending=Náklad
 Sendings=Zásilky
+AllSendings=All Shipments
 Shipment=Náklad
 Shipments=Zásilky
 ShowSending=Show Sending
diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang
index 99a629ba847..2c56c9da67f 100644
--- a/htdocs/langs/cs_CZ/suppliers.lang
+++ b/htdocs/langs/cs_CZ/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 8cbc1e17779..50aff90a32d 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Adviséringer
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donationer
@@ -508,14 +511,14 @@ Module1400Name=Regnskabsmæssig ekspert
 Module1400Desc=Regnskabsmæssig forvaltning for eksperter (dobbelt parterne)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorier
-Module1780Desc=Kategorier 'forvaltning (produkter, leverandører og kunder)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG Editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Handlinger / opgaver og dagsorden forvaltning
 Module2500Name=Elektronisk Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Læs tjenester
 Permission532=Opret / ændre tjenester
 Permission534=Slet tjenester
@@ -746,6 +754,7 @@ Permission1185=Godkend leverandør ordrer
 Permission1186=Bestil leverandør ordrer
 Permission1187=Anerkende modtagelsen af leverandør ordrer
 Permission1188=Luk leverandør ordrer
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Få resultatet af en eksport
 Permission1202=Opret / Modify en eksport
 Permission1231=Læs leverandør fakturaer
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Kør massen import af eksterne data i databasen (data belastning)
 Permission1321=Eksporter kunde fakturaer, attributter og betalinger
 Permission1421=Eksporter kundens ordrer og attributter
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Læs aktioner (begivenheder eller opgaver) i tilknytning til hans konto
 Permission2402=Opret / ændre / slette handlinger (begivenheder eller opgaver) i tilknytning til hans konto
 Permission2403=Læs aktioner (begivenheder eller opgaver) af andre
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Retur en regnskabspool kode bygget af %s efterfulgt af
 ModuleCompanyCodePanicum=Retur tom regnskabspool kode.
 ModuleCompanyCodeDigitaria=Regnskabsmæssig kode afhænger tredjepart kode. Koden er sammensat af tegnet "C" i første position efterfulgt af de første 5 bogstaver af tredjepart kode.
 UseNotifications=Brug anmeldelser
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Dokumenter skabeloner
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vandmærke på udkast til et dokument
@@ -1557,6 +1566,7 @@ SuppliersSetup=Leverandør modul opsætning
 SuppliersCommandModel=Komplet template af leverandør orden (logo. ..)
 SuppliersInvoiceModel=Komplet template leverandør faktura (logo. ..)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul opsætning
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index b8b1c1005f1..66276978bdf 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktura valideret
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Faktura %s gå tilbage til udkast til status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Bestil valideret
+OrderValidatedInDolibarr=Bestil valideret
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Bestil %s annulleret
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Bestil %s godkendt
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Bestil %s gå tilbage til udkast til status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 4fec0d6f176..25e0c915ce1 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Betalinger allerede gjort
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Betaling regel
 PaymentMode=Betalingstype
-PaymentConditions=Betaling sigt
-PaymentConditionsShort=Betaling sigt
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Indbetalingsbeløb
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Betaling højere end påmindelse om at betale
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total af to nye rabatten skal svare til de
 ConfirmRemoveDiscount=Er du sikker på du vil fjerne denne rabat?
 RelatedBill=Relaterede faktura
 RelatedBills=Relaterede fakturaer
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index ec63e24aba0..caa830e7065 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategori
-Categories=Kategorier
-Rubrique=Kategori
-Rubriques=Kategorier
-categories=kategorier
-TheCategorie=Kategorien
-NoCategoryYet=Ingen kategori af denne type skabt
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=I
 AddIn=Tilføj i
 modify=modificere
 Classify=Klassificere
-CategoriesArea=Kategorier område
-ProductsCategoriesArea=Produkter / Tjenester 'kategorier område
-SuppliersCategoriesArea=Suppliers' kategorier område
-CustomersCategoriesArea=Kundernes kategorier område
-ThirdPartyCategoriesArea=Tredjeparters kategorier område
-MembersCategoriesArea=Medlemmer kategorier område
-ContactsCategoriesArea=Contacts categories area
-MainCats=Hovedkategorier
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Underkategorier
 CatStatistics=Statistik
-CatList=Liste over kategorier
-AllCats=Alle kategorier
-ViewCat=Vis kategori
-NewCat=Tilføj kategori
-NewCategory=Ny kategori
-ModifCat=Modify kategori
-CatCreated=Kategori skabt
-CreateCat=Opret kategori
-CreateThisCat=Opret denne kategori
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Valider felterne
 NoSubCat=Nr. underkategori.
 SubCatOf=Underkategori
-FoundCats=Fundet kategorier
-FoundCatsForName=Kategorier fundet for navnet:
-FoundSubCatsIn=Underkategorier fundet i kategorien
-ErrSameCatSelected=Du har valgt samme kategori flere gange
-ErrForgotCat=Du glemte at vælge den kategori
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Du har glemt at informere de områder
 ErrCatAlreadyExists=Dette navn bruges allerede
-AddProductToCat=Tilføj dette produkt til en kategori?
-ImpossibleAddCat=Umuligt at tilføje kategori
-ImpossibleAssociateCategory=Umuligt at tilknytte den kategori,
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully= %s blev tilføjet med succes.
-ObjectAlreadyLinkedToCategory=Element er allerede knyttet til denne kategori.
-CategorySuccessfullyCreated=Denne kategori %s er blevet tilføjet med succes.
-ProductIsInCategories=Produkt / service ejer til følgende kategorier
-SupplierIsInCategories=Tredjemand ejer til følgende leverandører kategorier
-CompanyIsInCustomersCategories=Denne tredjepart ejer til følgende kunder / udsigter kategorier
-CompanyIsInSuppliersCategories=Denne tredjepart ejer til følgende leverandører kategorier
-MemberIsInCategories=Dette medlem ejer til følgende medlemmer kategorier
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=Dette produkt / service er ikke i alle kategorier
-SupplierHasNoCategory=Denne leverandør er ikke i alle kategorier
-CompanyHasNoCategory=Dette selskab er ikke i alle kategorier
-MemberHasNoCategory=Dette medlem er ikke på nogen kategorier
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Klassificering i kategori
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Ingen
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Denne kategori allerede findes på samme sted
 ReturnInProduct=Tilbage til produkt / service kortet
 ReturnInSupplier=Tilbage til leverandøren kortet
@@ -66,22 +64,22 @@ ReturnInCompany=Tilbage til kunde / udsigt kortet
 ContentsVisibleByAll=Indholdet vil være synlige fra alle
 ContentsVisibleByAllShort=Indhold synlige fra alle
 ContentsNotVisibleByAllShort=Indholdet ikke er synligt fra alle
-CategoriesTree=Categories tree
-DeleteCategory=Slet kategori
-ConfirmDeleteCategory=Er du sikker på du vil slette denne kategori?
-RemoveFromCategory=Fjern link med Categorie
-RemoveFromCategoryConfirm=Er du sikker på du vil fjerne forbindelsen mellem transaktionen og den kategori?
-NoCategoriesDefined=Ingen kategori defineret
-SuppliersCategoryShort=Leverandører kategori
-CustomersCategoryShort=Kunder kategori
-ProductsCategoryShort=Produkter kategori
-MembersCategoryShort=Medlemmer kategori
-SuppliersCategoriesShort=Leverandører kategorier
-CustomersCategoriesShort=Kunder kategorier
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / prosp. kategorier
-ProductsCategoriesShort=Produkter kategorier
-MembersCategoriesShort=Medlemmer kategorier
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Denne kategori indeholder ingen produkt.
 ThisCategoryHasNoSupplier=Denne kategori indeholder ingen leverandør.
 ThisCategoryHasNoCustomer=Denne kategori indeholder ingen kunde.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Henføres til en kunde
 AssignedToTheCustomer=Henføres til kundens
 InternalCategory=Inernal kategori
-CategoryContents=Kategori indhold
-CategId=Kategori-id
-CatSupList=Liste over leverandør kategorier
-CatCusList=Liste over kunde / udsigt kategorier
-CatProdList=Liste over produkter kategorier
-CatMemberList=Liste over medlemmer kategorier
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index 8ea7f4353fa..9c968794352 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= Ingen
+CronNone=Ingen
 CronDtStart=Startdato
 CronDtEnd=Slutdato
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/da_DK/donations.lang b/htdocs/langs/da_DK/donations.lang
index 64929d78199..470a7a0de84 100644
--- a/htdocs/langs/da_DK/donations.lang
+++ b/htdocs/langs/da_DK/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donorer
 AddDonation=Create a donation
 NewDonation=Ny donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gave løfte
 PromisesNotValid=Ikke valideret løfter
@@ -21,6 +23,8 @@ DonationStatusPaid=Donationen er modtaget
 DonationStatusPromiseNotValidatedShort=Udkast
 DonationStatusPromiseValidatedShort=Valideret
 DonationStatusPaidShort=Modtaget
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validér løfte
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build modtagelse
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index f69f42d1a6f..3a988907211 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 3a8d4d24d72..507d8277dc7 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List alle e-mail meddelelser
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 91070a4d2ce..a905c89c749 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. leverandør
 RefPayment=Ref. betaling
 CommercialProposalsShort=Kommerciel forslag
@@ -394,8 +395,8 @@ Available=Tilgængelig
 NotYetAvailable=Endnu ikke tilgængelig
 NotAvailable=Ikke til rådighed
 Popularity=Popularitet
-Categories=Kategorier
-Category=Kategori
+Categories=Tags/categories
+Category=Tag/category
 By=Ved
 From=Fra
 to=til
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index c5cb6c9dc56..9bc52e0047b 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Skib produkt
 Discount=Discount
 CreateOrder=Opret Order
 RefuseOrder=Nægte at
-ApproveOrder=Acceptere for
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Valider orden
 UnvalidateOrder=Unvalidate rækkefølge
 DeleteOrder=Slet orden
@@ -102,6 +103,8 @@ ClassifyBilled=Klassificere "Billed"
 ComptaCard=Regnskabsmæssig kortet
 DraftOrders=Udkast til ordrer
 RelatedOrders=Relaterede ordrer
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Den proces ordrer
 RefOrder=Ref. rækkefølge
 RefCustomerOrder=Ref. kunde for
@@ -118,6 +121,7 @@ PaymentOrderRef=Betaling af for %s
 CloneOrder=Klon orden
 ConfirmCloneOrder=Er du sikker på at du vil klone denne ordre %s?
 DispatchSupplierOrder=Modtagelse leverandør for %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Repræsentant opfølgning kundeordre
 TypeContact_commande_internal_SHIPPING=Repræsentant opfølgning shipping
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index ec7a5a1fc9f..334c5cfe289 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Valider intervention
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Valider regningen
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Leverandør for godkendt
 Notify_ORDER_SUPPLIER_REFUSE=Leverandør For nægtes
 Notify_ORDER_VALIDATE=Kundeordre valideret
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Kommercielle forslaget, som sendes med posten
 Notify_BILL_PAYED=Kundens faktura betales
 Notify_BILL_CANCEL=Kundefaktura aflyst
 Notify_BILL_SENTBYMAIL=Kundens faktura sendes med posten
-Notify_ORDER_SUPPLIER_VALIDATE=Leverandør valideret orden
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverandør orden sendt med posten
 Notify_BILL_SUPPLIER_VALIDATE=Leverandør faktura valideret
 Notify_BILL_SUPPLIER_PAYED=Leverandør faktura betales
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Antal vedhæftede filer / dokumenter
 TotalSizeOfAttachedFiles=Samlede størrelse på vedhæftede filer / dokumenter
 MaxSize=Maksimumstørrelse
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Faktura %s valideret
 EMailTextProposalValidated=Forslaget %s er blevet valideret.
 EMailTextOrderValidated=Ordren %s er blevet valideret.
 EMailTextOrderApproved=Bestil %s godkendt
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Bestil %s er godkendt af %s
 EMailTextOrderRefused=Bestil %s nægtet
 EMailTextOrderRefusedBy=Bestil %s afvises af %s
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index e66913ef4fc..d87ebdd1741 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index a72024e975f..8cb189e42f1 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Liste over leverandører fakturaer forbund
 ListContractAssociatedProject=Liste over kontrakter i forbindelse med projektet
 ListFichinterAssociatedProject=Liste over interventioner i forbindelse med projektet
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Liste over aktioner i forbindelse med projektet
 ActivityOnProjectThisWeek=Aktivitet på projektet i denne uge
 ActivityOnProjectThisMonth=Aktivitet på projektet i denne måned
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=En komplet projekt rapport model (logo. ..)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
index 0b1d722f494..5c2efe5957b 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. afsendelse
 Sending=Sender
 Sendings=Sendings
+AllSendings=All Shipments
 Shipment=Sender
 Shipments=Forsendelser
 ShowSending=Show Sending
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index aae6a4917a0..8702698b604 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Liste over leverandør ordrer
 MenuOrdersSupplierToBill=Leverandør ordrer der kan faktureres
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/de_AT/other.lang b/htdocs/langs/de_AT/other.lang
index 3504dd431ff..5d348ab99b6 100644
--- a/htdocs/langs/de_AT/other.lang
+++ b/htdocs/langs/de_AT/other.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - other
 ToolsDesc=Dieser Bereich ist zur Gruppe diverse Werkzeuge nicht verfügbar in andere Menüeinträge gewidmet. 

     Diese Tools können aus dem Menü auf der Seite zu erreichen.
 DateToBirth=Geburtstdatum
+Notify_ORDER_SUPPLIER_VALIDATE=Lieferanten, um validierte
 Notify_WITHDRAW_TRANSMIT=Transmission Rückzug
 Notify_WITHDRAW_CREDIT=Kreditkarten Rückzug
 Notify_WITHDRAW_EMIT=Isue Rückzug
@@ -10,7 +11,6 @@ Notify_PROPAL_SENTBYMAIL=Gewerbliche Vorschlag per Post
 Notify_BILL_PAYED=Kunden Rechnung bezahlt
 Notify_BILL_CANCEL=Kunden Rechnung storniert
 Notify_BILL_SENTBYMAIL=Kunden Rechnung per Post geschickt
-Notify_ORDER_SUPPLIER_VALIDATE=Lieferanten, um validierte
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferant Bestellung per Post geschickt
 Notify_BILL_SUPPLIER_VALIDATE=Lieferantenrechnung validiert
 Notify_BILL_SUPPLIER_SENTBYMAIL=Lieferant Rechnung per Post geschickt
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 45611a61a57..0cfe4d3443d 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Trennzeichen
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameterlisten müssen das Format Schlüssel,Wert haben

     zum Beispiel:
    1,Wert1
    2,Wert2
    3,Wert3
    ...

    Um die Liste in Abhängigkeit zu einer anderen zu haben:
    1,Wert1|parent_list_code:parent_key
    2,Wert2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameterlisten müssen das Format Schlüssel,Wert haben

     zum Beispiel:
    1,Wert1
    2,Wert2
    3,Wert3
    ...
 ExtrafieldParamHelpradio=Parameterlisten müssen das Format Schlüssel,Wert haben

     zum Beispiel:
    1,Wert1
    2,Wert2
    3,Wert3
    ...
@@ -494,6 +495,8 @@ Module500Name=Sonderausgaben (Steuern, Sozialbeiträge und Dividenden)
 Module500Desc=Steuer-, Sozialbeitrags-, Dividenden- und Lohnverwaltung
 Module510Name=Löhne
 Module510Desc=Verwaltung der Angestellten-Gehälter und -Zahlungen
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Benachrichtigungen
 Module600Desc=Senden Sie Benachrichtigungen zu einigen Dolibarr-Events per E-Mail an Partner (wird pro Partner definiert)
 Module700Name=Spenden
@@ -508,14 +511,14 @@ Module1400Name=Buchhaltung
 Module1400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorien
-Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG-Editor
 Module2200Name=Dynamische Preise
 Module2200Desc=Mathematische Ausdrücke für Preise aktivieren
 Module2300Name=Cron
-Module2300Desc=Verwaltung geplanter Aufgaben
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Maßnahmen/Aufgaben und Agendaverwaltung
 Module2500Name=Inhaltsverwaltung(ECM)
@@ -714,6 +717,11 @@ Permission510=Löhne einsehen
 Permission512=Löhne erstellen/bearbeiten
 Permission514=Löhne löschen
 Permission517=Löhne exportieren
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Leistungen einsehen
 Permission532=Leistungen erstellen/bearbeiten
 Permission534=Leistungen löschen
@@ -746,6 +754,7 @@ Permission1185=Lieferantenbestellungen bestätigen
 Permission1186=Lieferantenbestellungen übermitteln
 Permission1187=Eingang von Lieferantenbestellungen bestätigen
 Permission1188=Lieferantenbestellungen schließen
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Exportresultate einsehen
 Permission1202=Export erstellen/bearbeiten
 Permission1231=Lieferantenrechnungen einsehen
@@ -758,10 +767,10 @@ Permission1237=Lieferantenbestellungen mit Details exportieren
 Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
 Permission1421=Kundenbestellungen und Attribute exportieren
-Permission23001 = Lese geplante Aufgabe
-Permission23002 = Erstelle/aktualisiere geplante Aufgabe
-Permission23003 = Lösche geplante Aufgabe
-Permission23004 = Führe geplante Aufgabe aus
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Maßnahmen (Termine/Aufgaben) in Verbindung mit eigenem Konto einsehen
 Permission2402=Maßnahmen (Termine/Aufgaben) in Verbindung mit eigenem Konto erstellen/bearbeiten
 Permission2403=Maßnahmen (Termine/Aufgaben) in Verbindung mit eigenem Konto löschen
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Li
 ModuleCompanyCodePanicum=Generiert einen leeren Kontierungscode.
 ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Partnercode ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Partnercodes zusammen.
 UseNotifications=Benachrichtigungen verwenden
-NotificationsDesc=E-Mail-Benachrichtigungsfunktionen erlauben Ihnen den stillschweigenden Versand automatischer Benachrichtigungen zu einigen Dolibarr-Ereignissen. Ziele dafür können definiert werden:
    * pro Partner-Kontakt (Kunden oder Lieferanten), ein Partner zur Zeit.
    * durch das Setzen einer globalen Ziel-Mail-Adresse in den Modul-Einstellungen
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Dokumentvorlagenmodul
 DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt- oder .ods-Dateien für OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Wasserzeichen auf Entwurf
@@ -1557,6 +1566,7 @@ SuppliersSetup=Lieferantenmoduleinstellungen
 SuppliersCommandModel=Vollständige Vorlage für Lieferantenbestellungen (Logo, ...)
 SuppliersInvoiceModel=Vollständige Vorlage der Lieferantenrechnung (logo. ..)
 SuppliersInvoiceNumberingModel=Lieferantenrechnungen Zähl-Modell
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP-Maxmind Moduleinstellungen
 PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP-zu-Land Übersetzung. 
    Beispiele:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoOP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 02209a06808..080a83dc998 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -9,14 +9,14 @@ Calendars=Kalender
 LocalAgenda=Internetkalender
 ActionsOwnedBy=Maßnahme gehört
 AffectedTo=Zugewiesen an
-DoneBy=Erldedigt von
+DoneBy=Erledigt von
 Event=Aktion
 Events=Termine
 EventsNb=Anzahl der Termine
 MyEvents=Meine Termine
 OtherEvents=Weitere Termine
 ListOfActions=Terminliste
-Location=Ort
+Location=Standort
 EventOnFullDay=Ganztägig
 SearchAnAction= Suche Maßnahme / Aufgabe
 MenuToDoActions=Alle unvollständigen Termine
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Rechnung freigegeben
 InvoiceValidatedInDolibarrFromPos=Rechnung %s von POS validiert
 InvoiceBackToDraftInDolibarr=Rechnung %s in den Entwurf Status zurücksetzen
 InvoiceDeleteDolibarr=Rechnung %s gelöscht
-OrderValidatedInDolibarr= Bestellung %s freigegeben
+OrderValidatedInDolibarr=Bestellung %s freigegeben
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Auftrag storniert %s
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Bestellen %s genehmigt
 OrderRefusedInDolibarr=Bestellung %s abgelehnt
 OrderBackToDraftInDolibarr=Bestellen %s zurück nach Draft-Status
@@ -91,3 +94,5 @@ WorkingTimeRange=Arbeitszeit-Bereich
 WorkingDaysRange=Arbeitstag-Bereich
 AddEvent=Maßnahme erstellen
 MyAvailability=Meine Verfügbarkeit
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 9caea1587c2..eebbf4aa13b 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Bereits getätigte Zahlungen
 PaymentsBackAlreadyDone=Rückzahlungen bereits erledigt
 PaymentRule=Zahlungsregel
 PaymentMode=Zahlungsart
-PaymentConditions=Zahlungskonditionen
-PaymentConditionsShort=Konditionen
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Zahlungsbetrag
 ValidatePayment=Zahlung freigeben
 PaymentHigherThanReminderToPay=Zahlungsbetrag übersteigt Zahlungserinnerung
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Insgesamt zwei neue Rabatt muss gleich zu d
 ConfirmRemoveDiscount=Sind Sie sicher, dass Sie diesen Rabatt entfernen möchten?
 RelatedBill=Ähnliche Rechnung
 RelatedBills=Ähnliche Rechnungen
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Letzte ähnliche Rechnung
 WarningBillExist=Achtung, es existiert bereits mindestens eine Rechnung
 
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index a558ee04ff6..c558a8436a5 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategorie
-Categories=Kategorien
-Rubrique=Kategorie
-Rubriques=Kategorien
-categories=Kategorien
-TheCategorie=Die Kategorie
-NoCategoryYet=Keine Kategorie dieser Art erstellt
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Einfügen in
 modify=Ändern
 Classify=Einordnen
-CategoriesArea=Kategorien
-ProductsCategoriesArea=Produktkategorien
-SuppliersCategoriesArea=Lieferantenkategorien
-CustomersCategoriesArea=Kundenkategorien
-ThirdPartyCategoriesArea=Organisationskategorien
-MembersCategoriesArea=Kategoriemitglieder-Bereich
-ContactsCategoriesArea=Kontaktkategorien
-MainCats=Hauptkategorien
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Unterkategorien
 CatStatistics=Statistik
-CatList=Kategorieliste
-AllCats=Alle Kategorien
-ViewCat=Kategorie
-NewCat=Kategorie hinzufügen
-NewCategory=Neue Kategorie
-ModifCat=Kategorie bearbeiten
-CatCreated=Kategorie erstellt
-CreateCat=Kategorie erstellen
-CreateThisCat=Kategorie anlegen
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Überprüfen Sie die Felder
 NoSubCat=Keine Unterkategorie
 SubCatOf=Unterkategorie von
-FoundCats=Kategorien gefunden
-FoundCatsForName=Treffer für den Namen:
-FoundSubCatsIn=Kategorie besitzt Unterkategorien
-ErrSameCatSelected=Sie haben die gleiche Kategorie mehrmals ausgewählt
-ErrForgotCat=Sie haben vergessen eine Kategorie zu wählen
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Sie haben ein oder mehrere Felder nicht ausgefüllt
 ErrCatAlreadyExists=Dieser Name wird bereits verwendet
-AddProductToCat=Dieses Produkt einer Kategorie zuweisen?
-ImpossibleAddCat=Das Hinzufügen dieser Kategorie ist nicht möglich
-ImpossibleAssociateCategory=Kann die Kategorie nicht zuweisen zu
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully= %s wurde erfolgreich hinzugefügt.
-ObjectAlreadyLinkedToCategory=Element ist bereits mit dieser Kategorie verknüpft.
-CategorySuccessfullyCreated=Die Kategorie %s wurde erfolgreich hinzugefügt.
-ProductIsInCategories=Produkt gehört zu folgenden Kategorien
-SupplierIsInCategories=Dieser Lieferant ist folgenden Kategorien zugewiesen
-CompanyIsInCustomersCategories=Diese Organisation ist folgenden Lead-/Kundenkategorien zugewiesen
-CompanyIsInSuppliersCategories=Diese Organisation ist folgenden Lieferantenkategorien zugewiesen
-MemberIsInCategories=Dieses Mitglied ist Mitglied folgender Kategorien
-ContactIsInCategories=Dieser Kontakt ist folgenden Kontaktkategorien zugewiesen
-ProductHasNoCategory=Dieses Produkt / Dienstleistung ist nicht in allen Kategorien
-SupplierHasNoCategory=Dieser Lieferant ist keiner Kategorie zugewiesen
-CompanyHasNoCategory=Diese Organisation ist keiner Kategorie zugewiesen
-MemberHasNoCategory=Dieses Mitglied ist in keiner Kategorie
-ContactHasNoCategory=Dieser Kontakt ist keiner Kategorie zugewiesen
-ClassifyInCategory=Folgender Kategorie zuweisen
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Keine
-NotCategorized=Ohne Kategorie
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Diese Kategorie existiert bereits auf diesem Level
 ReturnInProduct=Zurück zur Produktkarte
 ReturnInSupplier=Zurück zur Anbieterkarte
@@ -66,22 +64,22 @@ ReturnInCompany=Zurück zur Kunden-/Lead-Karte
 ContentsVisibleByAll=Für alle sichtbarer Inhalt
 ContentsVisibleByAllShort=Öffentl. Inhalt
 ContentsNotVisibleByAllShort=Privater Inhalt
-CategoriesTree=Kategoriebaum
-DeleteCategory=Kategorie
-ConfirmDeleteCategory=Möchten Sie diese Kategorie wirklich löschen?
-RemoveFromCategory=Aus Kategorie entfernen
-RemoveFromCategoryConfirm=Zuordnung zu dieser Kategorie wirklich entfernen?
-NoCategoriesDefined=Keine Kategorie definiert
-SuppliersCategoryShort=Kategorielieferanten
-CustomersCategoryShort=Kategoriekunden
-ProductsCategoryShort=Kategorieprodukte
-MembersCategoryShort=Kategoriemitglieder
-SuppliersCategoriesShort=Lieferantenkategorien
-CustomersCategoriesShort=Kundenkategorien
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Lead- / Kundenkategorien
-ProductsCategoriesShort=Produktkategorien
-MembersCategoriesShort=Mitgliedergruppen
-ContactCategoriesShort=Kontaktkategorien
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Diese Kategorie enthält keine Produkte.
 ThisCategoryHasNoSupplier=Diese Kategorie enthält keine Lieferanten.
 ThisCategoryHasNoCustomer=Diese Kategorie enthält keine Kunden.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Diese Kategorie enthält keine Kontakte.
 AssignedToCustomer=Einem Kunden zugeordnet
 AssignedToTheCustomer=An den Kunden
 InternalCategory=Interne Kategorie
-CategoryContents=Kategorieinhalte
-CategId=Kategorie-ID
-CatSupList=Liste der Lieferantenkategorien
-CatCusList=Liste der Kunden-/ Leadkategorien
-CatProdList=Liste der Produktkategorien
-CatMemberList=Liste der Kategoriemitglieder
-CatContactList=Liste der Kontaktkategorien und Kontakte
-CatSupLinks=Verbindung zwischen Lieferanten und Kategorien
-CatCusLinks=Verbindung zwischen Kunden-/Lead und Kategorien
-CatProdLinks=Verbindungen zwischen Produkten/Services und Kategorien
-CatMemberLinks=Verbindung zwischen Mitgliedern und Kategorien
-DeleteFromCat=Aus Kategorie entfernen
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Bild löschen
 ConfirmDeletePicture=Bild wirklich löschen?
 ExtraFieldsCategories=Ergänzende Attribute
-CategoriesSetup=Kategorien Setup
-CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Wenn aktiviert, wird das Produkt auch zur übergeordneten Kategorie zugewiesen, wenn es einer Unterkategorie zugewiesen wird
 AddProductServiceIntoCategory=Folgendes Produkt/Dienstleistungen hinzufügen
-ShowCategory=Zeige Kategorie
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 740a928cb51..c752a4840dd 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Firmenname %s bereits vorhanden. Bitte wählen Sie einen anderen.
-ErrorPrefixAlreadyExists=Präfix %s bereits vorhanden. Bitte wählen Sie einen anderen.
-ErrorSetACountryFirst=Wählen sie zuerst das Land
-SelectThirdParty=Wählen Sie einen Partner
+ErrorPrefixAlreadyExists=Präfix %s bereits vorhanden. Wählen Sie einen anderen.
+ErrorSetACountryFirst=Wähle zuerst das Land
+SelectThirdParty=Wähle einen Partner
 DeleteThirdParty=Lösche einen Partner
 ConfirmDeleteCompany=Möchten Sie diesen Partner und alle verbundenen Informationen wirklich löschen?
 DeleteContact=Löschen Sie einen Kontakt
@@ -17,9 +17,9 @@ MenuSocGroup=Gruppen
 NewCompany=Neues Unternehmen (Leads, Kunden, Lieferanten)
 NewThirdParty=Neuer Partner (Leads, Kunden, Lieferanten)
 NewSocGroup=Neue Firmengruppe
-NewPrivateIndividual=Neue Privatperson (Leads, Kunden, Lieferanten)
+NewPrivateIndividual=Neue Privatperson (Lead, Kunde, Lieferant)
 CreateDolibarrThirdPartySupplier=Neuen Partner erstellen (Lieferant)
-ProspectionArea=Bereich
+ProspectionArea=Übersicht Geschäftsanbahnung
 SocGroup=Gruppe von Unternehmen
 IdThirdParty=Partner ID
 IdCompany=Unternehmens ID
@@ -82,7 +82,7 @@ Poste= Posten
 DefaultLang=Standardsprache
 VATIsUsed=MwSt.-pflichtig
 VATIsNotUsed=Nicht MwSt-pflichtig
-CopyAddressFromSoc=geben sie hier die Adressen Dritter ein
+CopyAddressFromSoc=Übernehme die Adresse vom Partner
 NoEmailDefined=Es ist keine Mail-Adresse definiert
 ##### Local Taxes #####
 LocalTax1IsUsedES= RE wird verwendet
@@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Verfügbare absolute Ermäßigungen
 DiscountNone=Keine
 Supplier=Lieferant
 CompanyList=Firmen-Liste
-AddContact=Kontakt hinzufügen
-AddContactAddress=Hinzufügen Kontakt/Anschrift
+AddContact=Kontakt erstellen
+AddContactAddress=Kontakt/Adresse erstellen
 EditContact=Kontakt bearbeiten
 EditContactAddress=Kontakt/Adresse bearbeiten
 Contact=Kontakt
@@ -268,8 +268,8 @@ ContactsAddresses=Kontakte/Adressen
 NoContactDefinedForThirdParty=Für diesen Kunden ist keine Adresse angegeben
 NoContactDefined=Kein Kontakt für diesen Partner
 DefaultContact=Standardkontakt
-AddCompany=Firma hinzufügen
-AddThirdParty=Partner hinzufügen
+AddCompany=Firma erstellen
+AddThirdParty=Partner erstellen
 DeleteACompany=Löschen eines Unternehmens
 PersonalInformations=Persönliche Daten
 AccountancyCode=Kontierungs-Code
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Lieferadressen-Label
 DeleteDeliveryAddress=Lieferadresse löschen
 ConfirmDeleteDeliveryAddress=Möchten Sie diese Lieferadresse wirklich löschen?
 NewDeliveryAddress=Neue Lieferadresse
-AddDeliveryAddress=Adresse hinzufügen
-AddAddress=Adresse hinzufügen
+AddDeliveryAddress=Adresse erstellen
+AddAddress=Adresse erstellen
 NoOtherDeliveryAddress=Keine alternative Lieferadresse definiert
 SupplierCategory=Lieferantenkategorie
 JuridicalStatus200=Unabhängige
@@ -397,8 +397,8 @@ YouMustCreateContactFirst=Sie müssen erst E-Mail-Kontakte für einen Partner an
 ListSuppliersShort=Liste der Lieferanten
 ListProspectsShort=Liste der Leads
 ListCustomersShort=Liste der Kunden
-ThirdPartiesArea=Third parties and contact area
-LastModifiedThirdParties=Letzten 15 bearbeiteten Partner
+ThirdPartiesArea=Partner- und Kontaktbereich
+LastModifiedThirdParties=Letzte %s bearbeitete Partner
 UniqueThirdParties=Gesamte Anzahl der Kontakte
 InActivity=Aktiv
 ActivityCeased=Inaktiv
@@ -410,5 +410,5 @@ OutstandingBillReached=Maximum für ausstehende Rechnung erreicht
 MonkeyNumRefModelDesc=Zurück NUMERO mit Format %syymm-nnnn für den Kunden-Code und syymm%-nnnn für die Lieferanten-Code ist, wenn JJ Jahr, MM Monat und nnnn ist eine Folge ohne Pause und kein Zurück mehr gibt, auf 0 gesetzt.
 LeopardNumRefModelDesc=Kunden / Lieferanten-Code ist frei. Dieser Code kann jederzeit geändert werden.
 ManagingDirectors=Name(n) des/der Manager (CEO, Direktor, Geschäftsführer, ...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+SearchThirdparty=Partner suchen
+SearchContact=Kontakt suchen
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index 77060539e1b..21c56d1a707 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Ausgabe der letzten Ausführung
 CronLastResult=Letzter Resultatcode
 CronListOfCronJobs=Liste der geplanten Jobs
 CronCommand=Befehl
-CronList=Jobliste
-CronDelete= Lösche Cronjobs
-CronConfirmDelete= Möchten Sie diesen Cronjob wirklich löschen?
-CronExecute=Starte Job
-CronConfirmExecute= Sind Sie sicher, dass Sie diesen Job jetzt ausführen wollen
-CronInfo= Jobs, die eine geplante Aufgabe ausführen dürfen
-CronWaitingJobs=Wartende Jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= Keine
+CronNone=Keine
 CronDtStart=Startdatum
 CronDtEnd=Vertragsende
 CronDtNextLaunch=Nächste Ausführung
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=Die auszuführende System-Kommandozeile
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/de_DE/donations.lang b/htdocs/langs/de_DE/donations.lang
index 7242670c414..4299cb5025c 100644
--- a/htdocs/langs/de_DE/donations.lang
+++ b/htdocs/langs/de_DE/donations.lang
@@ -6,6 +6,8 @@ Donor=Spender
 Donors=Spender
 AddDonation=Spende erstellen
 NewDonation=Neue Spende
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Spenden anzeigen
 DonationPromise=Zugesagte Spende
 PromisesNotValid=Ungültige Zusage
@@ -21,6 +23,8 @@ DonationStatusPaid=Spende bezahlt
 DonationStatusPromiseNotValidatedShort=Entwurf
 DonationStatusPromiseValidatedShort=Freigegeben
 DonationStatusPaidShort=Bezahlt
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Zusage freigeben
 DonationReceipt=Spendenbescheinigung
 BuildDonationReceipt=Erzeuge Spendenbeleg
@@ -36,3 +40,4 @@ FrenchOptions=Optionen für Frankreich
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index a78fe0da64a..0dc32476d55 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unbekannter Fehler '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 8a91a8911c4..01ce0719804 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Liste aller versandten E-Mail Benachrichtigungen
 MailSendSetupIs=Der E-Mail-Versand wurde auf '%s' konfiguriert. Dieser Modus kann nicht für Massen-Mails verwendet werden.
 MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sHome - Einstellungen - EMails%s den Parameter '%s' auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die Masse-E-Mail-Funktion nutzen.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 3f51e500253..1fccacfd60b 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorit
 ShortInfo=Info.
 Ref=Nummer
+ExternalRef=Ref. extern
 RefSupplier=Lieferanten-Nr.
 RefPayment=Zahlungs-Nr.
 CommercialProposalsShort=Angebote
@@ -394,8 +395,8 @@ Available=Verfügbar
 NotYetAvailable=Noch nicht verfügbar
 NotAvailable=Nicht verfügbar
 Popularity=Beliebtheit
-Categories=Kategorien
-Category=Kategorie
+Categories=Tags/categories
+Category=Tag/category
 By=Von
 From=Von
 to=An
@@ -694,6 +695,7 @@ AddBox=Box zufügen
 SelectElementAndClickRefresh=Wählen Sie ein Element und clicken Sie Aktualisieren
 PrintFile=Drucke Datei %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Montag
 Tuesday=Dienstag
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index afddbf7e1b7..5253f9dccc7 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Kundenbestellungsübersicht
-SuppliersOrdersArea=Lieferantenbestellungsübersicht
+OrdersArea=Übersicht Kundenbestellungen
+SuppliersOrdersArea=Übersicht Lieferantenbestellungen
 OrderCard=Bestell-Karte
 OrderId=Bestell-ID
 Order=Bestellung
@@ -21,15 +21,15 @@ CustomersOrdersRunning=Aktuelle Kundenbestellungen
 CustomersOrdersAndOrdersLines=Kundenbestellungen und Bestellpositionen
 OrdersToValid=Freizugebende Bestellungen
 OrdersToBill=Gelieferte Kundenbestellungen
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
+OrdersInProcess=Bestellungen in Bearbeitung
+OrdersToProcess=Zu bearbeitende Bestellungen
 SuppliersOrdersToProcess=Lieferantenbestellung in Bearbeitung
 StatusOrderCanceledShort=Storniert
 StatusOrderDraftShort=Entwurf
 StatusOrderValidatedShort=Freigegeben
 StatusOrderSentShort=In Bearbeitung
 StatusOrderSent=Versand in Bearbeitung
-StatusOrderOnProcessShort=Ordered
+StatusOrderOnProcessShort=Bestellt
 StatusOrderProcessedShort=Bearbeitet
 StatusOrderToBillShort=Zu verrechnen
 StatusOrderToBill2Short=Zu verrechnen
@@ -41,8 +41,8 @@ StatusOrderReceivedAllShort=Komplett erhalten
 StatusOrderCanceled=Storniert
 StatusOrderDraft=Entwurf (freizugeben)
 StatusOrderValidated=Freigegeben
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcess=Bestellt - wartet auf Eingang
+StatusOrderOnProcessWithValidation=Bestellt - wartet auf Eingang/Bestätigung 
 StatusOrderProcessed=Bearbeitet
 StatusOrderToBill=Zu verrechnen
 StatusOrderToBill2=Zu verrechnen
@@ -51,7 +51,7 @@ StatusOrderRefused=Abgelehnt
 StatusOrderReceivedPartially=Teilweise erhalten
 StatusOrderReceivedAll=Komplett erhalten
 ShippingExist=Eine Sendung ist vorhanden
-ProductQtyInDraft=Product quantity into draft orders
+ProductQtyInDraft=Produktmenge in Bestellentwurf
 ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
 DraftOrWaitingApproved=Entwurf oder genehmigt, noch nicht bestellt
 DraftOrWaitingShipped=Entwurf oder bestätigt, noch nicht versandt
@@ -59,12 +59,13 @@ MenuOrdersToBill=Bestellverrechnung
 MenuOrdersToBill2=Billable orders
 SearchOrder=Suche Bestellung
 SearchACustomerOrder=Kundenauftrag suchen
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Suche Lieferantenbestellung
 ShipProduct=Produkt versenden
 Discount=Rabatt
 CreateOrder=Erzeuge Bestellung
 RefuseOrder=Bestellung ablehnen
-ApproveOrder=Bestellung bestätigen
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Bestellung freigeben
 UnvalidateOrder=Unbestätigte Bestellung
 DeleteOrder=Bestellung löschen
@@ -102,6 +103,8 @@ ClassifyBilled=Als verrechnet markieren
 ComptaCard=Buchhaltungskarte
 DraftOrders=Bestellentwürfe
 RelatedOrders=Verknüpfte Bestellungen
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Bestellungen in Bearbeitung
 RefOrder=Bestell-Nr.
 RefCustomerOrder=Kunden-Bestellung-Nr.
@@ -118,6 +121,7 @@ PaymentOrderRef=Zahlung zur Bestellung %s
 CloneOrder=Bestellung duplizieren
 ConfirmCloneOrder=Möchten Sie die Bestellung %s wirklich duplizieren?
 DispatchSupplierOrder=Lieferantenbestellung %s erhalten
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Kundenauftrag-Nachverfolgung durch Vertreter
 TypeContact_commande_internal_SHIPPING=Versand-Nachverfolgung durch Vertreter
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 4b2f4a52bea..64ab0a6e45a 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Eingriff freigegeben
 Notify_FICHINTER_SENTBYMAIL=Service per E-Mail versendet
 Notify_BILL_VALIDATE=Rechnung freigegeben
 Notify_BILL_UNVALIDATE=Rechnung nicht freigegeben
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Lieferantenbestellung freigegeben
 Notify_ORDER_SUPPLIER_REFUSE=Lieferantenbestellung abgelehnt
 Notify_ORDER_VALIDATE=Kundenbestellung freigegeben
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Angebot mit E-Mail gesendet
 Notify_BILL_PAYED=Kundenrechnung bezahlt
 Notify_BILL_CANCEL=Kundenrechnung storniert
 Notify_BILL_SENTBYMAIL=Kundenrechnung per E-Mail zugestellt
-Notify_ORDER_SUPPLIER_VALIDATE=Lieferantenbestellung bestätigt
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferantenbestellung per E-Mail zugestellt
 Notify_BILL_SUPPLIER_VALIDATE=Lieferantenrechnung bestätigen
 Notify_BILL_SUPPLIER_PAYED=Lieferantenrechnung bezahlt
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Projekt-Erstellung
 Notify_TASK_CREATE=Aufgabe erstellt
 Notify_TASK_MODIFY=Aufgabe geändert
 Notify_TASK_DELETE=Aufgabe gelöscht
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Anzahl der angehängten Dateien/okumente
 TotalSizeOfAttachedFiles=Gesamtgröße der angehängten Dateien/Dokumente
 MaxSize=Maximalgröße
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Rechnung %s wurde freigegeben
 EMailTextProposalValidated=Angebot %s wurde freigegeben
 EMailTextOrderValidated=Bestellung %s wurde freigegeben
 EMailTextOrderApproved=Bestellung %s genehmigt
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Bestellung %s wurde von %s genehmigt
 EMailTextOrderRefused=Bestellung %s wurde abgelehnt
 EMailTextOrderRefusedBy=Bestellung %s wurde von %s abgelehnt
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 8816eff2614..35033adced3 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -26,11 +26,11 @@ ProductsAndServicesOnSell=Products and Services for sale or for purchase
 ProductsAndServicesNotOnSell=Products and Services out of sale
 ProductsAndServicesStatistics=Produkt- und Dienstleistungs-Statistik
 ProductsStatistics=Produktstatistik
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
+ProductsOnSell=Produkte für Ein- oder Verkauf
+ProductsNotOnSell=Produkte weder für Ein- noch Verkauf
 ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
+ServicesOnSell=Service für Verkauf oder für Einkauf
+ServicesNotOnSell=Service weder für Ein- noch Verkauf
 ServicesOnSellAndOnBuy=Services for sale and for purchase
 InternalRef=Interne Referenz
 LastRecorded=Zuletzt erfasste, verfügbare Produkte/Dienstleistungen
@@ -118,7 +118,7 @@ MultiPricesAbility=Mehrere Preisstufen pro Produkt/Dienstleistung
 MultiPricesNumPrices=Anzahl Preise
 MultiPriceLevelsName=Preiskategorien
 AssociatedProductsAbility=Untergeordnete Produkte aktivieren
-AssociatedProducts=Package product
+AssociatedProducts=verknüpfte Produkte
 AssociatedProductsNumber=Anzahl der Unterprodukte
 ParentProductsNumber=Anzahl der übergeordneten Produkte
 IfZeroItIsNotAVirtualProduct=Falls 0 ist das Produkt kein Unterprodukt
@@ -234,7 +234,7 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Barcode-Typ oder -Wert bei Partner
 BarCodeDataForProduct=Barcode-Information von Produkt %s:
 BarCodeDataForThirdparty=Barcode-Information von Partner %s:
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different price for each customer
+PriceByCustomer=Verschiedene Kundenpreise
 PriceCatalogue=Einzigartiger Preis pro Produkt/Dienstleistung
 PricingRule=Rules for customer prices
 AddCustomerPrice=Preis je Kunde hinzufügen
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimaler empfohlener Preis: %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Nummer
-DefaultPrice=Default price
+DefaultPrice=Standardpreis
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index fbbc111f0f7..94a6592d4eb 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Liste der mit diesem Projekt verbundenen L
 ListContractAssociatedProject=Liste der mit diesem Projekt verbundenen Verträge
 ListFichinterAssociatedProject=Liste der mit diesem Projekt verknüpften Services
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Liste der mit diesem Projekt verknüpften Maßnahmen
 ActivityOnProjectThisWeek=Projektaktivitäten dieser Woche
 ActivityOnProjectThisMonth=Projektaktivitäten dieses Monats
@@ -130,13 +131,15 @@ AddElement=Mit Element verknüpfen
 UnlinkElement=Verknüpfung zu Element aufheben
 # Documents models
 DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.)
-PlannedWorkload = Geplante Auslastung
-WorkloadOccupation= Beeinflussung der Auslastung
+PlannedWorkload=Geplante Auslastung
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Bezugnahmen
 SearchAProject=Suchen Sie ein Projekt
 ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden
 ProjectDraft=Projekt-Entwürfe
 FirstAddRessourceToAllocateTime=Eine Ressource zuordnen, um Zeit festzulegen
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index 93da292748d..549d40885e0 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Versand Nr.
 Sending=Sendung
 Sendings=Sendungen
+AllSendings=All Shipments
 Shipment=Sendung
 Shipments=Lieferungen
 ShowSending=Zeige Sendung
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index d560920f048..ec7c2010c6a 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -128,7 +128,7 @@ StockMustBeEnoughForShipment= Ausreichender Lagerbestand ist erforderlich, um da
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
-ShowWarehouse=Show warehouse
+ShowWarehouse=Zeige Lager
 MovementCorrectStock=Stock content correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
 WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index 58f83d6a3d5..390acc8f134 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Liste der Lieferantenbestellungen
 MenuOrdersSupplierToBill=Zu berechnende Lieferantenbestellungen
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index d8f7036b628..815220b1324 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -263,11 +263,11 @@ EMailsSetup=Διαχείριση E-mails
 EMailsDesc=Αυτή η σελίδα σας επιτρέπει να αλλάξετε τις παραμέτρους PHP για την αποστολή email.  Στις περισσότερες περιπτώσεις σε λειτουργικά συστήματα Unix/Linux, η διαμόρφωση της PHP σας είναι σωστή και αυτές οι παράμετροι είναι άχρηστες.
 MAIN_MAIL_SMTP_PORT=Θύρα SMTP/SMTPS (Προεπιλογή στο php.ini: %s)
 MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (Προεπιλογή στο php.ini: %s)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Θύρα SMTP/SMTPS (Δεν καθορίζεταιστην PHP σε συστήματα Unix)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Δεν καθορίζεταιστην PHP σε συστήματα Unix)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Θύρα SMTP/SMTPS (Δεν καθορίζεται στην PHP σε συστήματα Unix)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Δεν καθορίζεται στην PHP σε συστήματα Unix)
 MAIN_MAIL_EMAIL_FROM=E-mail αποστολέα για αυτόματα e-mails (Προεπιλογή στο php.ini: %s)
 MAIN_MAIL_ERRORS_TO=E-mail αποστολέα που χρησιμοποιούνται για την επιστροφή λάθος μηνυμάτων που στέλνονται
-MAIN_MAIL_AUTOCOPY_TO= Να αποστέλονται κρυφά αντίγραφα των απεσταλμένων emails στο
+MAIN_MAIL_AUTOCOPY_TO= Να αποστέλλονται κρυφά αντίγραφα των απεσταλμένων emails στο
 MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου των προσφορών που αποστέλλονται μέσω email στο
 MAIN_MAIL_AUTOCOPY_ORDER_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου των παραγγελιών που αποστέλλονται μέσω email στο
 MAIN_MAIL_AUTOCOPY_INVOICE_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου τιμολογίου που αποστέλλεται μέσω email στο
@@ -280,7 +280,7 @@ MAIN_DISABLE_ALL_SMS=Απενεργοποίηση όλων των αποστολ
 MAIN_SMS_SENDMODE=Μέθοδος που θέλετε να χρησιμοποιηθεί για την αποστολή SMS
 MAIN_MAIL_SMS_FROM=Προεπιλεγμένος αριθμός τηλεφώνου αποστολέα για την αποστολή SMS
 FeatureNotAvailableOnLinux=Αυτή η λειτουργία δεν είναι διαθέσιμη σε συστήματα Unix like. Δοκιμάστε το πρόγραμμα sendmail τοπικά.
-SubmitTranslation=Αν η μετάφραση για αυτή την γλώσσα δεν είναι ολοκληρωμένη λη βρίσκετε λάθη, μπορείτε να τα διορθώσετε με επεξεργασία των αρχείων στο φάκελο langs/%s και να στείλετε τα επεξεργασμένα αρχεία στο forum www.dolibarr.org.
+SubmitTranslation=Αν η μετάφραση για αυτή την γλώσσα δεν είναι ολοκληρωμένη και βρίσκετε λάθη, μπορείτε να τα διορθώσετε με επεξεργασία των αρχείων στο φάκελο langs/%s και να στείλετε τα επεξεργασμένα αρχεία στο forum www.dolibarr.org.
 ModuleSetup=Διαχείριση Αρθρώματος
 ModulesSetup=Διαχείριση Αρθρωμάτων
 ModuleFamilyBase=Σύστημα
@@ -289,14 +289,14 @@ ModuleFamilyProducts=Διαχείριση Προϊόντων
 ModuleFamilyHr=Διαχείριση Ανθρώπινου Δυναμικού
 ModuleFamilyProjects=Projects/Συμμετοχικές εργασίες
 ModuleFamilyOther=Άλλο
-ModuleFamilyTechnic=Εργαλεία πολλαπλών αρθρωμάτων
-ModuleFamilyExperimental=Πειραματικά αρθρώματα
-ModuleFamilyFinancial=Χρηματοοικονομικά αρθρώματα (Λογιστική/Χρηματοοικονομικά)
+ModuleFamilyTechnic=Εργαλεία πολλαπλών modules
+ModuleFamilyExperimental=Πειραματικά modules
+ModuleFamilyFinancial=Χρηματοοικονομικά Modules (Λογιστική/Χρηματοοικονομικά)
 ModuleFamilyECM=Διαχείριση Ηλεκτρονικού Περιεχομένου (ECM)
 MenuHandlers=Διαχειριστές μενού
 MenuAdmin=Επεξεργαστής μενού
 DoNotUseInProduction=Να μην χρησιμοποιείται για παραγωγή
-ThisIsProcessToFollow=Αυτό έχει ρυθμιστεί για να κατεργαστεί:
+ThisIsProcessToFollow=Αυτό έχει ρυθμιστεί για να επεξεργαστεί:
 StepNb=Βήμα %s
 FindPackageFromWebSite=Βρείτε ένα πακέτο που να παρέχει την λειτουργία που επιθυμείτε (για παράδειγμα στο επίσημο %s).
 DownloadPackageFromWebSite=Μεταφόρτωση πακέτου %s.
@@ -305,20 +305,20 @@ SetupIsReadyForUse=Η εγκατάσταση τελείωσε και το Doliba
 NotExistsDirect=Ο εναλλακτικός ριζικός φάκελος δεν έχει ρυθμιστεί.
    
 InfDirAlt=Από την έκδοση 3 είναι δυνατός ο ορισμός ενός εναλλακτικού ριζικού φακέλου.  Αυτό σας επιτρέπει να αποθηκεύσετε στο ίδιο μέρος πρόσθετες εφαρμογές και μη τυπικά templates.
    Απλά δημιουργήστε ένα φάκελο στο ριζικό φάκελο του Dolibarr (π.χ.: custom).
    
 InfDirExample=
    Κατόπιν δηλώστε το στο αρχείο conf.php
     $dolibarr_main_url_root_alt='http://myserver/custom'
    $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
    *Αυτές οι γραμμές είναι απενεργοποιημένες με χρήση του χαρακτήρα "#", για να της ενεργοποιήσετε απλά αφαιρέστε το χαρακτήρα.
-YouCanSubmitFile=Επιλογή αρθρώματος:
+YouCanSubmitFile=Επιλογή module:
 CurrentVersion=Έκδοση Dolibarr
 CallUpdatePage=Πηγαίνετε στην σελίδα που ενημερώνει την δομή της βάσης δεδομένων και τα δεδομένα: %s.
 LastStableVersion=Τελευταία σταθερή έκδοση
 UpdateServerOffline=Ο διακομιστής ενημερώσεων είναι εκτός σύνδεσης
-GenericMaskCodes=Μπορείτε να χρησιμοποιήσετε οποιαδήποτε μάσκα αρίθμησης. Σε αυτή τη μάσκα  μπορούν να χρησιμοποιηθούν τις παρακάτω ετικέτες:
    Το {000000} αντιστοιχεί σε έναν αριθμό που θα αυξάνεται σε κάθε %s. Εισάγετε όσα μηδεν επιθυμείτε ως το επιθυμητό μέγεθος για τον μετρητή. Ο μετρητής θα συμπληρωθεί με μηδενικά από τα αριστερά για να έχει όσα μηδενικά υπάρχουν στην μάσκα. 
    Η μάσκα {000000+000} είναι η ίδια όπως προηγουμένως αλλά ένα αντιστάθμισμα που αντιστοιχεί στον αριθμό στα δεξιά του + θα προστεθεί αρχίζοντας από το πρώτο %s. 
    Η μάσκα {000000@x} είναι η ίδια όπως προηγουμένως αλλά ο μετρητής επανέρχεται στο μηδέν όταν έρθει ο μήνας x  (το x είναι μεταξύ του 1 και του 12). Αν αυτή η επιλογή χρησιμοποιηθεί και το x είναι 2 ή μεγαλύτερο, τότε η ακολουθία {yy}{mm} ή {yyyy}{mm} είναι επίσης απαιραίτητη. 
    Η μάσκα {dd} ημέρα (01 έως 31).
    {mm} μήνας (01 έως 12).
    {yy}, {yyyy} ή {y} έτος με χρήση 2, 4 ή 1 αριθμού. 
    
+GenericMaskCodes=Μπορείτε να χρησιμοποιήσετε οποιαδήποτε μάσκα αρίθμησης. Σε αυτή τη μάσκα  μπορούν να χρησιμοποιηθούν τις παρακάτω ετικέτες:
    Το {000000} αντιστοιχεί σε έναν αριθμό που θα αυξάνεται σε κάθε %s. Εισάγετε όσα μηδέν επιθυμείτε ως το επιθυμητό μέγεθος για τον μετρητή. Ο μετρητής θα συμπληρωθεί με μηδενικά από τα αριστερά για να έχει όσα μηδενικά υπάρχουν στην μάσκα. 
    Η μάσκα {000000+000} είναι η ίδια όπως προηγουμένως αλλά ένα αντιστάθμισμα που αντιστοιχεί στον αριθμό στα δεξιά του + θα προστεθεί αρχίζοντας από το πρώτο %s. 
    Η μάσκα {000000@x} είναι η ίδια όπως προηγουμένως αλλά ο μετρητής επανέρχεται στο μηδέν όταν έρθει ο μήνας x  (το x είναι μεταξύ του 1 και του 12). Αν αυτή η επιλογή χρησιμοποιηθεί και το x είναι 2 ή μεγαλύτερο, τότε η ακολουθία {yy}{mm} ή {yyyy}{mm} είναι επίσης απαιραίτητη. 
    Η μάσκα {dd} ημέρα (01 έως 31).
    {mm} μήνας (01 έως 12).
    {yy}, {yyyy} ή {y} έτος με χρήση 2, 4 ή 1 αριθμού. 
    
 GenericMaskCodes2={cccc} ο κωδικός πελάτη σε n χαρακτήρες 
     {cccc000} ο κωδικός πελάτη σε n χαρακτήρες ακολουθείται από ένα μετρητή αφιερωμένο για τον πελάτη. Αυτός ο μετρητής ειναι αφιερωμένος στον πελάτη μηδενίζεται ταυτόχρονα από την γενικό μετρητή. 
     {tttt} Ο κωδικός των Πελ./Προμ. σε n χαρακτήρες (βλέπε λεξικό-thirdparty types). 
    
 GenericMaskCodes3=Όλοι οι άλλοι χαρακτήρες στην μάσκα θα παραμείνουν ίδιοι.
    Κενά διαστήματα δεν επιτρέπονται.
    
 GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany done 2007-01-31:
    
 GenericMaskCodes4b=Το παράδειγμα του τρίτου μέρους δημιουργήθηκε στις 2007-03-01:
    
-GenericMaskCodes4c=Το παράδειγμα προϊόντος δημιουργήθηκε στις 2007-03-01:
    
+GenericMaskCodes4c=Παράδειγμα το προϊόν δημιουργήθηκε στις 2007-03-01:
    
 GenericMaskCodes5=Η μάσκα ABC{yy}{mm}-{000000} θα δώσει ABC0701-000099
    Η μάσκα{0000+100}-ZZZ/{dd}/XXX θα δώσει 0199-ZZZ/31/XXX
 GenericNumRefModelDesc=Επιστρέφει έναν παραμετροποιήσημο αριθμό σύμφωνα με μία ορισμένη μάσκα.
-ServerAvailableOnIPOrPort=Ο διακομιστής είναι διαθέσιμο στην διεύθυνση %s στην θύρα %s
+ServerAvailableOnIPOrPort=Ο διακομιστής είναι διαθέσιμος στην διεύθυνση %s στην θύρα %s
 ServerNotAvailableOnIPOrPort=Ο διακομιστής δεν είναι διαθέσιμος στην διεύθυνση %s στην θύρα %s
 DoTestServerAvailability=Έλεγχος διασύνδεσης server
 DoTestSend=Δοκιμή Αποστολής
@@ -327,19 +327,19 @@ ErrorCantUseRazIfNoYearInMask=Σφάλμα, δεν μπορείτε να χρη
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ αν η ακολουθία {yy}{mm} ή {yyyy}{mm} δεν είναι στην μάσκα.
 UMask=Παράμετρος UMask για νέα αρχεία σε συστήματα αρχείων συστημάτων Unix/Linux/BSD/Mac.
 UMaskExplanation=Αυτή η παράμετρος σας επιτρέπει να ορίσετε προεπιλεγμένα δικαιώματα αρχείων για αρχεία που δημιουργεί το Dolibarr στον διακομιστή (κατά την διάρκεια μεταφόρτωσης π.χ.).
    Πρέπει να είναι οκταδικής μορφής (για παράδειγμα, 0666 σημαίνει εγγραφή και ανάγνωση για όλους).
    Αυτή η παράμετρος είναι άχρηστη σε διακομιστές Windows.
-SeeWikiForAllTeam=Ρίξτε μια ματία στην σελίδα wiki για μια πλήρη λίστα όλων των actors και της οργάνωσής τους
+SeeWikiForAllTeam=Ρίξτε μια ματιά στην σελίδα wiki για μια πλήρη λίστα όλων των actors και της οργάνωσής τους
 UseACacheDelay= Καθυστέρηση για την τοποθέτηση απόκρισης εξαγωγής στην προσωρινή μνήμη σε δευτερόλεπτα (0 ή άδεια για μη χρήση προσωρινής μνήμης)
 DisableLinkToHelpCenter=Αποκρύψτε τον σύνδεσμο "Αναζητήστε βοήθεια ή υποστήριξη" στην σελίδα σύνδεσης
 DisableLinkToHelp=Αποκρύψτε το σύνδεσμο "%s Online βοήθεια" στο αριστερό μενού
-AddCRIfTooLong=Δεν υπάρχει αυτόματη αναδίπλωση κειμένου.  Αν η γραμμή σας σας δεν χωράει στην σελίδα των εγγράφων επειδή είναι πολύ μεγάλη, θα πρέπει να προσθέσετε μόνοι σας χαρακτήρες αλλαγής γραμμής (carriage return) στην περιοχή κειμένου.
+AddCRIfTooLong=Δεν υπάρχει αυτόματη αναδίπλωση κειμένου.  Αν η γραμμή σας δεν χωράει στην σελίδα των εγγράφων επειδή είναι πολύ μεγάλη, θα πρέπει να προσθέσετε μόνοι σας χαρακτήρες αλλαγής γραμμής carriage return στην περιοχή κειμένου.
 ModuleDisabled=Απενεργοποιημένο Άρθρωμα
-ModuleDisabledSoNoEvent=Το άρθρωμα είναι απενεργοποιημένο και έτσι δεν έχει δημιουργηθεί τέτοιο γεγονός
+ModuleDisabledSoNoEvent=Το module είναι απενεργοποιημένο και έτσι δεν έχει δημιουργηθεί τέτοιο γεγονός
 ConfirmPurge=Είστε σίγουροι πως θέλετε να εκτελέσετε αυτή τη διαγραφή;
    Αυτό θα διαγράψει όλα σας τα δεδομένα με καμία δυνατότητα ανάκτησης (αρχεία ECM, συνημμένα αρχεία...).
 MinLength=Ελάχιστο μήκος
 LanguageFilesCachedIntoShmopSharedMemory=Τα αρχεία τύπου .lang έχουν φορτωθεί στην κοινόχρηστη μνήμη
 ExamplesWithCurrentSetup=Παραδείγματα με την τωρινή διαμόρφωση
 ListOfDirectories=Λίστα φακέλων προτύπων OpenDocument
-ListOfDirectoriesForModelGenODT=Λίστα φακέλων που περιέχουν αρχεία προτύπων τύπου OpenDocument.

    Τοποθετείστε εδώ ολόκληρη την διαδρομή των φακέλων.
    Εισάγετε ένα χαρακτήρα αλλαγής γραμμής ανάμεσα σε κάθε φάκελο.
    Για να προσθέσετε ένα φάκελο του αρθρώματος GED, προσθέστε εδώ DOL_DATA_ROOT/ecm/yourdirectoryname.

    Τα αρχεία σε αυτούς τους φακέλους πρέπει να έχουν την επέκταση .odt.
+ListOfDirectoriesForModelGenODT=Λίστα φακέλων που περιέχουν αρχεία προτύπων τύπου OpenDocument.

    Τοποθετείστε εδώ ολόκληρη την διαδρομή των φακέλων.
    Εισάγετε ένα χαρακτήρα αλλαγής γραμμής ανάμεσα σε κάθε φάκελο.
    Για να προσθέσετε ένα φάκελο του module GED, προσθέστε εδώ DOL_DATA_ROOT/ecm/yourdirectoryname.

    Τα αρχεία σε αυτούς τους φακέλους πρέπει να έχουν την επέκταση .odt.
 NumberOfModelFilesFound=Αριθμός αρχείων προτύπων ODT/ODS που βρέθηκαν σε αυτούς τους φακέλους
 ExampleOfDirectoriesForModelGen=Παραδείγματα σύνταξης:
    c:\\mydir
    /home/mydir
    DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=
    Για να μάθετε πως να δημιουργήσετε τα δικά σας αρχεία προτύπων, πριν τα αποθηκεύσετε σε αυτούς τους φακέλους, διαβάστε την τεκμηρίωση στο wiki:
@@ -348,21 +348,21 @@ FirstnameNamePosition=Θέση ονόματος/επιθέτου
 DescWeather=Οι παρακάτω εικόνες θα εμφανιστούν στο ταμπλό όταν ο αριθμός των τελευταίων ενεργειών φτάσει τις παρακάτω τιμές:
 KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
 TestSubmitForm=Φόρμα δοκιμής εισαγωγής δεδομένων
-ThisForceAlsoTheme=Αυτός ο τροποποιητής μενού χρησιμοποιεί το δικό του θέμα όποιο θέμα και να έχει επιλέξει ο χρήστης.  Επίσης, αυτό το πρόγραμμα διαχείρισης μενου που ειδικεύετεαι στις κινητές συσκευές δεν δουλεύει σε όλα τα smartphone. Χρησιμοποιήσετε κάποιον άλλο διαχειριστή μενού αν αντιμετωπίζετε προβλήματα στο δικό σας.
+ThisForceAlsoTheme=Αυτός ο τροποποιητής μενού χρησιμοποιεί το δικό του θέμα όποιο θέμα και να έχει επιλέξει ο χρήστης.  Επίσης, αυτό το πρόγραμμα διαχείρισης μενού που ειδικεύεται στις κινητές συσκευές δεν δουλεύει σε όλα τα smartphone. Χρησιμοποιήσετε κάποιον άλλο διαχειριστή μενού αν αντιμετωπίζετε προβλήματα στο δικό σας.
 ThemeDir=Φάκελος skins
 ConnectionTimeout=Λήξη σύνδεσης
 ResponseTimeout=Λήξη χρόνου αναμονής απάντησης
 SmsTestMessage=Δοκιμαστικό μήνυμα από __PHONEFROM__ να __PHONETO__
 ModuleMustBeEnabledFirst=%s Ενότητα πρέπει να είναι ενεργοποιημένα πρώτη φορά πριν τη χρήση αυτής της δυνατότητας.
 SecurityToken=Security Token
-NoSmsEngine=Δεν υπάρχει πρόγραμμα αποστολής SMS διαθέσιμο. Τα προγράμματα αποστολής SMS δεν εγκαθίστανται με την διανομή από προεπιλογή (επειδή εξαρτόνται από εξωτερικούς προμηθευτές) αλλά μπορείτε να βρείτε κάποια διαθέσιμα προγράμματα στο %s
+NoSmsEngine=Δεν υπάρχει πρόγραμμα αποστολής SMS διαθέσιμο. Τα προγράμματα αποστολής SMS δεν εγκαθίστανται με την διανομή από προεπιλογή (επειδή εξαρτώνται από εξωτερικούς προμηθευτές) αλλά μπορείτε να βρείτε κάποια διαθέσιμα προγράμματα στο %s
 PDF=PDF
 PDFDesc=Μπορείτε να ρυθμίσετε κάθε κεντρική επιλογή που σχετίζεται με τη δημιουργία PDF
 PDFAddressForging=Κανόνες για να δημιουργηθούν διευθύνσεις
 HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με τον ΦΠΑ στα δημιουργηθέντα PDF
 HideDescOnPDF=Απόκρυψη περιγραφών προϊόντων στα δημιουργηθέντα PDF
 HideRefOnPDF=Απόκρυψη αναφοράς προϊόντος στα δημιουργηθέντα PDF
-HideDetailsOnPDF=Απόκρυψη λεπτομεριών προϊόντων στα δημιουργηθέντα PDF
+HideDetailsOnPDF=Απόκρυψη λεπτομερειών προϊόντων στα δημιουργηθέντα PDF
 Library=Βιβλιοθήκη
 UrlGenerationParameters=Παράμετροι για δημιουργία ασφαλών URL
 SecurityTokenIsUnique=Χρησιμοποιήστε μια μοναδική παράμετρο securekey για κάθε διεύθυνση URL
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Διαχωριστικό
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Πλαίσιο ελέγχου από τον πίνακα
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value

     για παράδειγμα : 
    1,value1
    2,value2
    3,value3
    ...

    Προκειμένου να έχει τη λίστα εξαρτώμενη με μια άλλη: 
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value

     για παράδειγμα : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value

     για παράδειγμα : 
    1,value1
    2,value2
    3,value3
    ...
@@ -400,7 +401,7 @@ LocalTaxDesc=Σε κάποιες χώρες επιβάλλονται 2 ή 3 φό
 SMS=SMS
 LinkToTestClickToDial=Εισάγετε έναν τηλεφωνικό αριθμό για να δημιουργηθεί ένας σύνδεσμος που θα σας επιτρέπει να κάνετε κλήση με το ClickToDial για τον χρήστη %s
 RefreshPhoneLink=Ανανέωση συνδέσμου
-LinkToTest=Σημιουργήθηκε σύνδεσμος για τον χρήστη %s (κάντε κλικ στον αριθμό τηλεφώνου για να τον δοκιμάσετε)
+LinkToTest=Δημιουργήθηκε σύνδεσμος για τον χρήστη %s (κάντε κλικ στον αριθμό τηλεφώνου για να τον δοκιμάσετε)
 KeepEmptyToUseDefault=Αφήστε κενό για να χρησιμοποιήσετε την προεπιλεγμένη τιμή
 DefaultLink=Προεπιλεγμένος σύνδεσμος
 ValueOverwrittenByUserSetup=Προσοχή, αυτή η τιμή μπορεί να αντικατασταθεί από επιλογή του χρήστη (ο κάθε χρήστης μπορεί να κάνει τον δικό του σύνδεσμο clicktodial)
@@ -423,9 +424,9 @@ Module1Desc=Διαχείριση εταιρειών και επαφών (πελ
 Module2Name=Εμπορικό
 Module2Desc=Εμπορική διαχείριση
 Module10Name=Λογιστική
-Module10Desc=Απλές αναφορές λογιστικής (journals, turnover) βασισμένα στα περιοχόμενα της βάσης δεδομένων. Χωρίς αποστολές.
+Module10Desc=Απλές αναφορές λογιστικής (ημερολόγια, τζίρος) βασισμένα στα περιεχόμενο της βάσης δεδομένων. Χωρίς αποστολές.
 Module20Name=Προτάσεις
-Module20Desc=Διαχείριση εμπορικών προτάσεων
+Module20Desc=Διαχείριση προσφορών
 Module22Name=Μαζική αποστολή e-mail
 Module22Desc=Διαχείριση μαζικής αποστολής e-mail
 Module23Name= Ενέργεια
@@ -442,8 +443,8 @@ Module49Name=Επεξεργαστές κειμένου
 Module49Desc=Διαχείριση επεξεργαστών κειμένου
 Module50Name=Προϊόντα
 Module50Desc=Διαχείριση προϊόντων
-Module51Name=Μαζικές αποστολές επιστολών
-Module51Desc=Διαχείριση μαζικών αποστολών επιστολών
+Module51Name=Μαζικές αποστολές e-mail
+Module51Desc=Διαχείριση μαζικών αποστολών e-mail
 Module52Name=Αποθέματα
 Module52Desc=Διαχείριση αποθεμάτων (προϊόντων)
 Module53Name=Υπηρεσίες
@@ -467,9 +468,9 @@ Module75Desc=Διαχείριση σημειώσεων εξόδων και τα
 Module80Name=Αποστολές
 Module80Desc=Διαχείριση αποστολών και εντολών παράδοσης
 Module85Name=Τράπεζες και μετρητά
-Module85Desc=Διαχείριση τραπεζικών και λογαριασμών μετρητών
+Module85Desc=Διαχείριση τραπεζών και λογαριασμών μετρητών
 Module100Name=Εξωτερική ιστοσελίδα
-Module100Desc=Αυτό το άρθρωμα περιέχει μία εξωτερική ιστοσελίδα ή site μέσα από το μενού του Dolibarr  για να προβληθεί μέσω ενός παραθύρου Dolibarr
+Module100Desc=Αυτό το module περιέχει μία εξωτερική ιστοσελίδα ή site μέσα από το μενού του Dolibarr  για να προβληθεί μέσω ενός παραθύρου Dolibarr
 Module105Name=Mailman και SIP
 Module105Desc=Mailman ή SPIP διεπαφή για ενότητα μέλος
 Module200Name=LDAP
@@ -477,9 +478,9 @@ Module200Desc=Συγχρονισμός LDAP directory
 Module210Name=PostNuke
 Module210Desc=Διεπαφή PostNuke
 Module240Name=Εξαγωγές δεδομένων
-Module240Desc=Εργαλείο για την εξαγωγή δεδομέων του Dolibarr (με βοηθούς)
+Module240Desc=Εργαλείο για την εξαγωγή δεδομένων του Dolibarr (με βοηθούς)
 Module250Name=Εισαγωγές δεδομένων
-Module250Desc=Εργαλείο για την εισαγωγή δεδομένω στο Dolibarr (με βοηθούς)
+Module250Desc=Εργαλείο για την εισαγωγή δεδομένων στο Dolibarr (με βοηθούς)
 Module310Name=Μέλη
 Module310Desc=Διαχείριση μελών οργανισμού
 Module320Name=RSS Feed
@@ -494,6 +495,8 @@ Module500Name=Ειδικά έξοδα (φόροι, εισφορές κοινων
 Module500Desc=Διαχείριση των ειδικών δαπανών, όπως οι φόροι, κοινωνικές εισφορές, μερίσματα και μισθούς
 Module510Name=Μισθοί
 Module510Desc=Διαχείριση υπαλλήλων, μισθών και πληρωμών
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου σχετικά με ορισμένες Dolibarr επαγγελματικές συναντήσεις σε Πελ./Προμ. (η ρύθμιση ορίζεται από κάθε Πελ./Προμ.)
 Module700Name=Δωρεές
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Κατηγορίες
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Δυναμικές Τιμές
 Module2200Desc=Ενεργοποιήστε τη χρήση των μαθηματικών εκφράσεων για τις τιμές
 Module2300Name=Μενού
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Ατζέντα
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -642,7 +645,7 @@ Permission181=Read supplier orders
 Permission182=Create/modify supplier orders
 Permission183=Validate supplier orders
 Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
+Permission185=Ολοκλήρωση ή ακύρωση παραγγελίας προμηθευτή
 Permission186=Receive supplier orders
 Permission187=Close supplier orders
 Permission188=Cancel supplier orders
@@ -714,6 +717,11 @@ Permission510=Διαβάστε τους μισθούς
 Permission512=Δημιουργία/Τροποποίηση μισθών
 Permission514=Διαγραφή μισθών
 Permission517=Εξαγωγή μισθών
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=Emails ειδοποιήσεις η λειτουργία αυτή σας επιτρέπει να στείλετε σιωπηλά αυτόματο μήνυμα, για ορισμένες εκδηλώσεις Dolibarr. Οι στόχοι των κοινοποιήσεων μπορούν να οριστούν:
    * ανά Πελ./Προμ. (πελάτες ή προμηθευτές), ανά ένα Πελ./Προμ. την φορά.
    * ή με τον καθορισμό ενός γενικού e-mail στη σελίδα εγκατάστασης του module.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Πρότυπα εγγράφων
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index 5e8f1ffdcaf..f77c296ab81 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Το τιμολόγιο %s επικυρώθηκε
 InvoiceValidatedInDolibarrFromPos=Το τιμολόγιο επικυρώθηκε από το  POS
 InvoiceBackToDraftInDolibarr=Τιμολόγιο %s θα επιστρέψει στην κατάσταση του σχεδίου
 InvoiceDeleteDolibarr=Τιμολόγιο %s διαγράφεται
-OrderValidatedInDolibarr= Η παραγγελία %s επικυρώθηκε
+OrderValidatedInDolibarr=Η παραγγελία %s επικυρώθηκε
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Παραγγελία %s ακυρώθηκε
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Παραγγελία %s εγκρίθηκε
 OrderRefusedInDolibarr=Παραγγελία %s απορριφθεί
 OrderBackToDraftInDolibarr=Παραγγελία %s θα επιστρέψει στην κατάσταση σχέδιο
@@ -91,3 +94,5 @@ WorkingTimeRange=Εύρος χρόνου εργασίας
 WorkingDaysRange=Εύρος ημερών εργασίας
 AddEvent=Δημιουργία συμβάντος
 MyAvailability=Η διαθεσιμότητα μου
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 7c143b155f1..726182bd6ee 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -33,11 +33,11 @@ AllTime=Από την αρχή
 Reconciliation=Πραγματοποίηση Συναλλαγών
 RIB=Αριθμός Τραπ. Λογαριασμού
 IBAN=IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=Το ΙΒΑΝ είναι έγκυρο
+IbanNotValid=Το ΙΒΑΝ δεν είναι έγκυρο
 BIC=Αριθμός BIC/SWIFT
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=Το BIC/SWIFT είναι έγκυρο
+SwiftNotValid=Το BIC/SWIFT δεν είναι έγκυρο
 StandingOrders=Πάγιες εντολές
 StandingOrder=Πάγια εντολή
 Withdrawals=Αναλήψεις
@@ -152,7 +152,7 @@ BackToAccount=Επιστροφή στον λογαριασμό
 ShowAllAccounts=Εμφάνιση Όλων των Λογαριασμών
 FutureTransaction=Συναλλαγή στο μέλλον. Δεν υπάρχει τρόπος συμβιβασμού.
 SelectChequeTransactionAndGenerate=Επιλέξτε/φίλτρο ελέγχου για να συμπεριληφθεί στην απόδειξη κατάθεσης και κάντε κλικ στο "Δημιουργία".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή όπως: YYYYMM ή YYYYMMDD
 EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
 ToConciliate=Να συμβιβάσει;
 ThenCheckLinesAndConciliate=Στη συνέχεια, ελέγξτε τις γραμμές που υπάρχουν στο αντίγραφο κίνησης του τραπεζικού λογαριασμού και κάντε κλικ
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 597c71d53e7..ee85738b276 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Ιστορικό Πληρωμών
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Κανόνας Πληρωμής
 PaymentMode=Τρόπος Πληρωμής
-PaymentConditions=Συνθήκη Πληρωμής
-PaymentConditionsShort=Συνθήκες Πληρωμής
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Σύνολο πληρωμής
 ValidatePayment=Επικύρωση πληρωμής
 PaymentHigherThanReminderToPay=Η πληρωμή είναι μεγαλύτερη από το υπόλοιπο
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Το σύνολο των δύο νέων τ
 ConfirmRemoveDiscount=Είστε σίγουροι ότι θέλετε να αφαιρέσετε την έκπτωση;
 RelatedBill=Σχετιζόμενο τιμολόγιο
 RelatedBills=Σχετιζόμενα τιμολόγια
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Τελευταίο σχετικό τιμολόγιο
 WarningBillExist=Προσοχή, ένα ή περισσότερα τιμολόγια υπάρχουν ήδη
 
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 542fb2cf04f..44b883b8a0f 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Κατηγορία
-Categories=Κατηγορίες
-Rubrique=Κατηγορία
-Rubriques=Κατηγορίες
-categories=κατηγορίες
-TheCategorie=Η Κατηγορία
-NoCategoryYet=Δεν υπάρχει κατηγορία
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Μέσα
 AddIn=Προσθήκη σε
 modify=αλλαγή
 Classify=Ταξινόμηση
-CategoriesArea=Περιοχή κατηγοριών
-ProductsCategoriesArea=Περιοχή κατηγοριών Προϊόντων/Υπηρεσιών
-SuppliersCategoriesArea=Περιοχή κατηγοριών Προμηθευτών
-CustomersCategoriesArea=Περιοχή κατηγοριών Πελατών
-ThirdPartyCategoriesArea=Περιοχή κατηγοριών Άλλων Στοιχείων
-MembersCategoriesArea=Περιοχή κατηγοριών Χρηστών/Μελών
-ContactsCategoriesArea=Περιοχή κατηγοριών Επαφών
-MainCats=Βασικές Κατηγορίες
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Υποκατηγορίες
 CatStatistics=Στατιστικά
-CatList=Λίστα κατηγοριών
-AllCats=Όλες οι Κατηγορίες
-ViewCat=Εμφάνιση Κατηγορίας
-NewCat=Προσθήκη Κατηγορίας
-NewCategory=Νέα Κατηγορία
-ModifCat=Τροποποίηση Κατηγορίας
-CatCreated=Η Κατηγορία Δημιουργήθηκε
-CreateCat=Δημιουργία Κατηγορίας
-CreateThisCat=Δημιουργία αυτής της κατηγορίας
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Επικύρωση πεδίων
 NoSubCat=Καμία υποκατηγορία.
 SubCatOf=Υποκατηγορία
-FoundCats=Βρέθηκαν κατηγορίες
-FoundCatsForName=Βρέθηκαν κατηγορίες με το όνομα :
-FoundSubCatsIn=Βρέθηκαν υποκατηγορίες στην κατηγορία
-ErrSameCatSelected=Επιλέξατε την ίδια κατηγορία πολλές φορές
-ErrForgotCat=Δεν επιλέξατε κατηγορία
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Δεν ενημερώσατε τα πεδία
 ErrCatAlreadyExists=Αυτό το όνομα χρησιμοποιείται ήδη
-AddProductToCat=Προσθήκη αυτού του προϊόντος σε μια κατηγορία;
-ImpossibleAddCat=Αδύνατον να προσθέσετε την κατηγορία
-ImpossibleAssociateCategory=Αδύνατον να συνδεθεί στην κατηγορία
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s προστέθηκε με επιτυχία.
-ObjectAlreadyLinkedToCategory=Το στοιχείο είναι ήδη συνδεδεμένο σε αυτή την κατηγορία.
-CategorySuccessfullyCreated=Αυτή η κατηγορία %s έχει προστεθεί με επιτυχία.
-ProductIsInCategories=Το Προϊόν/Υπηρεσία ανήκει στις παρακάτω κατηγορίες
-SupplierIsInCategories=Το στοιχείο ανήκει στις παρακάτω κατηγορίες προμηθευτών
-CompanyIsInCustomersCategories=Αυτό το στοιχείο ανήκει στις παρακάτω κατηγορίες πελατών/προοπτικών
-CompanyIsInSuppliersCategories=Αυτό το στοιχείο ανήκει στις παρακάτω κατηγορίες προμηθευτών
-MemberIsInCategories=Αυτό το μέλος ανήκει στις παρακάτω κατηγορίες μελών
-ContactIsInCategories=Αυτή η επαφή ανήκει στις ακόλουθες κατηγορίες επαφών
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=Αυτός ο προμηθευτής δεν είναι σε καμία κατηγορία
-CompanyHasNoCategory=Αυτή η εταιρεία δεν είναι σε καμία κατηγορία
-MemberHasNoCategory=Αυτό το μέλος δεν είναι σε καμία κατηγορία
-ContactHasNoCategory=Η επαφή αυτή δεν είναι σε καμία κατηγορία
-ClassifyInCategory=Ταξινόμηση κατηγορίας
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Καμία
-NotCategorized=Χωρίς κατηγορία
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Η κατηγορία αυτή υπάρχει ήδη με αυτό το όνομα
 ReturnInProduct=Πίσω στην καρτέλα προϊόν/υπηρεσία
 ReturnInSupplier=Πίσω στην καρτέλα προμηθευτή
@@ -66,22 +64,22 @@ ReturnInCompany=Πίσω στην καρτέλα πελάτη/προοπτική
 ContentsVisibleByAll=Τα περιεχόμενα θα είναι ορατά από όλους
 ContentsVisibleByAllShort=Περιεχόμενα ορατά από όλους
 ContentsNotVisibleByAllShort=Περιεχόμενα μη ορατά από όλους
-CategoriesTree=Δέντρο κατηγοριών
-DeleteCategory=Διαγραφή Κατηγορίας
-ConfirmDeleteCategory=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την κατηγορία;
-RemoveFromCategory=Αφαιρέστε το σύνδεσμο από την κατηγορία
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=Δεν έχει οριστεί κατηγορία
-SuppliersCategoryShort=Κατηγορία Προμηθευτών
-CustomersCategoryShort=Κατηγορία Πελατών
-ProductsCategoryShort=Κατηγορία Προϊόντων
-MembersCategoryShort=Κατηγορία Μελών
-SuppliersCategoriesShort=Κατηγορίες Προμηθευτών
-CustomersCategoriesShort=Κατηγορίες Πελατών
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Κατηγορίες Πελατών/Προοπτ
-ProductsCategoriesShort=Κατηγορίες Προϊόντων
-MembersCategoriesShort=Κατηγορίες Μελών
-ContactCategoriesShort=Κατηγορίες επαφών
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Αυτή η κατηγορία δεν περιέχει κανένα προϊόν.
 ThisCategoryHasNoSupplier=Αυτή η κατηγορία δεν περιέχει κανένα προμηθευτή.
 ThisCategoryHasNoCustomer=Αυτή η κατηγορία δεν περιέχει κανένα πελάτη.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Αυτή η κατηγορία δεν περιέχει
 AssignedToCustomer=Ανατέθηκε σε πελάτη
 AssignedToTheCustomer=Έχει ανατεθεί σε πελάτη
 InternalCategory=Εσωτερική Κατηγορία
-CategoryContents=Περιεχόμενα Κατηγορίας
-CategId=Κωδικός Κατηγορίας
-CatSupList=Λίστα κατηγοριών προμηθευτή
-CatCusList=Λίστα κατηγοριών πελατών/προοπτικών
-CatProdList=Λίστα κατηγοριών προϊόντων
-CatMemberList=Λίστα κατηγοριών μελών
-CatContactList=Λίστα κατηγοριών επαφών και επικοινωνίας
-CatSupLinks=Προμηθευτές
-CatCusLinks=Πελάτες/Προοπτικές
-CatProdLinks=Προϊόντα
-CatMemberLinks=Σχέσεις μεταξύ των μελών και των κατηγοριών
-DeleteFromCat=Κατάργηση από την κατηγορία
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Διαγραφή εικόνας
 ConfirmDeletePicture=Επιβεβαιώστε τη διαγραφή εικόνας
 ExtraFieldsCategories=Συμπληρωματικά χαρακτηριστικά
-CategoriesSetup=Ρύθμισης κατηγοριών
-CategorieRecursiv=Συνδέουν με το γονέα της κατηγορίας αυτόματα
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Εάν είναι ενεργοποιημένο, το προϊόν θα συνδέεται επίσης με γονική κατηγορία κατά την προσθήκη σε μια υποκατηγορία
 AddProductServiceIntoCategory=Προσθέστε το ακόλουθο προϊόν/υπηρεσία
-ShowCategory=Εμφάνιση κατηγορίας
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index 114c0169055..1f1bc892da0 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Η επικοινωνία έγινε
 DateActionPlanned=Ημερ. προγραμματισμού
 DateActionDone=Ημερ. ολοκλήρωσης
 ActionAskedBy=Η ενέργεια ζητήθηκε από
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Η ενέργεια αφορά τον/την
 ActionDoneBy=Η ενέργεια έγινε από τον/την
 ActionUserAsk=Καταγράφηκε από τον/την
 ErrorStatusCantBeZeroIfStarted=Εάν το πεδίο 'Date done' είναι γεμάτο, η ενέργεια έχει αρχίσει (ή έχει τελειώσει), οπότε το πεδίο 'Status' δεν μπορεί να είναι 0%%.
diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
index c8e4c7b1cb5..1ff660913a1 100644
--- a/htdocs/langs/el_GR/contracts.lang
+++ b/htdocs/langs/el_GR/contracts.lang
@@ -19,7 +19,7 @@ ServiceStatusLateShort=Έληξε
 ServiceStatusClosed=Τερματισμένη
 ServicesLegend=Services legend
 Contracts=Συμβόλαια
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Συμβόλαια και η γραμμή των συμβολαίων
 Contract=Συμβόλαιο
 NoContracts=Κανένα Συμβόλαιο
 MenuServices=Υπηρεσίες
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 9f94c994725..738ac49580c 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Τελευταία εκτέλεση εξόδου
 CronLastResult=Τελευταίος κωδικός αποτελέσματος
 CronListOfCronJobs=Κατάλογος προγραμματισμένων εργασιών
 CronCommand=Εντολή
-CronList=Λίστα εργασιών
-CronDelete= Διαγραφή εργασιών cron
-CronConfirmDelete= Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την περιοδική εργασία;
-CronExecute=Έναρξη εργασίας
-CronConfirmExecute= Είστε σίγουροι για την εκτελέσει αυτής τις εργασίας τώρα;
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Αναμονή εργασίας
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Εργασία
-CronNone= Καμία
+CronNone=Καμία
 CronDtStart=Ημερ. έναρξης
 CronDtEnd=Ημερ. τέλους
 CronDtNextLaunch=Επόμενη εκτέλεση
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=Γραμμή εντολών του συστήματος προς εκτέλεση.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Πληροφορίες
 # Common
@@ -84,4 +85,4 @@ CronType_command=Εντολή Shell
 CronMenu=Μενού
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Πηγαίνετε στο μενού "Home - Modules εργαλεία - Λίστα εργασιών" για να δείτε και να επεξεργαστείτε τις προγραμματισμένες εργασίες.
-TaskDisabled=Task disabled
+TaskDisabled=Η εργασία απενεργοποιήθηκε
diff --git a/htdocs/langs/el_GR/donations.lang b/htdocs/langs/el_GR/donations.lang
index c35ee1cbc55..2230375c4db 100644
--- a/htdocs/langs/el_GR/donations.lang
+++ b/htdocs/langs/el_GR/donations.lang
@@ -6,6 +6,8 @@ Donor=Δωρεά
 Donors=Δωρεές
 AddDonation=Δημιουργία δωρεάς
 NewDonation=Νέα δωρεά
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Εμφάνιση δωρεάς
 DonationPromise=Υπόσχεση δώρου
 PromisesNotValid=Μη επικυρωμένες υποσχέσεις
@@ -21,6 +23,8 @@ DonationStatusPaid=Η δωρεά παραλήφθηκε
 DonationStatusPromiseNotValidatedShort=Προσχέδιο
 DonationStatusPromiseValidatedShort=Επικυρωμένη
 DonationStatusPaidShort=Ληφθήσα
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Επικύρωση υπόσχεσης
 DonationReceipt=Απόδειξη δωρεάς
 BuildDonationReceipt=Δημιουργία απόδειξης
@@ -36,3 +40,4 @@ FrenchOptions=Επιλογές για Γαλλία
 DONATION_ART200=Δείτε το άρθρο 200 από το CGI αν ανησυχείτε
 DONATION_ART238=Δείτε το άρθρο 238 από το CGI αν ανησυχείτε
 DONATION_ART885=Δείτε το άρθρο 885 από το CGI αν ανησυχείτε
+DonationPayment=Donation payment
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 1361707a862..ee989554734 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Άγνωστο σφάλμα '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index debe768f46e..37654134875 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Λίστα όλων των ειδοποιήσεων ηλ
 MailSendSetupIs=Διαμόρφωση αποστολή email έχει ρυθμιστεί σε '%s'. Αυτή η λειτουργία δεν μπορεί να χρησιμοποιηθεί για να σταλθούν μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs2=Θα πρέπει πρώτα να πάτε, με έναν λογαριασμό διαχειριστή, στο μενού %s Αρχική - Ρύθμιση - Emails %s για να αλλάξετε την παράμετρο '%s' για να χρησιμοποιήσετε τη λειτουργία '%s'. Με αυτόν τον τρόπο, μπορείτε να μεταβείτε στις ρυθμίσεις του διακομιστή SMTP παρέχεται από τον Internet Service Provider και να χρησιμοποιήσετε τη Μαζική αποστολή ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs3=Αν έχετε οποιαδήποτε απορία σχετικά με το πώς να ρυθμίσετε το διακομιστή SMTP σας, μπορείτε να ζητήσετε στο %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Τρέχων αριθμός των στοχευμένων ηλεκτρονικών μηνυμάτων της επαφής
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 50211a1e084..f16111aaa06 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -141,7 +141,7 @@ Cancel=Άκυρο
 Modify=Τροποποίηση
 Edit=Επεξεργασία
 Validate=Επικύρωση
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Επικύρωση και Έγκριση
 ToValidate=Προς Επικύρωση
 Save=Αποθήκευση
 SaveAs=Αποθήκευση Ως
@@ -159,7 +159,7 @@ Search=Αναζήτηση
 SearchOf=Αναζήτηση
 Valid=Έγκυρο
 Approve=Έγκριση
-Disapprove=Disapprove
+Disapprove=Δεν εγκρίνεται
 ReOpen=Εκ νέου άνοιγμα
 Upload=Αποστολή Αρχείου
 ToLink=Σύνδεσμος
@@ -221,7 +221,7 @@ Cards=Καρτέλες
 Card=Καρτέλα
 Now=Τώρα
 Date=Ημερομηνία
-DateAndHour=Date and hour
+DateAndHour=Ημερομηνία και ώρα
 DateStart=Ημερομηνία Έναρξης
 DateEnd=Ημερομηνία Τέλους
 DateCreation=Ημερομηνία Δημιουργίας
@@ -298,7 +298,7 @@ UnitPriceHT=Τιμή Μονάδος (χ. Φ.Π.Α)
 UnitPriceTTC=Τιμή Μονάδος
 PriceU=Τιμή μον.
 PriceUHT=Τιμή μον.
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=PU ΗΤ Ζητούμενες
 PriceUTTC=Τιμή μον.
 Amount=Ποσό
 AmountInvoice=Ποσό Τιμολογίου
@@ -352,6 +352,7 @@ Status=Κατάσταση
 Favorite=Αγαπημένα
 ShortInfo=Info.
 Ref=Κωδ.
+ExternalRef=Κωδ. extern
 RefSupplier=Αριθ. Τιμολογίου
 RefPayment=Κωδ. πληρωμής
 CommercialProposalsShort=Εμπορικές προτάσεις
@@ -394,8 +395,8 @@ Available=Σε διάθεση
 NotYetAvailable=Δεν είναι ακόμη σε διάθεση
 NotAvailable=Χωρίς διάθεση
 Popularity=Δημοτικότητα
-Categories=Κατηγορίες
-Category=Κατηγορία
+Categories=Ετικέτες/Κατηγορίες
+Category=Ετικέτα/Κατηγορία
 By=Από
 From=Από
 to=πρός
@@ -525,7 +526,7 @@ DateFromTo=Από %s μέχρι %s
 DateFrom=Από %s
 DateUntil=Μέχρι %s
 Check=Έλεγχος
-Uncheck=Uncheck
+Uncheck=Αποεπιλογή
 Internal=Internal
 External=External
 Internals=Internal
@@ -693,7 +694,8 @@ PublicUrl=Δημόσια URL
 AddBox=Προσθήκη πεδίου
 SelectElementAndClickRefresh=Επιλέξτε ένα στοιχείο και κάντε κλικ στο κουμπί Ανανέωση
 PrintFile=Εκτύπωση του αρχείου %s
-ShowTransaction=Show transaction
+ShowTransaction=Εμφάνιση συναλλαγών
+GoIntoSetupToChangeLogo=Πηγαίνετε Αρχική - Ρυθμίσεις - Εταιρία να αλλάξει το λογότυπο ή πηγαίνετε Αρχική - Ρυθμίσεις - Προβολή για απόκρυψη.
 # Week day
 Monday=Δευτέρα
 Tuesday=Τρίτη
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index e6cedcee375..2759e5ab7ba 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -42,7 +42,7 @@ StatusOrderCanceled=Ακυρωμένη
 StatusOrderDraft=Προσχέδιο (χρειάζεται επικύρωση)
 StatusOrderValidated=Επικυρωμένη
 StatusOrderOnProcess=Παραγγέλθηκε - Αναμονή παραλαβής
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcessWithValidation=Παραγγέλθηκε - Αναμονή παραλαβής ή επικύρωσης
 StatusOrderProcessed=Ολοκληρωμένη
 StatusOrderToBill=Προς πληρωμή
 StatusOrderToBill2=Προς τιμολόγηση
@@ -59,12 +59,13 @@ MenuOrdersToBill=Παραγγελίες προς χρέωση
 MenuOrdersToBill2=Χρεώσιμες παραγγελίες
 SearchOrder=Εύρεση παραγγελίας
 SearchACustomerOrder=Αναζητήστε μία παραγγελία πελάτη
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Αναζήτηση παραγγελίας προμηθευτή
 ShipProduct=Ship product
 Discount=Έκπτωση
 CreateOrder=Δημιουργία παραγγελίας
 RefuseOrder=Άρνηση παραγγελίας
-ApproveOrder=Αποδοχή παραγγελίας
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Επικύρωση παραγγελίας
 UnvalidateOrder=Για Unvalidate
 DeleteOrder=Διαγραφή παραγγελίας
@@ -102,6 +103,8 @@ ClassifyBilled=Χαρακτηρισμός "Τιμολογημένη"
 ComptaCard=Λογιστική κάρτα
 DraftOrders=Προσχέδια παραγγελιών
 RelatedOrders=Σχετικές παραγγελίες
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Παραγγελίες σε εξέλιξη
 RefOrder=Κωδ. παραγγελίας
 RefCustomerOrder=Κωδ. πελάτη παραγγελίας
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Κλωνοποίηση παραγγελίας
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 449d5bc6fac..bcc1ade3821 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Παρέμβαση αποστέλλεται μέσω ταχυδρομείου
 Notify_BILL_VALIDATE=Το τιμολόγιο πελάτη επικυρώθηκε
 Notify_BILL_UNVALIDATE=Τιμολόγιο του Πελάτη μη επικυρωμένο
+Notify_ORDER_SUPPLIER_VALIDATE=Παραγγελία του προμηθευτή καταγράφηκε
 Notify_ORDER_SUPPLIER_APPROVE=Η παραγγελία προμηθευτή εγγρίθηκε
 Notify_ORDER_SUPPLIER_REFUSE=Η παραγγελία προμηθευτή απορρίφθηκε
 Notify_ORDER_VALIDATE=Η παραγγελία πελάτη επικυρώθηκε
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Εμπορικές προτάσεις που αποστ
 Notify_BILL_PAYED=Τιμολογίου Πελατών payed
 Notify_BILL_CANCEL=Τιμολογίου Πελατών ακυρώσεις
 Notify_BILL_SENTBYMAIL=Τιμολογίου Πελατών σταλούν ταχυδρομικώς
-Notify_ORDER_SUPPLIER_VALIDATE=Για επικυρωθεί Προμηθευτής
+Notify_ORDER_SUPPLIER_VALIDATE=Παραγγελία του προμηθευτή καταγράφηκε
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Για Προμηθευτής σταλούν ταχυδρομικώς
 Notify_BILL_SUPPLIER_VALIDATE=Τιμολόγιο Προμηθευτή επικυρωθεί
 Notify_BILL_SUPPLIER_PAYED=Τιμολόγιο Προμηθευτή payed
@@ -47,20 +48,20 @@ Notify_PROJECT_CREATE=Δημιουργία έργου
 Notify_TASK_CREATE=Η εργασία δημιουργήθηκε
 Notify_TASK_MODIFY=Η εργασία τροποποιήθηκε
 Notify_TASK_DELETE=Η εργασία διαγράφηκε
-SeeModuleSetup=Προβολή ρύθμισης του module
+SeeModuleSetup=Δείτε την ρύθμιση του module %s
 NbOfAttachedFiles=Πλήθος επισυναπτώμενων αρχείων/εγγράφων
 TotalSizeOfAttachedFiles=Συνολικό μέγεθος επισυναπτώμενων αρχείων/εγγράφων
 MaxSize=Μέγιστο μέγεθος
 AttachANewFile=Επισύναψη νέου αρχείου/εγγράφου
 LinkedObject=Συνδεδεμένα αντικείμενα
 Miscellaneous=Διάφορα
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Αριθμός κοινοποιήσεων (Αριθμός emails παραλήπτη)
 PredefinedMailTest=Δοκιμαστικο mail.\nΟι δύο γραμμές είναι χωρισμένες με carriage return.
 PredefinedMailTestHtml=Αυτό είναι ένα μήνυμα δοκιμής (η δοκιμή λέξη πρέπει να είναι με έντονα γράμματα). 
     Οι δύο γραμμές που χωρίζονται με ένα χαρακτήρα επαναφοράς.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nΘα ήθελα να σας προειδοποιήσω ότι το τιμολόγιο  __FACREF__ φαίνεται να μην έχει πληρωθεί. Στο συνημμένο βρίσκεται το τιμολόγιο που φαίνεται να μην έχει πληρωθεί.\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την προσφορά __PROPREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το αίτημα των τιμών __ASKREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε τη παραγγελία __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την παραγγελία μας __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Το τιμολόγιο %s έχει επικυρωθε
 EMailTextProposalValidated=Η %s πρόταση έχει επικυρωθεί.
 EMailTextOrderValidated=Η σειρά %s έχει επικυρωθεί.
 EMailTextOrderApproved=Η %s παραγγελία έχει εγκριθεί.
+EMailTextOrderValidatedBy=Η παραγγελία %s έχει καταγραφεί από %s.
 EMailTextOrderApprovedBy=Η σειρά %s έχει εγκριθεί από %s.
 EMailTextOrderRefused=Η σειρά %s έχει απορριφθεί.
 EMailTextOrderRefusedBy=Η σειρά %s έχει απορριφθεί από %s.
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index cc6e312db0e..400c52b0d5c 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Παρτίδα/Σειριακός αριθμός
 l_eatby=Φάτε ημερομηνία λήξης
 l_sellby=Ημερομηνία πώλησης
 DetailBatchNumber=Παρτίδα/Λεπτομέρειες σειριακού
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+DetailBatchFormat=Παρτίδα/Σειριακός: %s - Αφαιρέθηκε από: %s - Πώληση από: %s (Ποσ. : %d)
 printBatch=Παρτίδα: %s
 printEatby=Eat-by: %s
 printSellby=Πώληση ανά: %s
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index eebb6c5060b..873cc94308a 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Ελάχιστη συνιστώμενη τιμή είν
 PriceExpressionEditor=Επεξεργαστής συνάρτησης τιμών
 PriceExpressionSelected=Επιλογή συνάρτησης τιμών
 PriceExpressionEditorHelp1="τιμή = 2 + 2" ή "2 + 2" για τον καθορισμό της τιμής. Χρησιμοποιήστε ; για να διαχωρίσετε τις εκφράσεις
-PriceExpressionEditorHelp2=Μπορείτε να αποκτήσετε πρόσβαση στα Συμπληρωματικά χαρακτηριστικά με μεταβλητές όπως #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=Στο προϊόν/υπηρεσία και στις τιμές του προμηθευτή υπάρχουν αυτές οι μεταβλητές διαθέσιμες:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Μόνο σε τιμές προϊόντων/υπηρεσιών: #supplier_min_price#
    Μόνο τιμές Προμηθευτών: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Λειτουργία Τιμής
 PriceNumeric=Αριθμός
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+DefaultPrice=Προεπιλεγμένη τιμή
+ComposedProductIncDecStock=Αύξηση/Μείωση αποθεμάτων στην μητρική
+ComposedProduct=Υποπροϊόν
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 3e20c208dc9..71c1c7e7cdb 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -8,10 +8,10 @@ SharedProject=Όλοι
 PrivateProject=Αντιπρόσωποι του έργου
 MyProjectsDesc=Η άποψη αυτή περιορίζονται σε έργα που είναι σε μια επαφή για την (όποια είναι ο τύπος).
 ProjectsPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα σας επιτρέπεται να διαβάσετε.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να δείτε.
 ProjectsDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
 MyTasksDesc=Η άποψη αυτή περιορίζονται σε έργα ή εργασίες που έχουν μια επαφή για την (όποια είναι ο τύπος).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Μόνο τα έργα που είναι ανοιχτά είναι ορατά (έργα που είναι σχέδιο ή κλειστά δεν είναι ορατά)
 TasksPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να διαβάζουν.
 TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
 ProjectsArea=Περιοχή Έργων
@@ -31,8 +31,8 @@ NoProject=No project defined or owned
 NbOpenTasks=Αριθμός ανοιχτών εργασιών
 NbOfProjects=Αριθμός έργων
 TimeSpent=Χρόνος που δαπανήθηκε
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Χρόνος που δαπανάται από εσάς
+TimeSpentByUser=Χρόνος που δαπανάται από τον χρήστη
 TimesSpent=Ο χρόνος που δαπανάται
 RefTask=Αναφ. εργασίας
 LabelTask=Ετικέτα εργασίας
@@ -71,7 +71,8 @@ ListSupplierOrdersAssociatedProject=Κατάλογος των ενταλμάτω
 ListSupplierInvoicesAssociatedProject=Κατάλογος των τιμολογίων του προμηθευτή που συνδέονται με το έργο
 ListContractAssociatedProject=Κατάλογος των συμβάσεων που συνδέονται με το έργο
 ListFichinterAssociatedProject=Κατάλογος των παρεμβάσεων που σχετίζονται με το έργο
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListExpenseReportsAssociatedProject=Λίστα αναφορών των δαπανών που σχετίζονται με το έργο
+ListDonationsAssociatedProject=Λίστα των δωρεών που σχετίζονται με το έργο
 ListActionsAssociatedProject=Κατάλογος των εκδηλώσεων που σχετίζονται με το έργο
 ActivityOnProjectThisWeek=Δραστηριότητα στο έργο αυτή την εβδομάδα
 ActivityOnProjectThisMonth=Δραστηριότητα στο έργο αυτό το μήνα
@@ -130,13 +131,15 @@ AddElement=Σύνδεση με το στοιχείο
 UnlinkElement=Αποσύνδεση στοιχείου
 # Documents models
 DocumentModelBaleine=Μοντέλο έκθεση Μια πλήρης έργου (logo. ..)
-PlannedWorkload = Σχέδιο φόρτου εργασίας
-WorkloadOccupation= Επιτήδευση Φόρτου εργασίας
+PlannedWorkload=Σχέδιο φόρτου εργασίας
+PlannedWorkloadShort=Φόρτος εργασίας
+WorkloadOccupation=Ανάθεση φόρτου εργασίας
 ProjectReferers=Αναφορές από αντικείμενα
 SearchAProject=Αναζήτηση ένα έργο
 ProjectMustBeValidatedFirst=Το έργο πρέπει να επικυρωθεί πρώτα
 ProjectDraft=Πρόχειρα έργα
 FirstAddRessourceToAllocateTime=Συσχετίστε έναν πόρο για την κατανομή του χρόνου
-InputPerTime=Input per time
-InputPerDay=Input per day
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+InputPerDay=Εισαγωγή ανά ημέρα
+InputPerWeek=Εισαγωγή ανά εβδομάδα
+InputPerAction=Εισαγωγή ανά ενέργεια
+TimeAlreadyRecorded=Ο χρόνος που δαπανάται έχει ήδη καταγραφεί για το έργο/ημέρα και ο χρήστης %s
diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
index 58f0b819a6e..2f920102746 100644
--- a/htdocs/langs/el_GR/salaries.lang
+++ b/htdocs/langs/el_GR/salaries.lang
@@ -10,4 +10,4 @@ SalariesPayments=Πληρωμές μισθών
 ShowSalaryPayment=Εμφάνιση μισθοδοσίας
 THM=Η μέση ωριαία τιμή
 TJM=Η μέση ημερήσια τιμή
-CurrentSalary=Current salary
+CurrentSalary=Τρέχον μισθός
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index 8a0733e2515..64667754277 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. αποστολή
 Sending=Αποστολή
 Sendings=Αποστολές
+AllSendings=All Shipments
 Shipment=Αποστολή
 Shipments=Αποστολές
 ShowSending=Προβολή αποστολής
@@ -23,7 +24,7 @@ QtyOrdered=Ποσότητα παραγγελιών
 QtyShipped=Ποσότητα που αποστέλλεται
 QtyToShip=Ποσότητα προς αποστολή
 QtyReceived=Ποσότητα παραλαβής
-KeepToShip=Remain to ship
+KeepToShip=Αναμένει για αποστολή
 OtherSendingsForSameOrder=Άλλες αποστολές για αυτό το σκοπό
 DateSending=Ημερομηνία αποστολή της παραγγελίας
 DateSendingShort=Ημερομηνία αποστολή της παραγγελίας
diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 34b5a692b6f..fef618b1300 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -29,7 +29,7 @@ ExportDataset_fournisseur_2=Τιμολόγια και πληρωμές προμ
 ExportDataset_fournisseur_3=Παραγγελίες σε προμηθευτές και σειρά γραμμών
 ApproveThisOrder=Έγκριση της παραγγελίας
 ConfirmApproveThisOrder=Είστε σίγουροι ότι θέλετε να εγκρίνετε την παραγγελία %s ;
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Απόρριψη παραγγελίας
 ConfirmDenyingThisOrder=Είστε σίγουροι ότι θέλετε να αρνηθείτε την παραγγελία %s ;
 ConfirmCancelThisOrder=Είστε σίγουροι ότι θέλετε να ακυρώσετε την παραγγελία %s ;
 AddCustomerOrder=Δημιουργία παραγγελίας πελάτη
@@ -42,4 +42,5 @@ SentToSuppliers=Αποστολή σε προμηθευτές
 ListOfSupplierOrders=Λίστα παραγγελιών των προμηθευτών
 MenuOrdersSupplierToBill=Παραγγελίες προμηθευτών για τιμολόγηση
 NbDaysToDelivery=Καθυστέρηση παράδοσης σε ημέρες
-DescNbDaysToDelivery=The biggest delay is display among order product list
+DescNbDaysToDelivery=Η μεγαλύτερη καθυστέρηση εμφανίζετε μεταξύ παραγγελίας και τη λίστα των προϊόντων
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index df2ba95700a..22f8dbb928b 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -79,7 +79,7 @@ CreditDate=Πιστωτικές με
 WithdrawalFileNotCapable=Αδύνατο να δημιουργηθεί το αρχείο παραλαβή απόσυρση για τη χώρα σας %s (η χώρα σας δεν υποστηρίζεται)
 ShowWithdraw=Εμφάνιση Ανάληψη
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο δεν έχει τουλάχιστον μία πληρωμή απόσυρσης ακόμη σε επεξεργασία, δεν θα πρέπει να οριστεί ως καταβληθέν θα επιτρέψει εκ των προτέρων την απόσυρση από την διαχείριση.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=Αυτή η καρτέλα σας επιτρέπει να ζητήσετε μια πάγια εντολή. Μόλις γίνει αυτό, πηγαίνετε στο μενού Τράπεζα->Withdrawal για τη διαχείριση της πάγιας εντολής. Όταν η πάγια εντολή κλείνει, η πληρωμή στο τιμολόγιο θα καταγραφεί αυτόματα, και το τιμολόγιο κλείνει εάν το υπόλοιπο είναι μηδενικό.
 WithdrawalFile=Απόσυρση αρχείο
 SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου"
 ThisWillAlsoAddPaymentOnInvoice=Αυτό θα ισχύει επίσης για τις πληρωμές προς τα τιμολόγια και θα τα χαρακτηρίσουν ως "Πληρωμένα"
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index d2ceaa175f8..7d791ef1b5b 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -1,2 +1,8 @@
 # Dolibarr language file - Source file is en_US - admin
-DictionaryVAT=VAT Rates
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
    Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ExampleOfDirectoriesForModelGen=Examples of syntax:
    c:\\mydir
    /home/mydir
    DOL_DATA_ROOT/ecm/ecmdir
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
index 025fcbe0f18..f1e67a676c3 100644
--- a/htdocs/langs/en_GB/bills.lang
+++ b/htdocs/langs/en_GB/bills.lang
@@ -1,24 +1,2 @@
 # Dolibarr language file - Source file is en_US - bills
-PaymentConditionShortRECEP=Due on Receipt
-PaymentConditionRECEP=Due on Receipt
-PaymentTypeVIR=Bank transfer
-PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Direct debit
-PaymentTypeShortPRE=Direct debit
-PaymentTypeCHQ=Cheque
-PaymentTypeShortCHQ=Cheque
-BankCode=Sort code
-ChequeNumber=Cheque N°
-ChequeOrTransferNumber=Cheque/Transfer N°
-ChequeMaker=Cheque transmitter
-ChequeBank=Bank of Cheque
-PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration.
-PaymentByChequeOrderedTo=Cheque payment (including tax) are payable to %s send to
-PaymentByChequeOrderedToShort=Cheque payment (including tax) are payable to
-MenuChequeDeposits=Cheques deposits
-MenuCheques=Cheques
-MenuChequesReceipts=Cheques receipts
-ChequesReceipts=Cheques receipts
-ChequesArea=Cheques deposits area
-ChequeDeposits=Cheques deposits
-Cheques=Cheques
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index ced56a38a13..c571a7a7272 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -4,23 +4,17 @@ FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
-FormatDateShort=%d/%m/%Y
-FormatDateShortInput=%d/%m/%Y
-FormatDateShortJava=dd/MM/yyyy
-FormatDateShortJavaInput=dd/MM/yyyy
-FormatDateShortJQuery=dd/mm/yy
-FormatDateShortJQueryInput=dd/mm/yy
-FormatHourShort=%H:%M
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
-FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
-AmountVAT=Amount VAT
-TotalVAT=Total VAT
-IncludedVAT=Included VAT
-TTC=Inc. VAT
-VAT=VAT
-VATRate=VAT Rate
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/en_GB/orders.lang b/htdocs/langs/en_GB/orders.lang
index 2c71fc66ccc..2efc33c6c5b 100644
--- a/htdocs/langs/en_GB/orders.lang
+++ b/htdocs/langs/en_GB/orders.lang
@@ -1,3 +1,4 @@
 # Dolibarr language file - Source file is en_US - orders
 StatusOrderOnProcessShort=Ordered
 StatusOrderOnProcess=Ordered - Standby reception
+ApproveOrder=Approve order
diff --git a/htdocs/langs/en_GB/other.lang b/htdocs/langs/en_GB/other.lang
index 5c827f1c4ed..c50a095e492 100644
--- a/htdocs/langs/en_GB/other.lang
+++ b/htdocs/langs/en_GB/other.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - other
-VolumeUnitdm3=dm3 (l)
-VolumeUnitcm3=cm3 (ml)
-VolumeUnitmm3=mm3 (µl)
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
+SeeModuleSetup=See setup of module %s
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 8161a7a8e7c..7233ad928c4 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-Module30Name=Facturas y notas de crédito
-Module30Desc=Gestión de facturas y notas de crédito a clientes. Gestión facturas de proveedores
-BillsNumberingModule=Módulo de numeración de facturas y notas de crédito
-CreditNoteSetup=Configuración del módulo notas de crédito
-CreditNotePDFModules=Modelo de documento de notas de crédito
+AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
    Example for ClamAv: /usr/bin/clamscan
+AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ExampleOfDirectoriesForModelGen=Examples of syntax:
    c:\\mydir
    /home/mydir
    DOL_DATA_ROOT/ecm/ecmdir
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
+MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
diff --git a/htdocs/langs/es_AR/bills.lang b/htdocs/langs/es_AR/bills.lang
index 75496f66e43..f1e67a676c3 100644
--- a/htdocs/langs/es_AR/bills.lang
+++ b/htdocs/langs/es_AR/bills.lang
@@ -1,21 +1,2 @@
 # Dolibarr language file - Source file is en_US - bills
-InvoiceAvoir=Nota de crédito
-InvoiceAvoirAsk=Nota de crédito para corregir la factura
-InvoiceAvoirDesc=La nota de crédito es una factura negativa destinada a compensar un importe de factura que difiere del importe realmente pagado (por haber pagado de más o por devolución de productos, por ejemplo).
-InvoiceHasAvoir=Corregida por una o más notas de crédito
-ConfirmConvertToReduc=¿Quiere convertir esta nota de crédito en una reducción futura?
    El importe de esta nota de crédito se almacenará para este cliente. Podrá utilizarse para reducir el importe de una próxima factura del cliente.
-AddBill=Crear factura o nota de crédito
-EnterPaymentDueToCustomer=Realizar pago de notas de crédito al cliente
-ErrorInvoiceAvoirMustBeNegative=Error, una factura de tipo nota de crédito debe tener un importe negativo
-ConfirmClassifyPaidPartiallyReasonAvoir=El resto a pagar (%s %s) se ha regularizado (ya que artículo se ha devuelto, olvidado entregar, descuento no definido...)  mediante una nota de crédito
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Esta elección será posible, por ejemplo, en los casos siguiente:
    -pago parcial ya que una partida de productos se ha devuleto.
    - reclamado por no entregar productos de la factura 
    En todos los casos, la reclamación debe regularizarse mediante una nota de crédito
-ShowInvoiceAvoir=Ver nota de crédito
-AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (excluidos las notas de crédito y anticipos)
-AddCreditNote=Crear nota de crédito
-ShowDiscount=Ver la nota de crédito
-CreditNote=Nota de crédito
-CreditNotes=Notas de crédito
-DiscountFromCreditNote=Descuento resultante de la nota de crédito %s
-AbsoluteDiscountUse=Este tipo de crédito no puede ser utilizado en una factura antes de su validación
-CreditNoteConvertedIntoDiscount=Esta nota de crédito se convirtió en %s
-TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas y %syymm-nnnn para las notas de crédito donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0
+ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index d43134a3f9c..7233ad928c4 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -2,4 +2,5 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
    Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:
    c:\\mydir
    /home/mydir
    DOL_DATA_ROOT/ecm/ecmdir
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index 2e691473326..678fac2d5bb 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -2,20 +2,38 @@
 DIRECTION=ltr
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
-SeparatorDecimal=.
-SeparatorThousand=,
-FormatDateShort=%m/%d/%Y
-FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM/dd/yyyy
-FormatDateShortJavaInput=MM/dd/yyyy
-FormatDateShortJQuery=mm/dd/yy
-FormatDateShortJQueryInput=mm/dd/yy
+SeparatorDecimal=,
+SeparatorThousand=.
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShortJQuery=HH:MI
-FormatHourShort=%I:%M %p
+FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%b %d, %Y
-FormatDateText=%B %d, %Y
-FormatDateHourShort=%m/%d/%Y %I:%M %p
-FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%b %d, %Y, %I:%M %p
-FormatDateHourText=%B %d, %Y, %I:%M %p
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
+NoRecordFound=No se encontraron registros
+ErrorFileNotUploaded=El archivo no se transifirió. Compruebe que el tamaño no supere el máximo permitido, el espacio libre disponible en el disco y que no hay un archivo con el mismo nombre en el directorio destino.
+ErrorNoRequestRan=No hay petición
+ErrorSomeErrorWereFoundRollbackIsDone=Se encontraron algunos errores. Modificaciones sin aplicar.
+ErrorNoSocialContributionForSellerCountry=Error, no hay tipo de carga social definida para el país '%s'.
+SeeHere=Ver aquí
+FileNotUploaded=El archivo no se subió
+FileWasNotUploaded=Un archivo ha sido seleccionado para adjuntarlo, pero aún no se ha subido. Haga clic en "Adjuntar este archivo".
+SeeAbove=Ver arriba
+InformationToHelpDiagnose=Esta es una información que puede ayudar de diagnóstico
+NoUserGroupDefined=No hay grupo de usuario definido
+DateModificationShort=Fecha modificación
+UseLocalTax=Incluir impuestos
+CommercialProposalsShort=Cotizaciones
+RequestAlreadyDone=La solicitud ya ha sido procesada
+NbOfReferers=Número de remitentes
+Currency=Moneda
+SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Actualizar
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 45dc1e4858b..526f47dc0ce 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -8,11 +8,11 @@ VersionExperimental=Experimental
 VersionDevelopment=Desarrollo
 VersionUnknown=Desconocida
 VersionRecommanded=Recomendada
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Integridad archivos
+FilesMissing=Archivos no encontrados
+FilesUpdated=Archivos actualizados
+FileCheckDolibarr=Comprobar la integridad de los Archivos Dolibarr
+XmlNotFound=Archivo xml de Integridad Dolibarr no encontrado
 SessionId=ID sesión
 SessionSaveHandler=Modalidad de salvaguardado de sesiones
 SessionSavePath=Localización salvaguardado de sesiones
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separador
 ExtrafieldCheckBox=Casilla de verificación
 ExtrafieldRadio=Botón de selección excluyente
 ExtrafieldCheckBoxFromList= Casilla de selección de tabla
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=El listado de parámetros tiene que ser key,valor

     por ejemplo:\n
    1,value1
    2,value2
    3,value3
    ...

    Para tener la lista en función de otra:
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=El listado de parámetros tiene que ser key,valor

     por ejemplo:\n
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=El listado de parámetros tiene que ser key,valor

     por ejemplo:\n
    1,value1
    2,value2
    3,value3
    ...
@@ -494,28 +495,30 @@ Module500Name=Gastos especiales (impuestos, gastos sociales, dividendos)
 Module500Desc=Gestión de los gastos especiales como impuestos, gastos sociales, dividendos y salarios
 Module510Name=Salarios
 Module510Desc=Gestión de salarios y pagos
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notificaciones
 Module600Desc=Envío de notificaciones por e-mail en algunos eventos de negocio de Dolibarr a contactos de terceros (configurado en cada tercero)
 Module700Name=Donaciones
 Module700Desc=Gestión de donaciones
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Informe de gastos
+Module770Desc=Gestión de informes de gastos (transporte, dietas, etc.)
+Module1120Name=Presupuesto de proveedor
+Module1120Desc=Solicitud presupuesto y precios a proveedor
 Module1200Name=Mantis
 Module1200Desc=Interfaz con el sistema de seguimiento de incidencias Mantis
 Module1400Name=Contabilidad experta
 Module1400Desc=Gestión experta de la contabilidad (doble partida)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Categorías
-Module1780Desc=Gestión de categorías (productos, proveedores y clientes)
+Module1520Name=Generación Documento
+Module1520Desc=Generación de documentos de correo masivo
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permite la edición de ciertas zonas de texto mediante un editor avanzado
 Module2200Name=Precios dinámicos
 Module2200Desc=Activar el uso de expresiones matemáticas para precios
 Module2300Name=Programador
-Module2300Desc=Tareas programadas
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Gestión de la agenda y de las acciones
 Module2500Name=Gestión Electrónica de Documentos
@@ -642,7 +645,7 @@ Permission181=Consultar pedidos a proveedores
 Permission182=Crear/modificar pedidos a proveedores
 Permission183=Validar pedidos a proveedores
 Permission184=Aprobar pedidos a proveedores
-Permission185=Order or cancel supplier orders
+Permission185=Realizar o cancelar pedidos a proveedores
 Permission186=Recibir pedidos de proveedores
 Permission187=Cerrar pedidos a proveedores
 Permission188=Anular pedidos a proveedores
@@ -714,6 +717,11 @@ Permission510=Consultar salarios
 Permission512=Crear/modificar salarios
 Permission514=Eliminar salarios
 Permission517=Exportar salarios
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Consultar servicios
 Permission532=Crear/modificar servicios
 Permission534=Eliminar servicios
@@ -722,13 +730,13 @@ Permission538=Exportar servicios
 Permission701=Consultar donaciones
 Permission702=Crear/modificar donaciones
 Permission703=Eliminar donaciones
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=Leer informes de gastos (propios y de sus subordinados)
+Permission772=Crear/modificar informe de gastos
+Permission773=Eliminar informe de gastos
+Permission774=Leer todos los informes de gastos (incluidos los no subordinados)
+Permission775=Aprobar informe de gastos
+Permission776=Pagar informe de gastos
+Permission779=Exportar informe de gastos
 Permission1001=Consultar stocks
 Permission1002=Crear/modificar almacenes
 Permission1003=Eliminar almacenes
@@ -746,6 +754,7 @@ Permission1185=Aprobar pedidos a proveedores
 Permission1186=Enviar pedidos a proveedores
 Permission1187=Recibir pedidos de proveedores
 Permission1188=Cerrar pedidos a proveedores
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Obtener resultado de una exportación
 Permission1202=Crear/codificar exportaciones
 Permission1231=Consultar facturas de proveedores
@@ -758,10 +767,10 @@ Permission1237=Exportar pedidos de proveedores junto con sus detalles
 Permission1251=Lanzar las importaciones en masa a la base de datos (carga de datos)
 Permission1321=Exportar facturas a clientes, atributos y cobros
 Permission1421=Exportar pedidos de clientes y atributos
-Permission23001 = Ver tareas programadas
-Permission23002 = Crear/actualizar tareas programadas
-Permission23003 = Borrar tareas programadas
-Permission23004 = Ejecutar tareas programadas
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Leer acciones (eventos o tareas) vinculadas a su cuenta
 Permission2402=Crear/eliminar acciones (eventos o tareas) vinculadas a su cuenta
 Permission2403=Modificar acciones (eventos o tareas) vinculadas a su cuenta
@@ -1043,8 +1052,8 @@ MAIN_PROXY_PASS=Contraseña del servidor proxy
 DefineHereComplementaryAttributes=Defina aquí la lista de atributos adicionales, no disponibles por defecto, y que desea gestionar para %s.
 ExtraFields=Atributos adicionales
 ExtraFieldsLines=Atributos adicionales (líneas)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Atributos complementarios (líneas de pedido)
+ExtraFieldsSupplierInvoicesLines=Atributos complementarios (líneas de factura)
 ExtraFieldsThirdParties=Atributos adicionales (terceros)
 ExtraFieldsContacts=Atributos adicionales (contactos/direcciones)
 ExtraFieldsMember=Atributos adicionales (miembros)
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Devuelve un código contable compuesto de
    %s seguid
 ModuleCompanyCodePanicum=Devuelve un código contable vacío.
 ModuleCompanyCodeDigitaria=Devuelve un código contable compuesto siguiendo el código de tercero. El código está formado por carácter ' C ' en primera posición seguido de los 5 primeros caracteres del código tercero.
 UseNotifications=Usar notificaciones
-NotificationsDesc=La función de las notificaciones permite enviar automáticamente un e-mail para algunos eventos de Dolibarr. Los destinatarios de las notificaciones pueden definirse:
    * por contactos de terceros (clientes o proveedores), un tercero a la vez.
    * o configurando un destinatario global en la configuración del módulo.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Modelos de documentos
 DocumentModelOdt=Generación desde los documentos OpenDocument (Archivo .ODT OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Marca de agua en los documentos borrador
@@ -1173,12 +1182,12 @@ FreeLegalTextOnProposal=Texto libre en presupuestos
 WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+AskPriceSupplierSetup=Configuración del módulo Solicitudes a proveedor
+AskPriceSupplierNumberingModules=Modelos de numeración de solicitud de precios a proveedor
+AskPriceSupplierPDFModules=Modelos de documentos de solicitud de precios a proveedores
+FreeLegalTextOnAskPriceSupplier=Texto libre en solicitudes de precios a proveedores
+WatermarkOnDraftAskPriceSupplier=Marca de agua en solicitudes de precios a proveedor (en caso de estar vacío)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Preguntar por cuenta bancaria a usar en el presupuesto
 ##### Orders #####
 OrdersSetup=Configuración del módulo pedidos
 OrdersNumberingModules=Módulos de numeración de los pedidos
@@ -1410,7 +1419,7 @@ BarcodeDescUPC=Códigos de barras tipo UPC
 BarcodeDescISBN=Códigos de barras tipo ISBN
 BarcodeDescC39=Códigos de barras tipo C39
 BarcodeDescC128=Códigos de barras tipo C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
    For example: /usr/local/bin/genbarcode
+GenbarcodeLocation=Herramienta de generación de códigos de barras en consola (usad por el motor interno para determinados tipos de códigos de barras). Debe de ser compatible con "genbarcode".
    Por ejemplo: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Motor interno
 BarCodeNumberManager=Gestor para auto definir números de código de barras 
 ##### Prelevements #####
@@ -1528,10 +1537,10 @@ CashDeskThirdPartyForSell=Tercero genérico a usar para las ventas
 CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
 CashDeskBankAccountForCheque= Cuenta por defecto a utilizar para los cobros con cheques
 CashDeskBankAccountForCB= Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
+CashDeskDoNotDecreaseStock=Desactivar decremento de stock si una venta es realizada desde un Punto de Venta (si "no", el decremento de stock es realizado desde el TPV,  cualquiera que sea la opción indicada en el módulo Stock).
 CashDeskIdWareHouse=Forzar y restringir almacén a usar para decremento de stock
 StockDecreaseForPointOfSaleDisabled=Decremento de stock desde TPV desactivado
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=El decremento de stock en TPV no es compatible con la gestión de lotes
 CashDeskYouDidNotDisableStockDecease=Usted no ha desactivado el decremento de stock al hacer una venta desde TPV. Así que se requiere un almacén.
 ##### Bookmark #####
 BookmarkSetup=Configuración del módulo Marcadores
@@ -1557,6 +1566,7 @@ SuppliersSetup=Configuración del módulo Proveedores
 SuppliersCommandModel=Modelo de pedidos a proveedores completo (logo...)
 SuppliersInvoiceModel=Modelo de facturas de proveedores completo (logo...)
 SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de proveedor
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuración del módulo GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Ruta del archivo Maxmind que contiene las conversiones IP->País.
    Ejemplo: /usr/local/share/GeoIP/GeoIP.dat
@@ -1597,7 +1607,12 @@ SortOrder=Ordenación
 Format=Formatear 
 TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor
 IncludePath=Include path (definida en la variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+ExpenseReportsSetup=Configuración del módulo Informe de Gastos
+TemplatePDFExpenseReports=Modelos de documento para generar informes de gastos
+NoModueToManageStockDecrease=No hay activado módulo para gestionar automáticamente el decremento de stock. El decremento de stock se realizará solamente con entrada manual
+NoModueToManageStockIncrease=No hay activado módulo para gestionar automáticamente el incremento de stock. El incremento de stock se realizará solamente con entrada manual
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index 64836535194..fe2acb4ff8a 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Factura %s validada
 InvoiceValidatedInDolibarrFromPos=Factura %s validada desde TPV
 InvoiceBackToDraftInDolibarr=Factura %s devuelta a borrador
 InvoiceDeleteDolibarr=Factura %s eliminada
-OrderValidatedInDolibarr= Pedido %s validado
+OrderValidatedInDolibarr=Pedido %s validado
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Pedido %s anulado
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Pedido %s aprobado
 OrderRefusedInDolibarr=Pedido %s rechazado
 OrderBackToDraftInDolibarr=Pedido %s devuelto a borrador
@@ -91,3 +94,5 @@ WorkingTimeRange=Rango temporal
 WorkingDaysRange=Rango diario
 AddEvent=Crear evento
 MyAvailability=Mi disponibilidad
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 3117ecc1f15..7366655c7a7 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -33,11 +33,11 @@ AllTime=Mostrar saldo desde el inicio
 Reconciliation=Conciliación
 RIB=Cuenta bancaria
 IBAN=Identificador IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=IBAN Válido
+IbanNotValid=IBAN No Válido
 BIC=Identificador BIC/SWIFT
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=BIC/SWIFT Válido
+SwiftNotValid=BIC/SWIFT No Válido
 StandingOrders=Domiciliaciones
 StandingOrder=Domiciliación
 Withdrawals=Reintregros
@@ -152,7 +152,7 @@ BackToAccount=Volver a la cuenta
 ShowAllAccounts=Mostrar para todas las cuentas
 FutureTransaction=Transacción futura. No es posible conciliar.
 SelectChequeTransactionAndGenerate=Seleccione/filtre los cheques a incluir en la remesa y haga clic en "Crear".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+InputReceiptNumber=Indique el extracto bancario relacionado con la conciliación. Utilice un valor numérico ordenable: YYYYMM o YYYYMMDD
 EventualyAddCategory=Eventualmente, indique una categoría en la que clasificar los registros
 ToConciliate=¿A conciliar?
 ThenCheckLinesAndConciliate=A continuación, compruebe las líneas presentes en el extracto bancario y haga clic
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 782efdf26e2..c63fe576b56 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Pagos efectuados
 PaymentsBackAlreadyDone=Reembolsos ya efectuados
 PaymentRule=Forma de pago
 PaymentMode=Forma de pago
+PaymentTerm=Condición de pago
 PaymentConditions=Condiciones de pago
-PaymentConditionsShort=Condiciones pago
+PaymentConditionsShort=Condiciones de pago
 PaymentAmount=Importe pago
 ValidatePayment=Validar este pago
 PaymentHigherThanReminderToPay=Pago superior al resto a pagar
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=La suma del importe de los 2 nuevos descuen
 ConfirmRemoveDiscount=¿Está seguro de querer eliminar este descuento?
 RelatedBill=Factura asociada
 RelatedBills=Facturas asociadas
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Última factura relacionada
 WarningBillExist=Atención, ya existe al menos una factura
 
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index e4d86be11bd..1825a9c57c9 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categoría
-Categories=Categorías
-Rubrique=Categoría
-Rubriques=Categorías
-categories=categoría(s)
-TheCategorie=La categoría
-NoCategoryYet=Ninguna categoría de este tipo creada
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=En
 AddIn=Añadir en
 modify=Modificar
 Classify=Clasificar
-CategoriesArea=Área categorías
-ProductsCategoriesArea=Área categorías de productos y servicios
-SuppliersCategoriesArea=Área categorías de proveedores
-CustomersCategoriesArea=Área categorías de clientes
-ThirdPartyCategoriesArea=Área categorías de terceros
-MembersCategoriesArea=Área categorías de miembros
-ContactsCategoriesArea=Área categorías de contactos
-MainCats=Categorías principales
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategorías
 CatStatistics=Estadísticas
-CatList=Listado de categorías
-AllCats=Todas las categorías
-ViewCat=Ver la categoría
-NewCat=Nueva categoría
-NewCategory=Nueva categoría
-ModifCat=Modificar una categoría
-CatCreated=Categoría creada
-CreateCat=Añadir una categoría
-CreateThisCat=Añadir esta categoría
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validar los campos
 NoSubCat=Esta categoría no contiene ninguna subcategoría.
 SubCatOf=Subcategoría
-FoundCats=Categorías encontradas
-FoundCatsForName=Categorías encontradas con el nombre:
-FoundSubCatsIn=Subcategorías encontradas en la categoría
-ErrSameCatSelected=Ha seleccionado la misma categoría varias veces
-ErrForgotCat=Ha olvidado escoger la categoría
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Ha olvidado reasignar un campo
 ErrCatAlreadyExists=Este nombre esta siendo utilizado
-AddProductToCat=¿Añadir este producto a una categoría?
-ImpossibleAddCat=Imposible añadir la categoría
-ImpossibleAssociateCategory=Imposible asociar la categoría
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=La categoría se ha añadido con éxito.
-ObjectAlreadyLinkedToCategory=El elemento ya está enlazado a esta categoría
-CategorySuccessfullyCreated=La categoría %s se insertado correctamente.
-ProductIsInCategories=Este producto/servicio se encuentra en las siguientes categorías
-SupplierIsInCategories=Este proveedor se encuentra en las siguientes categorías
-CompanyIsInCustomersCategories=Esta empresa se encuentra en las siguientes categorías
-CompanyIsInSuppliersCategories=Esta empresa se encuentra en las siguientes categorías de proveedores
-MemberIsInCategories=Este miembro se encuentra en las siguientes categorías de miembros
-ContactIsInCategories=Este contacto se encuentra en las siguientes categorías de contactos
-ProductHasNoCategory=Este producto/servicio no se encuentra en ninguna categoría en particular
-SupplierHasNoCategory=Este proveedor no se encuentra en ninguna categoría en particular
-CompanyHasNoCategory=Esta empresa no se encuentra en ninguna categoría en particular
-MemberHasNoCategory=Este miembro no se encuentra en ninguna categoría en particular
-ContactHasNoCategory=Este contacto no se encuentra en ninguna categoría
-ClassifyInCategory=Clasificar en la categoría
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Ninguna
-NotCategorized=Sin categoría
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Esta categoría ya existe para esta referencia
 ReturnInProduct=Volver a la ficha producto/servicio
 ReturnInSupplier=Volver a la ficha proveedor
@@ -66,22 +64,22 @@ ReturnInCompany=Volver a la ficha cliente/cliente potencial
 ContentsVisibleByAll=El contenido será visible por todos
 ContentsVisibleByAllShort=Contenido visible por todos
 ContentsNotVisibleByAllShort=Contenido no visible por todos
-CategoriesTree=Árbol de categorías
-DeleteCategory=Eliminar categoría
-ConfirmDeleteCategory=¿Está seguro de querer eliminar esta categoría?
-RemoveFromCategory=Eliminar vínculo con categoría
-RemoveFromCategoryConfirm=¿Está seguro de querer eliminar el vínculo entre la transacción y la categoría?
-NoCategoriesDefined=Ninguna categoría definida
-SuppliersCategoryShort=Categoría proveedores
-CustomersCategoryShort=Categoría clientes
-ProductsCategoryShort=Categoría productos
-MembersCategoryShort=Categoría miembro
-SuppliersCategoriesShort=Categorías proveedores
-CustomersCategoriesShort=Categorías clientes
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Categorías clientes
-ProductsCategoriesShort=Categorías productos
-MembersCategoriesShort=Categorías miembros
-ContactCategoriesShort=Categorías contactos
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Esta categoría no contiene ningún producto.
 ThisCategoryHasNoSupplier=Esta categoría no contiene ningún proveedor.
 ThisCategoryHasNoCustomer=Esta categoría no contiene ningún cliente.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Esta categoría no contiene contactos
 AssignedToCustomer=Asignar a un cliente
 AssignedToTheCustomer=Asigado a un cliente
 InternalCategory=Categoría interna
-CategoryContents=Contenido de la categoría
-CategId=Id categoría
-CatSupList=Listado categorías de proveedores
-CatCusList=Listado categorías de clientes/potenciales
-CatProdList=Listado categorías de productos
-CatMemberList=Listado categorías de miembros
-CatContactList=Listado de categorías de contactos y contactos
-CatSupLinks=Proveedores
-CatCusLinks=Clientes/Clientes potenciales
-CatProdLinks=Productos
-CatMemberLinks=Miembros
-DeleteFromCat=Eliminar de la categoría
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Eliminar imagen
 ConfirmDeletePicture=¿Confirma la eliminación de la imagen?
 ExtraFieldsCategories=Atributos complementarios
-CategoriesSetup=Configuración de categorías
-CategorieRecursiv=Enlazar con la categoría padre automáticamente
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Si está activado, el producto se enlazará a la categoría padre si lo añadimos a una subcategoría
 AddProductServiceIntoCategory=Añadir el siguiente producto/servicio
-ShowCategory=Mostrar categoría
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/es_ES/commercial.lang b/htdocs/langs/es_ES/commercial.lang
index 51de60229c8..47607cdb605 100644
--- a/htdocs/langs/es_ES/commercial.lang
+++ b/htdocs/langs/es_ES/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Clientes potenciales contactados
 DateActionPlanned=Fecha planificación
 DateActionDone=Fecha realización
 ActionAskedBy=Acción preguntada por
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Evento asignado a
 ActionDoneBy=Acción realizada por
 ActionUserAsk=Registrada por
 ErrorStatusCantBeZeroIfStarted=Si el campo 'Fecha de realización' contiene datos la acción está en curso , por lo que el campo ' Estado ' no puede ser 0%.
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index 654a55badde..10438b1ef76 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -19,7 +19,7 @@ ServiceStatusLateShort=Expirado
 ServiceStatusClosed=Cerrado
 ServicesLegend=Leyenda para los servicios
 Contracts=Contratos
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Contratos y líneas de contratos
 Contract=Contrato
 NoContracts=Sin contratos
 MenuServices=Servicios
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index d436847a411..e7a2d5c9098 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Res. ult. ejec.
 CronLastResult=Últ. cód. res.
 CronListOfCronJobs=Lista de tareas programadas
 CronCommand=Comando
-CronList=Lista de tareas Cron
-CronDelete= Borrar tareas Cron
-CronConfirmDelete= ¿Está seguro de querer eliminar estas tareas?
-CronExecute=Ejecutar Tarea
-CronConfirmExecute= ¿Está seguro de querer ejecutar esta tarea ahora?
-CronInfo= Cron le permite ejecutar tareas que han sido programadas
-CronWaitingJobs=Trabajos en espera
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Tarea
-CronNone= Ninguna
+CronNone=Ninguna
 CronDtStart=Fecha inicio
 CronDtEnd=Fecha fin
 CronDtNextLaunch=Sig. ejec.
@@ -75,6 +75,7 @@ CronObjectHelp=El nombre del objeto a cargar. 
     Por ejemplo para realizar un
 CronMethodHelp=El métpdp a lanzar. 
     Por ejemplo para realizar un fetch del objeto Product /htdocs/product/class/product.class.php, el valor del método es fecth
 CronArgsHelp=Los argumentos del método. 
     Por ejemplo para realizar un fetch del objeto Product /htdocs/product/class/product.class.php, los valores pueden ser 0, ProductRef
 CronCommandHelp=El comando en línea del sistema a ejecutar.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Información
 # Common
@@ -84,4 +85,4 @@ CronType_command=Comando Shell
 CronMenu=Programador
 CronCannotLoadClass=No se puede cargar la clase %s u objeto %s
 UseMenuModuleToolsToAddCronJobs=Ir a "Inicio - Utilidades módulos - Lista de tareas Cron" para ver y editar tareas programadas.
-TaskDisabled=Task disabled
+TaskDisabled=Tarea deshabilitada
diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang
index dda4508af8a..ca7df9cc00a 100644
--- a/htdocs/langs/es_ES/donations.lang
+++ b/htdocs/langs/es_ES/donations.lang
@@ -6,6 +6,8 @@ Donor=Donante
 Donors=Donantes
 AddDonation=Crear una donación
 NewDonation=Nueva donación
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Mostrar donación
 DonationPromise=Promesa de donación
 PromisesNotValid=Promesas no validadas
@@ -21,6 +23,8 @@ DonationStatusPaid=Donación pagada
 DonationStatusPromiseNotValidatedShort=No validada
 DonationStatusPromiseValidatedShort=Validada
 DonationStatusPaidShort=Pagada
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validar promesa
 DonationReceipt=Recibo de donación
 BuildDonationReceipt=Crear recibo
@@ -36,3 +40,4 @@ FrenchOptions=Opciones para Francia
 DONATION_ART200=Mostrar artículo 200 del CGI si se está interesado
 DONATION_ART238=Mostrar artículo 238 del CGI si se está interesado
 DONATION_ART885=Mostrar artículo 885 del CGI si se está interesado
+DonationPayment=Donation payment
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index f8506d6e27b..25da88ffde1 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=La cuenta origen y destino deben ser diferentes.
 ErrorBadThirdPartyName=Nombre de tercero incorrecto
 ErrorProdIdIsMandatory=El %s es obligatorio
 ErrorBadCustomerCodeSyntax=La sintaxis del código cliente es incorrecta
-ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadBarCodeSyntax=Sintaxis errónea para el código de barras. Es posible que haya asignado un tipo de código de barras o definido una máscara de código de barras para numerar que no coincide con el valor escaneado
 ErrorCustomerCodeRequired=Código cliente obligatorio
 ErrorBarCodeRequired=Código de barras requerido
 ErrorCustomerCodeAlreadyUsed=Código de cliente ya utilizado
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript no debe estar desactivado para que esta
 ErrorPasswordsMustMatch=Las 2 contraseñas indicadas deben corresponderse
 ErrorContactEMail=Se ha producido un error técnico. Contacte con el administrador al e-mail %s, indicando el código de error %s en su mensaje, o puede también adjuntar una copia de pantalla de esta página.
 ErrorWrongValueForField=Valor incorrecto para el campo número %s (el valor '%s' no cumple con la regla %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
+ErrorFieldValueNotIn=Valor incorrecto para el campo número %s (el valor '%s' no es un valor en el campo %s de la tabla %s = %s)
 ErrorFieldRefNotIn=Valor incorrecto para el campo número %s (el valor '%s' no es una referencia existente en %s)
 ErrorsOnXLines=Errores en %s líneas fuente
 ErrorFileIsInfectedWithAVirus=¡El antivirus no ha podido validar este archivo (es probable que esté infectado por un virus)!
@@ -160,7 +160,13 @@ ErrorPriceExpressionInternal=Error interno '%s'
 ErrorPriceExpressionUnknown=Error desconocido '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Los almacenes de origen y destino deben de ser diferentes
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, intenta hacer un movimiento de stock sin indicar lote/serie, en un producto que requiere de lote/serie
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Todas las recepciones deben verificarse primero antes para poder reallizar esta acción
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 6c154537764..575d03acabc 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Listado de notificaciones enviadas
 MailSendSetupIs=La configuración de e-mailings está a '%s'. Este modo no puede ser usado para enviar e-mails masivos.
 MailSendSetupIs2=Antes debe, con una cuenta de administrador, en el menú %sInicio - Configuración - E-Mails%s, cambiar el parámetro '%s' para usar el modo '%s'. Con este modo puede configurar un servidor SMTP de su proveedor de servicios de internet.
 MailSendSetupIs3=Si tiene preguntas de como configurar su servidor SMTP, puede contactar con %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 300e17729fe..8298465c933 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -141,7 +141,7 @@ Cancel=Anular
 Modify=Modificar
 Edit=Editar
 Validate=Validar
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Validar y Aprobar
 ToValidate=A validar
 Save=Grabar
 SaveAs=Grabar como
@@ -159,7 +159,7 @@ Search=Buscar
 SearchOf=Búsqueda de
 Valid=Validar
 Approve=Aprobar
-Disapprove=Disapprove
+Disapprove=Desaprobar
 ReOpen=Reabrir
 Upload=Enviar archivo
 ToLink=Enlace
@@ -221,7 +221,7 @@ Cards=Fichas
 Card=Ficha
 Now=Ahora
 Date=Fecha
-DateAndHour=Date and hour
+DateAndHour=Fecha y hora
 DateStart=Fecha inicio
 DateEnd=Fecha fin
 DateCreation=Fecha de creación
@@ -298,7 +298,7 @@ UnitPriceHT=Precio base
 UnitPriceTTC=Precio unitario total
 PriceU=P.U.
 PriceUHT=P.U.
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=P.U. solicitado
 PriceUTTC=P.U. Total
 Amount=Importe
 AmountInvoice=Importe factura
@@ -352,6 +352,7 @@ Status=Estado
 Favorite=Favorito
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. proveedor
 RefPayment=Ref. pago
 CommercialProposalsShort=Presupuestos
@@ -394,8 +395,8 @@ Available=Disponible
 NotYetAvailable=Aún no disponible
 NotAvailable=No disponible
 Popularity=Popularidad
-Categories=Categorías
-Category=Categoría
+Categories=Tags/categories
+Category=Tag/category
 By=Por
 From=De
 to=a
@@ -525,7 +526,7 @@ DateFromTo=De %s a %s
 DateFrom=A partir de %s
 DateUntil=Hasta %s
 Check=Verificar
-Uncheck=Uncheck
+Uncheck=Deseleccionar
 Internal=Interno
 External=Externo
 Internals=Internos
@@ -693,7 +694,8 @@ PublicUrl=URL pública
 AddBox=Añadir caja
 SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Refrescar
 PrintFile=Imprimir Archivo %s
-ShowTransaction=Show transaction
+ShowTransaction=Ver transacción
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Lunes
 Tuesday=Martes
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 46e87bd4dc7..76b17328889 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -42,7 +42,7 @@ StatusOrderCanceled=Anulado
 StatusOrderDraft=Borrador (a validar)
 StatusOrderValidated=Validado
 StatusOrderOnProcess=Pedido - En espera de recibir
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcessWithValidation=Pedido - A la espera de recibir o validar
 StatusOrderProcessed=Procesado
 StatusOrderToBill=Emitido
 StatusOrderToBill2=A facturar
@@ -59,12 +59,13 @@ MenuOrdersToBill=Pedidos a facturar
 MenuOrdersToBill2=Pedidos facturables
 SearchOrder=Buscar un pedido
 SearchACustomerOrder=Buscar un pedido de cliente
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Buscar un pedido a proveedor
 ShipProduct=Enviar producto
 Discount=Descuento
 CreateOrder=Crear pedido
 RefuseOrder=Rechazar el pedido
-ApproveOrder=Aceptar el pedido
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validar el pedido
 UnvalidateOrder=Desvalidar el pedido
 DeleteOrder=Eliminar el pedido
@@ -102,6 +103,8 @@ ClassifyBilled=Clasificar facturado
 ComptaCard=Ficha contable
 DraftOrders=Pedidos borrador
 RelatedOrders=Pedidos adjuntos
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Pedidos en proceso
 RefOrder=Ref. pedido
 RefCustomerOrder=Ref. pedido cliente
@@ -118,6 +121,7 @@ PaymentOrderRef=Pago pedido %s
 CloneOrder=Clonar pedido
 ConfirmCloneOrder=¿Está seguro de querer clonar este pedido %s?
 DispatchSupplierOrder=Recepción del pedido a proveedor %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable seguimiento pedido cliente
 TypeContact_commande_internal_SHIPPING=Responsable envío pedido cliente
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 01d97afcc34..8a724494efc 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validación ficha intervención
 Notify_FICHINTER_SENTBYMAIL=Envío ficha de intervención por e-mail
 Notify_BILL_VALIDATE=Validación factura
 Notify_BILL_UNVALIDATE=Devalidación factura a cliente
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Aprobación pedido a proveedor
 Notify_ORDER_SUPPLIER_REFUSE=Rechazo pedido a proveedor
 Notify_ORDER_VALIDATE=Validación pedido cliente
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Envío presupuesto por e-mail
 Notify_BILL_PAYED=Cobro factura a cliente
 Notify_BILL_CANCEL=Cancelación factura a cliente
 Notify_BILL_SENTBYMAIL=Envío factura a cliente por e-mail
-Notify_ORDER_SUPPLIER_VALIDATE=Validación pedido a proveedor
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Envío pedido a proveedor por e-mail
 Notify_BILL_SUPPLIER_VALIDATE=Validación factura de proveedor
 Notify_BILL_SUPPLIER_PAYED=Pago factura de proveedor
@@ -47,20 +48,20 @@ Notify_PROJECT_CREATE=Creación de proyecto
 Notify_TASK_CREATE=Tarea creada
 Notify_TASK_MODIFY=Tarea modificada
 Notify_TASK_DELETE=Tarea eliminada
-SeeModuleSetup=Consulte la configuración del módulo
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Número archivos/documentos adjuntos
 TotalSizeOfAttachedFiles=Tamaño total de los archivos/documentos adjuntos
 MaxSize=Tamaño máximo
 AttachANewFile=Adjuntar nuevo archivo/documento
 LinkedObject=Objeto adjuntado
 Miscellaneous=Miscelánea
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Número de notificaciones (nº de destinatarios)
 PredefinedMailTest=Esto es un correo de prueba.\nLas 2 líneas están separadas por un retorno de carro a la línea.
 PredefinedMailTestHtml=Esto es un e-mail de prueba(la palabra prueba debe de estar en negrita).
    Las 2 líneas están separadas por un retorno de carro en la línea
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nQueremos recordarle que su factura __FACREF__ parece estar pendiente de pago. Le adjuntamos la factura en cuestión, como recordatorio.\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nLe adjuntamos el presupuesto __PROPREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nLe adjuntamos la solicitud de precios __ASKREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nLe adjuntamos el pedido __ORDERREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLe adjuntamos nuestro pedido __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Factura %s validada
 EMailTextProposalValidated=El presupuesto %s que le concierne ha sido validado.
 EMailTextOrderValidated=El pedido %s que le concierne ha sido validado.
 EMailTextOrderApproved=Pedido %s aprobado
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Pedido %s aprobado por %s
 EMailTextOrderRefused=Pedido %s rechazado
 EMailTextOrderRefusedBy=Pedido %s rechazado por %s
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index 8540dfd80c9..6fa46be9db5 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Número Lote/Serie
 l_eatby=Fecha de caducidad
 l_sellby=Fecha límite de venta
 DetailBatchNumber=Detalles del lote/serie
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+DetailBatchFormat=Lote/Serie: %s - Caducidad: %s - Límite venta: %s (Stock: %d)
 printBatch=Lote: %s
 printEatby=Caducidad: %s
 printSellby=Límite venta: %s
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index ab2875577b0..d375d856198 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=El precio mínimo recomendado es: %s
 PriceExpressionEditor=Editor de expresión de precios
 PriceExpressionSelected=Expresión de precios seleccionada
 PriceExpressionEditorHelp1="price = 2 + 2" o "2 + 2" para configurar un precio. Use ; para separar expresiones
-PriceExpressionEditorHelp2=Puede acceder a los atributos adicionales con variables como #options_clavedemiatributoadicional#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=En productos y servicios, y precios de proveedor están disponibles las siguientes variables
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Solamente en los precios de productos y servicios: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Modo precio
 PriceNumeric=Número
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+DefaultPrice=Precio por defecto
+ComposedProductIncDecStock=Incrementar/Decrementar stock al cambiar su padre
+ComposedProduct=Sub-producto
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index b5c4081e1ba..02b13e916e7 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -8,10 +8,10 @@ SharedProject=Proyecto compartido
 PrivateProject=Contactos del proyecto
 MyProjectsDesc=Esta vista muestra aquellos proyectos en los que usted es un contacto afectado (cualquier tipo).
 ProjectsPublicDesc=Esta vista muestra todos los proyectos a los que usted tiene derecho a visualizar.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Esta vista muestra todos los proyectos a los que tiene derecho a visualizar.
 ProjectsDesc=Esta vista muestra todos los proyectos (sus permisos de usuario le permiten tener una visión completa).
 MyTasksDesc=Esta vista se limita a los proyectos y tareas en los que usted es un contacto afectado en al menos una tarea (cualquier tipo).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Solamente son visibles los proyectos abiertos (los proyectos con estado borrador o cerrado no son visibles)
 TasksPublicDesc=Esta vista muestra todos los proyectos y tareas en los que usted tiene derecho a tener visibilidad.
 TasksDesc=Esta vista muestra todos los proyectos y tareas (sus permisos de usuario le permiten tener una visión completa).
 ProjectsArea=Área proyectos
@@ -31,8 +31,8 @@ NoProject=Ningún proyecto definido
 NbOpenTasks=Nº tareas abiertas
 NbOfProjects=Nº de proyectos
 TimeSpent=Tiempo dedicado
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Tiempo dedicado por usted
+TimeSpentByUser=Tiempo dedicado por usuario
 TimesSpent=Tiempos dedicados
 RefTask=Ref. tarea
 LabelTask=Etiqueta tarea
@@ -71,7 +71,8 @@ ListSupplierOrdersAssociatedProject=Listado de pedidos a proveedores asociados a
 ListSupplierInvoicesAssociatedProject=Listado de facturas de proveedor asociados al proyecto
 ListContractAssociatedProject=Listado de contratos asociados al proyecto
 ListFichinterAssociatedProject=Listado de intervenciones asociadas al proyecto
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListExpenseReportsAssociatedProject=Listado de informes de gastos asociados al proyecto
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista de eventos asociados al proyecto
 ActivityOnProjectThisWeek=Actividad en el proyecto esta semana
 ActivityOnProjectThisMonth=Actividad en el proyecto este mes
@@ -130,13 +131,15 @@ AddElement=Vincular a elmento
 UnlinkElement=Desvincular elemento
 # Documents models
 DocumentModelBaleine=Modelo de informe de proyecto completo (logo...)
-PlannedWorkload = Carga de trabajo prevista
-WorkloadOccupation= Porcentaje afectado
+PlannedWorkload=Carga de trabajo prevista
+PlannedWorkloadShort=Carga de trabajo
+WorkloadOccupation=Asignación carga de trabajo 
 ProjectReferers=Objetos vinculados
 SearchAProject=Buscar un proyecto
 ProjectMustBeValidatedFirst=El proyecto debe validarse primero
 ProjectDraft=Proyectos borrador
 FirstAddRessourceToAllocateTime=Asociar un recurso para asignar tiempo consumido
-InputPerTime=Input per time
-InputPerDay=Input per day
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+InputPerDay=Entrada por día
+InputPerWeek=Entrada por semana
+InputPerAction=Entrada por acción
+TimeAlreadyRecorded=Tiempo dedicado ya registrado para esta tarea/día y usuario %s
diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang
index 6995284079c..80cc3e0d91c 100644
--- a/htdocs/langs/es_ES/salaries.lang
+++ b/htdocs/langs/es_ES/salaries.lang
@@ -10,4 +10,4 @@ SalariesPayments=Pagos de salarios
 ShowSalaryPayment=Ver pago
 THM=Precio medio por hora
 TJM=Precio medio por día
-CurrentSalary=Current salary
+CurrentSalary=Salario actual
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index c119cd363d2..898041a1398 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. envío
 Sending=Envío
 Sendings=Envíos
+AllSendings=All Shipments
 Shipment=Envío
 Shipments=Envíos
 ShowSending=Mostrar envío
@@ -23,7 +24,7 @@ QtyOrdered=Cant. pedida
 QtyShipped=Cant. enviada
 QtyToShip=Cant. a enviar
 QtyReceived=Cant. recibida
-KeepToShip=Remain to ship
+KeepToShip=Resto a enviar
 OtherSendingsForSameOrder=Otros envíos de este pedido
 DateSending=Fecha de expedición
 DateSendingShort=Fecha de expedición
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index bb9f7423361..845239bba15 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -47,7 +47,7 @@ PMPValue=Valor (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crear automáticamente existencias/almacén propio del usuario en la creación del usuario
-IndependantSubProductStock=Product stock and subproduct stock are independant
+IndependantSubProductStock=Stock del producto y stock del subproducto son independientes
 QtyDispatched=Cantidad recibida
 QtyDispatchedShort=Cant. recibida
 QtyToDispatchShort=Cant. a enviar
@@ -111,7 +111,7 @@ WarehouseForStockDecrease=Para el decremento de stock se usará el almacén %
 WarehouseForStockIncrease=Para el incremento de stock se usará el almacén %s
 ForThisWarehouse=Para este almacén
 ReplenishmentStatusDesc=Esta es la lista de todos los productos con un stock menor que el stock deseado (o menor que el valor de alerta si el checkbox "sólo alertas" está marcado) y que sugiere crear pedidos de proveedor para rellenar la diferencia.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentOrdersDesc=Este es el listado de todos los pedidos a proveedor con productos predefinidos. Solo son visibles pedidos abiertos con productos que puedan afectar al stock.
 Replenishments=Reaprovisionamiento
 NbOfProductBeforePeriod=Cantidad del producto %s en stock antes del periodo seleccionado (< %s)
 NbOfProductAfterPeriod=Cantidad del producto %s en stock después del periodo seleccionado (> %s)
@@ -131,4 +131,4 @@ IsInPackage=Contenido en el paquete
 ShowWarehouse=Mostrar almacén
 MovementCorrectStock=Corrección de stock del producto %s
 MovementTransferStock=Transferencia de stock del producto %s a otro almacén
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Debe definirse aquí un almacén origen cuando el módulo de lotes está activado. Se utiliza para enumerar lotes/series disponibles del producto para realizar un movimiento. Si desea enviar productos de diferentes almacenes, simplemente haga el envío en varios pasos.
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index 7e0f2718572..85648f97f12 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -29,7 +29,7 @@ ExportDataset_fournisseur_2=Facturas proveedores y pagos
 ExportDataset_fournisseur_3=Pedidos de proveedores y líneas de pedido
 ApproveThisOrder=Aprobar este pedido
 ConfirmApproveThisOrder=¿Está seguro de querer aprobar el pedido a proveedor %s?
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Denegar este pedido
 ConfirmDenyingThisOrder=¿Está seguro de querer denegar el pedido a proveedor %s?
 ConfirmCancelThisOrder=¿Está seguro de querer cancelar el pedido a proveedor %s?
 AddCustomerOrder=Crear pedido de cliente
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Listado de pedidos a proveedor
 MenuOrdersSupplierToBill=Pedidos a proveedor a facturar
 NbDaysToDelivery=Tiempo de entrega en días
 DescNbDaysToDelivery=El plazo mayor se visualiza el el listado de pedidos de productos
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 0ab2363364b..057367cc7a2 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Eraldaja
 ExtrafieldCheckBox=Märkeruut
 ExtrafieldRadio=Raadionupp
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameetrite nimekiri peab olema kujul võti,väärtus

    Näiteks:
    1,väärtus1
    2,väärtus2
    3,väärtus3
    jne

    Nimekirja teisest nimekirjast sõltuvaks muutmiseks:
    1,väärtus1|ema_nimekirja_kood:ema_võti
    2,väärtus2|ema_nimekirja_kood:ema_võti
 ExtrafieldParamHelpcheckbox=Parameetrite nimekiri peab olema kujul võti,väärtus

    Näiteks:
    1,väärtus1
    2,väärtus2
    3,väärtus3
    ...
 ExtrafieldParamHelpradio=Parameetrite nimekiri peab olema kujul võti,väärtus

    Näiteks:
    1,väärtus1
    2,väärtus2
    3,väärtus3
    ...
@@ -494,6 +495,8 @@ Module500Name=Erikulud (maksud, sotsiaalmaks, dividendid)
 Module500Desc=Erikulude: nt maksude, sotsiaalmaksude, dividendide ja palkade haldamine
 Module510Name=Palgad
 Module510Desc=Töötajate palkade ja palkade maksmise haldamine
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Teated
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Annetused
@@ -508,14 +511,14 @@ Module1400Name=Raamatupidamine
 Module1400Desc=Raamatupidamise haldamine (topelt isikud)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategooriad
-Module1780Desc=Kategooriate haldamine (tooted, hankijad ja kliendid)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG toimeti
 Module2000Desc=Luba mõnede tekstialade toimetamist võimsama toimetiga
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cro
-Module2300Desc=Ajastatud tegevuste haldamine
+Module2300Desc=Scheduled job management
 Module2400Name=Päevakava
 Module2400Desc=Tegevuste/ülesannete ja päevakava haldamine
 Module2500Name=Dokumendihaldus
@@ -714,6 +717,11 @@ Permission510=Palkade vaatamine
 Permission512=Palkade loomine/muutmine
 Permission514=Palkade kustutamine
 Permission517=Palkade eksportimine
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Teenuste vaatamine
 Permission532=Teenuste loomine/muutmine
 Permission534=Teenuste kustutamine
@@ -746,6 +754,7 @@ Permission1185=Ostutellimuste heaks kiitmine
 Permission1186=Ostutellimuste tellimine
 Permission1187=Ostutellimuste kinnitamise kviitung
 Permission1188=Ostutellimuste kustutamine
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Eksportimise tulemuse kätte saamine
 Permission1202=Ekspordi loomine/muutmine
 Permission1231=Ostuarvete vaatamine
@@ -758,10 +767,10 @@ Permission1237=Ostutellimuste ja ostuinfo eksport
 Permission1251=Väliste andmete massiline import andmebaasi (andmete laadimine)
 Permission1321=Müügiarvete, atribuutide ja maksete eksport
 Permission1421=Müügitellimuste ja atribuutide eksport
-Permission23001 = Ajastatud tegevuste vaatamine
-Permission23002 = Ajastatud tegevuste loomine/muutmine
-Permission23003 = Ajastatud tegevuste kustutamine
-Permission23004 = Ajastatud tegevuste käivitamine
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Oma kontoga seotud juhtumite (tegevuste või ülesannete) vaatamine
 Permission2402=Oma kontoga seotud juhtumite (tegevuste või ülesannete) loomine/muutmine
 Permission2403=Oma kontoga seotud juhtumite (tegevuste või ülesannete) kustutamine
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Tagasta raamatupidamise kood kujul:
    %s millele jär
 ModuleCompanyCodePanicum=Tagasta tühi raamatupidamise kood.
 ModuleCompanyCodeDigitaria=Raamatupidamine kood sõltub kolmanda isiku koodist. Kood algab tähega "C", millele järgnevad kolmanda isiku koodi esimesed 5 tähte.
 UseNotifications=Kasuta teateid
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Dokumendimallid
 DocumentModelOdt=Loo dokumendid OpenDocument mallidest (.ODT või .ODS failid OpenOffices, KOffices, TextEditis jne)
 WatermarkOnDraft=Mustandi vesimärk
@@ -1557,6 +1566,7 @@ SuppliersSetup=Hankijate mooduli seadistamine
 SuppliersCommandModel=Täielik ostutellimuse mall (logo jne)
 SuppliersInvoiceModel=Täielik ostuarve mall (logo jne)
 SuppliersInvoiceNumberingModel=Ostuarvete numeratsiooni mudel
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind mooduli seadistamine
 PathToGeoIPMaxmindCountryDataFile=Maxmind IP->maa tõlkimise faili rada.
    Näited:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
index 2a229dded16..1d95135c3c3 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Arve %s on kinnitatud
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Arve %s on tagasi mustandi staatuses
 InvoiceDeleteDolibarr=Arve %s on kustutatud
-OrderValidatedInDolibarr= Tellimus %s on kinnitatud
+OrderValidatedInDolibarr=Tellimus %s on kinnitatud
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Tellimus %s on tühistatud
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Tellimus %s on heaks kiidetud
 OrderRefusedInDolibarr=Tellimus %s on tagasi lükatud
 OrderBackToDraftInDolibarr=Tellimus %s on muudetud mustandiks
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 7fbee469a0a..bc5ccc57a44 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Juba tehtud maksed
 PaymentsBackAlreadyDone=Juba tehtud tagasimaksed
 PaymentRule=Maksereegel
 PaymentMode=Makse liik
-PaymentConditions=Maksetähtaeg
-PaymentConditionsShort=Maksetähtaeg
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Makse summa
 ValidatePayment=Kinnita makse
 PaymentHigherThanReminderToPay=Makse on suurem, kui makstava summa jääk
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Kahe uue allahindluse summa peab olema võr
 ConfirmRemoveDiscount=Kas oled täiesti kindel, et soovid selle allahindluse eemaldada?
 RelatedBill=Seotud arve
 RelatedBills=Seotud arved
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index 328c06c3a03..441c62cb002 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategooria
-Categories=Kategooriad
-Rubrique=Kategooria
-Rubriques=Kategooriad
-categories=kategooriad
-TheCategorie=Kategooria
-NoCategoryYet=Sellist tüüpi kategooriaid pole veel loodud
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Kategoorias
 AddIn=Lisa kategooriasse
 modify=muuda
 Classify=Liigita
-CategoriesArea=Kategooriate ala
-ProductsCategoriesArea=Toote-/teenuse kategooriate ala
-SuppliersCategoriesArea=Hankijakategooriate ala
-CustomersCategoriesArea=Kliendikategooriate ala
-ThirdPartyCategoriesArea=Kolmandate isikute kategooriate ala
-MembersCategoriesArea=Liikmekategooriate ala
-ContactsCategoriesArea=Kontaktikategooriate ala
-MainCats=Juurkategooriad
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Alamkategooriad
 CatStatistics=Statistika
-CatList=Kategooriate nimekiri
-AllCats=Kõik kategooriad
-ViewCat=Vaata kategooriat
-NewCat=Lisa kategooria
-NewCategory=Uus kategooria
-ModifCat=Muuda kategooriat
-CatCreated=Kategooria loodud
-CreateCat=Loo kategooria
-CreateThisCat=Loo selles kategoorias
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Valideeri väljad
 NoSubCat=Alamkategooriaid ei ole.
 SubCatOf=Alamkategooria
-FoundCats=Leitud kategooriad
-FoundCatsForName=Leiti kategooriad, mis on seotud nimega:
-FoundSubCatsIn=Kategoorias leidus alamkategooriaid
-ErrSameCatSelected=Valisid sama kategooria mitu korda
-ErrForgotCat=Unustasid kategooria valida
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Unustasid väljad täita
 ErrCatAlreadyExists=See nimi on juba kasutuses
-AddProductToCat=Lisa see toode mõnesse kategooriasse?
-ImpossibleAddCat=Ei suutnud kategooriat lisada
-ImpossibleAssociateCategory=Ei suutnud kategooriat seostada elemendiga
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s edukalt lisatud.
-ObjectAlreadyLinkedToCategory=Element on juba selle kategooriaga seostatud.
-CategorySuccessfullyCreated=Kategooria %s lisati edukalt.
-ProductIsInCategories=Toode/teenus kuulub järgmistesse kategooriatesse
-SupplierIsInCategories=Kolmas isik kuulub järgnevatesse hankijakategooriatesse
-CompanyIsInCustomersCategories=Antud kolmas isik kuulub järgnevatesse kliendi-/huviliste kategooriatesse
-CompanyIsInSuppliersCategories=Antud kolmas isik kuulub järgnevatesse hankijakategooriatesse
-MemberIsInCategories=Antud liige kuulub järgnevatesse liikmekategooriatesse
-ContactIsInCategories=Antud kontakt kuulub järgnevatesse kontaktikategooriatesse
-ProductHasNoCategory=Antud toode/teenus pole üheski kategoorias
-SupplierHasNoCategory=Antud hankija ei ole üheski kategoorias
-CompanyHasNoCategory=Antud ettevõte ei ole üheski kategoorias
-MemberHasNoCategory=Antud liige ei ole üheski kategoorias
-ContactHasNoCategory=Antud kontakt ei kuulu ühtegi kategooriasse
-ClassifyInCategory=Liigita kategooriasse
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Puudub
-NotCategorized=Kategooriata
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Sellise viitega kategooria on juba olemas
 ReturnInProduct=Tagasi toote/teenuse kaardile
 ReturnInSupplier=Tagasi hankija kaardile
@@ -66,22 +64,22 @@ ReturnInCompany=Tagasi kliendi/huvilise kaardile
 ContentsVisibleByAll=Antud sisu on kõigile nähtav
 ContentsVisibleByAllShort=Sisu on kõigile nähtav
 ContentsNotVisibleByAllShort=Sisu ei ole kõigile nähtav
-CategoriesTree=Kategooriate puu
-DeleteCategory=Kustuta kategooria
-ConfirmDeleteCategory=Kas oled kindel, et soovid antud kategooria kustutada?
-RemoveFromCategory=Eemalda seos kategooriaga
-RemoveFromCategoryConfirm=Kas oled kindel, et soovid eemaldada seose tehingu ja kategooria vahel?
-NoCategoriesDefined=Kategooriaid pole määratletud
-SuppliersCategoryShort=Hankijakategooria
-CustomersCategoryShort=Kliendikategooria
-ProductsCategoryShort=Tootekategooria
-MembersCategoryShort=Liikmekategooria
-SuppliersCategoriesShort=Hankijakategooriad
-CustomersCategoriesShort=Kliendikategooriad
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Kliendi-/Huvil kategooriad
-ProductsCategoriesShort=Tootekategooriad
-MembersCategoriesShort=Liikmekategooriad
-ContactCategoriesShort=Kontaktikategooriad
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Antud kategooria ei sisalda ühtki toodet.
 ThisCategoryHasNoSupplier=Antud kategooria ei sisalda ühtki hankijat.
 ThisCategoryHasNoCustomer=Antud kategooria ei sisalda ühtki klienti
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Antud kategooria ei sisalda ühtki kontakti
 AssignedToCustomer=Määratud kliendile
 AssignedToTheCustomer=Määratud kliendile nimega
 InternalCategory=Sisemine kategooria
-CategoryContents=Kategooria sisu
-CategId=Kategooria ID
-CatSupList=Hankijakategooriate nimekiri
-CatCusList=Kliendi-/huviliste kategooriate nimekiri
-CatProdList=Tootekategooriate nimekiri
-CatMemberList=Liikmekategooriate nimekiri
-CatContactList=Kontaktikategooriate ja kontaktide nimekiri
-CatSupLinks=Hankijate ja kategooriate vahelised seosed
-CatCusLinks=Klientide/huviliste ja kategooriate vahelised sosed
-CatProdLinks=Toodete/teenuste ja kategooriate vahelised seosed
-CatMemberLinks=Liikmete ja kategooriate vahelised seosed
-DeleteFromCat=Eemalda kategooriast
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Pildi kustutamine
 ConfirmDeletePicture=Kinnitada pildi kustutamine?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Kategooriate seadistamine
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index a8b2473acb2..477e601a0d6 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Viimase käivituse väljund
 CronLastResult=Viimane vastuse kood
 CronListOfCronJobs=Käivitatavate tööde nimekiri
 CronCommand=Käsk
-CronList=Programmide nimekiri
-CronDelete= Kustuta programme
-CronConfirmDelete= Kas oled kindel, et soovid selle käivituse kustutada?
-CronExecute=Käivita tegevus
-CronConfirmExecute= Kas oled kindel, et soovid seda programmi praegu käivitada
-CronInfo= Programmid, mis lubavad käivitada planeeritud tegevusi
-CronWaitingJobs=Ootel programmid
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Tegevus
-CronNone= Mitte ükski
+CronNone=Mitte ükski
 CronDtStart=Alguskuupäev
 CronDtEnd=Lõppkuupäev
 CronDtNextLaunch=Järgmine käivitus
@@ -75,6 +75,7 @@ CronObjectHelp=Laetava objekti nimi. 
     Näiteks Dolibarri Product objekti /ht
 CronMethodHelp=Kasutatava objekti korral käivitatav meetod. 
     Näiteks Dolibarr Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel on meetodi väärtuseks fetch
 CronArgsHelp=Meetodile antavad argumendid. 
     Näiteks Dolibarri Product objekti /htdocs/product/class/product.class.php meetodi fetch kasutamisel võivad parameetrite väärtusteks olla 0, ProductRef.
 CronCommandHelp=Käivitatav süsteemi käsk.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informatsioon
 # Common
diff --git a/htdocs/langs/et_EE/donations.lang b/htdocs/langs/et_EE/donations.lang
index ed140f372d8..40a9bf9f770 100644
--- a/htdocs/langs/et_EE/donations.lang
+++ b/htdocs/langs/et_EE/donations.lang
@@ -6,6 +6,8 @@ Donor=Annetaja
 Donors=Annetajad
 AddDonation=Create a donation
 NewDonation=Uus annetus
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Kuva annetus
 DonationPromise=Annetuse lubadus
 PromisesNotValid=Kinnitamata annetused
@@ -21,6 +23,8 @@ DonationStatusPaid=Annetus vastu võetud
 DonationStatusPromiseNotValidatedShort=Mustand
 DonationStatusPromiseValidatedShort=KInnitatud
 DonationStatusPaidShort=Vastu võetud
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Kinnita lubadus
 DonationReceipt=Annetuse kviitung
 BuildDonationReceipt=Loo kviitung
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 92f2ead7679..7e9d9f3cba8 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Kohustuslikud seadistusparameetrid on määratlemata
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index ec69991524d..2098f500988 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Loetle kõik saadetud e-posti teated
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 98632e2e74e..e767a115d75 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -352,6 +352,7 @@ Status=Staatus
 Favorite=Favorite
 ShortInfo=Inform
 Ref=Viide
+ExternalRef=Ref. extern
 RefSupplier=Hankija viide
 RefPayment=Makse viide
 CommercialProposalsShort=Pakkumised
@@ -394,8 +395,8 @@ Available=Saadaval
 NotYetAvailable=Pole veel saadaval
 NotAvailable=Pole saadaval
 Popularity=Populaarsus
-Categories=Kategooriad
-Category=Kategooria
+Categories=Tags/categories
+Category=Tag/category
 By=Isik
 From=Kellelt
 to=kellele
@@ -694,6 +695,7 @@ AddBox=Lisa kast
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Esmaspäev
 Tuesday=Teisipäev
diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
index 7c4e9a9b1d8..74e61e45396 100644
--- a/htdocs/langs/et_EE/orders.lang
+++ b/htdocs/langs/et_EE/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Saada toode
 Discount=Allahindlus
 CreateOrder=Loo tellimus
 RefuseOrder=Keeldu tellimusest
-ApproveOrder=Kiida tellimus heaks
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Kinnita tellimus
 UnvalidateOrder=Ava tellimus
 DeleteOrder=Kustuta tellimus
@@ -102,6 +103,8 @@ ClassifyBilled=Liigita arve esitatud
 ComptaCard=Raamatupidamise kaart
 DraftOrders=Tellimuste mustandid
 RelatedOrders=Seotud tellimused
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Töötlemisel tellimused
 RefOrder=Tellimuse viide
 RefCustomerOrder=Müügitellimuse viide
@@ -118,6 +121,7 @@ PaymentOrderRef=Tellimuse %s makse
 CloneOrder=Klooni tellimus
 ConfirmCloneOrder=Kas oled täiesti kindel, et soovid kloonida tellimuse %s ?
 DispatchSupplierOrder=Ostutellimuse %s vastu võtmine
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Müügitellimuse järelkajaga tegelev müügiesindaja
 TypeContact_commande_internal_SHIPPING=Saatmise järelkajaga tegelev müügiesindaja
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 1670ba75c7a..dc8d17da656 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Sekkumine kinnitatud
 Notify_FICHINTER_SENTBYMAIL=Sekkumine saadetud postiga
 Notify_BILL_VALIDATE=Müügiarve kinnitatud
 Notify_BILL_UNVALIDATE=Müügiarve avatud
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Ostutellimus heaks kiidetud
 Notify_ORDER_SUPPLIER_REFUSE=Ostutellimus tagasi lükatud
 Notify_ORDER_VALIDATE=Müügitellimus kinnitatud
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Müügipakkumine saadetud postiga
 Notify_BILL_PAYED=Müügiarve tasutud
 Notify_BILL_CANCEL=Müügiarve tühistatud
 Notify_BILL_SENTBYMAIL=Müügiarve saadetud postiga
-Notify_ORDER_SUPPLIER_VALIDATE=Ostutellimus kinnitatud
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Ostutellimus saadetud postiga
 Notify_BILL_SUPPLIER_VALIDATE=Ostuarve kinnitatud
 Notify_BILL_SUPPLIER_PAYED=Ostuarve makstud
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Manusena lisatud faile/dokumente
 TotalSizeOfAttachedFiles=Manusena lisatud failide/dokumentide kogusuurus
 MaxSize=Maksimaalne suurus
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Arve %s on kinnitatud.
 EMailTextProposalValidated=Pakkumine %s on kinnitatud.
 EMailTextOrderValidated=Tellimus %s on kinnitatud.
 EMailTextOrderApproved=Tellimus %s on heaks kiidetud.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Tellimuse %s kiitis %s heaks
 EMailTextOrderRefused=Tellimus %s on tagasi lükatud.
 EMailTextOrderRefusedBy=Tellimuse %s lükkas %s tagasi
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 2d64e8c5345..49b37b138c2 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index af73d9b93c7..38a2c9c6d37 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Antud projektiga seotud ostuarvete nimekir
 ListContractAssociatedProject=Antud projektiga seotud lepingute nimekiri
 ListFichinterAssociatedProject=Antud projektiga seotud sekkumiste nimekiri
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Antud projektiga seotud tegevuste nimekiri
 ActivityOnProjectThisWeek=Projekti aktiivsus sellel nädalal
 ActivityOnProjectThisMonth=Projekti aktiivsus sellel kuul
@@ -130,13 +131,15 @@ AddElement=Seosta elemendiga
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Täielik projekti aruande mudel (logo jne)
-PlannedWorkload = Planeeritav koormus
-WorkloadOccupation= Koormus mõjutab
+PlannedWorkload=Planeeritav koormus
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Viitavad objektid
 SearchAProject=Otsi projekti
 ProjectMustBeValidatedFirst=Esmalt peab projekti kinnitama
 ProjectDraft=Projektide mustandid
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
index e343a62f82d..9daa227665a 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Saadetise viide
 Sending=Saadetis
 Sendings=Saadetised
+AllSendings=All Shipments
 Shipment=Saadetis
 Shipments=Saadetised
 ShowSending=Show Sending
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index be8bd178d54..bba811e26e9 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 283b7d567cf..1955826bb03 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Bereizlea
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio botoia
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Jakinarazpenak
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Diru-emateak
@@ -508,14 +511,14 @@ Module1400Name=Kontabilitatea
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategoriak
-Module1780Desc=Kategoriak kudeatzea (produktuak, hornitzaileak eta bezeroak)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editorea
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Gertaera/Atazak eta agenda kudeatzea
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
index fb870bcd019..a0a43605c44 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 5ded974ea16..b0f031dd02a 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Jada egindako ordainketak
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Ordainketa mota
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Ordainketaren zenbatekoa
 ValidatePayment=Ordainketak balioztatu
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index c55f6c923ce..c9f25039854 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informazioa
 # Common
diff --git a/htdocs/langs/eu_ES/donations.lang b/htdocs/langs/eu_ES/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/eu_ES/donations.lang
+++ b/htdocs/langs/eu_ES/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index 697b6e3bc97..1c18ac46f16 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 5913029999d..64a77ffde27 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/eu_ES/orders.lang
+++ b/htdocs/langs/eu_ES/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/eu_ES/sendings.lang
+++ b/htdocs/langs/eu_ES/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/eu_ES/suppliers.lang
+++ b/htdocs/langs/eu_ES/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index c9304d083b0..76814c7ae0b 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -10,7 +10,7 @@ VersionUnknown=ناشناخته
 VersionRecommanded=توصیه شده
 FileCheck=Files Integrity
 FilesMissing=Missing Files
-FilesUpdated=Updated Files
+FilesUpdated=بروزرسانی فایلها
 FileCheckDolibarr=Check Dolibarr Files Integrity
 XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=جلسه ID
@@ -142,7 +142,7 @@ Box=جعبه
 Boxes=جعبه
 MaxNbOfLinesForBoxes=حداکثر تعداد خطوط برای جعبه
 PositionByDefault=به طور پیش فرض منظور
-Position=Position
+Position=موقعیت
 MenusDesc=مدیران منوها محتوا از 2 میله منو (نوار افقی و نوار عمودی) را تعریف کنیم.
 MenusEditorDesc=ویرایشگر منو به شما اجازه تعریف نوشته های شخصی در منوها. استفاده از آن را به دقت برای جلوگیری از ساخت dolibarr نوشته های ناپایدار و منو برای همیشه غیر قابل دسترس. 
     برخی از ماژول اضافه کردن ورودی در منو (در منو همه در اغلب موارد). اگر برخی از این نوشته های به اشتباه حذف خواهند، شما می توانید آنها را غیر فعال و reenabling ماژول بازگرداند.
 MenuForUsers=منو برای کاربران
@@ -299,7 +299,7 @@ DoNotUseInProduction=آیا در استفاده از تولید نیست
 ThisIsProcessToFollow=این راه اندازی به فرآیند است:
 StepNb=مرحله٪ s را
 FindPackageFromWebSite=پیدا کردن یک بسته است که ویژگی فراهم می کند شما می خواهید (به عنوان مثال در وب سایت رسمی٪ بازدید کنندگان).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=دانلود بسته %s.
 UnpackPackageInDolibarrRoot=باز کردن فایل بسته به پوشه ریشه Dolibarr هست٪ s
 SetupIsReadyForUse=نصب به پایان رسید و Dolibarr آماده استفاده است با این بخش جدید است.
 NotExistsDirect=ریشه جایگزین تعریف نشده است. 
    
@@ -309,7 +309,7 @@ YouCanSubmitFile=ماژول را انتخاب کنید:
 CurrentVersion=نسخه فعلی Dolibarr
 CallUpdatePage=برو به صفحه ای که به روز رسانی ساختار بانک اطلاعاتی و دادهها:٪ است.
 LastStableVersion=آخرین نسخه پایدار
-UpdateServerOffline=Update server offline
+UpdateServerOffline=بروزرسانی آفلاین سرور
 GenericMaskCodes=شما می توانید ماسک شماره را وارد کنید. در این ماسک، تگ های زیر می تواند مورد استفاده قرار گیرد: 
     {000000} مربوط به تعداد خواهد شد که در هر یک از٪ s را افزایش مییابد. به عنوان بسیاری از صفر را وارد کنید به عنوان طول مورد نظر از ضد. شمارنده خواهد شد صفر از سمت چپ به منظور به صفر کرده اند و بسیاری از ماسک به پایان رسید. 
     {000.000 +000} همان قبلی است اما جبران مربوطه را به شماره در سمت راست علامت + شروع به کار رفته در اولین٪ است. 
     {000000 @ X} همان قبلی است اما شمارنده به صفر زمانی که ماه X برسد (x بین 1 و 12، و یا 0 به استفاده از ماه های اولیه سال مالی تعیین شده در تنظیمات خود را، و یا 99 به صفر هر ماه ). اگر این گزینه استفاده می شود و x است 2 یا بالاتر، و سپس دنباله {YY} {میلی متر} یا {تاریخ برای ورود yyyy} {میلی متر} نیز مورد نیاز است. 
     {تولد} روز (01 تا 31). 
     {میلی متر} ماه (01 تا 12). 
     {YY}، {تاریخ برای ورود yyyy} یا {Y} سال بیش از 2، 4 و یا 1 عدد. 
    
 GenericMaskCodes2={CCCC} کد مشتری در تعداد کاراکتر 
     {cccc000} کد مشتری در تعداد کاراکتر توسط شمارنده اختصاص داده شده برای مشتری است. این مبارزه اختصاص داده شده به مشتری است که در همان زمان از مبارزه جهانی بازنشانی کنید. 
     {TTTT} کد از نوع thirdparty در تعداد شخصیت (نگاه کنید به انواع فرهنگ لغت-thirdparty). 
    
 GenericMaskCodes3=تمام شخصیت های دیگر در ماسک دست نخورده باقی خواهد ماند. 
     فضاهای امکان پذیر نیست. 
    
@@ -389,6 +389,7 @@ ExtrafieldSeparator=تفکیک کننده
 ExtrafieldCheckBox=جعبه
 ExtrafieldRadio=دکمه های رادیویی
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=فهرست پارامترها را به مانند کلید، ارزش است 

     به عنوان مثال: 
     1، VALUE1 
     2، VALUE2 
     3، value3 
     ... 

     به منظور داشتن لیست بسته به نوع دیگر: 
     1، VALUE1 | parent_list_code: parent_key 
     2، VALUE2 | parent_list_code: parent_key
 ExtrafieldParamHelpcheckbox=فهرست پارامترها را به مانند کلید، ارزش است 

     به عنوان مثال: 
     1، VALUE1 
     2، VALUE2 
     3، value3 
     ...
 ExtrafieldParamHelpradio=فهرست پارامترها را به مانند کلید، ارزش است 

     به عنوان مثال: 
     1، VALUE1 
     2، VALUE2 
     3، value3 
     ...
@@ -494,6 +495,8 @@ Module500Name=هزینه های ویژه (مالیاتی، کمک های اجت
 Module500Desc=مدیریت هزینه های خاص مانند مالیات، مشارکت اجتماعی، سود سهام و حقوق
 Module510Name=حقوق
 Module510Desc=مدیریت کارکنان حقوق و پرداخت
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=اطلاعیه ها
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=کمک های مالی
@@ -506,23 +509,23 @@ Module1200Name=اخوندک
 Module1200Desc=ادغام آخوندک
 Module1400Name=حسابداری
 Module1400Desc=مدیریت حسابداری (احزاب دو)
-Module1520Name=Document Generation
+Module1520Name=ساخت سند
 Module1520Desc=Mass mail document generation
-Module1780Name=دسته بندی ها
-Module1780Desc=مدیریت گروه (محصولات، تامین کنندگان و مشتریان)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=ویرایشگر WYSIWYG
 Module2000Desc=اجازه می دهد به ویرایش برخی از متن با استفاده از ویرایشگر پیشرفته
-Module2200Name=Dynamic Prices
+Module2200Name=قیمت های پویا.
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=cron را
-Module2300Desc=وظیفه مدیریت برنامه ریزی
+Module2300Desc=Scheduled job management
 Module2400Name=دستور کار
 Module2400Desc=رویدادهای / وظایف و مدیریت برنامه
 Module2500Name=الکترونیکی مدیریت محتوا
 Module2500Desc=ذخیره و به اشتراک اسناد
 Module2600Name=سرویس دهنده وب
 Module2600Desc=فعال کردن Dolibarr خدمات وب سرور
-Module2650Name=WebServices (client)
+Module2650Name=وب سروسی ها ( کلاینت)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar در
 Module2700Desc=استفاده از سرویس آنلاین Gravatar در (www.gravatar.com) برای نشان دادن عکس از کاربران / کاربران (که با ایمیل های خود را). نیاز به دسترسی به اینترنت
@@ -714,6 +717,11 @@ Permission510=خوانده شده حقوق
 Permission512=ایجاد / اصلاح حقوق
 Permission514=حذف حقوق
 Permission517=حقوق صادرات
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=خوانده شده خدمات
 Permission532=ایجاد / اصلاح خدمات
 Permission534=حذف خدمات
@@ -746,6 +754,7 @@ Permission1185=تصویب سفارشات کالا
 Permission1186=سفارشات تامین کننده نظم
 Permission1187=اذعان دریافت سفارشات کالا
 Permission1188=حذف سفارشات کالا
+Permission1190=Approve (second approval) supplier orders
 Permission1201=دریافت نتیجه شده از صادرات
 Permission1202=ایجاد / اصلاح صادرات
 Permission1231=خوانده شده فاکتورها منبع
@@ -758,10 +767,10 @@ Permission1237=سفارشات عرضه کننده کالا صادرات و مش
 Permission1251=اجرای واردات انبوه از داده های خارجی به پایگاه داده (بار داده ها)
 Permission1321=فاکتورها صادرات به مشتریان، ویژگی ها و پرداخت ها
 Permission1421=سفارشات صادرات مشتری و ویژگی های
-Permission23001 = به نشانه خوانده شدن برنامه ریزی شده کار
-Permission23002 = ایجاد / بروز رسانی برنامه ریزی شده کار
-Permission23003 = حذف کار برنامه ریزی شده
-Permission23004 = اجرای کار برنامه ریزی شده
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=دفعات بازدید: اقدامات (رویدادها و وظایف) مرتبط با حساب کاربری خود
 Permission2402=ایجاد / اصلاح اعمال (رویدادها و وظایف) به حساب او در ارتباط است
 Permission2403=حذف اقدامات (رویدادها و وظایف) مرتبط با حساب کاربری خود
@@ -808,7 +817,7 @@ DictionaryOrderMethods=مرتب سازی بر روش
 DictionarySource=منبع از پیشنهادات / سفارشات
 DictionaryAccountancyplan=نمودار حساب
 DictionaryAccountancysystem=مدل برای نمودار حساب
-DictionaryEMailTemplates=Emails templates
+DictionaryEMailTemplates=الگوهای ایمیل
 SetupSaved=راه اندازی نجات داد
 BackToModuleList=بازگشت به لیست ماژول ها
 BackToDictionaryList=برگشت به فهرست واژه نامه ها
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=بازگشت یک کد حسابداری ساخته ش
 ModuleCompanyCodePanicum=بازگشت یک کد حسابداری خالی است.
 ModuleCompanyCodeDigitaria=کد حسابداری بستگی به کد های شخص ثالث. کد از شخصیت "C" در مقام اول و پس از آن 5 حرف اول کد های شخص ثالث تشکیل شده است.
 UseNotifications=استفاده از اطلاعیه
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=اسناد قالب
 DocumentModelOdt=تولید اسناد از OpenDocuments قالب (. ODT و یا فایل های ODS برای آفیس اپن سورس کنند، KOffice، TextEdit، ...)
 WatermarkOnDraft=تعیین میزان مد آب در پیش نویس سند
@@ -1557,6 +1566,7 @@ SuppliersSetup=تامین کننده راه اندازی ماژول
 SuppliersCommandModel=قالب کامل جهت عرضه کننده کالا (logo. ..)
 SuppliersInvoiceModel=قالب کامل منبع فاکتور (logo. ..)
 SuppliersInvoiceNumberingModel=فاکتورها تامین کننده شماره مدل
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=راه اندازی ماژول GeoIP با Maxmind
 PathToGeoIPMaxmindCountryDataFile=مسیر فایل حاوی Maxmind آی پی به ترجمه کشور است. 
     مثال: 
     / usr / محلی / سهم / GeoIP با / GeoIP.dat 
     / usr / اشتراک / GeoIP با / GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
index 6e11caf7b70..a264cc8804c 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=فاکتور٪ بازدید کنندگان اعتبا
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=فاکتور٪ s را به بازگشت به پیش نویس وضعیت
 InvoiceDeleteDolibarr=فاکتور٪ s را حذف
-OrderValidatedInDolibarr= منظور از٪ s معتبر
+OrderValidatedInDolibarr=منظور از٪ s معتبر
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=منظور از٪ s را لغو
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=منظور از٪ s را تایید
 OrderRefusedInDolibarr=منظور از٪ s را رد کرد
 OrderBackToDraftInDolibarr=منظور از٪ s به بازگشت به پیش نویس وضعیت
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 90a5b2b6aeb..a3f3768a280 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=پرداخت از قبل انجام می شود
 PaymentsBackAlreadyDone=پرداخت به عقب در حال حاضر انجام می شود
 PaymentRule=قانون پرداخت
 PaymentMode=نحوه پرداخت
-PaymentConditions=مدت پرداخت
-PaymentConditionsShort=مدت پرداخت
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=مقدار پرداخت
 ValidatePayment=اعتبار پرداخت
 PaymentHigherThanReminderToPay=پرداخت بالاتر از یادآوری به پرداخت
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=مجموع دو تخفیف های جدید
 ConfirmRemoveDiscount=آیا مطمئن هستید که می خواهید به حذف این تخفیف؟
 RelatedBill=فاکتور های مرتبط
 RelatedBills=فاکتورها مرتبط
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index 427073d5f48..113d14a9429 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=رده
-Categories=دسته بندی ها
-Rubrique=رده
-Rubriques=دسته بندی ها
-categories=مجموعه ها
-TheCategorie=دسته
-NoCategoryYet=بدون دسته از این نوع ایجاد
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=به
 AddIn=اضافه کردن در
 modify=تغییر دادن
 Classify=دسته بندی کردن
-CategoriesArea=دسته بندی های منطقه
-ProductsCategoriesArea=منطقه محصولات / خدمات مجموعه ها
-SuppliersCategoriesArea=منطقه تولید کنندگان مجموعه ها
-CustomersCategoriesArea=منطقه مشتریان مجموعه ها
-ThirdPartyCategoriesArea=منطقه احزاب سوم مجموعه ها
-MembersCategoriesArea=منطقه گروهها کاربران
-ContactsCategoriesArea=منطقه تماس ها مجموعه ها
-MainCats=دسته بندی های اصلی
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=زیر شاخه ها
 CatStatistics=ارقام
-CatList=فهرست مجموعه ها
-AllCats=تمام دسته بندی
-ViewCat=گروه نمایش
-NewCat=اضافه کردن دسته بندی
-NewCategory=رده جدید
-ModifCat=تغییر دسته
-CatCreated=رده ایجاد
-CreateCat=ایجاد گروه
-CreateThisCat=ایجاد این گروه
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=اعتبارسنجی زمینه
 NoSubCat=بدون زیرشاخه.
 SubCatOf=زیرشاخه
-FoundCats=دسته بندی پیدا نشد
-FoundCatsForName=دسته بندی پیدا نشد برای نام:
-FoundSubCatsIn=زیر شاخه موجود در گروه
-ErrSameCatSelected=شما انتخاب شده گروه های مشابه چند بار
-ErrForgotCat=شما را فراموش کرده به انتخاب گروه
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=شما را فراموش کرده به اطلاع زمینه
 ErrCatAlreadyExists=این نام قبلا استفاده شده
-AddProductToCat=اضافه کردن این محصول را به یک موضوع؟
-ImpossibleAddCat=غیر ممکن برای اضافه کردن گروه
-ImpossibleAssociateCategory=غیر ممکن است از دسته
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=٪ s با موفقیت اضافه شد.
-ObjectAlreadyLinkedToCategory=عنصر در حال حاضر به این گروه مرتبط است.
-CategorySuccessfullyCreated=این رده در٪ s را با موفقیت اضافه شده است.
-ProductIsInCategories=محصولات / خدمات دارای به مقوله های زیر است
-SupplierIsInCategories=شخص ثالث صاحب به زیر تامین کنندگان مجموعه ها
-CompanyIsInCustomersCategories=این شخص ثالث صاحب به زیر مشتریان / چشم انداز مجموعه ها
-CompanyIsInSuppliersCategories=این شخص ثالث صاحب به زیر تامین کنندگان مجموعه ها
-MemberIsInCategories=این عضو صاحب به زیر اعضا گروهها
-ContactIsInCategories=این تماس با مالک به زیر تماس ها مجموعه ها
-ProductHasNoCategory=این محصول / خدمات در هر دسته بندی نشده
-SupplierHasNoCategory=این منبع در هر دسته بندی نشده
-CompanyHasNoCategory=این شرکت در هر دسته بندی نشده
-MemberHasNoCategory=این عضو است در هر دسته بندی نشده
-ContactHasNoCategory=این تماس است در هر دسته بندی نشده
-ClassifyInCategory=طبقه بندی در گروه
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=هیچ یک
-NotCategorized=بدون دسته بندی
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=این رده در حال حاضر با این کد عکس وجود دارد
 ReturnInProduct=برگشت به کارت محصول / خدمات
 ReturnInSupplier=برگشت به کارت کالا
@@ -66,22 +64,22 @@ ReturnInCompany=برگشت به کارت مشتری / چشم انداز
 ContentsVisibleByAll=مطالب توسط همه قابل مشاهده خواهد بود
 ContentsVisibleByAllShort=مطالب توسط همه قابل مشاهده
 ContentsNotVisibleByAllShort=مطالب توسط همه قابل رویت نیست
-CategoriesTree=شاخه درخت
-DeleteCategory=حذف گروه
-ConfirmDeleteCategory=آیا مطمئن هستید که می خواهید این دسته را حذف کنید؟
-RemoveFromCategory=حذف لینک با categorie
-RemoveFromCategoryConfirm=آیا مطمئن هستید که می خواهید به حذف ارتباط بین معامله و گروه؟
-NoCategoriesDefined=بدون دسته بندی های تعریف شده
-SuppliersCategoryShort=طبقه بندی تامین کنندگان
-CustomersCategoryShort=دسته بندی
-ProductsCategoryShort=دسته بندی محصولات
-MembersCategoryShort=گروه کاربران
-SuppliersCategoriesShort=تولید کنندگان مجموعه ها
-CustomersCategoriesShort=مشتریان مجموعه ها
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=مشتریان مشخصات. / Prosp. مجموعه ها
-ProductsCategoriesShort=دسته بندی محصولات
-MembersCategoriesShort=گروهها کاربران
-ContactCategoriesShort=تماس ها مجموعه ها
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=این رده در کل حاوی هر محصول نیست.
 ThisCategoryHasNoSupplier=این رده در هیچ منبع نیست.
 ThisCategoryHasNoCustomer=این رده در کل حاوی هر مشتری نیست.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=این رده در کل حاوی هر گونه ارتب
 AssignedToCustomer=واگذار شده به یک مشتری
 AssignedToTheCustomer=واگذار شده به مشتری
 InternalCategory=گروه داخلی
-CategoryContents=مطالب دسته بندی
-CategId=شناسه گروه
-CatSupList=فهرست دسته بندی های منبع
-CatCusList=فهرست دسته بندی های مشتری / چشم انداز
-CatProdList=لیست محصولات دسته بندی
-CatMemberList=فهرست کاربران گروهها
-CatContactList=فهرست دسته بندی های تماس و ارتباط با ما
-CatSupLinks=ارتباط بین تامین کنندگان و گروهها
-CatCusLinks=ارتباط بین مشتریان / چشم انداز ها و دسته ها
-CatProdLinks=لینک بین محصولات / خدمات و دسته ها
-CatMemberLinks=ارتباط بین اعضا و گروهها
-DeleteFromCat=حذف از گروه
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=تصویر حذف کنید
 ConfirmDeletePicture=تأیید حذف تصویر؟
 ExtraFieldsCategories=ویژگی های مکمل
-CategoriesSetup=شاخه ها راه اندازی
-CategorieRecursiv=پیوند با گروه پدر و مادر به طور خودکار
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=اگر فعال شود، محصول نیز به دسته پدر و مادر مرتبط است که با اضافه کردن به زیرشاخه
-AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+AddProductServiceIntoCategory=افزودن پیگیری محصول/سرویس
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index feca42ac429..8483a8ed71f 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=تاریخ و زمان آخرین خروجی اجرا
 CronLastResult=آخرین نتیجه
 CronListOfCronJobs=لیست شغل ها برنامه ریزی شده
 CronCommand=فرمان
-CronList=فهرست مشاغل
-CronDelete= حذف کارهای cron
-CronConfirmDelete= آیا مطمئن هستید که می خواهید این برنامه cron را حذف کنید؟
-CronExecute=کار راه اندازی
-CronConfirmExecute= آیا مطمئن به اجرای این کار در حال حاضر
-CronInfo= شغل اجازه می دهد برای اجرای وظیفه ای که برنامه ریزی شده است
-CronWaitingJobs=شغل Wainting
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=کار
-CronNone= هیچ یک
+CronNone=هیچ یک
 CronDtStart=تاریخ شروع
 CronDtEnd=تاریخ پایان
 CronDtNextLaunch=اعدام بعدی
@@ -75,6 +75,7 @@ CronObjectHelp=نام شی برای بارگذاری. 
     برای exemple به
 CronMethodHelp=روش شی برای راه اندازی. 
     برای exemple به بهانه روش Dolibarr محصولات شی / htdocs / محصول / کلاس / product.class.php، ارزش روش است fecth
 CronArgsHelp=استدلال از روش. 
     برای exemple به بهانه روش Dolibarr محصولات شی / htdocs / محصول / کلاس / product.class.php، مقدار پارامترهای می تواند 0، ProductRef
 CronCommandHelp=خط فرمان سیستم را اجرا کند.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=اطلاعات
 # Common
diff --git a/htdocs/langs/fa_IR/donations.lang b/htdocs/langs/fa_IR/donations.lang
index 27a5ed5f685..8e7f94bfebd 100644
--- a/htdocs/langs/fa_IR/donations.lang
+++ b/htdocs/langs/fa_IR/donations.lang
@@ -6,6 +6,8 @@ Donor=دهنده
 Donors=اهدا کنندگان
 AddDonation=Create a donation
 NewDonation=کمک مالی جدید
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=نمایش کمک مالی
 DonationPromise=وعده هدیه
 PromisesNotValid=وعده اعتبار نیست
@@ -21,6 +23,8 @@ DonationStatusPaid=کمک مالی دریافت کرد
 DonationStatusPromiseNotValidatedShort=پیش نویس
 DonationStatusPromiseValidatedShort=اعتبار
 DonationStatusPaidShort=رسیده
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=اعتبار قول
 DonationReceipt=دریافت کمک مالی
 BuildDonationReceipt=ساخت رسید
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index feea5472afb..6331432e548 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=پارامترهای راه اندازی اجباری هنوز تعریف نشده
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index e4bc57e2d42..ad218124678 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=لیست همه اطلاعیه ها ایمیل فرست
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 8e9afbf39b0..578185c24e2 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -352,6 +352,7 @@ Status=وضعیت
 Favorite=Favorite
 ShortInfo=اطلاعات.
 Ref=کد عکس.
+ExternalRef=Ref. extern
 RefSupplier=کد عکس. تهیه کننده
 RefPayment=کد عکس. پرداخت
 CommercialProposalsShort=طرح های تجاری
@@ -394,8 +395,8 @@ Available=در دسترس
 NotYetAvailable=هنوز در دسترس نیست
 NotAvailable=در دسترس نیست
 Popularity=محبوبیت
-Categories=دسته بندی ها
-Category=رده
+Categories=Tags/categories
+Category=Tag/category
 By=توسط
 From=از
 to=به
@@ -694,6 +695,7 @@ AddBox=اضافه کردن جعبه
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=دوشنبه
 Tuesday=سهشنبه
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index c680e0c4e84..bd43d5e6381 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=محصول کشتی
 Discount=تخفیف
 CreateOrder=ایجاد نظم
 RefuseOrder=منظور رد
-ApproveOrder=قبول سفارش
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=منظور اعتبارسنجی
 UnvalidateOrder=منظور Unvalidate
 DeleteOrder=به منظور حذف
@@ -102,6 +103,8 @@ ClassifyBilled=طبقه بندی صورتحساب
 ComptaCard=کارت حسابداری
 DraftOrders=دستور پیش نویس
 RelatedOrders=سفارشات مرتبط
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=در دستور روند
 RefOrder=کد عکس. سفارش
 RefCustomerOrder=کد عکس. سفارش مشتری
@@ -118,6 +121,7 @@ PaymentOrderRef=پرداخت منظور از٪ s
 CloneOrder=منظور کلون
 ConfirmCloneOrder=آیا مطمئن هستید که می خواهید به کلون کردن این منظور از٪ s؟
 DispatchSupplierOrder=دریافت کننده کالا منظور از٪ s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=نماینده سفارش مشتری زیر به بالا
 TypeContact_commande_internal_SHIPPING=نماینده زیر را به بالا حمل و نقل
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 0276748a4da..e552336f405 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=مداخله اعتبار
 Notify_FICHINTER_SENTBYMAIL=مداخله با پست
 Notify_BILL_VALIDATE=صورت حساب به مشتری اعتبار
 Notify_BILL_UNVALIDATE=صورت حساب به مشتری unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=منظور تامین کننده تایید
 Notify_ORDER_SUPPLIER_REFUSE=منظور تامین کننده خودداری کرد
 Notify_ORDER_VALIDATE=سفارش مشتری معتبر
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=پیشنهاد تجاری با پست
 Notify_BILL_PAYED=صورت حساب به مشتری غیر انتفایی
 Notify_BILL_CANCEL=صورت حساب به مشتری لغو
 Notify_BILL_SENTBYMAIL=صورت حساب به مشتری با پست
-Notify_ORDER_SUPPLIER_VALIDATE=منظور تامین کننده معتبر
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=منظور تامین کننده با پست
 Notify_BILL_SUPPLIER_VALIDATE=فاکتور تامین کننده معتبر
 Notify_BILL_SUPPLIER_PAYED=فاکتور تامین کننده غیر انتفایی
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=ایجاد پروژه
 Notify_TASK_CREATE=وظیفه ایجاد
 Notify_TASK_MODIFY=وظیفه اصلاح شده
 Notify_TASK_DELETE=وظیفه حذف
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=تعداد فایل های پیوست / اسناد
 TotalSizeOfAttachedFiles=اندازه کل فایل های پیوست / اسناد
 MaxSize=حداکثر اندازه
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=صورتحساب٪ s را دارای اعتبار بو
 EMailTextProposalValidated=این پیشنهاد از٪ s دارای اعتبار بوده است.
 EMailTextOrderValidated=منظور از٪ s دارای اعتبار بوده است.
 EMailTextOrderApproved=منظور از٪ s تایید شده است.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=منظور از٪ s شده توسط٪ s تایید شده است.
 EMailTextOrderRefused=منظور از٪ s رد شده است.
 EMailTextOrderRefusedBy=منظور از٪ s شده توسط٪ s خودداری کرد.
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index f7f332d68a0..620e7121399 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 0e685cffc26..31b2ef018c6 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=فهرست فاکتورها منبع در
 ListContractAssociatedProject=فهرست قرارداد در ارتباط با پروژه
 ListFichinterAssociatedProject=فهرست مداخلات مرتبط با پروژه
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=فهرست رویدادی به این پروژه
 ActivityOnProjectThisWeek=فعالیت در پروژه این هفته
 ActivityOnProjectThisMonth=فعالیت در پروژه این ماه
@@ -130,13 +131,15 @@ AddElement=لینک به عنصر
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=مدل گزارش یک پروژه کامل (logo. ..)
-PlannedWorkload = حجم کار برنامه ریزی شده
-WorkloadOccupation= تظاهر حجم کار
+PlannedWorkload=حجم کار برنامه ریزی شده
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=مراجعه اشیاء
 SearchAProject=جستجوی یک پروژه
 ProjectMustBeValidatedFirst=پروژه ابتدا باید معتبر باشد
 ProjectDraft=پروژه های پیش نویس
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang
index f456863b564..530ad3a8b6b 100644
--- a/htdocs/langs/fa_IR/sendings.lang
+++ b/htdocs/langs/fa_IR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=کد عکس. حمل
 Sending=حمل
 Sendings=حمل و نقل
+AllSendings=All Shipments
 Shipment=حمل
 Shipments=حمل و نقل
 ShowSending=Show Sending
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index 917a56b1758..0699573aec7 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 9ead36d476c..33c0c40e280 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Ilmoitukset
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Lahjoitukset
@@ -508,14 +511,14 @@ Module1400Name=Kirjanpidon asiantuntija
 Module1400Desc=Kirjanpidon hallinta asiantuntijoille (double osapuolet)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategoriat
-Module1780Desc=Kategoriat hallintaa (tuotteet, tavarantoimittajat ja asiakkaat)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG-editori
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Toimet / tehtävät ja esityslistan hallinta
 Module2500Name=Sähköinen Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Lue palvelut
 Permission532=Luoda / muuttaa palvelut
 Permission534=Poista palvelut
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Tilaa toimittaja tilaukset
 Permission1187=Vastaanottaneeni toimittaja tilaukset
 Permission1188=Sulje toimittaja tilaukset
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Hanki seurauksena vienti
 Permission1202=Luo / Muuta vienti
 Permission1231=Lue toimittajan laskut
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Suorita massa tuonnin ulkoisten tiedot tietokantaan (tiedot kuormitus)
 Permission1321=Vienti asiakkaan laskut, ominaisuudet ja maksut
 Permission1421=Vienti asiakkaan tilaukset ja attribuutit
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Lue toimet (tapahtumat tai tehtävät) liittyy hänen tilinsä
 Permission2402=Luoda / muuttaa / poistaa toimet (tapahtumat tai tehtävät) liittyy hänen tilinsä
 Permission2403=Lue toimet (tapahtumat tai tehtävät) muiden
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Paluu kirjanpitoyrityksen koodi rakentanut %s, jota se
 ModuleCompanyCodePanicum=Palata tyhjään kirjanpitotietojen koodi.
 ModuleCompanyCodeDigitaria=Kirjanpito-koodi riippuu kolmannen osapuolen koodi. Koodi koostuu merkin "C" ensimmäisessä kanta seurasi ensimmäisen 5 merkkiä kolmannen osapuolen koodi.
 UseNotifications=Käytä ilmoitukset
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Asiakirjat mallit
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vesileima asiakirjaluonnos
@@ -1557,6 +1566,7 @@ SuppliersSetup=Toimittajan moduuli setup
 SuppliersCommandModel=Täydellinen malli toimittajan järjestys (logo. ..)
 SuppliersInvoiceModel=Täydellinen malli toimittajan laskun (logo. ..)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind moduuli setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index e7156ddf654..867498a3bfa 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Laskun validoitava
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Laskun %s palata luonnos tila
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Tilaa validoitava
+OrderValidatedInDolibarr=Tilaa validoitava
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Tilaus %s peruutettu
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Tilaa %s hyväksytty
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Tilaa %s palata luonnos tila
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 01bdc48e34e..42f4b5eb341 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Maksut jo
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Maksu sääntö
 PaymentMode=Maksutapa
-PaymentConditions=Maksuaika
-PaymentConditionsShort=Maksuaika
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Maksusumma
 ValidatePayment=Vahvista maksu
 PaymentHigherThanReminderToPay=Maksu korkeampi kuin muistutus maksaa
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Yhteensä kaksi uutta alennus on oltava alk
 ConfirmRemoveDiscount=Oletko varma, että haluat poistaa tämän edullisista?
 RelatedBill=Related lasku
 RelatedBills=Related laskut
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Varoitus, yksi tai useampi lasku jo olemassa
 
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index 7fcb659df3b..c78728f3f83 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Luokka
-Categories=Kategoriat
-Rubrique=Luokka
-Rubriques=Kategoriat
-categories=luokat
-TheCategorie=Luokka
-NoCategoryYet=Luokkaa ei tällaisen luonut
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Sisällä
 AddIn=Lisää
 modify=muuttaa
 Classify=Luokittele
-CategoriesArea=Kategoriat alueella
-ProductsCategoriesArea=Tuotteet / Palvelut "luokkiin alue
-SuppliersCategoriesArea=Toimittajien luokkiin alue
-CustomersCategoriesArea=Asiakkaiden kategoriat alueella
-ThirdPartyCategoriesArea=Kolmansien osapuolten luokkiin alue
-MembersCategoriesArea=Jäsenet luokat alue
-ContactsCategoriesArea=Contacts categories area
-MainCats=Pääryhmään
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Alaluokat
 CatStatistics=Tilastot
-CatList=Luettelo catgories
-AllCats=Kaikki kategoriat
-ViewCat=Näytä luokkien
-NewCat=Lisää luokka
-NewCategory=Uusi luokka
-ModifCat=Muokkaa luokka
-CatCreated=Luokka luonut
-CreateCat=Luo luokka
-CreateThisCat=Luo tähän luokkaan
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate aloilla
 NoSubCat=N: o alaluokka.
 SubCatOf=Alaluokat
-FoundCats=Löytyi tuoteryhmät
-FoundCatsForName=Kategoriat löydetty nimi:
-FoundSubCatsIn=Alaluokat löytyy luokkaan
-ErrSameCatSelected=Valittaessa samaan kategoriaan useita kertoja
-ErrForgotCat=Unohditte valita luokka
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Unohditte ilmoitettava kentät
 ErrCatAlreadyExists=Tämä nimi on jo käytössä
-AddProductToCat=Lisää tämä tuote luokka?
-ImpossibleAddCat=Mahdotonta lisätä luokkaan
-ImpossibleAssociateCategory=Mahdotonta yhdistää luokka
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully= %s on lisätty onnistuneesti.
-ObjectAlreadyLinkedToCategory=Osa on jo liitetty tähän luokkaan.
-CategorySuccessfullyCreated=Tähän luokkaan %s on lisätty menestys.
-ProductIsInCategories=Tuotteen / palvelun omistaa seuraavien luokkien
-SupplierIsInCategories=Kolmas osapuoli omistaa seuraavien toimittajien tuoteryhmät
-CompanyIsInCustomersCategories=Tämä kolmas osapuoli omistaa seuraavien asiakkaat / näkymät tuoteryhmät
-CompanyIsInSuppliersCategories=Tämä kolmas osapuoli omistaa seuraavien toimittajien tuoteryhmät
-MemberIsInCategories=Tämä jäsen omistaa seuraaville jäsenille ryhmiin
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=Tämä tuote / palvelu ei ole mitään luokkia
-SupplierHasNoCategory=Tämä toimittaja ei ole mitään luokkia
-CompanyHasNoCategory=Tämä yritys ei ole mitään luokkia
-MemberHasNoCategory=Tämä jäsen ei ole mitään luokkiin
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Luokitella luokkaan
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Ei mitään
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Tämä luokka on jo olemassa samassa paikassa
 ReturnInProduct=Takaisin tuotteen / palvelun kortti
 ReturnInSupplier=Palaa toimittaja-kortti
@@ -66,22 +64,22 @@ ReturnInCompany=Palaa asiakas / näköpiirissä kortti
 ContentsVisibleByAll=Sisältö näkyy kaikkien
 ContentsVisibleByAllShort=Sisällys näkyviin kaikki
 ContentsNotVisibleByAllShort=Sisältö ei näy kaikissa
-CategoriesTree=Categories tree
-DeleteCategory=Poista luokka
-ConfirmDeleteCategory=Oletko varma, että haluat poistaa tämän luokan?
-RemoveFromCategory=Poista yhteys Categorie
-RemoveFromCategoryConfirm=Oletko varma, että haluat poistaa välinen kauppa-ja luokka?
-NoCategoriesDefined=N: o luokkaan
-SuppliersCategoryShort=Tavarantoimittajat luokka
-CustomersCategoryShort=Asiakkaat luokka
-ProductsCategoryShort=Tuotteet luokka
-MembersCategoryShort=Jäsenet luokka
-SuppliersCategoriesShort=Tavarantoimittajat tuoteryhmät
-CustomersCategoriesShort=Asiakkaat tuoteryhmät
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / prosp. luokat
-ProductsCategoriesShort=Tuotteet Tuoteryhmät
-MembersCategoriesShort=Jäsenet luokat
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Tämä kategoria ei sisällä mitään tuotetta.
 ThisCategoryHasNoSupplier=Tämä kategoria ei sisällä mitään toimittaja.
 ThisCategoryHasNoCustomer=Tämä kategoria ei sisällä asiakkaalle.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Annetaan asiakkaalle
 AssignedToTheCustomer=Annetaan asiakkaan
 InternalCategory=Inernal luokka
-CategoryContents=Luokka sisältö
-CategId=Luokka id
-CatSupList=Luettelo toimittaja tuoteryhmät
-CatCusList=Luettelo asiakas / näköpiirissä tuoteryhmät
-CatProdList=Luettelo tuotteista tuoteryhmät
-CatMemberList=Jäsenlista luokkien
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index bba69fbb33f..62cdc0a8183 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Viimeisen ajon tulostus
 CronLastResult=Viimeisen tuloksen koodi
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= Ei mitään
+CronNone=Ei mitään
 CronDtStart=Aloituspäivämäärä
 CronDtEnd=Lopetuspäivä
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/fi_FI/donations.lang b/htdocs/langs/fi_FI/donations.lang
index 85d041a84cf..2d55edc3294 100644
--- a/htdocs/langs/fi_FI/donations.lang
+++ b/htdocs/langs/fi_FI/donations.lang
@@ -6,6 +6,8 @@ Donor=Rahoittajien
 Donors=Luovuttajat
 AddDonation=Create a donation
 NewDonation=Uusi lahjoitus
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift lupaus
 PromisesNotValid=Ei validoitava lupaukset
@@ -21,6 +23,8 @@ DonationStatusPaid=Lahjoituksen vastaanotti
 DonationStatusPromiseNotValidatedShort=Vedos
 DonationStatusPromiseValidatedShort=Validoidut
 DonationStatusPaidShort=Vastatut
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Vahvista lupaus
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Rakenna vastaanottamisesta
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 3a31847c78b..53a0744840f 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index 59a4f74abc8..a1f6062735d 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Listaa kaikki sähköposti-ilmoitukset lähetetään
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 4e6098fd766..5f32596ece3 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -352,6 +352,7 @@ Status=Tila
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Viite
+ExternalRef=Ref. extern
 RefSupplier=Toimittajan viite
 RefPayment=Maksun viite
 CommercialProposalsShort=Kaupalliset ehdotukset
@@ -394,8 +395,8 @@ Available=Saatavissa
 NotYetAvailable=Ei vielä saatavilla
 NotAvailable=Ei saatavilla
 Popularity=Suosio
-Categories=Kategoriat
-Category=Luokka
+Categories=Tags/categories
+Category=Tag/category
 By=Mennessä
 From=Mistä
 to=on
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Maanantai
 Tuesday=Tiistai
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index 408212eb534..ab380e928e3 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Laiva tuote
 Discount=Discount
 CreateOrder=Luo Tilaa
 RefuseOrder=Jätteiden jotta
-ApproveOrder=Hyväksy jotta
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate jotta
 UnvalidateOrder=Unvalidate järjestys
 DeleteOrder=Poista jotta
@@ -102,6 +103,8 @@ ClassifyBilled=Luokittele "Laskutetun"
 ComptaCard=Kirjanpito-kortti
 DraftOrders=Luonnos tilaukset
 RelatedOrders=Aiheeseen liittyvät tilaukset
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Prosessissa tilaukset
 RefOrder=Ref. tilata
 RefCustomerOrder=Ref. asiakas jotta
@@ -118,6 +121,7 @@ PaymentOrderRef=Maksutoimisto jotta %s
 CloneOrder=Klooni jotta
 ConfirmCloneOrder=Oletko varma, että haluat klooni tässä järjestyksessä %s?
 DispatchSupplierOrder=Vastaanottaminen toimittaja järjestys %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Edustaja seurantaan asiakkaan tilauksen
 TypeContact_commande_internal_SHIPPING=Edustaja seurantaan merenkulku
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 66aea85c008..3a3ceea1169 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validate interventioelimen
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Validate bill
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Toimittaja jotta hyväksytty
 Notify_ORDER_SUPPLIER_REFUSE=Toimittaja jotta evätty
 Notify_ORDER_VALIDATE=Asiakas tilaa validoitu
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Kaupallinen ehdotus lähetetään postitse
 Notify_BILL_PAYED=Asiakas laskun maksanut
 Notify_BILL_CANCEL=Asiakas lasku peruutettu
 Notify_BILL_SENTBYMAIL=Asiakkaan lasku lähetetään postitse
-Notify_ORDER_SUPPLIER_VALIDATE=Toimittaja jotta validoitu
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Toimittaja jotta postitse
 Notify_BILL_SUPPLIER_VALIDATE=Toimittaja laskun validoitu
 Notify_BILL_SUPPLIER_PAYED=Toimittaja laskun maksanut
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Numero liitettyjen tiedostojen / asiakirjat
 TotalSizeOfAttachedFiles=Kokonaiskoosta liitettyjen tiedostojen / asiakirjat
 MaxSize=Enimmäiskoko
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Lasku %s validoitava
 EMailTextProposalValidated=Ehdotus %s on hyväksytty.
 EMailTextOrderValidated=Jotta %s on hyväksytty.
 EMailTextOrderApproved=Tilaa %s hyväksytty
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Tilaa %s hyväksynyt %s
 EMailTextOrderRefused=Tilaa %s evätty
 EMailTextOrderRefusedBy=Tilaa %s hylätty %s
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 6b6c461876d..42b86221dca 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 3772988a48c..1c9d5a4bd16 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Luettelo tavarantoimittajien laskut liitty
 ListContractAssociatedProject=Luettelo sopimukset hankkeeseen liittyvät
 ListFichinterAssociatedProject=Luettelo toimien hankkeeseen liittyvän
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Luettelo toimia, jotka liittyvät hankkeen
 ActivityOnProjectThisWeek=Toiminta hanke tällä viikolla
 ActivityOnProjectThisMonth=Toiminta hankkeen tässä kuussa
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Täydellinen hankkeen tarkastusraportin malli (logo. ..)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index 27c8093e232..0701b49d469 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. lähettäminen
 Sending=Lähettävä
 Sendings=Sendings
+AllSendings=All Shipments
 Shipment=Lähettävä
 Shipments=Toimitukset
 ShowSending=Show Sending
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index aca987a8016..0112a1bf127 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index ddf5de96a89..4dea57677d3 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -8,11 +8,11 @@ VersionExperimental=Expérimental
 VersionDevelopment=Développement
 VersionUnknown=Inconnue
 VersionRecommanded=Recommandé
-FileCheck=Files Integrity
-FilesMissing=Missing Files
+FileCheck=Intégrité des fichiers
+FilesMissing=Fichiers manquants
 FilesUpdated=Mettre à jour les fichiers
 FileCheckDolibarr=Vérifier l'intégrité des fichiers
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+XmlNotFound=Fichier Xml d'intégrité de Dolibarr non trouvé
 SessionId=ID Session
 SessionSaveHandler=Modalité de sauvegarde des sessions
 SessionSavePath=Emplacement de sauvegarde sessions
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Séparateur de champ
 ExtrafieldCheckBox=Case à cocher
 ExtrafieldRadio=Bouton radio
 ExtrafieldCheckBoxFromList= Liste à cocher issue d'une table
+ExtrafieldLink=Lier à un objet
 ExtrafieldParamHelpselect=La liste doit être de la forme clef,valeur

     par exemple : 
    1,valeur1
    2,valeur2
    3,valeur3
    ...

    Pour que la liste soit dépendante d'une autre :
    1,valeur1|code_liste_parent:clef_parent
    2,valeur2|code_liste_parent:clef_parent
 ExtrafieldParamHelpcheckbox=La liste doit être de la forme clef,valeur

     par exemple : 
    1,valeur1
    2,valeur2
    3,valeur3
    ...
 ExtrafieldParamHelpradio=La liste doit être de la forme clef,valeur

     par exemple : 
    1,valeur1
    2,valeur2
    3,valeur3
    ...
@@ -494,28 +495,30 @@ Module500Name=Dépenses spéciales (taxes, charges, dividendes)
 Module500Desc=Gestion des dépenses spéciales comme les taxes, charges sociales et dividendes
 Module510Name=Salaires
 Module510Desc=Gestion des paiements des salaires des employés
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Envoi de notifications Email sur certains événements métiers Dolibarr, aux contacts de tiers (configuration réalisé sur chaque tiers)
 Module700Name=Dons
 Module700Desc=Gestion des dons
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Note de frais
+Module770Desc=Gestion et déclaration des notes de frais (transports, repas, ...)
+Module1120Name=Propositions commerciales founisseurs
+Module1120Desc=Demander des devis et tarifs aux fournisseurs
 Module1200Name=Mantis
 Module1200Desc=Interface avec le bug tracker Mantis
 Module1400Name=Comptabilité
 Module1400Desc=Gestion de la comptabilité (partie double)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Catégories
-Module1780Desc=Gestion des catégories (produits, fournisseurs, clients et adhérents)
+Module1520Name=Génération de document
+Module1520Desc=Génération de documents de publipostages
+Module1780Name=Tags/Catégories
+Module1780Desc=Créer tags/catégories (pour les produits, clients, fournisseurs, contacts ou adhérents)
 Module2000Name=Éditeur WYSIWYG
 Module2000Desc=Permet la saisie de certaines zones de textes grace à un éditeur avancé
 Module2200Name=Prix calculés dynamiquement
 Module2200Desc=Active l'usage d'expressions mathématiques
 Module2300Name=Travaux programmés
-Module2300Desc=Gestionnaire de travaux programmés (Cron)
+Module2300Desc=Travaux planifiées
 Module2400Name=Agenda
 Module2400Desc=Gestion des actions (événements et tâches) et de l'agenda
 Module2500Name=Gestion électronique de documents
@@ -714,6 +717,11 @@ Permission510=Consulter les salaires
 Permission512=Créer/modifier les salaires
 Permission514=Supprimer les salaires
 Permission517=Exporter les salaires
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Consulter les services
 Permission532=Créer/modifier les services
 Permission534=Supprimer les services
@@ -722,13 +730,13 @@ Permission538=Exporter les services
 Permission701=Consulter les dons
 Permission702=Créer/modifier les dons
 Permission703=Supprimer les dons
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=Voir les notes de frais (Les vôtres et les utilisateurs autorisés)
+Permission772=Créer/modifier les notes de frais
+Permission773=Supprimer les notes de frais
+Permission774=Lire toutes les notes de frais (même pour les utilisateurs en dehors de ma hierarchie)
+Permission775=Approuver les notes de frais
+Permission776=Payer les notes de frais
+Permission779=Exporter les notes de frais
 Permission1001=Consulter les stocks
 Permission1002=Créer/modifier entrepôts
 Permission1003=Supprimer entrepôts
@@ -746,6 +754,7 @@ Permission1185=Approuver les commandes fournisseur
 Permission1186=Commander les commandes fournisseur
 Permission1187=Accuser réception des commandes fournisseur
 Permission1188=Supprimer les commandes fournisseur
+Permission1190=Approuver les commandes fournisseur (second niveau)
 Permission1201=Récupérer le résultat d'un export
 Permission1202=Créer/modifier un export
 Permission1231=Consulter les factures fournisseur
@@ -758,10 +767,10 @@ Permission1237=Exporter les commande fournisseurs, attributs
 Permission1251=Lancer des importations en masse dans la base (chargement de données)
 Permission1321=Exporter les factures clients, attributs et règlements
 Permission1421=Exporter les commandes clients et attributs
-Permission23001 = Voir les tâches planifiées
-Permission23002 = Créer/modifier les tâches planifiées
-Permission23003 = Supprimer les tâches planifiées
-Permission23004 = Lancer les tâches planifiées
+Permission23001=Voir les travaux planifiés
+Permission23002=Créer/Modifier des travaux planifiées
+Permission23003=Effacer travail planifié
+Permission23004=Exécuté Travail planifié
 Permission2401=Lire les actions (événements ou tâches) liées à son compte
 Permission2402=Créer/modifier les actions (événements ou tâches) liées à son compte
 Permission2403=Supprimer les actions (événements ou tâches) liées à son compte
@@ -1043,8 +1052,8 @@ MAIN_PROXY_PASS=Mot de passe pour passer le serveur proxy mandataire
 DefineHereComplementaryAttributes=Définissez ici la liste des attributs supplémentaires, non disponibles en standard, et que vous voulez voir gérer sur les %s.
 ExtraFields=Attributs supplémentaires
 ExtraFieldsLines=Attributs supplémentaires (lignes)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Attributs supplémentaires (lignes de commandes)
+ExtraFieldsSupplierInvoicesLines=Attributs supplémentaires (lignes de factures)
 ExtraFieldsThirdParties=Attributs supplémentaires (tiers)
 ExtraFieldsContacts=Attributs supplémentaires (contacts/adresses)
 ExtraFieldsMember=Attributs supplémentaires (adhérents)
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Renvoie un code comptable composé de :
    %s suivi du
 ModuleCompanyCodePanicum=Renvoie un code comptable vide.
 ModuleCompanyCodeDigitaria=Renvoie un code comptable composé suivant le code tiers. Le code est composé du caractère 'C' en première position suivi des 5 premiers caractères du code tiers.
 UseNotifications=Utiliser les notifications
-NotificationsDesc=La fonction des notifications par emails permet d'envoyer automatiquement un email, lors de certains événements Dolibarr. La cible des notifications peut être défini:
    * par contacts de tiers (clients, prospects ou fournisseurs), tiers par tiers.
    * ou en positionnant un email en paramètre global sur la page de configuration du module notification.
+NotificationsDesc=La fonction des notifications par emails permet d'envoyer automatiquement un email, lors de certains événements Dolibarr. La cible des notifications peut être défini:
    * par contacts de tiers (clients, prospects ou fournisseurs), contact par contact.
    * ou en positionnant un email en paramètre global sur la page de configuration du module Notification.
 ModelModules=Modèle de documents
 DocumentModelOdt=Génération depuis des modèles OpenDocument (Fichier .ODT ou .ODS OpenOffice, KOffice, TextEdit…)
 WatermarkOnDraft=Filigrane sur les documents brouillons
@@ -1173,12 +1182,12 @@ FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciale
 WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+AskPriceSupplierSetup=Configuration du module Demande de tarifs forunisseurs
+AskPriceSupplierNumberingModules=Modèles de numérotation des demandes de prix
+AskPriceSupplierPDFModules=Modèles de documents des demandes de prix
+FreeLegalTextOnAskPriceSupplier=Texte libre sur les demande de tarifs fournisseurs
+WatermarkOnDraftAskPriceSupplier=Filigrane sur le document de demande de prix fournisseurs (aucun si vide)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Demander le compte bancaire cible durant la création de la demande de prix fournisseur
 ##### Orders #####
 OrdersSetup=Configuration du module Commandes
 OrdersNumberingModules=Modèles de numérotation des commandes
@@ -1528,10 +1537,10 @@ CashDeskThirdPartyForSell=Tiers générique à utiliser par défaut pour les ven
 CashDeskBankAccountForSell=Compte par défaut à utiliser pour l'encaissement en liquide
 CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque
 CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement en carte de crédit
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
+CashDeskDoNotDecreaseStock=Désactiver la réduction de stocks systématique lorsque une vente se fait à partir du Point de Vente (si «non», la réduction du stock est faite pour chaque vente faite depuis le POS, quelquesoit l'option de changement de stock définit dans le module Stock).
 CashDeskIdWareHouse=Forcer et restreindre l'emplacement/entrepôt à utiliser pour la réduction de stock
 StockDecreaseForPointOfSaleDisabled=Réduction de stock lors de l'utilisation du Point de Vente désactivée
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=La décrémentation de stock depuis le Point de Vente n'est pas encore compatible avec la gestion des lots/série.
 CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stocks lors de la réalisation d'une vente depuis le Point de Vente. Aussi, un entrepôt/emplacement est nécessaire.
 ##### Bookmark #####
 BookmarkSetup=Configuration du module Marque-pages
@@ -1557,6 +1566,7 @@ SuppliersSetup=Configuration du module Fournisseurs
 SuppliersCommandModel=Modèle de commandes fournisseur complet (logo…)
 SuppliersInvoiceModel=Modèle de factures fournisseur complet (logo…)
 SuppliersInvoiceNumberingModel=Modèles de numérotation des factures fournisseur
+IfSetToYesDontForgetPermission=Si positionné sur Oui, n'oubliez pas de donner les permissions aux groupes ou utilisateurs qui auront le droit de cette action.
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Configuration du module GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Chemin du fichier Maxmind contenant les conversions IP->Pays.
    Exemples
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1599,5 +1609,10 @@ TypePaymentDesc=0:Type de paiement client, 1:Type de paiement fournisseur, 2:Pai
 IncludePath=Chemin Include (définir dans la variable %s)
 ExpenseReportsSetup=Configuration du module Notes de frais
 TemplatePDFExpenseReports=Modèles de documents pour générer les document de Notes de frais
-NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+NoModueToManageStockDecrease=Aucun module capable d'assurer la réduction de stock en automatique a été activé. La réduction de stock se fera donc uniquement sur mise à jour manuelle.
+NoModueToManageStockIncrease=Aucun module capable d'assurer l'augmentation de stock en automatique a été activé. La réduction de stock se fera donc uniquement sur mise à jour manuelle.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Vous pouvez trouver d'autres options pour la notification par Email en activant et configurant le module "Notification".
+ListOfNotificationsPerContact=Liste des notifications par contact*
+ListOfFixedNotifications=Liste des notifications emails fixes
+GoOntoContactCardToAddMore=Allez sur l'onglet "Notifications" d'un contact de tiers pour ajouter ou supprimer des notifications pour les contacts/adresses
+Threshold=Seuil
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index c29e782ab94..bd4709d1649 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Facture %s validée
 InvoiceValidatedInDolibarrFromPos=Facture %s validée depuis le Point de Vente
 InvoiceBackToDraftInDolibarr=Facture %s repassée en brouillon
 InvoiceDeleteDolibarr=Facture %s supprimée
-OrderValidatedInDolibarr= Commande %s validée
+OrderValidatedInDolibarr=Commande %s validée
+OrderDeliveredInDolibarr=Commande %s classée Délivrée
+OrderCanceledInDolibarr=Commande %s annulée
+OrderBilledInDolibarr=Commande %s classée Facturée
 OrderApprovedInDolibarr=Commande %s approuvée
 OrderRefusedInDolibarr=Commande %s refusée
 OrderBackToDraftInDolibarr=Commande %s repassée en brouillon
@@ -91,3 +94,5 @@ WorkingTimeRange=Plage d'heures travaillées
 WorkingDaysRange=Plage de jours travaillés
 AddEvent=Créer un événement
 MyAvailability=Ma disponibilité
+ActionType=Type événement
+DateActionBegin=Date début événément
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 1956ca025be..9e79b16af11 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Versements déjà effectués
 PaymentsBackAlreadyDone=Remboursements déjà effectués
 PaymentRule=Mode de paiement
 PaymentMode=Mode de règlement
+PaymentTerm=Condition de règlement
 PaymentConditions=Conditions de règlement
-PaymentConditionsShort=Conditions règlement
+PaymentConditionsShort=Conditions de règlement
 PaymentAmount=Montant règlement
 ValidatePayment=Valider ce règlement
 PaymentHigherThanReminderToPay=Règlement supérieur au reste à payer
@@ -94,7 +95,7 @@ SearchACustomerInvoice=Rechercher une facture client
 SearchASupplierInvoice=Rechercher une facture fournisseur
 CancelBill=Annuler une facture
 SendRemindByMail=Envoyer rappel
-DoPayment=Émettre règlement
+DoPayment=Saisir règlement
 DoPaymentBack=Émettre remboursement
 ConvertToReduc=Convertir en réduction future
 EnterPaymentReceivedFromCustomer=Saisie d'un règlement reçu du client
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=La somme du montant des 2 nouvelles réduct
 ConfirmRemoveDiscount=Êtes-vous sûr de vouloir supprimer cette réduction ?
 RelatedBill=Facture associée
 RelatedBills=Factures associées
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Dernière facture en rapport
 WarningBillExist=Attention, une ou plusieurs factures existent déjà
 
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 1c29dfc7772..5a6ac7abc31 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Catégorie
-Categories=Catégories
-Rubrique=Rubrique
-Rubriques=Rubriques
-categories=catégorie(s)
-TheCategorie=La catégorie
-NoCategoryYet=Aucune catégorie de ce type créée
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Dans
 AddIn=Ajouter dans
 modify=modifier
 Classify=Classer
-CategoriesArea=Espace catégories
-ProductsCategoriesArea=Espace des catégories de produits et services
-SuppliersCategoriesArea=Espace des catégories de tiers fournisseurs
-CustomersCategoriesArea=Espace des catégories de tiers clients ou prospects
-ThirdPartyCategoriesArea=Espace des catégories de tiers
-MembersCategoriesArea=Espace des catégories d'adhérents
-ContactsCategoriesArea=Espace des catégories des contacts
-MainCats=Catégories principales
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Sous-catégories
 CatStatistics=Statistiques
-CatList=Liste des catégories
-AllCats=Toutes les catégories
-ViewCat=Visualisation de la catégorie
-NewCat=Nouvelle catégorie
-NewCategory=Nouvelle catégorie
-ModifCat=Modifier une catégorie
-CatCreated=Catégorie créée
-CreateCat=Ajouter une catégorie
-CreateThisCat=Ajouter cette catégorie
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Valider les champs
 NoSubCat=Cette catégorie ne contient aucune sous-catégorie.
 SubCatOf=Sous-catégorie
-FoundCats=Catégories trouvées
-FoundCatsForName=Catégories trouvées pour le nom :
-FoundSubCatsIn=Sous-catégories trouvées dans la catégorie
-ErrSameCatSelected=Vous avez sélectionné la même catégorie plusieurs fois
-ErrForgotCat=Vous avez oublié de choisir la catégorie
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Vous avez oublié de renseigner un champ
 ErrCatAlreadyExists=Ce nom est déjà utilisé
-AddProductToCat=Ajouter ce produit à une catégorie ?
-ImpossibleAddCat=Impossible d'ajouter la catégorie
-ImpossibleAssociateCategory=Impossible d'associer la catégorie
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s a été ajouté avec succès.
-ObjectAlreadyLinkedToCategory=L'élément est déjà lié à cette catégorie.
-CategorySuccessfullyCreated=La catégorie %s a été ajouté avec succès.
-ProductIsInCategories=Ce produit/service est dans les catégories suivantes
-SupplierIsInCategories=Ce fournisseur est dans les catégories suivantes
-CompanyIsInCustomersCategories=Cette société est dans les catégories clients/prospects suivantes
-CompanyIsInSuppliersCategories=Cette société est dans les catégories fournisseurs suivantes
-MemberIsInCategories=Cet adhérent est dans les catégories adhérent suivantes
-ContactIsInCategories=Ce contact est dans les catégories contact suivantes
-ProductHasNoCategory=Ce produit/service n'est dans aucune catégorie en particulier
-SupplierHasNoCategory=Ce fournisseur n'est dans aucune catégorie en particulier
-CompanyHasNoCategory=Cette société n'est dans aucune catégorie en particulier
-MemberHasNoCategory=Cet adhérent n'est dans aucune catégorie en particulier
-ContactHasNoCategory=Ce contact n'est dans aucune catégorie en particulier
-ClassifyInCategory=Classer dans la catégorie
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Aucune
-NotCategorized=Sans catégorie
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Cette catégorie existe déjà pour cette référence
 ReturnInProduct=Retour sur la fiche produit/service
 ReturnInSupplier=Retour sur la fiche fournisseur
@@ -66,22 +64,22 @@ ReturnInCompany=Retour sur la fiche client/prospect
 ContentsVisibleByAll=Le contenu sera visible par tous
 ContentsVisibleByAllShort=Contenu visible par tous
 ContentsNotVisibleByAllShort=Contenu non visible par tous
-CategoriesTree=Arbre des catégories
-DeleteCategory=Supprimer catégorie
-ConfirmDeleteCategory=Êtes-vous sûr de vouloir supprimer cette catégorie ?
-RemoveFromCategory=Supprimer lien avec catégorie
-RemoveFromCategoryConfirm=Êtes-vous sûr de vouloir supprimer le lien entre la transaction et la catégorie ?
-NoCategoriesDefined=Aucune catégorie définie
-SuppliersCategoryShort=Catégorie fournisseurs
-CustomersCategoryShort=Catégorie clients
-ProductsCategoryShort=Catégorie produits
-MembersCategoryShort=Catégorie adhérent
-SuppliersCategoriesShort=Catégories fournisseurs
-CustomersCategoriesShort=Catégories clients
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Catégories clients/prosp.
-ProductsCategoriesShort=Catégories produits
-MembersCategoriesShort=Catégories adhérents
-ContactCategoriesShort=Catégories contacts
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Cette catégorie ne contient aucun produit.
 ThisCategoryHasNoSupplier=Cette catégorie ne contient aucun fournisseur.
 ThisCategoryHasNoCustomer=Cette catégorie ne contient aucun client.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Cette catégorie ne contient aucun contact.
 AssignedToCustomer=Attribuer à un client
 AssignedToTheCustomer=Attribué au client
 InternalCategory=Catégorie interne
-CategoryContents=Contenu de la catégorie
-CategId=Identifiant catégorie
-CatSupList=Liste des catégories fournisseurs
-CatCusList=Liste des catégories clients/prospects
-CatProdList=Liste des catégories produits
-CatMemberList=Liste des catégories adhérents
-CatContactList=Liste des catégories contacts et contacts
-CatSupLinks=Liens entre les fournisseurs et les catégories
-CatCusLinks=Liens entre les clients/prospects et les catégories
-CatProdLinks=Liens entre les produits/services et les catégories
-CatMemberLinks=Liens entre les adhérents et les catégories
-DeleteFromCat=Supprimer de la catégorie
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Supprimer image
 ConfirmDeletePicture=Etes-vous sur de vouloir supprimer cette image ?
 ExtraFieldsCategories=Attributs supplémentaires
-CategoriesSetup=Configuration du module catégories
-CategorieRecursiv=Lier avec les catégories parentes
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Si activé : quand un élément est ajouté dans une catégorie, l'ajouter aussi dans toutes les catégories parentes
 AddProductServiceIntoCategory=Ajouter le produit/service suivant
-ShowCategory=Afficher catégorie
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index 659113176be..7c67426510d 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Sortie du dernier lancement
 CronLastResult=Dernier code de retour
 CronListOfCronJobs=Liste des travaux planifiés
 CronCommand=Commande
-CronList=Liste des travaux
-CronDelete= Supprimer les travaux cron
-CronConfirmDelete= Êtes-vous sûr de vouloir supprimer ces travaux cron ?
-CronExecute=Lancer cette tâche
-CronConfirmExecute= Êtes-vous sûr de vouloir lancer ce travail maintenant?
-CronInfo= Les travaux planifiés permettent d'exécuter des tâches à intervales réguliers
+CronList=Travaux planifiées
+CronDelete=Effacer les travaux planifiés
+CronConfirmDelete=Êtes-vous sûr de vouloir supprimer ce travail planifié ?
+CronExecute=Lancer les travaux planifiés
+CronConfirmExecute=Êtes-vous sûr de vouloir exécuter ce travail planifié maintenant?
+CronInfo=Le module des travaux planifiés permet d'exécuter des opérations qui ont été programmées
 CronWaitingJobs=Travaux en attente
 CronTask=Tâche
-CronNone= Aucun(e)
+CronNone=Aucun(e)
 CronDtStart=Date de début
 CronDtEnd=Date de fin
 CronDtNextLaunch=Prochaine exécution
@@ -75,6 +75,7 @@ CronObjectHelp=Le nom de l'objet à charger. 
     Par exemple pour appeler la m
 CronMethodHelp=La méthode à lancer. 
     Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/product/class/product.class.php, la valeur de la méthode est fetch
 CronArgsHelp=Les arguments de la méthode. 
     Par exemple pour appeler la méthode fetch de l'objet Product de Dolibarr /htdocs/product/class/product.class.php, la valeur des arguments pourrait être 0, RefProduit
 CronCommandHelp=La commande système a exécuter.
+CronCreateJob=Créer un nouveau travail planifié
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang
index 84081b64576..a2625c9c0fa 100644
--- a/htdocs/langs/fr_FR/donations.lang
+++ b/htdocs/langs/fr_FR/donations.lang
@@ -6,6 +6,8 @@ Donor=Donateur
 Donors=Donateurs
 AddDonation=Créer un don
 NewDonation=Nouveau don
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Montrer don
 DonationPromise=Promesse de don
 PromisesNotValid=Promesses non validées
@@ -21,6 +23,8 @@ DonationStatusPaid=Don payé
 DonationStatusPromiseNotValidatedShort=Non validée
 DonationStatusPromiseValidatedShort=Validée
 DonationStatusPaidShort=Payé
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Valider promesse
 DonationReceipt=Reçu de dons
 BuildDonationReceipt=Créer reçu
@@ -32,7 +36,8 @@ ThankYou=Merci
 IConfirmDonationReception=Le bénéficiaire reconnait avoir reçu au titre des versements ouvrant droit à réduction d'impôt, la somme de
 MinimumAmount=Don minimum de %s
 FreeTextOnDonations=Mention complémentaire sur les dons
-FrenchOptions=Options propre à la france
+FrenchOptions=Options propres à la france
 DONATION_ART200=Afficher article 200 du CGI si vous êtes concernés
 DONATION_ART238=Afficher article 238 du CGI si vous êtes concernés
 DONATION_ART885=Afficher article 885 du CGI si vous êtes concernés
+DonationPayment=Donation payment
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index ae65a532774..d784017964d 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Le javascript ne doit pas être désactivé pour qu
 ErrorPasswordsMustMatch=Les 2 mots de passe saisis doivent correspondre
 ErrorContactEMail=Une erreur technique est apparue. Merci de contacter l'administrateur à l'email suivant %s en lui indiquant le code erreur %s dans votre message ou mieux en fournissant une copie d'écran de cette page.
 ErrorWrongValueForField=Mauvaise valeur pour le champ numéro %s (la valeur '%s' ne respecte pas la règle %s)
-ErrorFieldValueNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une valeure présente dans le champ %s de la table %s = %s)
+ErrorFieldValueNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une valeur présente dans le champ %s de la table %s = %s)
 ErrorFieldRefNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une référence existante comme %s)
 ErrorsOnXLines=Erreurs sur %s enregistrement(s) source
 ErrorFileIsInfectedWithAVirus=L'antivirus n'a pas pu valider ce fichier (il est probablement infecté par un virus) !
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Erreur inconnue '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Les entrepôts source et destination doivent être différents
 ErrorTryToMakeMoveOnProductRequiringBatchData=Erreur, vous essayez de faire un mouvement sans lot/numéro de série, sur un produit qui exige un lot/numéro de série.
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index 8cb4cdcecd1..403b09310c6 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Liste des notifications emails envoyées
 MailSendSetupIs=La configuration d'envoi d'emails a été définir sur '%s'. Ce mode ne peut pas être utilisé pour envoyer des e-mailing en masse.
 MailSendSetupIs2=Vous devez d'abord aller, avec un compte d'administrateur, dans le menu %sAccueil - Configuration - EMails%s pour changer le paramètre '%s' pour utiliser le mode '%s'. Avec ce mode, vous pouvez accéder à la configuration du serveur SMTP fourni par votre fournisseur de services Internet et utiliser la fonction d'envoi d'email en masse.
 MailSendSetupIs3=Si vous avez des questions sur la façon de configurer votre serveur SMTP, vous pouvez demander à %s.
+YouCanAlsoUseSupervisorKeyword=Vous pouvez également ajouter le mot-clé __SUPERVISOREMAIL__ pour avoir les emails envoyés au responsable hiérarchique de l'utilisateur (ne fonctionne que si un email est défini pour ce responsable)
+NbOfTargetedContacts=Nombre courant d'emails de contacts cibles
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 173594ef593..97aa65f021e 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -352,6 +352,7 @@ Status=État
 Favorite=Favori
 ShortInfo=Infos
 Ref=Réf.
+ExternalRef=Ref. extern
 RefSupplier=Réf. fournisseur
 RefPayment=Réf. paiement
 CommercialProposalsShort=Propositions/devis
@@ -394,8 +395,8 @@ Available=Disponible
 NotYetAvailable=Pas encore disponible
 NotAvailable=Non disponible
 Popularity=Popularité
-Categories=Catégories
-Category=Catégorie
+Categories=Tags/categories
+Category=Tag/category
 By=Par
 From=Du
 to=au
@@ -694,6 +695,7 @@ AddBox=Ajouter boite
 SelectElementAndClickRefresh=Sélectionnez un élément et cliquez sur Rafraichir
 PrintFile=Imprimer fichier %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Lundi
 Tuesday=Mardi
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index 849a6ad0245..3cc4fbd11ad 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -183,7 +183,7 @@ LastMemberDate=Date dernier adhérent
 Nature=Nature
 Public=Informations publiques
 Exports=Exports
-NewMemberbyWeb=Nouvel Adhérent ajoute. En attente de validation
+NewMemberbyWeb=Nouvel adhérent ajouté. En attente de validation
 NewMemberForm=Nouvel Adhérent form
 SubscriptionsStatistics=Statistiques sur les cotisations
 NbOfSubscriptions=Nombre de cotisations
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 78565d17a8a..ec71dfaebca 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -42,7 +42,7 @@ StatusOrderCanceled=Annulée
 StatusOrderDraft=Brouillon (à valider)
 StatusOrderValidated=Validée
 StatusOrderOnProcess=Commandé - en attente de réception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcessWithValidation=Commandé - en attente de réception ou validation
 StatusOrderProcessed=Traitée
 StatusOrderToBill=Délivrée
 StatusOrderToBill2=À facturer
@@ -59,12 +59,13 @@ MenuOrdersToBill=Commandes délivrées
 MenuOrdersToBill2=Commandes facturables
 SearchOrder=Rechercher une commande
 SearchACustomerOrder=Rechercher une commande client
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Rechercher une commande fournisseur
 ShipProduct=Expédier produit
 Discount=Remise
 CreateOrder=Créer Commande
 RefuseOrder=Refuser la commande
-ApproveOrder=Accepter la commande
+ApproveOrder=Approuver commande
+Approve2Order=Approuver commande (deuxième niveau)
 ValidateOrder=Valider la commande
 UnvalidateOrder=Dévalider la commande
 DeleteOrder=Supprimer la commande
@@ -102,6 +103,8 @@ ClassifyBilled=Classer facturée
 ComptaCard=Fiche compta
 DraftOrders=Commandes brouillons
 RelatedOrders=Commandes rattachées
+RelatedCustomerOrders=Commandes clients liées
+RelatedSupplierOrders=Commandes fournisseurs liées
 OnProcessOrders=Commandes en cours de traitement
 RefOrder=Réf. commande
 RefCustomerOrder=Réf. commande client
@@ -118,6 +121,7 @@ PaymentOrderRef=Paiement commande %s
 CloneOrder=Cloner commande
 ConfirmCloneOrder=Êtes-vous sûr de vouloir cloner cette commande %s ?
 DispatchSupplierOrder=Réception de la commande fournisseur %s
+FirstApprovalAlreadyDone=Premier niveau d'approbation déjà réalisé
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsable suivi commande client
 TypeContact_commande_internal_SHIPPING=Responsable envoi commande client
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 45ba7c01e89..4e45d306802 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validation fiche intervention
 Notify_FICHINTER_SENTBYMAIL=Envoi fiche d'intervention par email
 Notify_BILL_VALIDATE=Validation facture client
 Notify_BILL_UNVALIDATE=Dévalidation facture client
+Notify_ORDER_SUPPLIER_VALIDATE=Commande fournisseur enregistrée
 Notify_ORDER_SUPPLIER_APPROVE=Approbation commande fournisseur
 Notify_ORDER_SUPPLIER_REFUSE=Refus commande fournisseur
 Notify_ORDER_VALIDATE=Validation commande client
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Envoi proposition commerciale par email
 Notify_BILL_PAYED=Recouvrement facture client
 Notify_BILL_CANCEL=Annulation facture client
 Notify_BILL_SENTBYMAIL=Envoi facture client par email
-Notify_ORDER_SUPPLIER_VALIDATE=Validation commande fournisseur
+Notify_ORDER_SUPPLIER_VALIDATE=Commande fournisseur enregistrée
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Envoi commande fournisseur par email
 Notify_BILL_SUPPLIER_VALIDATE=Validation facture fournisseur
 Notify_BILL_SUPPLIER_PAYED=Paiment facture fournisseur
@@ -47,20 +48,20 @@ Notify_PROJECT_CREATE=Création de projet
 Notify_TASK_CREATE=Tâche créée
 Notify_TASK_MODIFY=Tâche modifiée
 Notify_TASK_DELETE=Tâche supprimée
-SeeModuleSetup=Voir la configuration du module
+SeeModuleSetup=Voir la configuration du module %s
 NbOfAttachedFiles=Nombre de fichiers/documents liés
 TotalSizeOfAttachedFiles=Taille totale fichiers/documents liés
 MaxSize=Taille maximum
 AttachANewFile=Ajouter un nouveau fichier/document
 LinkedObject=Objet lié
 Miscellaneous=Divers
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Nombre de notifications (nb de destinataires emails)
 PredefinedMailTest=Ceci est un message de test.\nLes 2 lignes sont séparées par un retour à la ligne.\n\n__SIGNATURE__
 PredefinedMailTestHtml=Ceci est un message de test (le mot test doit être en gras).
    Les 2 lignes sont séparées par un retour à la ligne.

    __SIGNATURE__
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\nNous voudrions porter à votre connaissance que la facture  __FACREF__ ne semble pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la proposition commerciale __PROPREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre demande de tarif __ASKREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=La facture %s vous concernant a été validée.
 EMailTextProposalValidated=La proposition commerciale %s vous concernant a été validée.
 EMailTextOrderValidated=La commande %s vous concernant a été validée.
 EMailTextOrderApproved=La commande %s a été approuvée.
+EMailTextOrderValidatedBy=La commande %s a été enregistrée par %s
 EMailTextOrderApprovedBy=La commande %s a été approuvée par %s.
 EMailTextOrderRefused=La commande %s a été refusée.
 EMailTextOrderRefusedBy=La commande %s a été refusée par %s.
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index d1c1edb2b8e..5551523ad3a 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Lot/Numéro de série
 l_eatby=Date limite de consommation
 l_sellby=Date de péremption
 DetailBatchNumber=Détails Lot/Série
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+DetailBatchFormat=Lot/Série: %s - E: %s - S: %s (Qté: %d)
 printBatch=Lot/Série: %s
 printEatby=Limite de consommation : %s
 printSellby=Péremption : %s
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 3443b2c7aac..e7ec1cba00e 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Prix minimum recommandé : %s
 PriceExpressionEditor=Éditeur d'expression de prix
 PriceExpressionSelected=Expression de prix sélectionnée
 PriceExpressionEditorHelp1="price = 2 + 2" ou "2 + 2" pour définir un prix. Utilisez ; pour séparer les expressions
-PriceExpressionEditorHelp2=Vous pouvez accédez aux ExtraFields avec des variables comme\n#options_myextrafieldkey#
+PriceExpressionEditorHelp2=Vous pouvez accédez aux ExtraFields avec des variables comme\n#extrafield_myextrafieldkey# et aux variables globales avec #global_myvar#
 PriceExpressionEditorHelp3=Dans les produits commes les services et les prix fournisseurs, les variables suivantes sont disponibles:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Dans les prix produits/services uniquement: #supplier_min_price#
    Dans les prix fournisseurs uniquement: #supplier_quantity# et #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Mode de tarification
 PriceNumeric=Nombre
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+DefaultPrice=Prix par défaut
+ComposedProductIncDecStock=Augmenter/Réduire le stock sur changement du stock du père
+ComposedProduct=Sous-produits
+MinSupplierPrice=Prix minimum fournisseur
+DynamicPriceConfiguration=Configuration du prix dynamique
+GlobalVariables=Variables globales
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=Données JSON
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=Le format est {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=Données WebService
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=Le format est {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Intervale de mise à jour (minutes)
+LastUpdated=Dernière mise à jour
+CorrectlyUpdated=Mise à jour avec succès
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 08d2436c16e..4f1cecb79c8 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -8,10 +8,10 @@ SharedProject=Tout le monde
 PrivateProject=Contacts du projet
 MyProjectsDesc=Cette vue projet est restreinte aux projets pour lesquels vous êtes un contact affecté (quel qu'en soit le type).
 ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes habilité à avoir une visibilité.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
 ProjectsDesc=Cette vue présente tous les projets (vos habilitations vous offrant une vue exhaustive).
 MyTasksDesc=Cette vue est restreinte aux projets et tâches pour lesquels vous êtes un contact affecté à au moins une tâche (quel qu'en soit le type).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Seules les projets ouverts sont visibles (les projets avec le statut brouillon et fermé ne sont pas affichés)
 TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
 TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
 ProjectsArea=Espace projet
@@ -31,8 +31,8 @@ NoProject=Aucun projet défini ou responsable
 NbOpenTasks=Nb Tâches Ouvertes
 NbOfProjects=Nombre de projets
 TimeSpent=Temps consommé
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Temps consommé par vous
+TimeSpentByUser=Temps consommé par utilisateur
 TimesSpent=Temps consommés
 RefTask=Ref. tâche
 LabelTask=Libellé tâche
@@ -71,7 +71,8 @@ ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées
 ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet
 ListContractAssociatedProject=Liste des contrats associés au projet
 ListFichinterAssociatedProject=Liste des interventions associées au projet
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListExpenseReportsAssociatedProject=Liste des notes de frais associées avec ce projet
+ListDonationsAssociatedProject=Liste des dons associés au projet
 ListActionsAssociatedProject=Liste des événements associés au projet
 ActivityOnProjectThisWeek=Activité sur les projets cette semaine
 ActivityOnProjectThisMonth=Activité sur les projets ce mois
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Délier l'élément
 # Documents models
 DocumentModelBaleine=Modèle de rapport de projet complet (logo...)
-PlannedWorkload = Charge de travail prévue
-WorkloadOccupation= Pourcentage affectation
+PlannedWorkload=Charge de travail prévue
+PlannedWorkloadShort=Charge de travail
+WorkloadOccupation=Charge de travail affectée
 ProjectReferers=Objets associés
 SearchAProject=Rechercher un projet
 ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
 ProjectDraft=Projets brouillons
 FirstAddRessourceToAllocateTime=Ajouter une ressource pour pouvoir allouer tu temps
-InputPerTime=Input per time
-InputPerDay=Input per day
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+InputPerDay=Saisie par jour
+InputPerWeek=Saisie par semaine
+InputPerAction=Saisie par action
+TimeAlreadyRecorded=Temps consommé déjà enregistré pour cette tâche/jour et utilisateur %s
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index e65707e186c..1354fe7ddf6 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Réf. expédition
 Sending=Expédition
 Sendings=Expéditions
+AllSendings=Toutes les expéditions
 Shipment=Expédition
 Shipments=Expéditions
 ShowSending=Afficher expédition
@@ -23,7 +24,7 @@ QtyOrdered=Qté. commandée
 QtyShipped=Qté. expédiée
 QtyToShip=Qté. à expédier
 QtyReceived=Qté. reçue
-KeepToShip=Remain to ship
+KeepToShip=Reste à expédier
 OtherSendingsForSameOrder=Autres expéditions pour cette commande
 DateSending=Date ordre d'expédition
 DateSendingShort=Date ordre exp.
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index 07904930bf2..233e1828ca6 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -29,7 +29,7 @@ ExportDataset_fournisseur_2=Factures fournisseurs et règlements
 ExportDataset_fournisseur_3=Commandes fournisseur et lignes de commande
 ApproveThisOrder=Approuver la commande
 ConfirmApproveThisOrder=Êtes-vous sûr de vouloir approuver la commande fournisseur %s ?
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Refuser cette commande
 ConfirmDenyingThisOrder=Êtes-vous sûr de vouloir refuser la commande fournisseur %s ?
 ConfirmCancelThisOrder=Êtes-vous sûr de vouloir annuler la commande fournisseur %s ?
 AddCustomerOrder=Créer commande client
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Liste des commandes fournisseurs
 MenuOrdersSupplierToBill=Commandes fournisseurs en facture
 NbDaysToDelivery=Délai de livraison en jours
 DescNbDaysToDelivery=Délai le plus élevé parmi la liste de produit dans la commande
+UseDoubleApproval=Utiliser la double approbation (la deuxième approbation pourra être faite par tout utilisateur qui bénéficie de la permission dédiée à cela) 
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index 3a11b7c4036..b36286cdb57 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -22,7 +22,7 @@ SearchATripAndExpense=Rechercher une note de frais
 ClassifyRefunded=Classer 'Remboursé'
 ExpenseReportWaitingForApproval=Une nouvelle note de frais a été soumise pour approbation
 ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
-TripId=Id expense report
+TripId=Id note de frais
 AnyOtherInThisListCanValidate=Person to inform for validation.
 TripSociete=Information société
 TripSalarie=Informations utilisateur
@@ -32,49 +32,49 @@ ConfirmDeleteLine=Are you sure you want to delete this line ?
 PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
 ExpenseReportLine=Expense report line
 TF_OTHER=Autre
-TF_TRANSPORTATION=Transportation
+TF_TRANSPORTATION=Transport
 TF_LUNCH=Repas
-TF_METRO=Metro
+TF_METRO=Métro
 TF_TRAIN=Train
 TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_CAR=Voiture
+TF_PEAGE=Péage
+TF_ESSENCE=Carburant
+TF_HOTEL=Hôtel
 TF_TAXI=Taxi
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 ListTripsAndExpenses=Liste des notes de frais
-AucuneNDF=No expense reports found for this criteria
-AucuneLigne=There is no expense report declared yet
+AucuneNDF=Pas de note de frais trouvées avec ces critères
+AucuneLigne=Aucune note de frais déclarée
 AddLine=Ajout nouvelle ligne
-AddLineMini=Add
+AddLineMini=Ajouter
 
 Date_DEBUT=Date début
 Date_FIN=Date fin
 ModePaiement=Mode de paiement
 Note=Note
-Project=Project
+Project=Projet
 
-VALIDATOR=User to inform for approbation
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
-REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+VALIDATOR=Utilisateur à informer pour approbation
+VALIDOR=Approuvé par
+AUTHOR=Enregistré par
+AUTHORPAIEMENT=Payé par
+REFUSEUR=Refusé par
+CANCEL_USER=Annulé par
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=Motif
+MOTIF_CANCEL=Motif
 
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_VALIDE=Validation date
-DateApprove=Approving date
-DATE_CANCEL=Cancelation date
+DATE_REFUS=Date refus
+DATE_SAVE=Date validation
+DATE_VALIDE=Date validation
+DateApprove=Date approbation
+DATE_CANCEL=Date annulation
 DATE_PAIEMENT=Payment date
 
-Deny=Deny
-TO_PAID=Pay
+Deny=Refuser
+TO_PAID=Payer
 BROUILLONNER=Reopen
 SendToValid=Sent to approve
 ModifyInfoGen=Edit
@@ -86,13 +86,13 @@ NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
 RefuseTrip=Deny an expense report
 ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
 
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report ?
+ValideTrip=Approuver note de frais
+ConfirmValideTrip=Êtes-vous sûr de vouloir approuver cette note de frais ?
 
-PaidTrip=Pay an expense report
+PaidTrip=Payer note de frais
 ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
 
-CancelTrip=Cancel an expense report
+CancelTrip=Annuler note de frais
 ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
 
 BrouillonnerTrip=Move back expense report to status "Draft"n
@@ -123,4 +123,4 @@ TripForValid=à Valider
 TripForPaid=à Payer
 TripPaid=Payée
 
-NoTripsToExportCSV=No expense report to export for this period.
+NoTripsToExportCSV=Pas de note de frais à exporter dans cette période
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 40ebcc8f65d..4ca97ee13e9 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=הודעות
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=תרומות
@@ -508,14 +511,14 @@ Module1400Name=חשבונאות
 Module1400Desc=חשבונאות וניהול (צד כפולות)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=קטגוריות
-Module1780Desc=Categorie ההנהלה (מוצרים, ספקים ולקוחות)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=עורך WYSIWYG
 Module2000Desc=אפשר לערוך כמה אזור הטקסט באמצעות עורך מתקדם
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=סדר היום
 Module2400Desc=אירועים / משימות וניהול סדר היום
 Module2500Name=תוכן אלקטרוני ניהול
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=לקרוא שירותים
 Permission532=יצירה / שינוי שירותים
 Permission534=מחק את השירותים
@@ -746,6 +754,7 @@ Permission1185=לאשר הזמנות ספקים
 Permission1186=הספק סדר הזמנות
 Permission1187=לאשר קבלת הזמנות ספקים
 Permission1188=מחק הזמנות ספקים
+Permission1190=Approve (second approval) supplier orders
 Permission1201=קבל תוצאה של יצוא
 Permission1202=יצירה / שינוי של הייצוא
 Permission1231=קרא את חשבוניות הספק
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=הפעל יבוא המוני של נתונים חיצוניים לתוך מסד נתונים (עומס נתונים)
 Permission1321=יצוא חשבוניות הלקוח, תכונות ותשלומים
 Permission1421=ייצוא הזמנות של לקוחות ותכונות
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=קרא פעולות או משימות (אירועים) מקושר לחשבון שלו
 Permission2402=ליצור / לשנות את פעולות או משימות (אירועים) היא מקושרת לחשבון שלו
 Permission2403=מחק פעולות או משימות (אירועים) מקושר לחשבון שלו
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=חזור קוד חשבון נבנה על ידי: 
    
 ModuleCompanyCodePanicum=חזור קוד חשבון ריק.
 ModuleCompanyCodeDigitaria=קוד חשבונאות תלוי קוד של צד שלישי. הקוד מורכב בעל אופי "C" בעמדה 1 ואחריו את 5 התווים הראשונים של קוד של צד שלישי.
 UseNotifications=השתמש הודעות
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=תבניות מסמכים
 DocumentModelOdt=צור מסמכים מתבניות OpenDocuments (. ODT קבצים של אופן אופיס, KOffice, TextEdit, ...)
 WatermarkOnDraft=סימן מים על מסמך טיוטה
@@ -1557,6 +1566,7 @@ SuppliersSetup=מודול הספק ההתקנה
 SuppliersCommandModel=תבנית שלמה של הסדר הספק (logo. ..)
 SuppliersInvoiceModel=תבנית שלמה של חשבונית הספק (logo. ..)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind ההתקנה מודול
 PathToGeoIPMaxmindCountryDataFile=הנתיב לקובץ המכיל IP Maxmind תרגום הארץ. 
     דוגמה: / usr / local / share / GeoIP / GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index ca1edd3df0e..ba1542e483f 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 0a1e1ef5d5d..a5796dd0544 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index 244341b4fba..7c293065433 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=קטגוריות
-Rubrique=Category
-Rubriques=קטגוריות
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index bb128746069..63223b9e15e 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/he_IL/donations.lang b/htdocs/langs/he_IL/donations.lang
index 8f009f4a115..a8365c79d8c 100644
--- a/htdocs/langs/he_IL/donations.lang
+++ b/htdocs/langs/he_IL/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index d7a601e8382..42eeab81dd4 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 510dc2d1443..54717d8915e 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=קטגוריות
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
index 3e45ed9db31..ba84cae1344 100644
--- a/htdocs/langs/he_IL/orders.lang
+++ b/htdocs/langs/he_IL/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index 4c5e1b6346f..5b9876272c7 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 9c98812f2a3..179740315d1 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 31faca7c515..54d25b4ef24 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang
index 51b04b2db35..c8d5d582b68 100644
--- a/htdocs/langs/he_IL/sendings.lang
+++ b/htdocs/langs/he_IL/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=משלוחים
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=משלוחים
 ShowSending=Show Sending
diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index 591b1d13545..e3f2c428379 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 22a62f00d59..2cdcce59866 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index b61eb591433..8e49047bf96 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Račun %s ovjeren
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Račun %s  vraćen u status skice
 InvoiceDeleteDolibarr=Račun %s obrisan
-OrderValidatedInDolibarr= Narudžba %s ovjerena
+OrderValidatedInDolibarr=Narudžba %s ovjerena
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Narudžba %s otkazana
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Narudžba %s odobrena
 OrderRefusedInDolibarr=Narudžba %s je odbijena
 OrderBackToDraftInDolibarr=Narudžba %s vraćena u status skice
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 784462c316b..640257f7a11 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Izvršena plaćanja
 PaymentsBackAlreadyDone=Izvršeni povrati plaćanja
 PaymentRule=Pravilo plaćanja
 PaymentMode=Oblik plaćanja
-PaymentConditions=Rok plaćanja
-PaymentConditionsShort=Rok plaćanja
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Iznos plaćanja
 ValidatePayment=Ovjeri plaćanje
 PaymentHigherThanReminderToPay=Plaćanje je veće nego podsjetnik za plaćanje
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Jeste li sigurni da želite ukloniti ovaj popust?
 RelatedBill=Povezani račun
 RelatedBills=Povezani račun
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/hr_HR/donations.lang b/htdocs/langs/hr_HR/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/hr_HR/donations.lang
+++ b/htdocs/langs/hr_HR/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 3e299f51788..756360ff88a 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=Od
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index f59089eee0f..2561198dd90 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Pošalji proizvod
 Discount=Popust
 CreateOrder=Kreiraj narudžbu
 RefuseOrder=Odbij narudžbu
-ApproveOrder=Prihvati narudžbu
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Ovjeri narudžbu
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Obriši narudžbu
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 0b8b37f2a97..e94e24244a7 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 58ef04b2e35..068aa55954a 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index b4f1e2b8e25..e20a1b00985 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Pošiljka
 Sendings=Pošiljke
+AllSendings=All Shipments
 Shipment=Pošiljka
 Shipments=Pošiljke
 ShowSending=Show Sending
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 6bf991e2634..0c7daf61ed2 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Értesítések
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Adományok
@@ -508,14 +511,14 @@ Module1400Name=Számvitel
 Module1400Desc=Számviteli menedzsment (dupla felek)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategóriák
-Module1780Desc=Kategóriában vezetősége (termékek, szállítók és vevők)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG szerkesztő
 Module2000Desc=Hagyjuk szerkeszteni egy szöveget terület egy fejlett szerkesztő
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Napirend
 Module2400Desc=Események / feladatok és napirend menedzsment
 Module2500Name=Elektronikus Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Olvassa szolgáltatások
 Permission532=Létrehozza / módosítja szolgáltatások
 Permission534=Törlés szolgáltatások
@@ -746,6 +754,7 @@ Permission1185=Jóváhagyás beszállítói megrendelések
 Permission1186=Rendelés szállító megrendelések
 Permission1187=Kézhezvételét beszállítói megrendelések
 Permission1188=Törlés beszállítói megrendelések
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get eredményeképpen az export
 Permission1202=Létrehozása / módosítása a kiviteli
 Permission1231=Olvassa szállító számlák
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Fuss tömeges import a külső adatok adatbázisba (adatok terhelés)
 Permission1321=Export vevői számlák, attribútumok és kifizetések
 Permission1421=Export vevői megrendelések és attribútumok
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Olvassa tevékenységek (rendezvények, vagy feladatok) kapcsolódik a számláját
 Permission2402=Létrehozza / módosítja tevékenységek (rendezvények, vagy feladatok) kapcsolódik a számláját
 Permission2403=Törlés tevékenységek (rendezvények, vagy feladatok) kapcsolódik a számláját
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Vissza 1 számviteli kódot építette: 
     %s követ
 ModuleCompanyCodePanicum=Vissza az üres számviteli kódot.
 ModuleCompanyCodeDigitaria=Számviteli kód attól függ, hogy harmadik fél kódot. A kód áll a karakter "C"-ben az első helyen, majd az első 5 karakter a harmadik fél kódot.
 UseNotifications=Használja értesítések
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Dokumentumok sablonok
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vízjel dokumentum tervezetét
@@ -1557,6 +1566,7 @@ SuppliersSetup=Szállító modul beállítása
 SuppliersCommandModel=Teljes sablon szállító érdekében (logo. ..)
 SuppliersInvoiceModel=A teljes szállítói számla sablon (logo. ..)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modul beállítása
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index c6decbcb31a..b3144ba2bd2 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=%s számla érvényesítve
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Számla %s menj vissza a tervezett jogállását
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= %s megrendelés érvényesítve
+OrderValidatedInDolibarr=%s megrendelés érvényesítve
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Rendelés %s törölt
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Rendelés %s jóváhagyott
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Rendelés %s menj vissza vázlat
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 5eca0e94b49..f33958ab6f6 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Kifizetések már megtette
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Fizetési szabály
 PaymentMode=Fizetési típus
-PaymentConditions=Fizetési határidő
-PaymentConditionsShort=Fizetési határidő
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Fizetés összege
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Fizetési magasabb emlékeztető fizetni
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Összesen két új kedvezményt meg kell eg
 ConfirmRemoveDiscount=Biztosan el akarja távolítani ezt a kedvezményt?
 RelatedBill=Kapcsolódó számla
 RelatedBills=Kapcsolódó számlák
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index 348f309e7f2..340e05776ac 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategória
-Categories=Kategóriák
-Rubrique=Kategória
-Rubriques=Kategóriák
-categories=kategóriák
-TheCategorie=A kategória
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=módosítás
 Classify=Osztályozás
-CategoriesArea=Kategóriák terület
-ProductsCategoriesArea=Termékek/Szolgáltatások kategória terület
-SuppliersCategoriesArea=Beszállítói kategóriák terület
-CustomersCategoriesArea=Ügyfél kategóriák terület
-ThirdPartyCategoriesArea=Harmadik fél kategóriák terület
-MembersCategoriesArea=Tagok kategória terület
-ContactsCategoriesArea=Contacts categories area
-MainCats=Fő kategóriák
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Alkategóriák
 CatStatistics=Statisztikák
-CatList=Kategóriák listája
-AllCats=Minden kategória
-ViewCat=Kategória megtekintése
-NewCat=Add category
-NewCategory=Új kategória
-ModifCat=Kategória módosítása
-CatCreated=Kategória létrehozva
-CreateCat=Kategória létrehozása
-CreateThisCat=Kategória létrehozása
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Mezők hitelesítése
 NoSubCat=Nincs alkategória.
 SubCatOf=Alkategória
-FoundCats=Talált kategóriák
-FoundCatsForName=Név számára talált kategóriák:
-FoundSubCatsIn=Talált alkategória a kategóriában
-ErrSameCatSelected=Többször választotta ki ugyan azt a kategóriát
-ErrForgotCat=Elfelejtett kategóriát választani
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Elfelejtette kitölteni a mezőket
 ErrCatAlreadyExists=Ez a nvé már használatban van
-AddProductToCat=Adjuk hozzá a terméket ehhez a kategóriához?
-ImpossibleAddCat=Nem lehet kategorizálni
-ImpossibleAssociateCategory=Nem lehet asszociálni a kategóriát
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s sikeresen hozzá lett adva.
-ObjectAlreadyLinkedToCategory=Már a kategóriához van linkelve.
-CategorySuccessfullyCreated=Ez a kategória %s sikeresen hozzá lett adva.
-ProductIsInCategories=Termékek/Szolgáltatások a következő kategóriákat tulajdonolják
-SupplierIsInCategories=Ez a harmadik fél a következő beszállítókat tulajdonolják
-CompanyIsInCustomersCategories=Ez a harmadik fél a következő ügyfeleket/kilátásokat tulajdonolják
-CompanyIsInSuppliersCategories=Ez a harmadik fél a következő beszállítókat tulajdonolják
-MemberIsInCategories=Ez a tag ebbe a tag kategóriába tartozik
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=Ez a termék/szolgáltatás nincs egy kategóriában sem
-SupplierHasNoCategory=Ez a beszállító nincs egy kategóriában sem
-CompanyHasNoCategory=Ez a cég nincs egy kategóriában sem
-MemberHasNoCategory=Ez a tag nincs egy kategóriában sem
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Kategorizálni
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Nincs
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Ez a kategória ezzel a ref# -el már létezik
 ReturnInProduct=Vissza a termék/szolgáltatás kártyához
 ReturnInSupplier=Vissza a beszállító kártyához
@@ -66,22 +64,22 @@ ReturnInCompany=Vissza az ügyfél/kilátás kártyához
 ContentsVisibleByAll=A tartalom mindenki számára látható lesz
 ContentsVisibleByAllShort=Tartalom látható mindenki számára
 ContentsNotVisibleByAllShort=Tartalom nem látható mindenki számára
-CategoriesTree=Categories tree
-DeleteCategory=Kategória törlése
-ConfirmDeleteCategory=Biztos törölni akarja a kategóriát?
-RemoveFromCategory=Kategória link eltávolítása
-RemoveFromCategoryConfirm=Biztos törölni akarja a kapcsolatot a tranzakció és a kategória közt?
-NoCategoriesDefined=Nincs definiált kategóriáa
-SuppliersCategoryShort=Beszállítói kategória
-CustomersCategoryShort=Vásárlói kategória
-ProductsCategoryShort=Termék kategória
-MembersCategoryShort=Tag kategória
-SuppliersCategoriesShort=Beszállítói kategória
-CustomersCategoriesShort=Vásárlói kategória
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Vásárló/Kilátás kategóriák
-ProductsCategoriesShort=Termék kategória
-MembersCategoriesShort=Tag kategória
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Ez a kategória nem tartalmaz termékeket.
 ThisCategoryHasNoSupplier=Ez a kategória nem tartalmaz beszállítót.
 ThisCategoryHasNoCustomer=Ez a kategória nem tartalmaz vásárlót.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Vásárlóhoz rendelve
 AssignedToTheCustomer=Vásárlóhoz rendelve
 InternalCategory=Belső kategória
-CategoryContents=Kategória tartalmak
-CategId=Kategória azon#
-CatSupList=Beszállítói kategóriák listázása
-CatCusList=Ügyfél/kilátás kategóriák listázása
-CatProdList=Termék kategóriák listázása
-CatMemberList=Tag kategóriák listázása
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index b186a698110..078f1829621 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= Nincs
+CronNone=Nincs
 CronDtStart=Kezdési dátum
 CronDtEnd=Befejezési dátum
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/hu_HU/donations.lang b/htdocs/langs/hu_HU/donations.lang
index 78108dcd9dc..606cc976570 100644
--- a/htdocs/langs/hu_HU/donations.lang
+++ b/htdocs/langs/hu_HU/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donorok
 AddDonation=Create a donation
 NewDonation=Új adomány
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Ajándék ígéret
 PromisesNotValid=Nem hitelesített ígéretek
@@ -21,6 +23,8 @@ DonationStatusPaid=Kapott adomány
 DonationStatusPromiseNotValidatedShort=Vázlat
 DonationStatusPromiseValidatedShort=Hitelesített
 DonationStatusPaidShort=Kapott
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Érvényesítés ígéret
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Nyugta készítése
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 197f9806cca..18243bd074f 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index 60741482144..8fd814d95e0 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Lista minden e-mail értesítést küldeni
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 47b61bbf942..9789a1797c2 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -352,6 +352,7 @@ Status=Állapot
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Beszállító Ref.
 RefPayment=Fizetési Ref.
 CommercialProposalsShort=Üzleti ajánlatok
@@ -394,8 +395,8 @@ Available=Elérhető
 NotYetAvailable=Még nem elérhető
 NotAvailable=Nem elérhető
 Popularity=Népszerűság
-Categories=Kategóriák
-Category=Kategória
+Categories=Tags/categories
+Category=Tag/category
 By=által
 From=Kitől?
 to=kinek
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Hétfő
 Tuesday=Kedd
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index d146ad13e0b..d6338ec744b 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Hajó termék
 Discount=Kedvezmény
 CreateOrder=Rendet
 RefuseOrder=Hulladékgyűjtő érdekében
-ApproveOrder=Accept érdekében
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Érvényesítése érdekében
 UnvalidateOrder=Unvalidate érdekében
 DeleteOrder=Törlése érdekében
@@ -102,6 +103,8 @@ ClassifyBilled=Classify "számlázott"
 ComptaCard=Számviteli kártya
 DraftOrders=Tervezet megrendelések
 RelatedOrders=Kapcsolódó megrendelések
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=A folyamat sorrendek
 RefOrder=Ref. érdekében
 RefCustomerOrder=Ref. az ügyfelek érdekében
@@ -118,6 +121,7 @@ PaymentOrderRef=Kifizetése érdekében %s
 CloneOrder=Clone érdekében
 ConfirmCloneOrder=Biztos vagy benne, hogy ezt a sorrendet %s klónozni?
 DispatchSupplierOrder=Fogadása érdekében szállító %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Reprezentatív nyomon követése az ügyfelek érdekében
 TypeContact_commande_internal_SHIPPING=Képviselő-up a következő hajózási
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 5b4e01644cd..f18813e846a 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Beavatkozás validált
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Ügyfél számla hitelesített
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Szállító érdekében elfogadott
 Notify_ORDER_SUPPLIER_REFUSE=Szállító érdekében hajlandó
 Notify_ORDER_VALIDATE=Ügyfél érdekében érvényesített
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Kereskedelmi által küldött javaslatban mail
 Notify_BILL_PAYED=Az ügyfél számlát fizetni
 Notify_BILL_CANCEL=Az ügyfél számlát törölt
 Notify_BILL_SENTBYMAIL=Az ügyfél számlát postai úton
-Notify_ORDER_SUPPLIER_VALIDATE=Szállító annak hitelesített
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Szállító érdekében postai úton
 Notify_BILL_SUPPLIER_VALIDATE=Szállító számlát érvényesített
 Notify_BILL_SUPPLIER_PAYED=Szállító számlát fizetni
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Száma csatolt fájlok / dokumentumok
 TotalSizeOfAttachedFiles=Teljes méretű csatolt fájlok / dokumentumok
 MaxSize=Maximális méret
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=A számla %s nem érvényesítette.
 EMailTextProposalValidated=A javaslat %s nem érvényesítette.
 EMailTextOrderValidated=A rendelés %s nem érvényesítette.
 EMailTextOrderApproved=A rendelés %s nem hagyták jóvá.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=A megrendelés %s jóváhagyta %s.
 EMailTextOrderRefused=A megrendelés %s visszautasításra került.
 EMailTextOrderRefusedBy=A megrendelés %s már elutasította %s.
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 584d47aeb70..73774ec73c9 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 085c0f39bc5..8485f52743c 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=A projekthez tartozó beszállítói szám
 ListContractAssociatedProject=A projekthez tartozó szerződések listája
 ListFichinterAssociatedProject=A projekthez tartozó intervenciók listája
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=A projekthez tartozó cselekvések listája
 ActivityOnProjectThisWeek=Heti projekt aktivitás
 ActivityOnProjectThisMonth=Havi projekt aktivitás
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Teljes jelentés modell (logo, ...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index b2c42484995..65d32d6f400 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Szállítási Ref.
 Sending=Szállítás
 Sendings=Szállítások
+AllSendings=All Shipments
 Shipment=Szállítás
 Shipments=Szállítások
 ShowSending=Show Sending
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index bf6540154b1..761f1450e6d 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 7c834ac36f8..ae4ea132bc1 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Pembatas
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifikasi
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Sumbangan
@@ -508,14 +511,14 @@ Module1400Name=Akunting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategori
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Membaca Jasa
 Permission532=Membuat/Merubah Jasa
 Permission534=Menghapus Jasa
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Mambaca Nota Pemasok
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index 3b088ea3c7d..5f9bc8f8e5e 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 0aff57599da..dc23045e239 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Pembayaran - pembayaran yang sudah selesai
 PaymentsBackAlreadyDone=Pembayaran - pembayaran kembali yang sudah selesai
 PaymentRule=Aturan pembayaran
 PaymentMode=Jenis pembayaran
-PaymentConditions=Ketentuan pembayaran
-PaymentConditionsShort=Ketentuan pembayaran
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Jumlah pembayaran
 ValidatePayment=Validasi pembayaran
 PaymentHigherThanReminderToPay=Pengingat untuk pembayaran yang lebih tinggi
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/id_ID/donations.lang b/htdocs/langs/id_ID/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/id_ID/donations.lang
+++ b/htdocs/langs/id_ID/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 81deb7c28f0..27779080dd0 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/id_ID/orders.lang
+++ b/htdocs/langs/id_ID/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 1f2b7c1b38d..a34983b009f 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
index 1f90724539e..5ce0419ddf4 100644
--- a/htdocs/langs/id_ID/suppliers.lang
+++ b/htdocs/langs/id_ID/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Daftar pesanan suplier
 MenuOrdersSupplierToBill=Pesanan suplier menjadi invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 50ac8371a52..74f0eb019d1 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Tilkynningar
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Fjárframlög
@@ -508,14 +511,14 @@ Module1400Name=Bókhald
 Module1400Desc=Bókhald stjórnun (tvöfaldur aðila)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Flokkar
-Module1780Desc=Stjórn Flokkur's (vörur, birgja og viðskiptavina)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Dagskrá
 Module2400Desc=Aðgerðir / verkefni og dagskrá stjórnun
 Module2500Name=Rafræn Innihald Stjórnun
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Lesa þjónusta
 Permission532=Búa til / breyta þjónusta
 Permission534=Eyða þjónustu
@@ -746,6 +754,7 @@ Permission1185=Samþykkja birgir pantanir
 Permission1186=Order / Hætta við birgi pantanir
 Permission1187=Staðfesta móttöku fyrirmæla birgir
 Permission1188=Loka birgir pantanir
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Fá vegna útflutnings
 Permission1202=Búa til / breyta útflutnings
 Permission1231=Lesa birgir reikningum
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Setja massa innflutningi af ytri gögn inn í gagnagrunn (gögn álag)
 Permission1321=Útflutningur viðskiptavina reikninga, eiginleika og greiðslur
 Permission1421=Útflutningur viðskiptavina pantanir og eiginleika
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Lesa aðgerða (atburðum eða verkefni) tengd reikningnum hans
 Permission2402=Búa til / breyta aðgerðum (atburðum eða verkefni) tengd reikningnum hans
 Permission2403=Eyða aðgerða (atburðum eða verkefni) tengd reikningnum hans
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Fara aftur á bókhalds kóða byggt af %s á eftir þ
 ModuleCompanyCodePanicum=Return tómt bókhalds-númer.
 ModuleCompanyCodeDigitaria=Bókhalds kóða ráðast á þriðja aðila kóða. Kóðinn er samsett af eðli "C" í efstu stöðu eftir fyrstu 5 stafina þriðja aðila kóðann.
 UseNotifications=Notaðu tilkynningar
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Skjöl sniðmát
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vatnsmerki á drögum að skjali
@@ -1557,6 +1566,7 @@ SuppliersSetup=Birgir mát skipulag
 SuppliersCommandModel=Heill sniðmát af röð birgir (logo. ..)
 SuppliersInvoiceModel=Heill sniðmát af reikningi birgis (logo. ..)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind mát skipulag
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
index 1b163691b92..057e39f0584 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s  staðfestar
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Vörureikningi %s fara aftur til drög að stöðu
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Panta %s  staðfestar
+OrderValidatedInDolibarr=Panta %s  staðfestar
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Panta %s niður
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Panta %s samþykkt
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Panta %s fara aftur til drög að stöðu
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index 40a85a7a31f..1fa4a21c586 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Greiðslur gert þegar
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Greiðsla regla
 PaymentMode=Greiðslumáti
-PaymentConditions=Greiðsla orð
-PaymentConditionsShort=Greiðsla orð
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Upphæð greiðslu
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Greiðsla hærri en áminning að borga
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Samtals tvö ný afsláttur verður jafn up
 ConfirmRemoveDiscount=Ertu viss um að þú viljir fjarlægja þetta afslætti?
 RelatedBill=Svipaðir Reikningar
 RelatedBills=Svipaðir reikningum
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index 4308d85801f..6a6769cfc33 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Flokkur
-Categories=Flokkar
-Rubrique=Flokkur
-Rubriques=Flokkar
-categories=Flokkur
-TheCategorie=Flokki
-NoCategoryYet=Engin flokkur af þessu tagi skapaði
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Í
 AddIn=Bæta við í
 modify=breyta
 Classify=Flokka
-CategoriesArea=Flokkar area
-ProductsCategoriesArea=Vörur / Þjónusta flokka svæði
-SuppliersCategoriesArea=Birgjar flokkar area
-CustomersCategoriesArea=Viðskiptavinir flokkar area
-ThirdPartyCategoriesArea=Í þriðja aðila flokkar area
-MembersCategoriesArea=Members flokkar area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Helstu flokkar
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Undirflokkar
 CatStatistics=Tölfræði
-CatList=Listi yfir flokka
-AllCats=Allir flokkar
-ViewCat=Skoða flokk
-NewCat=Bæta við flokk
-NewCategory=Nýr flokkur
-ModifCat=Breyta flokki
-CatCreated=Flokkur búið
-CreateCat=Búa til flokkur
-CreateThisCat=Búa þessum flokki
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Staðfesta reitina
 NoSubCat=Nei undirflokk.
 SubCatOf=Undirflokkur
-FoundCats=Stofna flokkar
-FoundCatsForName=Flokkar fundust fyrir Notendanafn:
-FoundSubCatsIn=Undirflokkar fundust í flokknum
-ErrSameCatSelected=Þú valdir sama flokki nokkrum sinnum
-ErrForgotCat=Þú hefur gleymt að velja þann flokk
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Þú gleymdi að tilkynna þeim sviðum
 ErrCatAlreadyExists=Þetta heiti er þegar í notkun
-AddProductToCat=Bæta þessari vöru flokk?
-ImpossibleAddCat=Ómögulegt að bæta við flokki
-ImpossibleAssociateCategory=Ómögulegt að tengja flokk
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully= %s  var bætt við.
-ObjectAlreadyLinkedToCategory=Frumefni er nú þegar tengdur þessum flokki.
-CategorySuccessfullyCreated=Þetta% flokki s hefur verið bætt við að ná árangri.
-ProductIsInCategories=Vöru / þjónustu er eigandi að eftirtöldum flokkum
-SupplierIsInCategories=Þriðji aðili er eigandi að eftirtöldum birgjum flokkar
-CompanyIsInCustomersCategories=Þessi þriðji aðili er eigandi að fylgja viðskiptavinum / horfur flokkar
-CompanyIsInSuppliersCategories=Þessi þriðji aðili er eigandi að eftirtöldum birgjum flokkar
-MemberIsInCategories=Þessi aðili er eigandi að eftirfarandi aðilar flokkar
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=Þessi vara / þjónusta er ekki í neinum flokkum
-SupplierHasNoCategory=Þetta birgir ekki í neinum flokkum
-CompanyHasNoCategory=Þetta fyrirtæki er ekki í neinum flokkum
-MemberHasNoCategory=Þessi aðili er ekki í neinum flokkum
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Flokka í flokki
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Þessi flokkur er þegar til með þessu tilv
 ReturnInProduct=Til baka vöru / þjónustu kort
 ReturnInSupplier=Til baka birgir kort
@@ -66,22 +64,22 @@ ReturnInCompany=Til baka viðskiptavina / horfur kort
 ContentsVisibleByAll=Inntak verður sýnilegt af öllum
 ContentsVisibleByAllShort=Efnisyfirlit sýnileg um alla
 ContentsNotVisibleByAllShort=Efnisyfirlit ekki sýnileg um alla
-CategoriesTree=Categories tree
-DeleteCategory=Eyða flokki
-ConfirmDeleteCategory=Ertu viss um að þú viljir eyða þessum flokki?
-RemoveFromCategory=Fjarlægja hlekk með Flokkur
-RemoveFromCategoryConfirm=Ertu viss um að þú viljir fjarlægja tengilinn á milli viðskipta og flokk?
-NoCategoriesDefined=Engin flokkur er skilgreind
-SuppliersCategoryShort=Birgjar flokkur
-CustomersCategoryShort=Viðskiptavinir flokkur
-ProductsCategoryShort=Vörur flokkur
-MembersCategoryShort=Members flokkur
-SuppliersCategoriesShort=Birgjar flokkar
-CustomersCategoriesShort=Viðskiptavinir flokkar
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prosp. Flokkur
-ProductsCategoriesShort=Vörur flokkar
-MembersCategoriesShort=Members flokkar
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Þessi flokkur inniheldur ekki vöruna.
 ThisCategoryHasNoSupplier=Þessi flokkur inniheldur ekki birgir.
 ThisCategoryHasNoCustomer=Þessi flokkur inniheldur ekki allir viðskiptavinur.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Úthlutað til viðskiptavinar
 AssignedToTheCustomer=Úthlutað til viðskiptavinar
 InternalCategory=Innri flokkur
-CategoryContents=Flokkur innihald
-CategId=Auðkenni
-CatSupList=Listi yfir flokka birgir
-CatCusList=Listi yfir viðskiptavini / horfur flokkar
-CatProdList=Listi yfir vörur flokkar
-CatMemberList=Listi yfir meðlimi flokkar
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index 746b799208a..af03d82d7bb 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Upphafsdagur
 CronDtEnd=Lokadagur
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/is_IS/donations.lang b/htdocs/langs/is_IS/donations.lang
index 12fc71b3b9e..0c204f442f3 100644
--- a/htdocs/langs/is_IS/donations.lang
+++ b/htdocs/langs/is_IS/donations.lang
@@ -6,6 +6,8 @@ Donor=Gjafa
 Donors=Styrktaraðila
 AddDonation=Create a donation
 NewDonation=New málefnið
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gjöf loforð
 PromisesNotValid=Ekki staðfest loforð
@@ -21,6 +23,8 @@ DonationStatusPaid=Framlag borist
 DonationStatusPromiseNotValidatedShort=Víxill
 DonationStatusPromiseValidatedShort=Staðfestar
 DonationStatusPaidShort=Móttekin
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Staðfesta loforð
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Byggja kvittun
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 4676457743f..c0fdc7b7bd0 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index 6f5f9108e3a..b99aa9b8fd8 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Sýna allar tilkynningar í tölvupósti sendi
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 0e595e2d7be..370be13bc99 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Tilv.
+ExternalRef=Ref. extern
 RefSupplier=Tilv. birgir
 RefPayment=Tilv. greiðslu
 CommercialProposalsShort=Auglýsing tillögur
@@ -394,8 +395,8 @@ Available=Laus
 NotYetAvailable=Ekki enn í boði
 NotAvailable=Ekki í boði
 Popularity=Vinsældir
-Categories=Flokkar
-Category=Flokkur
+Categories=Tags/categories
+Category=Tag/category
 By=Með því að
 From=Frá
 to=til
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Mánudagur
 Tuesday=Þriðjudagur
diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
index 29a82746738..902d6f40508 100644
--- a/htdocs/langs/is_IS/orders.lang
+++ b/htdocs/langs/is_IS/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Skip vöru
 Discount=Afsláttur
 CreateOrder=Búa Order
 RefuseOrder=Neita röð
-ApproveOrder=Samþykkja röð
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Staðfesta röð
 UnvalidateOrder=Unvalidate röð
 DeleteOrder=Eyða röð
@@ -102,6 +103,8 @@ ClassifyBilled=Flokka "borgað"
 ComptaCard=Bókhalds-kort
 DraftOrders=Drög að fyrirmælum
 RelatedOrders=Svipaðir pantanir
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Í pantanir ferli
 RefOrder=Tilv. röð
 RefCustomerOrder=Tilv. viðskiptavina þess
@@ -118,6 +121,7 @@ PaymentOrderRef=Greiðsla %s kyni s
 CloneOrder=Klóna röð
 ConfirmCloneOrder=Ertu viss um að þú viljir klón þessari röð %s ?
 DispatchSupplierOrder=Móttaka birgir röð %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Fulltrúi eftirfarandi upp viðskiptavina röð
 TypeContact_commande_internal_SHIPPING=Fulltrúi eftirfarandi upp siglinga
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 051c37066dc..9286b8bdd81 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention staðfestar
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Viðskiptavinur Reikningar staðfestar
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Birgir röð samþykkt
 Notify_ORDER_SUPPLIER_REFUSE=Birgir þess neitaði
 Notify_ORDER_VALIDATE=Viðskiptavinur til setja í gildi
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Auglýsing tillögu send með pósti
 Notify_BILL_PAYED=Viðskiptavinur Reikningar borgað
 Notify_BILL_CANCEL=Viðskiptavinur reikning niður
 Notify_BILL_SENTBYMAIL=Viðskiptavinur Reikningar send með pósti
-Notify_ORDER_SUPPLIER_VALIDATE=Birgir röð fullgilt
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Birgir röð send með pósti
 Notify_BILL_SUPPLIER_VALIDATE=Birgir reikning fullgilt
 Notify_BILL_SUPPLIER_PAYED=Birgir reikning borgað
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Fjöldi meðfylgjandi skrá / gögn
 TotalSizeOfAttachedFiles=Heildarstærð meðfylgjandi skrá / gögn
 MaxSize=Hámarks stærð
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Í% reikningi s hefur verið staðfest.
 EMailTextProposalValidated=Á% Tillagan s hefur verið staðfest.
 EMailTextOrderValidated=Á %s kyni s hefur verið staðfest.
 EMailTextOrderApproved=Á %s kyni s hefur verið samþykkt.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Á %s kyni s hefur verið samþykkt af %s .
 EMailTextOrderRefused=Á %s kyni s hefur verið hafnað.
 EMailTextOrderRefusedBy=Á %s kyni s hefur verið hafnað af %s .
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 655a4801339..278ac3161f0 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index ee5af4c6a48..8a186277a99 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Listi yfir reikninga birgis í tengslum vi
 ListContractAssociatedProject=Listi yfir samninga í tengslum við verkefnið
 ListFichinterAssociatedProject=Listi yfir inngrip í tengslum við verkefnið
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Listi yfir aðgerðir í tengslum við verkefnið
 ActivityOnProjectThisWeek=Afþreying á verkefni í þessari viku
 ActivityOnProjectThisMonth=Afþreying á verkefni í þessum mánuði
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=skýrslu lýkur verkefninu er líkan (logo. ..)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang
index 0e2e1d76be7..40d0f918aa2 100644
--- a/htdocs/langs/is_IS/sendings.lang
+++ b/htdocs/langs/is_IS/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Tilv. sendingunni
 Sending=Sendingunni
 Sendings=Sendingar
+AllSendings=All Shipments
 Shipment=Sendingunni
 Shipments=Sendingar
 ShowSending=Show Sending
diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index 6635f860563..4176fa17e9d 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index 9348b460f9a..386fa3c17e4 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separatore
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Bottone Radio
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=I parametri della lista deveono avere una sintassi tipo chiave,valore

     ad esempio: 
    1,valore1
    2,valore2
    3,valore3
    ...

     In modo da avere una lista madre che dipenda da un altra:
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=La lista dei parametri deve contenere chiave univoca e valore.

    Per esempio:
    1, valore1
    2, valore2
    3, valore3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Spese speciali (tasse, contributi sociali, dividendi)
 Module500Desc=Amministrazione delle spese speciali quali tasse, contributi sociali, dividendi e salari.
 Module510Name=Stipendi
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifiche
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donazioni
@@ -508,14 +511,14 @@ Module1400Name=Contabilità avanzata
 Module1400Desc=Gestione contabilità per esperti (partita doppia)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categorie
-Module1780Desc=Gestione Categorie (prodotti, fornitori e clienti)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=Permette di usare un editor avanzato per alcune aree di testo
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Gestione dei task programmati
+Module2300Desc=Scheduled job management
 Module2400Name=Ordine del giorno
 Module2400Desc=Gestione eventi/compiti e ordine del giorno
 Module2500Name=Gestione dei contenuti digitali
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Vedere servizi
 Permission532=Creare/modificare servizi
 Permission534=Eliminare servizi
@@ -746,6 +754,7 @@ Permission1185=Approvare ordini fornitore
 Permission1186=Ordinare ordini fornitore
 Permission1187=Accettare consegna ordini fornitore
 Permission1188=Chiudere ordini fornitore
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Ottieni il risultato di un esportazione
 Permission1202=Creare/Modificare esportazioni
 Permission1231=Vedere fatture fornitore
@@ -758,10 +767,10 @@ Permission1237=Esportazione ordini fornitori e loro dettagli
 Permission1251=Eseguire importazioni di massa di dati esterni nel database (data load)
 Permission1321=Esportare fatture cliente, attributi e pagamenti
 Permission1421=Esportare ordini cliente e attributi
-Permission23001 = Leggi compito programmato
-Permission23002 = Crea/aggiorna compito programmato
-Permission23003 = Cancella compito programmato
-Permission23004 = Esegui compito programmato
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Vedere azioni (eventi o compiti) personali
 Permission2402=Creare/modificare azioni (eventi o compiti) personali
 Permission2403=Cancellare azioni (eventi o compiti) personali
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Restituisce una stringa composta da %s seguito dal cod
 ModuleCompanyCodePanicum=Restituisce un codice contabile vuoto.
 ModuleCompanyCodeDigitaria=Codice contabile dipendente dal codice di terze parti. Il codice è composto dal carattere "C" nella prima posizione seguito da i primi 5 caratteri del codice cliente/fornitore.
 UseNotifications=Attiva le notifiche
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Modelli per i documenti
 DocumentModelOdt=Generare documenti da modelli OpenDocuments (file .ODT o .ODS per OpenOffice, KOffice, TextEdit, ecc...)
 WatermarkOnDraft=Filigrana sulle bozze
@@ -1557,6 +1566,7 @@ SuppliersSetup=Impostazioni modulo fornitori
 SuppliersCommandModel=Modello completo di ordine fornitore (logo...)
 SuppliersInvoiceModel=Modello completo di fattura fornitore (logo...)
 SuppliersInvoiceNumberingModel=Modello per la numerazione delle fatture fornitore
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Impostazioni modulo GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 4a8317beef2..5ee3c2ee363 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Fattura convalidata
 InvoiceValidatedInDolibarrFromPos=Ricevute %s validate dal POS
 InvoiceBackToDraftInDolibarr=Fattura %s riportata allo stato di bozza
 InvoiceDeleteDolibarr=La fattura %s è stata cancellata
-OrderValidatedInDolibarr= Ordine convalidato
+OrderValidatedInDolibarr=Ordine convalidato
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=ordine %s annullato
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Ordine %s approvato
 OrderRefusedInDolibarr=Ordine %s rifiutato
 OrderBackToDraftInDolibarr=Ordine %s riportato allo stato di bozza
@@ -91,3 +94,5 @@ WorkingTimeRange=Intervallo di tempo di lavoro
 WorkingDaysRange=Intervallo di giorni di lavoro
 AddEvent=Crea evento
 MyAvailability=Mie disponibilità
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 62ab683bd6e..0f4132f0162 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Pagamenti già fatti
 PaymentsBackAlreadyDone=Rimborso già effettuato
 PaymentRule=Regola pagamento
 PaymentMode=Tipo di pagamento
-PaymentConditions=Termine di pagamento
-PaymentConditionsShort=Ter. di pagamento
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Importo del pagamento
 ValidatePayment=Convalidare questo pagamento?
 PaymentHigherThanReminderToPay=Pagamento superiore alla rimanenza da pagare
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Il totale di due nuovi sconti deve essere p
 ConfirmRemoveDiscount=Vuoi davvero eliminare questo sconto?
 RelatedBill=Fattura correlata
 RelatedBills=Fatture correlate
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Ultima fattura correlata
 WarningBillExist=Attenzione, una o più fatture già esistenti
 
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 0514f048fa6..806156a82a4 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categoria
-Categories=Categorie
-Rubrique=Categoria
-Rubriques=Categorie
-categories=categorie
-TheCategorie=La categoria
-NoCategoryYet=Non esiste alcuna categoria di questo tipo
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Aggiungi a
 modify=modifica
 Classify=Classifica
-CategoriesArea=Area categorie
-ProductsCategoriesArea=Area categorie prodotti/servizi
-SuppliersCategoriesArea=Area categorie fornitori
-CustomersCategoriesArea=Area categorie clienti
-ThirdPartyCategoriesArea=Area categorie soggetti terzi
-MembersCategoriesArea=Area categorie membri
-ContactsCategoriesArea=Area Categorie di contatti
-MainCats=Categorie principali
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Sub-categorie
 CatStatistics=Statistiche
-CatList=Elenco delle categorie
-AllCats=Tutte le categorie
-ViewCat=Visualizza categoria
-NewCat=Aggiungi categoria
-NewCategory=Nuova categoria
-ModifCat=Modifica categoria
-CatCreated=Categoria creata
-CreateCat=Crea categoria
-CreateThisCat=Crea questa categoria
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Convalidare i campi
 NoSubCat=Nessuna sottocategoria
 SubCatOf=Sottocategoria
-FoundCats=Categorie trovate
-FoundCatsForName=Categorie trovate per il nome:
-FoundSubCatsIn=Sottocategorie trovate nella categoria
-ErrSameCatSelected=Hai selezionato la stessa categoria più volte
-ErrForgotCat=Hai dimenticato di scegliere la categoria
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Hai dimenticato di indicare i campi
 ErrCatAlreadyExists=La categoria esiste già
-AddProductToCat=Inserire il prodotto in una categoria?
-ImpossibleAddCat=Impossibile aggiungere la categoria
-ImpossibleAssociateCategory=Impossibile associare la categoria a
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully= %s  aggiunta con successo
-ObjectAlreadyLinkedToCategory=L'elemento appartiene già questa categoria.
-CategorySuccessfullyCreated=La categoria %s è stata aggiunta con successo.
-ProductIsInCategories=Il Prodotto/servizio appartiene alle seguenti categorie
-SupplierIsInCategories=Questo Fornitore appartiene alle seguenti categorie
-CompanyIsInCustomersCategories=Questa società si trova nelle seguenti categorie di clienti
-CompanyIsInSuppliersCategories=Questa società si trova nelle seguenti categorie di fornitori
-MemberIsInCategories=Questo membro appartiene alle seguenti categorie
-ContactIsInCategories=Il contatto appartiene alle seguenti categorie
-ProductHasNoCategory=Il prodotto/servizio non apaprtiene ad alcuna categoria
-SupplierHasNoCategory=Questo fornitore non appartiene ad alcuna categoria
-CompanyHasNoCategory=Questa società non è in alcuna categoria
-MemberHasNoCategory=Questo membro non è in alcuna categoria
-ContactHasNoCategory=Il contatto non ha categoria
-ClassifyInCategory=Classificare nella categoria
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Nessuna
-NotCategorized=Senza categoria
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Questa categoria esiste già allo stesso livello
 ReturnInProduct=Torna alla scheda prodotto/servizio
 ReturnInSupplier=Torna alla scheda fornitore
@@ -66,22 +64,22 @@ ReturnInCompany=Torna alla scheda cliente
 ContentsVisibleByAll=I contenuti saranno visibili a tutti gli utenti
 ContentsVisibleByAllShort=Contenuti visibili a tutti
 ContentsNotVisibleByAllShort=Contenuti non visibili a tutti
-CategoriesTree=Albero categorie
-DeleteCategory=Elimina categoria
-ConfirmDeleteCategory=Vuoi davvero eliminare questa categoria?
-RemoveFromCategory=Rimuovi collegamento con la categoria
-RemoveFromCategoryConfirm=Sei sicuro di voler rimuovere il legame tra l'operazione e la categoria?
-NoCategoriesDefined=Nessuna categoria definita
-SuppliersCategoryShort=Categoria fornitori
-CustomersCategoryShort=Categoria clienti
-ProductsCategoryShort=Categorie prodotti
-MembersCategoryShort=Categoria membri
-SuppliersCategoriesShort=Categorie fornitori
-CustomersCategoriesShort=Categorie clienti
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Categorie clienti potenziali
-ProductsCategoriesShort=Categorie dei prodotti/servizi
-MembersCategoriesShort=Categorie membri
-ContactCategoriesShort=Categorie di contatti
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Questa categoria non contiene alcun prodotto
 ThisCategoryHasNoSupplier=Questa categoria non contiene alcun fornitore
 ThisCategoryHasNoCustomer=Questa categoria non contiene alcun cliente
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Questa categoria non contiene contatti
 AssignedToCustomer=Assegnato ad un cliente
 AssignedToTheCustomer=Assegnato al cliente
 InternalCategory=Categoria interna
-CategoryContents=Contenuti categoria
-CategId=Id categoria
-CatSupList=Elenco delle categorie per i fornitori
-CatCusList=Elenco delle categorie per i clienti/clienti potenziali
-CatProdList=Elenco delle categorie per i prodotti
-CatMemberList=Elenco delle categorie per i membri
-CatContactList=Lista di categorie di contatti e di contatti
-CatSupLinks=Collegamenti tra fornitori e categorie
-CatCusLinks=Collegamenti tra clienti/clienti potenziali e categorie
-CatProdLinks=Collegamenti tra prodotti/servizi e categorie
-CatMemberLinks=Collegamenti tra membri e categorie
-DeleteFromCat=Elimina dalla categoria
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Foto cancellata
 ConfirmDeletePicture=Confermi l'eliminazione della foto?
 ExtraFieldsCategories=Campi extra
-CategoriesSetup=Impostazioni categorie
-CategorieRecursiv=Collega automaticamente con la categoria padre
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Se attivata, il prodotto sarà inserito anche nella categoria padre quando  lo aggiungi ad una sottocategoria
 AddProductServiceIntoCategory=Aggiungi il seguente prodotto/servizio
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index edb0ea5183b..f0fa432c985 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Output dell'ultimo avvio
 CronLastResult=Codice del risultato dell'ultima esecuzione
 CronListOfCronJobs=Lista dei job programmati
 CronCommand=Comando
-CronList=Lista dei job
-CronDelete= Cancella job di cron
-CronConfirmDelete= Vuoi davvero cancellare questa azione pianificata?
-CronExecute=Esegui azione
-CronConfirmExecute= Sei sicuro di voler eseguire ora questo job
-CronInfo= I job possono eseguire compiti pianificati
-CronWaitingJobs=Job in attesa
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Azione
-CronNone= Nessuno
+CronNone=Nessuno
 CronDtStart=Data di inizio
 CronDtEnd=Data di fine
 CronDtNextLaunch=Prossima esecuzione
@@ -75,6 +75,7 @@ CronObjectHelp=Nome dell'oggetto da caricare. 
    Per esempio per ottenere il me
 CronMethodHelp=Nome del metodo dell'oggetto da eseguire. 
    Per esempio per ottenere il metodo dell'oggetto /htdocs/product/class/product.class.php, il valore da inserire è fetch
 CronArgsHelp=Argomenti del metodo.
     Per esempio per ottenere il metodo corretto dell'oggetto /htdocs/product/class/product.class.php, il valore dei parametri può essere 0, ProductRef
 CronCommandHelp=Il comando da eseguire sul sistema
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informazioni
 # Common
diff --git a/htdocs/langs/it_IT/donations.lang b/htdocs/langs/it_IT/donations.lang
index 6ee8837eeeb..67c45f72dba 100644
--- a/htdocs/langs/it_IT/donations.lang
+++ b/htdocs/langs/it_IT/donations.lang
@@ -6,6 +6,8 @@ Donor=Donatore
 Donors=Donatori
 AddDonation=Crea donazione
 NewDonation=Nuova donazione
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Visualizza donazione
 DonationPromise=Donazione promessa
 PromisesNotValid=Promesse non convalidate
@@ -21,6 +23,8 @@ DonationStatusPaid=Donazione ricevuta
 DonationStatusPromiseNotValidatedShort=Bozza
 DonationStatusPromiseValidatedShort=Promessa convalidata
 DonationStatusPaidShort=Ricevuta
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Convalida promessa
 DonationReceipt=Ricevuta per donazione
 BuildDonationReceipt=Genera ricevuta donazione
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 69de1916c4b..61c8dcff477 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=I parametri di configurazione obbligatori non sono ancora stati definiti
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 9e5b6c21480..a99f261e44f 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Elenco delle notifiche spedite per email
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index a545e5a156d..699cb4296bd 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -352,6 +352,7 @@ Status=Stato
 Favorite=Preferito
 ShortInfo=Info.
 Ref=Rif.
+ExternalRef=Ref. extern
 RefSupplier=Rif. fornitore
 RefPayment=Rif. pagamento
 CommercialProposalsShort=Preventivi/Proposte commerciali
@@ -394,8 +395,8 @@ Available=Disponibile
 NotYetAvailable=Non ancora disponibile
 NotAvailable=Non disponibile
 Popularity=Popularità
-Categories=Categorie
-Category=Categoria
+Categories=Tags/categories
+Category=Tag/category
 By=Per
 From=Da
 to=a
@@ -694,6 +695,7 @@ AddBox=Aggiungi box
 SelectElementAndClickRefresh=Seleziona un elemento e clicca Aggiorna
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Lunedì
 Tuesday=Martedì
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index 7206efd62c2..ceec5498561 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Spedisci prodotto
 Discount=Sconto
 CreateOrder=Crea ordine
 RefuseOrder=Rifiuta ordine
-ApproveOrder=Accetta ordine
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Convalida ordine
 UnvalidateOrder=Invalida ordine
 DeleteOrder=Elimina ordine
@@ -102,6 +103,8 @@ ClassifyBilled=Classifica "fatturato"
 ComptaCard=Scheda contabilità
 DraftOrders=Bozze di ordini
 RelatedOrders=Ordini collegati
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Ordini in lavorazione
 RefOrder=Rif. ordine
 RefCustomerOrder=Rif. ordine cliente
@@ -118,6 +121,7 @@ PaymentOrderRef=Riferimento pagamento ordine %s
 CloneOrder=Clona ordine
 ConfirmCloneOrder=Vuoi davvero clonare l'ordine %s?
 DispatchSupplierOrder=Ricezione ordine fornitore %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsabile ordini cliente
 TypeContact_commande_internal_SHIPPING=Responsabile spedizioni cliente
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index ef337e3c36c..dd2e00eb508 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervento convalidato
 Notify_FICHINTER_SENTBYMAIL=Intervento inviato per posta
 Notify_BILL_VALIDATE=Convalida fattura attiva
 Notify_BILL_UNVALIDATE=Ricevuta cliente non convalidata
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Ordine fornitore approvato
 Notify_ORDER_SUPPLIER_REFUSE=Ordine fornitore rifiutato
 Notify_ORDER_VALIDATE=Ordine cliente convalidato
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Proposta inviata per email
 Notify_BILL_PAYED=Fattura attiva pagata
 Notify_BILL_CANCEL=Fattura attiva annullata
 Notify_BILL_SENTBYMAIL=Fattura attiva inviata per email
-Notify_ORDER_SUPPLIER_VALIDATE=Ordine fornitore convalidato
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Ordine fornitore inviato per email
 Notify_BILL_SUPPLIER_VALIDATE=Fattura fornitore convalidata
 Notify_BILL_SUPPLIER_PAYED=Fattura fornitore pagata
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Creazione del progetto
 Notify_TASK_CREATE=Attività creata
 Notify_TASK_MODIFY=Attività modificata
 Notify_TASK_DELETE=Attività cancellata
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Numero di file/documenti allegati
 TotalSizeOfAttachedFiles=Dimensione totale dei file/documenti allegati
 MaxSize=La dimensione massima è
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Fattura %s convalidata
 EMailTextProposalValidated=Proposta %s convalidata.
 EMailTextOrderValidated=Ordine %s convalidato.
 EMailTextOrderApproved=Ordine %s approvato
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Ordine %s approvato da %s
 EMailTextOrderRefused=Ordine %s rifiutato
 EMailTextOrderRefusedBy=Ordine %s rifiutato da %s
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 6bb5e68614e..950d8dc38ef 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Il prezzo minimo raccomandato è: %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index ce4d893f0fd..d12ac2a4ad0 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Elenco delle fatture passive associate al
 ListContractAssociatedProject=Elenco dei contratti associati al progetto
 ListFichinterAssociatedProject=Elenco degli interventi associati al progetto
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Elenco delle azioni associate al progetto
 ActivityOnProjectThisWeek=Operatività sul progetto questa settimana
 ActivityOnProjectThisMonth=Operatività sul progetto questo mese
@@ -130,13 +131,15 @@ AddElement=Link all'elemento
 UnlinkElement=Rimuovi collegamento
 # Documents models
 DocumentModelBaleine=Modello per il report di un progetto completo (logo, etc..)
-PlannedWorkload = Carico di lavoro previsto
-WorkloadOccupation= Carico di lavoro supposto
+PlannedWorkload=Carico di lavoro previsto
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Elementi correlati
 SearchAProject=Cerca un progetto
 ProjectMustBeValidatedFirst=I progetti devono prima essere validati
 ProjectDraft=Progetti bozza
 FirstAddRessourceToAllocateTime=Associa una risorsa per allocare il tempo
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index b4a29ef16c4..319b526628e 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Rif. spedizione
 Sending=Spedizione
 Sendings=Spedizioni
+AllSendings=All Shipments
 Shipment=Spedizione
 Shipments=Spedizioni
 ShowSending=Show Sending
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index 9d21cef1c12..49343fbc66e 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Elenco ordini fornitori
 MenuOrdersSupplierToBill=Ordini fornitori in fatture
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index bac8eb6dbcf..a2a0af90f93 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=通知
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=寄付
@@ -508,14 +511,14 @@ Module1400Name=会計
 Module1400Desc=会計管理（二者）
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=カテゴリー
-Module1780Desc=Categorieの管理（製品、サプライヤー、顧客）
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYGエディタ
 Module2000Desc=高度なエディタを使用して、いくつかのテキストエリアを編集することができます
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=議題
 Module2400Desc=イベント/タスクと議題の管理
 Module2500Name=電子コンテンツ管理
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=サービスを読む
 Permission532=サービスを作成/変更
 Permission534=サービスを削除する
@@ -746,6 +754,7 @@ Permission1185=サプライヤの注文を承認する
 Permission1186=注文サプライヤーの受注
 Permission1187=サプライヤの受注を認める
 Permission1188=サプライヤの注文を削除する
+Permission1190=Approve (second approval) supplier orders
 Permission1201=エクスポートの結果を得る
 Permission1202=エクスポートを作成/変更
 Permission1231=サプライヤーの請求書をお読みください
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=データベース（データロード）に外部データの大量インポートを実行する
 Permission1321=顧客の請求書、属性、および支払いをエクスポートする
 Permission1421=顧客の注文と属性をエクスポートします。
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=自分のアカウントにリンクされたアクション（イベントまたはタスク）を読む
 Permission2402=作成/変更するアクション（イベントまたはタスク）が自分のアカウントにリンクされている
 Permission2403=自分のアカウントにリンクされたアクション（イベントまたはタスク）を削除
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=によって建てられた会計コードを返しま
 ModuleCompanyCodePanicum=空の会計コードを返します。
 ModuleCompanyCodeDigitaria=会計コードがサードパーティのコードに依存しています。コー​​ドは、文字サードパーティのコードの最初の5文字が続く最初の位置に "C"で構成されています。
 UseNotifications=通知を使用する
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=ドキュメントテンプレート
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=ドラフト文書に透かし
@@ -1557,6 +1566,7 @@ SuppliersSetup=サプライヤーモジュールのセットアップ
 SuppliersCommandModel=サプライヤーのための完全なテンプレート（logo. ..）
 SuppliersInvoiceModel=サプライヤーの請求書の完全なテンプレート（logo. ..）
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=のGeoIP Maxmindモジュールのセットアップ
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 292509ba6e8..24c589e4fb1 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=請求書%sは、検証
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=請求書%sはドラフトの状態に戻って
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= 注文%sは、検証
+OrderValidatedInDolibarr=注文%sは、検証
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=ご注文はキャンセル%s
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=注文%sは、承認された
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=注文%sは、ドラフトの状態に戻って
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index f27ee25bc1a..7a6c45ea12d 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=支払いがすでに行わ
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=支払いルール
 PaymentMode=お支払い方法の種類
-PaymentConditions=支払期間
-PaymentConditionsShort=支払期間
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=支払金額
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=支払うために思い出させるよりも高い支払い
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=二つの新しい割引の合計は元の
 ConfirmRemoveDiscount=この割引を削除してよろしいですか？
 RelatedBill=関連する請求書
 RelatedBills=関連する請求書
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index 697c8c985dc..6027c5137f4 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=カテゴリ
-Categories=カテゴリー
-Rubrique=カテゴリ
-Rubriques=カテゴリー
-categories=カテゴリ
-TheCategorie=カテゴリ
-NoCategoryYet=このタイプのカテゴリが作成されません
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=で
 AddIn=加える
 modify=修正する
 Classify=分類する
-CategoriesArea=カテゴリーエリア
-ProductsCategoriesArea=製品/サービスのカテゴリエリア
-SuppliersCategoriesArea=サプライヤーカテゴリエリア
-CustomersCategoriesArea=お客さまカテゴリエリア
-ThirdPartyCategoriesArea=第三者カテゴリエリア
-MembersCategoriesArea=メンバーカテゴリエリア
-ContactsCategoriesArea=Contacts categories area
-MainCats=主なカテゴリ
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=サブカテゴリ
 CatStatistics=統計
-CatList=カテゴリの一覧
-AllCats=すべてのカテゴリ
-ViewCat=カテゴリを見る
-NewCat=カテゴリを追加
-NewCategory=新しいカテゴリ
-ModifCat=カテゴリを変更
-CatCreated=カテゴリを作成
-CreateCat=カテゴリーを作成する
-CreateThisCat=このカテゴリを作成する
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=フィールドを検証する
 NoSubCat=いいえサブカテゴリはありません。
 SubCatOf=サブカテゴリ
-FoundCats=見つかったカテゴリ
-FoundCatsForName=名前が見つかりカテゴリー：
-FoundSubCatsIn=カテゴリにサブカテゴリ
-ErrSameCatSelected=あなたは、同じカテゴリを数回選択
-ErrForgotCat=あなたはカテゴリを選択するのを忘れた
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=あなたは、フィールドを通知するのを忘れた
 ErrCatAlreadyExists=この名前はすでに使用されています
-AddProductToCat=カテゴリにこの製品を追加しますか？
-ImpossibleAddCat=カテゴリを追加することは不可能
-ImpossibleAssociateCategory=にカテゴリを関連付けることが不可能
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%sが正常に追加されました。
-ObjectAlreadyLinkedToCategory=要素は、既にこのカテゴリにリンクされています。
-CategorySuccessfullyCreated=このカテゴリの%sは成功して追加されました。
-ProductIsInCategories=製品/サービスは、次のカテゴリに所有している
-SupplierIsInCategories=サードパーティは、以下の仕入先のカテゴリに所有している
-CompanyIsInCustomersCategories=この第三者には、次の顧客/見込み客のカテゴリに所有している
-CompanyIsInSuppliersCategories=この第三者は、以下の仕入先のカテゴリに所有している
-MemberIsInCategories=このメンバは、次のメンバカテゴリに所有している
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=この製品/サービスの任意のカテゴリではありません
-SupplierHasNoCategory=このサプライヤーは、任意のカテゴリではありません
-CompanyHasNoCategory=この会社は、任意のカテゴリではありません
-MemberHasNoCategory=このメンバは、任意のカテゴリではありません
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=カテゴリに分類する
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=なし
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=このカテゴリには、このrefで既に存在している
 ReturnInProduct=戻る製品/サービスカード
 ReturnInSupplier=サプライヤーカードにバックアップする
@@ -66,22 +64,22 @@ ReturnInCompany=戻る顧客/見込み客カードに
 ContentsVisibleByAll=内容は、すべてで見えるようになります
 ContentsVisibleByAllShort=すべてから見える内容
 ContentsNotVisibleByAllShort=すべてでは表示されない内容
-CategoriesTree=Categories tree
-DeleteCategory=カテゴリを削除します。
-ConfirmDeleteCategory=このカテゴリを削除してもよろしいですか？
-RemoveFromCategory=categorieのリンクを削除します。
-RemoveFromCategoryConfirm=あなたは、トランザクションとカテゴリ間のリンクを削除してよろしいですか？
-NoCategoriesDefined=にカテゴリが定義されていません
-SuppliersCategoryShort=サプライヤーカテゴリ
-CustomersCategoryShort=お客さまのカテゴリ
-ProductsCategoryShort=製品カテゴリ
-MembersCategoryShort=メンバーカテゴリ
-SuppliersCategoriesShort=仕入先のカテゴリ
-CustomersCategoriesShort=お客さまのカテゴリ
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=クスト/ Prosp。カテゴリ
-ProductsCategoriesShort=製品カテゴリ
-MembersCategoriesShort=メンバーカテゴリ
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=このカテゴリにはどの製品も含まれていません。
 ThisCategoryHasNoSupplier=このカテゴリにはすべてのサプライヤーが含まれていません。
 ThisCategoryHasNoCustomer=このカテゴリにはすべての顧客が含まれていません。
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=顧客に割り当てられ
 AssignedToTheCustomer=顧客に割り当てられ
 InternalCategory=内部カテゴリ
-CategoryContents=カテゴリの内容
-CategId=カテゴリID
-CatSupList=サプライヤーカテゴリの一覧
-CatCusList=顧客/見込み客のカテゴリのリスト
-CatProdList=製品カテゴリの一覧
-CatMemberList=メンバーカテゴリの一覧
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index d10cb4a8784..103bd29a409 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= なし
+CronNone=なし
 CronDtStart=開始日
 CronDtEnd=終了日
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang
index 10ce21a04c4..788a696e7ca 100644
--- a/htdocs/langs/ja_JP/donations.lang
+++ b/htdocs/langs/ja_JP/donations.lang
@@ -6,6 +6,8 @@ Donor=ドナー
 Donors=ドナー
 AddDonation=Create a donation
 NewDonation=新しい寄付
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=ギフト約束
 PromisesNotValid=検証されていない約束
@@ -21,6 +23,8 @@ DonationStatusPaid=寄付は、受信した
 DonationStatusPromiseNotValidatedShort=ドラフト
 DonationStatusPromiseValidatedShort=検証
 DonationStatusPaidShort=受信された
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=約束を検証する
 DonationReceipt=Donation receipt
 BuildDonationReceipt=領収書を構築する
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 852bc364ace..609e4764bfe 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index f5138fd4a12..42b6f7a5e5f 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=送信されたすべての電子メール通知を一
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 66fd5efdecf..0b44e77f1ef 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -352,6 +352,7 @@ Status=ステータス
 Favorite=Favorite
 ShortInfo=Info.
 Ref=REF。
+ExternalRef=Ref. extern
 RefSupplier=REF。サプライヤー
 RefPayment=REF。支払い
 CommercialProposalsShort=商用の提案
@@ -394,8 +395,8 @@ Available=利用できる
 NotYetAvailable=まだ利用できません
 NotAvailable=利用できない
 Popularity=人気
-Categories=カテゴリー
-Category=カテゴリ
+Categories=Tags/categories
+Category=Tag/category
 By=によって
 From=から
 to=へ
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=月曜日
 Tuesday=火曜日
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index f0267668aed..797306821d6 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=船積
 Discount=割引
 CreateOrder=順序を作成します。
 RefuseOrder=順番を拒否
-ApproveOrder=順序を受け入れる
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=順序を検証する
 UnvalidateOrder=順序をUnvalidate
 DeleteOrder=順序を削除する
@@ -102,6 +103,8 @@ ClassifyBilled="銘打たれた"分類
 ComptaCard=会計カード
 DraftOrders=ドラフト注文
 RelatedOrders=関連受注
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=プロセス受注
 RefOrder=REF。オーダー
 RefCustomerOrder=REF。顧客注文
@@ -118,6 +121,7 @@ PaymentOrderRef=オーダーの%sの支払い
 CloneOrder=クローンの順序
 ConfirmCloneOrder=あなたは、この順序%sのクローンを作成してもよろしいですか？
 DispatchSupplierOrder=サプライヤの注文%sを受信
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=代表的なフォローアップ、顧客の注文
 TypeContact_commande_internal_SHIPPING=代表的なフォローアップ出荷
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index fe4bdc9e962..af1c98b5cf3 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=介入は、検証
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=顧客への請求書が検証さ
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=サプライヤーの順序は、承認さ
 Notify_ORDER_SUPPLIER_REFUSE=サプライヤーのオーダーが拒否されました
 Notify_ORDER_VALIDATE=検証済みの顧客の注文
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=電子メールによって送信された商業提案
 Notify_BILL_PAYED=顧客への請求はpayed
 Notify_BILL_CANCEL=顧客への請求書が取り消さ
 Notify_BILL_SENTBYMAIL=メールで送信された顧客への請求書
-Notify_ORDER_SUPPLIER_VALIDATE=検証サプライヤーのため
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=メールでの送信サプライヤー順
 Notify_BILL_SUPPLIER_VALIDATE=サプライヤの請求書が検証さ
 Notify_BILL_SUPPLIER_PAYED=サプライヤの請求書はpayed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=添付ファイル/文書の数
 TotalSizeOfAttachedFiles=添付ファイル/文書の合計サイズ
 MaxSize=最大サイズ
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=請求書%sが検証されています。
 EMailTextProposalValidated=提案%sが検証されています。
 EMailTextOrderValidated=注文%sが検証されています。
 EMailTextOrderApproved=注文%sが承認されました。
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=注文%sは%sによって承認されている。
 EMailTextOrderRefused=注文%sは拒否されました。
 EMailTextOrderRefusedBy=注文%sは%sによって拒否されました。
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index cadaad87d96..bb0d1ca3050 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 0011d0ab801..84f8113a5e4 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=プロジェクトに関連付けられて
 ListContractAssociatedProject=プロジェクトに関連付けられている契約のリスト
 ListFichinterAssociatedProject=プロジェクトに関連付けられている介入のリスト
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=プロジェクトに関連付けられているイベントのリスト
 ActivityOnProjectThisWeek=プロジェクト今週のアクティビティ
 ActivityOnProjectThisMonth=プロジェクトの活動今月
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=完全なプロジェクトのレポートモデル（logo. ..）
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index 43ca3aaec39..d7fc750da77 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=REF。出荷
 Sending=出荷
 Sendings=出荷
+AllSendings=All Shipments
 Shipment=出荷
 Shipments=出荷
 ShowSending=Show Sending
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index 0596adaa02c..8b71d67b2ab 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/ka_GE/agenda.lang b/htdocs/langs/ka_GE/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/ka_GE/agenda.lang
+++ b/htdocs/langs/ka_GE/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index 7232f00e91c..014996eee65 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/ka_GE/categories.lang
+++ b/htdocs/langs/ka_GE/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/ka_GE/donations.lang b/htdocs/langs/ka_GE/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/ka_GE/donations.lang
+++ b/htdocs/langs/ka_GE/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index d40e28cb776..4b393ec50c5 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/ka_GE/orders.lang
+++ b/htdocs/langs/ka_GE/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ka_GE/sendings.lang b/htdocs/langs/ka_GE/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/ka_GE/sendings.lang
+++ b/htdocs/langs/ka_GE/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/ka_GE/suppliers.lang
+++ b/htdocs/langs/ka_GE/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/kn_IN/agenda.lang b/htdocs/langs/kn_IN/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/kn_IN/agenda.lang
+++ b/htdocs/langs/kn_IN/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index 7232f00e91c..014996eee65 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/kn_IN/categories.lang
+++ b/htdocs/langs/kn_IN/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/kn_IN/cron.lang
+++ b/htdocs/langs/kn_IN/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/kn_IN/donations.lang b/htdocs/langs/kn_IN/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/kn_IN/donations.lang
+++ b/htdocs/langs/kn_IN/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index d40e28cb776..4b393ec50c5 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/kn_IN/orders.lang
+++ b/htdocs/langs/kn_IN/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/kn_IN/sendings.lang b/htdocs/langs/kn_IN/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/kn_IN/sendings.lang
+++ b/htdocs/langs/kn_IN/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/kn_IN/suppliers.lang
+++ b/htdocs/langs/kn_IN/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index af647d9f52c..a554ac64ee7 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
index 99f110deaf9..06b08f18561 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 7232f00e91c..014996eee65 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/ko_KR/donations.lang b/htdocs/langs/ko_KR/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/ko_KR/donations.lang
+++ b/htdocs/langs/ko_KR/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 7c88ed9e005..636e4ed9ef1 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index dd8caefab78..3b2fcaf0f52 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index de1eb65bf14..2f1e4633ebe 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=월요일
 Tuesday=화요일
diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/ko_KR/orders.lang
+++ b/htdocs/langs/ko_KR/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index 80399108329..bcee06dd11b 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/ko_KR/sendings.lang
+++ b/htdocs/langs/ko_KR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/ko_KR/suppliers.lang
+++ b/htdocs/langs/ko_KR/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 0b715dc2929..879f9fc27c8 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -7,20 +7,20 @@ Chartofaccounts=Chart of accounts
 Fiscalyear=Fiscal years
 Menuaccount=Accounting accounts
 Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+MenuTools=ເຄື່ອງມື
 
 ConfigAccountingExpert=Configuration of the module accounting expert
 Journaux=Journals
 JournalFinancial=Financial journals
 Exports=Exports
-Export=Export
+Export=ສົ່ງອອກ
 Modelcsv=Model of export
 OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
 Selectmodelcsv=Select a model of export
 Modelcsv_normal=Classic export
 Modelcsv_CEGID=Export towards CEGID Expert
 BackToChartofaccounts=Return chart of accounts
-Back=Return
+Back=ກັບຄືນ
 
 Definechartofaccounts=Define a chart of accounts
 Selectchartofaccounts=Select a chart of accounts
@@ -34,13 +34,13 @@ Dispatched=Dispatched
 CustomersVentilation=Breakdown customers
 SuppliersVentilation=Breakdown suppliers
 TradeMargin=Trade margin
-Reports=Reports
+Reports=ບົດລາຍງານ
 ByCustomerInvoice=By invoices customers
 ByMonth=By Month
 NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
+Update=ປັບປຸງ
+List=ລາຍການ
+Create=ສ້າງ
 UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
@@ -94,10 +94,10 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
 
-Doctype=Type of document
-Docdate=Date
+Doctype=ປະເພດເອກະສານ
+Docdate=ວັນທີ
 Docref=Reference
-Numerocompte=Account
+Numerocompte=ບັນຊີ
 Code_tiers=Thirdparty
 Labelcompte=Label account
 Debit=Debit
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/lo_LA/agenda.lang b/htdocs/langs/lo_LA/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/lo_LA/agenda.lang
+++ b/htdocs/langs/lo_LA/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index a2306950fb4..5893c36a4f6 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=Bank
-Banks=Banks
-MenuBankCash=Bank/Cash
-MenuSetupBank=Bank/Cash setup
-BankName=Bank name
-FinancialAccount=Account
-FinancialAccounts=Accounts
-BankAccount=Bank account
+Bank=ທະນາຄານ
+Banks=ທະນາຄານ
+MenuBankCash=ທະນາຄານ/ເງິນສົດ
+MenuSetupBank=ທະນາຄານ/ຕັ້ງຄ່າເງິນສົດ
+BankName=ຊື່ທະນາຄານ
+FinancialAccount=ບັນຊີ
+FinancialAccounts=ບັນຊີ
+BankAccount=ບັນຊີທະນາຄານ
 BankAccounts=Bank accounts
 ShowAccount=Show Account
 AccountRef=Financial account ref
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 7232f00e91c..014996eee65 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/lo_LA/categories.lang
+++ b/htdocs/langs/lo_LA/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/lo_LA/cron.lang
+++ b/htdocs/langs/lo_LA/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/lo_LA/donations.lang b/htdocs/langs/lo_LA/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/lo_LA/donations.lang
+++ b/htdocs/langs/lo_LA/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index d40e28cb776..4b393ec50c5 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/lo_LA/orders.lang
+++ b/htdocs/langs/lo_LA/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/lo_LA/sendings.lang b/htdocs/langs/lo_LA/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/lo_LA/sendings.lang
+++ b/htdocs/langs/lo_LA/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/lo_LA/suppliers.lang
+++ b/htdocs/langs/lo_LA/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index baf209f9d1c..52c2f25d8b0 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -4,43 +4,43 @@ UserCard=User card
 ContactCard=Contact card
 GroupCard=Group card
 NoContactCard=No card among contacts
-Permission=Permission
-Permissions=Permissions
-EditPassword=Edit password
-SendNewPassword=Regenerate and send password
-ReinitPassword=Regenerate password
+Permission=ການອະນຸຍາດ
+Permissions=ການອະນຸຍາດ
+EditPassword=ແກ້ໄຂລະຫັດຜ່ານ
+SendNewPassword=ສ້າງລະຫັດຜ່ານແບບສຸ່ມ ແລະ ສົ່ງ
+ReinitPassword=ສ້າງລະຫັດແບບສຸ່ມ
 PasswordChangedTo=Password changed to: %s
-SubjectNewPassword=Your new password for Dolibarr
+SubjectNewPassword=ລະຫັດຜ່ານໃຫມ່ຂອງທ່ານສຳລັບ Dolibarr
 AvailableRights=Available permissions
 OwnedRights=Owned permissions
 GroupRights=Group permissions
 UserRights=User permissions
 UserGUISetup=User display setup
-DisableUser=Disable
-DisableAUser=Disable a user
-DeleteUser=Delete
-DeleteAUser=Delete a user
-DisableGroup=Disable
-DisableAGroup=Disable a group
-EnableAUser=Enable a user
-EnableAGroup=Enable a group
-DeleteGroup=Delete
-DeleteAGroup=Delete a group
-ConfirmDisableUser=Are you sure you want to disable user %s ?
-ConfirmDisableGroup=Are you sure you want to disable group %s ?
-ConfirmDeleteUser=Are you sure you want to delete user %s ?
-ConfirmDeleteGroup=Are you sure you want to delete group %s ?
-ConfirmEnableUser=Are you sure you want to enable user %s ?
-ConfirmEnableGroup=Are you sure you want to enable group %s ?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user %s ?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user %s ?
-NewUser=New user
-CreateUser=Create user
-SearchAGroup=Search a group
-SearchAUser=Search a user
+DisableUser=ປິດການນຳໃຊ້
+DisableAUser=ປິດຜູ້ນຳໃຊ້
+DeleteUser=ລຶບ
+DeleteAUser=ລຶບຜູ້ນຳໃຊ້
+DisableGroup=ປິດການນຳໃຊ້
+DisableAGroup=ປິດນຳໃຊ້ກຸ່ມ
+EnableAUser=ເປີດຜູ້ນຳໃຊ້
+EnableAGroup=ເປີດນຳໃຊ້ກຸ່ມ
+DeleteGroup=ລຶບ
+DeleteAGroup=ລຶບກຸ່ມ
+ConfirmDisableUser=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການປິດນຳໃຊ້ຜູ້ນຳໃຊ້ %s ?
+ConfirmDisableGroup=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການປິດນຳໃຊ້ກຸ່ມ %s ?
+ConfirmDeleteUser=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການລຶບຜູ້ນຳໃຊ້ %s ?
+ConfirmDeleteGroup=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການລຶບກຸ່ມ %s ?
+ConfirmEnableUser=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການເປີດຜູ້ນຳໃຊ້ %s ?
+ConfirmEnableGroup=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການເປີດນຳໃຊ້ກຸ່ມ %s ?
+ConfirmReinitPassword=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການສ້າງລະຫັດຜ່ານແບບສຸ່ມໃໝ່ຜູ້ນຳໃຊ້ %s ?
+ConfirmSendNewPassword=ທ່ານແນ່ໃຈບໍວ່າທ່ານຕ້ອງການສ້າງລະຫັດຜ່ານແບບສຸ່ມໃໝ່ ແລະ ສົ່ງໃຫ້ຜູ້ນຳໃຊ້ %s ?
+NewUser=ຜູ້ນຳໃຊ້ໃໝ່
+CreateUser=ສ້າງຜູ້ນຳໃຊ້ໃໝ່
+SearchAGroup=ຄົ້ນຫາກຸ່ມ
+SearchAUser=ຄົ້ນຫາຜູ້ນຳໃຊ້
 LoginNotDefined=Login is not defined.
 NameNotDefined=Name is not defined.
-ListOfUsers=List of users
+ListOfUsers=ລາຍການຂອງຜູ້ນຳໃຊ້
 Administrator=Administrator
 SuperAdministrator=Super Administrator
 SuperAdministratorDesc=Global administrator
@@ -48,19 +48,19 @@ AdministratorDesc=Administrator's entity
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here default permissions that are automatically granted to a new created user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Name
-FirstName=First name
-ListOfGroups=List of groups
-NewGroup=New group
-CreateGroup=Create group
-RemoveFromGroup=Remove from group
+LastName=ຊື່
+FirstName=ຊື່ແທ້
+ListOfGroups=ລາຍການຂອງກຸ່ມ
+NewGroup=ກຸ່ມໃໝ່
+CreateGroup=ສ້າງກຸ່ມ
+RemoveFromGroup=ລຶບຈາກກຸ່ມ
 PasswordChangedAndSentTo=Password changed and sent to %s.
 PasswordChangeRequestSent=Request to change password for %s sent to %s.
 MenuUsersAndGroups=Users & Groups
 LastGroupsCreated=Last %s created groups
 LastUsersCreated=Last %s users created
-ShowGroup=Show group
-ShowUser=Show user
+ShowGroup=ສະແດງກຸ່ມ
+ShowUser=ສະແດງຜູ້ນຳໃຊ້
 NonAffectedUsers=Non assigned users
 UserModified=User modified successfully
 PhotoFile=Photo file
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index bb9b358c045..9ca41bce1f9 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
 
-Accounting=Accounting
-Globalparameters=Global parameters
+Accounting=Apskaita
+Globalparameters=Bendrieji parametrai
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
+Fiscalyear=Fiskaliniai metai
+Menuaccount=Apskaitos sąskaitos
 Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+MenuTools=Įrankiai
 
 ConfigAccountingExpert=Configuration of the module accounting expert
 Journaux=Journals
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 0a9afd42fe8..9ab50d7e82a 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separatorius
 ExtrafieldCheckBox=Žymimasis langelis ("paukščiukas")
 ExtrafieldRadio=Opcijų mygtukai
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Specialiosios išlaidos (mokesčiai, socialinės įmokos, dividend
 Module500Desc=Spec. išlaidų valdymas, pavyzdžiui: mokesčių, socialinių įmokų, dividendų ir atlyginimų
 Module510Name=Atlyginimai
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Pranešimai
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Parama
@@ -508,14 +511,14 @@ Module1400Name=Apskaita
 Module1400Desc=Apskaitos valdymas (dvivietės šalys)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorijos
-Module1780Desc=Kategorijų valdymas (produktai, tiekėjai ir klientai)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG redaktorius
 Module2000Desc=Leisti redaguoti tam tikrą teksto sritį naudojant pažangų redaktorių
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Numatomų užduočių valdymas
+Module2300Desc=Scheduled job management
 Module2400Name=Darbotvarkė
 Module2400Desc=Renginių/užduočių ir darbotvarkės valdymas
 Module2500Name=Elektroninis Turinio Valdymas
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Skaityti paslaugas
 Permission532=Sukurti/keisti paslaugas
 Permission534=Ištrinti paslaugas
@@ -746,6 +754,7 @@ Permission1185=Patvirtinti tiekėjo užsakymus
 Permission1186=Tvarkyti tiekėjo užsakymus
 Permission1187=Pripažinti tiekėjo užsakymų įplaukas
 Permission1188=Ištrinti tiekėjo užsakymus
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Gauti eksporto rezultatą
 Permission1202=Sukurti/keisti eksportą
 Permission1231=Skaityti tiekėjo sąskaitas-faktūras
@@ -758,10 +767,10 @@ Permission1237=Eksportuoti tiekėjo užsakymus ir jų detales
 Permission1251=Pradėti masinį išorinių duomenų importą į duomenų bazę (duomenų užkrovimas)
 Permission1321=Eksportuoti klientų sąskaitas-faktūras, atributus ir mokėjimus
 Permission1421=Eksportuoti klientų užsakymus ir atributus
-Permission23001 = Skaityti suplanuotas užduotis
-Permission23002 = Sukurti/atnaujinti suplanuotas užduotis
-Permission23003 = Ištrinti suplanuotas užduotis
-Permission23004 = Vykdyti suplanuotas užduotis
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Skaityti veiksmus (įvykiai ar užduotys), susijusius su jų sąskaita
 Permission2402=Sukurti/keisti veiksmus (įvykiai ar užduotys) susijusius su jų sąskaita
 Permission2403=Ištrinti veiksmus (įvykius ar užduotis), susijusius su jų sąskaita
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Grąžinti apskaitos kodą, sudarytą pagal:
    %s po
 ModuleCompanyCodePanicum=Grąžinti tuščią apskaitos kodą.
 ModuleCompanyCodeDigitaria=Apskaitos kodas priklauso nuo trečiosios šalies kodo. Kodas yra sudarytas iš simbolių "C" į pirmąją poziciją, toliau seka 5 simbolių trečiosios šalies kodas.
 UseNotifications=Naudokite pranešimus
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Dokumentų šablonai
 DocumentModelOdt=Sukurti dokumentus pagal OpenDocuments šablonus (.ODT arba .OAM failus OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vandens ženklas ant dokumento projekto
@@ -1557,6 +1566,7 @@ SuppliersSetup=Tiekėjo modulio nustatymas
 SuppliersCommandModel=Pilnas tiekėjo užsakymo šablonas (logo. ..)
 SuppliersInvoiceModel=Pilnas tiekėjo sąskaitos-faktūros šablonas (logo. ..)
 SuppliersInvoiceNumberingModel=Tiekėjo sąskaitų-faktūrų numeracijos modeliai
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modulio nustatymas
 PathToGeoIPMaxmindCountryDataFile=Kelias iki failo, kuriame yra MaxMind IP į šalies kalbą. 
     Pavyzdžiai: 
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
index a963e4807a3..53d5804edd2 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -6,11 +6,11 @@ Agenda=Operacijų sąrašas
 Agendas=Operacijų sąrašai
 Calendar=Kalendorius
 Calendars=Kalendoriai
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
+LocalAgenda=Vidinis kalendorius
+ActionsOwnedBy=Įvykio savininkas
 AffectedTo=Priskirtas
 DoneBy=Atliko
-Event=Event
+Event=Įvykis
 Events=Įvykiai
 EventsNb=Įvykių skaičius
 MyEvents=Mano įvykiai
@@ -23,20 +23,20 @@ MenuToDoActions=Visi neužbaigti įvykiai
 MenuDoneActions=Visi užbaigti/nutraukti įvykiai
 MenuToDoMyActions=Mano neužbaigti įvykiai
 MenuDoneMyActions=Mano užbaigti/nutraukti įvykiai
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Įvykių sąrašas (vidinis kalendorius)
 ActionsAskedBy=Įvykiai, apie kuriuos pranešė
 ActionsToDoBy=Įvykiai priskirti
 ActionsDoneBy=Įvykiai atlikti
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
-ActionAssignedTo=Event assigned to
+ActionsForUser=Įvykiai vartotojui
+ActionsForUsersGroup=Įvykiai visiems grupės vartotojams
+ActionAssignedTo=Įvykis priskirtas
 AllMyActions= Visi mano įvykiai/užduotys
 AllActions= Visi įvykiai/užduotys
 ViewList=Sąrašo vaizdas
 ViewCal=Mėnesio vaizdas
 ViewDay=Dienos vaizdas
 ViewWeek=Savaitės vaizdas
-ViewPerUser=Per user view
+ViewPerUser=Vartotojo nuomone
 ViewWithPredefinedFilters= Peržiūrėti su nustatytais filtrais
 AutoActions= Automatinis užpildymas
 AgendaAutoActionDesc= Nustatykite įvykius, kuriems norite, kad Dolibarr sukurtų automatiškai įvykį operacijoje. Jei niekas nepažymėta (pagal nutylėjimą), tik rankomis įvesti veiksmai bus įtraukti į operaciją.
@@ -45,10 +45,13 @@ AgendaExtSitesDesc=Šis puslapis leidžia paskelbti išorinius kalendorių šalt
 ActionsEvents=Įvykiai, kuriems Dolibarr sukurs veiksmą operacijų sąraše automatiškai
 PropalValidatedInDolibarr=Pasiūlymas %s pripažintas galiojančiu
 InvoiceValidatedInDolibarr=Sąskaita-faktūra %s pripažinta galiojančia
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Sąskaita patvirtinta per POS
 InvoiceBackToDraftInDolibarr=Sąskaita-faktūra %s grąžinama į projektinę būklę
 InvoiceDeleteDolibarr=Sąskaita-faktūra %s ištrinta
-OrderValidatedInDolibarr= Užsakymas %s pripažintas galiojančiu
+OrderValidatedInDolibarr=Užsakymas %s pripažintas galiojančiu
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Užsakymas %s atšauktas
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Užsakymas %s patvirtintas
 OrderRefusedInDolibarr=Užsakymas %s atmestas
 OrderBackToDraftInDolibarr=Užsakymas %s grąžintas į projektinę būklę
@@ -58,9 +61,9 @@ OrderSentByEMail=Kliento užsakymas %s atsiųstas e-paštu
 InvoiceSentByEMail=Kliento sąskaita-faktūra %s išsiųsta e-paštu
 SupplierOrderSentByEMail=Tiekėjo užsakymas %s atsiųstas e-paštu
 SupplierInvoiceSentByEMail=Tiekėjo sąskaita-faktūra %s atsiųsta e-paštu
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
+ShippingSentByEMail=Siunta %s išsiųsta EMail
+ShippingValidated= Siunta %s patvirtinta
+InterventionSentByEMail=Intervencija %s išsiųsta EMail
 NewCompanyToDolibarr= Trečioji šalis sukūrė
 DateActionPlannedStart= Planuojama pradžios data
 DateActionPlannedEnd= Planuojama pabaigos data
@@ -69,25 +72,27 @@ DateActionDoneEnd= Reali pabaigos data
 DateActionStart= Pradžios data
 DateActionEnd= Pabaigos data
 AgendaUrlOptions1=Taip pat galite pridėti šiuos parametrus išvesties filtravimui:
-AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s.
-AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s.
+AgendaUrlOptions2=login=%s uždrausti išvestis veiksmų sukurtų ar priskirtų vartotojui %s išvestis.
+AgendaUrlOptions3=logina=%s uždrausti vartotojo veiksmų išvestis %s.
 AgendaUrlOptions4=logint =%s ​​apriboti išvedimą veiksmais, priskirtais vartotojui %s.
-AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID.
+AgendaUrlOptionsProject=projektas=PROJECT_ID uždrausti veiksmų asocijuotų su projektu PROJECT_ID išvestis.
 AgendaShowBirthdayEvents=Rodyti gimtadienio adresatus
 AgendaHideBirthdayEvents=Paslėpti gimtadienio adresatus
 Busy=Užimtas
 ExportDataset_event1=Operacijos įvykių sąrašas
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Numatytoji darbo dienų sritis savaitėje (Pvz.: 1-5, 1-6)
+DefaultWorkingHours=Numatyta darbo valandų per dieną (Pvz.: 9-18)
 # External Sites ical
 ExportCal=Eksportuoti kalendorių
 ExtSites=Importuoti išorinį kalendorių
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Rodyti išorinius kalendorius (nustatytus pagrindinuose nustatymuose) darbotvarkėje. Neįtakoja išorinių kalendorių nustatytų vartotojo.
 ExtSitesNbOfAgenda=Kalendorių skaičius
 AgendaExtNb=Kalendoriaus nb %s
 ExtSiteUrlAgenda=URL prieiga prie .ical failo
 ExtSiteNoLabel=Aprašymo nėra
-WorkingTimeRange=Working time range
-WorkingDaysRange=Working days range
-AddEvent=Create event
-MyAvailability=My availability
+WorkingTimeRange=Darbo laiko sritis
+WorkingDaysRange=Darbo dienų sritis
+AddEvent=Sukurti įvykį
+MyAvailability=Mano eksploatacinė parengtis
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 109f690c9e9..7f5f7daea2d 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Jau atlikti mokėjimai
 PaymentsBackAlreadyDone=Jau atlikti mokėjimai atgal (grąžinimai)
 PaymentRule=Mokėjimo taisyklė
 PaymentMode=Mokėjimo būdas
-PaymentConditions=Mokėjimo terminas
-PaymentConditionsShort=Mokėjimo terminas
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Mokėjimo suma
 ValidatePayment=Mokėjimą pripažinti galiojančiu
 PaymentHigherThanReminderToPay=Mokėjimas svarbesnis už priminimą sumokėti
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Dviejų naujų nuolaidų suma turi būti ly
 ConfirmRemoveDiscount=Ar tikrai norite pašalinti šią nuolaidą ?
 RelatedBill=Susijusi sąskaita-faktūra
 RelatedBills=Susiję sąskaitos-faktūros
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index ffa404fbb6d..e601cd2fe33 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategorija
-Categories=Kategorijos
-Rubrique=Kategorija
-Rubriques=Kategorijos
-categories=kategorijos
-TheCategorie=Kategorija
-NoCategoryYet=Tokiam tipui nėra sukurtų kategorijų
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Į
 AddIn=Įtraukti
 modify=Pakeisti
 Classify=Priskirti
-CategoriesArea=Kategorijų sritis
-ProductsCategoriesArea=Produktų/Paslaugų kategorijų sritis
-SuppliersCategoriesArea=Tiekėjų kategorijų sritis
-CustomersCategoriesArea=Klientų kategorijų sritis
-ThirdPartyCategoriesArea=Trečiųjų šalių kategorijų sritis
-MembersCategoriesArea=Narių kategorijų sritis
-ContactsCategoriesArea=Adresatų kategorijų sritis
-MainCats=Pagrindinės kategorijos
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subkategorijos
 CatStatistics=Statistika
-CatList=Kategorijų sąrašas
-AllCats=Visos kategorijos
-ViewCat=Žiūrėti kategoriją
-NewCat=Įtraukti kategoriją
-NewCategory=Nauja kategorija
-ModifCat=Keisti kategoriją
-CatCreated=Kategorija sukurta
-CreateCat=Sukurti kategoriją
-CreateThisCat=Sukurti šią kategoriją
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Patvirtinti laukus
 NoSubCat=Nėra subkategorijos
 SubCatOf=Subkategorija
-FoundCats=Rastos kategorijos
-FoundCatsForName=Rasta kategorijos pavadinimui:
-FoundSubCatsIn=Kategorijoje rastos Subkategorijos
-ErrSameCatSelected=Pasirinkote tą pačią kategoriją keletą kartų
-ErrForgotCat=Pamiršote pasirinkti kategoriją
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Pamiršote informuoti laukus
 ErrCatAlreadyExists=Šis pavadinimas jau naudojamas
-AddProductToCat=Pridėti šį produktą į kategoriją ?
-ImpossibleAddCat=Neįmanoma pridėti kategoriją
-ImpossibleAssociateCategory=Neįmanoma susieti kategoriją
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s buvo sėkmingai įrašytas.
-ObjectAlreadyLinkedToCategory=Elementas jau yra susietas su šia kategorija
-CategorySuccessfullyCreated=Ši kategorija %s buvo pridėta sėkmingai
-ProductIsInCategories=Produktas/paslauga turi šias kategorijas
-SupplierIsInCategories=Trečioji šalis turi sekančias tiekėjų kategorijas
-CompanyIsInCustomersCategories=Ši trečioji šalis turi sekančias klientų/planų kategorijas
-CompanyIsInSuppliersCategories=Ši trečioji šalis turi sekančias tiekėjų kategorijas
-MemberIsInCategories=Šis narys priklauso sekančioms narių kategorijoms
-ContactIsInCategories=Šis adresatas priklauso sekančioms adresatų kategorijoms
-ProductHasNoCategory=Šis produktas/paslauga neturi jokių kategorijų
-SupplierHasNoCategory=Šis tiekėjas neturi jokių kategorijų
-CompanyHasNoCategory=Ši įmonė neturi jokių kategorijų
-MemberHasNoCategory=Šis narys neturi jokių kategorijų
-ContactHasNoCategory=Šis adresatas nėra jokioje kategorijoje
-ClassifyInCategory=Priskirti kategorijai
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Nė vienas
-NotCategorized=Be kategorijos
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Ši kategorija jau egzistuoja su šia nuoroda
 ReturnInProduct=Atgal į produkto/paslaugos kortelę
 ReturnInSupplier=Atgal į tiekėjo kortelę
@@ -66,22 +64,22 @@ ReturnInCompany=Atgal į kliento/plano kortelę
 ContentsVisibleByAll=Turinys bus matomas visiems
 ContentsVisibleByAllShort=Turinys matomas visiems
 ContentsNotVisibleByAllShort=Turinys nėra matomos visiems
-CategoriesTree=Kategorijų medis
-DeleteCategory=Ištrinti kategoriją
-ConfirmDeleteCategory=Ar tikrai norite ištrinti šią kategoriją?
-RemoveFromCategory=Pašalinti ryšį su kategorija
-RemoveFromCategoryConfirm=Ar tikrai norite pašalinti ryšį tarp operacijos ir kategorijos ?
-NoCategoriesDefined=Nėra apibrėžtos kategorijos
-SuppliersCategoryShort=Tiekėjų kategorija
-CustomersCategoryShort=Klientų kategorija
-ProductsCategoryShort=Produktų kategorija
-MembersCategoryShort=Narių kategorija
-SuppliersCategoriesShort=Tiekėjų kategorijos
-CustomersCategoriesShort=Klientų kategorijos
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Klientų/Planų kategorijos
-ProductsCategoriesShort=Produktų kategorijos
-MembersCategoriesShort=Narių kategorijos
-ContactCategoriesShort=Adresatų kategorijos
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Ši kategorija neturi jokių produktų.
 ThisCategoryHasNoSupplier=Ši kategorija neturi jokių tiekėjų.
 ThisCategoryHasNoCustomer=Ši kategorija neturi jokių klientų.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Ši kategorija neturi jokių adresatų
 AssignedToCustomer=Paskirti klientui
 AssignedToTheCustomer=Paskirtas klientui
 InternalCategory=Vidinė kategorija
-CategoryContents=Kategorijos turinys
-CategId=Kategorijos ID
-CatSupList=Tiekėjo kategorijų sąrašas
-CatCusList=Kliento/Plano kategorijų sąrašas
-CatProdList=Produktų kategorijų sąrašas
-CatMemberList=Narių kategorijų sąrašas
-CatContactList=Adresatų kategorijų ir adresatų sąrašas
-CatSupLinks=Ryšys tarp tiekėjų ir kategorijų
-CatCusLinks=Ryšys tarp klientų/planų ir kategorijų
-CatProdLinks=Ryšys tarp produktų/paslaugų ir kategorijų
-CatMemberLinks=Ryšys tarp narių ir kategorijų
-DeleteFromCat=Pašalinti iš kategorijos
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Ištrinti nuotrauką
 ConfirmDeletePicture=Patvirtinkite nuotraukos trynimą
 ExtraFieldsCategories=Papildomi atributai
-CategoriesSetup=Kategorijų nustatymai
-CategorieRecursiv=Automatiškai susieti su pirmine kategorija
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Jei įjungta, produktas taip pat susijęs su pirmine kategorija, kai dedamas į subkategoriją
-AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+AddProductServiceIntoCategory=Pridėti sekantį produktą / servisą
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index 55aee3fddce..480c3ab3d63 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Paskutinė paleista išvestis
 CronLastResult=Paskutinio rezultato kodas
 CronListOfCronJobs=Numatytų darbų sąrašas
 CronCommand=Komanda
-CronList=Darbų sąrašas
-CronDelete= Ištrinti cron darbus
-CronConfirmDelete= Ar tikrai norite ištrinti šį cron darbą ?
-CronExecute=Pradėti darbą
-CronConfirmExecute= Ar tikrai norite vykdyti šį darbą dabar ?
-CronInfo= Darbai leidžia vykdyti užduotį, kuri buvo suplanuota
-CronWaitingJobs=Laukiantys darbai
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Darbas
-CronNone= Nė vienas
+CronNone=Nė vienas
 CronDtStart=Pradžios data
 CronDtEnd=Pabaigos data
 CronDtNextLaunch=Kitas vykdymas
@@ -75,6 +75,7 @@ CronObjectHelp=Objekto pavadinimas įkėlimui. 
     Pvz.:Dolibarr Produkto objek
 CronMethodHelp=Objekto metodas įkėlimui. 
     Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, metodo reikšmė yra fecth
 CronArgsHelp=Metodo argumentai. 
     Pvz.: Dolibarr Produkto objekto patraukimo metodas /htdocs/product/class/product.class.php, parametrų reikšmė gali būti 0, ProductRef
 CronCommandHelp=Sistemos komandinė eilutė vykdymui
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informacija
 # Common
diff --git a/htdocs/langs/lt_LT/dict.lang b/htdocs/langs/lt_LT/dict.lang
index a662b0f7573..b77f195b2ea 100644
--- a/htdocs/langs/lt_LT/dict.lang
+++ b/htdocs/langs/lt_LT/dict.lang
@@ -1,329 +1,327 @@
 # Dolibarr language file - Source file is en_US - dict
-# CountryFR=France
-# CountryBE=Belgium
-# CountryIT=Italy
-# CountryES=Spain
-# CountryDE=Germany
-# CountryCH=Switzerland
-# CountryGB=Great Britain
-# CountryUK=United Kingdom
-# CountryIE=Ireland
-# CountryCN=China
-# CountryTN=Tunisia
-# CountryUS=United States
-# CountryMA=Morocco
-# CountryDZ=Algeria
-# CountryCA=Canada
-# CountryTG=Togo
-# CountryGA=Gabon
-# CountryNL=Netherlands
-# CountryHU=Hungary
-# CountryRU=Russia
-# CountrySE=Sweden
-# CountryCI=Ivoiry Coast
-# CountrySN=Senegal
-# CountryAR=Argentina
-# CountryCM=Cameroon
-# CountryPT=Portugal
-# CountrySA=Saudi Arabia
-# CountryMC=Monaco
-# CountryAU=Australia
-# CountrySG=Singapore
-# CountryAF=Afghanistan
-# CountryAX=Åland Islands
-# CountryAL=Albania
-# CountryAS=American Samoa
-# CountryAD=Andorra
-# CountryAO=Angola
-# CountryAI=Anguilla
-# CountryAQ=Antarctica
-# CountryAG=Antigua and Barbuda
-# CountryAM=Armenia
-# CountryAW=Aruba
-# CountryAT=Austria
-# CountryAZ=Azerbaijan
-# CountryBS=Bahamas
-# CountryBH=Bahrain
-# CountryBD=Bangladesh
-# CountryBB=Barbados
-# CountryBY=Belarus
-# CountryBZ=Belize
-# CountryBJ=Benin
-# CountryBM=Bermuda
-# CountryBT=Bhutan
-# CountryBO=Bolivia
-# CountryBA=Bosnia and Herzegovina
-# CountryBW=Botswana
-# CountryBV=Bouvet Island
-# CountryBR=Brazil
-# CountryIO=British Indian Ocean Territory
-# CountryBN=Brunei Darussalam
-# CountryBG=Bulgaria
-# CountryBF=Burkina Faso
-# CountryBI=Burundi
-# CountryKH=Cambodia
-# CountryCV=Cape Verde
-# CountryKY=Cayman Islands
-# CountryCF=Central African Republic
-# CountryTD=Chad
-# CountryCL=Chile
-# CountryCX=Christmas Island
-# CountryCC=Cocos (Keeling) Islands
-# CountryCO=Colombia
-# CountryKM=Comoros
-# CountryCG=Congo
-# CountryCD=Congo, The Democratic Republic of the
-# CountryCK=Cook Islands
-# CountryCR=Costa Rica
-# CountryHR=Croatia
-# CountryCU=Cuba
-# CountryCY=Cyprus
-# CountryCZ=Czech Republic
-# CountryDK=Denmark
-# CountryDJ=Djibouti
-# CountryDM=Dominica
-# CountryDO=Dominican Republic
-# CountryEC=Ecuador
-# CountryEG=Egypt
-# CountrySV=El Salvador
-# CountryGQ=Equatorial Guinea
-# CountryER=Eritrea
-# CountryEE=Estonia
-# CountryET=Ethiopia
-# CountryFK=Falkland Islands
-# CountryFO=Faroe Islands
-# CountryFJ=Fiji Islands
-# CountryFI=Finland
-# CountryGF=French Guiana
-# CountryPF=French Polynesia
-# CountryTF=French Southern Territories
-# CountryGM=Gambia
-# CountryGE=Georgia
-# CountryGH=Ghana
-# CountryGI=Gibraltar
-# CountryGR=Greece
-# CountryGL=Greenland
-# CountryGD=Grenada
-# CountryGP=Guadeloupe
-# CountryGU=Guam
-# CountryGT=Guatemala
-# CountryGN=Guinea
-# CountryGW=Guinea-Bissau
-# CountryGY=Guyana
-# CountryHT=Haïti
-# CountryHM=Heard Island and McDonald
-# CountryVA=Holy See (Vatican City State)
-# CountryHN=Honduras
-# CountryHK=Hong Kong
-# CountryIS=Icelande
-# CountryIN=India
-# CountryID=Indonesia
-# CountryIR=Iran
-# CountryIQ=Iraq
-# CountryIL=Israel
-# CountryJM=Jamaica
-# CountryJP=Japan
-# CountryJO=Jordan
-# CountryKZ=Kazakhstan
-# CountryKE=Kenya
-# CountryKI=Kiribati
-# CountryKP=North Korea
-# CountryKR=South Korea
-# CountryKW=Kuwait
-# CountryKG=Kyrghyztan
-# CountryLA=Lao
-# CountryLV=Latvia
-# CountryLB=Lebanon
-# CountryLS=Lesotho
-# CountryLR=Liberia
-# CountryLY=Libyan
-# CountryLI=Liechtenstein
-# CountryLT=Lituania
-# CountryLU=Luxembourg
-# CountryMO=Macao
-# CountryMK=Macedonia, the former Yugoslav of
-# CountryMG=Madagascar
-# CountryMW=Malawi
-# CountryMY=Malaysia
-# CountryMV=Maldives
-# CountryML=Mali
-# CountryMT=Malta
-# CountryMH=Marshall Islands
-# CountryMQ=Martinique
-# CountryMR=Mauritania
-# CountryMU=Mauritius
-# CountryYT=Mayotte
-# CountryMX=Mexico
-# CountryFM=Micronesia
-# CountryMD=Moldova
-# CountryMN=Mongolia
-# CountryMS=Monserrat
-# CountryMZ=Mozambique
-# CountryMM=Birmania (Myanmar)
-# CountryNA=Namibia
-# CountryNR=Nauru
-# CountryNP=Nepal
-# CountryAN=Netherlands Antilles
-# CountryNC=New Caledonia
-# CountryNZ=New Zealand
-# CountryNI=Nicaragua
-# CountryNE=Niger
-# CountryNG=Nigeria
-# CountryNU=Niue
-# CountryNF=Norfolk Island
-# CountryMP=Northern Mariana Islands
-# CountryNO=Norway
-# CountryOM=Oman
-# CountryPK=Pakistan
-# CountryPW=Palau
-# CountryPS=Palestinian Territory, Occupied
-# CountryPA=Panama
-# CountryPG=Papua New Guinea
-# CountryPY=Paraguay
-# CountryPE=Peru
-# CountryPH=Philippines
-# CountryPN=Pitcairn Islands
-# CountryPL=Poland
-# CountryPR=Puerto Rico
-# CountryQA=Qatar
-# CountryRE=Reunion
-# CountryRO=Romania
-# CountryRW=Rwanda
-# CountrySH=Saint Helena
-# CountryKN=Saint Kitts and Nevis
-# CountryLC=Saint Lucia
-# CountryPM=Saint Pierre and Miquelon
-# CountryVC=Saint Vincent and Grenadines
-# CountryWS=Samoa
-# CountrySM=San Marino
-# CountryST=Sao Tome and Principe
-# CountryRS=Serbia
-# CountrySC=Seychelles
-# CountrySL=Sierra Leone
-# CountrySK=Slovakia
-# CountrySI=Slovenia
-# CountrySB=Solomon Islands
-# CountrySO=Somalia
-# CountryZA=South Africa
-# CountryGS=South Georgia and the South Sandwich Islands
-# CountryLK=Sri Lanka
-# CountrySD=Sudan
-# CountrySR=Suriname
-# CountrySJ=Svalbard and Jan Mayen
-# CountrySZ=Swaziland
-# CountrySY=Syrian
-# CountryTW=Taiwan
-# CountryTJ=Tajikistan
-# CountryTZ=Tanzania
-# CountryTH=Thailand
-# CountryTL=Timor-Leste
-# CountryTK=Tokelau
-# CountryTO=Tonga
-# CountryTT=Trinidad and Tobago
-# CountryTR=Turkey
-# CountryTM=Turkmenistan
-# CountryTC=Turks and Cailos Islands
-# CountryTV=Tuvalu
-# CountryUG=Uganda
-# CountryUA=Ukraine
-# CountryAE=United Arab Emirates
-# CountryUM=United States Minor Outlying Islands
-# CountryUY=Uruguay
-# CountryUZ=Uzbekistan
-# CountryVU=Vanuatu
-# CountryVE=Venezuela
-# CountryVN=Viet Nam
-# CountryVG=Virgin Islands, British
-# CountryVI=Virgin Islands, U.S.
-# CountryWF=Wallis and Futuna
-# CountryEH=Western Sahara
-# CountryYE=Yemen
-# CountryZM=Zambia
-# CountryZW=Zimbabwe
-# CountryGG=Guernsey
-# CountryIM=Isle of Man
-# CountryJE=Jersey
-# CountryME=Montenegro
-# CountryBL=Saint Barthelemy
-# CountryMF=Saint Martin
+CountryFR=Prancūzija
+CountryBE=Belgija
+CountryIT=Italija
+CountryES=Ispanija
+CountryDE=Vokietija
+CountryCH=Šveicarija
+CountryGB=Didžioji Britanija
+CountryUK=Jungtinė Karalystė
+CountryIE=Airija
+CountryCN=Kinija
+CountryTN=Tunisas
+CountryUS=Jungtinės Amerikos Valstijos
+CountryMA=Marokas
+CountryDZ=Alžyras
+CountryCA=Kanada
+CountryTG=Togas
+CountryGA=Gabonas
+CountryNL=Nyderlandai
+CountryHU=Vengrija
+CountryRU=Rusija
+CountrySE=Švedija
+CountryCI=Dramblio kaulo krantas
+CountrySN=Senegalas
+CountryAR=Argentina
+CountryCM=Kamerūnas
+CountryPT=Portugalija
+CountrySA=Saudo Arabija
+CountryMC=Monakas
+CountryAU=Australija
+CountrySG=Singapūras
+CountryAF=Afganistanas
+CountryAX=Alandų salos
+CountryAL=Albanija
+CountryAS=Amerikos Samoa
+CountryAD=Andora
+CountryAO=Angola
+CountryAI=Angilija
+CountryAQ=Antarktida
+CountryAG=Antigva ir Barbuda
+CountryAM=Armėnija
+CountryAW=Aruba
+CountryAT=Austrija
+CountryAZ=Azerbaidžanas
+CountryBS=Bahamos
+CountryBH=Bahreinas
+CountryBD=Bangladešas
+CountryBB=Barbadosas
+CountryBY=Baltarusija
+CountryBZ=Belizas
+CountryBJ=Beninas
+CountryBM=Bermudų salos
+CountryBT=Butanas
+CountryBO=Bolivija
+CountryBA=Bosnija ir Hercegovina
+CountryBW=Botsvana
+CountryBV=Bouvet sala
+CountryBR=Brazilija
+CountryIO=Indijos vandenyno britų sritis
+CountryBN=Brunėjaus Darusalamas
+CountryBG=Bulgarija
+CountryBF=Burkina Fasas
+CountryBI=Burundis
+CountryKH=Kambodža
+CountryCV=Žaliasis Kyšulys
+CountryKY=Kaimanų salos
+CountryCF=Centrinės Afrikos Respublika
+CountryTD=Čadas
+CountryCL=Čilė
+CountryCX=Kalėdų sala
+CountryCC=Kokosų (Kilingo) salos
+CountryCO=Kolumbija
+CountryKM=Komorai
+CountryCG=Kongas
+CountryCD=Kongo Demokratinė Respublika
+CountryCK=Kuko salos
+CountryCR=Kosta Rika
+CountryHR=Kroatija
+CountryCU=Kuba
+CountryCY=Kipras
+CountryCZ=Čekija
+CountryDK=Danija
+CountryDJ=Džibutis
+CountryDM=Dominika
+CountryDO=Dominikos Respublika
+CountryEC=Ekvadoras
+CountryEG=Egiptas
+CountrySV=Salvadoras
+CountryGQ=Pusiaujo Gvinėja
+CountryER=Eritrėja
+CountryEE=Estija
+CountryET=Etiopija
+CountryFK=Folklendo salos
+CountryFO=Farerų salos
+CountryFJ=Fidžio Salų Respublika
+CountryFI=Suomija
+CountryGF=Prancūzijos Gviana
+CountryPF=Prancūzijos Polinezija
+CountryTF=Prancūzijos Pietų ir Antarkties sritys
+CountryGM=Gambija
+CountryGE=Gruzija
+CountryGH=Gana
+CountryGI=Gibraltaras
+CountryGR=Graikija
+CountryGL=Grenlandija
+CountryGD=Grenada
+CountryGP=Gvadelupa
+CountryGU=Guamas
+CountryGT=Gvatemala
+CountryGN=Gvinėja
+CountryGW=Bisau Gvinėja
+CountryGY=Gajana
+CountryHT=Haitis
+CountryHM=Herdo ir Makdonaldo
+CountryVA=Šventasis Sostas (Vatikano Miesto Valstybė)
+CountryHN=Hondūras
+CountryHK=Honkongas
+CountryIS=Islandija
+CountryIN=Indija
+CountryID=Indonezija
+CountryIR=Iranas
+CountryIQ=Irakas
+CountryIL=Izraelis
+CountryJM=Jamaika
+CountryJP=Japonija
+CountryJO=Jordanija
+CountryKZ=Kazachstanas
+CountryKE=Kenija
+CountryKI=Kiribatis
+CountryKP=Šiaurės Korėja
+CountryKR=Pietų Korėja
+CountryKW=Kuveitas
+CountryKG=Kirgizija
+CountryLA=Lao
+CountryLV=Latvija
+CountryLB=Libanas
+CountryLS=Lesotas
+CountryLR=Liberija
+CountryLY=Libija
+CountryLI=Lichtenšteinas
+CountryLT=Lietuva
+CountryLU=Liuksemburgas
+CountryMO=Makao
+CountryMK=Makedonija
+CountryMG=Madagaskaras
+CountryMW=Malavis
+CountryMY=Malaizija
+CountryMV=Maldyvai
+CountryML=Malis
+CountryMT=Malta
+CountryMH=Maršalo salos
+CountryMQ=Martinika
+CountryMR=Mauritanija
+CountryMU=Mauricijus
+CountryYT=Mayotte
+CountryMX=Meksika
+CountryFM=Mikronezija
+CountryMD=Moldova
+CountryMN=Mongolija
+CountryMS=Monseratas
+CountryMZ=Mozambikas
+CountryMM=Birma (Mianmaras)
+CountryNA=Namibija
+CountryNR=Nauru
+CountryNP=Nepalas
+CountryAN=Olandijos Antilai
+CountryNC=Naujoji Kaledonija
+CountryNZ=Naujoji Zelandija
+CountryNI=Nikaragva
+CountryNE=Nigeris
+CountryNG=Nigerija
+CountryNU=Niue salos
+CountryNF=Norfolko sala
+CountryMP=Marianos šiaurinės salos
+CountryNO=Norvegija
+CountryOM=Omanas
+CountryPK=Pakistanas
+CountryPW=Palau
+CountryPS=Okupuota Palestinos teritorija
+CountryPA=Panama
+CountryPG=Papua ir Naujoji Gvinėja
+CountryPY=Paragvajus
+CountryPE=Peru
+CountryPH=Filipinai
+CountryPN=Pitkerno salos
+CountryPL=Lenkija
+CountryPR=Puerto Rikas
+CountryQA=Kataras
+CountryRE=Reunion sala
+CountryRO=Rumunija
+CountryRW=Ruanda
+CountrySH=Elenos sala
+CountryKN=Sent Kitsas ir Nevis
+CountryLC=Sent Lusija
+CountryPM=Sen Pjeras ir Mikelonas
+CountryVC=Sent Vinsentas ir Grenadinai
+CountryWS=Samoa
+CountrySM=San Marinas
+CountryST=San Tomė ir Prinsipė
+CountryRS=Serbija
+CountrySC=Seišelių salos
+CountrySL=Siera Leonė
+CountrySK=Slovakija
+CountrySI=Slovėnija
+CountrySB=Saliamono salos
+CountrySO=Somalis
+CountryZA=Pietų Afrikos Respublika
+CountryGS=Pietų Džordžija ir Pietų Sandvičo salos
+CountryLK=Šri Lanka
+CountrySD=Sudanas
+CountrySR=Surinamas
+CountrySJ=Svalbardas ir Jan Mayenas
+CountrySZ=Svazilendas
+CountrySY=Sirija
+CountryTW=Taivanis
+CountryTJ=Tadžikistanas
+CountryTZ=Tanzanija
+CountryTH=Tailandas
+CountryTL=Rytų Timoras
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidadas ir Tobagas
+CountryTR=Turkija
+CountryTM=Turkmėnistanas
+CountryTC=Terkso ir Cailos salos
+CountryTV=Tuvalu
+CountryUG=Uganda
+CountryUA=Ukraina
+CountryAE=Jungtiniai Arabų Emyratai
+CountryUM=Jungtinių Valstijų mažosios aplinkinės salos
+CountryUY=Urugvajus
+CountryUZ=Uzbekistanas
+CountryVU=Vanuatu
+CountryVE=Venesuela
+CountryVN=Vietnamas
+CountryVG=Didžiosios Britanijos Mergelių salos
+CountryVI=Mergelių salos, JAV
+CountryWF=Volisas ir Futūna
+CountryEH=Vakarų Sachara
+CountryYE=Jemenas
+CountryZM=Zambija
+CountryZW=Zimbabvė
+CountryGG=Guernsey
+CountryIM=Isle of Man
+CountryJE=Džersis
+CountryME=Juodkalnija
+CountryBL=Švento Baltramiejaus sala
+CountryMF=Saint Martin
 
 ##### Civilities #####
-# CivilityMME=Mrs.
-# CivilityMR=Mr.
-# CivilityMLE=Ms.
-# CivilityMTRE=Master
-# CivilityDR=Doctor
-
+CivilityMME=p.
+CivilityMR=p.
+CivilityMLE=p.
+CivilityMTRE=Magistras
+CivilityDR=Daktaras
 ##### Currencies #####
-# Currencyeuros=Euros
-# CurrencyAUD=AU Dollars
-# CurrencySingAUD=AU Dollar
-# CurrencyCAD=CAN Dollars
-# CurrencySingCAD=CAN Dollar
-# CurrencyCHF=Swiss Francs
-# CurrencySingCHF=Swiss Franc
-# CurrencyEUR=Euros
-# CurrencySingEUR=Euro
-# CurrencyFRF=French Francs
-# CurrencySingFRF=French Franc
-# CurrencyGBP=GB Pounds
-# CurrencySingGBP=GB Pound
-# CurrencyINR=Indian rupees
-# CurrencySingINR=Indian rupee
-# CurrencyMAD=Dirham
-# CurrencySingMAD=Dirham
-# CurrencyMGA=Ariary
-# CurrencySingMGA=Ariary
-# CurrencyMUR=Mauritius rupees
-# CurrencySingMUR=Mauritius rupee
-# CurrencyNOK=Norwegian krones
-# CurrencySingNOK=Norwegian krone
-# CurrencyTND=Tunisian dinars
-# CurrencySingTND=Tunisian dinar
-# CurrencyUSD=US Dollars
-# CurrencySingUSD=US Dollar
-# CurrencyUAH=Hryvnia
-# CurrencySingUAH=Hryvnia
-# CurrencyXAF=CFA Francs BEAC
-# CurrencySingXAF=CFA Franc BEAC
-# CurrencyXOF=CFA Francs BCEAO
-# CurrencySingXOF=CFA Franc BCEAO
-# CurrencyXPF=CFP Francs
-# CurrencySingXPF=CFP Franc
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+Currencyeuros=Eurų
+CurrencyAUD=AUS doleriai
+CurrencySingAUD=AUS doleris
+CurrencyCAD=CAN doleriai
+CurrencySingCAD=CAN doleris
+CurrencyCHF=Šveicarijos frankas
+CurrencySingCHF=Šveicarijos frankas
+CurrencyEUR=Eurų
+CurrencySingEUR=Euras
+CurrencyFRF=Prancūzijos frankas
+CurrencySingFRF=Prancūzijos frankas
+CurrencyGBP=Didžiosios Britanijos svarais
+CurrencySingGBP=GB svaras
+CurrencyINR=Indijos rupijų
+CurrencySingINR=Indijos rupija
+CurrencyMAD=Dirhamas
+CurrencySingMAD=Dirhamas
+CurrencyMGA=Ariaris
+CurrencySingMGA=Ariaris
+CurrencyMUR=Mauricijaus rupijų
+CurrencySingMUR=Mauricijaus rupija
+CurrencyNOK=Norvegijos kronų
+CurrencySingNOK=Norvegijos krona
+CurrencyTND=Tuniso dinaras
+CurrencySingTND=Tuniso dinaras
+CurrencyUSD=JAV doleriai
+CurrencySingUSD=JAV doleris
+CurrencyUAH=Grivina
+CurrencySingUAH=Grivina
+CurrencyXAF=CFA frankai BEAC
+CurrencySingXAF=CFA frankas BEAC
+CurrencyXOF=CFA frankai BCEAO
+CurrencySingXOF=CFA BCEAO frankas
+CurrencyXPF=CFP frankai
+CurrencySingXPF=CFP frankas
+CurrencyCentSingEUR=centas
+CurrencyCentINR=paisa (1/100 rupijos)
+CurrencyCentSingINR=paisa (1/100 rupijos)
+CurrencyThousandthSingTND=tūkstantasis
 #### Input reasons #####
-# DemandReasonTypeSRC_INTE=Internet
-# DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
-# DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
-# DemandReasonTypeSRC_CAMP_PHO=Phone campaign
-# DemandReasonTypeSRC_CAMP_FAX=Fax campaign
-# DemandReasonTypeSRC_COMM=Commercial contact
-# DemandReasonTypeSRC_SHOP=Shop contact
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_INTE=Internetas
+DemandReasonTypeSRC_CAMP_MAIL=Pašto kampanija
+DemandReasonTypeSRC_CAMP_EMAIL=E-Pašto kampanija
+DemandReasonTypeSRC_CAMP_PHO=Telefoninė kampanija
+DemandReasonTypeSRC_CAMP_FAX=Faksinė kampanija
+DemandReasonTypeSRC_COMM=Komerciniai kontaktai
+DemandReasonTypeSRC_SHOP=Parduotuvės kontaktai
+DemandReasonTypeSRC_WOM=Žodis
+DemandReasonTypeSRC_PARTNER=Partneris
+DemandReasonTypeSRC_EMPLOYEE=Darbuotojas
+DemandReasonTypeSRC_SPONSORING=Rėmimas
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Formatas 4A0
+PaperFormatEU2A0=Formatas 2A0
+PaperFormatEUA0=Formatas A0
+PaperFormatEUA1=Formatas A1
+PaperFormatEUA2=Formatas A2
+PaperFormatEUA3=Formatas A3
+PaperFormatEUA4=Formatas A4
+PaperFormatEUA5=Formatas A5
+PaperFormatEUA6=Formatas A6
+PaperFormatUSLETTER=Formatas Letter US
+PaperFormatUSLEGAL=Formatas Legal US
+PaperFormatUSEXECUTIVE=Formatas Executive US
+PaperFormatUSLEDGER=Formatas Ledger/Tabloid
+PaperFormatCAP1=Formatas P1 Kanada
+PaperFormatCAP2=Formatas P2 Kanada
+PaperFormatCAP3=Formatas P3 Kanada
+PaperFormatCAP4=Formatas P4 Kanada
+PaperFormatCAP5=Formatas P5 Kanada
+PaperFormatCAP6=Formatas P6 Kanada
diff --git a/htdocs/langs/lt_LT/donations.lang b/htdocs/langs/lt_LT/donations.lang
index 145d05b7cf1..5786862a6a5 100644
--- a/htdocs/langs/lt_LT/donations.lang
+++ b/htdocs/langs/lt_LT/donations.lang
@@ -6,6 +6,8 @@ Donor=Donoras
 Donors=Donorai
 AddDonation=Create a donation
 NewDonation=Nauja auka
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Rodyti auką
 DonationPromise=Dovanos pažadas
 PromisesNotValid=Nepripažinti galiojančiais pažadai
@@ -21,6 +23,8 @@ DonationStatusPaid=Gauta auka
 DonationStatusPromiseNotValidatedShort=Projektas/apmatai
 DonationStatusPromiseValidatedShort=Pripažintas galiojančiu
 DonationStatusPaidShort=Gautas
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Pažadą pripažinti galiojančiu
 DonationReceipt=Aukos įplaukos
 BuildDonationReceipt=Sukurti įplaukas
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 4f45a89c521..8112a8f674a 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Privalomi nustatymų parametrai dar nėra apibrėžti
diff --git a/htdocs/langs/lt_LT/link.lang b/htdocs/langs/lt_LT/link.lang
index 8b1efb75ef3..c48d83ce6e4 100644
--- a/htdocs/langs/lt_LT/link.lang
+++ b/htdocs/langs/lt_LT/link.lang
@@ -1,8 +1,8 @@
-LinkANewFile=Link a new file/document
+LinkANewFile=Susieti naują filą / dokumentą
 LinkedFiles=Linked files and documents
 NoLinkFound=No registered links
 LinkComplete=The file has been linked successfully
 ErrorFileNotLinked=The file could not be linked
 LinkRemoved=The link %s has been removed
 ErrorFailedToDeleteLink= Failed to remove link '%s'
-ErrorFailedToUpdateLink= Failed to update link '%s'
+ErrorFailedToUpdateLink= Nesėkmingas sąsajos '%s' atnaujinimas
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 39c860d518d..609ecce2f42 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Visų išsiųstų e-pašto pranešimų sąrašas
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 1ff97860263..f3b8fc5263e 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -352,6 +352,7 @@ Status=Būklė
 Favorite=Favorite
 ShortInfo=Informacija
 Ref=Nuoroda
+ExternalRef=Ref. extern
 RefSupplier=Tiekėjo nuoroda
 RefPayment=Mokėjimo nuoroda
 CommercialProposalsShort=Komerciniai pasiūlymai
@@ -394,8 +395,8 @@ Available=Prieinamas
 NotYetAvailable=Dar nėra prieinamas
 NotAvailable=Nėra prieinamas
 Popularity=Populiarumas
-Categories=Kategorijos
-Category=Kategorija
+Categories=Tags/categories
+Category=Tag/category
 By=Pagal
 From=Nuo
 to=į
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Pirmadienis
 Tuesday=Antradienis
diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
index 9ddb927bb6f..6ad2ae7c62c 100644
--- a/htdocs/langs/lt_LT/orders.lang
+++ b/htdocs/langs/lt_LT/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Gabenti produktą
 Discount=Nuolaida
 CreateOrder=Sukurti Užsakymą
 RefuseOrder=Atmesti užsakymą
-ApproveOrder=Priimti užsakymą
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Patvirtinti užsakymą
 UnvalidateOrder=Nepatvirtinti užsakymo
 DeleteOrder=Ištrinti užsakymą
@@ -102,6 +103,8 @@ ClassifyBilled=Rūšiuoti pateiktas sąskaitas-faktūras
 ComptaCard=Apskaitos kortelė
 DraftOrders=Užsakymų projektai
 RelatedOrders=Susiję užsakymai
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Apdorojami užsakymai
 RefOrder=Užsakymo nuoroda
 RefCustomerOrder=Kliento užsakymo nuoroda
@@ -118,6 +121,7 @@ PaymentOrderRef=Užsakymo apmokėjimas %s
 CloneOrder=Užsakymo klonavimas
 ConfirmCloneOrder=Ar tikrai norite klonuoti šį užsakymą %s ?
 DispatchSupplierOrder=Tiekėjo užsakymo %s gavimas
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Sekančio kliento užsakymo atstovas
 TypeContact_commande_internal_SHIPPING=Sekančio pakrovimo atstovas
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 1a21722f710..0dcd8e7f106 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervencija patvirtinta
 Notify_FICHINTER_SENTBYMAIL=Intervencija nusiųsta paštu
 Notify_BILL_VALIDATE=Kliento sąskaita-faktūra patvirtinta
 Notify_BILL_UNVALIDATE=Kliento sąskaita-faktūra nepatvirtinta
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Tiekėjo užsakymas patvirtintas
 Notify_ORDER_SUPPLIER_REFUSE=Tiekėjo užsakymas atmestas
 Notify_ORDER_VALIDATE=Kliento užsakymas patvirtintas
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Komercinis pasiūlymas nusiųstas paštu
 Notify_BILL_PAYED=Kliento sąskaita-faktūra apmokėta
 Notify_BILL_CANCEL=Kliento sąskaita-faktūra atšaukta
 Notify_BILL_SENTBYMAIL=Kliento sąskaita-faktūra išsiųsta paštu
-Notify_ORDER_SUPPLIER_VALIDATE=Tiekėjo užsakymas patvirtintas
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Tiekėjo užsakymas išsiųstas paštu
 Notify_BILL_SUPPLIER_VALIDATE=Tiekėjo sąskaita-faktūra patvirtinta
 Notify_BILL_SUPPLIER_PAYED=Tiekėjo sąskaita-faktūra apmokėta
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Projekto kūrimas
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Prikabintų failų/dokumentų skaičius
 TotalSizeOfAttachedFiles=Iš viso prikabintų failų/dokumentų dydis
 MaxSize=Maksimalus dydis
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Sąskaita-faktūra %s buvo patvirtinta
 EMailTextProposalValidated=Pasiūlymas %s patvirtintas
 EMailTextOrderValidated=Užsakymas %s pripažintas galiojančiu
 EMailTextOrderApproved=Užsakymas %s patvirtintas
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Užsakymas %s buvo patvirtintas %s
 EMailTextOrderRefused=Užsakymas %s atmestas
 EMailTextOrderRefusedBy=Užsakymas %s atmestas %s
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 119a17d71e2..6148b31c11a 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index ad5077bc7b4..385638c087f 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Tiekėjo sąskaitų-faktūrų, susijusių
 ListContractAssociatedProject=Sudarytų sutarčių, susijusių su projektu, sąrašas
 ListFichinterAssociatedProject=Intervencijų, susijusių su projektu, sąrašas
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Įvykių, susijusių su projektu, sąrašas
 ActivityOnProjectThisWeek=Projekto aktyvumas šią savaitę
 ActivityOnProjectThisMonth=Projekto aktyvumas šį mėnesį
@@ -130,13 +131,15 @@ AddElement=Susieti su elementu
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Pilnas projekto ataskaitos modelis (logo. ..)
-PlannedWorkload = Planuojamas darbo krūvis
-WorkloadOccupation= Darbo krūvio paskirtis
+PlannedWorkload=Planuojamas darbo krūvis
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Nurodomi objektai
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang
index 15cf1916fcf..3003c65d6b7 100644
--- a/htdocs/langs/lt_LT/sendings.lang
+++ b/htdocs/langs/lt_LT/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Pakrovimo nuoroda
 Sending=Pakrovimas
 Sendings=Pakrovimai
+AllSendings=All Shipments
 Shipment=Siunta
 Shipments=Pakrovimai
 ShowSending=Show Sending
diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
index 63a3de6a9e5..c1510a3b5de 100644
--- a/htdocs/langs/lt_LT/suppliers.lang
+++ b/htdocs/langs/lt_LT/suppliers.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Tiekėjai
-AddSupplier=Create a supplier
+AddSupplier=Sukurti tiekėją
 SupplierRemoved=Tiekėjas pašalintas
 SuppliersInvoice=Tiekėjo sąskaita-faktūra
 NewSupplier=Naujas tiekėjas
@@ -39,7 +39,8 @@ AddSupplierInvoice=Sukurti tiekėjo sąskaitą-faktūrą
 ListOfSupplierProductForSupplier=Produktų ir kainų sąrašas tiekėjui %s
 NoneOrBatchFileNeverRan=Nėra arba grupinis %s neseniai neįvyko
 SentToSuppliers=Nusiųsta tiekėjams
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+ListOfSupplierOrders=Tiekėjo užsakymų sąrašas
+MenuOrdersSupplierToBill=Tiekėjo užsakymai sąskaitoms
+NbDaysToDelivery=Pristatymo vėlavimas dienomis
+DescNbDaysToDelivery=Didžiausias vėlavimas rodomas
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index b1e121979c8..26bdce05e84 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -8,9 +8,9 @@ VersionExperimental=Eksperimentāls
 VersionDevelopment=Attīstība
 VersionUnknown=Nezināms
 VersionRecommanded=Ieteicams
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
+FileCheck=Failu veselums
+FilesMissing=Trūkstošie faili
+FilesUpdated=Atjaunotie faili
 FileCheckDolibarr=Check Dolibarr Files Integrity
 XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=Sesijas ID
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Atdalītājs
 ExtrafieldCheckBox=Rūtiņa
 ExtrafieldRadio=Radio poga
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Atalgojums
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Paziņojumi
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Ziedojumi
@@ -508,14 +511,14 @@ Module1400Name=Grāmatvedība
 Module1400Desc=Grāmatvedības vadība (dubultā partijas)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Sadaļas
-Module1780Desc=Kategoriju vadība (produktiem, piegādātājiem un klientiem)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG redaktors
 Module2000Desc=Ļauj rediģēt kādu teksta apgabalu, izmantojot uzlabotas redaktoru
 Module2200Name=Dinamiskas cenas
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Plānotais uzdevumu pārvaldība
+Module2300Desc=Scheduled job management
 Module2400Name=Darba kārtība
 Module2400Desc=Notikumi / uzdevumi un darba kārtības vadība
 Module2500Name=Elektroniskā satura pārvaldība
@@ -714,6 +717,11 @@ Permission510=Apskatīt algas
 Permission512=Izveidot/labot algas
 Permission514=Dzēst algas
 Permission517=Eksportēt algas
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Lasīt pakalpojumus
 Permission532=Izveidot/mainīt pakalpojumus
 Permission534=Dzēst pakalpojumus
@@ -746,6 +754,7 @@ Permission1185=Apstiprināt piegādātājq pasūtījumus
 Permission1186=Pasūtīt piegādātāja pasūtījumus
 Permission1187=Saņemšanu piegādātāju pasūtījumu
 Permission1188=Dzēst piegādātāju pasūtījumus
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Saņemt eksportēšanas rezultātu
 Permission1202=Izveidot/Modificēt eksportu
 Permission1231=Lasīt piegādātāja rēķinus
@@ -758,10 +767,10 @@ Permission1237=Eksporta piegādātāju pasūtījumus un to detaļas
 Permission1251=Palaist masveida importu ārējiem datiem datu bāzē (datu ielāde)
 Permission1321=Eksporta klientu rēķinus, atribūti un maksājumus
 Permission1421=Eksporta klientu pasūtījumus un atribūti
-Permission23001 = Skatīt plānoto uzdevumu
-Permission23002 = Izveidot/atjaunināt plānoto uzdevumu
-Permission23003 = Dzēst plānoto uzdevumu
-Permission23004 = Izpildīt plānoto uzdevumu
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=SKatīt darbības (pasākumi vai uzdevumi), kas saistīti ar kontu
 Permission2402=Izveidot / mainīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
 Permission2403=Dzēst darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Atgriezties grāmatvedības kodu būvēts pēc: 
     %
 ModuleCompanyCodePanicum=Atgriezt tukšu grāmatvedības uzskaites kodu.
 ModuleCompanyCodeDigitaria=Grāmatvedība kods ir atkarīgs no trešās personas kodu. Kods sastāv no simbols "C" pirmajā pozīcijā un pēc tam pirmais 5 zīmēm no trešās puses kodu.
 UseNotifications=Izmantot paziņojumus
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Dokumentu veidnes
 DocumentModelOdt=Izveidot dokumentus no OpenDocument veidnes (. ODT vai. ODS failus OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Ūdenszīme dokumenta projektā
@@ -1436,7 +1445,7 @@ SendingsReceiptModel=Nosūtot saņemšanas modeli
 SendingsNumberingModules=Sendings numerācijas moduļus
 SendingsAbility=Support shipment sheets for customer deliveries
 NoNeedForDeliveryReceipts=Vairumā gadījumu, sendings ieņēmumi tiek izmantoti gan kā loksnes klientu piegādēm (produktu sarakstu, lai nosūtītu) un loksnes, kas tiek recevied un paraksta klientu. Tātad produkta piegādes kvītis ir dublēta iezīme, un reti aktivizēts.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Brīvais teksts piegādēs
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkti piegādes kvīts numerācija modulis
 DeliveryOrderModel=Produkti piegādes kvīts modelis
@@ -1553,10 +1562,11 @@ BankOrderESDesc=Spāņu displejs, lai
 ##### Multicompany #####
 MultiCompanySetup=Multi-kompānija modulis iestatīšana
 ##### Suppliers #####
-SuppliersSetup=Piegādātājs modulis uzstādīšana
+SuppliersSetup=Piegādātāja moduļa iestatījumi
 SuppliersCommandModel=Pilnīga veidni no piegādātāja secībā (logo. ..)
 SuppliersInvoiceModel=Pilnīga veidni no piegādātāja rēķina (logo. ..)
 SuppliersInvoiceNumberingModel=Piegādātāju rēķinu numerācijas modeļus
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind moduļa iestatīšana
 PathToGeoIPMaxmindCountryDataFile=Ceļš uz failu, kas satur MaxMind ip uz valsti tulkojumu. 
     Piemēri: 
     / Usr / local / share / GeoIP / GeoIP.dat 
     / Usr / share / GeoIP / GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index 9cca7068840..362db73f511 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Rēķins %s apstiprināts
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Rēķins %s doties atpakaļ uz melnrakstu
 InvoiceDeleteDolibarr=Rēķins %s dzēsts
-OrderValidatedInDolibarr= Pasūtījums %s pārbaudīts
+OrderValidatedInDolibarr=Pasūtījums %s pārbaudīts
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Pasūtījums %s atcelts
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Pasūtījums %s apstiprināts
 OrderRefusedInDolibarr=Pasūtījums %s atteikts
 OrderBackToDraftInDolibarr=Pasūtījums %s doties atpakaļ uz melnrakstu
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Izveidot notikumu
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 4216d9f6a05..51186618520 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Jau samaksāts
 PaymentsBackAlreadyDone=Maksājumi atpakaļ izdarījušas
 PaymentRule=Maksājuma noteikums
 PaymentMode=Maksājuma veids
-PaymentConditions=Maksājuma noteikumi
-PaymentConditionsShort=Maksājuma noteikumi
+PaymentTerm=Apmaksas noteikumi
+PaymentConditions=Apmaksas noteikumi
+PaymentConditionsShort=Apmaksas noteikumi
 PaymentAmount=Maksājuma summa
 ValidatePayment=Apstiprināt maksājumu
 PaymentHigherThanReminderToPay=Maksājumu augstāka nekā atgādinājums par samaksu
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Divām jaunajām atlaidēm jābūt vienāda
 ConfirmRemoveDiscount=Vai tiešām vēlaties noņemt šo atlaidi?
 RelatedBill=Saistītais rēķins
 RelatedBills=Saistītie rēķini
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Jaunākais sasitītais rēķins
 WarningBillExist=Uzmanību, viens vai vairāki rēķini jau eksistē
 
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 54d4a89cb71..b1c8e62adf0 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Sadaļa
-Categories=Sadaļas
-Rubrique=Sadaļa
-Rubriques=Sadaļas
-categories=sadaļas
-TheCategorie=Sadaļa
-NoCategoryYet=No category šī radīja veida
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Uz
 AddIn=Pievienot
 modify=modificēt
 Classify=Klasificēt
-CategoriesArea=Kategoriju sadaļa
-ProductsCategoriesArea=Produktu/Pakalpojumu sadaļas
-SuppliersCategoriesArea=Piegādātāju sadaļa
-CustomersCategoriesArea=Klientu sadaļa
-ThirdPartyCategoriesArea=Trešo personu sadaļa
-MembersCategoriesArea=Dalībnieku sadaļa
-ContactsCategoriesArea=Kontaktu sadaļa
-MainCats=Galvenās sadaļas
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Apakšsadaļas
 CatStatistics=Statistika
-CatList=Sadaļu saraksts
-AllCats=Visas sadaļas
-ViewCat=Skatīt sadaļu
-NewCat=Pievienot sadaļu
-NewCategory=Jauna sadaļa
-ModifCat=Mainīt sadaļu
-CatCreated=Sadaļa izveidota
-CreateCat=Izveidot sadaļu
-CreateThisCat=Izveidot šo sadaļu
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Apstiprināt laukus
 NoSubCat=Nav apakšsadaļas.
 SubCatOf=Apakšsadaļa
-FoundCats=Atrastās sadaļas
-FoundCatsForName=Sadaļas atrastas ar nosaukumu:
-FoundSubCatsIn=Apakšsadaļas atrastas sadaļā
-ErrSameCatSelected=Izvēlējāties to pašu sadaļu vairākas reizes
-ErrForgotCat=Jūs aizmirsāt izvēlēties sadaļu
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Jūs aizmirsāt, lai informētu laukus
 ErrCatAlreadyExists=Šis nosaukums jau tiek izmantots
-AddProductToCat=Pievienot šo produktu sadaļai?
-ImpossibleAddCat=Nav iespējams pievienot sadaļu
-ImpossibleAssociateCategory=Neiespējami saistīt kategoriju
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s tika veiksmīgi pievienots.
-ObjectAlreadyLinkedToCategory=Elements ir jau saistīts ar šo sadaļu.
-CategorySuccessfullyCreated=Šī sadaļa %s ir pievienota veiksmīgi.
-ProductIsInCategories=Produkts / pakalpojums pieder pie šādām kategorijām
-SupplierIsInCategories=Trešai personai pieder sekojoša piegādātāju sadaļas
-CompanyIsInCustomersCategories=Šī trešā persona pieder pie šādiem klientiem / perspektīvas kategorijām
-CompanyIsInSuppliersCategories=Šī trešā persona pieder, lai pēc piegādātājiem sadaļas
-MemberIsInCategories=Šis dalībnieks ir šādās dalībnieku sadaļās
-ContactIsInCategories=Šī kontaktpersona pieder pie šādiem kontaktiem kategorijām
-ProductHasNoCategory=Šis produkts/pakalpojums nav nevienā sadaļā
-SupplierHasNoCategory=Šis piegādātājs nav nevienā sadaļā
-CompanyHasNoCategory=Šis uzņēmums nav nevienā sadaļā
-MemberHasNoCategory=Šis dalībnieks nav nevienā sadaļā
-ContactHasNoCategory=Šī kontaktpersona nav nekādas kategorijās
-ClassifyInCategory=Klasificēt sadaļā
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Nav
-NotCategorized=Bez sadaļas
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Šī sadaļa jau pastāv ar šo ref
 ReturnInProduct=Atpakaļ uz produktu / pakalpojumu karti
 ReturnInSupplier=Atpakaļ uz piegādātāju karti
@@ -66,22 +64,22 @@ ReturnInCompany=Atpakaļ uz klienta / izredzes kartes
 ContentsVisibleByAll=Saturs būs redzams visiem
 ContentsVisibleByAllShort=Saturs redzams visiem
 ContentsNotVisibleByAllShort=Saturu visi neredz
-CategoriesTree=Sadaļu koks
-DeleteCategory=Dzēst kategoriju
-ConfirmDeleteCategory=Vai tiešām vēlaties dzēst šo sadaļu?
-RemoveFromCategory=Noņemt sadaļas saiti
-RemoveFromCategoryConfirm=Vai esat pārliecināts, ka vēlaties noņemt saiti starp darījumu un sadaļu?
-NoCategoriesDefined=Nav izveidotu sadaļu
-SuppliersCategoryShort=Piegādātāju sadaļa
-CustomersCategoryShort=Klientu sadaļa
-ProductsCategoryShort=Produktu sadaļa
-MembersCategoryShort=Dalībnieku sadaļa
-SuppliersCategoriesShort=Piegādātāju sdaļas
-CustomersCategoriesShort=Klientu sadaļas
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo / prosp. sadaļas
-ProductsCategoriesShort=Produktu sadaļas
-MembersCategoriesShort=Dalībnieku sadaļas
-ContactCategoriesShort=Kontaktu sadaļas
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Šī sadaļā nav produktu.
 ThisCategoryHasNoSupplier=Šajā sadaļā nav neviena piegādātāja.
 ThisCategoryHasNoCustomer=Šī sadaļa nesatur klientu.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Šajā kategorijā nav nekādu kontaktu.
 AssignedToCustomer=Piešķirts klientam
 AssignedToTheCustomer=Piešķirts klientam
 InternalCategory=Iekšējā sadaļa
-CategoryContents=Sadaļas saturs
-CategId=Sadaļas id
-CatSupList=Piegādātāju sadaļu saraksts
-CatCusList=Klientu/perspektīva sadaļu saraksts
-CatProdList=Produktu sadaļu saraksts
-CatMemberList=Dalībnieku sadaļu saraksts
-CatContactList=Saraksts kontaktu kategorijām un kontaktu
-CatSupLinks=Saikne starp piegādātājiem un sadaļām
-CatCusLinks=Saiknes starp klientu / perspektīvām un kategorijām
-CatProdLinks=Saiknes starp produktu / pakalpojumu un kategoriju
-CatMemberLinks=Saikne starp biedriem un kategorijām
-DeleteFromCat=Noņemt no sadaļas
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Dzēst attēlu
 ConfirmDeletePicture=Apstiprināt attēla dzēšanu
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Sadaļas iestatījumi
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Rādīt sadaļu
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index d75495175ef..c879b80c2d6 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Pēdējo reizi palaist izejas
 CronLastResult=Pēdējais rezultātu kods
 CronListOfCronJobs=Saraksts ar plānotajiem darbiem
 CronCommand=Komanda
-CronList=Darbu saraksts
-CronDelete= Dzēst cron darbavietas
-CronConfirmDelete= Vai tiešām vēlaties dzēst šo cron darbu?
-CronExecute=Uzsākt darbu
-CronConfirmExecute= Vai esat pārliecināts, ka, lai izpildītu šo darbu tagad
-CronInfo= Darbs ļauj izpildīt uzdevumu, kas ir plānots
-CronWaitingJobs=Wainting darbavietas
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Darbs
-CronNone= Nav
+CronNone=Nav
 CronDtStart=Sākuma datums
 CronDtEnd=Beigu datums
 CronDtNextLaunch=Nākošā izpilde
@@ -75,6 +75,7 @@ CronObjectHelp=Objekta nosaukums, lai slodze. 
     Par exemple atnest metodi Dol
 CronMethodHelp=Objekts metode, lai palaistu. 
     Par exemple atnest metodi Dolibarr Produkta objekts / htdocs / produktu / klase / product.class.php, metodes vērtība ir ir fecth
 CronArgsHelp=Šī metode argumentus. 
     Par exemple atnest metodi Dolibarr Produkta objekts / htdocs / produktu / klase / product.class.php, no paramters vērtība var būt 0, ProductRef
 CronCommandHelp=Sistēma komandrindas izpildīt.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informācija
 # Common
@@ -84,4 +85,4 @@ CronType_command=Shell komandu
 CronMenu=Cron
 CronCannotLoadClass=Nevar ielādēt klases %s vai objektu %s
 UseMenuModuleToolsToAddCronJobs=Iet uz izvēlni "Home - moduļi instrumenti - Darbs sarakstu", lai redzētu un rediģēt plānoto darbu.
-TaskDisabled=Task disabled
+TaskDisabled=Uzdevums bloķēts
diff --git a/htdocs/langs/lv_LV/donations.lang b/htdocs/langs/lv_LV/donations.lang
index 0d9036343bb..792b322fd91 100644
--- a/htdocs/langs/lv_LV/donations.lang
+++ b/htdocs/langs/lv_LV/donations.lang
@@ -6,6 +6,8 @@ Donor=Donors
 Donors=Donori
 AddDonation=Izveidot ziedojumu
 NewDonation=Jauns ziedojums
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Rādīt ziedojumu
 DonationPromise=Dāvanu solījumu
 PromisesNotValid=Nav apstiprinātas solījumi
@@ -21,6 +23,8 @@ DonationStatusPaid=Ziedojums saņemts
 DonationStatusPromiseNotValidatedShort=Melnraksts
 DonationStatusPromiseValidatedShort=Apstiprināts
 DonationStatusPaidShort=Saņemti
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Apstiprināt solījumu
 DonationReceipt=Ziedojuma kvīts
 BuildDonationReceipt=Veidot kvīti
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index c3f12157435..916ac4676a6 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Nezināma kļūda '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Obligātie uzstādīšanas parametri vēl nav definētas
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 2a1530a3612..8276f5a23aa 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Uzskaitīt visus e-pasta nosūtītās paziņojumus
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index edc3343f1be..c080d22c708 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -221,7 +221,7 @@ Cards=Kartes
 Card=Karte
 Now=Tagad
 Date=Datums
-DateAndHour=Date and hour
+DateAndHour=Datums un laiks
 DateStart=Sākuma datums
 DateEnd=Beigu datums
 DateCreation=Izveidošanas datums
@@ -352,6 +352,7 @@ Status=Statuss
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. piegādātājs
 RefPayment=Ref. maksājums
 CommercialProposalsShort=Komerciālie priekšlikumi
@@ -394,8 +395,8 @@ Available=Pieejams
 NotYetAvailable=Nav vēl pieejams
 NotAvailable=Nav pieejams
 Popularity=Popularitāte
-Categories=Sadaļas
-Category=Sadaļa
+Categories=Tags/categories
+Category=Tag/category
 By=Līdz
 From=No
 to=līdz
@@ -693,7 +694,8 @@ PublicUrl=Publiskā saite
 AddBox=Pievienot info logu
 SelectElementAndClickRefresh=Izvēlieties elementu un nospiediet atjaunot
 PrintFile=Print File %s
-ShowTransaction=Show transaction
+ShowTransaction=Rādīt transakcijas
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Pirmdiena
 Tuesday=Otrdiena
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index abed9fe2985..c53ed262d23 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -59,12 +59,13 @@ MenuOrdersToBill=Pasūtījumi piegādāti
 MenuOrdersToBill2=Billable orders
 SearchOrder=Meklēšanas kārtība
 SearchACustomerOrder=Meklēt klienta pasūtījumu
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Meklēt piegādātāja pasūtījumu
 ShipProduct=Sūtīt produktu
 Discount=Atlaide
 CreateOrder=Izveidot pasūtījumu
 RefuseOrder=Atteikt pasūtījumu
-ApproveOrder=Pieņemt pasūtījumu
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Apstiprināt pasūtījumu
 UnvalidateOrder=Unvalidate pasūtījumu
 DeleteOrder=Dzēst pasūtījumu
@@ -102,6 +103,8 @@ ClassifyBilled=Klasificēt rēķins
 ComptaCard=Grāmatvedības kartiņa
 DraftOrders=Projekts pasūtījumi
 RelatedOrders=Saistītie pasūtījumi
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Pasūtījumi procesā
 RefOrder=Ref. pasūtījuma
 RefCustomerOrder=Ref. klienta rīkojums
@@ -118,6 +121,7 @@ PaymentOrderRef=Apmaksa pasūtījumu %s
 CloneOrder=Klonēt pasūtījumu
 ConfirmCloneOrder=Vai jūs tiešām vēlaties klonēt šo pasūtījumu %s ?
 DispatchSupplierOrder=Saņemšanas piegādātājs pasūtījuma %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Pārstāvis turpinot darboties klienta pasūtījumu
 TypeContact_commande_internal_SHIPPING=Pārstāvis turpinot darboties kuģniecības
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 731b200e05d..fa1e46bc8e2 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervences apstiprināts
 Notify_FICHINTER_SENTBYMAIL=Intervences nosūtīt pa pastu
 Notify_BILL_VALIDATE=Klienta rēķins apstiprināts
 Notify_BILL_UNVALIDATE=Klienta rēķins neapstiprināts
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Piegādātājs, lai apstiprinātu
 Notify_ORDER_SUPPLIER_REFUSE=Piegādātājs lai atteicās
 Notify_ORDER_VALIDATE=Klienta rīkojumu apstiprināts
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial priekšlikums nosūtīts pa pastu
 Notify_BILL_PAYED=Klienta rēķins samaksāts
 Notify_BILL_CANCEL=Klienta rēķins atcelts
 Notify_BILL_SENTBYMAIL=Klienta rēķins nosūtīts pa pastu
-Notify_ORDER_SUPPLIER_VALIDATE=Piegādātāja pasūtījums pārbaudīts
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Piegādātājs rīkojumam, kas nosūtīts pa pastu
 Notify_BILL_SUPPLIER_VALIDATE=Piegādātāja rēķins apstiprināts
 Notify_BILL_SUPPLIER_PAYED=Piegādātāja rēķins jāapmaksā
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Projekts izveidots
 Notify_TASK_CREATE=Uzdevums izveidots
 Notify_TASK_MODIFY=Uzdevums labots
 Notify_TASK_DELETE=Uzdevums dzēsts
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Skaits pievienotos failus / dokumentus
 TotalSizeOfAttachedFiles=Kopējais apjoms pievienotos failus / dokumentus
 MaxSize=Maksimālais izmērs
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Rēķins %s ir apstiprināts.
 EMailTextProposalValidated=Priekšlikums %s ir apstiprināts.
 EMailTextOrderValidated=Pasūtījums %s ir apstiprināts.
 EMailTextOrderApproved=Pasūtījums %s ir apstiprināts.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Pasūtījumu %s ir apstiprinājis %s.
 EMailTextOrderRefused=Pasūtījums %s ir noraidīts.
 EMailTextOrderRefusedBy=Pasūtījums %s ir noraidījis %s.
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index 0a00746d8e3..4ea82dbcfbd 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimālā rekomendējamā cena : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Numurs
-DefaultPrice=Default price
+DefaultPrice=Noklusējuma cena
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+ComposedProduct=Apakš produkts
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index bc4ff4c3057..534102353d3 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Saraksts no piegādātāja rēķinus saist
 ListContractAssociatedProject=Līgumu sarakstu kas saistīti ar projektu
 ListFichinterAssociatedProject=Saraksts iejaukšanās saistīts ar projektu
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Saraksts ar notikumiem, kas saistīti ar projektu
 ActivityOnProjectThisWeek=Aktivitāte projektu šonedēļ
 ActivityOnProjectThisMonth=Aktivitāte projektu šomēnes
@@ -130,13 +131,15 @@ AddElement=Saite uz elementu
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Pilnīgu projekta ziņojums modelis (logo. ..)
-PlannedWorkload = Plānotais darba apjoms
-WorkloadOccupation= Darba slodze izlikšanās
+PlannedWorkload=Plānotais darba apjoms
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Atsaucoties objekti
 SearchAProject=Meklēt projektu
 ProjectMustBeValidatedFirst=Projektu vispirms jāpārbauda
 ProjectDraft=Melnraksta projekts
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index 3816af9db35..03d28db44fe 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. sūtījumam
 Sending=Sūtījums
 Sendings=Sūtījumi
+AllSendings=All Shipments
 Shipment=Sūtījums
 Shipments=Sūtījumi
 ShowSending=Show Sending
@@ -23,7 +24,7 @@ QtyOrdered=Pasūtītais daudzums
 QtyShipped=Daudzums kas nosūtīts
 QtyToShip=Daudzums, kas jānosūta
 QtyReceived=Saņemtais daudzums
-KeepToShip=Remain to ship
+KeepToShip=Vēl jāpiegādā
 OtherSendingsForSameOrder=Citas sūtījumiem uz šo rīkojumu
 DateSending=Datums nosūtot kārtība
 DateSendingShort=Datums nosūtot kārtība
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 5d278bd1f7a..5cdb13ce298 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Saraksts ar piegādātāju pasūtījumiem
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Piegādes kavēšanās dienās
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index 7232f00e91c..014996eee65 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/mk_MK/donations.lang b/htdocs/langs/mk_MK/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/mk_MK/donations.lang
+++ b/htdocs/langs/mk_MK/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 81deb7c28f0..27779080dd0 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/mk_MK/orders.lang
+++ b/htdocs/langs/mk_MK/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/mk_MK/sendings.lang
+++ b/htdocs/langs/mk_MK/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/mk_MK/suppliers.lang
+++ b/htdocs/langs/mk_MK/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index a094028679b..bd5c4996e2a 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Avmerkingsboks
 ExtrafieldRadio=Radio-knapp
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Spesielle utgifter (skatt, sosiale bidrag, utbytte)
 Module500Desc=Forvaltning av spesielle utgifter som skatt, sosiale bidrag, utbytte og lønn
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Varselmeldinger
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donasjoner
@@ -508,14 +511,14 @@ Module1400Name=Regnskapsekspert
 Module1400Desc=Behandling av regnskapssopplysninger for eksperter (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorier
-Module1780Desc=Behandling av kategorier (varer, leverandører og kunder)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Behandle planlagte oppgaver
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Handlinger/oppgaver og agendabehandling
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Les Lønn
 Permission512=Opprett/endre lønn
 Permission514=Slett lønn
 Permission517=Eksporter lønn
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Les tjenester
 Permission532=Opprett / endre tjenester
 Permission534=Slett tjenester
@@ -746,6 +754,7 @@ Permission1185=Godkjenne leverandørordre
 Permission1186=Bestille leverandørordre
 Permission1187=Bekrefte mottak av leverandørordre
 Permission1188=Lukke leverandørordre
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Eksporter leverandør-bestillinger og detaljer
 Permission1251=Kjør massen import av eksterne data til database (data last)
 Permission1321=Eksportere kundefakturaer, attributter og betalinger
 Permission1421=Eksport kundeordre og attributter
-Permission23001 = Les Planlagt oppgave
-Permission23002 = Lag / oppdater Planlagt oppgave
-Permission23003 = Slett planlagt oppgave
-Permission23004 = Utfør planlagt oppgave
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Vise handlinger (hendelser og oppgaver) lenket til egen brukerkonto
 Permission2402=Lage/endre/slette handlinger (hendelser og oppgaver) lenket til egen brukerkonto
 Permission2403=Vise andre personers handlinger (hendelser og oppgaver)
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by %s followed by thi
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Bruk beskjeder
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Dokumenter maler
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vannmerke på utkast
@@ -1557,6 +1566,7 @@ SuppliersSetup=Leverandør modulen oppsett
 SuppliersCommandModel=Komplett mal av leverandør rekkefølge (logo. ..)
 SuppliersInvoiceModel=Komplett mal av leverandør faktura (logo. ..)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul-oppsett
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index dfddfc2b3e6..e2da157733d 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktura godkjent
 InvoiceValidatedInDolibarrFromPos=Faktura %s godkjent fra POS
 InvoiceBackToDraftInDolibarr=Faktura %s gå tilbake til utkast status
 InvoiceDeleteDolibarr=Faktura %s slettet
-OrderValidatedInDolibarr= Ordre godkjent
+OrderValidatedInDolibarr=Ordre godkjent
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Bestill %s kansellert
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Bestill %s godkjent
 OrderRefusedInDolibarr=Ordre %s nektet
 OrderBackToDraftInDolibarr=Bestill %s gå tilbake til utkast status
@@ -91,3 +94,5 @@ WorkingTimeRange=Arbeidstid
 WorkingDaysRange=Arbeidsuke
 AddEvent=Opprett hendelse
 MyAvailability=Min tilgjengelighet
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index db2883bb788..033c9414bfd 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -23,13 +23,13 @@ InvoiceProFormaAsk=Proforma faktura
 InvoiceProFormaDesc=Proforma faktura er et bilde av en ekte faktura, men har ingen regnskapsføring verdi.
 InvoiceReplacement=Erstatningsfaktura. Må erstatte faktura med referanse
 InvoiceReplacementAsk=Erstatningsfaktura for faktura
-InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

    Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=Erstatningsfaktura brukes til å avbryte og erstatte en faktura uten at betaling allerede er mottatt. 

     Merk: Bare faktura uten innbetaling kan erstattes. Hvis ikke faktura er stengt, vil den bli automatisk satt til 'forlatt'.
 InvoiceAvoir=Kreditnota
 InvoiceAvoirAsk=Kreditnota for å korriger fektura
 InvoiceAvoirDesc=En kreditnota er en negativ faktura som brukes for å løse situasjoner hvor en faktura har et annet beløp enn det som virkelig er betalt (fordi kunden har betalt for lite ved en feil, eller for eksempel ikke ønsker å betale alt fordi han har returnert noen varer.).

    Obs!: Originalfakturaen må allerede være lukket ('betalt' eller 'delbetalt') for at du skal kunne opprette en kreditnota mot den.
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithLines=Opprett kreditnota med opprinnelige fakturalinjer
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirLineWithPaymentRestAmount=Kreditnota for restbeløp
 ReplaceInvoice=Erstatt faktura %s
 ReplacementInvoice=Erstatningsfaktura
 ReplacedByInvoice=Erstattet av faktura %s
@@ -74,6 +74,7 @@ PaymentsAlreadyDone=Betalinger allerede utført
 PaymentsBackAlreadyDone=Tilbakebetalinger allerede utført
 PaymentRule=Betalingsregel
 PaymentMode=Betalingsmåte
+PaymentTerm=Betalingsbetingelser
 PaymentConditions=Betalingsbetingelser
 PaymentConditionsShort=Betalingsbetingelser
 PaymentAmount=Beløp til betaling
@@ -154,9 +155,9 @@ ConfirmCancelBill=Er du sikker på at du vil kansellere faktura %s ?
 ConfirmCancelBillQuestion=hvorfor vil du tapsføre denne fakturaen?
 ConfirmClassifyPaidPartially=Er du sikker på at du vil endre status på faktura %s til betalt?
 ConfirmClassifyPaidPartiallyQuestion=Denne fakturaen er ikke fullt ut betalt. Hva er grunnen til at du vil lukke fakturaen?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Restbeløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg ønsker å rette opp MVA med en kreditnota.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restbeløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg aksepterer å miste MVA på denne rabatten.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Restebløpet (%s %s) er rabatt innrømmet fordi betalingen ble gjort før forfall. Jeg skriver av MVA på denne rabatten uten kreditnota.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Dårlig kunde
 ConfirmClassifyPaidPartiallyReasonProductReturned=Varer delvis returnert
 ConfirmClassifyPaidPartiallyReasonOther=Beløpet tapsføres av en annen årsak
@@ -189,9 +190,9 @@ AlreadyPaid=Allerede betalt
 AlreadyPaidBack=Allerede tilbakebetalt
 AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditt notater og innskudd)
 Abandoned=Tapsført
-RemainderToPay=Remaining unpaid
+RemainderToPay=Restbeløp
 RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPayBack=Resterende beløp å betale:
 Rest=Ventende
 AmountExpected=Beløp purret
 ExcessReceived=Overskytende
@@ -222,13 +223,13 @@ NonPercuRecuperable=Non-recoverable
 SetConditions=Angi betalingsbetingelser
 SetMode=Angi betalingsmodus
 Billed=Fakturert
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RepeatableInvoice=Fakturamal
+RepeatableInvoices=Fakturamaler
+Repeatable=Mal
+Repeatables=Maler
+ChangeIntoRepeatableInvoice=Gjør om til fakturamal
+CreateRepeatableInvoice=Opprett fakturamal
+CreateFromRepeatableInvoice=Opprett fra fakturamal
 CustomersInvoicesAndInvoiceLines=Kundefakturaer og fakturalinjer
 CustomersInvoicesAndPayments=Kundefakturaer og betalinger
 ExportDataset_invoice_1=Oversikt over kundefakturaer og fakturalinjer
@@ -242,7 +243,7 @@ Discount=Rabatt
 Discounts=Rabatter
 AddDiscount=Legg til rabatt
 AddRelativeDiscount=Lag relativ rabatt
-EditRelativeDiscount=Edit relative discount
+EditRelativeDiscount=Endre relativ rabatt
 AddGlobalDiscount=Legg til rabatt
 EditGlobalDiscounts=Rediger absolutte rabatter
 AddCreditNote=Lag kreditt notat
@@ -293,7 +294,9 @@ TotalOfTwoDiscountMustEqualsOriginal=Totalt to nye rabatt må være lik original
 ConfirmRemoveDiscount=Er du sikker på at du vil fjerne denne rabatten?
 RelatedBill=Relaterte faktura
 RelatedBills=Relaterte fakturaer
-LatestRelatedBill=Latest related invoice
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
+LatestRelatedBill=Siste tilknyttede faktura
 WarningBillExist=Warning, one or more invoice already exist
 
 # PaymentConditions
@@ -309,8 +312,8 @@ PaymentConditionShort60DENDMONTH=Leveringsmåned + 60 dager
 PaymentCondition60DENDMONTH=Leveringsmåned + 60 dager
 PaymentConditionShortPT_DELIVERY=Levering
 PaymentConditionPT_DELIVERY=Ved levering
-PaymentConditionShortPT_ORDER=On order
-PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_ORDER=I bestilling
+PaymentConditionPT_ORDER=I bestilling
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% i forskudd, 50%% ved levering
 FixAmount=Fast beløp
@@ -395,7 +398,7 @@ AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten gjenstår å betale vil
 ToMakePayment=Betal
 ToMakePaymentBack=Tilbakebetal
 ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
+NoteListOfYourUnpaidInvoices=Denne listen inneholder kun fakturaer for tredjeparter du er koblet til som salgsrepresentant.
 RevenueStamp=Revenue stamp
 YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
 PDFCrabeDescription=Fakturamal Crabe. En komplett mal (Støtter MVA, rabatter, betalingsbetingelser, logo, osv...)
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index d03d3f0aa7b..662c28bdc3b 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategori
-Categories=Kategorier
-Rubrique=Kategori
-Rubriques=Kategorier
-categories=kategorier
-TheCategorie=Kategorien
-NoCategoryYet=Ingen kategori av denne typen er opprettet
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=I
 AddIn=Legg til i
 modify=endre
 Classify=Klassifiser
-CategoriesArea=Kategoriområde
-ProductsCategoriesArea=Område for kategorier : produkter/tjenester
-SuppliersCategoriesArea=Område for kategorier : Leverandører
-CustomersCategoriesArea=Område for kategorier : Kunder
-ThirdPartyCategoriesArea=Område for kategorier : Tredjeparter
-MembersCategoriesArea=Medlemmers kategoriområder
-ContactsCategoriesArea=Kontaktkategorier 
-MainCats=Hovedkategorier
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Underkategorier
 CatStatistics=Statistikk
-CatList=Liste over kategorier
-AllCats=Alle kategorier
-ViewCat=Vis kategori
-NewCat=Legg til kategori
-NewCategory=Ny kategori
-ModifCat=Endre kategori
-CatCreated=Kategori opprettet
-CreateCat=Opprett kategori
-CreateThisCat=Opprett denne kategorien
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Godkjenn feltene
 NoSubCat=Ingen underkategori.
 SubCatOf=Undekategori
-FoundCats=Kategorier funnet
-FoundCatsForName=Fant kategorier med navnet :
-FoundSubCatsIn=Undekategorier funnet i kategorien
-ErrSameCatSelected=Du har valgt samme kategori flere ganger
-ErrForgotCat=Du glemte å velge kategorien
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Du glemte feltene
 ErrCatAlreadyExists=Dette navnet er allerede i bruk
-AddProductToCat=Legg til dette produktet i en kategori?
-ImpossibleAddCat=Umulig å legge til kategorien
-ImpossibleAssociateCategory=Umulig å knytte kategorien til
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s ble lagt til.
-ObjectAlreadyLinkedToCategory=Elementet er allerede lenket til denne kategorien.
-CategorySuccessfullyCreated=Kategorien %s er opprettet.
-ProductIsInCategories=Dette produktet/tjenesten hører til følgende kategorier
-SupplierIsInCategories=Denne tredjeparten hører til følgende leverandørkategorier
-CompanyIsInCustomersCategories=Denne tredjeparten hører til følgende kunder/prospektkategorier
-CompanyIsInSuppliersCategories=Denne tredjeparten hører til følgende leverandørkategorier
-MemberIsInCategories=Dette medlemmet hører til følgende medlemmeskategorier
-ContactIsInCategories=Denne kontakten hører til følgende kontaktkategorier
-ProductHasNoCategory=Dette produktet/tjenesten er ikke i noen kategorier
-SupplierHasNoCategory=Denne leverandøren er ikke i noen kategorier
-CompanyHasNoCategory=Dette firmaet er ikke i noen kategorier
-MemberHasNoCategory=Dette medlem er ikke i noen kategorier
-ContactHasNoCategory=Denne kontakten er ikke i noen kategorier
-ClassifyInCategory=Klassifiser i kategori
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Ingen
-NotCategorized=Uten kategori
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Denne kategorien finnes allerede med denne referansen
 ReturnInProduct=Tilbake til produkt-/tjenestekort
 ReturnInSupplier=Tilbake til leverandørkort
@@ -66,22 +64,22 @@ ReturnInCompany=Tilbake til kunde-/prospektkort
 ContentsVisibleByAll=Inneholdet vil være synlig for alle
 ContentsVisibleByAllShort=Innhold synlig for alle
 ContentsNotVisibleByAllShort=Innhold ikke synlig for alle
-CategoriesTree=Kategori-tre
-DeleteCategory=Slett kategori
-ConfirmDeleteCategory=Er du sikker på at du vil slette denne kategorien?
-RemoveFromCategory=Fjern lenke med kategori
-RemoveFromCategoryConfirm=Er du sikker på at du vil fjerne lenken mellom transaksjonen og kategorien?
-NoCategoriesDefined=Ingen kategori definert
-SuppliersCategoryShort=Leverandøkategori
-CustomersCategoryShort=Kundekategori
-ProductsCategoryShort=Produktkategori
-MembersCategoryShort=Medlemskategori
-SuppliersCategoriesShort=Leverandøkategorier
-CustomersCategoriesShort=Kundekategorier
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Kunde-/prospektkategorier
-ProductsCategoriesShort=Produktkategorier
-MembersCategoriesShort=Medlemskategorier
-ContactCategoriesShort=Kontaktkategorier
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Denne kategorien inneholder ingen produkter.
 ThisCategoryHasNoSupplier=Denne kategorien inneholder ingen leverandører.
 ThisCategoryHasNoCustomer=Denne kategorien inneholder ingen kunder.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Denne kategorien inneholder ikke noen kontakt.
 AssignedToCustomer=Knyttet til en kunde
 AssignedToTheCustomer=Knyttet til kunden
 InternalCategory=Intern kategori
-CategoryContents=Innhold i kategori
-CategId=Kategori-ID
-CatSupList=Liste av leverandørkategorier
-CatCusList=Liste over kunde-/prospektkategorier
-CatProdList=Liste over produktkategorier
-CatMemberList=Liste over medlemskategorier
-CatContactList=Liste over kontaktkategorier og kontakt
-CatSupLinks=Koblinger mellom leverandører og kategorier
-CatCusLinks=Koblinger mellom kunder/prospekter og kategorier
-CatProdLinks=Koblinger mellom produkter/tjenester og kategorier
-CatMemberLinks=Koblinger mellom medlemmer og kategorier
-DeleteFromCat=Fjern fra kategori
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Slette bilde 
 ConfirmDeletePicture=Bekreft bildesletting?
 ExtraFieldsCategories=Komplementære attributter
-CategoriesSetup=Kategori-oppsett
-CategorieRecursiv=Link automatisk med overordnet kategori
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Hvis aktivert, vil produktet også knyttes til overordnet kategori når du legger inn en underkategori
 AddProductServiceIntoCategory=Legg til følgende produkt/tjeneste
-ShowCategory=Vis kategori
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index e15b4232a60..848d170e2cc 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= Ingen
+CronNone=Ingen
 CronDtStart=Startdato
 CronDtEnd=Sluttdato
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/nb_NO/donations.lang b/htdocs/langs/nb_NO/donations.lang
index 5b4828f6cfa..ce2c7feea42 100644
--- a/htdocs/langs/nb_NO/donations.lang
+++ b/htdocs/langs/nb_NO/donations.lang
@@ -6,6 +6,8 @@ Donor=Giver
 Donors=Givere
 AddDonation=Create a donation
 NewDonation=Ny donasjon
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Lovet donasjon
 PromisesNotValid=Ikke godkjente løfter
@@ -21,6 +23,8 @@ DonationStatusPaid=Mottatt donasjon
 DonationStatusPromiseNotValidatedShort=Kladd
 DonationStatusPromiseValidatedShort=Godkjent
 DonationStatusPaidShort=Mottatt
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Valider lover
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Opprett kvittering
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 7f06fb6e0fa..4c05c7e2f26 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 011ac84fb48..f886b9c1129 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List alle e-postmeldinger sendt
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 6fc76ac7a89..bcbad4f6d72 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favoritt
 ShortInfo=Info.
 Ref=Nummer
+ExternalRef=Ref. extern
 RefSupplier=Ref. leverandør
 RefPayment=Ref. betaling
 CommercialProposalsShort=Tilbud
@@ -394,8 +395,8 @@ Available=Tilgjengelig
 NotYetAvailable=Ikke tilgjengelig ennå
 NotAvailable=Ikke tilgjengelig
 Popularity=Popularitet
-Categories=Kategorier
-Category=Kategori
+Categories=Tags/categories
+Category=Tag/category
 By=Av
 From=Fra
 to=til
@@ -694,6 +695,7 @@ AddBox=Legg til boks
 SelectElementAndClickRefresh=Velg et element og klikk Oppfrisk
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 8aea126a9c1..e013d9b79c9 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Lever produkt
 Discount=Rabatt
 CreateOrder=Lag ordre
 RefuseOrder=Avvis ordre
-ApproveOrder=Aksepter ordre
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Valider ordre
 UnvalidateOrder=Devalider ordre
 DeleteOrder=Slett ordre
@@ -102,6 +103,8 @@ ClassifyBilled=Klassifiser "Fakturert"
 ComptaCard=Regnskapskort
 DraftOrders=Ordrekladder
 RelatedOrders=Relaterte ordre
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Ordre i behandling
 RefOrder=Ref. ordre
 RefCustomerOrder=Ref. kundeordre
@@ -118,6 +121,7 @@ PaymentOrderRef=Betaling av ordre %s
 CloneOrder=Clone bestilling
 ConfirmCloneOrder=Er du sikker på at du vil klone denne bestillingen %s?
 DispatchSupplierOrder=Motta leverandør bestill %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representant oppfølging kundeordre
 TypeContact_commande_internal_SHIPPING=Representant oppfølging shipping
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 57beeca7610..1fa27e70bac 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Godkjenn intervention
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Godkjenn faktura
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Leverandør bestill godkjent
 Notify_ORDER_SUPPLIER_REFUSE=Leverandør bestill nektet
 Notify_ORDER_VALIDATE=Kundeordre validert
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Kommersiell forslaget sendes med post
 Notify_BILL_PAYED=Kunden faktura betales
 Notify_BILL_CANCEL=Kunden faktura kansellert
 Notify_BILL_SENTBYMAIL=Kunden faktura sendt i posten
-Notify_ORDER_SUPPLIER_VALIDATE=Leverandør orden validert
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverandør ordre sendes med post
 Notify_BILL_SUPPLIER_VALIDATE=Leverandør faktura validert
 Notify_BILL_SUPPLIER_PAYED=Leverandør faktura betales
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Antall vedlagte filer/dokumenter
 TotalSizeOfAttachedFiles=Total størrelse på vedlagte filer/dokumenter
 MaxSize=Maksimal størrelse
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Fakturaen %s har blitt validert.
 EMailTextProposalValidated=Forslaget %s har blitt validert.
 EMailTextOrderValidated=Ordren %s har blitt validert.
 EMailTextOrderApproved=Ordren %s er godkjent.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Ordren %s er godkjent av %s.
 EMailTextOrderRefused=Ordren %s har blitt nektet.
 EMailTextOrderRefusedBy=Ordren %s har blitt nektet av %s.
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 1a443f724cd..42894d7663e 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 86f6159f0fa..62a33832a10 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Liste over leverandørens fakturaer knytte
 ListContractAssociatedProject=Liste over kontrakter knyttet til prosjektet
 ListFichinterAssociatedProject=Liste over tiltak knyttet til prosjektet
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Liste over tiltak knyttet til prosjektet
 ActivityOnProjectThisWeek=Aktiviteter i prosjektet denne uke
 ActivityOnProjectThisMonth=Aktiviteter i prosjektet denne måned
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Koble fra element
 # Documents models
 DocumentModelBaleine=En komplett prosjektets rapport modell (logo. ..)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index c2e8b0514b6..60d7aa4c22a 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. levering
 Sending=Levering
 Sendings=Leveringer
+AllSendings=All Shipments
 Shipment=Levering
 Shipments=Skipninger
 ShowSending=Show Sending
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index 219237d952d..329b4134696 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Liste over leverandørordre
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index c961b2450f3..4eb15ee7988 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Scheidingsteken
 ExtrafieldCheckBox=Aanvink-vak
 ExtrafieldRadio=Radioknop
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameterlijsten hebben de waarden sleutel,waarde

     bijvoorbeeld: 
    1,waarde1
    2,waarde2
    3,waarde3
    ...

    Voor een afhankelijke lijst:
    1,waarde1|parent_list_code:parent_key
    2,waarde2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Een parameterlijst heeft de waarden sleutel,waarde

     bijvoorbeeld: 
    1,waarde1
    2,waarde2
    3,waarde3
    ...

    
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Bijzondere uitgaven (BTW, sociale lasten, dividenden)
 Module500Desc=Beheer van diverse uitgaven, zoals belastingen, sociale bijdragen, dividenden en salarissen
 Module510Name=Salarissen
 Module510Desc=Beheer van de werknemers salarissen en betalingen
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Kennisgevingen
 Module600Desc=Stuur EMail notificaties van bepaalde Dolibarr zakelijke gebeurtenissen naar derde-partijen contacten (setup gedefinieerd in iedere derde-partij)
 Module700Name=Giften
@@ -508,14 +511,14 @@ Module1400Name=Boekhouden
 Module1400Desc=Boekhoudkundig beheer van deskundigen (dubbel partijen)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categorieën
-Module1780Desc=Categoriebeheer (producten, leveranciers en afnemers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=Een WYSIWYG editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Beheer taakplanning
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Acties-, taken- en agendabeheer
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Lees Salarissen
 Permission512=Maak / wijzig salarissen
 Permission514=Verwijder salarissen
 Permission517=Export salarissen
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Diensten inzien
 Permission532=Creëren / wijzigen van diensten
 Permission534=Diensten verwijderen
@@ -746,6 +754,7 @@ Permission1185=Goedkeuren leveranciersopdrachten
 Permission1186=Bestel leveranciersopdrachten
 Permission1187=Bevestigt de ontvangst van de leveranciersopdrachten
 Permission1188=Sluiten leverancier opdrachten
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Geef het resultaat van een uitvoervergunning
 Permission1202=Creëren/wijzigen een uitvoervergunning
 Permission1231=Bekijk leveranciersfacturen
@@ -758,10 +767,10 @@ Permission1237=Exporteer Leverancier opdrachten en hun details
 Permission1251=Voer massale invoer van externe gegevens in de database uit (data load)
 Permission1321=Exporteer afnemersfacturen, attributen en betalingen
 Permission1421=Exporteer afnemersfacturen en attributen
-Permission23001 = Lees geplande taak
-Permission23002 = Maak/wijzig geplande taak
-Permission23003 = Verwijder geplande taak
-Permission23004 = Voer geplande taak uit
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Bekijk acties (gebeurtenissen of taken) in gerelateerd aan eigen account
 Permission2402=Creëren / wijzigen / verwijderen acties (gebeurtenissen of taken) gerelateerd aan eigen account
 Permission2403=Bekijk acties (gebeurtenissen of taken) van anderen
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Geef een boekhoudkundige code terug opgebouwd uit "401
 ModuleCompanyCodePanicum=Geef een lege boekhoudkundige code terug.
 ModuleCompanyCodeDigitaria=Boekhoudkundige-code is afhankelijk van derden code. De code bestaat uit het teken "C" in de eerste positie, gevolgd door de eerste 5 tekens van de derden code.
 UseNotifications=Gebruik kennisgevingen
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documentensjablonen
 DocumentModelOdt=Genereer documenten uit OpenDocuments sjablonen (. ODT of. ODS-bestanden voor OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Watermerk op conceptdocumenten
@@ -1557,6 +1566,7 @@ SuppliersSetup=Leveranciersmoduleinstellingen
 SuppliersCommandModel=Compleet levaranciersopdrachtsjabloon (logo)
 SuppliersInvoiceModel=Compleet leveranciersfacturensjabloon (logo)
 SuppliersInvoiceNumberingModel=Leveranciersfacturen nummering modellen
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup="GeoIP Maxmind"-moduleinstellingen
 PathToGeoIPMaxmindCountryDataFile=Pad naar bestand met Maxmind ip tot land vertaling. 
    Voorbeelden: 
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index 22169bc3f06..9f0115bc97f 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Factuur %s gevalideerd
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Factuur %s ga terug naar ontwerp van de status van
 InvoiceDeleteDolibarr=Factuur %s verwijderd
-OrderValidatedInDolibarr= Opdracht %s gevalideerd
+OrderValidatedInDolibarr=Opdracht %s gevalideerd
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Bestel %s geannuleerd
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Bestel %s goedgekeurd
 OrderRefusedInDolibarr=Order %s is geweigerd
 OrderBackToDraftInDolibarr=Bestel %s terug te gaan naar ontwerp-status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 1f75b981c62..51364e08de8 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Betalingen gedaan
 PaymentsBackAlreadyDone=Terugbetaling al gedaan
 PaymentRule=Betalingsvoorwaarde
 PaymentMode=Betalingstype
-PaymentConditions=Betalingstermijn
-PaymentConditionsShort=Betalingstermijn
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Betalingsbedrag
 ValidatePayment=Valideer deze betaling
 PaymentHigherThanReminderToPay=Betaling hoger dan herinnering te betalen
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Totaal van de twee nieuwe korting moet geli
 ConfirmRemoveDiscount=Weet u zeker dat u van deze korting wilt verwijderen?
 RelatedBill=Gerelateerde factuur
 RelatedBills=Gerelateerde facturen
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 1819c47be8f..1391402e8f3 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categorie
-Categories=Categorieën
-Rubrique=Rubriek
-Rubriques=Rubrieken
-categories=categorieën
-TheCategorie=De categorie
-NoCategoryYet=Geen categorie van dit type gecreëerd
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Invoegen in categorie
 modify=wijzigen
 Classify=Classificeren
-CategoriesArea=Categorieënoverzicht
-ProductsCategoriesArea=Categorieënoverzicht van producten / diensten
-SuppliersCategoriesArea=Categorieënoverzicht van leveranciers
-CustomersCategoriesArea=Categorieënoverzicht van afnemers
-ThirdPartyCategoriesArea=Categorieënoverzicht van derde partijen
-MembersCategoriesArea=Categorieënoverzicht van leden
-ContactsCategoriesArea=Categorie contacten gebied
-MainCats=Belangrijkste categorieën
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategorieën
 CatStatistics=Statistieken
-CatList=categorieënlijst
-AllCats=Alle categorieën
-ViewCat=Bekijk categorie
-NewCat=Categorie toevoegen
-NewCategory=Nieuwe categorie
-ModifCat=Categorie wijzigen
-CatCreated=Categorie gecreëerd
-CreateCat=Creëer categorie
-CreateThisCat=Creëer deze categorie
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Valideer de velden
 NoSubCat=Geen subcategorie.
 SubCatOf=Subcategorie
-FoundCats=Gevonden categorieën
-FoundCatsForName=Gevonden categorieën voor de naam
-FoundSubCatsIn=Subcategorie gevonden in de categorie
-ErrSameCatSelected=U heeft meerder keren dezelfde categorie geselecteerd
-ErrForgotCat=U vergat de categorie te kiezen
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=U vergat velden in te vullen
 ErrCatAlreadyExists=Deze naam wordt al gebruikt
-AddProductToCat=Dit product toevoegen aan een categorie?
-ImpossibleAddCat=Niet mogelijk om de categorie toe te voegen
-ImpossibleAssociateCategory=Niet mogelijk om de categorie te koppelen aan
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s is succesvol toegevoegd.
-ObjectAlreadyLinkedToCategory=Element is al gekoppeld aan deze categorie.
-CategorySuccessfullyCreated=De categorie %s is met succes toegevoegd.
-ProductIsInCategories=Product / dienst is eigenaar van de volgende categorieën
-SupplierIsInCategories=Klant is eigenaar van de volgende leverancierscategorieën
-CompanyIsInCustomersCategories=Deze Klant is eigenaar van de volgende afnemers- / prospectencategorieën
-CompanyIsInSuppliersCategories=Deze Klant is eigenaar van de volgende leverancierscategorieën
-MemberIsInCategories=Dit lid is eigenaar van de volgende ledencategorieën
-ContactIsInCategories=Dit contact kent de volgende  contacts Categorieën
-ProductHasNoCategory=Dit product / dienst behoort tot geen enkele categorie
-SupplierHasNoCategory=Deze leverancier behoort tot geen enkele categorie
-CompanyHasNoCategory=Dit bedrijf behoort tot geen enkele categorie
-MemberHasNoCategory=Dit lid behoort tot geen enkele categorie
-ContactHasNoCategory=Dit contact is niet in een Categorieën onderverdeeld
-ClassifyInCategory=Classificeren naar categorie
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Geen
-NotCategorized=Zonder categorie
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Deze categorie bestaat al op hetzelfde niveau
 ReturnInProduct=Terug naar product- / dienstdetails
 ReturnInSupplier=Terug naar leverancierdetails
@@ -66,22 +64,22 @@ ReturnInCompany=Terug naar de afnemer- / prospectdetails
 ContentsVisibleByAll=De inhoud wordt zichtbaar voor iedereen
 ContentsVisibleByAllShort=Inhoud zichtbaar voor iedereen
 ContentsNotVisibleByAllShort=Inhoud is niet zichtbaar voor iedereen
-CategoriesTree=Overzicht van categorieën
-DeleteCategory=Categorie verwijderen
-ConfirmDeleteCategory=Weet u zeker dat u deze categorie wilt verwijderen?
-RemoveFromCategory=Verwijder de koppeling met de categorie
-RemoveFromCategoryConfirm=Weet u zeker dat u het verband tussen de transactie en de categorie wilt verwijderen?
-NoCategoriesDefined=Geen categorieën ingesteld
-SuppliersCategoryShort=Leverancierscategorie
-CustomersCategoryShort=Afnemerscategorie
-ProductsCategoryShort=Productencategorie
-MembersCategoryShort=Ledencategorie
-SuppliersCategoriesShort=Leverancierscategorie
-CustomersCategoriesShort=Afnemerscategorie
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Afnemers- / Prospectencategorie
-ProductsCategoriesShort=Productencategorie
-MembersCategoriesShort=Ledencategorie
-ContactCategoriesShort=Contact Categorieën
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Deze categorie bevat geen producten.
 ThisCategoryHasNoSupplier=Deze categorie bevat geen enkele leverancier.
 ThisCategoryHasNoCustomer=Deze categorie bevat geen enkele afnemer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Deze categorie bevat geen enkel contact.
 AssignedToCustomer=Toegewezen aan een afnemer
 AssignedToTheCustomer=Toegewezen aan de afnemer
 InternalCategory=Interne categorie
-CategoryContents=Categorie-inhoud
-CategId=Categorie-ID
-CatSupList=Leverancierscategorieënlijst
-CatCusList=afnemers- / prospectencategorieënlijst
-CatProdList=productencategorieënlijst
-CatMemberList=Ledencategorieënlijst
-CatContactList=Lijst van Categorieën van Contacten
-CatSupLinks=Verbinding tussen leverancier en categorie
-CatCusLinks=Verbinding tussen klant/prospect en categorie
-CatProdLinks=Verbinding tussen producten/diensten en categorieën
-CatMemberLinks=Verbinding tussen leden en categorieën
-DeleteFromCat=Verwijder uit categorie
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Afbeelding verwijderen
 ConfirmDeletePicture=Bevestig verwijderen afbeelding
 ExtraFieldsCategories=Complementaire kenmerken
-CategoriesSetup=Opzetten categorieën 
-CategorieRecursiv=Automatisch linken met bovenliggende categorie
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Indien geactiveerd zal het product ook gelinkt worden met de bovenliggende categorie wanneer een subcategorie toegevoegd wordt.
 AddProductServiceIntoCategory=Voeg het volgende product/dienst toe
-ShowCategory=Laat categorie zien
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index 509725038ef..9308defa42a 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Commando
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Weet je zker dat je deze cron taak wilt verwijderen?
-CronExecute=Voer taak uit
-CronConfirmExecute= Weet je zeker dat je deze taak nu uit wilt voeren
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wachtende taken
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Taak
-CronNone= Geen
+CronNone=Geen
 CronDtStart=Begindatum
 CronDtEnd=Einddatum
 CronDtNextLaunch=Volgende uitvoering
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informatie
 # Common
diff --git a/htdocs/langs/nl_NL/donations.lang b/htdocs/langs/nl_NL/donations.lang
index c666ad40925..a3470f88df7 100644
--- a/htdocs/langs/nl_NL/donations.lang
+++ b/htdocs/langs/nl_NL/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donoren
 AddDonation=Create a donation
 NewDonation=Nieuwe donatie
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Toon gift
 DonationPromise=Donatie toezegging
 PromisesNotValid=Niet gevalideerde toezegging
@@ -21,6 +23,8 @@ DonationStatusPaid=Donatie ontvangen
 DonationStatusPromiseNotValidatedShort=Voorlopig
 DonationStatusPromiseValidatedShort=Gevalideerd
 DonationStatusPaidShort=Ontvangen
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Bevestig de toezegging
 DonationReceipt=Gift ontvangstbewijs
 BuildDonationReceipt=Creëer donatieontvangstbewijs
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 0a8f7093045..5b331399e82 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Verplichte setup parameters zijn nog niet gedefinieerd
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index cdd2ca5a1c3..7917a240c14 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Toon een lijst van alle verzonden kennisgevingen
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index e2029732446..613de2e8598 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Referentie
+ExternalRef=Ref. extern
 RefSupplier=Leverancierreferentie
 RefPayment=Betalingskenmerk
 CommercialProposalsShort=Offertes
@@ -394,8 +395,8 @@ Available=Beschikbaar
 NotYetAvailable=Nog niet beschikbaar
 NotAvailable=Niet beschikbaar
 Popularity=Populariteit
-Categories=Categorieën
-Category=Categorie
+Categories=Tags/categories
+Category=Tag/category
 By=Door
 From=Van
 to=aan
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Maandag
 Tuesday=Dinsdag
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 83f76d2ab97..08686be5296 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Verzend product
 Discount=Korting
 CreateOrder=Creeer opdracht
 RefuseOrder=Wijger opdracht
-ApproveOrder=Accepteer opdracht
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Valideer opdracht
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Verwijder opdracht
@@ -102,6 +103,8 @@ ClassifyBilled=Classificeer "gefactureerd"
 ComptaCard=Boekhoudingsoverzicht
 DraftOrders=Conceptopdrachten
 RelatedOrders=Gerelateerde opdrachten
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Opdrachten in behandeling
 RefOrder=Ref. Opdracht
 RefCustomerOrder=Ref. afnemersopdracht
@@ -118,6 +121,7 @@ PaymentOrderRef=Betaling van opdracht %s
 CloneOrder=Kloon opdracht
 ConfirmCloneOrder=Weet u zeker dat u deze opdracht %s wilt klonen?
 DispatchSupplierOrder=Ontvangst van leveranciersopdracht %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Vertegenwoordiger die follow-up van afnemersopdracht doet
 TypeContact_commande_internal_SHIPPING=Vertegenwoordiger die follow-up van verzending doet
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 4445dfcb6ca..0c20da6fc3f 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Interventie gevalideerd
 Notify_FICHINTER_SENTBYMAIL=Interventie via mail verzonden
 Notify_BILL_VALIDATE=Klant factuur gevalideerd
 Notify_BILL_UNVALIDATE=Klantenfactuur niet gevalideerd
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Leverancier te zijn goedgekeurd
 Notify_ORDER_SUPPLIER_REFUSE=Leverancier bestellen geweigerd
 Notify_ORDER_VALIDATE=Bestelling van de klant gevalideerd
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercieel voorstel per e-mail
 Notify_BILL_PAYED=Klant factuur betaald
 Notify_BILL_CANCEL=Klant factuur geannuleerd
 Notify_BILL_SENTBYMAIL=Klant verzonden factuur per post
-Notify_ORDER_SUPPLIER_VALIDATE=Gevalideerde leverancier bestellen
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverancier bestellen per e-mail
 Notify_BILL_SUPPLIER_VALIDATE=Leverancier factuur gevalideerd
 Notify_BILL_SUPPLIER_PAYED=Leverancier factuur betaald
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Creatie project
 Notify_TASK_CREATE=Taak gemaakt
 Notify_TASK_MODIFY=Taak gewijzigd
 Notify_TASK_DELETE=Taak verwijderd
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Aantal bijgevoegde bestanden / documenten
 TotalSizeOfAttachedFiles=Totale omvang van de bijgevoegde bestanden / documenten
 MaxSize=Maximale grootte
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=De factuur %s is gevalideerd
 EMailTextProposalValidated=De offerte %s is gevalideerd.
 EMailTextOrderValidated=De opdracht %s is gevalideerd.
 EMailTextOrderApproved=De opdracht %s is goedgekeurd.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=De order %s is goedgekeuerd door %s.
 EMailTextOrderRefused=De order %s is geweigerd.
 EMailTextOrderRefusedBy=De order %s is geweigerd door %s.
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 784314a472c..0b99eadd66c 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index e242d88716f..bddf7fe85d7 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Lijst van aan het project verbonden levera
 ListContractAssociatedProject=Lijst van aan het project verbonden contracten
 ListFichinterAssociatedProject=Lijst van aan het project verbonden interventies
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lijst van aan het project verbonden acties
 ActivityOnProjectThisWeek=Projectactiviteit in deze week
 ActivityOnProjectThisMonth=Projectactiviteit in deze maand
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Een compleet projectrapportagemodel (logo, etc)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index 72a94edeec1..42dbd16a12f 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Referentie verzending
 Sending=Verzending
 Sendings=Verzendingen
+AllSendings=All Shipments
 Shipment=Verzending
 Shipments=Verzendingen
 ShowSending=Show Sending
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index e38970a6513..8983b90f533 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index bb9b358c045..b9536aee4af 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -1,160 +1,160 @@
 # Dolibarr language file - en_US - Accounting Expert
 CHARSET=UTF-8
 
-Accounting=Accounting
-Globalparameters=Global parameters
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
-Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+Accounting=Księgowość
+Globalparameters=Parametry globalne
+Chartofaccounts=Plan kont
+Fiscalyear=Lat podatkowych
+Menuaccount=Konta księgowe
+Menuthirdpartyaccount=Rachunki Thirdparty
+MenuTools=Narzędzia
 
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
-Export=Export
-Modelcsv=Model of export
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert
-BackToChartofaccounts=Return chart of accounts
-Back=Return
+ConfigAccountingExpert=Konfiguracja modułu eksperta księgowego
+Journaux=Czasopisma
+JournalFinancial=Czasopisma finansowe
+Exports=Eksportuje
+Export=Eksport
+Modelcsv=Model eksportu
+OptionsDeactivatedForThisExportModel=Dla tego modelu eksportowego, opcje są wyłączone
+Selectmodelcsv=Wybierz model eksportu
+Modelcsv_normal=Klasyczne eksport
+Modelcsv_CEGID=Eksport do Cegid Expert
+BackToChartofaccounts=Powrót planu kont
+Back=Powrót
 
-Definechartofaccounts=Define a chart of accounts
-Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-Ventilation=Breakdown
-ToDispatch=To dispatch
-Dispatched=Dispatched
+Definechartofaccounts=Definiowanie planu kont
+Selectchartofaccounts=Wybierz plan kont
+Validate=Uprawomocnić
+Addanaccount=Dodaj konto księgowe
+AccountAccounting=Konto księgowe
+Ventilation=Awaria
+ToDispatch=Wysyłką
+Dispatched=Wywoływane
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
-NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
-UpdateAccount=Modification of an accounting account
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
+CustomersVentilation=Podział klientów
+SuppliersVentilation=Dostawcy Breakdown
+TradeMargin=Marża handlowa
+Reports=Raporty
+ByCustomerInvoice=Fakturami klientów
+ByMonth=Przez miesiąc
+NewAccount=Nowe konto księgowe
+Update=Aktualizacja
+List=Lista
+Create=Utworzyć
+UpdateAccount=Modyfikacja konta księgowego
+UpdateMvts=Modyfikacja ruch
+WriteBookKeeping=Konta rekord w księdze głównej
+Bookkeeping=Księga główna
+AccountBalanceByMonth=Stan konta na miesiąc
 
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
-Line=Line
+AccountingVentilation=Rachunkowości podział
+AccountingVentilationSupplier=Dostawca rachunkowości podział
+AccountingVentilationCustomer=Podział klientów rachunkowości
+Line=Linia
 
-CAHTF=Total purchase supplier HT
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=In the accounting account
+CAHTF=Razem HT dostawca kupna
+InvoiceLines=Linie faktury być wentylowane
+InvoiceLinesDone=Wentylowanych linie faktury
+IntoAccount=W rachunku rachunkowości
 
-Ventilate=Ventilate
-VentilationAuto=Automatic breakdown
+Ventilate=Wietrzyć
+VentilationAuto=Automatyczny podział
 
-Processing=Processing
-EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+Processing=Przetwarzanie
+EndProcessing=Koniec obróbki
+AnyLineVentilate=Wszelkie linie do wentylacji
+SelectedLines=Wybrane linie
+Lineofinvoice=Linia faktury
+VentilatedinAccount=Wentylowane z powodzeniem na koncie księgowym
+NotVentilatedinAccount=Nie wentylowane na koncie księgowym
 
-ACCOUNTING_SEPARATORCSV=Column separator in export file
+ACCOUNTING_SEPARATORCSV=Separator kolumna w pliku eksportu
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Ilość elementów jest podział przedstawiony przez strony (maksymalna zalecana: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Rozpocząć sortowanie stron rozpadu "Has to podział" przez ostatnich elementów
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Rozpocznij sortowanie stron rozpadu "Breakdown" przez ostatnich elementów
 
-AccountLength=Length of the accounting accounts shown in Dolibarr
-AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+AccountLength=Długość rozliczania rachunków przedstawiono w Dolibarr
+AccountLengthDesc=Funkcja pozwala udawać długość koncie księgowym zastępując obowiązuje przez cyfrę zero. Funkcja ta dotyka tylko wyświetlacz, to nie zmienia kont księgowych zarejestrowanych w Dolibarr. Na wywóz, funkcja ta jest konieczna, aby być zgodne z określonym oprogramowaniem.
+ACCOUNTING_LENGTH_GACCOUNT=Długość ogólnych rachunków
+ACCOUNTING_LENGTH_AACCOUNT=Długość z rachunków osób trzecich
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=Sprzedam czasopisma
+ACCOUNTING_PURCHASE_JOURNAL=Zakup czasopisma
+ACCOUNTING_BANK_JOURNAL=Czasopismo Banku
+ACCOUNTING_CASH_JOURNAL=Czasopismo Gotówka
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Inne czasopisma
+ACCOUNTING_SOCIAL_JOURNAL=Czasopismo Społecznego
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
-ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Konto transferu
+ACCOUNTING_ACCOUNT_SUSPENSE=Konto czekać
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Rachunkowość konto domyślnie dla zakupionych produktów (jeśli nie jest określony w ulotce)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Rachunkowość konto domyślnie dla sprzedawanych produktów (jeśli nie określono w ulotce)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Rachunkowość konto domyślnie dla zakupionych usług (jeśli nie określona w arkuszu usług)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Rachunkowość konto domyślnie dla sprzedanych usług (jeśli nie określona w arkuszu usług)
 
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
+Doctype=Rodzaj dokumentu
+Docdate=Data
+Docref=Odniesienie
+Numerocompte=Konto
 Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
+Labelcompte=Konto Wytwórnia
+Debit=Debet
+Credit=Kredyt
+Amount=Ilość
 Sens=Sens
-Codejournal=Journal
+Codejournal=Czasopismo
 
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Usuń zapisy w księdze głównej
 
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
-DescCashJournal=Cash journal including the type of payment cash
+SellsJournal=Sprzedaje w czasopiśmie
+PurchasesJournal=Zakupy czasopisma
+DescSellsJournal=Sprzedaje w czasopiśmie
+DescPurchasesJournal=Zakupy czasopisma
+BankJournal=Czasopismo Banku
+DescBankJournal=Czasopismo Banku w tym wszystkich rodzajów płatności innych niż gotówka
+CashJournal=Czasopismo Gotówka
+DescCashJournal=Czasopismo pieniężnych w tym rodzaju płatności gotówką
 
-CashPayment=Cash Payment
+CashPayment=Płatność gotówką
 
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Zapłata faktury dostawcy
+CustomerInvoicePayment=Zapłata faktury klienta
 
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Thirdparty konto
 
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+NewAccountingMvt=Nowy ruch
+NumMvts=Ilość ruchów
+ListeMvts=Lista przemieszczania
+ErrorDebitCredit=Debetowych i kredytowych nie może mieć wartość w tym samym czasie
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=Lista thirdparty konto
+DescThirdPartyReport=Skonsultuj się tutaj listę thirdparty klientów i dostawców oraz ich kont księgowych
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Lista kont księgowych
 
-Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
-Active=Statement
+Pcgversion=Wersja planu
+Pcgtype=Klasa konta
+Pcgsubtype=W ramach klasy uwagę
+Accountparent=Korzeń konta
+Active=Oświadczenie
 
-NewFiscalYear=New fiscal year
+NewFiscalYear=Nowy rok podatkowy
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
-TotalVente=Total turnover HT
-TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+DescVentilCustomer=Skonsultuj się tutaj rocznego rozliczenia przebicia faktur klientów
+TotalVente=Razem HT obroty
+TotalMarge=Marża całkowita sprzedaż
+DescVentilDoneCustomer=Skonsultuj się tutaj listę linii faktur klientów i ich rachunek rachunkowości
+DescVentilTodoCustomer=Wyraź swoje wiersze faktury klienta z kontem rachunkowości
+ChangeAccount=Zmienianie konta księgowego dla wierszy wybranych przez konto:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
-DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
-DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+DescVentilSupplier=Skonsultuj się tutaj rocznego rozliczenia przebicia faktur dostawców
+DescVentilTodoSupplier=Wyraź swoje wiersze dostawcę faktury z kontem rachunkowości
+DescVentilDoneSupplier=Skonsultuj się tutaj listę linii dostawcy faktur i ich koncie księgowym
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Weryfikacja Automatycznie
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+ErrorAccountancyCodeIsAlreadyUse=Błąd, nie można usunąć to konto księgowe, ponieważ jest używany
 
-FicheVentilation=Breakdown card
+FicheVentilation=Karta Podział
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index d048aa3a61b..a72d6503990 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -8,11 +8,11 @@ VersionExperimental=Eksperymentalny
 VersionDevelopment=Rozwój
 VersionUnknown=Nieznany
 VersionRecommanded=Zalecana
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Pliki Integrity
+FilesMissing=Brakujące pliki
+FilesUpdated=Aktualizacja plików
+FileCheckDolibarr=Sprawdź Dolibarr integralności plików
+XmlNotFound=Plik XML z Dolibarr Integrity Not Found
 SessionId=ID sesji
 SessionSaveHandler=Asystent zapisu sesji
 SessionSavePath=Lokalizacja sesji danych
@@ -48,21 +48,21 @@ SecuritySetup=Ustawienia bezpieczeństwa
 ErrorModuleRequirePHPVersion=Błąd ten moduł wymaga PHP w wersji %s lub większej
 ErrorModuleRequireDolibarrVersion=Błąd ten moduł wymaga Dolibarr wersji %s lub większej
 ErrorDecimalLargerThanAreForbidden=Błąd, dokładność większa niż %s nie jest obsługiwana
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
+DictionarySetup=Słownik setup
+Dictionary=Słowniki
+Chartofaccounts=Plan kont
+Fiscalyear=Lat podatkowych
+ErrorReservedTypeSystemSystemAuto=Wartość "System" i "systemauto" dla typu jest zarezerwowana. Możesz użyć "użytkownik" jako wartości, aby dodać swój własny rekord
 ErrorCodeCantContainZero=Kod nie może zawierać wartości "0"
 DisableJavascript=Wyłącz funkcje JavaScript i Ajax (rekomendowane dla osób niewidomych oraz przeglądarek tekstowych)
 ConfirmAjax=Wykorzystanie potwierdzeń Ajax popups
-UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
+UseSearchToSelectCompanyTooltip=Także jeśli masz dużą liczbę osób trzecich (> 100 000), można zwiększyć prędkość przez ustawienie stałej COMPANY_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
+UseSearchToSelectCompany=Użyj pól wyboru Autouzupełnianie osób trzecich zamiast pól listy.
 ActivityStateToSelectCompany= Dodaj filtr opcję aby pokazać / ukryć thirdparties, które są aktualnie w działalności lub przestał go
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContact=Use autocompletion fields to choose contact (instead of using a list box).
-DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
-DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
+UseSearchToSelectContactTooltip=Także jeśli masz dużą liczbę osób trzecich (> 100 000), można zwiększyć prędkość przez ustawienie stałej CONTACT_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
+UseSearchToSelectContact=Użyj pól wyboru Autouzupełnianie kontaktu (zamiast przy użyciu pola listy).
+DelaiedFullListToSelectCompany=Poczekaj naciśnięciu klawisza przed ładowania treści z listy thirdparties kombi (Może to zwiększyć wydajność, jeśli masz dużą liczbę thirdparties)
+DelaiedFullListToSelectContact=Poczekaj naciśnięciu klawisza przed ładowania treści z listy kontaktów kombi (może to zwiększyć wydajność, jeśli masz dużą liczbę kontaktów)
 SearchFilter=Opcje filtrów wyszukiwania
 NumberOfKeyToSearch=NBR znaków do uruchomienia wyszukiwania: %s
 ViewFullDateActions=Pokaż pełny terminy działań w trzecim arkusza
@@ -74,25 +74,25 @@ ShowPreview=Pokaż podgląd
 PreviewNotAvailable=Podgląd niedostępny
 ThemeCurrentlyActive=Theme obecnie aktywnych
 CurrentTimeZone=Aktualna Timezone
-MySQLTimeZone=TimeZone MySql (database)
-TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
+MySQLTimeZone=Strefa czasowa MySQL (baza danych)
+TZHasNoEffect=Daty są przechowywane i zwrócone przez serwer bazy danych, jak gdyby były przechowywane jako zgłosił ciąg. Strefa czasowa ma wpływ tylko wtedy, gdy przy użyciu funkcji UNIX_TIMESTAMP (które nie powinny być używane przez Dolibarr, więc TZ bazy danych nie powinny mieć wpływu, nawet jeśli zmienił się po dane zostały wprowadzone).
 Space=Space
 Table=Tabela
-Fields=Obszary
+Fields=Pola
 Index=Indeks
 Mask=Maska
 NextValue=Następna wartość
 NextValueForInvoices=Następna wartość (faktury)
 NextValueForCreditNotes=Następna wartość (not kredytowych)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Uwaga: PHP granicach każdego pliku jego rozmiar do %s %s, niezależnie od wartości tego parametru jest
-NoMaxSizeByPHPLimit=Uwaga: Nie jest dopuszczalne w konfiguracji PHP
-MaxSizeForUploadedFiles=Maksymalny rozmiar upload plików (0 uniemożliwiających jakiekolwiek upload)
-UseCaptchaCode=Użyj graficzny kod na stronie logowania
-UseAvToScanUploadedFiles=Użyj antywirusowego do skanowania upload plików
-AntiVirusCommand= Pełna ścieżka do polecenia antivirus
-AntiVirusCommandExample= ClamWin przykład: c: \\ Program Files (x86) \\ ClamWin \\ bin \\ clamscan.exe 
     ClamAV przykład: / usr / bin / clamscan
+NextValueForDeposit=Następny wartości (depozyt)
+NextValueForReplacements=Następna wartość (zamienniki)
+MustBeLowerThanPHPLimit=Uwaga: twoj PHP ogranicza rozmiar każdego uploadowanego pliku do %s %s, niezależnie od wartości tego parametru 
+NoMaxSizeByPHPLimit=Uwaga: Brak ustawionego limitu w twojej konfiguracji PHP
+MaxSizeForUploadedFiles=Maksymalny rozmiar dla twoich przesyłanych plików (0 by zabronić jego przesyłanie/upload)
+UseCaptchaCode=Użyj graficzny kod (CAPTCHA) na stronie logowania
+UseAvToScanUploadedFiles=Użyj programu antywirusowego do skanowania przesłanych plików
+AntiVirusCommand= Pełna ścieżka do poleceń antivirusa
+AntiVirusCommandExample= ClamWin przykład: c:\\Program Files (x86)\\ClamWin\\bin\\ clamscan.exe
    Przykład dla ClamAV: /usr/bin/clamscan
 AntiVirusParam= Więcej parametrów w linii poleceń
 AntiVirusParamExample= ClamWin przykład: - bazy danych = "C: \\ Program Files (x86) \\ lib ClamWin \\"
 ComptaSetup=Rachunkowość konfiguracji modułu
@@ -113,9 +113,9 @@ OtherOptions=Inne opcje
 OtherSetup=Inne konfiguracji
 CurrentValueSeparatorDecimal=Separator
 CurrentValueSeparatorThousand=Tysiąc separatora
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=Miejsce przeznaczenia
+IdModule=Identyfikator modułu
+IdPermissions=Uprawnienia ID
 Modules=Moduły
 ModulesCommon=Wspólne modules
 ModulesOther=Inne moduły
@@ -127,7 +127,7 @@ LanguageBrowserParameter=Parametr %s
 LocalisationDolibarrParameters=Lokalizacja parametry
 ClientTZ=Strefa Czasowa Klienta (użytkownik)
 ClientHour=Czas klienta (użytkownik)
-OSTZ=Server OS Time Zone
+OSTZ=Strefa czasowa Serwera OS
 PHPTZ=Strefa czasowa serwera PHP
 PHPServerOffsetWithGreenwich=Offset dla PHP serwer szerokość Greenwich (secondes)
 ClientOffsetWithGreenwich=Klient / Przeglądarka offset szerokość Greenwich (sekund)
@@ -136,7 +136,7 @@ CurrentHour=Aktualna godzina
 CompanyTZ=Strefa czasowa spółki (główne firmy)
 CompanyHour=Godzina spółki (główne firmy)
 CurrentSessionTimeOut=Obecna sesja czasu
-YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
+YouCanEditPHPTZ=Aby ustawić inną strefę czasową PHP (nie jest wymagany), można spróbować dodać .htacces plików z linii jak ten "Setenv TZ Europe / Paris"
 OSEnv=OS Środowiska
 Box=Box
 Boxes=Pulpity informacyjne
@@ -215,7 +215,7 @@ ModulesJobDesc=Biznes moduły zapewniają prostą konfigurację predefiniowanych
 ModulesMarketPlaceDesc=Mogą Państwo znaleźć więcej modułów do pobrania na zewnętrznych stron internetowych w internecie ...
 ModulesMarketPlaces=Więcej modułów ...
 DoliStoreDesc=DoliStore, urzędowy rynek dla Dolibarr ERP / CRM modułów zewnętrznych
-DoliPartnersDesc=List with some companies that can provide/develop on-demand modules or features (Note: any Open Source company knowning PHP language can provide you specific development)
+DoliPartnersDesc=Lista z niektórych firm, które mogą dostarczyć / opracowanie na żądanie moduły i funkcje (Uwaga: każda firma open source knowning języka PHP może dostarczyć konkretny rozwój)
 WebSiteDesc=dostawców sieci Web można szukać, aby znaleźć więcej modułów ...
 URL=Łącze
 BoxesAvailable=Pola dostępne
@@ -227,7 +227,7 @@ AutomaticIfJavascriptDisabled=Automatyczne gdy JavaScript jest wyłączony
 AvailableOnlyIfJavascriptNotDisabled=Dostępna tylko wtedy, gdy JavaScript jest wyłączony
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostępna tylko wtedy, gdy JavaScript jest wyłączony
 Required=Wymagany
-UsedOnlyWithTypeOption=Used by some agenda option only
+UsedOnlyWithTypeOption=Używane przez niektórych opcji porządku obrad tylko
 Security=Bezpieczeństwo
 Passwords=Hasła
 DoNotStoreClearPassword=Czy nie przechowywać hasła w sposób jasny w bazie danych
@@ -246,9 +246,9 @@ OfficialWebSiteFr=Francuski oficjalnej strony www
 OfficialWiki=Dolibarr Wiki
 OfficialDemo=Dolibarr online demo
 OfficialMarketPlace=Dziennik rynku zewnętrznych modułów / addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OfficialWebHostingService=Odwołuje usług hostingowych (cloud hosting)
+ReferencedPreferredPartners=Preferowani Partnerzy
+OtherResources=Zasoby autres
 ForDocumentationSeeWiki=Dla użytkownika lub dewelopera dokumentacji (Doc, FAQ ...), 
     zajrzyj do Dolibarr Wiki: 
      %s
 ForAnswersSeeForum=Na wszelkie inne pytania / pomoc, można skorzystać z Dolibarr forum: 
      %s
 HelpCenterDesc1=Obszar ten może pomóc uzyskać wsparcie na usługi Dolibarr.
@@ -268,9 +268,9 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP (Nie zdefiniowany w PHP,
 MAIN_MAIL_EMAIL_FROM=Nadawca e-mail do automatycznego przetwarzania wiadomości e-mail (domyślnie w php.ini: %s)
 MAIN_MAIL_ERRORS_TO=Nadawca e-mail używany do wiadomości powraca błędach wysyłane
 MAIN_MAIL_AUTOCOPY_TO= Wyślij systematycznie ukryte węgla kopie wszystkich wysłanych e-maili do
-MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Send systematically a hidden carbon-copy of proposals sent by email to
-MAIN_MAIL_AUTOCOPY_ORDER_TO= Send systematically a hidden carbon-copy of orders sent by email to
-MAIN_MAIL_AUTOCOPY_INVOICE_TO= Send systematically a hidden carbon-copy of invoice sent by emails to
+MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Wyślij systematycznie ukryty węgla-egzemplarz wniosków przesłanych pocztą elektroniczną na adres
+MAIN_MAIL_AUTOCOPY_ORDER_TO= Wyślij systematycznie ukryty węglowego kopię zlecenia wysłane e-mailem do
+MAIN_MAIL_AUTOCOPY_INVOICE_TO= Wyślij systematycznie ukryty węgla-egzemplarz faktury wysyłane przez e-maili do
 MAIN_DISABLE_ALL_MAILS=Wyłącz wszystkie e-maile sendings (dla celów badań lub demo)
 MAIN_MAIL_SENDMODE=Metoda użyć do wysyłania e-maili
 MAIN_MAIL_SMTPS_ID=SMTP identyfikator, jeżeli wymaga uwierzytelniania
@@ -303,15 +303,15 @@ DownloadPackageFromWebSite=Pobieram paczke %s
 UnpackPackageInDolibarrRoot=Rozpakuj pakiet plików do katalogu głównego Dolibarr %s
 SetupIsReadyForUse=Instalacja jest zakończona i Dolibarr jest gotowy do użycia z tym nowym elementem.
 NotExistsDirect=Alternatywna ścieżka root nie została zdefiniowana.
    
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
    Just create a directory at the root of Dolibarr (eg: custom).
    
-InfDirExample=
    Then declare it in the file conf.php
     $dolibarr_main_url_root_alt='http://myserver/custom'
    $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
    *These lines are commented with "#", to uncomment only remove the character.
+InfDirAlt=Od wersji 3, możliwe jest zdefiniowanie alternatywne directory.This administratora pozwala na przechowywanie, to samo miejsce, wtyczek i szablonów niestandardowych. 
     Wystarczy utworzyć katalog w katalogu głównym Dolibarr (np: na zamówienie). 
    
+InfDirExample=
     Następnie deklarowany w conf.php pliku 
     $ Dolibarr_main_url_root_alt = "http: // myserver / custom" 
     $ Dolibarr_main_document_root_alt = "/ ścieżka / z / Dolibarr / htdocs / obyczaju" 
     * Linie te są skomentował w "#", odkomentowac tylko usunąć znak.
 YouCanSubmitFile=Wybierz moduł:
 CurrentVersion=Dolibarr aktualnej wersji
 CallUpdatePage=Wejdź na stronę aktualizacji struktury bazy danych i danych %s.
 LastStableVersion=Ostatnia wersja stabilna
-UpdateServerOffline=Update server offline
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
    {000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. 
    {000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. 
    {000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. 
    {dd} day (01 to 31).
    {mm} month (01 to 12).
    {yy}, {yyyy} or {y} year over 2, 4 or 1 numbers. 
    
-GenericMaskCodes2={cccc} the client code on n characters
    {cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
    {tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
    
+UpdateServerOffline=Aktualizacja serwera nieaktywny
+GenericMaskCodes=Można wpisać dowolną maskę numeracji. W tej masce, może stosować następujące tagi: 
     {000000} odpowiada liczbie, która jest zwiększona w każdym% s. Wprowadzić dowolną liczbę zer jako żądaną długość licznika. Licznik zostaną zakończone zerami z lewej, aby mieć jak najwięcej zer jak maski. 
     {000000 + 000} sama jak poprzednia, ale przesunięciem odpowiadającym numerem, na prawo od znaku + odnosi się począwszy od pierwszego% s. 
     {000000} @ x, ale sama jak poprzednia licznik jest wyzerowany, gdy miesiąc osiągnięciu x (x od 1 do 12 lub ​​0 do korzystania pierwszych miesiącach roku podatkowego określone w konfiguracji, lub 99 do wyzerowany co miesiąc ). Jeśli opcja ta jest używana, a x jest 2 lub więcej, wymagana jest również to ciąg {rr} {mm} lub {rrrr} {mm}. 
     {Dd} dni (01 do 31). 
     {Mm} miesięcy (01 do 12). 
     {Rr}, {rrrr} lub {r} roku ponad 2, 4 lub 1 liczb. 
    
+GenericMaskCodes2=Cccc} {kod klienta na n znaków 
     {Cccc000} kod klienta na n znaków następuje przez licznik dedykowaną dla klienta. Licznik ten poświęcony klienta jest kasowany w tym samym czasie, niż globalny licznik. 
     {Tttt} kod thirdparty typu na n znaków (patrz typy słowników-thirdparty). 
    
 GenericMaskCodes3=Wszystkie inne znaki w masce pozostaną nienaruszone. 
     Spacje są niedozwolone. 
    
 GenericMaskCodes4a=Przykład na 99-cie %s strony trzeciej TheCompany zrobić 2007-01-31: 
    
 GenericMaskCodes4b=Przykład trzeciej na uaktualniona w dniu 2007-03-01: 
    
@@ -323,7 +323,7 @@ ServerNotAvailableOnIPOrPort=Serwer nie jest dostępna pod adresem %s na
 DoTestServerAvailability=Test serwera łączność
 DoTestSend=Test wysyłanie
 DoTestSendHTML=Test wysyłania HTML
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazIfNoYearInMask=Błąd, nie można korzystać z opcji @ na reset licznika każdego roku, jeśli ciąg {rr} lub {rrrr} nie jest w masce.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Błąd, nie można użytkownika, jeśli opcja @ sekwencji rr () () lub (mm rrrr mm) () nie jest w maskę.
 UMask=Umask parametr dla nowych plików w Unix / Linux / BSD systemu plików.
 UMaskExplanation=Ten parametr pozwala określić uprawnienia ustawione domyślnie na pliki stworzone przez Dolibarr na serwerze (na przykład podczas przesyłania). 
     To musi być wartość ósemkowa (na przykład, 0666 oznacza odczytu i zapisu dla wszystkich). 
     Paramtre Ce ne sert pas sous un serveur Windows.
@@ -388,32 +388,33 @@ ExtrafieldSelectList = Wybierz z tabeli
 ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Pole wyboru
 ExtrafieldRadio=Przełącznik
-ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
-ExtrafieldParamHelpsellist=Parameters list comes from a table
    Syntax : table_name:label_field:id_field::filter
    Example : c_typent:libelle:id::filter

    filter can be a simple test (eg active=1) to display only active value 
     if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)

    In order to have the list depending on another :
    c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
    Syntax : table_name:label_field:id_field::filter
    Example : c_typent:libelle:id::filter

    filter can be a simple test (eg active=1) to display only active value 
     if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)

    In order to have the list depending on another :
    c_typent:libelle:id:parent_list_code|parent_column:filter
-LibraryToBuildPDF=Library used to build PDF
-WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
    To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
    1 : local tax apply on products and services without vat (vat is not applied on local tax)
    2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
    3 : local tax apply on products without vat (vat is not applied on local tax)
    4 : local tax apply on products before vat (vat is calculated on amount + localtax)
    5 : local tax apply on services without vat (vat is not applied on local tax)
    6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+ExtrafieldCheckBoxFromList= Pole z tabeli
+ExtrafieldLink=Link to an object
+ExtrafieldParamHelpselect=Parametry lista musi tak być, wartość klucza 

     Na przykład: 
     1, wartosc1 
     2, wartość2 
     3, wartość3 
     ... 

     W celu uzyskania listy zależności od drugiego: 
     1, wartosc1 | parent_list_code: parent_key 
     2, wartość2 | parent_list_code: parent_key
+ExtrafieldParamHelpcheckbox=Parametry lista musi tak być, wartość klucza 

     Na przykład: 
     1, wartosc1 
     2, wartość2 
     3, wartość3 
     ...
+ExtrafieldParamHelpradio=Parametry lista musi tak być, wartość klucza 

     Na przykład: 
     1, wartosc1 
     2, wartość2 
     3, wartość3 
     ...
+ExtrafieldParamHelpsellist=Lista parametrów przychodzi z tabeli 
     Składnia: nazwa_tabeli: label_field: id_field :: Filtr 
     Przykład: c_typent: libelle: id :: Filtr 

     Filtr może być prosty test (np aktywny = 1), aby wyświetlić tylko aktywne wartości 
     jeśli chcesz filtrować extrafields używać syntaxt extra.fieldcode = ... (gdzie kod pole jest kod extrafield) 

     W celu uzyskania listy zależności od drugiego: 
     c_typent: libelle: id: parent_list_code | parent_column: filtr
+ExtrafieldParamHelpchkbxlst=Lista parametrów przychodzi z tabeli 
     Składnia: nazwa_tabeli: label_field: id_field :: Filtr 
     Przykład: c_typent: libelle: id :: Filtr 

     Filtr może być prosty test (np aktywny = 1), aby wyświetlić tylko aktywne wartości 
     jeśli chcesz filtrować extrafields używać syntaxt extra.fieldcode = ... (gdzie kod pole jest kod extrafield) 

     W celu uzyskania listy zależności od drugiego: 
     c_typent: libelle: id: parent_list_code | parent_column: filtr
+LibraryToBuildPDF=Biblioteka wykorzystane do budowy PDF
+WarningUsingFPDF=Uwaga: Twój conf.php zawiera dyrektywę dolibarr_pdf_force_fpdf = 1. Oznacza to, że korzystanie z biblioteki FPDF do generowania plików PDF. Ta biblioteka jest stara i nie obsługuje wiele funkcji (Unicode, przejrzystości obrazu, języków cyrylicy, arabskich oraz azjatyckiego, ...), więc mogą wystąpić błędy podczas generowania pliku PDF. 
     Aby rozwiązać ten problem i mieć pełne wsparcie generacji PDF, należy pobrać bibliotekę TCPDF , to skomentować lub usunięcia linii $ dolibarr_pdf_force_fpdf = 1, i dodać zamiast $ dolibarr_lib_TCPDF_PATH = "path_to_TCPDF_dir"
+LocalTaxDesc=W niektórych krajach stosuje się 2 lub 3 podatki od każdej linii faktury. Jeśli jest to przypadek, wybrać typ dla drugiego i trzeciego podatków i jej stopy. Możliwe typu są: 
     1: opłata stosuje się produktów i usług bez podatku VAT (VAT nie jest stosowana na podatek lokalny) 
     2: lokalny podatek stosuje się na produkty i usługi, zanim VAT (jest obliczany na kwotę + localtax) 
     3: podatek lokalny zastosowanie wobec produktów bez podatku VAT (VAT nie jest stosowana na podatek lokalny) 
     4: podatek lokalny zastosowanie wobec produktów przed VAT (jest obliczany na kwotę + localtax) 
     5: opłata stosuje na usługi, bez podatku VAT (VAT nie jest stosowana na podatek lokalny) 
     6: opłata stosuje na usługi przed VAT (jest obliczany na kwotę + localtax)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s
+LinkToTestClickToDial=Wprowadź numer telefonu, aby zadzwonić, aby zobaczyć link do przetestowania url ClickToDial dla użytkownika% s
 RefreshPhoneLink=Odśwież link
-LinkToTest=Clickable link generated for user %s (click phone number to test)
+LinkToTest=Klikalny link wygenerowany dla użytkownika% s (kliknij, numer telefonu, aby sprawdzić)
 KeepEmptyToUseDefault=Zostaw puste by używać domyślnych wartości
 DefaultLink=Domyślny link
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have %s records on %s %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
-NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
+ValueOverwrittenByUserSetup=Uwaga, ta wartość może być zastąpione przez specyficzną konfiguracją użytkowników (każdy użytkownik może ustawić własną clicktodial url)
+ExternalModule=Moduł zewnętrzny - Zainstalowane w katalogu% s
+BarcodeInitForThirdparties=Msza kodów kreskowych o rozruchu thirdparties
+BarcodeInitForProductsOrServices=Msza startowych kodów kreskowych lub zresetować na produkty lub usługi
+CurrentlyNWithoutBarCode=Obecnie masz rekordy% s% s% s bez kodu kreskowego zdefiniowane.
+InitEmptyBarCode=Init wartość przyszłorocznego% s puste rekordy
+EraseAllCurrentBarCode=Usuń wszystkie aktualne wartości kodów kreskowych
+ConfirmEraseAllCurrentBarCode=Czy na pewno chcesz usunąć wszystkie bieżące wartości kodów kreskowych?
+AllBarcodeReset=Wszystkie wartości zostały usunięte z kodem kreskowym
+NoBarcodeNumberingTemplateDefined=Nie szablonu numeracji kodów kreskowych włączona w konfiguracji modułu kodów kreskowych.
+NoRecordWithoutBarcodeDefined=Brak zapisu bez wartości kodów kreskowych zdefiniowane.
 
 # Modules
 Module0Name=Użytkownicy i grupy
@@ -449,13 +450,13 @@ Module52Desc=Zapasy zarządzania produktów
 Module53Name=Usługi
 Module53Desc=Usługi zarządzania
 Module54Name=Kontakty/Subskrypcje
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Desc=Zarządzanie umowami (usług lub subskrypcji Reccuring)
 Module55Name=Kody kreskowe
 Module55Desc=Kody kreskowe zarządzania
 Module56Name=Telefonia
 Module56Desc=Telefonia integracji
 Module57Name=Zlecenia stałe
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Desc=Zleceń stałych oraz zarządzanie wypłaty. Również obejmuje generowanie pliku SEPA dla krajów europejskich.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integracji
 Module59Name=Bookmark4u
@@ -486,77 +487,79 @@ Module320Name=RSS Feed
 Module320Desc=Dodaj kanał RSS Dolibarr wewnątrz ekranu stron
 Module330Name=Zakładki
 Module330Desc=Zakładki zarządzania
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Name=Projekty / Możliwości / Przewody
+Module400Desc=Zarządzanie projektami, możliwości lub przewodów. Następnie można przypisać dowolny element (faktury, zamówienia, propozycja, interwencja, ...) do projektu i uzyskać widok poprzeczny z widoku projektu.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar integracji
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module500Name=Koszty specjalne (podatków, składek na ubezpieczenie społeczne, dywidendy)
+Module500Desc=Zarządzanie specjalnych kosztów, takich jak podatki, składki na ubezpieczenie społeczne, dywidend i wynagrodzenia
+Module510Name=Wynagrodzenia
+Module510Desc=Zarządzanie pracownikami wynagrodzenia i płatności
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Powiadomienia
-Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
+Module600Desc=Wyślij informację, na niektórych zdarzeń gospodarczych do Dolibarr kontaktów zewnętrznych (ustawienia zdefiniowane na każdej thirdparty)
 Module700Name=Darowizny
 Module700Desc=Darowizny zarządzania
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Kosztorys
+Module770Desc=Zarządzanie i roszczenia raporty wydatków (transport, posiłek, ...)
+Module1120Name=Dostawca propozycja handlowa
+Module1120Desc=Dostawca komercyjnych i wniosek propozycja ceny
 Module1200Name=Mantis
 Module1200Desc=Mantis integracji
 Module1400Name=Księgowość ekspertów
 Module1400Desc=Księgowość zarządzania dla ekspertów (double stron)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Kategorie
-Module1780Desc=Kategorie zarządzania (produktów, dostawców i klientów)
+Module1520Name=Generowanie dokumentu
+Module1520Desc=Dokument poczty masowej generacji
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=Edytor WYSIWYG
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
+Module2200Name=Dynamiczne Ceny
+Module2200Desc=Włącz użycie wyrażeń matematycznych dla cen
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Porządek obrad
 Module2400Desc=Działania / zadania i porządku zarządzania
 Module2500Name=Electronic Content Management
 Module2500Desc=Zapisz i udostępniania dokumentów
 Module2600Name=WebServices
 Module2600Desc=Włącz serwer usług internetowych Dolibarr
-Module2650Name=WebServices (client)
-Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
+Module2650Name=WebServices (klient)
+Module2650Desc=Włącz Dolibarr serwisów internetowych klienta (może być używany do pchania danych / wnioski o dopuszczenie do zewnętrznych serwerów. Zamówień Dostawca obsługiwane tylko na chwilę)
 Module2700Name=Gravatar
 Module2700Desc=Użyj Gravatar usług online (www.gravatar.com), aby pokazać zdjęcia użytkowników / członków (znaleziono ich e-maile). Konieczność dostępu do Internetu
 Module2800Desc=FTP Client
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP możliwości konwersji Maxmind
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
+Module3100Desc=Dodaj przycisk Skype do karty zwolenników / osób trzecich / kontaktów
 Module5000Name=Multi-firma
 Module5000Desc=Pozwala na zarządzanie wieloma firmami
 Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
-Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
+Module6000Desc=Zarządzania przepływem pracy
+Module20000Name=Zostaw zarządzanie życzenia
+Module20000Desc=Deklaracja i postępuj pracowników pozostawia wnioski
+Module39000Name=Partii wyrobów
+Module39000Desc=Partii lub serii, jeść po i sprzedawać po zarządzania data o produktach
 Module50000Name=Paybox
 Module50000Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z Paybox
 Module50100Name=Kasa
 Module50100Desc=Kasa modułu
 Module50200Name=Paypal
 Module50200Desc=Moduł oferują online strony płatności za pomocą karty kredytowej z Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
+Module50400Name=Rachunkowość (zaawansowane)
+Module50400Desc=Rachunkowości zarządczej (podwójne strony)
 Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
+Module54000Desc=Druk bezpośredni (bez otwierania dokumentów) za pomocą interfejsu Puchary IPP (drukarki muszą być widoczne z serwera, a CUPS musi być installé na serwerze).
+Module55000Name=Otwórz Sonda
+Module55000Desc=Moduł do ankiet internetowych (jak Doodle, Szpilki, Rdvz, ...)
+Module59000Name=Marże
+Module59000Desc=Moduł do zarządzania marże
+Module60000Name=Prowizje
+Module60000Desc=Moduł do zarządzania prowizji
+Module150010Name=Numer partii, jeść po terminie i data sprzedaży
+Module150010Desc=numer partii, jeść po terminie i sprzedawać po zarządzania data dla produktu
 Permission11=Czytaj faktur
 Permission12=Tworzenie/Modyfikacja faktur
 Permission13=faktur Unvalidate
@@ -586,7 +589,7 @@ Permission67=Eksport interwencji
 Permission71=Czytaj użytkowników
 Permission72=Tworzenie / modyfikować użytkowników
 Permission74=Usuwanie użytkowników
-Permission75=Setup types of membership
+Permission75=Typy konfiguracji członkostwa
 Permission76=Eksport danych
 Permission78=Czytaj subskrypcje
 Permission79=Tworzenie / zmodyfikować subskrypcje
@@ -605,12 +608,12 @@ Permission95=Przeczytaj raporty
 Permission101=Czytaj sendings
 Permission102=Utwórz / Modyfikuj sendings
 Permission104=Validate sendings
-Permission106=Export sendings
+Permission106=Sendings eksport
 Permission109=Usuń sendings
 Permission111=Czytaj finansowych
 Permission112=Tworzenie / modyfikować / usuwać i porównać transakcji
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
+Permission113=Sprawozdania finansowe konfiguracji (tworzenie, zarządzanie kategoriami)
+Permission114=Reconciliate transakcji
 Permission115=Transakcji eksportowych i konta
 Permission116=Przelewy pomiędzy rachunkami
 Permission117=Zarządzanie czeków wysyłkowe
@@ -627,22 +630,22 @@ Permission151=Czytaj stałych zleceń
 Permission152=Instalacji stałych zleceń
 Permission153=Czytaj zlecenia stałe wpływy
 Permission154=Karta kredytowa / odmówić zleceń stałych wpływów
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission171=Read trips and expenses (own and his subordinates)
-Permission172=Create/modify trips and expenses
+Permission161=Czytaj zamówień / subskrypcjami
+Permission162=Tworzenie / modyfikacja zamówień / subskrypcjami
+Permission163=Aktywacja usługi / subskrypcji umowy
+Permission164=Wyłączanie usług / zapis umowy
+Permission165=Usuń zamówień / subskrypcjami
+Permission171=Czytaj wycieczek i koszty (własne i swoich podwładnych)
+Permission172=Tworzenie / modyfikacja wycieczek i koszty
 Permission173=Usuń wyjazdy i wydatki
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
+Permission174=Przeczytaj wszystkie wycieczki i koszty
+Permission178=Eksport wycieczki i koszty
 Permission180=Czytaj dostawców
 Permission181=Czytaj dostawcy zamówienia
 Permission182=Tworzenie / zmodyfikować dostawcy zamówienia
 Permission183=Validate dostawcy zamówienia
 Permission184=Zatwierdź dostawcy zamówienia
-Permission185=Order or cancel supplier orders
+Permission185=Zamówić lub anulować zamówienia dostawca
 Permission186=Odbiór dostawcy zamówienia
 Permission187=Zamknij dostawcy zamówienia
 Permission188=Zrezygnuj dostawcy zamówienia
@@ -663,9 +666,9 @@ Permission221=Czytaj emailings
 Permission222=Utwórz / Modyfikuj emailings (tematu odbiorców ...)
 Permission223=Validate emailings (umożliwia wysyłanie)
 Permission229=Usuń emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
+Permission237=Zobacz odbiorców i informacji
+Permission238=Ręczne wysyłanie mailingów
+Permission239=Usuń wysyłki po zatwierdzeniu lub wysłany
 Permission241=Czytaj kategorii
 Permission242=Tworzenie / modyfikowanie kategorii
 Permission243=Usuwanie kategorii
@@ -693,7 +696,7 @@ Permission300=Odczyt kodów kreskowych
 Permission301=Tworzenie / modyfikować kody kreskowe
 Permission302=Usuwanie kodów kreskowych
 Permission311=Czytaj usług
-Permission312=Assign service/subscription to contract
+Permission312=Przypisywanie usługi / subskrypcja do umowy
 Permission331=Czytaj zakładek
 Permission332=Utwórz / Modyfikuj zakładki
 Permission333=Usuwanie zakładki
@@ -710,10 +713,15 @@ Permission401=Czytaj zniżki
 Permission402=Tworzenie / modyfikować rabaty
 Permission403=Sprawdź rabaty
 Permission404=Usuń zniżki
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
+Permission510=Czytaj Wynagrodzenia
+Permission512=Tworzenie / modyfikacja pensje
+Permission514=Usuń pensje
+Permission517=Wynagrodzenia eksport
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Czytaj usług
 Permission532=Tworzenie / modyfikowania usług
 Permission534=Usuwanie usług
@@ -722,16 +730,16 @@ Permission538=Eksport usług
 Permission701=Czytaj darowizn
 Permission702=Tworzenie / zmodyfikować darowizn
 Permission703=Usuń darowizn
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=Raporty Czytaj wydatków (własne i jego podwładni)
+Permission772=Tworzenie / modyfikacja raportów wydatków
+Permission773=Usuń raporty wydatków
+Permission774=Przeczytaj wszystkie raporty wydatków (nawet dla użytkowników nie podwładni)
+Permission775=Zatwierdzanie raportów wydatków
+Permission776=Zapłać raporty wydatków
+Permission779=Raporty wydatków Export
 Permission1001=Czytaj zapasów
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Tworzenie / modyfikacja magazyny
+Permission1003=Usuń magazyny
 Permission1004=Czytaj stanie ruchów
 Permission1005=Tworzenie / zmodyfikować stanie ruchów
 Permission1101=Przeczytaj zamówienia na dostawy
@@ -746,6 +754,7 @@ Permission1185=Zatwierdź dostawcy zamówienia
 Permission1186=Postanowienie dostawcy zamówienia
 Permission1187=Potwierdzam otrzymanie zamówienia dostawcy
 Permission1188=Zamknij dostawcy zamówienia
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Pobierz skutek wywozu
 Permission1202=Utwórz / Modyfikuj wywóz
 Permission1231=Czytaj dostawcy faktur
@@ -754,14 +763,14 @@ Permission1233=Sprawdź dostawcę faktur
 Permission1234=Usuń dostawcy faktur
 Permission1235=Wyślij faktury dostawców za pośrednictwem poczty elektronicznej
 Permission1236=Eksport faktury dostawcy, atrybuty i płatności
-Permission1237=Export supplier orders and their details
+Permission1237=Zamówienia dostawca Eksport i ich szczegóły
 Permission1251=Uruchom masowego importu danych do zewnętrznych baz danych (dane obciążenia)
 Permission1321=Eksport klienta faktury, atrybuty i płatności
 Permission1421=Eksport zamówień i atrybuty
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Czytaj działań (zdarzeń lub zadań) związane z jego konta
 Permission2402=Tworzenie / modyfikować / usuwać działań (zdarzeń lub zadań) związane z jego konta
 Permission2403=Czytaj działań (zdarzeń lub zadań) innych
@@ -772,66 +781,66 @@ Permission2501=Przeczytaj dokumenty
 Permission2502=Prześlij dokumenty lub usunąć
 Permission2503=Wyślij lub usuwanie dokumentów
 Permission2515=Konfiguracja katalogów dokumentów
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
-Permission50101=Use Point of sales
+Permission2801=Za pomocą klienta FTP w trybie odczytu (przeglądać i pobierać tylko)
+Permission2802=Korzystanie z klienta FTP w trybie zapisu (usuwanie lub przesyłanie plików)
+Permission50101=Zastosowanie Punkt sprzedaży
 Permission50201=Przeczytaj transakcji
 Permission50202=Transakcji importowych
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-DictionaryCompanyType=Thirdparties type
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Civility title
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFees=Type of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyplan=Chart of accounts
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
+Permission54001=Druk
+Permission55001=Czytaj ankiet
+Permission55002=Tworzenie / modyfikacja ankiet
+Permission59001=Czytaj marż handlowych
+Permission59002=Zdefiniuj marż handlowych
+Permission59003=Przeczytaj co margines użytkownika
+DictionaryCompanyType=Typ Thirdparties
+DictionaryCompanyJuridicalType=Prawne, rodzaje thirdparties
+DictionaryProspectLevel=Perspektywa potencjalny poziom
+DictionaryCanton=State / Kantonów
+DictionaryRegion=Regiony
+DictionaryCountry=Kraje
+DictionaryCurrency=Waluty
+DictionaryCivility=Tytuł Grzeczność
+DictionaryActions=Rodzaj wydarzenia porządku obrad
+DictionarySocialContributions=Rodzaje składek na ubezpieczenia społeczne
+DictionaryVAT=VAT ceny lub podatku od sprzedaży ceny
+DictionaryRevenueStamp=Ilość znaczków opłaty skarbowej
+DictionaryPaymentConditions=Warunki płatności
+DictionaryPaymentModes=Tryby płatności
+DictionaryTypeContact=Kontakt / typy Adres
+DictionaryEcotaxe=Podatku ekologicznego (WEEE)
+DictionaryPaperFormat=Formaty papieru
+DictionaryFees=Rodzaj opłaty
+DictionarySendingMethods=Metody wysyłki
+DictionaryStaff=Personel
+DictionaryAvailability=Opóźnienie dostawy
+DictionaryOrderMethods=Sposoby zamawiania
+DictionarySource=Pochodzenie wniosków / zleceń
+DictionaryAccountancyplan=Plan kont
+DictionaryAccountancysystem=Modele dla planu kont
+DictionaryEMailTemplates=Szablony wiadomości e-mail
 SetupSaved=Konfiguracja zapisana
 BackToModuleList=Powrót do listy modułów
-BackToDictionaryList=Back to dictionaries list
+BackToDictionaryList=Powrót do listy słowników
 VATReceivedOnly=Specjalne stawki nie obciążają
 VATManagement=Zarządzanie VAT
-VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:
    If the seller is not subjected to VAT, then VAT by default=0. End of rule.
    If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule. 
    If seller and buyer in the European Community and goods are transport products (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.
    If seller and buyer in the European Community and buyer is not a company, then the VAT by default=VAT of product sold.  End of rule.
    If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.
    Else the proposed default VAT=0. End of rule.
+VATIsUsedDesc=Stawka VAT domyślnie podczas tworzenia perspektywy, faktur, zamówień itp wykonaj standardową zasadę czynnego: 
     Jeśli sprzedający nie poddaje opodatkowaniu podatkiem VAT, to podatek VAT domyślnie = 0. Koniec rządów. 
     Jeśli (sprzedaż kraj = zakupem kraj), a następnie domyślnie = VAT VAT produktu w kraju sprzedaży. Koniec rządów. 
     Jeżeli sprzedający i kupujący we Wspólnocie Europejskiej i towarów są produkty transportu (samochód, statek, samolot), domyślny VAT = 0 (VAT powinny być wypłacane przez kupującego na customoffice swojego kraju, a nie sprzedawcy). Koniec rządów. 
     Jeżeli sprzedający i kupujący we Wspólnocie Europejskiej, a kupujący nie jest spółką, a następnie domyślnie = VAT VAT sprzedawanych produktów. Koniec rządów. 
     Jeżeli sprzedający i kupujący we Wspólnocie Europejskiej i kupującego jest firma, to VAT domyślnie = 0. Koniec rządów. 
     Else proponowany domyślny VAT = 0. Koniec rządów.
 VATIsNotUsedDesc=Domyślnie proponowany VAT wynosi 0, które mogą być wykorzystane w przypadkach takich jak stowarzyszeń, osób fizycznych lub małych firm.
 VATIsUsedExampleFR=We Francji, oznacza to, że firmy i organizacje o rzeczywistym systemu fiskalnego (uproszczony rzeczywistym lub normalnej rzeczywistym). A system, w którym VAT jest deklarowana.
 VATIsNotUsedExampleFR=We Francji, oznacza to stowarzyszenia, które nie są zgłoszone VAT lub firm, organizacji i wolnych zawodów, które wybrały mikro przedsiębiorstw systemu fiskalnego (VAT w franczyzy) i wypłaciła franszyzowej VAT bez deklaracji VAT. Ten wybór będzie wyświetlany odniesienie "Nie dotyczy podatku VAT - art-293B z CGI" na fakturach.
 ##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsUsed=Use second tax
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
+LTRate=Stawka
+LocalTax1IsUsed=Użyj drugiego podatku
+LocalTax1IsNotUsed=Nie należy używać drugiego podatku
+LocalTax1IsUsedDesc=Użyj drugi typ podatków (innych niż VAT)
+LocalTax1IsNotUsedDesc=Nie należy używać innego rodzaju podatków (innych niż VAT)
+LocalTax1Management=Drugi rodzaj podatku
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsUsed=Use third tax
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
+LocalTax2IsUsed=Użyj trzeci podatku
+LocalTax2IsNotUsed=Nie używać trzeci podatku
+LocalTax2IsUsedDesc=Użyj trzeci rodzaj podatku (poza VAT)
+LocalTax2IsNotUsedDesc=Nie należy używać innego rodzaju podatków (innych niż VAT)
+LocalTax2Management=Trzeci rodzaj podatku
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES= RE Management
@@ -844,13 +853,13 @@ LocalTax2IsUsedDescES= RE stawki domyślnie podczas tworzenia perspektyw, faktur
 LocalTax2IsNotUsedDescES= Domyślnie proponowana jest 0 IRPF. Koniec panowania.
 LocalTax2IsUsedExampleES= W Hiszpanii, freelancerów i przedstawicieli wolnych zawodów, którzy świadczą usługi i przedsiębiorstwa, którzy wybrali system podatkowy modułów.
 LocalTax2IsNotUsedExampleES= W Hiszpanii nie są one przedmiotem Bussines modułów systemu podatkowego.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
-CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
-CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
+CalcLocaltax=Raporty
+CalcLocaltax1ES=Sprzedaż - Zakupy
+CalcLocaltax1Desc=Lokalne raporty Podatki są obliczane z różnicy między sprzedażą localtaxes i localtaxes zakupów
+CalcLocaltax2ES=Zakupy
+CalcLocaltax2Desc=Lokalne raporty Podatki są łącznie localtaxes zakupów
+CalcLocaltax3ES=Obroty
+CalcLocaltax3Desc=Lokalne raporty Podatki są za łączną sprzedaży localtaxes
 LabelUsedByDefault=Wytwórnia używany domyślnie, jeśli nie można znaleźć tłumaczenie dla kodu
 LabelOnDocuments=Etykieta na dokumenty
 NbOfDays=Nb dni
@@ -875,7 +884,7 @@ PhpConf=Conf.
 PhpWebLink=Web-Php link
 Pear=Pear
 PearPackages=Pear Packages
-Browser=Browser
+Browser=Przeglądarka
 Server=Serwer
 Database=Baza
 DatabaseServer=Database host
@@ -902,7 +911,7 @@ MenuCompanySetup=Firma / Fundacja
 MenuNewUser=Nowy użytkownik
 MenuTopManager=Górne menu menedżera
 MenuLeftManager=Lewe menu menedżera
-MenuManager=Menu manager
+MenuManager=Menedżer menu
 MenuSmartphoneManager=Smartphone menedżer menu
 DefaultMenuTopManager=Górne menu menedżera
 DefaultMenuLeftManager=Lewe menu menedżera
@@ -918,7 +927,7 @@ PermanentLeftSearchForm=Stałe formularz wyszukiwania na lewym menu
 DefaultLanguage=Domyślny język do użytku (kod języka)
 EnableMultilangInterface=Włącz wielojęzyczny interfejs
 EnableShowLogo=logo Pokaż na menu po lewej stronie
-EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
+EnableHtml5=Włącz HTML5 (Developement - Dostępna tylko na Eldy szablonu)
 SystemSuccessfulyUpdated=System został zaktualizowany
 CompanyInfo=Firma / fundacja informacji
 CompanyIds=Firma / fundament tożsamości
@@ -962,15 +971,15 @@ SetupDescription5=Inne pozycje menu Zarządzaj opcjonalne parametry.
 EventsSetup=Konfiguracja dzienników zdarzeń
 LogEvents=Audyt bezpieczeństwa imprez
 Audit=Audyt
-InfoDolibarr=Infos Dolibarr
-InfoBrowser=Infos Browser
-InfoOS=Infos OS
-InfoWebServer=Infos web server
-InfoDatabase=Infos database
-InfoPHP=Infos PHP
-InfoPerf=Infos performances
-BrowserName=Browser name
-BrowserOS=Browser OS
+InfoDolibarr=Informacje Dolibarr
+InfoBrowser=Informacje o przeglądarce
+InfoOS=Informacje OS
+InfoWebServer=Informacje serwer WWW
+InfoDatabase=Informacje o bazie
+InfoPHP=Informacje o PHP
+InfoPerf=Informacje o występy
+BrowserName=Nazwa przeglądarki
+BrowserOS=Przeglądarka OS
 ListEvents=Audyt wydarzenia
 ListOfSecurityEvents=Lista Dolibarr bezpieczeństwa imprez
 SecurityEventsPurged=Zdarzenia zabezpieczeń oczyszczone
@@ -991,7 +1000,7 @@ TriggerDisabledAsModuleDisabled=Wyzwalacze w tym pliku są wyłączone jako m
 TriggerAlwaysActive=Wyzwalacze w tym pliku są zawsze aktywne, niezależnie są aktywowane Dolibarr modułów.
 TriggerActiveAsModuleActive=Wyzwalacze w tym pliku są aktywne jako modułu %s jest aktywny.
 GeneratedPasswordDesc=Określ tutaj reguły, które chcesz użyć do wygenerowania nowego hasła, jeśli zapyta się automatycznie wygenerowane hasło
-DictionaryDesc=Define here all reference datas. You can complete predefined value with yours.
+DictionaryDesc=Określ tutaj wszystkie dane teleadresowe referencyjnych. Możesz wypełnić predefiniowaną wartość z Ciebie.
 ConstDesc=Ta strona pozwala edytować wszystkie inne parametry nie są dostępne w poprzedniej strony. Są one zastrzeżone dla zaawansowanych parametrów deweloperzy lub troubleshouting.
 OnceSetupFinishedCreateUsers=Ostrzeżenie, jesteś Dolibarr administratora użytkownika. Administrator użytkowników wykorzystywane są do konfiguracji Dolibarr. Dla Zazwyczaj korzystanie z Dolibarr, zaleca się używać nieujemnych administratora użytkownika tworzone Użytkownicy i grupy menu.
 MiscellaneousDesc=Określ tutaj wszystkie inne parametry związane z bezpieczeństwem.
@@ -1013,11 +1022,11 @@ BackupDesc2=* Zapisz zawartość dokumentów katalog ( %s), który zawier
 BackupDesc3=* Zapisz zawartość bazy danych z zrzutu. do tego, możesz użyć następujących asystenta.
 BackupDescX=Zarchiwizowane katalogu należy przechowywać w bezpiecznym miejscu.
 BackupDescY=Wygenerowany plik zrzutu powinny być przechowywane w bezpiecznym miejscu.
-BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
+BackupPHPWarning=Kopia zapasowa nie może być gwarantowana przy użyciu tej metody. Wolę poprzedni
 RestoreDesc=Aby przywrócić Dolibarr zapasowej, należy:
 RestoreDesc2=* Przywracanie pliku archiwum (np. zip) katalog dokumentów, aby wyodrębnić drzewa plików w katalogu dokumentów na nowe Dolibarr instalacji lub na tym dokumenty directoy ( %s).
 RestoreDesc3=* Przywracanie danych z kopii zapasowej pliku zrzutu, do bazy danych do nowego Dolibarr instalacji lub do bazy danych tej instalacji. Ostrzeżenie, po przywróceniu jest gotowy, należy użyć loginu i hasła, które istniały, gdy kopia zapasowa została dokonana, aby połączyć się ponownie. Aby przywrócić kopię zapasową bazy danych do tej instalacji, można się do tego asystenta.
-RestoreMySQL=MySQL import
+RestoreMySQL=Import MySQL
 ForcedToByAModule= Ta zasada jest zmuszona do %s przez aktywowany modułu
 PreviousDumpFiles=Dump bazy danych dostępne pliki kopii zapasowej
 WeekStartOnDay=Pierwszy dzień tygodnia
@@ -1027,9 +1036,9 @@ YourPHPDoesNotHaveSSLSupport=funkcji SSL nie są dostępne w PHP
 DownloadMoreSkins=Więcej skórek do pobrania
 SimpleNumRefModelDesc=Zwraca numer z formatu %syymm nnnn, gdzie yy to rok, MM miesiąc i nnnn jest ciągiem bez otworu, bez resetowania
 ShowProfIdInAddress=Pokaż zawodami identyfikator z adresów na dokumentach
-ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
+ShowVATIntaInAddress=Ukryj VAT Intra num z adresów na dokumenty
 TranslationUncomplete=Częściowe tłumaczenie
-SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to http://transifex.com/projects/p/dolibarr/.
+SomeTranslationAreUncomplete=Niektóre języki mogą być częściowo tłumaczona lub maja zawiera błędy. Jeśli wykrycie niektórych, można naprawić pliki językowe z zarejestrowaniem się http://transifex.com/projects/p/dolibarr/ .
 MenuUseLayout=Dodać pionowe menu hidable (javascript opcja nie może być wyłączone)
 MAIN_DISABLE_METEO=Wyłącz widok pictogramów meteo
 TestLoginToAPI=Przetestuj się zalogować do interfejsu API
@@ -1042,51 +1051,51 @@ MAIN_PROXY_USER=Zaloguj się, aby korzystać z serwera proxy
 MAIN_PROXY_PASS=Hasło do korzystania z serwera proxy
 DefineHereComplementaryAttributes=Określ tutaj wszystkie ATUTY, nie są już dostępne domyślnie i że chcesz być obsługiwane przez %s.
 ExtraFields=Uzupełniające atrybuty
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerOrders=Complementary attributes (orders)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyCharsAndNoSpace=only alphanumericals characters without space
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+ExtraFieldsLines=Atrybuty uzupełniające (linie)
+ExtraFieldsSupplierOrdersLines=(Linie uzupełniające atrybuty order)
+ExtraFieldsSupplierInvoicesLines=Atrybuty uzupełniające (linie na fakturze)
+ExtraFieldsThirdParties=Atrybuty uzupełniające (thirdparty)
+ExtraFieldsContacts=Atrybuty uzupełniające (kontakt / adres)
+ExtraFieldsMember=Atrybuty uzupełniające (członek)
+ExtraFieldsMemberType=Atrybuty uzupełniające (typ członkiem)
+ExtraFieldsCustomerOrders=Zamówienia uzupełniające (atrybuty)
+ExtraFieldsCustomerInvoices=Atrybuty uzupełniające (faktury)
+ExtraFieldsSupplierOrders=Zamówienia uzupełniające (atrybuty)
+ExtraFieldsSupplierInvoices=Atrybuty uzupełniające (faktury)
+ExtraFieldsProject=Atrybuty uzupełniające (projektów)
+ExtraFieldsProjectTask=Atrybuty uzupełniające (zadania)
+ExtraFieldHasWrongValue=Atrybut% s ma nieprawidłową wartość.
+AlphaNumOnlyCharsAndNoSpace=tylko alphanumericals znaków bez spacji
+AlphaNumOnlyLowerCharsAndNoSpace=tylko alphanumericals i małe litery bez przestrzeni
 SendingMailSetup=Ustawienie sendings emailem
 SendmailOptionNotComplete=Uwaga, w niektórych systemach Linux, aby wysłać e-mail z poczty elektronicznej, konfiguracja wykonanie sendmail musi conatins opcja-ba (mail.force_extra_parameters parametr w pliku php.ini). Jeśli nigdy niektórzy odbiorcy otrzymywać e-maile, spróbuj edytować ten parametr PHP z mail.force_extra_parameters =-ba).
 PathToDocuments=Ścieżka do dokumentów
 PathDirectory=Katalog
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=Choice of language visible on screen can be modified:
    * Globally from menu Home - Setup - Display
    * For user only from tab User display of user card (click on login on top of screen).
-TotalNumberOfActivatedModules=Total number of activated feature modules: %s
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
-YouUseBestDriver=You use driver %s that is best driver available currently.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
-NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
-SearchOptim=Search optimization
-YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
-BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-FieldEdition=Edition of field %s
-FixTZ=TimeZone fix
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+SendmailOptionMayHurtBuggedMTA=Funkcja wysłać maile za pomocą metody "PHP poczty bezpośredniej" wygeneruje wiadomości, że może nie być prawidłowo przeanalizowany przez niektórych otrzymujących serwerów pocztowych. Powoduje to, że niektóre maile nie mogą być odczytywane przez ludzi obsługiwanych przez te platformy podsłuchu. To przypadku niektórych dostawców internetowych (Ex: Pomarańczowy we Francji). To nie jest problem w Dolibarr, ani w PHP, ale na otrzymywanie serwera poczty. Możesz jednak dodać opcję MAIN_FIX_FOR_BUGGED_MTA do 1 w konfiguracji - inne zmodyfikować Dolibarr, aby tego uniknąć. Jednakże, mogą wystąpić problemy z innymi serwerami, które przestrzegają ściśle standardu SMTP. Inne rozwiązanie (zalecane) jest użycie metody "gniazdo SMTP biblioteki", który nie ma wad.
+TranslationSetup=Konfiguracja de la traduction
+TranslationDesc=Wybór języka widoczne na ekranie mogą być modyfikowane: 
     * Globalnie z menu Start - Ustawienia - Wyświetlacz 
     * Dla użytkowników tylko z wyświetlaczem karta użytkownika karty użytkownika (kliknij zaloguj się na górze ekranu).
+TotalNumberOfActivatedModules=Łączna liczba aktywowanych modułów funkcji:% s
+YouMustEnableOneModule=Musisz przynajmniej umożliwić 1 moduł
+ClassNotFoundIntoPathWarning=Klasa% s nie znaleziono na drodze PHP
+YesInSummer=Tak w lecie
+OnlyFollowingModulesAreOpenedToExternalUsers=Uwaga, tylko następujące moduły są otwarte dla użytkowników zewnętrznych (co mają pozwolenie takich użytkowników):
+SuhosinSessionEncrypt=Przechowywania sesji szyfrowane Suhosin
+ConditionIsCurrently=Stan jest obecnie% s
+YouUseBestDriver=Za pomocą sterownika% s, który jest najlepszym kierowcą dostępne obecnie.
+YouDoNotUseBestDriver=Używać dysku% s% s, ale kierowca jest zalecane.
+NbOfProductIsLowerThanNoPb=Masz tylko% s produktów / usług do bazy danych. W ten sposób nie wymaga żadnej szczególnej optymalizacji.
+SearchOptim=Pozycjonowanie
+YouHaveXProductUseSearchOptim=Masz% s produktu w bazie danych. Należy dodać stałą PRODUCT_DONOTSEARCH_ANYWHERE do 1 w Home-Setup-Inne, można ograniczyć wyszukiwanie do początku ciągów składających możliwe dla bazy danych do wykorzystania indeksu i powinieneś otrzymać natychmiastową odpowiedź.
+BrowserIsOK=Używasz przeglądarki internetowej% s. Ta przeglądarka jest ok dla bezpieczeństwa i wydajności.
+BrowserIsKO=Używasz przeglądarki internetowej% s. Ta przeglądarka jest znany zły wybór dla bezpieczeństwa, wydajności i niezawodności. Mamy polecam do korzystania z przeglądarki Firefox, Chrome, Opera lub Safari.
+XDebugInstalled=XDebug jest załadowany.
+XCacheInstalled=XCache jest załadowany.
+AddRefInList=Wyświetlacz klienta / ref dostawcą na liście (wybierz listy lub combobox) i większość z hiperłącza. Osób trzecich pojawia się nazwa "CC12345 - SC45678 - duży coorp firmy", zamiast "The big coorp firmy".
+FieldEdition=Edycja pola% s
+FixTZ=Strefa czasowa fix
+FillThisOnlyIfRequired=Przykład: +2 (wypełnić tylko w przypadku strefy czasowej w stosunku problemy są doświadczeni)
+GetBarCode=Pobierz kod kreskowy
+EmptyNumRefModelDesc=Kod jest bezpłatne. Kod ten może być zmieniane w dowolnym momencie.
 ##### Module password generation
 PasswordGenerationStandard=Wróć hasło generowane zgodnie z wewnętrznym Dolibarr algorytmu: 8 znaków zawierających cyfry i znaki udostępniony w małe.
 PasswordGenerationNone=Nie zgłosił żadnych wygenerowane hasło. Hasło należy wpisać ręcznie.
@@ -1107,15 +1116,15 @@ ModuleCompanyCodeAquarium=Zwrócić rachunkowych kod zbudowany przez %s, a nast
 ModuleCompanyCodePanicum=Wróć pusty rachunkowych kodu.
 ModuleCompanyCodeDigitaria=Księgowość kod zależy od trzeciej kodu. Kod składa się z charakterem "C" na pierwszej pozycji, po którym następuje pierwsze 5 znaków w kodzie strony trzeciej.
 UseNotifications=Użyj powiadomień
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Szablony dokumentów
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=Generowanie dokumentów z szablonów (.odt OpenDocuments lub ods pliki dla OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Znak wodny w sprawie projektu dokumentu
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+JSOnPaimentBill=Aktywuj funkcję automatyczne wypełnianie linii płatności w formie płatności
 CompanyIdProfChecker=Profesjonalny Identyfikator unikalny
 MustBeUnique=Musi być wyjątkowa?
-MustBeMandatory=Mandatory to create third parties ?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
+MustBeMandatory=Obowiązkowe do tworzenia stron trzecich?
+MustBeInvoiceMandatory=Obowiązkowe do sprawdzania poprawności faktur?
 Miscellaneous=Różne
 ##### Webcal setup #####
 WebCalSetup=Webcalendar link konfiguracji
@@ -1129,7 +1138,7 @@ WebCalServer=Serwerze bazy danych kalendarza
 WebCalDatabaseName=Nazwa bazy danych
 WebCalUser=Użytkownicy mają dostęp do bazy danych
 WebCalSetupSaved=Webcalendar konfiguracji zapisany pomyślnie.
-WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
+WebCalTestOk=Połączenie do serwera '% s' w bazie danych '% s' z użytkownika '% s' sukces.
 WebCalTestKo1=Połączenie do serwera ' %s' sukces, ale baza danych' %s' nie mógł zostać osiągnięty.
 WebCalTestKo2=Połączenie do serwera ' %s' z użytkownika' %s' nie powiodło się.
 WebCalErrorConnectOkButWrongDatabase=Połączenie udało, ale baza danych nie patrzy się Webcalendar danych.
@@ -1157,7 +1166,7 @@ EnableEditDeleteValidInvoice=Włącz możliwość edytować / usuwać ważnej fa
 SuggestPaymentByRIBOnAccount=Zaproponuj płatność wycofać z
 SuggestPaymentByChequeToAddress=Zaproponuj płatności czekiem do
 FreeLegalTextOnInvoices=Wolny tekst na fakturach
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+WatermarkOnDraftInvoices=Znak wodny na projekt faktury (brak jeśli pusty)
 ##### Proposals #####
 PropalSetup=Commercial propozycje konfiguracji modułu
 CreateForm=Tworzenie formularzy
@@ -1170,25 +1179,25 @@ AddShippingDateAbility=Dodaj datę wysyłki zdolność
 AddDeliveryAddressAbility=Dodaj datę dostawy zdolność
 UseOptionLineIfNoQuantity=Linia produktów / usług z zerową ilość jest traktowana jako opcja
 FreeLegalTextOnProposal=Darmowy tekstu propozycji
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+WatermarkOnDraftProposal=Znak wodny projektów wniosków komercyjnych (brak jeśli pusty)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Zapytaj o rachunku bankowego przeznaczenia propozycji
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+AskPriceSupplierSetup=Cena żąda konfiguracji modułu dostawcy
+AskPriceSupplierNumberingModules=Wnioski Cena dostawcy numeracji modeli
+AskPriceSupplierPDFModules=Cena żąda dostawców modele dokumenty
+FreeLegalTextOnAskPriceSupplier=Bezpłatne tekst na podania Ceny dostawców
+WatermarkOnDraftAskPriceSupplier=Znak wodny na projekt cenie żąda dostawców (brak jeśli pusty)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Zapytaj o rachunku bankowego przeznaczenia zamówienie cena
 ##### Orders #####
 OrdersSetup=Zamówienia zarządzania konfiguracją
 OrdersNumberingModules=Zamówienia numeracji modules
 OrdersModelModule=Zamów dokumenty modeli
-HideTreadedOrders=Hide the treated or cancelled orders in the list
+HideTreadedOrders=Ukryj leczonych lub anulowane zlecenia z listy
 ValidOrderAfterPropalClosed=Aby zatwierdzić wniosek, aby po bliższa, umożliwia nie krok po tymczasowym porządku
 FreeLegalTextOnOrders=Wolny tekst na zamówienie
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+WatermarkOnDraftOrders=Znak wodny w sprawie projektów zamówień (brak jeśli pusty)
+ShippableOrderIconInList=Dodaj ikonę w liście zamówień, które wskazują, czy zamówienie jest shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Zapytaj o rachunku bankowego przeznaczenia porządku
 ##### Clicktodial #####
 ClickToDialSetup=Kliknij, aby Dial konfiguracji modułu
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url, vous pouvez utiliser les balises
    __PHONETO__ qui sera remplacé par le téléphone de l'appelé
    __PHONEFROM__ qui sera remplacé par le téléphone de l'appelant (le votre)
    __LOGIN__ qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)
    __PASS__ qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -1199,13 +1208,13 @@ InterventionsSetup=Interwencje konfiguracji modułu
 FreeLegalTextOnInterventions=Darmowe tekst na dokumenty interwencji
 FicheinterNumberingModules=Interwencja numeracji modules
 TemplatePDFInterventions=Interwencja karty wzorów dokumentów
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+WatermarkOnDraftInterventionCards=Znak wodny na dokumentach kart interwencji (brak jeśli pusty)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Kontrakty / konfiguracji modułu Subskrybcje
 ContractsNumberingModules=Kontrakty numerowania modułów
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+TemplatePDFContracts=Kontrakty modele dokumenty
+FreeLegalTextOnContracts=Wolny tekst na kontraktach
+WatermarkOnDraftContractCards=Znak wodny w sprawie projektów umów (brak jeśli pusty)
 ##### Members #####
 MembersSetup=Członkowie konfiguracji modułu
 MemberMainOptions=Główne opcje
@@ -1274,15 +1283,15 @@ LDAPTestSynchroContact=Test kontaktu synchronizacji
 LDAPTestSynchroUser=Test użytkownika synchronizacji
 LDAPTestSynchroGroup=Test grupy synchronizacji
 LDAPTestSynchroMember=Test członka synchronizacji
-LDAPTestSearch= Test a LDAP search
+LDAPTestSearch= Testowanie wyszukiwania LDAP
 LDAPSynchroOK=Synchronizacja udany test
 LDAPSynchroKO=Niepowodzenie testu synchronizacji
 LDAPSynchroKOMayBePermissions=Niepowodzenie testu synchronizacji. Upewnij się, że łączenie się z serwerem jest poprawnie skonfigurowany i pozwala LDAP udpates
 LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP podłączyć do serwera LDAP powiodło się (Server= %s, port= %s)
 LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP podłączyć do serwera LDAP nie powiodło się (Server= %s, port= %s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Połącz / Authentificate na serwerze LDAP sukces (Server =% s, port =% s, Admin =% s, hasło =% s)
 LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=Kontakt / Authentificate do serwera LDAP nie powiodło się (Server= %s, port= %s, %s= Administrator, Password= %s)
-LDAPUnbindSuccessfull=Disconnect successful
+LDAPUnbindSuccessfull=Odłącz sukces
 LDAPUnbindFailed=Odłącz nie
 LDAPConnectToDNSuccessfull=Połączenie au DN ( %s) Russie
 LDAPConnectToDNFailed=Połączenie au DN ( %s) choue
@@ -1338,8 +1347,8 @@ LDAPFieldSid=SID
 LDAPFieldSidExample=Przykład: objectSid
 LDAPFieldEndLastSubscription=Data zakończenia subskrypcji
 LDAPFieldTitle=Post / Funkcja
-LDAPFieldTitleExample=Example: title
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
+LDAPFieldTitleExample=Przykład: tytuł
+LDAPParametersAreStillHardCoded=Parametry LDAP nadal sztywno (w klasie kontaktowego)
 LDAPSetupNotComplete=LDAP konfiguracji nie są kompletne (przejdź na innych kartach)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nr hasło administratora lub przewidziane. LDAP dostęp będą anonimowe i w trybie tylko do odczytu.
 LDAPDescContact=Ta strona pozwala na zdefiniowanie atrybutów LDAP nazwę LDAP drzewa dla każdego danych na Dolibarr kontakty.
@@ -1348,24 +1357,24 @@ LDAPDescGroups=Ta strona pozwala na zdefiniowanie atrybutów LDAP nazwę LDAP dr
 LDAPDescMembers=Ta strona pozwala na zdefiniowanie atrybutów LDAP nazwę LDAP drzewa dla każdego danych na Dolibarr użytkowników modułu.
 LDAPDescValues=Przykład wartości są dla OpenLDAP ładowane z następujących schematów: core.schema, cosine.schema, inetorgperson.schema). Jeśli używasz thoose wartości i OpenLDAP, zmodyfikować plik konfiguracyjny LDAP slapd.conf do wszystkich thoose schemas załadowany.
 ForANonAnonymousAccess=Dla uwierzytelniane dostęp (do zapisu na przykład)
-PerfDolibarr=Performance setup/optimizing report
-YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
-NotInstalled=Not installed, so your server is not slow down by this.
-ApplicativeCache=Applicative cache
-MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
    More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
    Note that a lot of web hosting provider does not provide such cache server.
-MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
-MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
-CompressionOfResources=Compression of HTTP responses
-TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
+PerfDolibarr=Konfiguracja Wyniki / optymalizacja raport
+YouMayFindPerfAdviceHere=Znajdziesz na tej stronie kilka czeków lub porad związanych z realizacją.
+NotInstalled=Nie jest zainstalowany, więc serwer nie jest wolniejsze od tego.
+ApplicativeCache=Aplikacyjnych cache
+MemcachedNotAvailable=Nie znaleziono cache aplikacyjnych. Możesz zwiększyć wydajność poprzez zainstalowanie serwera cache i Memcached moduł w stanie korzystać z tego serwera cache. 
     Więcej informacji tutaj http://wiki.dolibarr.org/index.php/Module_MemCached_EN . 
     Należy pamiętać, że wiele hosting provider nie zapewnia takiego serwera cache.
+MemcachedModuleAvailableButNotSetup=Moduł memcached dla aplikacyjnej cache znaleźć, ale konfiguracja modułu nie jest kompletna.
+MemcachedAvailableAndSetup=Moduł memcached dedykowane obsłudze serwer memcached jest włączony.
+OPCodeCache=OPCODE cache
+NoOPCodeCacheFound=Nie znaleziono OpCode cache. Może użyć innego cache OPCODE niż XCache lub eAccelerator (dobry), może nie masz OPCODE cache (bardzo źle).
+HTTPCacheStaticResources=Cache HTTP do zasobów statycznych (css, img, JavaScript)
+FilesOfTypeCached=Pliki typu% s są buforowane przez serwer HTTP
+FilesOfTypeNotCached=Pliki typu% s nie są buforowane przez serwer HTTP
+FilesOfTypeCompressed=Pliki typu% s są skompresowane przez serwer HTTP
+FilesOfTypeNotCompressed=Pliki typu% s nie są kompresowane przez serwer HTTP
+CacheByServer=Cache przez serwer
+CacheByClient=Cache przez przeglądarkę
+CompressionOfResources=Kompresja odpowiedzi HTTP
+TestNotPossibleWithCurrentBrowsers=Taka automatyczna detekcja nie jest możliwe przy obecnych przeglądarek
 ##### Products #####
 ProductSetup=Produkty konfiguracji modułu
 ServiceSetup=Konfiguracja modułu Usługi
@@ -1375,13 +1384,13 @@ ConfirmDeleteProductLineAbility=Potwierdzenie usunięcia linii produkuje w forma
 ModifyProductDescAbility=Personalizacja opisy produkowanych w formach
 ViewProductDescInFormAbility=Wizualizacja opisy produktów w formach (inaczej jak popup tooltip)
 ViewProductDescInThirdpartyLanguageAbility=Wizualizacja produktów opisów w thirdparty języku
-UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
+UseSearchToSelectProductTooltip=Także jeśli masz dużą ilość produktu (> 100 000), można zwiększyć prędkość przez ustawienie stałej PRODUCT_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
+UseSearchToSelectProduct=Użyj wyszukiwarki aby wybrać produkt (zamiast listy rozwijanej).
 UseEcoTaxeAbility=Wsparcie Eko-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Domyślny kod kreskowy typu użyć do produktów
 SetDefaultBarcodeTypeThirdParties=Domyślny kod kreskowy typu do użytku dla osób trzecich
-ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
+ProductCodeChecker= Moduł do generowania kodu produktu i sprawdzeniu (produkt lub usługa)
+ProductOtherConf= Konfiguracja produktu / usługi
 ##### Syslog #####
 SyslogSetup=Syslog konfiguracji modułu
 SyslogOutput=Zaloguj wyjście
@@ -1392,7 +1401,7 @@ SyslogSimpleFile=Plik
 SyslogFilename=Nazwa pliku i ścieżka
 YouCanUseDOL_DATA_ROOT=Możesz użyć DOL_DATA_ROOT / dolibarr.log do pliku w Dolibarr "dokumenty" katalogu. Można ustawić inną ścieżkę do przechowywania tego pliku.
 ErrorUnknownSyslogConstant=Stała %s nie jest znany syslog stałej
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=System Windows obsługuje tylko LOG_USER
 ##### Donations #####
 DonationsSetup=Darowizna konfiguracji modułu
 DonationsReceiptModel=Szablon otrzymania wpłaty
@@ -1410,33 +1419,33 @@ BarcodeDescUPC=Kod kreskowy typu UPC
 BarcodeDescISBN=Kod kreskowy typu ISBN
 BarcodeDescC39=Kod kreskowy typu C39
 BarcodeDescC128=Kod kreskowy typu C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
    For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+GenbarcodeLocation=Bar generowanie kodu narzędzie wiersza polecenia (używany przez silnik wewnętrznego dla niektórych typów kodów kreskowych). Muszą być zgodne z "genbarcode". 
     Na przykład: / usr / local / bin / genbarcode
+BarcodeInternalEngine=Silnik wewnętrznego
+BarCodeNumberManager=Manager auto zdefiniować numery kodów kreskowych
 ##### Prelevements #####
 WithdrawalsSetup=Wycofanie konfiguracji modułu
 ##### ExternalRSS #####
 ExternalRSSSetup=Zewnętrzne RSS przywóz konfiguracji
 NewRSS=Nowy kanał RSS
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=Ciekawe RSS
 ##### Mailing #####
 MailingSetup=Moduł konfiguracji e-maila
 MailingEMailFrom=Nadawca wiadomości e-mail (Z) na e-maile wysyłane przez e-maila modułu
 MailingEMailError=Powrót e-mail (Errors-do) na e-maile z błędami
-MailingDelay=Seconds to wait after sending next message
+MailingDelay=Sekund po wysłaniu czekać następnej wiadomości
 ##### Notification #####
-NotificationSetup=EMail notification module setup
+NotificationSetup=Napisz e-mail konfiguracji modułu powiadomienia
 NotificationEMailFrom=Nadawca wiadomości e-mail (Z) na e-maile wysyłane do powiadomień
-ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
-FixedEmailTarget=Fixed email target
+ListOfAvailableNotifications=Lista wydarzeń można ustawić powiadomienia w odniesieniu do każdego thirdparty (przejdź do thirdparty karty, aby ustawić) lub ustawiając stały adres e-mail (Lista modułów zależy od aktywowanych)
+FixedEmailTarget=Naprawiono docelowy adres e-mail
 ##### Sendings #####
 SendingsSetup=Wysyłanie konfiguracji modułu
 SendingsReceiptModel=Wysyłanie otrzymania modelu
 SendingsNumberingModules=Sendings numerowania modułów
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Arkusze Wsparcie klienta na dostawy przesyłki
 NoNeedForDeliveryReceipts=W większości przypadków, sendings wpływy są wykorzystywane zarówno jako karty klienta dostaw (wykaz produktów wysłać) i arkusze, które są recevied i podpisana przez klienta. Więc produktu dostaw wpływów jest powielony funkcji i rzadko jest włączony.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Dowolny tekst sprawie przemieszczania
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkty dostaw otrzymania numeracji modułu
 DeliveryOrderModel=Produkty dostaw otrzymania modelu
@@ -1447,19 +1456,19 @@ AdvancedEditor=Zaawansowany edytor
 ActivateFCKeditor=Uaktywnij FCKeditor za:
 FCKeditorForCompany=WYSIWIG tworzenie / edycja spółek opis i notatki
 FCKeditorForProduct=WYSIWIG tworzenie / edycja produktów / usług "opis i notatki
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.
+FCKeditorForProductDetails=WYSIWIG tworzenie / edycja produktów szczegóły linii dla wszystkich podmiotów (wnioski, zamówienia, faktury, itp ...). Ostrzeżenie: Użycie tej opcji w tym przypadku nie jest zalecane, ponieważ może poważnie to spowodować problemy z znaków specjalnych i strona formatowania, gdy buduje PDF pliki.
 FCKeditorForMailing= WYSIWIG tworzenie / edycja wiadomości
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
+FCKeditorForUserSignature=WYSIWIG tworzenie / edycja podpisu użytkownika
+FCKeditorForMail=WYSIWIG tworzenie / edycja dla wszystkich wiadomości (z wyjątkiem Outils-> e-maila)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Połączenie udało, ale baza danych nie patrzy się osCommerce danych (klucz %s nie został znaleziony w tabeli %s).
 OSCommerceTestOk=Połączenie do serwera ' %s' w bazie danych " %s" z użytkownika' %s' powiodło się.
 OSCommerceTestKo1=Połączenie do serwera ' %s' sukces, ale baza danych' %s' nie mógł zostać osiągnięty.
 OSCommerceTestKo2=Połączenie do serwera ' %s' z użytkownika' %s' nie powiodło się.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
-IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
+StockSetup=Magazyn konfiguracji modułu
+UserWarehouse=Korzystanie użytkowników osobiste magazyny
+IfYouUsePointOfSaleCheckModule=W przypadku korzystania z modułu Point of Sale (POS dostarczonych przez moduł domyślnie lub innego modułu zewnętrznego), ta konfiguracja może być ignorowane przez swój punkt modułu sprzedaż. Większość punktem modułów sprzedaży są przeznaczone do tworzenia natychmiast fakturę i zmniejszyć czas, opcje są domyślnie co tutaj. Tak więc, jeśli chcesz, czy nie mieć spadek akcji podczas rejestracji sprzedać z twojego punktu sprzedaży, sprawdź również swój moduł POS skonfigurować.
 ##### Menu #####
 MenuDeleted=Menu skreślony
 TreeMenu=Drzewo menu
@@ -1494,11 +1503,11 @@ ConfirmDeleteLine=Czy na pewno chcesz usunąć ten wiersz?
 ##### Tax #####
 TaxSetup=Podatków, składek na ubezpieczenia społeczne i dywidendy konfiguracji modułu
 OptionVatMode=Opcja d'exigibilit de TVA
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Kasowej
+OptionVATDebitOption=Memoriału
 OptionVatDefaultDesc=VAT jest należny: 
     - W dniu dostawy / płatności za towary 
     - Na opłatę za usługi
 OptionVatDebitOptionDesc=VAT jest należny: 
     - W dniu dostawy / płatności za towary 
     - Na fakturze (obciążenie) na usługi
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
+SummaryOfVatExigibilityUsedByDefault=Czas VAT exigibility domyślnie wg wybranej opcji:
 OnDelivery=Na dostawy
 OnPayment=W sprawie wypłaty
 OnInvoice=Na fakturze
@@ -1509,30 +1518,30 @@ Sell=Sprzedać
 InvoiceDateUsed=Faktura używany termin
 YourCompanyDoesNotUseVAT=Twoja firma została określona, aby nie używać VAT (Start - Ustawienia - Firma / fundacji), więc nie ma VAT opcje konfiguracji.
 AccountancyCode=Kod Księgowość
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCodeSell=Rachunek sprzedaży. kod
+AccountancyCodeBuy=Kup konto. kod
 ##### Agenda #####
 AgendaSetup=Działania i porządku konfiguracji modułu
 PasswordTogetVCalExport=Klucz do wywozu zezwolić na link
 PastDelayVCalExport=Nie starsze niż eksport przypadku
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
-AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_USE_EVENT_TYPE=Typy użyć zdarzenia (udało się menu Setup -> słownik -> Rodzaj wydarzenia porządku obrad)
+AGENDA_DEFAULT_FILTER_TYPE=Ustaw automatycznie tego typu imprezy w filtrze wyszukiwania widzenia porządku obrad
+AGENDA_DEFAULT_FILTER_STATUS=Ustaw automatycznie tego stanu dla wydarzeń w filtrze wyszukiwania widzenia porządku obrad
+AGENDA_DEFAULT_VIEW=Która karta chcesz otworzyć domyślnie po wybraniu menu Agendę
 ##### ClickToDial #####
 ClickToDialDesc=Moduł ten pozwala dodać ikonę po numer telefonu Dolibarr kontakty. Kliknięcie na tę ikonę, będzie połączenie z serveur z danego adresu URL można zdefiniować poniżej. Może to być wykorzystane, aby połączyć się z Call Center z systemu Dolibarr, że mogą dzwonić na numer telefonu SIP system przykład.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Punktów sprzedaży
 CashDeskSetup=Kasa konfiguracji modułu
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Domyślnie ogólny osób trzecich do korzystania z Sells
 CashDeskBankAccountForSell=Środki pieniężne na rachunku do korzystania sprzedaje
 CashDeskBankAccountForCheque= Chcesz używać do otrzymywania płatności w formie czeku
 CashDeskBankAccountForCB= Chcesz używać do przyjmowania płatności gotówkowych za pomocą kart kredytowych
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
-CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
+CashDeskDoNotDecreaseStock=Wyłącz spadek akcji, gdy sprzedaż odbywa się z punktów sprzedaży (jeśli "nie", spadek zapasów odbywa się dla każdego sprzedają zrobić z POS, co jest rozwiązaniem określonym w module magazynie).
+CashDeskIdWareHouse=Życie i ograniczyć magazyn użyć do spadku magazynie
+StockDecreaseForPointOfSaleDisabled=Spadek Zdjęcie z punktach sprzedaży wyłączony
+StockDecreaseForPointOfSaleDisabledbyBatch=Spadek Zdjęcie w POS nie jest kompatybilny z zarządzania partiami
+CashDeskYouDidNotDisableStockDecease=Nie wyłączono spadek akcji podczas dokonywania sprzedaży od punktu sprzedaży. Więc jest wymagane magazynu.
 ##### Bookmark #####
 BookmarkSetup=Zakładka konfiguracji modułu
 BookmarkDesc=Moduł ten umożliwia zarządzanie zakładkami. Możesz także dodać skróty do jakichkolwiek Dolibarr strony lub stron internetowych externale po lewej stronie menu.
@@ -1556,10 +1565,11 @@ MultiCompanySetup=Firma Multi-Moduł konfiguracji
 SuppliersSetup=Dostawca konfiguracji modułu
 SuppliersCommandModel=Kompletny szablon zamówienia dostawcy (logo. ..)
 SuppliersInvoiceModel=Kompletny szablon faktury dostawcy (logo. ..)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+SuppliersInvoiceNumberingModel=Modele numeracji faktur dostawca
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind konfiguracji modułu
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Ścieżka dostępu do pliku zawierającego MaxMind ip do tłumaczenia kraju. 
     Przykłady: 
     /usr/local/share/GeoIP/GeoIP.dat 
     /usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=Pamiętać, że dane państwo ip do pliku musi być wewnątrz katalogu PHP może odczytać (sprawdzenie konfiguracji PHP open_basedir i uprawnienia systemu plików).
 YouCanDownloadFreeDatFileTo=Możesz pobrać darmową wersję demo kraju GeoIP plik Maxmind w %s.
 YouCanDownloadAdvancedDatFileTo=Możesz także pobrać bardziej kompletna wersja, z aktualizacjami, kraju GeoIP plik Maxmind w %s.
@@ -1568,36 +1578,41 @@ TestGeoIPResult=Test konwersji IP -> kraj
 ProjectsNumberingModules=Moduł projektów numeracji
 ProjectsSetup=Projekt instalacji modułu
 ProjectsModelModule=Wzór dokumentu projektu sprawozdania
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
+TasksNumberingModules=Zadania numeracji modułu
+TaskModelModule=Zadania raporty modelu dokumentu
 ##### ECM (GED) #####
-ECMSetup = GED Setup
-ECMAutoTree = Automatic tree folder and document
+ECMSetup = Konfiguracja GED
+ECMAutoTree = Automatyczne drzewa folderów i dokumentów
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-AlwaysEditable=Can always be edited
-MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+FiscalYears=Lat podatkowych
+FiscalYear=Rok podatkowy
+FiscalYearCard=Fiskalny rok karty
+NewFiscalYear=Nowy rok podatkowy
+EditFiscalYear=Edycja rok obrotowy
+OpenFiscalYear=Otwórz rok obrotowy
+CloseFiscalYear=Blisko rok obrotowy
+DeleteFiscalYear=Usuń rok obrotowy
+ConfirmDeleteFiscalYear=Czy na pewno usunąć ten rok podatkowy?
+Opened=Otwierany
+Closed=Zamknięte
+AlwaysEditable=Zawsze może być edytowany
+MAIN_APPLICATION_TITLE=Wymusza widoczną nazwę aplikacji (ostrzeżenie: ustawienie własnej nazwy tutaj może złamać Autouzupełnianie funkcji logowania przy użyciu DoliDroid aplikację mobilną)
+NbMajMin=Minimalna liczba wielkich liter
+NbNumMin=Minimalna liczba znaków numerycznych
+NbSpeMin=Minimalna liczba znaków specjalnych
+NbIteConsecutive=Maksymalna liczba powtarzając te same znaki
+NoAmbiCaracAutoGeneration=Nie należy używać znaków wieloznacznych ("1", "L", "ja", "|", "0", "O") dla automatycznego generowania
+SalariesSetup=Konfiguracja modułu wynagrodzenia
+SortOrder=Sortowanie po
 Format=Format
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+TypePaymentDesc=0: Rodzaj klienta płatności, 1: Dostawca typ płatności, 2: Zarówno klienci i dostawcy typ płatności
+IncludePath=Dołącz ścieżkę (zdefiniowane w zmiennej% s)
+ExpenseReportsSetup=Konfiguracja modułu kosztów raportów
+TemplatePDFExpenseReports=Szablony dokumentów w celu wygenerowania raportu wydatków dokument
+NoModueToManageStockDecrease=Nie Moduł stanie zarządzać automatyczny spadek akcji zostało aktywowane. Spadek Zdjęcie zostanie zrobione tylko na ręczne wprowadzanie.
+NoModueToManageStockIncrease=Nie Moduł stanie zarządzać automatyczny wzrost akcji zostało aktywowane. Wzrost Zdjęcie zostanie zrobione tylko na ręczne wprowadzanie.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index 58e41af52ac..a2bef22d4fb 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -6,11 +6,11 @@ Agenda=Agenda
 Agendas=Agendy
 Calendar=Kalendarz
 Calendars=Kalendarze
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
+LocalAgenda=Kalendarz Wewnętrzne
+ActionsOwnedBy=Wydarzenie własnością
 AffectedTo=Przypisany do
 DoneBy=Wykonane przez
-Event=Event
+Event=Wydarzenie
 Events=Zdarzenia
 EventsNb=Ilość zdarzeń
 MyEvents=Moje zdarzenia
@@ -23,20 +23,20 @@ MenuToDoActions=Wszystkie zdarzenia niekompletne
 MenuDoneActions=Wszystkie zdarzenia zakończone
 MenuToDoMyActions=Moje działania niekompletne
 MenuDoneMyActions=Moje zdarzenia zakończone
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Lista zdarzeń (wewnętrzny kalendarz)
 ActionsAskedBy=Akcje zostały zarejestrowane przez
 ActionsToDoBy=Zdarzenia przypisane do
 ActionsDoneBy=Zdarzenia wykonane przez
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
-ActionAssignedTo=Event assigned to
+ActionsForUser=Imprezy dla użytkowników
+ActionsForUsersGroup=Imprezy dla wszystkich użytkowników grupy
+ActionAssignedTo=Przypisany do zdarzenia
 AllMyActions= Wszystkie moje zdarzenia/zadania
 AllActions= Wszystkie zdarzenia/zadania
 ViewList=Widok listy
 ViewCal=Pokaż miesiąc
 ViewDay=Pokaż dzień
 ViewWeek=Pokaż tydzień
-ViewPerUser=Per user view
+ViewPerUser=Za widzenia użytkownika
 ViewWithPredefinedFilters= Widok ze zdefiniowanymi filtrami
 AutoActions= Automatyczne wypełnianie
 AgendaAutoActionDesc= Określ zdarzenia, dla których Dolibarr ma tworzyć automatycznie wpisy w agendzie. Jeżeli nie jest zaznaczone (domyślnie), w agendzie zostaną utworzone wpisy wyłącznie dla działań manualnych.
@@ -45,12 +45,15 @@ AgendaExtSitesDesc=Ta strona pozwala zdefiniować zewnętrzne źródła kalendar
 ActionsEvents=Zdarzenia, dla których Dolibarr stworzy automatycznie zadania w agendzie
 PropalValidatedInDolibarr=Zatwierdzenie oferty %s
 InvoiceValidatedInDolibarr=Zatwierdzenie faktury %s
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Faktura% s potwierdzone z POS
 InvoiceBackToDraftInDolibarr=Zmiana statusu faktura %s na draft
 InvoiceDeleteDolibarr=Usunięcie faktury %s
-OrderValidatedInDolibarr= Zatwierdzenie zamówienia %s
+OrderValidatedInDolibarr=Zatwierdzenie zamówienia %s
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Anulowanie zamówienia %s
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Akceptacja zamówienia %s
-OrderRefusedInDolibarr=Order %s refused
+OrderRefusedInDolibarr=Zamówienie% s odmówił
 OrderBackToDraftInDolibarr=Zmiana statusu zamówienia %s na draft
 OrderCanceledInDolibarr=Anulowanie zamówienia %s
 ProposalSentByEMail=Oferta %s wysłana e-mailem
@@ -58,9 +61,9 @@ OrderSentByEMail=Zamówienie %s Klienta wysłane e-mailem
 InvoiceSentByEMail=Faktura %s wysłana e-mailem
 SupplierOrderSentByEMail=Zamówienie %s wysłane do dostawcy e-mailem
 SupplierInvoiceSentByEMail=Faktura %s wysłana do dostawcy e-mailem
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
+ShippingSentByEMail=Przesyłka% s wysłane e-mailem
+ShippingValidated= Przesyłka% s potwierdzone
+InterventionSentByEMail=% Interwencja y wysyłane e-mailem
 NewCompanyToDolibarr= Stworzono kontrahenta
 DateActionPlannedStart= Planowana data rozpoczęcia
 DateActionPlannedEnd= Planowana data zakończenia
@@ -69,25 +72,27 @@ DateActionDoneEnd= Rzeczywista data zakończenia
 DateActionStart= Data rozpoczęcia
 DateActionEnd= Data zakończenia
 AgendaUrlOptions1=Możesz także dodać następujące parametry do filtr wyjściowy:
-AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s.
-AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s.
+AgendaUrlOptions2=logowanie =% s, aby ograniczyć wyjścia do działań stworzonych przez lub przypisanych do użytkownika% s.
+AgendaUrlOptions3=Logina =% s, aby ograniczyć wyjścia do działań będących własnością% użytkownika s.
 AgendaUrlOptions4=logint=%s, aby ograniczyć wyjścia do działań przypisanych do użytkownika %s.
-AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID.
+AgendaUrlOptionsProject=Projekt = PROJECT_ID ograniczyć wyjścia do działań związanych z projektem PROJECT_ID.
 AgendaShowBirthdayEvents=Pokaż urodziny kontaktów
 AgendaHideBirthdayEvents=Ukryj urodzin kontaktów
 Busy=Zajęty
 ExportDataset_event1=Lista zdarzeń w agendzie
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Domyślne dni roboczych wahać w tym tygodniu (przykład: 1-5, 1-6)
+DefaultWorkingHours=Domyślnie godziny pracy w dni (przykład: 9-18)
 # External Sites ical
 ExportCal=Eksport kalendarza
 ExtSites=Import zewnętrznych kalendarzy
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Pokaż kalendarze zewnętrznych (zdefiniowane w globalnej konfiguracji) do porządku obrad. Nie ma wpływu na kalendarze zewnętrzne zdefiniowane przez użytkowników.
 ExtSitesNbOfAgenda=Ilość kalendarzy
 AgendaExtNb=Kalendarz nb %s
 ExtSiteUrlAgenda=URL dostępu. Plik iCal
 ExtSiteNoLabel=Brak opisu
-WorkingTimeRange=Working time range
-WorkingDaysRange=Working days range
-AddEvent=Create event
-MyAvailability=My availability
+WorkingTimeRange=Zakres czasu pracy
+WorkingDaysRange=Dni robocze w zakresie
+AddEvent=Utwórz wydarzenie
+MyAvailability=Moja dostępność
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index bbb51193375..da57536fb74 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -8,7 +8,7 @@ FinancialAccount=Konto
 FinancialAccounts=Konta
 BankAccount=Konto bankowe
 BankAccounts=Konta bankowe
-ShowAccount=Show Account
+ShowAccount=Pokaż konto
 AccountRef=Rachunek finansowy ref
 AccountLabel=Etykieta rachunku finansowego
 CashAccount=Rachunek gotówkowy
@@ -20,8 +20,8 @@ SavingAccount=Rachunek oszczędnościowy
 SavingAccounts=Rachunki oszczędnościowe
 ErrorBankLabelAlreadyExists=Etykieta rachunku finansowego już istnieje
 BankBalance=Saldo
-BankBalanceBefore=Balance before
-BankBalanceAfter=Balance after
+BankBalanceBefore=Salda przed
+BankBalanceAfter=Bilans po
 BalanceMinimalAllowed=Minimalne dozwolone saldo
 BalanceMinimalDesired=Minimalne saldo pożądane
 InitialBankBalance=Saldo początkowe
@@ -29,15 +29,15 @@ EndBankBalance=Saldo końcowe
 CurrentBalance=Saldo bieżące
 FutureBalance=Przyszłość równowagi
 ShowAllTimeBalance=Pokaż saldo od początku
-AllTime=From start
+AllTime=Od początku
 Reconciliation=Pojednanie
 RIB=Numer konta bankowego
 IBAN=Numer IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=Ważny jest numer IBAN
+IbanNotValid=IBAN nie jest ważny
 BIC=Numer BIC / SWIFT
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=BIC / SWIFT Ważny
+SwiftNotValid=BIC / SWIFT nie jest ważny
 StandingOrders=Zlecenia stałe
 StandingOrder=Zlecenie stałe
 Withdrawals=Wypłaty
@@ -110,7 +110,7 @@ ConciliatedBy=Pojednaniem przez
 DateConciliating=Zjednać daty
 BankLineConciliated=Transakcja pojednaniem
 CustomerInvoicePayment=Klient płatności
-CustomerInvoicePaymentBack=Customer payment back
+CustomerInvoicePaymentBack=Płatności z powrotem klienta
 SupplierInvoicePayment=Dostawca płatności
 WithdrawalPayment=Wycofanie płatności
 SocialContributionPayment=Społeczny wkład płatności
@@ -138,28 +138,28 @@ CashBudget=Środki pieniężne budżetu
 PlannedTransactions=Planowane transakcje
 Graph=Grafika
 ExportDataset_banque_1=Bank transakcji i konta
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=Odcinek wpłaty
 TransactionOnTheOtherAccount=Transakcji na inne konta
 TransactionWithOtherAccount=Konto transferu
 PaymentNumberUpdateSucceeded=Płatność liczba zaktualizowany
 PaymentNumberUpdateFailed=Płatność liczba nie może być aktualizowane
 PaymentDateUpdateSucceeded=Płatność data aktualizacji pomyślnie
 PaymentDateUpdateFailed=Data płatności nie mogą być aktualizowane
-Transactions=Transactions
+Transactions=Transakcje
 BankTransactionLine=Bank transakcji
 AllAccounts=Wszystkie bank / Rachunki
 BackToAccount=Powrót do konta
 ShowAllAccounts=Pokaż wszystkich rachunków
 FutureTransaction=Transakcja w futur. Nie da się pogodzić.
 SelectChequeTransactionAndGenerate=Wybierz / filtr sprawdza, to do otrzymania depozytu wyboru i kliknij przycisk "Utwórz".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-BankDashboard=Bank accounts summary
-DefaultRIB=Default BAN
-AllRIB=All BAN
+InputReceiptNumber=Wybierz wyciągu bankowego związanego z postępowania pojednawczego. Użyj sortable wartość liczbową: RRRRMM lub RRRRMMDD
+EventualyAddCategory=Ostatecznie, określić kategorię, w której sklasyfikować rekordy
+ToConciliate=Do pogodzenia?
+ThenCheckLinesAndConciliate=Następnie sprawdź linie obecne w wyciągu bankowym i kliknij
+BankDashboard=Rachunki bankowe podsumowanie
+DefaultRIB=Domyślnie BAN
+AllRIB=Wszystko BAN
 LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+NoBANRecord=Nie rekord BAN
+DeleteARib=Usuń rekord BAN
+ConfirmDeleteRib=Czy na pewno chcesz usunąć ten rekord BAN?
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 0d11b2c8bf0..4072ad3de2f 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -9,8 +9,8 @@ BillsCustomersUnpaidForCompany=Należne wpłaty klientów faktur dla %s
 BillsSuppliersUnpaid=Należne wpłaty dostawców faktur
 BillsSuppliersUnpaidForCompany=Nieodpłatnej dostawcy faktury za %s
 BillsLate=Opóźnienia w płatnościach
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatistics=Klienci faktury statystyki
+BillsStatisticsSuppliers=Dostawcy faktury statystyki
 DisabledBecauseNotErasable=Wyłączone, ponieważ nie mogą być skasowane
 InvoiceStandard=Standard faktury
 InvoiceStandardAsk=Standard faktury
@@ -23,13 +23,13 @@ InvoiceProFormaAsk=Proforma faktury
 InvoiceProFormaDesc=Proforma fakturze jest obraz prawdziwy faktury, ale nie ma wartości księgowych.
 InvoiceReplacement=Zastąpienie faktury
 InvoiceReplacementAsk=Zastąpienie faktury do faktury
-InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

    Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=Zastąpienie faktury służy do anulowania i całkowicie zastąpić faktury bez zapłaty już otrzymane. 

     Uwaga: Tylko faktury bez zapłaty na jej temat można zastąpić. Jeżeli faktura wymiany nie jest jeszcze zamknięta, zostanie ona automatycznie zamknięta dla "porzucone".
 InvoiceAvoir=Nota kredytowa
 InvoiceAvoirAsk=Kredyt notatkę do skorygowania faktury
 InvoiceAvoirDesc=Kredyt notatka jest negatywny faktury wykorzystane do rozwiązania, że na fakturze jest kwota, która różni się od kwoty faktycznie wypłacana (ponieważ klient wypłacana przez pomyłkę zbyt dużo, albo nie będzie wypłacana w całości, ponieważ wrócił niektórych produktów na przykład). 

     Uwaga: oryginał faktury musi być już zamknięta ( "wypłata" lub "częściowo wypłacana") w celu umożliwienia stworzenia kredytowej notatkę na jej temat.
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirWithLines=Tworzenie kredytowa Uwaga liniami z faktury pochodzenia
+invoiceAvoirWithPaymentRestAmount=Tworzenie kredytowa z nieopłacone Uwaga faktury pochodzenia
+invoiceAvoirLineWithPaymentRestAmount=Nota kredytowa na kwotę pozostałą nieodpłatną
 ReplaceInvoice=Wymień faktury %s
 ReplacementInvoice=Zastąpienie faktury
 ReplacedByInvoice=Otrzymuje fakturę %s
@@ -58,7 +58,7 @@ Payment=Płatność
 PaymentBack=Płatność powrót
 Payments=Płatności
 PaymentsBack=Płatności powrót
-PaidBack=Paid back
+PaidBack=Spłacona
 DatePayment=Data płatności
 DeletePayment=Usuń płatności
 ConfirmDeletePayment=Czy na pewno chcesz usunąć tę płatność?
@@ -66,29 +66,30 @@ ConfirmConvertToReduc=Czy chcesz przekonwertować tego kredytu notatkę do absol
 SupplierPayments=Dostawcy płatności
 ReceivedPayments=Odebrane płatności
 ReceivedCustomersPayments=Zaliczki otrzymane od klientów
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Płatności zapłaci dostawcom
 ReceivedCustomersPaymentsToValid=Odebrane płatności klientów, aby potwierdzić
 PaymentsReportsForYear=Płatności raportów dla %s
 PaymentsReports=Płatności raportów
 PaymentsAlreadyDone=Płatności już
-PaymentsBackAlreadyDone=Payments back already done
+PaymentsBackAlreadyDone=Płatności powrotem już zrobione
 PaymentRule=Zasady płatności
 PaymentMode=Typ płatności
-PaymentConditions=Termin płatności
-PaymentConditionsShort=Termin płatności
+PaymentTerm=Termin płatności
+PaymentConditions=Warunki płatności
+PaymentConditionsShort=Warunki płatności
 PaymentAmount=Kwota płatności
-ValidatePayment=Validate payment
+ValidatePayment=Weryfikacja płatności
 PaymentHigherThanReminderToPay=Płatności wyższe niż upomnienie do zapłaty
 HelpPaymentHigherThanReminderToPay=Uwaga, płatność kwoty jednego lub więcej rachunków jest wyższa niż reszta zapłacić. 
     Edycja wpisu, inaczej potwierdzić i myśleć o tworzeniu kredytowej uwagę nadwyżki otrzymanych dla każdego nadpłaty faktur.
-HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. 
     Edit your entry, otherwise confirm.
+HelpPaymentHigherThanReminderToPaySupplier=Uwagi, kwotę płatności z jednego lub większej liczby rachunków jest większa niż reszta zapłacić. 
     Edytuj swoje wejście, w przeciwnym razie potwierdzić.
 ClassifyPaid=Klasyfikacja "wypłata"
 ClassifyPaidPartially=Klasyfikacja "paid częściowo"
 ClassifyCanceled=Klasyfikacji "Abandoned"
 ClassifyClosed=Klasyfikacja "zamkniętych"
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Sklasyfikować "Unbilled"
 CreateBill=Utwórz fakturę
-AddBill=Create invoice or credit note
-AddToDraftInvoices=Add to draft invoice
+AddBill=Tworzenie faktury lub kredytową wiadomości
+AddToDraftInvoices=Dodaj do sporządzenia faktury
 DeleteBill=Usuń faktury
 SearchACustomerInvoice=Szukaj klienta faktury
 SearchASupplierInvoice=Szukaj dostawcy fakturę
@@ -99,7 +100,7 @@ DoPaymentBack=Czy płatności powrót
 ConvertToReduc=Konwersja w przyszłości rabatu
 EnterPaymentReceivedFromCustomer=Wprowadź płatności otrzymanych od klienta
 EnterPaymentDueToCustomer=Dokonaj płatności do klienta
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DisabledBecauseRemainderToPayIsZero=Wyłączona, ponieważ nieopłacone jest zero
 Amount=Ilość
 PriceBase=Cena podstawy
 BillStatus=Faktura statusu
@@ -154,9 +155,9 @@ ConfirmCancelBill=Czy na pewno chcesz anulować fakturę %s?
 ConfirmCancelBillQuestion=Dlaczego chcesz zaklasyfikować tę fakturę "opuszczonych"?
 ConfirmClassifyPaidPartially=Czy na pewno chcesz zmienić fakturę %s do statusu wypłatę?
 ConfirmClassifyPaidPartiallyQuestion=Niniejsza faktura nie została całkowicie wypłacana. Jakie są powody, aby zamknąć tę fakturę?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Nieopłacone (% s% s) jest zniżka przyznane, ponieważ płatność została dokonana przed terminem. I uregulowania podatku VAT z faktury korygującej.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Nieopłacone (% s% s) jest zniżka przyznane, ponieważ płatność została dokonana przed terminem. Akceptuję stracić VAT od tej zniżki.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Nieopłacone (% s% s) jest zniżka przyznane, ponieważ płatność została dokonana przed terminem. Odzyskać VAT od tej zniżki bez noty kredytowej.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Bad klienta
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produkty częściowo zwrócone
 ConfirmClassifyPaidPartiallyReasonOther=Kwota porzucił dla innej przyczyny
@@ -169,7 +170,7 @@ ConfirmClassifyPaidPartiallyReasonOtherDesc=Użyj tego wyboru, jeśli wszystkie
 ConfirmClassifyAbandonReasonOther=Inny
 ConfirmClassifyAbandonReasonOtherDesc=Wybór ten będzie używany we wszystkich innych przypadkach. Na przykład dlatego, że jest plan, aby utworzyć zastępująca faktury.
 ConfirmCustomerPayment=Czy to potwierdzić paiement wejściowych dla %s %s?
-ConfirmSupplierPayment=Do you confirm this payment input for %s %s ?
+ConfirmSupplierPayment=Czy możesz potwierdzić tej płatności wejście dla% s% s?
 ConfirmValidatePayment=Êtes-vous sur de vouloir Valider ce paiment, aucune zmiany n'est możliwe une fois le paiement ważne?
 ValidateBill=Validate faktury
 UnvalidateBill=Unvalidate faktury
@@ -186,23 +187,23 @@ ShowInvoiceDeposit=Pokaż złożeniu faktury
 ShowPayment=Pokaż płatności
 File=Plik
 AlreadyPaid=Już paid
-AlreadyPaidBack=Already paid back
+AlreadyPaidBack=Już zwrócona
 AlreadyPaidNoCreditNotesNoDeposits=Już wypłacone (bez not kredytowych i depozytów)
 Abandoned=Porzucone
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
-Rest=Pending
+RemainderToPay=Nieopłacone
+RemainderToTake=Pozostała kwota do podjęcia
+RemainderToPayBack=Pozostała kwota do zwrotu
+Rest=W oczekiwaniu
 AmountExpected=Kwota twierdził
 ExcessReceived=Trop Peru
 EscompteOffered=Rabat oferowane (płatność przed kadencji)
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
+SendBillRef=Złożenie faktury% s
+SendReminderBillRef=Złożenie faktury% s (przypomnienie)
 StandingOrders=Zlecenia stałe
 StandingOrder=Zlecenie stałe
 NoDraftBills=Projekt nr faktury
 NoOtherDraftBills=Żaden inny projekt faktur
-NoDraftInvoices=No draft invoices
+NoDraftInvoices=Brak projektów faktury
 RefBill=Faktura ref
 ToBill=Do rachunku
 RemainderToBill=Pozostająca do rachunku
@@ -217,18 +218,18 @@ NoInvoice=Nr faktury
 ClassifyBill=Klasyfikacja faktury
 SupplierBillsToPay=Dostawcy faktur do zapłaty
 CustomerBillsUnpaid=Należne wpłaty klientów faktury
-DispenseMontantLettres=The written invoices through mecanographic procedures are dispensed by the order in letters
+DispenseMontantLettres=Pisemne faktur drogą procedur mecanographic są dozowane przez porządek w listach
 NonPercuRecuperable=Niepodlegające zwrotowi
 SetConditions=Ustaw warunki płatności
 SetMode=Ustaw tryb płatności
 Billed=Billed
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RepeatableInvoice=Szablon faktury
+RepeatableInvoices=Szablon faktury
+Repeatable=Szablon
+Repeatables=Szablony
+ChangeIntoRepeatableInvoice=Konwersja do szablonu faktury
+CreateRepeatableInvoice=Tworzenie szablonu faktury
+CreateFromRepeatableInvoice=Utwórz z szablonu faktury
 CustomersInvoicesAndInvoiceLines=Klienta faktury i faktury linii
 CustomersInvoicesAndPayments=Klient faktur i płatności
 ExportDataset_invoice_1=Klient faktury i faktury listę "linii
@@ -242,12 +243,12 @@ Discount=Rabat
 Discounts=Zniżki
 AddDiscount=Dodaj zniżki
 AddRelativeDiscount=Tworzenie względnej zniżki
-EditRelativeDiscount=Edit relative discount
+EditRelativeDiscount=Edycja względną zniżki
 AddGlobalDiscount=Dodaj zniżki
 EditGlobalDiscounts=Edytuj bezwzględne zniżki
 AddCreditNote=Tworzenie noty kredytowej
 ShowDiscount=Pokaż zniżki
-ShowReduc=Show the deduction
+ShowReduc=Pokaż odliczenia
 RelativeDiscount=Względna zniżki
 GlobalDiscount=Globalne zniżki
 CreditNote=Nota kredytowa
@@ -284,7 +285,7 @@ InvoiceNotChecked=Nie wybrano faktura
 CloneInvoice=Clone faktury
 ConfirmCloneInvoice=Czy na pewno chcesz klon tej faktury %s?
 DisabledBecauseReplacedInvoice=Działania wyłączone, ponieważ na fakturze została zastąpiona
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+DescTaxAndDividendsArea=Obszar ten stanowi podsumowanie wszystkich płatności dokonanych na specjalne wydatki. Tylko zapisy z płatności w czasie ustalonym roku zostały tu uwzględnione.
 NbOfPayments=Nb płatności
 SplitDiscount=Split zniżki w dwóch
 ConfirmSplitDiscount=Czy na pewno chcesz podzielić tym rabat w %s %s na 2 niższe zniżki?
@@ -293,8 +294,10 @@ TotalOfTwoDiscountMustEqualsOriginal=Suma dwóch nowych rabatu musi być równa
 ConfirmRemoveDiscount=Czy na pewno chcesz usunąć ten rabat?
 RelatedBill=Podobne faktury
 RelatedBills=Faktur związanych
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
+LatestRelatedBill=Ostatnie pokrewne faktury
+WarningBillExist=Ostrzeżenie, jeden lub więcej faktur istnieje
 
 # PaymentConditions
 PaymentConditionShortRECEP=Natychmiastowe
@@ -309,12 +312,12 @@ PaymentConditionShort60DENDMONTH=60 dni koniec miesiąca
 PaymentCondition60DENDMONTH=60 dni koniec miesiąca
 PaymentConditionShortPT_DELIVERY=Dostawa
 PaymentConditionPT_DELIVERY=Na dostawy
-PaymentConditionShortPT_ORDER=On order
-PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_ORDER=Na zamówienie
+PaymentConditionPT_ORDER=Na zamówienie
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-FixAmount=Fix amount
-VarAmount=Variable amount (%% tot.)
+PaymentConditionPT_5050=50 %% z góry, Pobranie 50 %%
+FixAmount=Kwota Fix
+VarAmount=Zmienna ilość (%% tot.)
 # PaymentType
 PaymentTypeVIR=Lokat bankowych
 PaymentTypeShortVIR=Lokat bankowych
@@ -348,7 +351,7 @@ ChequeNumber=Czek N
 ChequeOrTransferNumber=Cheque / Transferu N
 ChequeMaker=Sprawdź nadajnikiem
 ChequeBank=Bank czek
-CheckBank=Check
+CheckBank=Sprawdź
 NetToBePaid=Netto do wypłaty
 PhoneNumber=Tel
 FullPhoneNumber=Telefon
@@ -365,7 +368,7 @@ LawApplicationPart2=towary pozostają własnością
 LawApplicationPart3=sprzedającego do pełna cashing z
 LawApplicationPart4=ich ceny.
 LimitedLiabilityCompanyCapital=SARL z Stolicy
-UseLine=Apply
+UseLine=Zastosować
 UseDiscount=Użyj zniżki
 UseCredit=Wykorzystanie kredytu
 UseCreditNoteInInvoicePayment=Zmniejszenie płatności z tego nota kredytowa
@@ -389,18 +392,18 @@ DisabledBecausePayments=Nie możliwe, ponieważ istnieją pewne płatności
 CantRemovePaymentWithOneInvoicePaid=Nie można usunąć płatności, ponieważ istnieje przynajmniej na fakturze sklasyfikowane płatne
 ExpectedToPay=Oczekuje płatności
 PayedByThisPayment=Wypłacana przez płatność
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
-ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidInvoicesAutomatically=Sklasyfikować "Paid" wszystkie standardowe, sytuacja lub faktury zamienne wypłacane w całości.
+ClosePaidCreditNotesAutomatically=Klasyfikująsubstancje "Paid" wszystkie noty kredytowe w całości zwrócona.
 AllCompletelyPayedInvoiceWillBeClosed=Wszystko faktura bez pozostawać do zapłaty zostanie automatycznie zamknięta do statusu "płatny".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+ToMakePayment=Płacić
+ToMakePaymentBack=Spłacać
+ListOfYourUnpaidInvoices=Lista niezapłaconych faktur
+NoteListOfYourUnpaidInvoices=Uwaga: Ta lista zawiera tylko faktury dla osób trzecich jesteś powiązanych jako przedstawiciel sprzedaży.
+RevenueStamp=Znaczek skarbowy
+YouMustCreateInvoiceFromThird=Ta opcja jest dostępna tylko podczas tworzenia faktury z zakładki "klienta" z thirdparty
 PDFCrabeDescription=Faktura Crabe modelu. Pełna faktura modelu (VAT Wsparcie opcji, rabaty, warunki płatności, logo, itp. ..)
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for credit notes and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
+TerreNumRefModelDesc1=Powrót liczbę z formatu% syymm-nnnn do standardowych faktur i% syymm-nnnn do not kredytowych, gdzie RR oznacza rok, miesiąc i jest mm nnnn jest ciągiem bez przerwy i nie ma powrotu do 0
+MarsNumRefModelDesc1=Powrót liczbę z formatu% syymm-nnnn do standardowych faktur,% syymm-nnnn faktur zamiennych,% syymm-nnnn do not kredytowych i% syymm-nnnn do not kredytowych, gdzie rr jest rok, miesiąc i jest mm nnnn jest ciągiem bez przerwy i nie ma powrotu do 0
 TerreNumRefModelError=Rachunek zaczynające się od $ syymm już istnieje i nie jest kompatybilne z tym modelem sekwencji. Usuń go lub zmienić jego nazwę, aby włączyć ten moduł.
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Przedstawiciela w ślad za klienta faktura
@@ -412,19 +415,19 @@ TypeContact_invoice_supplier_external_BILLING=kontakt fakturze dostawcy
 TypeContact_invoice_supplier_external_SHIPPING=kontakt koszty dostawcy
 TypeContact_invoice_supplier_external_SERVICE=Dostawca usługi kontakt
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-Progress=Progress
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-NotLastInCycle=This invoice in not the last in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
-InvoiceSituationLast=Final and general invoice
+InvoiceFirstSituationAsk=Pierwsza faktura sytuacja
+InvoiceFirstSituationDesc=Faktury sytuacji, są związane z sytuacji związanych z progresją np postęp budowy. Każda sytuacja jest związana z fakturą.
+InvoiceSituation=Sytuacja na fakturze
+InvoiceSituationAsk=Faktura następujących sytuacji
+InvoiceSituationDesc=Utwórz nową sytuację po już istniejącej
+SituationAmount=Kwota Sytuacja faktury (netto)
+SituationDeduction=Sytuacja odejmowanie
+Progress=Postęp
+ModifyAllLines=Modyfikować wszystkie linie
+CreateNextSituationInvoice=Tworzenie kolejnej sytuacji
+NotLastInCycle=Ta faktura nie ostatni w cyklu i nie mogą być modyfikowane.
+DisabledBecauseNotLastInCycle=Następna sytuacja już istnieje.
+DisabledBecauseFinal=Sytuacja ta jest ostateczna.
+CantBeLessThanMinPercent=Postęp nie może być mniejsza niż wartość w poprzedniej sytuacji.
+NoSituations=Brak otwarte sytuacje
+InvoiceSituationLast=Ostateczna i ogólnie faktury
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index fe0d43bf7f3..86f10513d1a 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=Rss informacji
 BoxLastProducts=Ostatnie produkty / usługi
-# BoxProductsAlertStock=Products in stock alert
+BoxProductsAlertStock=Produkty w alercie magazynie
 BoxLastProductsInContract=Ostatnia zakontraktowanych produktów / usług
 BoxLastSupplierBills=Ostatnia dostawcy faktur
 BoxLastCustomerBills=Ostatnia klienta faktury
@@ -12,13 +12,14 @@ BoxLastProspects=Ostatnie modyfikowani potencjalni klienci
 BoxLastCustomers=Ostatnia klientów
 BoxLastSuppliers=Ostatnia dostawców
 BoxLastCustomerOrders=Ostatnia zamówień
+BoxLastValidatedCustomerOrders=Ostatnie potwierdzone zamówienia klientów
 BoxLastBooks=Ostatnie książki
 BoxLastActions=Ostatnie działania
 BoxLastContracts=Siste kontrakter
 BoxLastContacts=Ostatnie kontakty / adresy
 BoxLastMembers=Ostatnie użytkowników
-# BoxFicheInter=Last interventions
-# BoxCurrentAccounts=Opened accounts balance
+BoxFicheInter=Ostatnie interwencje
+BoxCurrentAccounts=Saldo konta otwarte
 BoxSalesTurnover=Obrót
 BoxTotalUnpaidCustomerBills=Suma niezapłaconych faktur przez klientów
 BoxTotalUnpaidSuppliersBills=Suma niezapłaconych faktur dostawcy
@@ -26,27 +27,30 @@ BoxTitleLastBooks=Ostatnia %s rejestrowane książek
 BoxTitleNbOfCustomers=Nombre de klienta
 BoxTitleLastRssInfos=Ostatnie wieści z %s %s
 BoxTitleLastProducts=Ostatnia %s zmodyfikowane produkty / usługi
-# BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Ostatnia %s zmodyfikowane zamówień
+BoxTitleProductsAlertStock=Produkty w alercie magazynie
+BoxTitleLastCustomerOrders=W ostatnim% s zamówień klientów
+BoxTitleLastModifiedCustomerOrders=W ostatnim% s zmodyfikowane zamówienia klientów
 BoxTitleLastSuppliers=Ostatnia %s zarejestrowanych dostawców
 BoxTitleLastCustomers=Ostatnia %s zarejestrowanych klientów
 BoxTitleLastModifiedSuppliers=%s ostatnio zmodyfikowano dostawców
 BoxTitleLastModifiedCustomers=%s ostatnio zmodyfikowanych klientów
-BoxTitleLastCustomersOrProspects=Ostatnia %s zarejestrowanych klientów lub potencjalnych klientów
-BoxTitleLastPropals=Ostatnia %s rejestrowane propozycje
+BoxTitleLastCustomersOrProspects=W ostatnim% s klienci lub perspektywy
+BoxTitleLastPropals=W ostatnim% s propozycje
+BoxTitleLastModifiedPropals=W ostatnim% s zmodyfikowane propozycje
 BoxTitleLastCustomerBills=%s ostatnich faktur klientów
+BoxTitleLastModifiedCustomerBills=W ostatnim% s zmodyfikowane faktury klienta
 BoxTitleLastSupplierBills=Ostatnia %s dostawcy faktur
-BoxTitleLastProspects=%s ostatnio dodanych potencjalnych klientów
+BoxTitleLastModifiedSupplierBills=W ostatnim% s zmodyfikowane faktur dostawca
 BoxTitleLastModifiedProspects=%s ostatnio zmodyfikowanych potencjalnych klientów
 BoxTitleLastProductsInContract=Ostatnie %s produktów / usług w umowie
-BoxTitleLastModifiedMembers=Ostatnie %s zmodyfikowane użytkowników
-# BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=%s najstarszych, niezapłaconych faktur klientów
-BoxTitleOldestUnpaidSupplierBills=Najstarszy %s dostawcy niezapłaconych faktur
-# BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleLastModifiedMembers=W ostatnim% s użytkowników
+BoxTitleLastFicheInter=W ostatnim% s zmodyfikowano interwencji
+BoxTitleOldestUnpaidCustomerBills=Najstarsze% s niezapłacone faktury klienta
+BoxTitleOldestUnpaidSupplierBills=Najstarsze% s niezapłacone faktury dostawca
+BoxTitleCurrentAccounts=Salda otworzył koncie
 BoxTitleSalesTurnover=Obrót
-BoxTitleTotalUnpaidCustomerBills=Należne wpłaty klienta faktury
-BoxTitleTotalUnpaidSuppliersBills=Zaległej płatności za faktury dostawcy
+BoxTitleTotalUnpaidCustomerBills=Niezapłacone faktury klienta
+BoxTitleTotalUnpaidSuppliersBills=Niezapłacone faktury dostawca
 BoxTitleLastModifiedContacts=%s ostatnio zmodyfikowanych kontaktów / adresów
 BoxMyLastBookmarks=Moje ostatnie %s zakładek
 BoxOldestExpiredServices=Najstarszy aktywny minął usługi
@@ -55,7 +59,7 @@ BoxTitleLastActionsToDo=Ostatnia %s do działania
 BoxTitleLastContracts=Siste %s kontrakter
 BoxTitleLastModifiedDonations=Ostatnie %s modyfikowane darowizn
 BoxTitleLastModifiedExpenses=Ostatnie %s modyfikowane wydatki
-# BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxGlobalActivity=Globalna aktywność (faktury, wnioski, zamówienia)
 FailedToRefreshDataInfoNotUpToDate=Nie można odświeżyć RSS topnika. Ostatnie udane odświeżenie data: %s
 LastRefreshDate=Ostatnia odświeżyć daty
 NoRecordedBookmarks=No bookmarks defined. Click tutaj, aby dodać zakładki.
@@ -74,18 +78,19 @@ NoRecordedProducts=Nr zarejestrowane produkty / usługi
 NoRecordedProspects=Brak potencjalnyc klientów
 NoContractedProducts=Brak produktów / usług zakontraktowanych
 NoRecordedContracts=Ingen registrert kontrakter
-# NoRecordedInterventions=No recorded interventions
-# BoxLatestSupplierOrders=Latest supplier orders
-# BoxTitleLatestSupplierOrders=%s latest supplier orders
-# NoSupplierOrder=No recorded supplier order
+NoRecordedInterventions=Brak zapisanych interwencje
+BoxLatestSupplierOrders=Ostatnie zamówienia dostawca
+BoxTitleLatestSupplierOrders=W ostatnim% s zamówienia dostawca
+BoxTitleLatestModifiedSupplierOrders=W ostatnim% s zmodyfikowane zamówienia dostawca
+NoSupplierOrder=Nie odnotowano zamówienia dostawca
 BoxCustomersInvoicesPerMonth=Ilość faktur w skali miesiąca
-# BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-# BoxCustomersOrdersPerMonth=Customer orders per month
-# BoxSuppliersOrdersPerMonth=Supplier orders per month
-# BoxProposalsPerMonth=Proposals per month
-# NoTooLowStockProducts=No product under the low stock limit
-# BoxProductDistribution=Products/Services distribution
-# BoxProductDistributionFor=Distribution of %s for %s
+BoxSuppliersInvoicesPerMonth=Faktur dostawca miesięcznie
+BoxCustomersOrdersPerMonth=Zamówienia klientów miesięcznie
+BoxSuppliersOrdersPerMonth=Zamówienia dostawca miesięcznie
+BoxProposalsPerMonth=Propozycje na miesiąc
+NoTooLowStockProducts=Brak produktów w dolnej granicy magazynie
+BoxProductDistribution=Produkty / Usługi dystrybucji
+BoxProductDistributionFor=Dystrybucja% s% s
 ForCustomersInvoices=Faktury Klientów
-# ForCustomersOrders=Customers orders
+ForCustomersOrders=Zamówienia klientów
 ForProposals=Propozycje
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index 007c40feaae..20027eddfa8 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -3,38 +3,38 @@ CashDeskMenu=Punkt sprzedaży
 CashDesk=Punkt sprzedaży
 CashDesks=Punkt sprzedaży
 CashDeskBank=Konto bankowe
-CashDeskBankCash=Na konto bankowe (gotówka)
-CashDeskBankCB=Na konto bankowe (karty)
-CashDeskBankCheque=Na konto bankowe (czek)
+CashDeskBankCash=Konto bankowe (gotówka)
+CashDeskBankCB=Konto bankowe (karty)
+CashDeskBankCheque=Konto bankowe (czek)
 CashDeskWarehouse=Magazyn
-CashdeskShowServices=Sprzedaży usług
+CashdeskShowServices=Działy sprzedaży
 CashDeskProducts=Produkty
-CashDeskStock=Fotografii
+CashDeskStock=Zapasy
 CashDeskOn=na
-CashDeskThirdParty=Osoby trzecie
-# CashdeskDashboard=Point of sale access
+CashDeskThirdParty=Zamówienie
+CashdeskDashboard=Punkt dostępu sprzedaży
 ShoppingCart=Koszyk
-NewSell=Nowy Sprzedam
-BackOffice=Back Office
+NewSell=Nowa tranzakcja
+BackOffice=Powrót do biura
 AddThisArticle=Dodaj ten artykuł
 RestartSelling=Wróć na sprzedaż
 SellFinished=Sprzedaż zakończona
 PrintTicket=Bilet do druku
-NoProductFound=Żaden artykuł znalezionych
+NoProductFound=Artykuł nie znaleziony
 ProductFound=Znaleziono produkt
-ProductsFound=znalezionych produktów
-NoArticle=Żaden artykuł
+ProductsFound=znalezione produkty
+NoArticle=Brak artykułu
 Identification=Identyfikacja
 Article=Artykuł
 Difference=Różnica
-TotalTicket=Całkowity bilet
-NoVAT=VAT nie dla tej sprzedaży
-Change=Nadmiar otrzymał
+TotalTicket=Podsumowanie całkowity
+NoVAT=bez podatku VAT dla tej sprzedaży
+Change=Nadwyżka otrzymana
 CalTip=Kliknij aby zobaczyć kalendarz
-CashDeskSetupStock=Możesz poprosić, aby zmniejszyć zapasy na tworzenia faktury, ale za to magazyn nie został zdefiniowany 
     Zmiana ustawień modułu akcji, lub wybierz magazyn
-BankToPay=Rachunku kosztów
+CashDeskSetupStock=Prosisz, o zmniejszenie zapasów produktów na fakturze, ale magazyn nie został zdefiniowany 
     Zmień zapasy ustawień modułu, lub wybierz magazyn
+BankToPay=Należności konta
 ShowCompany=Pokaż firmę
 ShowStock=Pokaż magazyn
 DeleteArticle=Kliknij, aby usunąć ten artykuł
-# FilterRefOrLabelOrBC=Search (Ref/Label)
-# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+FilterRefOrLabelOrBC=Szukaj (Ref / Label)
+UserNeedPermissionToEditStockToUsePos=Próbujesz zmniejszyć zapasy na fakturze stworzonej, więc użytkownik by mógł używać POS potrzebuje mieć uprawnienie by edytować zapasy.
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index 8afe23bd46a..09bb7efef99 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategoria
-Categories=Kategorie
-Rubrique=Kategoria
-Rubriques=Kategorie
-categories=kategorie
-TheCategorie=Kategoria
-NoCategoryYet=Nr kategorii tego typu tworzone
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=W
 AddIn=Dodaj w
 modify=modyfikować
 Classify=Klasyfikacja
-CategoriesArea=Kategorie obszarze
-ProductsCategoriesArea=Produkty / Usługi kategorii powierzchni
-SuppliersCategoriesArea=Dostawcy kategorii powierzchni
-CustomersCategoriesArea=Klienci kategorii powierzchni
-ThirdPartyCategoriesArea=Stron trzecich kategorii powierzchni
-MembersCategoriesArea=Członków kategorii obszaru
-ContactsCategoriesArea=Contacts categories area
-MainCats=Główne kategorie
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Podkategorie
 CatStatistics=Statystyki
-CatList=Lista catgories
-AllCats=Wszystkie kategorie
-ViewCat=Wyświetl kategorii
-NewCat=Dodaj kategorię
-NewCategory=Nowa kategoria
-ModifCat=Modyfikacja kategorii
-CatCreated=Kategoria utworzonych
-CreateCat=Tworzenie kategorii
-CreateThisCat=Tworzenie tej kategorii
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate pola
 NoSubCat=Brak podkategorii.
 SubCatOf=Podkategoria
-FoundCats=Znaleziono kategorii
-FoundCatsForName=Kategorie znaleźć na imię i nazwisko:
-FoundSubCatsIn=Podkategorie w kategorii
-ErrSameCatSelected=Wybrano tej samej kategorii, kilka razy
-ErrForgotCat=You forgot wybrać kategorię
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Zapomniałeś o zakresie
 ErrCatAlreadyExists=Ta nazwa jest już używany
-AddProductToCat=Dodaj produkt do kategorii?
-ImpossibleAddCat=Niemożliwe, aby dodać kategorię
-ImpossibleAssociateCategory=Niemożliwe włączają do kategorii
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully= %s został dodany pomyślnie.
-ObjectAlreadyLinkedToCategory=Element jest już powiązana z tej kategorii.
-CategorySuccessfullyCreated=Ta kategoria %s został dodany pomyślnie.
-ProductIsInCategories=Produktu / usługi posiada do następujących kategorii
-SupplierIsInCategories=Trzeciej posiada do następujących kategorii dostawców
-CompanyIsInCustomersCategories=Wspomniana strona trzecia posiada do następujących klientów / perspektywy kategorii\nTen kontrahent posiada następujące kategorie klientów / potencjalnych klientów
-CompanyIsInSuppliersCategories=Wspomniana strona trzecia posiada do następujących kategorii dostawców
-MemberIsInCategories=Ten użytkownik posiada do następujących kategorii użytkowników
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=Ten produkt / usługa nie jest w żaden kategorii
-SupplierHasNoCategory=To dostawca nie jest w żaden kategorii
-CompanyHasNoCategory=Ta firma nie jest w żaden kategorii
-MemberHasNoCategory=Członek ten nie jest w żadnym kategorii
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Klasyfikacja w kategorii
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Żaden
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Ta kategoria już istnieje w tym samym miejscu
 ReturnInProduct=Powrót do produktów / usług karty
 ReturnInSupplier=Powrót do dostawcy kart
@@ -66,47 +64,47 @@ ReturnInCompany=Powrót do klienta / perspektywa karty
 ContentsVisibleByAll=Zawartość będzie widoczny przez wszystkich
 ContentsVisibleByAllShort=Zawartość widoczna przez wszystkie
 ContentsNotVisibleByAllShort=Treść nie jest widoczna dla wszystkich
-CategoriesTree=Categories tree
-DeleteCategory=Usuwanie kategorii
-ConfirmDeleteCategory=Czy na pewno chcesz usunąć tę kategorię?
-RemoveFromCategory=Usuń powiązanie z kategorii
-RemoveFromCategoryConfirm=Czy na pewno chcesz usunąć związek między transakcją i kategorii?
-NoCategoriesDefined=Nr kategorii zdefiniowanych
-SuppliersCategoryShort=Dostawcy kategorii
-CustomersCategoryShort=Klienci kategorii
-ProductsCategoryShort=Produkty kategorii
-MembersCategoryShort=Członków kategorii
-SuppliersCategoriesShort=Dostawcy kategorii
-CustomersCategoriesShort=Klienci kategorii
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / prosp. kategorie
-ProductsCategoriesShort=Produkty kategorii
-MembersCategoriesShort=Członków kategorii
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Ta kategoria nie zawiera żadnych produktów.
 ThisCategoryHasNoSupplier=Ta kategoria nie zawiera żadnego dostawcy.
 ThisCategoryHasNoCustomer=Ta kategoria nie zawiera żadnych klientów.
 ThisCategoryHasNoMember=Ta kategoria nie zawiera żadnych członków.
-ThisCategoryHasNoContact=This category does not contain any contact.
+ThisCategoryHasNoContact=Ta kategoria nie zawiera żadnego kontaktu.
 AssignedToCustomer=Przypisany do klienta
 AssignedToTheCustomer=Przypisany do klienta
 InternalCategory=Inernal kategorii
-CategoryContents=Kategoria treści
-CategId=Kategoria id
-CatSupList=Lista kategorii dostawcy
-CatCusList=Lista klientów / perspektywa kategorii
-CatProdList=Lista produktów kategorii
-CatMemberList=Lista członków kategorii
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
-CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
-AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
+DeletePicture=Obraz usunięcia
+ConfirmDeletePicture=Potwierdź usunięcie obrazu?
+ExtraFieldsCategories=Atrybuty uzupełniające
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
+CategorieRecursivHelp=Jeśli aktywna, produkt będzie również związany z kategorii nadrzędnej podczas dodawania do podkategorii
+AddProductServiceIntoCategory=Dodaj następujący produkt / usługę
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 75f3244f729..62e5fde531e 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -3,8 +3,8 @@ Accountancy=Księgowość
 AccountancyCard=Księgowość karty
 Treasury=Skarbiec
 MenuFinancial=Finanse
-TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation
+TaxModuleSetupToModifyRules=Przejdź do konfiguracji modułu Podatki zmodyfikować zasady obliczania
+TaxModuleSetupToModifyRulesLT=Przejdź do konfiguracji firmy zmodyfikować zasady obliczania
 OptionMode=Opcja dla księgowych
 OptionModeTrue=Opcja Input-Output
 OptionModeVirtual=Opcja Kredyty-Debits
@@ -12,15 +12,15 @@ OptionModeTrueDesc=W tym kontekście, obrót jest obliczana na płatności (data
 OptionModeVirtualDesc=W tym kontekście, obrót jest obliczana na fakturach (data zatwierdzenia). Gdy te faktury są należne, czy zostały zapłacone, czy nie są one wymienione w obrocie wyjście.
 FeatureIsSupportedInInOutModeOnly=Funkcja dostępna tylko w KREDYTÓW-DŁUGI rachunkowych trybu (patrz Rachunkowych moduł konfiguracji)
 VATReportBuildWithOptionDefinedInModule=Kwoty wyświetlane tutaj są obliczane na zasadach określonych przez organy podatkowe moduł konfiguracji.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+LTReportBuildWithOptionDefinedInModule=Kwoty podane są obliczane na podstawie zasad określonych przez konfiguracji firmy.
 Param=Konfiguracja
 RemainingAmountPayment=Płatność pozostałej kwoty:
 AmountToBeCharged=Łączna kwota do zapłaty:
 AccountsGeneral=Konta
 Account=Konto
 Accounts=Konta
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Konto rodzic
+Accountsparent=Konta rodzica
 BillsForSuppliers=Rachunki dla dostawców
 Income=Przychody
 Outcome=Rezultat
@@ -29,11 +29,11 @@ ReportTurnover=Obrót
 PaymentsNotLinkedToInvoice=Płatności związane z wszelkich faktur, więc nie są związane z jakąkolwiek osobą trzecią
 PaymentsNotLinkedToUser=Płatności związane z dowolnego użytkownika
 Profit=Zysk
-AccountingResult=Accounting result
+AccountingResult=Wynik księgowy
 Balance=Saldo
 Debit=Rozchody
 Credit=Kredyt
-Piece=Accounting Doc.
+Piece=Rachunkowość Doc.
 Withdrawal=Wycofanie
 Withdrawals=Wypłaty
 AmountHTVATRealReceived=HT zebrane
@@ -43,25 +43,25 @@ VATReceived=VAT otrzymana
 VATToCollect=VAT do gromadzenia
 VATSummary=VAT Podsumowanie
 LT2SummaryES=Balans IRPF
-LT1SummaryES=RE Balance
+LT1SummaryES=RE Saldo
 VATPaid=VAT paid
-SalaryPaid=Salary paid
+SalaryPaid=Wynagrodzenie wypłacane
 LT2PaidES=IRPF Płatny
-LT1PaidES=RE Paid
+LT1PaidES=RE Płatny
 LT2CustomerES=Sprzedaż IRPF
 LT2SupplierES=Zakupy IRPF
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
+LT1CustomerES=RE sprzedaży
+LT1SupplierES=RE zakupów
 VATCollected=VAT zebrane
 ToPay=Aby zapłacić
 ToGet=Aby powrócić
-SpecialExpensesArea=Area for all special payments
+SpecialExpensesArea=Obszar dla wszystkich specjalnych płatności
 TaxAndDividendsArea=Podatek, składki na ubezpieczenie społeczne i dywidendy obszarze
 SocialContribution=Społeczny wkład
 SocialContributions=Składek na ubezpieczenia społeczne
-MenuSpecialExpenses=Special expenses
+MenuSpecialExpenses=Koszty specjalne
 MenuTaxAndDividends=Podatki i dywidendy
-MenuSalaries=Salaries
+MenuSalaries=Wynagrodzenia
 MenuSocialContributions=Składek na ubezpieczenia społeczne
 MenuNewSocialContribution=Nowe Wkład
 NewSocialContribution=Nowe społecznego wkładu
@@ -74,21 +74,21 @@ PaymentCustomerInvoice=Klient płatności faktury
 PaymentSupplierInvoice=Dostawca płatności faktury
 PaymentSocialContribution=Społeczny wkład płatności
 PaymentVat=Zapłaty podatku VAT
-PaymentSalary=Salary payment
+PaymentSalary=Wypłata wynagrodzenia
 ListPayment=Wykaz płatności
 ListOfPayments=Wykaz płatności
 ListOfCustomerPayments=Lista klientów płatności
 ListOfSupplierPayments=Lista dostawców płatności
 DatePayment=Data płatności
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
+DateStartPeriod=Data okres rozruchu
+DateEndPeriod=Data zakończenia okresu
 NewVATPayment=Nowe zapłaty podatku VAT
 newLT2PaymentES=Nowy IRPF płatności
-newLT1PaymentES=New RE payment
+newLT1PaymentES=Nowa płatność RE
 LT2PaymentES=Płatność IRPF
 LT2PaymentsES=Płatności IRPF
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=RE: Płatność
+LT1PaymentsES=RE Płatności
 VATPayment=Zapłaty podatku VAT
 VATPayments=Płatności VAT
 SocialContributionsPayments=Płatności składek na ubezpieczenia społeczne
@@ -101,7 +101,7 @@ AccountNumberShort=Numer konta
 AccountNumber=Numer konta
 NewAccount=Nowe konto
 SalesTurnover=Obrót
-SalesTurnoverMinimum=Minimum sales turnover
+SalesTurnoverMinimum=Minimalne obroty sprzedaży
 ByThirdParties=Bu trzecich
 ByUserAuthorOfInvoice=Na fakturze autora
 AccountancyExport=Księgowość eksportu
@@ -109,7 +109,7 @@ ErrorWrongAccountancyCodeForCompany=Bad klienta rachunkowych kod %s
 SuppliersProductsSellSalesTurnover=Obrotów generowanych przez sprzedaż dostawców produktów.
 CheckReceipt=Sprawdź depozyt
 CheckReceiptShort=Sprawdź depozyt
-LastCheckReceiptShort=Last %s check receipts
+LastCheckReceiptShort=W ostatnim% s wpływy wyboru
 NewCheckReceipt=Nowe zniżki
 NewCheckDeposit=Nowe sprawdzić depozytu
 NewCheckDepositOn=Nowe sprawdzić depozytu na konto: %s
@@ -121,42 +121,42 @@ ConfirmPaySocialContribution=Czy na pewno chcesz sklasyfikować ten społecznego
 DeleteSocialContribution=Usuń społecznego wkładu
 ConfirmDeleteSocialContribution=Czy na pewno chcesz usunąć ten wkład społeczny?
 ExportDataset_tax_1=Składek na ubezpieczenia społeczne i płatności
-CalcModeVATDebt=Mode %sVAT on commitment accounting%s.
-CalcModeVATEngagement=Mode %sVAT on incomes-expenses%s.
-CalcModeDebt=Mode %sClaims-Debts%s said Commitment accounting.
-CalcModeEngagement=Mode %sIncomes-Expenses%s said cash accounting
-CalcModeLT1= Mode %sRE on customer invoices - suppliers invoices%s
-CalcModeLT1Debt=Mode %sRE on customer invoices%s
-CalcModeLT1Rec= Mode %sRE on suppliers invoices%s
-CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s
-CalcModeLT2Debt=Mode %sIRPF on customer invoices%s
-CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+CalcModeVATDebt=Tryb% Svat na rachunkowości zaangażowanie% s.
+CalcModeVATEngagement=Tryb% Svat na dochody-wydatki% s.
+CalcModeDebt=Tryb% sClaims-Długi% s powiedział rachunkowości zobowiązania.
+CalcModeEngagement=Tryb% sIncomes-Wydatki% s powiedział kasowej
+CalcModeLT1= Tryb% SRE faktur klienta - dostawcy wystawia faktury% s
+CalcModeLT1Debt=Tryb% SRE faktur klienta% s
+CalcModeLT1Rec= Tryb% SRE dostawców fakturuje% s
+CalcModeLT2= Tryb% sIRPF na fakturach klientów - dostawców faktury% s
+CalcModeLT2Debt=Tryb% sIRPF faktur klienta% s
+CalcModeLT2Rec= Tryb% sIRPF od dostawców faktury% s
+AnnualSummaryDueDebtMode=Saldo przychodów i kosztów, roczne podsumowania
+AnnualSummaryInputOutputMode=Saldo przychodów i kosztów, roczne podsumowania
 AnnualByCompaniesDueDebtMode=Bilan et des recettes dpenses, dtail par tiers, en trybie %sCrances-dettes %s comptabilit dit d'engagement.
 AnnualByCompaniesInputOutputMode=Bilan et des recettes dpenses, dtail par tiers, en trybie %sRecettes-Dpenses %s comptabilit dit de Caisse.
 SeeReportInInputOutputMode=Voir le rapport %sRecettes-Dpenses %s comptabilit dit pour un Caisse de calcul sur les paiements effectivement raliss
 SeeReportInDueDebtMode=Voir le rapport %sCrances-dettes %s comptabilit dit d'engagement pour un calcul sur les factures mises
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesAmountWithTaxIncluded=- Kwoty podane są łącznie z podatkami
 RulesResultDue=- Kwoty wykazane są łącznie ze wszystkimi podatkami 
     - Obejmuje ona zaległych faktur, kosztów i podatku VAT, czy są one wypłacane lub nie. 
     - Jest on oparty na zatwierdzanie daty faktur i podatku VAT oraz o terminie płatności na wydatki.
-RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT. 
    - It is based on the payment dates of the invoices, expenses and VAT.
+RulesResultInOut=- Zawiera rzeczywiste płatności na fakturach, wydatki oraz podatek VAT. 
     - To jest na podstawie terminów płatności faktur, koszty i VAT.
 RulesCADue=- Obejmuje ona klientów z powodu faktury, czy są one wypłacane, czy nie. 
     - Jest on oparty na zatwierdzenie daty tych faktur. 
    
 RulesCAIn=- Obejmuje wszystkie skuteczne płatności faktur otrzymanych od klientów. 
     - Jest on oparty na dacie płatności tych faktur 
    
 DepositsAreNotIncluded=- Faktury depozytów są ani też
 DepositsAreIncluded=- Faktury depozytowe są zawarte
 LT2ReportByCustomersInInputOutputModeES=Raport osób trzecich IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+LT1ReportByCustomersInInputOutputModeES=Sprawozdanie trzecim RE partii
+VATReportByCustomersInInputOutputMode=Sprawozdanie VAT klienta gromadzone i wypłacane
+VATReportByCustomersInDueDebtMode=Sprawozdanie VAT klienta gromadzone i wypłacane
+VATReportByQuartersInInputOutputMode=Sprawozdanie stawki VAT pobierane i wypłacane
+LT1ReportByQuartersInInputOutputMode=Sprawozdanie stopy RE
+LT2ReportByQuartersInInputOutputMode=Sprawozdanie IRPF stopy
+VATReportByQuartersInDueDebtMode=Sprawozdanie stawki VAT pobierane i wypłacane
+LT1ReportByQuartersInDueDebtMode=Sprawozdanie stopy RE
+LT2ReportByQuartersInDueDebtMode=Sprawozdanie IRPF stopy
 SeeVATReportInInputOutputMode=Zobacz raport %sVAT encasement%s na standardowe obliczenia
 SeeVATReportInDueDebtMode=%sVAT sprawozdanie Zobacz na flow%s do obliczenia z opcją na przepływ
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
+RulesVATInServices=- W przypadku usług, raport zawiera przepisów VAT faktycznie otrzymane lub wydane na podstawie daty płatności.
 RulesVATInProducts=- W przypadku środków trwałych, to obejmuje faktur VAT na podstawie daty wystawienia faktury.
 RulesVATDueServices=- W przypadku usług, raport zawiera faktur VAT należnego, płatnego lub nie, w oparciu o daty wystawienia faktury.
 RulesVATDueProducts=- W przypadku środków trwałych, to obejmuje faktury VAT, w oparciu o daty wystawienia faktury.
@@ -179,29 +179,29 @@ CodeNotDef=Nie zdefiniowane
 AddRemind=Wysłanie dostępną kwotę
 RemainToDivide= Pozostają do wysyłki:
 WarningDepositsNotIncluded=Depozyty faktury nie są zawarte w tej wersji z tego modułu księgowego.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Pcg version
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
-AccountancyDashboard=Accountancy summary
-ByProductsAndServices=By products and services
-RefExt=External ref
-ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=Link to order
-ReCalculate=Recalculate
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:
    Method 1 is rounding vat on each line, then summing them.
    Method 2 is summing all vat on each line, then rounding result.
    Final result may differs from few cents. Default mode is mode %s.
-CalculationRuleDescSupplier=according to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a cash accountancy mode is not relevant. This report is only available when using engagement accountancy mode (see setup of accountancy module).
-CalculationMode=Calculation mode
-AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+DatePaymentTermCantBeLowerThanObjectDate=Termin płatności określony nie może być niższa niż data obiektu.
+Pcg_version=Wersja PCG
+Pcg_type=Typ PCG
+Pcg_subtype=PCG podtyp
+InvoiceLinesToDispatch=Linie do wysyłki faktury
+InvoiceDispatched=Wysłane faktury
+AccountancyDashboard=Podsumowanie Księgowość
+ByProductsAndServices=Przez produkty i usługi
+RefExt=Ref Zewnętrzne
+ToCreateAPredefinedInvoice=Aby utworzyć predefiniowany fakturę, utworzyć standardowy fakturę następnie, bez sprawdzania, kliknij na przycisk "Convert to predefiniowanym faktury".
+LinkedOrder=Link do zamówienia
+ReCalculate=Przelicz
+Mode1=Metoda 1
+Mode2=Metoda 2
+CalculationRuleDesc=Aby obliczyć całkowity podatek VAT, nie ma dwóch metod: 
     Metoda 1 jest zaokrąglenie vat na każdej linii, a następnie ich zsumowanie. 
     Metoda 2 jest zsumowanie wszystkich vat na każdej linii, a następnie zaokrąglenie wyniku. 
     Efekt końcowy może różni się od kilku centów. Domyślnym trybem jest tryb% s.
+CalculationRuleDescSupplier=wg dostawcy, wybierz odpowiednią metodę zastosować samą zasadę obliczania i uzyskać taki sam wynik oczekiwany przez dostawcę.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Raport obroty na produkcie, w przypadku korzystania z trybu rachunkowości gotówki, nie ma znaczenia. Raport ten jest dostępny tylko w przypadku korzystania z trybu zaangażowanie rachunkowości (patrz konfiguracja modułu księgowego).
+CalculationMode=Tryb Obliczanie
+AccountancyJournal=Kod Księgowość czasopisma
+ACCOUNTING_VAT_ACCOUNT=Domyślny kod rachunkowe poboru VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=Domyślny kod księgowość dla płacenia podatku VAT
+ACCOUNTING_ACCOUNT_CUSTOMER=Kod Księgowość domyślnie dla thirdparties klientów
+ACCOUNTING_ACCOUNT_SUPPLIER=Kod Księgowość domyślnie dla thirdparties dostawca
+CloneTax=Clone wkład społeczny
+ConfirmCloneTax=Potwierdź klon wkładu społecznego
+CloneTaxForNextMonth=Sklonować go na następny miesiąc
diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
index 138ce5b91c7..697e7054d09 100644
--- a/htdocs/langs/pl_PL/contracts.lang
+++ b/htdocs/langs/pl_PL/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Zamówienia obszarze
 ListOfContracts=Wykaz umów
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=W ostatnim% s zmodyfikowane umowy
 AllContracts=Wszystkie umowy
 ContractCard=Zamówienie karty
 ContractStatus=Kontrakt statusu
@@ -19,7 +19,7 @@ ServiceStatusLateShort=Minął
 ServiceStatusClosed=Zamknięte
 ServicesLegend=Usługi legendy
 Contracts=Kontrakty
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Kontrakty i linia umów
 Contract=Kontrakt
 NoContracts=Nr umowy
 MenuServices=Usługi
@@ -28,7 +28,7 @@ MenuRunningServices=Uruchamianie usług
 MenuExpiredServices=Minął usług
 MenuClosedServices=Zamknięte usług
 NewContract=Nowe umowy
-AddContract=Create contract
+AddContract=Tworzenie umowy
 SearchAContract=Szukaj zamówienia
 DeleteAContract=Usuń umowy
 CloseAContract=Zamknij umowy
@@ -39,7 +39,7 @@ ConfirmCloseService=Czy na pewno chcesz zamknąć tej usługi wraz z datą %s
 ValidateAContract=Sprawdź umowę
 ActivateService=Aktywacja usługi
 ConfirmActivateService=Czy na pewno chcesz, aby uaktywnić tę usługę z dnia %s?
-RefContract=Contract reference
+RefContract=Numer umowy
 DateContract=Kontrakt daty
 DateServiceActivate=Data aktywacji usługi
 DateServiceUnactivate=Data doręczenia unactivation
@@ -54,7 +54,7 @@ ListOfRunningContractsLines=Listę uruchomionych linii zamówienia
 ListOfRunningServices=Lista uruchomionych usług
 NotActivatedServices=Nie aktywacji usług (wśród zatwierdzonych umów)
 BoardNotActivatedServices=Usługi uaktywnić wśród zatwierdzonych umów
-LastContracts=Last %s contracts
+LastContracts=Zamówienia w ostatnim% s
 LastActivatedServices=Ostatnia %s aktywacji usługi
 LastModifiedServices=Ostatnia %s zmodyfikowane usług
 EditServiceLine=Edycja usługa linii
@@ -86,13 +86,13 @@ PaymentRenewContractId=Odnowienie umowy linii (liczba %s)
 ExpiredSince=Data ważności
 RelatedContracts=Związane z nimi umowy
 NoExpiredServices=Nie minął aktywne usługi
-ListOfServicesToExpireWithDuration=List of Services to expire in %s days
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
-ListOfServicesToExpire=List of Services to expire
-NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+ListOfServicesToExpireWithDuration=Lista Usługi wygasa w% s dni
+ListOfServicesToExpireWithDurationNeg=Lista usług wygasły z więcej niż% s dni
+ListOfServicesToExpire=Lista Usług wygaśnie
+NoteListOfYourExpiredServices=Ta lista zawiera tylko usługi umów na rzecz osób trzecich jesteś związanych jako przedstawiciel sprzedaży.
+StandardContractsTemplate=Szablon standardowe kontrakty
+ContactNameAndSignature=Dla% s, nazwisko i podpis:
+OnlyLinesWithTypeServiceAreUsed=Tylko linie z typu "usługi" będzie przebity.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Podpisanie umowy sprzedaży
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index d9628c890ea..15a149f8379 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -1,87 +1,88 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 About = O
-CronAbout = About Cron
-CronAboutPage = Cron about page
+CronAbout = O Cron
+CronAboutPage = Cron o stronie
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
-Permission23103 = Delete Scheduled task
-Permission23104 = Execute Scheduled task
+Permission23101 = Czytaj Zaplanowane zadanie
+Permission23102 = Tworzenie / aktualizacja Zaplanowane zadania
+Permission23103 = Usuwanie zaplanowanego zadania
+Permission23104 = Wykonanie zaplanowanego zadania
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
-OrToLaunchASpecificJob=Or to check and launch a specific job
-KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to launch cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronSetup= Zaplanowana konfiguracja zarządzanie zadaniami
+URLToLaunchCronJobs=Adres URL, aby sprawdzić i uruchomić wymagane cron, jeśli
+OrToLaunchASpecificJob=Albo sprawdzić i uruchomić określonej pracy
+KeyForCronAccess=Klucz zabezpieczeń dla URL, aby uruchomić cron
+FileToLaunchCronJobs=Wiersz poleceń uruchomić cron
+CronExplainHowToRunUnix=Na środowisku Unix należy użyć następującego crontabie Uruchom wiersz poleceń co 5 minut
+CronExplainHowToRunWin=W systemie Microsoft (tm) environement systemu Windows można użyć narzędzi zaplanowane zadanie do uruchomienia linii poleceń co 5 minut
 # Menu
-CronJobs=Scheduled jobs
-CronListActive=List of active/scheduled jobs
-CronListInactive=List of disabled jobs
+CronJobs=Zaplanowane zadania
+CronListActive=Lista aktywnych / zaplanowanych zadań
+CronListInactive=Lista miejsc pracy osób niepełnosprawnych
 # Page list
-CronDateLastRun=Last run
-CronLastOutput=Last run output
-CronLastResult=Last result code
-CronListOfCronJobs=List of scheduled jobs
-CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
-CronTask=Job
-CronNone= Żaden
+CronDateLastRun=Ostatni bieg
+CronLastOutput=Ostatnie wyjście prowadzony
+CronLastResult=Ostatni kod wynikowy
+CronListOfCronJobs=Lista zaplanowanych zadań
+CronCommand=Komenda
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
+CronTask=Praca
+CronNone=Żaden
 CronDtStart=Data rozpoczęcia
 CronDtEnd=Data zakończenia
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Last execution
+CronDtNextLaunch=Następna realizacja
+CronDtLastLaunch=Ostatnia egzekucja
 CronFrequency=Frequancy
 CronClass=Classe
 CronMethod=Metoda
 CronModule=Moduł
-CronAction=Action
+CronAction=Akcja
 CronStatus=Status
 CronStatusActive=Włączone
 CronStatusInactive=Niepełnosprawnych
-CronNoJobs=No jobs registered
+CronNoJobs=Brak miejsc pracy zarejestrowanych
 CronPriority=Priorytet
 CronLabel=Opis
-CronNbRun=Nb. launch
-CronEach=Every
-JobFinished=Job launched and finished
+CronNbRun=Nb. szalupa
+CronEach=Każdy
+JobFinished=Praca rozpoczął i zakończył
 #Page card
-CronAdd= Add jobs
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronAdd= Dodaj miejsca pracy
+CronHourStart= Początek godzina i data zadania
+CronEvery= I wykonać każde zadanie
+CronObject= Instance / Obiekt do tworzenia
 CronArgs=Parametry
-CronSaveSucess=Save succesfully
+CronSaveSucess=Zapisz pomyślnie
 CronNote=Komentarz
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
-CronStatusActiveBtn=Enable
+CronFieldMandatory=Pola% s jest obowiązkowe
+CronErrEndDateStartDt=Data zakończenia nie może być wcześniejsza niż data rozpoczęcia
+CronStatusActiveBtn=Umożliwiać
 CronStatusInactiveBtn=Wyłączyć
-CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
+CronTaskInactive=Ta praca jest wyłączony
+CronDtLastResult=Data Ostatnie wyniki
 CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product
-CronClassFileHelp=The file name to load. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php
-CronObjectHelp=The object name to load. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product
-CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
-CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
-CronCommandHelp=The system command line to execute.
+CronClassFile=Zajęcia (filename.class.php)
+CronModuleHelp=Nazwa Dolibarr katalogu modułu (także współpracować z zewnętrznym modułem Dolibarr). 
     Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów / htdocs / /class/product.class.php produktu, wartość modułu jest produktem
+CronClassFileHelp=Nazwa pliku do załadowania. 
     Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów / htdocs / produktu / klasy / product.class.php wartość nazwy pliku klasa product.class.php
+CronObjectHelp=Nazwa obiektu, aby załadować. 
     Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów /htdocs/product/class/product.class.php wartość nazwy pliku klasa produktów
+CronMethodHelp=Metoda obiektu, aby uruchomić. 
     Dla exemple sprowadzić metodę Dolibarr obiektu wyrobów /htdocs/product/class/product.class.php, wartość metody jest to fecth
+CronArgsHelp=Argumenty metody. 
     Reprezentują np sprowadzić sposób Dolibarr obiektu Product /htdocs/product/class/product.class.php, wartość paramters może wynosić 0, ProductRef
+CronCommandHelp=System linii poleceń do wykonania.
+CronCreateJob=Create new Scheduled Job
 # Info
-CronInfoPage=Information
+CronInfoPage=Informacja
 # Common
-CronType=Task type
-CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
+CronType=Typ zadania
+CronType_method=Wywołanie metody z klasy Dolibarr
+CronType_command=Polecenie powłoki
 CronMenu=Cron
-CronCannotLoadClass=Cannot load class %s or object %s
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+CronCannotLoadClass=Nie można załadować klasy% s% s lub obiektu
+UseMenuModuleToolsToAddCronJobs=Wejdź w menu "Home - modułów narzędzi - Lista zadań", aby zobaczyć i edytować zaplanowane zadania.
+TaskDisabled=Zadanie wyłączony
diff --git a/htdocs/langs/pl_PL/deliveries.lang b/htdocs/langs/pl_PL/deliveries.lang
index 7a1320d6207..f279018bf76 100644
--- a/htdocs/langs/pl_PL/deliveries.lang
+++ b/htdocs/langs/pl_PL/deliveries.lang
@@ -23,4 +23,6 @@ GoodStatusDeclaration=Czy otrzymane towary powyżej w dobrym stanie,
 Deliverer=Dostawca:
 Sender=Nadawca
 Recipient=Odbiorca
-# ErrorStockIsNotEnough=There's not enough stock
+ErrorStockIsNotEnough=Nie wystarczy Zdjęcie
+Shippable=Shippable
+NonShippable=Nie shippable
diff --git a/htdocs/langs/pl_PL/dict.lang b/htdocs/langs/pl_PL/dict.lang
index 5bb75c300c3..746867ec3a4 100644
--- a/htdocs/langs/pl_PL/dict.lang
+++ b/htdocs/langs/pl_PL/dict.lang
@@ -6,7 +6,7 @@ CountryES=Hiszpania
 CountryDE=Niemcy
 CountryCH=Szwajcaria
 CountryGB=Wielkiej Brytanii
-# CountryUK=United Kingdom
+CountryUK=Zjednoczone Królestwo
 CountryIE=Polen
 CountryCN=Chiny
 CountryTN=Tunezja
@@ -252,8 +252,7 @@ CivilityMME=Pani
 CivilityMR=Pan
 CivilityMLE=Pani
 CivilityMTRE=Mistrz
-# CivilityDR=Doctor
-
+CivilityDR=Lekarz
 ##### Currencies #####
 Currencyeuros=Euro
 CurrencyAUD=Dolar UA
@@ -290,10 +289,10 @@ CurrencyXOF=Franków CFA BCEAO
 CurrencySingXOF=Frank CFA BCEAO
 CurrencyXPF=Franków CFP
 CurrencySingXPF=Frank CFP
-
-# CurrencyCentSingEUR=cent
-# CurrencyThousandthSingTND=thousandth
-
+CurrencyCentSingEUR=cent
+CurrencyCentINR=Paisa
+CurrencyCentSingINR=Paise
+CurrencyThousandthSingTND=tysięczny
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
 DemandReasonTypeSRC_CAMP_MAIL=Kampanie mailingowe
@@ -302,28 +301,27 @@ DemandReasonTypeSRC_CAMP_PHO=Telefon kampanii
 DemandReasonTypeSRC_CAMP_FAX=Kampania Fax
 DemandReasonTypeSRC_COMM=Handlowych kontakt
 DemandReasonTypeSRC_SHOP=Sklep kontakt
-# DemandReasonTypeSRC_WOM=Word of mouth
-# DemandReasonTypeSRC_PARTNER=Partner
-# DemandReasonTypeSRC_EMPLOYEE=Employee
-# DemandReasonTypeSRC_SPONSORING=Sponsorship
-
+DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Pracownik
+DemandReasonTypeSRC_SPONSORING=Sponsorowanie
 #### Paper formats ####
-# PaperFormatEU4A0=Format 4A0
-# PaperFormatEU2A0=Format 2A0
-# PaperFormatEUA0=Format A0
-# PaperFormatEUA1=Format A1
-# PaperFormatEUA2=Format A2
-# PaperFormatEUA3=Format A3
-# PaperFormatEUA4=Format A4
-# PaperFormatEUA5=Format A5
-# PaperFormatEUA6=Format A6
-# PaperFormatUSLETTER=Format Letter US
-# PaperFormatUSLEGAL=Format Legal US
-# PaperFormatUSEXECUTIVE=Format Executive US
-# PaperFormatUSLEDGER=Format Ledger/Tabloid
-# PaperFormatCAP1=Format P1 Canada
-# PaperFormatCAP2=Format P2 Canada
-# PaperFormatCAP3=Format P3 Canada
-# PaperFormatCAP4=Format P4 Canada
-# PaperFormatCAP5=Format P5 Canada
-# PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format List US
+PaperFormatUSLEGAL=Format prawna US
+PaperFormatUSEXECUTIVE=Format wykonawczy US
+PaperFormatUSLEDGER=Format Ledger / Tabloid
+PaperFormatCAP1=Format P1 Kanada
+PaperFormatCAP2=Format P2 Kanada
+PaperFormatCAP3=Format P3 Kanada
+PaperFormatCAP4=Format P4 Kanada
+PaperFormatCAP5=Format P5 Kanada
+PaperFormatCAP6=Format P6 Kanada
diff --git a/htdocs/langs/pl_PL/donations.lang b/htdocs/langs/pl_PL/donations.lang
index 2318d3bf19f..b3d03910754 100644
--- a/htdocs/langs/pl_PL/donations.lang
+++ b/htdocs/langs/pl_PL/donations.lang
@@ -1,12 +1,14 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Darowizna
 Donations=Darowizny
-DonationRef=Donation ref.
+DonationRef=Darowizna sędzią.
 Donor=Donor
 Donors=Darczyńcy
-AddDonation=Create a donation
+AddDonation=Tworzenie darowiznę
 NewDonation=Nowe wpłaty
-ShowDonation=Show donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
+ShowDonation=Pokaż darowizny
 DonationPromise=Prezent obietnicy
 PromisesNotValid=Nie potwierdzone obietnic
 PromisesValid=Zatwierdzona obietnic
@@ -21,18 +23,21 @@ DonationStatusPaid=Darowizna otrzymana
 DonationStatusPromiseNotValidatedShort=Szkic
 DonationStatusPromiseValidatedShort=Zatwierdzona
 DonationStatusPaidShort=Odebrane
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Sprawdź obietnicy
-DonationReceipt=Donation receipt
+DonationReceipt=Otrzymanie darowizny
 BuildDonationReceipt=Zbuduj otrzymania
 DonationsModels=Dokumenty modeli oddawania wpływy
 LastModifiedDonations=Ostatnie %s modyfikowane darowizn
 SearchADonation=Szukaj darowiznę
-DonationRecipient=Donation recipient
-ThankYou=Thank You
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationRecipient=Darowizna odbiorca
+ThankYou=Dziękujemy
+IConfirmDonationReception=Odbiorca deklarują odbiór, jako darowiznę, następującej kwoty
+MinimumAmount=Minimalna kwota to% s
+FreeTextOnDonations=Dowolny tekst do wyświetlenia w stopce
+FrenchOptions=Opcje dla Francji
+DONATION_ART200=Pokaż artykuł 200 z CGI, jeśli obawiasz
+DONATION_ART238=Pokaż artykuł 238 z CGI, jeśli obawiasz
+DONATION_ART885=Pokaż artykuł 885 z CGI, jeśli obawiasz
+DonationPayment=Donation payment
diff --git a/htdocs/langs/pl_PL/ecm.lang b/htdocs/langs/pl_PL/ecm.lang
index 45b1445b898..a547d974dae 100644
--- a/htdocs/langs/pl_PL/ecm.lang
+++ b/htdocs/langs/pl_PL/ecm.lang
@@ -23,10 +23,10 @@ ECMNewDocument=Nowy dokument
 ECMCreationDate=Data utworzenia
 ECMNbOfFilesInDir=Liczba plików w katalogu
 ECMNbOfSubDir=Liczba pod-katalogi
-ECMNbOfFilesInSubDir=Number of files in sub-directories
+ECMNbOfFilesInSubDir=Liczba plików w podkatalogach
 ECMCreationUser=Twórca
-ECMArea=EDM area
-ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMArea=Obszar EDM
+ECMAreaDesc=Powierzchnia (zarządzanie dokumentami elektronicznymi) EDM pozwala na zapisywanie, udostępnianie i szybko wyszukiwać wszelkiego rodzaju dokumentów w Dolibarr.
 ECMAreaDesc2=* Automatyczne katalogi wypełnione automatycznie podczas dodawania dokumentów z karty elementu. 
     * Podręcznik katalogów mogą być wykorzystane do zapisywania dokumentów nie są powiązane z konkretnym elementem.
 ECMSectionWasRemoved=Katalog %s została usunięta.
 ECMDocumentsSection=Dokument katalogu
@@ -35,16 +35,16 @@ ECMSearchByEntity=Szukaj wg obiektu
 ECMSectionOfDocuments=Katalogi dokumentów
 ECMTypeManual=Podręcznik
 ECMTypeAuto=Automatyczne
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMDocsBySocialContributions=Dokumenty związane ze składek na ubezpieczenia społeczne
 ECMDocsByThirdParties=Dokumenty związane z trzecim
 ECMDocsByProposals=Dokumenty związane z wnioskami
 ECMDocsByOrders=Dokumenty związane z zamówień klientów
 ECMDocsByContracts=Dokumenty związane z umowami
 ECMDocsByInvoices=Dokumenty związane z odbiorców faktur
 ECMDocsByProducts=Dokumenty związane z produktami
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByProjects=Dokumenty związane z projektami
+ECMDocsByUsers=Dokumenty związane z użytkowników
+ECMDocsByInterventions=Dokumenty związane z interwencjami
 ECMNoDirectoryYet=Nr katalogu stworzonym
 ShowECMSection=Pokaż katalog
 DeleteSection=Usuwanie katalogu
@@ -53,5 +53,5 @@ ECMDirectoryForFiles=Względna katalog plików
 CannotRemoveDirectoryContainsFiles=Usuwane nie możliwe, ponieważ zawiera ona pewne pliki
 ECMFileManager=Menedżer plików
 ECMSelectASection=Wybierz katalog na lewym drzewa ...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+DirNotSynchronizedSyncFirst=Katalog ten wydaje się być tworzone lub zmieniane poza modułem ECM. Należy kliknąć na przycisk "Odśwież" pierwszy synchronizacji dysku i bazy danych, aby uzyskać zawartość tego katalogu.
 
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 2cf540a0d8d..907f1887ab8 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Nie ma błędu, zobowiązujemy
 # Errors
 Error=Błąd
 Errors=Błędy
-ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorButCommitIsDone=Znalezione błędy, ale mimo to możemy potwierdzić
 ErrorBadEMail=EMail %s jest nie tak
 ErrorBadUrl=Url %s jest nie tak
 ErrorLoginAlreadyExists=Zaloguj %s już istnieje.
@@ -25,11 +25,11 @@ ErrorFromToAccountsMustDiffers=Źródło i celów rachunków bankowych muszą by
 ErrorBadThirdPartyName=Zła wartość w trzeciej imię
 ErrorProdIdIsMandatory=%s jest obowiązkowy
 ErrorBadCustomerCodeSyntax=Bad składni kodu klienta
-ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadBarCodeSyntax=Zła składnia kodu kreskowego. Może ustawić typ kodu kreskowego lub złe Zdefiniowane maskę kodów kreskowych do numerowania, że ​​nie pasuje do wartości zeskanowany.
 ErrorCustomerCodeRequired=Klient kod wymagane
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=Wymagany kod kreskowy
 ErrorCustomerCodeAlreadyUsed=Klient kod już używane
-ErrorBarCodeAlreadyUsed=Bar code already used
+ErrorBarCodeAlreadyUsed=Kod kreskowy już używana
 ErrorPrefixRequired=Prefiks wymagana
 ErrorUrlNotValid=Adres strony internetowej jest nieprawidłowy
 ErrorBadSupplierCodeSyntax=Bad składni kodu dostawcy
@@ -37,9 +37,9 @@ ErrorSupplierCodeRequired=Dostawca kod wymagane
 ErrorSupplierCodeAlreadyUsed=Dostawca kod już używane
 ErrorBadParameters=Bad parametry
 ErrorBadValueForParameter=Wrong wartość '%s "dla parametrów nieprawidłowe" %s spacerem
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadImageFormat=Plik obrazu ma nie Obsługiwany format (Twój PHP nie obsługuje funkcje do konwersji obrazów tego formatu)
 ErrorBadDateFormat=Wartość '%s "ma zły format daty
-ErrorWrongDate=Date is not correct!
+ErrorWrongDate=Data nie jest poprawny!
 ErrorFailedToWriteInDir=Nie można zapisać w katalogu %s
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=Znaleziono nieprawidłowy adres e-mail składni %s linii w pliku (np. z linii email %s= %s)
 ErrorUserCannotBeDelete=Użytkownik nie może być usunięty. Może być to związane jest na Dolibarr podmiotów.
@@ -60,26 +60,26 @@ ErrorUploadBlockedByAddon=Prześlij zablokowane / PHP wtyczki Apache.
 ErrorFileSizeTooLarge=Rozmiar pliku jest zbyt duży.
 ErrorSizeTooLongForIntType=Rozmiar zbyt długo typu int (%s cyfr maksimum)
 ErrorSizeTooLongForVarcharType=Rozmiar zbyt długo typu string (%s znaków maksymalnie)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
-ErrorBadFormatValueList=The list value cannot have more than one come : %s, but need at least one: llave,valores
+ErrorNoValueForSelectType=Proszę wypełnić wartości listy wyboru
+ErrorNoValueForCheckBoxType=Proszę wypełnić pole wyboru wartości dla listy
+ErrorNoValueForRadioType=Proszę wypełnić wartość liście radiowej
+ErrorBadFormatValueList=Wartość lista nie może mieć więcej niż jeden pochodzić:% s, ale potrzeba co najmniej jeden: llave, valores
 ErrorFieldCanNotContainSpecialCharacters=Pole %s nie zawiera znaki specjalne.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Pole% s nie musi zawiera znaki specjalne, ani dużych liter.
 ErrorNoAccountancyModuleLoaded=Nr rachunkowych moduł aktywowany
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorExportDuplicateProfil=Ta nazwa profil już istnieje dla tego zestawu eksportu.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP dopasowywania nie jest kompletna.
 ErrorLDAPMakeManualTest=A. LDIF plik został wygenerowany w katalogu %s. Spróbuj załadować go ręcznie z wiersza polecenia, aby mieć więcej informacji na temat błędów.
 ErrorCantSaveADoneUserWithZeroPercentage=Nie można zapisać działania z "Statut nie rozpocznie", jeśli pole "wykonana przez" jest wypełniona.
 ErrorRefAlreadyExists=Numer identyfikacyjny używany do tworzenia już istnieje.
 ErrorPleaseTypeBankTransactionReportName=Wpisz nazwę banku otrzymania gdy transakcja jest zgłaszane (Format RRRRMM lub RRRRMMDD)
 ErrorRecordHasChildren=Nie można usunąć rekordy, ponieważ ma pewne Childs.
-ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into other object.
+ErrorRecordIsUsedCantDelete=Nie możesz usuwać rekord. Jest ona już używana lub włączane do innego obiektu.
 ErrorModuleRequireJavascript=JavaScript nie musi być wyłączona do tej pracy funkcji. Aby włączyć / wyłączyć Javascript, przejdź do menu Start-> Ustawienia-> Ekran.
 ErrorPasswordsMustMatch=Zarówno wpisane hasło musi się zgadzać się
 ErrorContactEMail=Techniczny błąd. Proszę skontaktować się z administratorem, aby po %s email pl zapewnić %s kod błędu w wiadomości, a nawet lepsze, dodając kopię ekranu strony.
 ErrorWrongValueForField=Nieprawidłowa wartość dla %s numer pola (wartość "%s" nie pasuje regex %s zasady)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
+ErrorFieldValueNotIn=Błędna wartość w polu Numer% s (wartości '% s' nie jest dostępna w polu wartości% s Tabela% s =% s)
 ErrorFieldRefNotIn=Nieprawidłowa wartość dla %s liczba pól (wartość '%s "nie jest %s istniejących ref)
 ErrorsOnXLines=Błędów na linii źródło %s
 ErrorFileIsInfectedWithAVirus=Program antywirusowy nie był w stanie potwierdzić (plik może być zainfekowany przez wirusa)
@@ -91,8 +91,8 @@ ErrorModuleSetupNotComplete=Instalacja modułu wygląda na uncomplete. Idź na i
 ErrorBadMask=Błąd na masce
 ErrorBadMaskFailedToLocatePosOfSequence=Błąd, maska ​​bez kolejnego numeru
 ErrorBadMaskBadRazMonth=Błąd, zła wartość zresetowane
-ErrorMaxNumberReachForThisMask=Max number reach for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorMaxNumberReachForThisMask=Maksymalna liczba zasięg dla tej maski
+ErrorCounterMustHaveMoreThan3Digits=Licznik musi mieć więcej niż 3 cyfry
 ErrorSelectAtLeastOne=Błąd. Wybierz co najmniej jeden wpis.
 ErrorProductWithRefNotExist=Produkt z '%s "odniesienia nie istnieje
 ErrorDeleteNotPossibleLineIsConsolidated=Usuń nie możliwe, ponieważ zapis jest związany z transation bankowego, który jest conciliated
@@ -116,54 +116,60 @@ ErrorLoginDoesNotExists=Użytkownik z logowania %s nie może zostać znal
 ErrorLoginHasNoEmail=Ten użytkownik nie ma adresu e-mail. Proces przerwany.
 ErrorBadValueForCode=Zła wartość typy kodu. Spróbuj ponownie z nową wartość ...
 ErrorBothFieldCantBeNegative=Pola %s i %s nie może być zarówno negatywny
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Ilość linii do faktur dla klientów nie może być ujemna
 ErrorWebServerUserHasNotPermission=Konto użytkownika %s wykorzystywane do wykonywania serwer WWW nie ma zgody na który
 ErrorNoActivatedBarcode=Nie Typ aktywny kodów kreskowych
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
-ErrorFileRequired=It takes a package Dolibarr file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
-ErrorNewValueCantMatchOldValue=New value can't be equal to old one
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
-ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date can not be greater than today
-ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature.
-ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
-ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Iperator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrUnzipFails=Nie udało się rozpakować% s ZipArchive
+ErrNoZipEngine=Nie silnika rozpakować% s plik w PHP
+ErrorFileMustBeADolibarrPackage=Plik% s musi być pakiet zip Dolibarr
+ErrorFileRequired=To zajmuje plik pakietu Dolibarr
+ErrorPhpCurlNotInstalled=PHP CURL nie jest zainstalowany, to jest niezbędne, aby porozmawiać z Paypal
+ErrorFailedToAddToMailmanList=Nie udało się dodać% s do% s listy Mailman lub podstawy SPIP
+ErrorFailedToRemoveToMailmanList=Nie udało się usunąć rekord% s do% s listy Mailman lub podstawy SPIP
+ErrorNewValueCantMatchOldValue=Nowa wartość nie może być równa starego
+ErrorFailedToValidatePasswordReset=Nie udało się REINIT hasło. Mogą być wykonywane już reinit (ten link może być używany tylko jeden raz). Jeśli nie, spróbuj ponownie uruchomić proces reinit.
+ErrorToConnectToMysqlCheckInstance=Podłącz się do bazy danych nie powiedzie się. Sprawdź serwer MySQL jest uruchomiony (w większości przypadków, można go uruchomić z linii poleceń z "sudo /etc/init.d/mysql start").
+ErrorFailedToAddContact=Nie udało się dodać kontakt
+ErrorDateMustBeBeforeToday=Data nie może być większa niż dzisiaj
+ErrorPaymentModeDefinedToWithoutSetup=Tryb płatność została ustawiona na typ% s, ale konfiguracja modułu faktury nie została zakończona do określenia informacji, aby pokazać tym trybie płatności.
+ErrorPHPNeedModule=Błąd, Twój PHP musi mieć zainstalowanego modułu% s, aby korzystać z tej funkcji.
+ErrorOpenIDSetupNotComplete=Ty konfiguracji Dolibarr plik konfiguracyjny, aby umożliwić uwierzytelnianie OpenID, ale adres URL usługi OpenID nie jest zdefiniowany w stałej% s
+ErrorWarehouseMustDiffers=Źródłowy i docelowy składach, musi różni
+ErrorBadFormat=Bad Format!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Błąd, członek ten nie jest jeszcze związana z żadnymi thirdparty. Członkiem Link do istniejącej strony trzeciej lub utworzyć nowy thirdparty przed utworzeniem subskrypcji z faktury.
+ErrorThereIsSomeDeliveries=Błąd występuje kilka dostaw związane z tym przemieszczenia. Wykreślenie odmówił.
+ErrorCantDeletePaymentReconciliated=Nie można usunąć płatności, które generowane transakcji w banku, który został pojednaniem
+ErrorCantDeletePaymentSharedWithPayedInvoice=Nie można usunąć płatności udostępnionej przez co najmniej jednego stanu zapłaci faktury z
+ErrorPriceExpression1=Nie można przypisać do stałej '% s'
+ErrorPriceExpression2=Nie można przedefiniować wbudowanej funkcji "% s"
+ErrorPriceExpression3=Niezdefiniowana zmienna '% s' w definicji funkcji
+ErrorPriceExpression4=Nieprawidłowy znak '% s'
+ErrorPriceExpression5=Nieoczekiwany "% s"
+ErrorPriceExpression6=Błędna liczba argumentów (% s podano,% s oczekiwany)
+ErrorPriceExpression8=Operator nieoczekiwane "% s"
+ErrorPriceExpression9=Wystąpił błąd
+ErrorPriceExpression10=Iperator '% s' nie ma argumentu
+ErrorPriceExpression11=Spodziewając '% s'
+ErrorPriceExpression14=Dzielenie przez zero
+ErrorPriceExpression17=Niezdefiniowana zmienna '% s'
+ErrorPriceExpression19=Ekspresja Nie znaleziono
+ErrorPriceExpression20=Pusty wyraz
+ErrorPriceExpression21=Pusty wynik '% s'
+ErrorPriceExpression22=Wynik negatywny "% s"
+ErrorPriceExpressionInternal=Wewnętrzny błąd "% s"
+ErrorPriceExpressionUnknown=Nieznany błąd "% s"
+ErrorSrcAndTargetWarehouseMustDiffers=Źródłowy i docelowy składach, musi różni
+ErrorTryToMakeMoveOnProductRequiringBatchData=Błąd, próbuje zrobić ruch akcji bez partii / informacji szeregowego, na produkt wymagający partii / informacja seryjny
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Wszystkie nagrane przyjęć muszą najpierw zostać zweryfikowane przed dopuszczeniem do wykonania tej akcji
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
-WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
+WarningMandatorySetupNotComplete=Parametry konfiguracyjne obowiązkowe nie są jeszcze określone
 WarningSafeModeOnCheckExecDir=Uwaga, opcja safe_mode w PHP jest więc polecenia muszą być przechowywane wewnątrz katalogu safe_mode_exec_dir parametrów deklarowanych przez php.
 WarningAllowUrlFopenMustBeOn=Allow_url_fopen Parametr musi być ustawiony w Filer php.ini za ten moduł pracy całkowicie. Należy zmodyfikować ten plik ręcznie.
 WarningBuildScriptNotRunned=Skrypt %s nie zostało jeszcze prowadził do tworzenia grafiki, lub nie ma danych do pokazania.
@@ -172,12 +178,12 @@ WarningPassIsEmpty=Ostrzeżenie, hasło bazy danych jest pusta. To jest chronion
 WarningConfFileMustBeReadOnly=Uwaga, plik konfiguracyjny (htdocs / conf / conf.php) mogą być zastąpione przez serwer internetowy. Jest to poważna luka w zabezpieczeniach. Modyfikowanie uprawnień na wniosek jest w trybie tylko do odczytu dla użytkownika system operacyjny używany przez serwer sieci Web. Jeśli używasz systemu Windows i format FAT na dysku, musisz wiedzieć, że ten system plików nie pozwala na dodawanie uprawnień do pliku, więc nie może być całkowicie bezpieczne.
 WarningsOnXLines=Ostrzeżeń na linii źródło %s
 WarningNoDocumentModelActivated=Nie modelu do generowania dokumentu, został aktywowany. Model będzie wybraną domyślnie dopóki nie zajrzysz do modułu konfiguracji.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file install.lock into directory %s. Missing this file is a security hole.
+WarningLockFileDoesNotExists=Ostrzeżenie, po zakończeniu instalacji, należy wyłączyć instalacji / migracji narzędzia, dodając plik do katalogu install.lock% s. Brakuje tego pliku jest dziura w zabezpieczeniach.
 WarningUntilDirRemoved=To ostrzeżenie pozostanie aktywne, dopóki ten katalog jest obecny (Widoczne tylko admin użytkowników).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
-WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningNotRelevant=Irrelevant operation for this dataset
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningCloseAlways=Ostrzeżenie, zamykanie odbywa się nawet wtedy, gdy kwota zależy od elementów źródłowych i docelowych. Włącz tę funkcję, z zachowaniem ostrożności.
+WarningUsingThisBoxSlowDown=Ostrzeżenie, za pomocą tego pola spowolnić poważnie do wszystkich stron zawierających pola.
+WarningClickToDialUserSetupNotComplete=Konfiguracja ClickToDial informacji dla użytkownika nie są kompletne (patrz zakładka ClickToDial na kartę użytkownika).
+WarningNotRelevant=Bez znaczenia dla tej operacji zbiorze
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funkcja wyłączona podczas konfiguracji wyświetlacz jest zoptymalizowana dla osoby niewidomej lub tekstowych przeglądarek.
+WarningPaymentDateLowerThanInvoiceDate=Termin płatności (% s) jest wcześniejsza niż dzień wystawienia faktury (% s) dla faktury% s.
+WarningTooManyDataPleaseUseMoreFilters=Zbyt wiele danych. Proszę używać więcej filtrów
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index 6e701b96939..efabd1bea03 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -8,7 +8,7 @@ ImportableDatas=Przywozowe danych
 SelectExportDataSet=Wybierz dane, które chcesz wyeksportować ...
 SelectImportDataSet=Wybierz dane, które chcesz zaimportować ...
 SelectExportFields=Wybierz pola, które chcesz wyeksportować, lub wybrać predefiniowany profil eksportu
-SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+SelectImportFields=Wybierz pola plików źródłowych chcesz importować, a ich pola docelowego w bazie danych, przesuwając je w górę iw dół z kotwicą% s, lub wybierz predefiniowany profil importu:
 NotImportedFields=Obszary plik przywożonych źródła nie
 SaveExportModel=Zapisz ten wywóz profil jeśli masz zamiar ponownego użycia go później ...
 SaveImportModel=Zapisz ten przywóz profil jeśli masz zamiar ponownego użycia go później ...
@@ -64,7 +64,7 @@ ChooseFormatOfFileToImport=Wybierz format pliku do wykorzystania jako format pli
 ChooseFileToImport=Wybierz plik do zaimportowania, a następnie kliknij przycisk picto %s ...
 SourceFileFormat=format pliku źródłowego
 FieldsInSourceFile=Obszary w pliku źródłowym
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+FieldsInTargetDatabase=Pola docelowe w bazie danych Dolibarr (wytłuszczenie = obowiązkowe)
 Field=Pole
 NoFields=Nie pól
 MoveField=Przenieś %s kolumnie polu numeru
@@ -81,7 +81,7 @@ DoNotImportFirstLine=Nie przywozili pierwszym wierszu pliku źródłowego
 NbOfSourceLines=Liczba linii w pliku źródłowym
 NowClickToTestTheImport=Sprawdź parametry na przywóz zostało to określone. Jeśli są one prawidłowe, kliknij na przycisk "%s", aby uruchomić symulację procesu importowania (żadne dane nie zostaną zmienione w bazie danych, to tylko symulacja na razie) ...
 RunSimulateImportFile=Uruchomienie symulacji import
-FieldNeedSource=This field requires data from the source file
+FieldNeedSource=To pole wymaga danych z pliku źródłowego
 SomeMandatoryFieldHaveNoSource=Niektóre z pól obowiązkowych nie ma źródła danych z pliku
 InformationOnSourceFile=Informacje o pliku źródłowego
 InformationOnTargetTables=Informacji na temat docelowego pola
@@ -102,33 +102,33 @@ NbOfLinesImported=Liczba linii zaimportowany: %s.
 DataComeFromNoWhere=Wartości, aby dodać pochodzi z nigdzie w pliku źródłowym.
 DataComeFromFileFieldNb=Wartości, aby dodać pochodzi z %s numer pola w pliku źródłowym.
 DataComeFromIdFoundFromRef=Wartość, która pochodzi z %s numer dziedzinie pliku źródłowego zostaną wykorzystane w celu znalezienia id rodzica obiektu do użytkowania (So %s objet że ma ref. Od pliku źródłowego musi istnieć w Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number %s of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary %s). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromCodeId=Kod, który pochodzi z numeru pola% s w pliku źródłowym zostaną wykorzystane, aby znaleźć identyfikator obiektu nadrzędnego w użyciu (Tak Kod z pliku źródłowego musi istnieje w słowniku% s). Zauważ, że jeśli wiesz, id, można również użyć go do pliku źródłowego zamiast kodu. Import powinien pracować w obu przypadkach.
 DataIsInsertedInto=Danych pochodzących z pliku źródłowego zostanie wstawiony w pole następujące brzmienie:
 DataIDSourceIsInsertedInto=Id rodzica znalezionego obiektu na podstawie danych w pliku źródłowym, zostaną włączone do następujących dziedzinach:
 DataCodeIDSourceIsInsertedInto=Id linii macierzystej znaleźć z kodem, zostaną włączone do następnego pola:
 SourceRequired=Wartość danych jest obowiązkowe
 SourceExample=Przykład możliwych wartości danych
 ExampleAnyRefFoundIntoElement=Wszelkie ref dla %s elementów
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s
+ExampleAnyCodeOrIdFoundIntoDictionary=Każdy kod (lub identyfikator) znajduje się w słowniku% s
 CSVFormatDesc=Format pliku oddzielonych przecinkami jakości (. Csv). 
     Jest to format pliku tekstowego, gdzie pola oddzielone są separatorem [%s]. Jeśli wewnątrz znajduje się separator zawartości pola, jest zaokrąglona przez cały charakter [%s]. Ucieczka do charakteru uciec charakter rundy [%s].
-Excel95FormatDesc=Excel file format (.xls)
    This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=Excel file format (.xlsx)
    This is native Excel 2007 format (SpreadsheetML).
-TsvFormatDesc=Tab Separated Value file format (.tsv)
    This is a text file format where fields are separated by a tabulator [tab].
-ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ).
-CsvOptions=Csv Options
+Excel95FormatDesc=Format pliku Excel (.xls) 
     To jest natywny format programu Excel 95 (BIFF5).
+Excel2007FormatDesc=Format pliku Excel (xlsx) 
     To jest w formacie Excel 2007 rodzimych (SpreadsheetML).
+TsvFormatDesc=Tab separacji format Wartość (.tsv) 
     Jest to format pliku tekstowego, gdzie pola są oddzielone tabulator [TAB].
+ExportFieldAutomaticallyAdded=Pole% s został automatycznie dodany. Będzie unikać, aby mieć podobne linie mają być traktowane jako zduplikowanych rekordów (w tym polu dodał, wszystkie linie będzie posiadać swój własny identyfikator i będą się różnić).
+CsvOptions=Opcje csv
 Separator=Separator
-Enclosure=Enclosure
-SuppliersProducts=Suppliers Products
+Enclosure=Ogrodzenie
+SuppliersProducts=Dostawcy Produkty
 BankCode=Kod banku
 DeskCode=Recepcja kod
 BankAccountNumber=Numer konta
 BankAccountNumberKey=Klucz
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
    YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
     > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
     < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value
    'NNNNN+NNNNN' filters over a range of values
    '>NNNNN' filters by lower values
    '>NNNNN' filters by higher values
+SpecialCode=Specjalny kod
+ExportStringFilter=%% Umożliwia zastąpienie jednego lub więcej znaków w tekście
+ExportDateFilter=YYYY, RRRRMM, RRRRMMDD: filtry o rok / miesiąc / dzień 
     RR + YYYY, RRRRMM + RRRRMM, RRRRMMDD + RRRRMMDD: Filtry ponad szeregu lat / miesięcy / dni 
     > YYYY> RRRRMM,> yyyymmdd: filtry na wszystkich kolejnych lat / miesięcy / dni 
      Filtry "NNNNN + NNNNN" ponad zakres wartości 
     "> NNNNN" filtry według niższej wartości 
     "> NNNNN" filtry według wyższych wartości
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
+SelectFilterFields=Jeśli chcesz filtrować niektóre wartości, wartości po prostu wejść tutaj.
 FilterableFields=Champs Filtrables
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
+FilteredFields=Pola filtrowane
+FilteredFieldsValues=Wart filtru
diff --git a/htdocs/langs/pl_PL/externalsite.lang b/htdocs/langs/pl_PL/externalsite.lang
index 35765bf2fd5..3064e00428a 100644
--- a/htdocs/langs/pl_PL/externalsite.lang
+++ b/htdocs/langs/pl_PL/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Skonfiguruj link do zewnętrznej strony internetowej
 ExternalSiteURL=Zewnętrzny URL strony
 ExternalSiteModuleNotComplete=Moduł zewnętrznej strony internetowej nie został skonfigurowany poprawny
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Moja pozycja menu
diff --git a/htdocs/langs/pl_PL/ftp.lang b/htdocs/langs/pl_PL/ftp.lang
index b71a5a0faa9..e7eae611fbf 100644
--- a/htdocs/langs/pl_PL/ftp.lang
+++ b/htdocs/langs/pl_PL/ftp.lang
@@ -9,4 +9,4 @@ FailedToConnectToFTPServer=Nie udało się połączyć z serwerem FTP (%s serwer
 FailedToConnectToFTPServerWithCredentials=Nie udało się zalogować do serwera FTP z definicją login / hasło
 FTPFailedToRemoveFile=Nie udało się usunąć pliku %s.
 FTPFailedToRemoveDir=Nie udało się usunąć %s katalogu (Sprawdź uprawnienia i że katalog jest pusty).
-# FTPPassiveMode=Passive mode
+FTPPassiveMode=Tryb pasywny
diff --git a/htdocs/langs/pl_PL/help.lang b/htdocs/langs/pl_PL/help.lang
index b3882097137..988909ade7e 100644
--- a/htdocs/langs/pl_PL/help.lang
+++ b/htdocs/langs/pl_PL/help.lang
@@ -24,5 +24,5 @@ BackToHelpCenter=W innym przypadku, kliknij tutaj, aby przejść ws
 LinkToGoldMember=Możesz połączyć jedno z trenera wybranej przez Dolibarr dla danego języka ( %s), klikając jego Widget (status i maksymalną cenę są automatycznie uaktualniane):
 PossibleLanguages=Obsługiwane języki
 MakeADonation=Pomoc Dolibarr projektu, dokonać wpłaty
-# SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
-# SeeOfficalSupport=For official Dolibarr support in your language: 
    %s
+SubscribeToFoundation=Pomoc projekt Dolibarr, zapisz się na fundamencie
+SeeOfficalSupport=Do oficjalnego wsparcia Dolibarr w Twoim języku: 
     % S
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index bbf13703b82..42b65f717e6 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -1,148 +1,148 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
-MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this,  click here .
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
-Employe=Employee
+Holidays=Liście
+CPTitreMenu=Liście
+MenuReportMonth=Oświadczenie miesięczny
+MenuAddCP=Złożyć wniosek do urlopu
+NotActiveModCP=Musisz włączyć liście modułów do strony.
+NotConfigModCP=Musisz skonfigurować moduł Liście do strony. Aby to zrobić, kliknij tutaj  ,
+NoCPforUser=Nie mają żadnych dzień.
+AddCP=Złożyć wniosek do urlopu
+Employe=Pracownik
 DateDebCP=Data rozpoczęcia
 DateFinCP=Data zakończenia
 DateCreateCP=Data utworzenia
 DraftCP=Projekt
-ToReviewCP=Awaiting approval
+ToReviewCP=Oczekuje na zatwierdzenie
 ApprovedCP=Zatwierdzony
 CancelCP=Odwołany
 RefuseCP=Odmówił
 ValidatorCP=Approbator
-ListeCP=List of leaves
-ReviewedByCP=Will be reviewed by
+ListeCP=Lista liści
+ReviewedByCP=Zostanie rozpatrzony przez
 DescCP=Opis
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least %s day(s) before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is %s days.
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+SendRequestCP=Tworzenie żądania urlopu
+DelayToRequestCP=Zostawić wnioski muszą być wykonane co ​​najmniej% s dzień (dni) przed nimi.
+MenuConfCP=Edycja bilans liści
+UpdateAllCP=Aktualizacja liście
+SoldeCPUser=Liście saldo jest% s dni.
+ErrorEndDateCP=Musisz wybrać datę zakończenia większą niż data rozpoczęcia.
+ErrorSQLCreateCP=Wystąpił błąd SQL podczas tworzenia:
+ErrorIDFicheCP=Wystąpił błąd, wniosek urlop nie istnieje.
+ReturnCP=Powrót do poprzedniej strony
+ErrorUserViewCP=Nie masz uprawnień do czytania tego żądania urlopu.
+InfosCP=Informacje o wniosku urlopowego
+InfosWorkflowCP=Informacje Workflow
+RequestByCP=Wniosek
+TitreRequestCP=Zostaw żądanie
+NbUseDaysCP=Liczba dni urlopu spożywane
 EditCP=Edytuj
 DeleteCP=Usunąć
 ActionValidCP=Validate
-ActionRefuseCP=Refuse
+ActionRefuseCP=Odmawiać
 ActionCancelCP=Zrezygnuj
 StatutCP=Status
-SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-CantUpdate=You cannot update this leave request.
-NoDateDebut=You must select a start date.
-NoDateFin=You must select an end date.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=Date approved
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
+SendToValidationCP=Wyślij do walidacji
+TitleDeleteCP=Usunąć żądanie urlopu
+ConfirmDeleteCP=Potwierdź usunięcie tego wniosku urlopowego?
+ErrorCantDeleteCP=Błąd nie masz prawo do usunięcia tego żądania urlopu.
+CantCreateCP=Nie mają prawa do składania wniosków urlopowych.
+InvalidValidatorCP=Musisz wybrać approbator do żądania urlopu.
+CantUpdate=Nie można zaktualizować to żądanie urlopu.
+NoDateDebut=Musisz wybrać datę rozpoczęcia.
+NoDateFin=Musisz wybrać datę zakończenia.
+ErrorDureeCP=Twoje zapytanie urlopu nie zawiera dzień roboczy.
+TitleValidCP=Zatwierdzenie wniosku urlopu
+ConfirmValidCP=Czy na pewno chcesz, aby zatwierdzić wniosek urlopu?
+DateValidCP=Data zatwierdzone
+TitleToValidCP=Wyślij prośbę o urlop
+ConfirmToValidCP=Czy jesteś pewien, że chcesz wysłać wniosek do urlopu?
+TitleRefuseCP=Odrzucają wniosek o urlop
+ConfirmRefuseCP=Czy na pewno chcesz odrzucić wniosek urlopu?
+NoMotifRefuseCP=Musisz wybrać powód do odrzucenia wniosku.
+TitleCancelCP=Anuluj żądanie urlopu
+ConfirmCancelCP=Czy na pewno chcesz zrezygnować z żądania urlopu?
+DetailRefusCP=Powodem odmowy
+DateRefusCP=Data odmowy
+DateCancelCP=Data odwołania
+DefineEventUserCP=Przypisywanie wyjątkowy urlop dla użytkownika
+addEventToUserCP=Przypisywanie urlopu
 MotifCP=Powód
 UserCP=Użytkownik
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
-UserUpdateCP=For the user
-PrevSoldeCP=Previous Balance
+ErrorAddEventToUserCP=Wystąpił błąd podczas dodawania wyjątkowy urlop.
+AddEventToUserOkCP=Dodanie wyjątkowe prawo zostało zakończone.
+MenuLogCP=Zobacz dzienniki wniosków urlopowych
+LogCP=Zaloguj o aktualizacjach dostępnych dni urlopu
+ActionByCP=Wykonywane przez
+UserUpdateCP=Dla użytkownika
+PrevSoldeCP=Poprzedni Saldo
 NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
+alreadyCPexist=Żądanie urlopu zostało już zrobione na ten okres.
 UserName=Nazwa użytkownika
-Employee=Employee
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
+Employee=Pracownik
+FirstDayOfHoliday=Pierwszy dzień wakacji
+LastDayOfHoliday=Ostatni dzień wakacji
+HolidaysMonthlyUpdate=Miesięczna aktualizacja
+ManualUpdate=Ręczna aktualizacja
+HolidaysCancelation=Zostaw żądania anulowanie
 
 ## Configuration du Module ##
-ConfCP=Configuration of leave request module
-DescOptionCP=Description of the option
+ConfCP=Konfiguracja modułu żądanie urlopu
+DescOptionCP=Opis wariantu
 ValueOptionCP=Wartość
-GroupToValidateCP=Group with the ability to approve leave requests
-ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last automatic update of leaves allocation
-UpdateConfCPOK=Updated successfully.
-ErrorUpdateConfCP=An error occurred during the update, please try again.
-AddCPforUsers=Please add the balance of leaves allocation of users by clicking here.
-DelayForSubmitCP=Deadline to make a leave requests
-AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of leave days added every month
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of leave request
-TitleOptionEventCP=Settings of leave requets for events
+GroupToValidateCP=Grupa ze zdolnością do zatwierdzenia wniosków urlopowych
+ConfirmConfigCP=Weryfikacja konfiguracji
+LastUpdateCP=Ostatni automatyczna aktualizacja alokacji liści
+UpdateConfCPOK=Zaktualizowane.
+ErrorUpdateConfCP=Wystąpił błąd podczas aktualizacji, spróbuj ponownie.
+AddCPforUsers=Proszę dodać równowagę liście przydziału użytkowników, klikając tutaj .
+DelayForSubmitCP=Ostateczny termin się zrobić wniosków urlopowych
+AlertapprobatortorDelayCP=Zapobiec approbator jeżeli żądanie urlopu nie odpowiada termin
+AlertValidatorDelayCP=Préevent na approbator jeżeli wniosek urlop przekroczyć opóźnienia
+AlertValidorSoldeCP=Zapobiec approbator jeżeli wniosek urlop przekroczyć salda
+nbUserCP=Liczba użytkowników obsługiwane w module Liści
+nbHolidayDeductedCP=Liczba dni urlopu do odliczenia za każdy dzień urlopu podjętej
+nbHolidayEveryMonthCP=Liczba dni urlopu co miesiąc dodaje
+Module27130Name= Zarządzanie wniosków urlopowych
+Module27130Desc= Zarządzanie wniosków urlopowych
+TitleOptionMainCP=Główne ustawienia żądanie urlopu
+TitleOptionEventCP=Ustawienia prośby w urlopu na imprezy
 ValidEventCP=Validate
-UpdateEventCP=Update events
+UpdateEventCP=Wydarzenia Aktualizuj
 CreateEventCP=Edytuj
-NameEventCP=Event name
-OkCreateEventCP=The addition of the event went well.
-ErrorCreateEventCP=Error creating the event.
-UpdateEventOkCP=The update of the event went well.
-ErrorUpdateEventCP=Error while updating the event.
-DeleteEventCP=Delete Event
-DeleteEventOkCP=The event has been deleted.
-ErrorDeleteEventCP=Error while deleting the event.
-TitleDeleteEventCP=Delete a exceptional leave
-TitleCreateEventCP=Create a exceptional leave
-TitleUpdateEventCP=Edit or delete a exceptional leave
+NameEventCP=Nazwa wydarzenia
+OkCreateEventCP=Dodanie przypadku poszło dobrze.
+ErrorCreateEventCP=Błąd tworzenia zdarzenia.
+UpdateEventOkCP=Aktualizacja przypadku poszło dobrze.
+ErrorUpdateEventCP=Błąd podczas aktualizacji zdarzenie.
+DeleteEventCP=Usuń zdarzenie
+DeleteEventOkCP=Impreza została usunięta.
+ErrorDeleteEventCP=Błąd podczas usuwania wydarzenia.
+TitleDeleteEventCP=Usuwanie wyjątkowy urlop
+TitleCreateEventCP=Stwórz wyjątkowe prawo
+TitleUpdateEventCP=Edytować lub usunąć w drodze wyjątku prawo
 DeleteEventOptionCP=Usunąć
 UpdateEventOptionCP=Uaktualnić
-ErrorMailNotSend=An error occurred while sending email:
-NoCPforMonth=No leave this month.
-nbJours=Number days
-TitleAdminCP=Configuration of Leaves
+ErrorMailNotSend=Wystąpił błąd podczas wysyłania wiadomości e-mail:
+NoCPforMonth=Nie opuścić ten miesiąc.
+nbJours=Liczba dni
+TitleAdminCP=Konfiguracja Liście
 #Messages
-Hello=Hello
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
-Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Hello=Halo
+HolidaysToValidate=Weryfikacja wniosków urlopowych
+HolidaysToValidateBody=Poniżej jest wniosek o dopuszczenie do sprawdzenia
+HolidaysToValidateDelay=Wniosek ten urlop odbędzie się w ciągu mniej niż% s dni.
+HolidaysToValidateAlertSolde=Użytkownik, który dokonał tego zostawić nie mają przesiał wniosek wystarczająco dostępne dni.
+HolidaysValidated=Zatwierdzone wnioski urlopowe
+HolidaysValidatedBody=Twoje zapytanie urlopu% s do% s został zatwierdzony.
+HolidaysRefused=Zapytanie zaprzeczył
+HolidaysRefusedBody=Twoje zapytanie urlopu dla% s do% s została odrzucona z następującego powodu:
+HolidaysCanceled=Anulowane liściasta wniosek
+HolidaysCanceledBody=Twoje zapytanie urlopu% s do% s została anulowana.
+Permission20000=Czytaj jesteś właścicielem wniosków urlopowych
+Permission20001=Tworzenie / modyfikowanie wniosków urlopowych
+Permission20002=Tworzenie / modyfikacja wniosków urlopowych dla wszystkich
+Permission20003=Usuń wniosków urlopowych
+Permission20004=Ustawienia dostępne użytkowników dni urlopu
+Permission20005=Dziennik Przegląd zmodyfikowanych wniosków urlopowych
+Permission20006=Przeczytaj pozostawia raport miesięczny
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 2361a900a14..96f1f87c958 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -156,7 +156,7 @@ LastStepDesc=Ostatni krok: Zdefiniuj tutaj nazwę i hasło, kt
 ActivateModule=Aktywuj moduł %s
 ShowEditTechnicalParameters=Kliknij tutaj, aby pokazać / edytować zaawansowane parametry (tryb ekspert)
 WarningUpgrade=Uwaga:\nPamiętaj o zrobieniu kopi zapasowej bazy!\nWysoko rekomendowane: dla przykładu,  podczas wystąpienia błędu w bazie danych systemu (dla przykładu w wersji 5.5.40 mySQL), niektóre dane lub tabele mogą zostać stracone podczas tego procesu. Rekomendowane jest by zrobic kopię swojej bazy przed migracją.\n\nNaciśnij OK by zacząć migrację...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+ErrorDatabaseVersionForbiddenForMigration=Twoja wersja bazy danych% s. Ma krytycznej utraty danych podejmowania błąd jeśli się zmianę struktury na bazie danych, tak jak jest to wymagane przez proces migracji. Na jego powodu migracji nie zostaną dopuszczone do aktualizacji bazy danych do wyższej wersji stałej (lista znanych wersji podsłuch:% s)
 
 #########
 # upgrade
diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang
index 4ab987ec5fb..558c43cd66a 100644
--- a/htdocs/langs/pl_PL/languages.lang
+++ b/htdocs/langs/pl_PL/languages.lang
@@ -10,10 +10,10 @@ Language_da_DA=Duński
 Language_da_DK=Duński
 Language_de_DE=Niemiecki
 Language_de_AT=Niemiecki (Austria)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Niemiecki (Szwajcaria)
 Language_el_GR=Grecki
 Language_en_AU=Angielski (Australia)
-Language_en_CA=English (Canada)
+Language_en_CA=Angielski (Kanada)
 Language_en_GB=Angielski (Zjednoczone Królestwo)
 Language_en_IN=Angielski (Indie)
 Language_en_NZ=Angielski (Nowa Zelandia)
@@ -21,9 +21,9 @@ Language_en_SA=Angielski (Arabia Saudyjska)
 Language_en_US=Angielski (Stany Zjednoczone)
 Language_en_ZA=Angielski (Republika Południowej Afryki)
 Language_es_ES=Hiszpański
-Language_es_DO=Spanish (Dominican Republic)
+Language_es_DO=Hiszpański (Dominikana)
 Language_es_AR=Hiszpański (Argentyna)
-Language_es_CL=Spanish (Chile)
+Language_es_CL=Hiszpański (Chile)
 Language_es_HN=Hiszpański (Honduras)
 Language_es_MX=Hiszpański (Meksyk)
 Language_es_PY=Hiszpański (Paragwaj)
@@ -41,7 +41,7 @@ Language_fr_NC=Francuski (Nowa Kaledonia)
 Language_he_IL=Hebrajski
 Language_hr_HR=Chorwacki
 Language_hu_HU=Węgierski
-Language_id_ID=Indonesian
+Language_id_ID=Indonezyjski
 Language_is_IS=Islandzki
 Language_it_IT=Włoski
 Language_ja_JP=Japoński
@@ -62,7 +62,7 @@ Language_tr_TR=Turecki
 Language_sl_SI=Słoweński
 Language_sv_SV=Szwedzki
 Language_sv_SE=Szwedzki
-Language_sq_AL=Albanian
+Language_sq_AL=Albański
 Language_sk_SK=Słowacki
 Language_th_TH=Tajski
 Language_uk_UA=Ukraiński
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index d1a930134f5..b02bff7a0d4 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -43,10 +43,10 @@ MailingStatusSentCompletely=Wysłane całkowicie
 MailingStatusError=Błąd
 MailingStatusNotSent=Nie wysłano
 MailSuccessfulySent=E-mail wysłany successfuly (od %s do %s)
-MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
-Unsuscribe=Unsubscribe
-MailingStatusNotContact=Don't contact anymore
+MailingSuccessfullyValidated=Wysyłanie pomyślnie zweryfikowane
+MailUnsubcribe=Wyrejestrowanie
+Unsuscribe=Wyrejestrowanie
+MailingStatusNotContact=Nie kontaktuj się więcej
 ErrorMailRecipientIsEmpty=E-mail odbiorcy jest pusty
 WarningNoEMailsAdded=Brak nowych wiadomości e-mail, aby dodać adres do listy.
 ConfirmValidMailing=Czy na pewno chcesz, aby potwierdzić tego e-maila?
@@ -73,31 +73,31 @@ DateLastSend=Data ostatniej wysyłanie
 DateSending=Data wysłania
 SentTo=Wysłane do %s
 MailingStatusRead=Czytać
-CheckRead=Read Receipt
-YourMailUnsubcribeOK=The email %s  is correctly unsubcribe from mailing list
-MailtoEMail=Hyper link to email
-ActivateCheckRead=Allow to use the "Unsubcribe" link
-ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcribe" feature
-EMailSentToNRecipients=EMail sent to %s recipients.
-XTargetsAdded=%s recipients added into target list
-EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
-MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s)
-SendRemind=Send reminder by EMails
-RemindSent=%s reminder(s) sent
-AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
-NoRemindSent=No EMail reminder sent
-ResultOfMassSending=Result of mass EMail reminders sending
+CheckRead=Czytaj Otrzymanie
+YourMailUnsubcribeOK=E-mail% s jest prawidłowo unsubcribe z listy mailingowej
+MailtoEMail=Hyper link e-mail
+ActivateCheckRead=Pozwól, aby skorzystać z linku "Unsubcribe"
+ActivateCheckReadKey=Klucz do szyfrowania wykorzystanie wykorzystanie URL dla "Czytaj Pokwitowanie" oraz funkcja "Unsubcribe"
+EMailSentToNRecipients=Napisz e-mail wysłany do% s odbiorców.
+XTargetsAdded=% s dodany do listy odbiorców docelowych
+EachInvoiceWillBeAttachedToEmail=Dokument za pomocą domyślnej faktury szablon dokumentu będą tworzone i dołączone do każdego maila.
+MailTopicSendRemindUnpaidInvoices=Przypomnienie faktury% s (% s)
+SendRemind=Wyślij przypomnienie poprzez e-maile
+RemindSent=Przypominamy% s (e) wysłany
+AllRecipientSelectedForRemind=Zaznacz wszystkie thirdparties i jeśli e-mail jest ustawiony (zauważ, że jeden elektronicznej za faktury będą wysyłane)
+NoRemindSent=Bez przypomnienia e-mail wysłany
+ResultOfMassSending=Wynik przypomnienia masowe wysyłanie wiadomości e-mail
 
 # Libelle des modules de liste de destinataires mailing
 MailingModuleDescContactCompanies=Kontakty wszystkich stron trzecich (klienta, perspektywa, dostawca, ...)
 MailingModuleDescDolibarrUsers=Wszystkie Dolibarr użytkownikom wiadomości e-mail
 MailingModuleDescFundationMembers=Fundacja użytkowników z e-maili
 MailingModuleDescEmailsFromFile=E-maile z pliku tekstowego (e-mail, imię, nazwisko)
-MailingModuleDescEmailsFromUser=EMails from user input (email;lastname;firstname;other)
+MailingModuleDescEmailsFromUser=E-maili od danych wejściowych użytkownika (e-mail; Nazwisko; imię, inne)
 MailingModuleDescContactsCategories=Kontakty wszystkich stron trzecich (według kategorii)
 MailingModuleDescDolibarrContractsLinesExpired=Trzecim minął zamówienia linie
 MailingModuleDescContactsByCompanyCategory=Kontakt trzecich (przez osoby trzecie kategoria)
-MailingModuleDescContactsByCategory=Contacts/addresses of third parties by category
+MailingModuleDescContactsByCategory=Kontakt / adresy stron trzecich według kategorii
 MailingModuleDescMembersCategories=Członkowie Fundacji (o kategorie)
 MailingModuleDescContactsByFunction=Kontakt trzecich (według pozycji / funkcji)
 LineInFile=Linia w pliku %s
@@ -112,30 +112,32 @@ SearchAMailing=Szukaj mailowych
 SendMailing=Wyślij e-maila
 SendMail=Wyślij e-mail
 SentBy=Wysłane przez
-MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
+MailingNeedCommand=Ze względów bezpieczeństwa, wysyłając e-maila jest lepiej, gdy wykonywane z linii poleceń. Jeśli masz, poproś administratora serwera, aby uruchomić następujące polecenie, aby wysłać e-maila do wszystkich odbiorców:
 MailingNeedCommand2=Możesz jednak wysłać je w sieci poprzez dodanie parametru MAILING_LIMIT_SENDBYWEB o wartości max liczba wiadomości e-mail, który chcesz wysłać przez sesji.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session.
+ConfirmSendingEmailing=Jeśli nie możesz lub preferują wysyłanie ich z przeglądarki www, prosimy o potwierdzenie jesteś pewien, że chcesz wysłać e-maila teraz z przeglądarki?
+LimitSendingEmailing=Uwaga: Wysyłanie Emailings z interfejsu WWW jest wykonywana w kilku czasach ze względów bezpieczeństwa oraz limitu czasu,% s odbiorców jednocześnie dla każdej sesji wysyłającego.
 TargetsReset=Wyczyść listę
 ToClearAllRecipientsClickHere=Aby wyczyścić odbiorców tego e-maila na listę, kliknij przycisk
 ToAddRecipientsChooseHere=Aby dodać odbiorców, wybierz w tych wykazach
 NbOfEMailingsReceived=Masa emailings otrzymała
-NbOfEMailingsSend=Mass emailings sent
+NbOfEMailingsSend=Masowe Emailings wysłane
 IdRecord=ID rekordu
 DeliveryReceipt=Odbiór dostawy
 YouCanUseCommaSeparatorForSeveralRecipients=Możesz używać przecinka separator określić kilku odbiorców.
-TagCheckMail=Track mail opening
-TagUnsubscribe=Unsubscribe link
-TagSignature=Signature sending user
-TagMailtoEmail=Recipient EMail
+TagCheckMail=Utwór otwierający elektronicznej
+TagUnsubscribe=Wypisz odnośnik
+TagSignature=Podpis wysyłania użytkownika
+TagMailtoEmail=E-mail odbiorcy
 # Module Notifications
 Notifications=Powiadomienia
 NoNotificationsWillBeSent=Brak powiadomień e-mail są planowane dla tego wydarzenia i spółka
 ANotificationsWillBeSent=1 zgłoszenie zostanie wysłane pocztą elektroniczną
 SomeNotificationsWillBeSent=%s powiadomienia będą wysyłane przez e-mail
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active email notification targets
+AddNewNotification=Aktywuj nowy cel powiadomienia e-mail
+ListOfActiveNotifications=Lista wszystkich aktywnych celów powiadomienia e-mail
 ListOfNotificationsDone=Lista wszystkich powiadomień e-mail wysłany
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
-MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+MailSendSetupIs=Konfiguracja poczty e-mail wysyłającego musi być połączone z '% s'. Tryb ten może być wykorzystywany do wysyłania masowego wysyłania.
+MailSendSetupIs2=Najpierw trzeba przejść, z konta administratora, w menu% sHome - Ustawienia - e-maile% s, aby zmienić parametr '% s' na tryb '% s' używać. W tym trybie można wprowadzić ustawienia serwera SMTP dostarczonych przez usługodawcę internetowego i używać funkcji e-maila Mszę św.
+MailSendSetupIs3=Jeśli masz jakieś pytania na temat jak skonfigurować serwer SMTP, możesz poprosić o% s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index cec0f69b646..28fd1461784 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -141,7 +141,7 @@ Cancel=Zrezygnuj
 Modify=Modyfikuj
 Edit=Edytuj
 Validate=Potwierdz
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Weryfikacja i zatwierdzanie
 ToValidate=Aby potwierdzić
 Save=Zapisać
 SaveAs=Zapisz jako
@@ -159,7 +159,7 @@ Search=Wyszukaj
 SearchOf=Szukaj
 Valid=Aktualny
 Approve=Zatwierdź
-Disapprove=Disapprove
+Disapprove=Potępiać
 ReOpen=Otwórz ponownie
 Upload=Wyślij plik
 ToLink=Łącze
@@ -221,7 +221,7 @@ Cards=Kartki
 Card=Karta
 Now=Teraz
 Date=Data
-DateAndHour=Date and hour
+DateAndHour=Data i godzina
 DateStart=Data rozpoczęcia
 DateEnd=Data zakończenia
 DateCreation=Data utworzenia
@@ -298,7 +298,7 @@ UnitPriceHT=Cena jednostkowa (netto)
 UnitPriceTTC=Cena jednostkowa
 PriceU=cen/szt.
 PriceUHT=cen/szt (netto)
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=PU HT Zamówiony
 PriceUTTC=cena/szt.
 Amount=Ilość
 AmountInvoice=Kwota faktury
@@ -352,6 +352,7 @@ Status=Stan
 Favorite=Ulubiony
 ShortInfo=Info.
 Ref=Nr ref.
+ExternalRef=Ref. extern
 RefSupplier=Nr ref. Dostawca
 RefPayment=Nr ref. płatności
 CommercialProposalsShort=Propozycje komercyjne
@@ -394,8 +395,8 @@ Available=Dostępny
 NotYetAvailable=Nie są jeszcze dostępne
 NotAvailable=Niedostępne
 Popularity=Popularność
-Categories=Kategorie
-Category=Kategoria
+Categories=Tags/categories
+Category=Tag/category
 By=Przez
 From=Od
 to=do
@@ -525,7 +526,7 @@ DateFromTo=Z %s do %s
 DateFrom=Z %s
 DateUntil=Dopuki %s
 Check=Sprawdzić
-Uncheck=Uncheck
+Uncheck=Usuń zaznaczenie pola wyboru
 Internal=Wewnętrzne
 External=Zewnętrzne
 Internals=Wewnętrzne
@@ -693,7 +694,8 @@ PublicUrl=Publiczny URL
 AddBox=Dodaj skrzynke
 SelectElementAndClickRefresh=Zaznacz element i kliknij Odśwież
 PrintFile=Wydrukuj plik %s
-ShowTransaction=Show transaction
+ShowTransaction=Pokaż transakcji
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Poniedziałek
 Tuesday=Wtorek
diff --git a/htdocs/langs/pl_PL/margins.lang b/htdocs/langs/pl_PL/margins.lang
index d6822f8b2c9..e15937923ee 100644
--- a/htdocs/langs/pl_PL/margins.lang
+++ b/htdocs/langs/pl_PL/margins.lang
@@ -1,45 +1,45 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
-UserMargins=User margins
+Margin=Margines
+Margins=Marże
+TotalMargin=Razem Margines
+MarginOnProducts=Margin / Produkty
+MarginOnServices=Margin / Usługi
+MarginRate=Stopa marży
+MarkRate=Stawka Mark
+DisplayMarginRates=Stawki marży wyświetlacz
+DisplayMarkRates=Stawki znaków wyświetlanych
+InputPrice=Cena wejściowa
+margin=Zarządzanie marże
+margesSetup=Marże ustawień zarządzania
+MarginDetails=Szczegóły marginesów
+ProductMargins=Marginesy produktu
+CustomerMargins=Marginesy klientów
+SalesRepresentativeMargins=Sprzedaż marże reprezentatywne
+UserMargins=Marginesy użytkownika
 ProductService=Produkt lub usługa
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
+AllProducts=Wszystkie produkty i usługi
+ChooseProduct/Service=Wybierz produkt lub usługę
 StartDate=Data rozpoczęcia
 EndDate=Data zakończenia
 Launch=Start
-ForceBuyingPriceIfNull=Force buying price if null
-ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Margin type
-MargeBrute=Raw margin
-MargeNette=Net margin
-MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price
    Net margin : Selling price - Cost price
-CostPrice=Cost price
-BuyingCost=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
+ForceBuyingPriceIfNull=Siła cena skupu, jeżeli wartość null
+ForceBuyingPriceIfNullDetails=jeśli "ON", marża będzie zero na linii (zakup cenę = cena sprzedaży), w przeciwnym razie ("OFF"), Marge będzie równa cena sprzedaży (cena zakupu = 0)
+MARGIN_METHODE_FOR_DISCOUNT=Metoda marży dla globalnych zniżki
+UseDiscountAsProduct=Jako produkt
+UseDiscountAsService=Jako usługa
+UseDiscountOnTotal=Na podsumy
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Określa, czy globalne rabatu jest traktowana jako produktu, usługi lub tylko na sumy częściowej obliczania marży.
+MARGIN_TYPE=Typ marża
+MargeBrute=Raw marża
+MargeNette=Rentowność netto
+MARGIN_TYPE_DETAILS=Raw margin: Cena sprzedaży - cena zakupu 
     Rentowność netto: Cena sprzedaży - cena kosztów
+CostPrice=Cena fabryczna
+BuyingCost=Cena fabryczna
+UnitCharges=Koszty jednostkowe
+Charges=Opłaty
+AgentContactType=Przedstawiciel handlowy typ kontaktu
+AgentContactTypeDetails=Zdefiniować, jaki rodzaj (związane na fakturach) kontaktowe będą wykorzystywane do raportu marży na reprezentatywną sprzedaż
+rateMustBeNumeric=Stawka musi być wartością liczbową
+markRateShouldBeLesserThan100=Stopa znak powinien być niższy niż 100
+ShowMarginInfos=Pokaż informacje o marżę
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index ec066499c2c..d2e8dfa1c5f 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -8,7 +8,7 @@ Members=Członkowie
 MemberAccount=Member Login
 ShowMember=Pokaż Państwa karty
 UserNotLinkedToMember=Użytkownik nie wiąże się z członkiem
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Innej firmy nie związane z członkiem
 MembersTickets=Członkowie Bilety
 FundationMembers=Fundacja użytkowników
 Attributs=Atrybuty
@@ -85,7 +85,7 @@ SubscriptionLateShort=Późno
 SubscriptionNotReceivedShort=Nigdy nie otrzymała
 ListOfSubscriptions=Lista subskrypcji
 SendCardByMail=Wyślij kartę
-AddMember=Create member
+AddMember=Tworzenie elementu
 NoTypeDefinedGoToSetup=Żaden członek typów zdefiniowanych. Przejdź do konfiguracji - Członkowie typy
 NewMemberType=Nowy członek typu
 WelcomeEMail=Zapraszamy e-mail
@@ -125,12 +125,12 @@ Date=Data
 DateAndTime=Data i czas
 PublicMemberCard=Państwa publiczne karty
 MemberNotOrNoMoreExpectedToSubscribe=Państwa nie są lub nie oczekuje, aby subskrybować
-AddSubscription=Create subscription
+AddSubscription=Tworzenie subskrypcji
 ShowSubscription=Pokaż subskrypcji
 MemberModifiedInDolibarr=Państwa zmodyfikowany w Dolibarr
 SendAnEMailToMember=Wyślij e-mail informacji na członka
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Temat wiadomości e-mail otrzymane w przypadku automatycznego napisem gość
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail otrzymane w przypadku automatycznego napisem gość
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Temat wiadomości dla członka autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=E-mail dotyczące członka autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=EMail temat członkiem walidacji
@@ -141,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=EMail temat członka resiliation
 DescADHERENT_MAIL_RESIL=EMail dla członka resiliation
 DescADHERENT_MAIL_FROM=Nadawca wiadomości e-mail do automatycznych wiadomości e-mail
 DescADHERENT_ETIQUETTE_TYPE=Etykiety formacie
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Tekst drukowany na arkuszach adresowych członkiem
 DescADHERENT_CARD_TYPE=Format karty stronę
 DescADHERENT_CARD_HEADER_TEXT=Tekst wydrukowany na górę członka karty
 DescADHERENT_CARD_TEXT=Tekst wydrukowany na członka karty
@@ -155,7 +155,7 @@ NoThirdPartyAssociatedToMember=Nr trzeciej związane do tego członka
 ThirdPartyDolibarr=Dolibarr trzeciej
 MembersAndSubscriptions= Członkowie i Subscriptions
 MoreActions=Działanie uzupełniające na nagrywanie
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Działania uzupełniające, zasugerował domyślnie podczas nagrywania abonament
 MoreActionBankDirect=Stworzenie bezpośredniego zapisu na rachunku transakcji
 MoreActionBankViaInvoice=Tworzenie faktury i wpłaty na rachunek
 MoreActionInvoiceOnly=Tworzenie faktury bez zapłaty
@@ -170,8 +170,8 @@ LastSubscriptionAmount=Ostatnio kwota subskrypcji
 MembersStatisticsByCountries=Użytkownicy statystyki według kraju
 MembersStatisticsByState=Użytkownicy statystyki na State / Province
 MembersStatisticsByTown=Użytkownicy statystyki na miasto
-MembersStatisticsByRegion=Members statistics by region
-MemberByRegion=Members by region
+MembersStatisticsByRegion=Użytkownicy statystyki regionu
+MemberByRegion=Członków w regionie
 NbOfMembers=Liczba członków
 NoValidatedMemberYet=Żadna potwierdzona znaleziono użytkowników
 MembersByCountryDesc=Ten ekran pokaże statystyki członków przez poszczególne kraje. Graficzny zależy jednak na Google usługi online grafów i jest dostępna tylko wtedy, gdy połączenie internetowe działa.
@@ -197,10 +197,10 @@ Collectivités=Organizacje
 Particuliers=Osobisty
 Entreprises=Firmy
 DOLIBARRFOUNDATION_PAYMENT_FORM=Aby dokonać płatności abonamentu za pomocą przelewu bankowego, patrz strona http://wiki.dolibarr.org/index.php/Subscribe~~dobj . 
     Aby zapłacić za pomocą karty kredytowej lub PayPal, kliknij przycisk na dole tej strony. 
    
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+ByProperties=Według cech
+MembersStatisticsByProperties=Użytkownicy statystyki cech
+MembersByNature=Użytkownicy z natury
+VATToUseForSubscriptions=Stawka VAT użyć do subskrypcji
+NoVatOnSubscription=Nie TVA subskrypcji
+MEMBER_PAYONLINE_SENDEMAIL=E-mail, aby ostrzec, gdy Dolibarr otrzymać potwierdzenie zatwierdzonej płatności subskrypcji
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt stosowany do linii subskrypcji do faktury:% s
diff --git a/htdocs/langs/pl_PL/opensurvey.lang b/htdocs/langs/pl_PL/opensurvey.lang
index 67f78996af0..e0bc3eeaa4c 100644
--- a/htdocs/langs/pl_PL/opensurvey.lang
+++ b/htdocs/langs/pl_PL/opensurvey.lang
@@ -1,66 +1,66 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-# Survey=Poll
-# Surveys=Polls
-# OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll...
-# NewSurvey=New poll
-# NoSurveysInDatabase=%s poll(s) into database.
-# OpenSurveyArea=Polls area
-# AddACommentForPoll=You can add a comment into poll...
-# AddComment=Add comment
-# CreatePoll=Create poll
-# PollTitle=Poll title
-# ToReceiveEMailForEachVote=Receive an email for each vote
-# TypeDate=Type date
-# TypeClassic=Type standard
-# OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-# RemoveAllDays=Remove all days
-# CopyHoursOfFirstDay=Copy hours of first day
-# RemoveAllHours=Remove all hours
-# SelectedDays=Selected days
-# TheBestChoice=The best choice currently is
-# TheBestChoices=The best choices currently are
-# with=with
-# OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-# CommentsOfVoters=Comments of voters
-# ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-# RemovePoll=Remove poll
-# UrlForSurvey=URL to communicate to get a direct access to poll
-# PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-# CreateSurveyDate=Create a date poll
-# CreateSurveyStandard=Create a standard poll
-# CheckBox=Simple checkbox
-# YesNoList=List (empty/yes/no)
-# PourContreList=List (empty/for/against)
-# AddNewColumn=Add new column
-# TitleChoice=Choice label
-# ExportSpreadsheet=Export result spreadsheet
+Survey=Głosowanie
+Surveys=Ankiety
+OrganizeYourMeetingEasily=Organizowanie spotkań i ankiet łatwo. Najpierw wybierz rodzaj ankiety ...
+NewSurvey=Nowa sonda
+NoSurveysInDatabase=% s ankieta (e) do bazy danych.
+OpenSurveyArea=Obszar ankiety
+AddACommentForPoll=Możesz dodać komentarz do ankiety ...
+AddComment=Dodaj komentarz
+CreatePoll=Tworzenie ankiety
+PollTitle=Tytuł Sonda
+ToReceiveEMailForEachVote=Otrzymasz e-mail dla każdego głosowania
+TypeDate=Data Rodzaj
+TypeClassic=Typ standardowy
+OpenSurveyStep2=Wybierz daty amoung wolnych dni (szary). Wybrane dni są zielone. Możesz odznaczyć dzień wcześniej wybrany przez kliknięcie na nim ponownie
+RemoveAllDays=Usuń wszystkie dni
+CopyHoursOfFirstDay=Godziny rozpowszechnianie pierwszego dnia
+RemoveAllHours=Usuń wszystkie godziny
+SelectedDays=Wybrane dni
+TheBestChoice=Obecnie jest najlepszym wyborem
+TheBestChoices=Najlepszym wyborem są obecnie
+with=z
+OpenSurveyHowTo=Jeśli zgadzasz się głosować w tej ankiecie musisz podać swoje imię, wybrać wartości, które pasują najlepiej dla Ciebie i zatwierdź przyciskiem powiększonej na końcu linii.
+CommentsOfVoters=Komentarze wyborców
+ConfirmRemovalOfPoll=Czy na pewno chcesz usunąć tę ankietę (i wszystkich głosów)
+RemovePoll=Usuń ankieta
+UrlForSurvey=Adres URL do komunikowania się, aby uzyskać bezpośredni dostęp do sondowania
+PollOnChoice=Tworzysz ankietę zrobić testowych na ankiecie. Wprowadź wszystkie możliwe opcje do ankiety:
+CreateSurveyDate=Tworzenie datę ankieta
+CreateSurveyStandard=Tworzenie standardowej ankieta
+CheckBox=Proste pole
+YesNoList=Lista (pusty / tak / nie)
+PourContreList=Lista (pusty / za / przeciw)
+AddNewColumn=Dodaj nową kolumnę
+TitleChoice=Etykieta wybór
+ExportSpreadsheet=Wynik Eksport arkusza kalkulacyjnego
 ExpireDate=Limit daty
-# NbOfSurveys=Number of polls
-# NbOfVoters=Nb of voters
-# SurveyResults=Results
-# PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-# 5MoreChoices=5 more choices
-# Abstention=Abstention
-# Against=Against
-# YouAreInivitedToVote=You are invited to vote for this poll
-# VoteNameAlreadyExists=This name was already used for this poll
-# ErrorPollDoesNotExists=Error, poll %s does not exists.
-# OpenSurveyNothingToSetup=There is no specific setup to do.
-# PollWillExpire=Your poll will expire automatically %s days after the last date of your poll.
-# AddADate=Add a date
-# AddStartHour=Add start hour
-# AddEndHour=Add end hour
-# votes=vote(s)
-# NoCommentYet=No comments have been posted for this poll yet
-# CanEditVotes=Can change vote of others
-# CanComment=Voters can comment in the poll
-# CanSeeOthersVote=Voters can see other people's vote
-# SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
    - empty,
    - "8h", "8H" or "8:00" to give a meeting's start hour,
    - "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
    - "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-# BackToCurrentMonth=Back to current month
-# ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-# ErrorOpenSurveyOneChoice=Enter at least one choice
-# ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD
-# ErrorInsertingComment=There was an error while inserting your comment
-# MoreChoices=Enter more choices for the voters
-# SurveyExpiredInfo=The voting time of this poll has expired.
-# EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+NbOfSurveys=Liczba ankietach
+NbOfVoters=Nb wyborców
+SurveyResults=Wyniki
+PollAdminDesc=Masz możliwość zmiany wszystkich linii ankiecie uznali tego za pomocą przycisku "Edytuj". Można, jak również, usunąć kolumnę lub wiersz z% s. Możesz również dodać nową kolumnę z% s.
+5MoreChoices=5 więcej możliwości
+Abstention=Wstrzymanie się od głosu
+Against=Przed
+YouAreInivitedToVote=Zapraszamy do głosowania na tej sondzie
+VoteNameAlreadyExists=Nazwa ta była już wykorzystana w tej sondzie
+ErrorPollDoesNotExists=Błąd, ankieta% s nie istnieje.
+OpenSurveyNothingToSetup=Nie ma określonej konfiguracji zrobić.
+PollWillExpire=Twoja ankieta automatycznie wygaśnie,% s dni po ostatnim dniu swojej ankiecie.
+AddADate=Dodaj datę
+AddStartHour=Dodaj rozpoczęcia godzinę
+AddEndHour=Dodaj końcową godzinę
+votes=głos (y)
+NoCommentYet=Brak dodanych komentarzy dla tej ankiecie jeszcze
+CanEditVotes=Może zmienić głos innych
+CanComment=Wyborcy mogą wypowiedzieć się w ankiecie
+CanSeeOthersVote=Wyborcy widzą głos innych ludzi
+SelectDayDesc=Dla każdego wybranego dnia, można wybrać, czy nie, godzina spotkania w następującym formacie: 
     - Pusty, 
     - "8h", "8H" lub "08:00" dać zgromadzenie rozpoczęcia godzinę, 
     - "11/08", "8h-11h", "8H-11H" lub "8: 00-11: 00", aby dać spotkanie za godzinę rozpoczęcia i zakończenia, 
     - "8h15-11h15", "8H15-11H15" lub "8: 15-11: 15" za to samo, ale z minuty.
+BackToCurrentMonth=Powrót do bieżącego miesiąca
+ErrorOpenSurveyFillFirstSection=Nie zapełnione pierwszą część tworzenia ankiecie
+ErrorOpenSurveyOneChoice=Wprowadź co najmniej jeden wybór
+ErrorOpenSurveyDateFormat=Data musi mieć formacie YYYY-MM-DD
+ErrorInsertingComment=Wystąpił błąd podczas wstawiania komentarz
+MoreChoices=Wprowadź więcej możliwości dla wyborców
+SurveyExpiredInfo=Głosowanie w tej sondzie wygasł.
+EmailSomeoneVoted=% S napełnił linię. Możesz znaleźć ankietę na link:% s
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index 86ff6886783..2839701ef3c 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -2,7 +2,7 @@
 OrdersArea=Klienci dziedzinie zamówień
 SuppliersOrdersArea=Dostawcy dziedzinie zamówień
 OrderCard=Zamów kartę
-OrderId=Order Id
+OrderId=Zamówienie Id
 Order=Porządek
 Orders=Zamówienia
 OrderLine=Zamówienie linii
@@ -16,20 +16,20 @@ SupplierOrder=Dostawca celu
 SuppliersOrders=Dostawcy zleceń
 SuppliersOrdersRunning=Aktualna dostawców zleceń
 CustomerOrder=Zamówieniem
-CustomersOrders=Customers orders
+CustomersOrders=Zamówienia klientów
 CustomersOrdersRunning=Aktualna klientów zleceń
 CustomersOrdersAndOrdersLines=Zamówień i zleceń linii
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
+OrdersToValid=Zamówienia klientów, aby potwierdzić
+OrdersToBill=Zamówienia klientów są dostarczane
+OrdersInProcess=Zamówienia klientów w procesie
+OrdersToProcess=Zamówienia klientów na przetwarzanie
 SuppliersOrdersToProcess=Dostawcy zamówienia na przetwarzanie
 StatusOrderCanceledShort=Odwołany
 StatusOrderDraftShort=Szkic
 StatusOrderValidatedShort=Zatwierdzona
 StatusOrderSentShort=W procesie
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
+StatusOrderSent=Wysyłka w procesie
+StatusOrderOnProcessShort=Zamówione
 StatusOrderProcessedShort=Przetworzone
 StatusOrderToBillShort=Do rachunku
 StatusOrderToBill2Short=Do rachunku
@@ -41,8 +41,8 @@ StatusOrderReceivedAllShort=Wszystko otrzymała
 StatusOrderCanceled=Odwołany
 StatusOrderDraft=Projekt (musi zostać zatwierdzone)
 StatusOrderValidated=Zatwierdzona
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcess=Zamówione - odbiór czuwania
+StatusOrderOnProcessWithValidation=Zamówione - odbiór lub walidacji czuwania
 StatusOrderProcessed=Przetworzone
 StatusOrderToBill=Do rachunku
 StatusOrderToBill2=Do rachunku
@@ -51,32 +51,33 @@ StatusOrderRefused=Odmowa
 StatusOrderReceivedPartially=Częściowo otrzymała
 StatusOrderReceivedAll=Wszystko otrzymała
 ShippingExist=Przesyłka istnieje
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ProductQtyInDraft=Ilość produktów w projektach zamówień
+ProductQtyInDraftOrWaitingApproved=Ilość produktów w projekcie lub zatwierdzonych zamówień, jeszcze nie zamówione
 DraftOrWaitingApproved=Projekt nie został jeszcze zatwierdzony lub sortowane
 DraftOrWaitingShipped=Projekt lub zatwierdzonych jeszcze nie wysłane
 MenuOrdersToBill=Zamówienia na rachunku
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Rozliczanych zamówienia
 SearchOrder=Szukaj celu
-SearchACustomerOrder=Search a customer order
-SearchASupplierOrder=Search a supplier order
+SearchACustomerOrder=Szukaj zamówienie klienta
+SearchASupplierOrder=Szukaj zlecenie dostawców
 ShipProduct=Statek produktu
 Discount=Rabat
 CreateOrder=Tworzenie Zamówienie
 RefuseOrder=Odmówić celu
-ApproveOrder=Akceptuj zamówienie
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Sprawdź zamówienie
 UnvalidateOrder=Unvalidate zamówienie
 DeleteOrder=Usuń zamówienie
 CancelOrder=Anulować zamówienie
-AddOrder=Create order
+AddOrder=Tworzenie zamówienia
 AddToMyOrders=Dodaj do mojego zamówienia
 AddToOtherOrders=Dodaj do zamówienia
-AddToDraftOrders=Add to draft order
+AddToDraftOrders=Dodaj do projektu porządku
 ShowOrder=Pokaż zamówienie
 NoOpenedOrders=Nie otworzył zamówień
 NoOtherOpenedOrders=Żadne inne otwarte zamówienia
-NoDraftOrders=No draft orders
+NoDraftOrders=Brak projektów zamówienia
 OtherOrders=Inne zamówienia
 LastOrders=Ostatnia %s zamówień
 LastModifiedOrders=Ostatnia %s zmodyfikowane zamówień
@@ -86,7 +87,7 @@ NbOfOrders=Liczba zleceń
 OrdersStatistics=Zamówienia statystyk
 OrdersStatisticsSuppliers=Dostawca zamówień statystyk
 NumberOfOrdersByMonth=Liczba zleceń przez miesiąc
-AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Ilość zamówień na miesiąc (po odliczeniu podatku)
 ListOfOrders=Lista zamówień
 CloseOrder=Zamknij celu
 ConfirmCloseOrder=Czy na pewno chcesz zamknąć to zamówienie? Gdy zamówienie jest zamknięta, to może być rozliczone.
@@ -97,11 +98,13 @@ ConfirmUnvalidateOrder=Czy na pewno chcesz przywrócić %s zamówień ze
 ConfirmCancelOrder=Czy na pewno chcesz anulować zamówienie?
 ConfirmMakeOrder=Czy na pewno chcesz, aby potwierdzić wprowadzone tym celu na %s?
 GenerateBill=Generowanie faktur
-ClassifyShipped=Classify delivered
+ClassifyShipped=Klasyfikowania dostarczane
 ClassifyBilled=Klasyfikacja "obciążonego"
 ComptaCard=Księgowość karty
 DraftOrders=Projekt zamówień
 RelatedOrders=Podobne zamówienia
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Na proces zamówienia
 RefOrder=Nr ref. porządek
 RefCustomerOrder=Nr ref. zamówieniem
@@ -118,6 +121,7 @@ PaymentOrderRef=Płatność celu %s
 CloneOrder=Clone celu
 ConfirmCloneOrder=Czy na pewno chcesz klon tej kolejności %s?
 DispatchSupplierOrder=%s Odbiór aby dostawca
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Przedstawiciela w ślad za zamówienie klienta
 TypeContact_commande_internal_SHIPPING=Przedstawiciela w ślad za koszty
@@ -134,7 +138,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Stała COMMANDE_SUPPLIER_ADDON nie zdef
 Error_COMMANDE_ADDON_NotDefined=Stała COMMANDE_ADDON nie zdefiniowane
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Nie można załadować modułu pliku ' %s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Nie można załadować modułu pliku ' %s'
-Error_OrderNotChecked=No orders to invoice selected
+Error_OrderNotChecked=Zlecenia do faktury wybrane
 # Sources
 OrderSource0=Commercial wniosku
 OrderSource1=Internet
@@ -148,19 +152,19 @@ AddDeliveryCostLine=Dodaj dostawy koszt linii wskazujące wagi zamówienia
 # Documents models
 PDFEinsteinDescription=Pełna kolejność modelu (logo. ..)
 PDFEdisonDescription=Prosty model celu
-PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=Pełna faktura proforma (logo ...)
 # Orders modes
 OrderByMail=Poczta
 OrderByFax=Faks
 OrderByEMail=EMail
 OrderByWWW=Online
 OrderByPhone=Telefon
-CreateInvoiceForThisCustomer=Bill orders
-NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
-Ordered=Ordered
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Zamówienia na banknoty
+NoOrdersToInvoice=Brak zleceń rozliczanych
+CloseProcessedOrdersAutomatically=Sklasyfikować "przetwarzane" wszystkie wybrane zamówienia.
+OrderCreation=Stworzenie Zamówienie
+Ordered=Zamówione
+OrderCreated=Twoje zamówienia zostały utworzone
+OrderFail=Błąd podczas tworzenia się zamówień
+CreateOrders=Tworzenie zamówienia
+ToBillSeveralOrderSelectCustomer=Aby utworzyć fakturę za kilka rzędów, kliknij pierwszy na klienta, a następnie wybrać "% s".
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index fb8f7bab39f..3ab98cdaba6 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -9,64 +9,65 @@ DateToBirth=Data urodzenia
 BirthdayAlertOn= urodziny wpisu aktywnych
 BirthdayAlertOff= urodziny wpisu nieaktywne
 Notify_FICHINTER_VALIDATE=Validate interwencji
-Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
+Notify_FICHINTER_SENTBYMAIL=Interwencja wysyłane pocztą
 Notify_BILL_VALIDATE=Sprawdź rachunki
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_UNVALIDATE=Faktura klienta nie- zwalidowane
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Dostawca celu zatwierdzone
 Notify_ORDER_SUPPLIER_REFUSE=Dostawca odmówił celu
 Notify_ORDER_VALIDATE=Zamówienie Klienta potwierdzone
 Notify_PROPAL_VALIDATE=Oferta klienta potwierdzona
-Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
+Notify_PROPAL_CLOSE_SIGNED=Zamknięte podpisane PROPAL klienta
+Notify_PROPAL_CLOSE_REFUSED=PROPAL klienta zamknięte odmówił
 Notify_WITHDRAW_TRANSMIT=Wycofanie transmisji
 Notify_WITHDRAW_CREDIT=Wycofanie kredyt
 Notify_WITHDRAW_EMIT=Wycofanie Isue
 Notify_ORDER_SENTBYMAIL=Zamówienie klienta wysyłane pocztą
 Notify_COMPANY_CREATE=Trzeciej stworzone
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_SENTBYMAIL=Maile wysyłane z karty przez osoby trzecie
 Notify_PROPAL_SENTBYMAIL=Gospodarczy wniosek przesłany pocztą
 Notify_BILL_PAYED=Klient zapłaci faktury
 Notify_BILL_CANCEL=Faktury klienta odwołany
 Notify_BILL_SENTBYMAIL=Faktury klienta wysyłane pocztą
-Notify_ORDER_SUPPLIER_VALIDATE=Aby zatwierdzone Dostawca
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Aby dostawca wysłane pocztą
 Notify_BILL_SUPPLIER_VALIDATE=Faktura dostawca zatwierdzone
 Notify_BILL_SUPPLIER_PAYED=Dostawca zapłaci faktury
 Notify_BILL_SUPPLIER_SENTBYMAIL=Faktura dostawca wysłane pocztą
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=Dostawca anulowania faktury
 Notify_CONTRACT_VALIDATE=Umowa zatwierdzona
 Notify_FICHEINTER_VALIDATE=Interwencja zatwierdzone
 Notify_SHIPPING_VALIDATE=Wysyłka zatwierdzone
 Notify_SHIPPING_SENTBYMAIL=Wysyłka wysłane pocztą
 Notify_MEMBER_VALIDATE=Członek zatwierdzone
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=Użytkownik zmodyfikowany
 Notify_MEMBER_SUBSCRIPTION=Członek subskrybowanych
 Notify_MEMBER_RESILIATE=Członek resiliated
 Notify_MEMBER_DELETE=Członek usunięte
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+Notify_PROJECT_CREATE=Stworzenie projektu
+Notify_TASK_CREATE=Utworzone zadanie
+Notify_TASK_MODIFY=Zmodyfikowane zadanie
+Notify_TASK_DELETE=Zadanie usunięte
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Liczba załączonych plików / dokumentów
 TotalSizeOfAttachedFiles=Całkowita wielkość załączonych plików / dokumentów
 MaxSize=Maksymalny rozmiar
 AttachANewFile=Załącz nowy plik / dokument
 LinkedObject=Związany obiektu
 Miscellaneous=Różne
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Liczba zgłoszeń (nb e-maili odbiorców)
 PredefinedMailTest=Dette er en test post. \\ NDe to linjer er atskilt med en vognretur.
 PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fet skrift). 
     De to linjene er skilt med en vognretur.
-PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
+PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Znajdziesz tu fakturę __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Chcielibyśmy ostrzec, że __FACREF__ faktura wydaje się nie jest wypłacana. Więc to jest faktura w załączniku znowu, jako przypomnienie. __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Znajdziesz tu propozycję handlową __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__ Znajdziesz tu wniosek cen __ASKREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Znajdziesz tu porządek __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Znajdziesz tu nasze zamówienie __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Znajdziesz tu fakturę __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendShipping=__CONTACTCIVNAME__ Znajdziesz tu wysyłkę __SHIPPINGREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__ Znajdziesz tu interwencji __FICHINTERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentThirdparty=__CONTACTCIVNAME__ __PERSONALIZED__ __SIGNATURE__
 DemoDesc=Dolibarr jest kompaktowym ERP / CRM złożona z kilku modułów funkcjonalnych. A demo, które zawiera wszystkie moduły nie oznacza nic, ponieważ nie występuje. Tak więc, kilka profili są dostępne demo.
 ChooseYourDemoProfil=Wybierz demo, które pasują do profilu działalności ...
 DemoFundation=Zarządzanie użytkowników o fundacji
@@ -81,16 +82,16 @@ ModifiedBy=Zmodyfikowane przez %s
 ValidatedBy=Zatwierdzona przez %s
 CanceledBy=Odwołany przez %s
 ClosedBy=Zamknięte przez %s
-CreatedById=User id who created
-ModifiedById=User id who made last change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made last change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
+CreatedById=ID użytkownika, który stworzył
+ModifiedById=ID użytkownika, który stworzył ostatnią zmianę
+ValidatedById=ID użytkownika, który zatwierdzony
+CanceledById=ID użytkownika, który anulowane
+ClosedById=ID użytkownika, który zamknięty
+CreatedByLogin=Nazwa użytkownika, który stworzył
+ModifiedByLogin=Nazwa użytkownika, który stworzył ostatnią zmianę
+ValidatedByLogin=Nazwa użytkownika, który zatwierdzony
+CanceledByLogin=Nazwa użytkownika, który anulowane
+ClosedByLogin=Nazwa użytkownika, który zamknięty
 FileWasRemoved=Plik został usunięty
 DirWasRemoved=Katalog został usunięty
 FeatureNotYetAvailableShort=Dostępne w następnej wersji
@@ -133,7 +134,7 @@ VolumeUnitdm3=dm3
 VolumeUnitcm3=cm3
 VolumeUnitmm3=mm3
 VolumeUnitfoot3=ft3
-VolumeUnitinch3=in3
+VolumeUnitinch3=cale3
 VolumeUnitounce=uncja
 VolumeUnitlitre=litr
 VolumeUnitgallon=galon
@@ -144,7 +145,7 @@ SizeUnitcm=cm
 SizeUnitmm=mm
 SizeUnitinch=cal
 SizeUnitfoot=stopa
-SizeUnitpoint=point
+SizeUnitpoint=punkt
 BugTracker=Bug tracker
 SendNewPasswordDesc=Ta forma pozwala na złożenie wniosku o nowe hasło. Będzie wyślij swój adres e-mail. 
     Zmiana będzie skuteczne dopiero po kliknięciu na link potwierdzający wewnątrz tej wiadomości. 
     Sprawdź pocztę czytnik oprogramowania.
 BackToLoginPage=Powrót do strony logowania
@@ -158,22 +159,23 @@ StatsByNumberOfEntities=Statystyki liczby podmiotów
 NumberOfProposals=Liczba wniosków o ostatnie 12 miesięcy
 NumberOfCustomerOrders=Liczba zamówień w ostatnich 12 miesięcy
 NumberOfCustomerInvoices=Liczba klientów faktury na ostatnie 12 miesięcy
-NumberOfSupplierOrders=Number of supplier orders on last 12 month
+NumberOfSupplierOrders=Liczba zamówień dostawców, na ostatniej 12 miesięcy
 NumberOfSupplierInvoices=Liczba dostawcy faktur na ostatnie 12 miesięcy
 NumberOfUnitsProposals=Antall enheter på forslag på siste 12 mnd
 NumberOfUnitsCustomerOrders=Liczba jednostek w sprawie zamówień na ostatnie 12 miesięcy
 NumberOfUnitsCustomerInvoices=Liczba jednostek na klienta faktury na ostatnie 12 miesięcy
-NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month
+NumberOfUnitsSupplierOrders=Liczba jednostek na terenie dostawców, na ostatniej 12 miesięcy
 NumberOfUnitsSupplierInvoices=Liczba jednostek na dostawcę faktur przez ostatnie 12 miesięcy
 EMailTextInterventionValidated=Interwencja %s zatwierdzone
 EMailTextInvoiceValidated=Faktura %s zatwierdzone
 EMailTextProposalValidated=Forslaget %s har blitt validert.
 EMailTextOrderValidated=Ordren %s har blitt validert.
 EMailTextOrderApproved=Postanowienie %s zatwierdzone
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Zamówienie zatwierdzone przez %s %s
 EMailTextOrderRefused=Postanowienie %s odmówił
 EMailTextOrderRefusedBy=Postanowienie %s %s odmawia
-EMailTextExpeditionValidated=The shipping %s has been validated.
+EMailTextExpeditionValidated=Wysyłka% s został zatwierdzony.
 ImportedWithSet=Przywóz zestaw danych
 DolibarrNotification=Automatyczne powiadomienia
 ResizeDesc=Skriv inn ny bredde eller ny høyde. Forhold vil bli holdt under resizing ...
@@ -195,35 +197,35 @@ StartUpload=Rozpocznij przesyłanie
 CancelUpload=Anuluj przesyłanie
 FileIsTooBig=Plików jest zbyt duży
 PleaseBePatient=Proszę o cierpliwość...
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+RequestToResetPasswordReceived=Wniosek o zmianę hasła Dolibarr został odebrany
+NewKeyIs=To jest twoje nowe klucze, aby zalogować się
+NewKeyWillBe=Twój nowy klucz, aby zalogować się do programu będzie
+ClickHereToGoTo=Kliknij tutaj, aby przejść do% s
+YouMustClickToChange=Trzeba jednak najpierw kliknąć na poniższy link, aby potwierdzić tę zmianę hasła
+ForgetIfNothing=Jeśli nie zwrócić tę zmianę, po prostu zapomnieć ten e-mail. Twoje dane są przechowywane w sposób bezpieczny.
 
 ##### Calendar common #####
 AddCalendarEntry=Dodaj wpis w kalendarzu %s
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+NewCompanyToDolibarr=Spółka% s dodany
+ContractValidatedInDolibarr=Umowa% s potwierdzone
+ContractCanceledInDolibarr=Umowa% s anulowana
+ContractClosedInDolibarr=Umowa% s zamknięty
+PropalClosedSignedInDolibarr=Wniosek% s podpisana
+PropalClosedRefusedInDolibarr=Wniosek% s odmówił
+PropalValidatedInDolibarr=Wniosek% s potwierdzone
+PropalClassifiedBilledInDolibarr=Wniosek% s rozliczane niejawnych
+InvoiceValidatedInDolibarr=Faktura% s potwierdzone
+InvoicePaidInDolibarr=Faktura% s zmieniła się zwrócić
+InvoiceCanceledInDolibarr=Faktura% s anulowana
+PaymentDoneInDolibarr=Płatność% s gotowe
+CustomerPaymentDoneInDolibarr=Płatności klienta% s gotowe
+SupplierPaymentDoneInDolibarr=Płatności Dostawca% s gotowe
+MemberValidatedInDolibarr=% S potwierdzone państwa
+MemberResiliatedInDolibarr=Użytkownik% s resiliated
+MemberDeletedInDolibarr=Użytkownik usunął%
+MemberSubscriptionAddedInDolibarr=Zapisy na członka% s dodany
+ShipmentValidatedInDolibarr=Przesyłka% s potwierdzone
+ShipmentDeletedInDolibarr=Przesyłka% s usunięte
 ##### Export #####
 Export=Eksport
 ExportsArea=Wywóz obszarze
diff --git a/htdocs/langs/pl_PL/paypal.lang b/htdocs/langs/pl_PL/paypal.lang
index 8f6715c6be8..e92b731896e 100644
--- a/htdocs/langs/pl_PL/paypal.lang
+++ b/htdocs/langs/pl_PL/paypal.lang
@@ -9,17 +9,17 @@ PAYPAL_API_USER=API użytkownika
 PAYPAL_API_PASSWORD=API hasło
 PAYPAL_API_SIGNATURE=Podpis API
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta płatności "integralnej" (Karta kredytowa + Paypal) lub "Paypal" tylko
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
+PaypalModeIntegral=Integralny
+PaypalModeOnlyPaypal=Tylko PayPal
 PAYPAL_CSS_URL=Opcjonalnej Url arkusza stylów CSS na stronie płatności
 ThisIsTransactionId=Jest to id transakcji: %s
 PAYPAL_ADD_PAYMENT_URL=Dodaj url płatności PayPal podczas wysyłania dokumentów pocztą
 PAYPAL_IPN_MAIL_ADDRESS=Adres e-mail do natychmiastowego powiadamiania o płatności (BPP)
-PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n
+PredefinedMailContentLink=Możesz kliknąć na obrazek poniżej bezpiecznego aby dokonać płatności (PayPal), jeśli nie jest już zrobione. % S
 YouAreCurrentlyInSandboxMode=Jesteś obecnie w trybie "sandbox"
-NewPaypalPaymentReceived=New Paypal payment received
-NewPaypalPaymentFailed=New Paypal payment tried but failed
-PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed
-PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
+NewPaypalPaymentReceived=Otrzymał nowe Paypal zapłata
+NewPaypalPaymentFailed=Nowe Paypal zapłata próbował, ale nie
+PAYPAL_PAYONLINE_SENDEMAIL=Napisz e-mail, aby ostrzec po płatności (sukces lub nie)
+ReturnURLAfterPayment=Powrót URL po dokonaniu płatności
+ValidationOfPaypalPaymentFailed=Walidacja Paypal płatności zawiodły
+PaypalConfirmPaymentPageWasCalledButFailed=Strona potwierdzenia płatności za Paypal został nazwany przez Paypal, ale potwierdzenie nie udało
diff --git a/htdocs/langs/pl_PL/printipp.lang b/htdocs/langs/pl_PL/printipp.lang
index 835e6827f12..e0e18a450b9 100644
--- a/htdocs/langs/pl_PL/printipp.lang
+++ b/htdocs/langs/pl_PL/printipp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
+PrintIPPSetup=Konfiguracja modułu Direct Print
+PrintIPPDesc=Moduł ten dodaje przycisk Drukuj, aby wysłać dokumenty bezpośrednio do drukarki. To wymaga systemu Linux z CUPS zainstalowanych.
+PRINTIPP_ENABLED=Pokaż ikonę "Druk bezpośredni" na listach dokumentów
+PRINTIPP_HOST=Serwer druku
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
+PRINTIPP_PASSWORD=Hasło
+NoPrinterFound=Nie znaleziono drukarki (sprawdź konfigurację CUPS)
+FileWasSentToPrinter=Plik% s został wysłany do drukarki
+NoDefaultPrinterDefined=Nie drukarka domyślna zdefiniowana
+DefaultPrinter=Drukarka domyślna
+Printer=Drukarka
+CupsServer=Serwer CUPS
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index aadbe802a8f..aee3672e474 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -13,25 +13,25 @@ NewProduct=Nowy produkt
 NewService=Nowa usługa
 ProductCode=Kod produktu
 ServiceCode=Kod usługi
-ProductVatMassChange=Mass VAT change
-ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
+ProductVatMassChange=Msza zmiany VAT
+ProductVatMassChangeDesc=Strona ta może być wykorzystana do modyfikacji zdefiniowanego stawkę VAT na produkty i usługi z wartością do drugiego. Uwaga, zmiana ta jest wykonywana na całej bazy danych.
+MassBarcodeInit=Msza kodów kreskowych startowych
+MassBarcodeInitDesc=Strona ta może być używana do zainicjowania kod kreskowy na obiekty, które nie mają kodów kreskowych zdefiniowane. Sprawdź wcześniej, że konfiguracja modułu kodu kreskowego jest kompletna.
 ProductAccountancyBuyCode=Kod księgowy (zakup)
 ProductAccountancySellCode=Kod księgowy (sprzedaż)
 ProductOrService=Produkt lub usługa
 ProductsAndServices=Produkty i usługi
 ProductsOrServices=Produkty lub Usługi
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesOnSell=Produkty i usługi na sprzedaż lub do zakupu
+ProductsAndServicesNotOnSell=Produkty i usługi spośród sprzedaży
 ProductsAndServicesStatistics=Statystyki produktów i usług
 ProductsStatistics=Statystyki produktów
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
+ProductsOnSell=Produkt na sprzedaż lub do pruchase
+ProductsNotOnSell=Produkt na sprzedaż i na zakup
+ProductsOnSellAndOnBuy=Produkty na sprzedaż i do zakupu
+ServicesOnSell=Usługi na sprzedaż lub do zakupu
+ServicesNotOnSell=Usługi spośród sprzedaży
+ServicesOnSellAndOnBuy=Usługi na sprzedaż i do zakupu
 InternalRef=Wewnętrzny nr referencyjny
 LastRecorded=Ostatnie produkty / usługi na sprzedaż rejestrowana
 LastRecordedProductsAndServices=Ostatnie %s zarejestrowanych produktów / usług
@@ -72,20 +72,20 @@ PublicPrice=Cena publiczna
 CurrentPrice=Aktualna cena
 NewPrice=Nowa cena
 MinPrice=Min. cena sprzedaży
-MinPriceHT=Minim. selling price (net of tax)
-MinPriceTTC=Minim. selling price (inc. tax)
+MinPriceHT=Minim. Cena sprzedaży (po odliczeniu podatku)
+MinPriceTTC=Minim. Cena sprzedaży (inc. podatku)
 CantBeLessThanMinPrice=Cena sprzedaży nie może być niższa niż minimalna dopuszczalna dla tego produktu (%s bez podatku). Ten komunikat może się również pojawić po wpisaniu zbyt wysokiego rabatu.
 ContractStatus=Status zamówienia
 ContractStatusClosed=Zamknięte
 ContractStatusRunning=W trakcie realizacji
 ContractStatusExpired=minął
 ContractStatusOnHold=Nie działa
-ContractStatusToRun=To get running
+ContractStatusToRun=Aby uzyskać działa
 ContractNotRunning=Zamówienie nie jest realizowane
 ErrorProductAlreadyExists=Produkt o numerze referencyjnym %s już istnieje.
 ErrorProductBadRefOrLabel=Błędna wartość referencyjna lub etykieta.
 ErrorProductClone=Podczas próby sklonowania produktu lub usługi wystąpił problem.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Błąd cena nie może być niższa niż cena minimalna.
 Suppliers=Dostawcy
 SupplierRef=Nr referencyjny dostawcy produktu
 ShowProduct=Pokaż produkt
@@ -114,15 +114,15 @@ BarcodeValue=Wartość kodu kreskowego
 NoteNotVisibleOnBill=Uwaga (nie widoczna na fakturach, ofertach...)
 CreateCopy=Utwórz kopię
 ServiceLimitedDuration=Jeśli produkt jest usługą z ograniczonym czasem trwania:
-MultiPricesAbility=Several level of prices per product/service
+MultiPricesAbility=Kilka poziom cen na produkt / usługę
 MultiPricesNumPrices=Ilość cen
 MultiPriceLevelsName=Kategorie cenowe
-AssociatedProductsAbility=Activate the virtual package feature
-AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
-ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+AssociatedProductsAbility=Włączanie funkcji pakietu wirtualnego
+AssociatedProducts=Produkt w opakowaniu
+AssociatedProductsNumber=Liczba produktów komponując ten produkt wirtualny pakiet
+ParentProductsNumber=Liczba dominującej opakowaniu produktu
+IfZeroItIsNotAVirtualProduct=Jeśli 0, ten produkt nie jest produktem wirtualny pakiet
+IfZeroItIsNotUsedByVirtualProduct=Jeśli 0, produkt ten nie jest używany przez produkt wirtualnego pakietu
 EditAssociate=Współpracownik
 Translation=Tłumaczenie
 KeywordFilter=Filtr słów kluczowych
@@ -132,7 +132,7 @@ AddDel=Dodaj / Usuń
 Quantity=Ilość
 NoMatchFound=Nie znaleziono odpowiednika
 ProductAssociationList=Lista powiązanych produktów / usług: nazwa produktu / usługi (ma wpływ na ilość)
-ProductParentList=List of package products/services with this product as a component
+ProductParentList=Lista produktów / usług pakietowych z tym produktem jako składnika
 ErrorAssociationIsFatherOfThis=Jeden z wybranych produktów jest nadrzędny dla produktu bierzącego
 DeleteProduct=Usuń produkt / usługę
 ConfirmDeleteProduct=Czy na pewno chcesz usunąć ten produkt / usługę?
@@ -161,12 +161,12 @@ NoSupplierPriceDefinedForThisProduct=Nie jest określona cena / ilość dostawcy
 RecordedProducts=Zapisane produkty
 RecordedServices=Zapisane usługi
 RecordedProductsAndServices=Zapisane produkty / usługi
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
+PredefinedProductsToSell=Predefiniowane sprzedawać produkty
+PredefinedServicesToSell=Predefiniowane sprzedawać usługi
+PredefinedProductsAndServicesToSell=Predefiniowane produkty / usługi do sprzedaży
+PredefinedProductsToPurchase=Predefiniowane produkt do zakupu
+PredefinedServicesToPurchase=Predefiniowane usługi do zakupu
+PredefinedProductsAndServicesToPurchase=Predefiniowane produkty / usługi do puchase
 GenerateThumb=Wygeneruj miniaturkę
 ProductCanvasAbility=Użyj specjalnych dodatków "canvas"
 ServiceNb=Usługa #%s
@@ -179,18 +179,18 @@ CloneProduct=Duplikuj produkt lub usługę
 ConfirmCloneProduct=Czy na pewno chcesz wykonać duplikat produktu lub usługi %s??
 CloneContentProduct=Sklonuj wszystkie główne informacje dot. produktu / usługi
 ClonePricesProduct=Clone główne informacje i ceny
-CloneCompositionProduct=Clone packaged product/services
+CloneCompositionProduct=Clone pakowane produkty / usługi
 ProductIsUsed=Ten produkt jest używany
 NewRefForClone=Ref. nowych produktów / usług
 CustomerPrices=Ceny klientów
 SuppliersPrices=Ceny dostawców
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+SuppliersPricesOfProductsOrServices=Ceny dostawców (wyrobów lub usług)
 CustomCode=Kod taryfy celnej
 CountryOrigin=Kraj pochodzenia
 HiddenIntoCombo=Ukryty na listach wyboru
 Nature=Natura
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
+ProductCodeModel=Szablon sędzią wyrobów
+ServiceCodeModel=Serwis szablon sędzią
 AddThisProductCard=Stwórz kartę produktu
 HelpAddThisProductCard=Ta opcja pozwala na tworzenie lub klonowanie produktu, jeśli on nie istnieje.
 AddThisServiceCard=Stwórz kartę usługi
@@ -198,7 +198,7 @@ HelpAddThisServiceCard=Ta opcja pozwala na tworzenie lub klonowanie usługi, je
 CurrentProductPrice=Aktualna cena
 AlwaysUseNewPrice=Zawsze używaj aktualnej ceny produktu / usługi
 AlwaysUseFixedPrice=Zastosuj stałą cenę
-PriceByQuantity=Different prices by quantity
+PriceByQuantity=Różne ceny według ilości
 PriceByQuantityRange=Zakres ilości
 ProductsDashboard=Podsumowanie Produkty / Usługi
 UpdateOriginalProductLabel=Modyfikacja oryginalnej etykiety
@@ -214,43 +214,56 @@ CostPmpHT=Łączna VWAP netto
 ProductUsedForBuild=Automatycznie zużyte przez produkcję
 ProductBuilded=Produkcja została zakończona
 ProductsMultiPrice=Multi-cena produktu
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Ceny klientów (produktów lub usług, multi-ceny)
 ProductSellByQuarterHT=Obroty kwartalne VWAP produktów
 ServiceSellByQuarterHT=Obroty kwartalne VWAP usług
 Quarter1=1-szy Kwartał
 Quarter2=2-i Kwartał
 Quarter3=3-i Kwartał
 Quarter4=4-y Kwartał
-BarCodePrintsheet=Print bar code
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
-BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different price for each customer
-PriceCatalogue=Unique price per product/service
-PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
-PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
-PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+BarCodePrintsheet=Drukuj kod kreskowy
+PageToGenerateBarCodeSheets=Za pomocą tego narzędzia można drukować arkusze naklejek z kodami kreskowymi. Wybierz format strony naklejki, rodzaj kodu kreskowego i wartości kodu kreskowego, a następnie kliknij w przycisk% s.
+NumberOfStickers=Ilość naklejek do wydrukowania na stronie
+PrintsheetForOneBarCode=Wydrukuj kilka naklejek na jednym kodzie kreskowym
+BuildPageToPrint=Generowanie strony do druku
+FillBarCodeTypeAndValueManually=Wypełnij typ kodu kreskowego i wartość ręcznie.
+FillBarCodeTypeAndValueFromProduct=Wypełnij typ kodu kreskowego i wartości z kodu kreskowego produktu.
+FillBarCodeTypeAndValueFromThirdParty=Wypełnij typ kodu kreskowego i wartości z kodu kreskowego z thirdparty.
+DefinitionOfBarCodeForProductNotComplete=Określenie rodzaju i wartości kodu kreskowego nie kompletnego o produkt% s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Określenie rodzaju i wartości kodu kreskowego nie wyczerpujący thirdparty% s.
+BarCodeDataForProduct=Informacje o kod kreskowy produktu% s:
+BarCodeDataForThirdparty=Informacje o kod kreskowy z thirdparty% s:
+ResetBarcodeForAllRecords=Definiowanie wartości kodów kreskowych dla wszystkich rekordów (to również zresetować wartości kodów kreskowych już zdefiniowane z nowymi wartościami)
+PriceByCustomer=Inna cena dla każdego klienta
+PriceCatalogue=Wyjątkowa cena za produkt / usługę
+PricingRule=Zasady cen z klientami
+AddCustomerPrice=Dodaj cenę przez klientów
+ForceUpdateChildPriceSoc=Ustaw sama cena na zależnych klientów
+PriceByCustomerLog=Cena od dziennika klienta
+MinimumPriceLimit=Cena minimalna nie może być niższa niż% s
+MinimumRecommendedPrice=Cena minimalna zalecana jest:% s
+PriceExpressionEditor=Edytor Cena wyraz
+PriceExpressionSelected=Wybrany wyraz cena
+PriceExpressionEditorHelp1="Cena = 2 + 2" lub "2 + 2" dla ustalenia ceny. Użyj; oddzielić wyrażeń
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
+PriceExpressionEditorHelp3=W obu cen produktów / usług i dostawca są te zmienne dostępne: 
     # # # Localtax1_tx tva_tx # # # # Waga localtax2_tx # # # # Długość powierzchni # # # price_min
+PriceExpressionEditorHelp4=W produkcie / cena usługi tylko: # supplier_min_price # 
     W cenach dostawca tylko: # supplier_quantity # i # supplier_tva_tx #
+PriceExpressionEditorHelp5=Available global values:
+PriceMode=Tryb Cena
+PriceNumeric=Liczba
+DefaultPrice=Cena Domyślnie
+ComposedProductIncDecStock=Wzrost / spadek akcji na zmiany dominującej
+ComposedProduct=Pod-Produkt
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 2c0a3ee7470..0baab0048f4 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectId=Project Id
+RefProject=Ref. projekt
+ProjectId=Projekt Id
 Project=Project
 Projects=Projekty
-ProjectStatus=Project status
+ProjectStatus=Status projektu
 SharedProject=Współużytkowane projektu
 PrivateProject=Kontakt z projektu
 MyProjectsDesc=Ten widok jest ograniczony do projektów jesteś kontaktu (cokolwiek to typ).
 ProjectsPublicDesc=Ten widok przedstawia wszystkie projekty, które możesz przeczytać.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Ten widok przedstawia wszystkie projekty i zadania, które są dozwolone, aby przeczytać.
 ProjectsDesc=Ten widok przedstawia wszystkie projekty (uprawnień użytkownika przyznać uprawnienia do wyświetlania wszystko).
 MyTasksDesc=Ten widok jest ograniczony do projektów i zadań, które są do kontaktu (cokolwiek to typ).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Tylko otwarte projekty są widoczne (projekty z projektu lub stanu zamkniętego nie są widoczne).
 TasksPublicDesc=Ten widok przedstawia wszystkich projektów i zadań, które możesz przeczytać.
 TasksDesc=Ten widok przedstawia wszystkich projektów i zadań (uprawnień użytkownika przyznać uprawnienia do wyświetlania wszystko).
 ProjectsArea=Projekty obszaru
 NewProject=Nowy projekt
-AddProject=Create project
+AddProject=Tworzenie projektu
 DeleteAProject=Usuń projektu
 DeleteATask=Usuń zadanie
 ConfirmDeleteAProject=Czy na pewno chcesz usunąć ten projekt?
@@ -31,27 +31,27 @@ NoProject=Projekt zdefiniowane
 NbOpenTasks=Nb otwartych zadań
 NbOfProjects=Nb projektów
 TimeSpent=Czas spędzony
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Czas spędzony przez Ciebie
+TimeSpentByUser=Czas spędzony przez użytkownika
 TimesSpent=Czas spędzony
 RefTask=Nr ref. zadanie
 LabelTask=Wytwórnia zadanie
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
-TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on opened projects
-WorkloadNotDefined=Workload not defined
+TaskTimeSpent=Czas spędzony na zadaniach
+TaskTimeUser=Użytkownik
+TaskTimeNote=Uwaga
+TaskTimeDate=Data
+TasksOnOpenedProject=Zadania na otwartych projektów
+WorkloadNotDefined=Obciążenie nie zdefiniowano
 NewTimeSpent=Nowy czas spędzony
 MyTimeSpent=Mój czas spędzony
 MyTasks=Moje zadania
 Tasks=Zadania
 Task=Zadanie
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
+TaskDateStart=Zadanie data rozpoczęcia
+TaskDateEnd=Data zakończenia zadania
+TaskDescription=Opis zadania
 NewTask=Nowe zadania
-AddTask=Create task
+AddTask=Tworzenie zadania
 AddDuration=Dodaj czas
 Activity=Aktywność
 Activities=Zadania / działania
@@ -60,8 +60,8 @@ MyActivities=Moje zadania / działania
 MyProjects=Moje projekty
 DurationEffective=Efektywny czas trwania
 Progress=Postęp
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+ProgressDeclared=Deklarowana postęp
+ProgressCalculated=Obliczone postęp
 Time=Czas
 ListProposalsAssociatedProject=Lista komercyjne propozycje związane z projektem
 ListOrdersAssociatedProject=Lista zamówień związanych z projektem
@@ -71,7 +71,8 @@ ListSupplierOrdersAssociatedProject=Lista dostawców zamówień związanych z pr
 ListSupplierInvoicesAssociatedProject=Lista dostawców faktur związanych z projektem
 ListContractAssociatedProject=Wykaz umów związanych z projektem
 ListFichinterAssociatedProject=Wykaz interwencji związanych z projektem
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListExpenseReportsAssociatedProject=Lista raportów o wydatkach związanych z projektem
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Wykaz działań związanych z projektem
 ActivityOnProjectThisWeek=Aktywność na projekt w tym tygodniu
 ActivityOnProjectThisMonth=Aktywność w sprawie projektu w tym miesiącu
@@ -91,52 +92,54 @@ ActionsOnProject=Działania w ramach projektu
 YouAreNotContactOfProject=Nie masz kontaktu to prywatne przedsięwzięcie
 DeleteATimeSpent=Czas spędzony Usuń
 ConfirmDeleteATimeSpent=Czy na pewno chcesz usunąć ten czas?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Zobacz również zadania powierzone mi nie
+ShowMyTasksOnly=Wyświetl tylko zadania przypisane do mnie
 TaskRessourceLinks=Zasoby
 ProjectsDedicatedToThisThirdParty=Projekty poświęcone tej trzeciej
 NoTasks=Brak zadań dla tego projektu
 LinkedToAnotherCompany=Powiązane z innymi trzeciej
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Zadanie nie jest przypisany do Ciebie
 ErrorTimeSpentIsEmpty=Czas spędzony jest pusty
 ThisWillAlsoRemoveTasks=Działanie to będzie także usunąć wszystkie zadania projektu (%s zadania w tej chwili) i wszystkimi wejściami czasu spędzonego.
 IfNeedToUseOhterObjectKeepEmpty=Jeżeli pewne obiekty (faktura, zamówienie, ...), należące do innej osoby trzeciej, musi być związane z projektem tworzenia, zachować ten pusty mieć projekt jest multi osób trzecich.
-CloneProject=Clone project
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now ?
-ConfirmCloneProject=Are you sure to clone this project ?
-ProjectReportDate=Change task date according project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
+CloneProject=Projekt Clone
+CloneTasks=Zadania Clone
+CloneContacts=Kontakty Clone
+CloneNotes=Notatki Clone
+CloneProjectFiles=Projekt klon dołączył pliki
+CloneTaskFiles=Zadanie (s), klon połączone plików (jeśli zadania (s) sklonowano)
+CloneMoveDate=Aktualizacja projektu / zadania pochodzi od teraz?
+ConfirmCloneProject=Czy na pewno chcesz sklonować ten projekt?
+ProjectReportDate=Zmień datę zadaniem data rozpoczęcia według projektu
+ErrorShiftTaskDate=Niemożliwe do przesunięcia daty zadania według nowej daty rozpoczęcia projektu
+ProjectsAndTasksLines=Projekty i zadania
+ProjectCreatedInDolibarr=Projekt% s utworzony
+TaskCreatedInDolibarr=Zadanie% s utworzony
+TaskModifiedInDolibarr=Zadanie% s zmodyfikowano
+TaskDeletedInDolibarr=Zadanie% s usunięte
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Kierownik projektu
 TypeContact_project_external_PROJECTLEADER=Kierownik projektu
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Współpracownik
+TypeContact_project_external_PROJECTCONTRIBUTOR=Współpracownik
 TypeContact_project_task_internal_TASKEXECUTIVE=zadań wykonawczych
 TypeContact_project_task_external_TASKEXECUTIVE=zadań wykonawczych
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
-UnlinkElement=Unlink element
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Współpracownik
+TypeContact_project_task_external_TASKCONTRIBUTOR=Współpracownik
+SelectElement=Wybierz elementem
+AddElement=Link do elementu
+UnlinkElement=Rozłącz elementem
 # Documents models
 DocumentModelBaleine=Kompletny model projektu sprawozdania (logo. ..)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
-ProjectReferers=Refering objects
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
-FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
-InputPerDay=Input per day
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+PlannedWorkload=Planowany nakład pracy
+PlannedWorkloadShort=Nakład pracy
+WorkloadOccupation=Nakład pracy przypisanie
+ProjectReferers=Odnosząc obiektów
+SearchAProject=Szukaj projektu
+ProjectMustBeValidatedFirst=Projekt musi być najpierw zatwierdzone
+ProjectDraft=Projekty Projekty
+FirstAddRessourceToAllocateTime=Kojarzenie ressource przeznaczyć czas
+InputPerDay=Wejście na dzień
+InputPerWeek=Wejście w tygodniu
+InputPerAction=Wejście na działanie
+TimeAlreadyRecorded=Czas spędzony na już zarejestrowane dla tego zadania / dzień i użytkownika% s
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index 4626b302570..6408c15d0d0 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -2,10 +2,11 @@
 RefSending=Nr ref. wysyłanie
 Sending=Wysyłanie
 Sendings=Sendings
+AllSendings=All Shipments
 Shipment=Wysyłanie
 Shipments=Wysyłek
-ShowSending=Show Sending
-Receivings=Receipts
+ShowSending=Pokaż Wysyłanie
+Receivings=Wpływy
 SendingsArea=Sendings obszarze
 ListOfSendings=Lista sendings
 SendingMethod=Wysyłanie metody
@@ -14,8 +15,8 @@ LastSendings=Ostatnia %s sendings
 SearchASending=Wyszukaj wysyłanie
 StatisticsOfSendings=Statystyka sendings
 NbOfSendings=Liczba sendings
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
+NumberOfShipmentsByMonth=Liczba przesyłek przez miesiąc
+SendingCard=Karta Przesyłka
 NewSending=Nowe wysyłanie
 CreateASending=Utwórz wysyłanie
 CreateSending=Utwórz wysyłanie
@@ -23,7 +24,7 @@ QtyOrdered=Ilosc sortowane
 QtyShipped=Ilosc wysłane
 QtyToShip=Ilosc do statku
 QtyReceived=Ilość otrzymanych
-KeepToShip=Remain to ship
+KeepToShip=Pozostają do wysyłki
 OtherSendingsForSameOrder=Inne sendings do tego celu
 DateSending=Data wysłania porządku
 DateSendingShort=Data wysłania porządku
@@ -38,7 +39,7 @@ StatusSendingCanceledShort=Odwołany
 StatusSendingDraftShort=Szkic
 StatusSendingValidatedShort=Zatwierdzona
 StatusSendingProcessedShort=Przetworzony
-SendingSheet=Shipment sheet
+SendingSheet=Arkusz Przesyłka
 Carriers=Przewoźnicy
 Carrier=Przewoźnik
 CarriersArea=Przewoźnicy obszarze
@@ -51,23 +52,23 @@ Enlevement=Zgarnięte przez klienta
 DocumentModelSimple=Prosty wzór dokumentu
 DocumentModelMerou=Mérou model A5
 WarningNoQtyLeftToSend=Ostrzeżenie nie produktów oczekujących na wysłanie.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
+StatsOnShipmentsOnlyValidated=Statystyki prowadzone w sprawie przesyłania tylko potwierdzone. Data używany jest data uprawomocnienia przesyłki (planowanym terminem dostawy nie zawsze jest znana).
 DateDeliveryPlanned=Strugane daty dostawy
 DateReceived=Data otrzymania dostawy
 SendShippingByEMail=Wyślij przesyłki przez e-mail
-SendShippingRef=Submission of shipment %s
+SendShippingRef=Złożenie przesyłki% s
 ActionsOnShipping=Wydarzenia na dostawy
 LinkToTrackYourPackage=Link do strony śledzenia paczki
 ShipmentCreationIsDoneFromOrder=Na razie utworzenie nowego przesyłki odbywa się z karty zamówienia.
-RelatedShippings=Related shipments
-ShipmentLine=Shipment line
-CarrierList=List of transporters
-SendingRunning=Product from ordered customer orders
-SuppliersReceiptRunning=Product from ordered supplier orders
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+RelatedShippings=Podobne przesyłki
+ShipmentLine=Linia Przesyłka
+CarrierList=Lista przewoźników
+SendingRunning=Produkt z zamówionych zleceń klientów
+SuppliersReceiptRunning=Produkt z zamówionych zleceń dostawca
+ProductQtyInCustomersOrdersRunning=Ilość produktów w otwartych zleceń klientów
+ProductQtyInSuppliersOrdersRunning=Ilość produktów w otwartych dostawców zamówień
+ProductQtyInShipmentAlreadySent=Ilość produktów z opended zamówienie klienta już wysłane
+ProductQtyInSuppliersShipmentAlreadyRecevied=Ilość produktów z otwartego zlecenia dostawca otrzymał już
 
 # Sending methods
 SendingMethodCATCH=Catch przez klientów
@@ -77,9 +78,9 @@ SendingMethodCOLSUI=Colissimo
 DocumentModelSirocco=Prosty dokument model dostawy wpływy
 DocumentModelTyphon=Więcej kompletny dokument model dostawy wpływy (logo. ..)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Stała EXPEDITION_ADDON_NUMBER nie zdefiniowano
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Suma wolumenów
+SumOfProductWeights=Suma wag produktów
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseNumber= Szczegóły magazynowe
+DetailWarehouseFormat= W:% s (Ilość:% d)
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 9ce3327dd7d..e1f06e833fd 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -8,8 +8,8 @@ MenuNewWarehouse=Nowy magazyn
 WarehouseOpened=Magazyn otwarty
 WarehouseClosed=Magazyn zamknięte
 WarehouseSource=Źródło magazynu
-WarehouseSourceNotDefined=No warehouse defined,
-AddOne=Add one
+WarehouseSourceNotDefined=Nie zdefiniowano magazynu,
+AddOne=Dodaj jedną
 WarehouseTarget=Docelowe magazynie
 ValidateSending=Usuń wysyłanie
 CancelSending=Anuluj wysyłanie
@@ -23,34 +23,34 @@ ErrorWarehouseLabelRequired=Magazyn etykiecie jest wymagane
 CorrectStock=Poprawny stanie
 ListOfWarehouses=Lista magazynów
 ListOfStockMovements=Wykaz stanu magazynowego
-StocksArea=Warehouses area
+StocksArea=Powierzchnia magazynów
 Location=Lieu
 LocationSummary=Nazwa skrócona lokalizacji
-NumberOfDifferentProducts=Number of different products
+NumberOfDifferentProducts=Wiele różnych środków
 NumberOfProducts=Łączna liczba produktów
 LastMovement=Ostatni ruch
 LastMovements=Ostatnie ruchy
 Units=Jednostki
 Unit=Jednostka
 StockCorrection=Poprawny stanie
-StockTransfer=Stock transfer
+StockTransfer=Transfer Zdjęcie
 StockMovement=Przeniesienie
 StockMovements=Stock transfery
-LabelMovement=Movement label
+LabelMovement=Etykieta Ruch
 NumberOfUnit=Liczba jednostek
-UnitPurchaseValue=Unit purchase price
+UnitPurchaseValue=Jednostkowa cena nabycia
 TotalStock=Razem w akcji
 StockTooLow=Zasób zbyt niska
-StockLowerThanLimit=Stock lower than alert limit
+StockLowerThanLimit=Zdjęcie niższa niż progu alarmu
 EnhancedValue=Wartość
 PMPValue=Wartość
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Magazyny wartości
 UserWarehouseAutoCreate=Tworzenie stanie automatycznie podczas tworzenia użytkownika
-IndependantSubProductStock=Product stock and subproduct stock are independant
+IndependantSubProductStock=Produkt akcji i subproduct akcji są niezależne
 QtyDispatched=Ilość wysyłanych
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
+QtyDispatchedShort=Ilość wysyłanych
+QtyToDispatchShort=Ilość wysyłką
 OrderDispatch=Postanowienie wysyłkowe
 RuleForStockManagementDecrease=Artykuł na zarządzanie zapasami spadek
 RuleForStockManagementIncrease=Artykuł na zarządzanie zapasami wzrost
@@ -60,13 +60,13 @@ DeStockOnShipment=Spadek realnych zasobów wysyłką (zaleciły)
 ReStockOnBill=Wzrost realnego zasobów faktur / not kredytowych
 ReStockOnValidateOrder=Wzrost realnego zasobów zamówień notatek
 ReStockOnDispatchOrder=Wzrost rzeczywisty stan zapasów w magazynach ręcznego wysyłki, po otrzymaniu zamówienia dostawca
-ReStockOnDeleteInvoice=Increase real stocks on invoice deletion
+ReStockOnDeleteInvoice=Wzrost realnych zapasów na fakturze usunięcia
 OrderStatusNotReadyToDispatch=Zamówienie nie jest jeszcze lub nie więcej status, który umożliwia wysyłanie produktów w magazynach czas.
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
+StockDiffPhysicTeoric=Wyjaśnienie różnicy między fizycznej i teoretycznej magazynie
 NoPredefinedProductToDispatch=Nie gotowych produktów dla tego obiektu. Więc nie w czas wysyłki jest wymagane.
 DispatchVerb=Wysyłka
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Limit dla wpisu
+StockLimit=Zdjęcie do wpisu limitu
 PhysicalStock=Fizyczne zapasy
 RealStock=Real Stock
 VirtualStock=Wirtualne stanie
@@ -91,44 +91,44 @@ PersonalStock=Osobowych %s czas
 ThisWarehouseIsPersonalStock=Tym składzie przedstawia osobiste zasobów %s %s
 SelectWarehouseForStockDecrease=Wybierz magazyn użyć do zmniejszenia czas
 SelectWarehouseForStockIncrease=Wybierz magazyn użyć do zwiększenia czas
-NoStockAction=No stock action
-LastWaitingSupplierOrders=Orders waiting for receptions
-DesiredStock=Desired stock
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Curent selection mode
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
-RuleForStockReplenishment=Rule for stocks replenishment
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a supplier
-AlertOnly= Alerts only
-WarehouseForStockDecrease=The warehouse %s will be used for stock decrease
-WarehouseForStockIncrease=The warehouse %s will be used for stock increase
-ForThisWarehouse=For this warehouse
-ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-MassStockMovement=Mass stock movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfert
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
-MovementLabel=Label of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+NoStockAction=Brak akcji stock
+LastWaitingSupplierOrders=Zamówienia oczekujące na przyjęcia
+DesiredStock=Pożądany Zdjęcie
+StockToBuy=Na zamówienie
+Replenishment=Uzupełnianie
+ReplenishmentOrders=Zamówień towarów
+VirtualDiffersFromPhysical=Według zwiększyć / zmniejszyć opcje zdjęcia, fizyczną i wirtualną akcji akcji (fizyczne + zamówień bieżących) może różni
+UseVirtualStockByDefault=Użyj wirtualnej akcji domyślnie, zamiast fizycznego magazynie, do uzupełniania funkcji
+UseVirtualStock=Użyj wirtualnej akcji
+UsePhysicalStock=Użyj fizycznej akcji
+CurentSelectionMode=Tryb wyboru curent
+CurentlyUsingVirtualStock=Wirtualny Zdjęcie
+CurentlyUsingPhysicalStock=Zdjęcie fizyczny
+RuleForStockReplenishment=Reguła dla uzupełnienia zapasów
+SelectProductWithNotNullQty=Wybierz co najmniej jeden produkt z st not null i dostawcy
+AlertOnly= Tylko alarmy
+WarehouseForStockDecrease=Magazyn% s zostaną wykorzystane do zmniejszenia magazynie
+WarehouseForStockIncrease=Magazyn% s zostaną wykorzystane do zwiększenia magazynie
+ForThisWarehouse=W tym magazynie
+ReplenishmentStatusDesc=To jest lista wszystkich produktów z zapasów niższej niż pożądanym stanie (lub niższa niż wartość alertu, jeśli pole wyboru "Alarm tylko" jest zaznaczona), i sugerują tworzenie zamówień dostawca do wypełnienia różnicę.
+ReplenishmentOrdersDesc=To jest lista wszystkich otwartych zleceń dostawca tym predefiniowanych produktów. Tylko otwarty rozkazy z góry określonych produktów, tak, że mogą mieć wpływ na zapasy, są widoczne tutaj.
+Replenishments=Uzupełnianie
+NbOfProductBeforePeriod=Ilość produktów w magazynie% s przed wybrany okres (<% s)
+NbOfProductAfterPeriod=Ilość produktów w magazynie% s po wybraniu okres (>% s)
+MassMovement=Masowy ruch
+MassStockMovement=Msza ruch Zdjęcie
+SelectProductInAndOutWareHouse=Wybierz produkt, ilość, magazyn źródłowy i docelowy magazyn, a następnie kliknij przycisk "% s". Po wykonaniu tych wszystkich wymaganych ruchów, kliknij na "% s".
+RecordMovement=Rekord transfert
+ReceivingForSameOrder=Wpływy do tego celu
+StockMovementRecorded=Zbiory zapisane ruchy
+RuleForStockAvailability=Zasady dotyczące wymagań dotyczących
+StockMustBeEnoughForInvoice=Poziom zapasów musi być na tyle, aby dodać produkt / usługę na fakturze
+StockMustBeEnoughForOrder=Poziom zapasów musi być na tyle, aby dodać produkt / usługę na zamówienie
+StockMustBeEnoughForShipment= Poziom zapasów musi być na tyle, aby dodać produkt / usługę do wysyłki
+MovementLabel=Wytwórnia ruchu
+InventoryCode=Kod Ruch i inwentaryzacji
+IsInPackage=Zawarte w pakiecie
+ShowWarehouse=Pokaż magazyn
+MovementCorrectStock=Korekta treści Zdjęcie za produkt% s
+MovementTransferStock=Transfer Zdjęcie produktu% s do innego magazynu
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Magazyn źródłowy musi być zdefiniowany tu, gdy moduł partii jest. Będzie on wykorzystywany do listy Wich dużo / seryjny jest dostępna dla produktu, który wymaga partii / dane szeregowe do ruchu. Jeśli chcesz wysłać produkty z różnych magazynów, tak aby transport na kilka etapów.
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index bcf12754ec4..d27163f41e4 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Dostawcy
-AddSupplier=Create a supplier
+AddSupplier=Tworzenie dostawcy
 SupplierRemoved=Dostawca usunięty
 SuppliersInvoice=Faktury dostawców
 NewSupplier=Nowy dostawca
@@ -29,7 +29,7 @@ ExportDataset_fournisseur_2=Faktury i płatności dostawcy
 ExportDataset_fournisseur_3=Zamówienia dostawcy i pozycje na zamówieniu
 ApproveThisOrder=Zatwierdź to zamówienie
 ConfirmApproveThisOrder=Czy na pewno chcesz zatwierdzić zamówienie %s ?
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Odmów tę kolejność
 ConfirmDenyingThisOrder=Czy na pewno chcesz odrzucić zamówienie %s ?
 ConfirmCancelThisOrder=Czy na pewno chcesz anulować zamówienie %s ?
 AddCustomerOrder=Stwórz zamówienie Klienta
@@ -39,7 +39,8 @@ AddSupplierInvoice=Stwórz fakturę dostawcy
 ListOfSupplierProductForSupplier=Wykaz produktów i cen dostawcy %s
 NoneOrBatchFileNeverRan=Brak lub partii  %s nie prowadził niedawno
 SentToSuppliers=Wysyłane do dostawców
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+ListOfSupplierOrders=Lista zleceń dostawca
+MenuOrdersSupplierToBill=Zamówienia dostawca do faktury
+NbDaysToDelivery=Opóźnienie dostawy w dni
+DescNbDaysToDelivery=Największe opóźnienie wyświetlania listy produktów wśród zamówienia
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang
index 126fe2dda63..336aa514dc4 100644
--- a/htdocs/langs/pl_PL/trips.lang
+++ b/htdocs/langs/pl_PL/trips.lang
@@ -1,126 +1,126 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense report
+ExpenseReport=Raport z wydatków
+ExpenseReports=Raporty wydatków
+Trip=Raport z wydatków
+Trips=Raporty wydatków
+TripsAndExpenses=Koszty raporty
+TripsAndExpensesStatistics=Statystyki raporty wydatków
+TripCard=Koszty karta raport
+AddTrip=Tworzenie raportu wydatków
+ListOfTrips=Lista raporcie wydatków
 ListOfFees=Wykaz opłat
-NewTrip=New expense report
+NewTrip=Nowy raport z wydatków
 CompanyVisited=Firm / fundacji odwiedzonych
 Kilometers=Kilometrów
 FeesKilometersOrAmout=Kwota lub kilometry
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-SearchATripAndExpense=Search an expense report
+DeleteTrip=Usuń raport wydatków
+ConfirmDeleteTrip=Czy na pewno chcesz usunąć ten raport wydatków?
+ListTripsAndExpenses=Wykaz raportów kosztowych
+ListToApprove=Czeka na zatwierdzenie
+ExpensesArea=Obszar raporty wydatków
+SearchATripAndExpense=Szukaj raport wydatków
 ClassifyRefunded=Zakfalifikowano do refundacji.
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripSalarie=Informations user
-TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
-ConfirmDeleteLine=Are you sure you want to delete this line ?
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
+ExpenseReportWaitingForApproval=Nowy raport wydatek został przedłożony do zatwierdzenia
+ExpenseReportWaitingForApprovalMessage=Nowy raport wydatek został złożony i czeka na zatwierdzenie. - Użytkownika:% s - Czas:% s Kliknij tutaj aby sprawdzić:% s
+TripId=Raport z wydatków Id
+AnyOtherInThisListCanValidate=Osoba do informowania o jej potwierdzenie.
+TripSociete=Informacje o firmie
+TripSalarie=Informacje użytkownika
+TripNDF=Informacje raport z wydatków
+DeleteLine=Usuwanie ligne raportu wydatków
+ConfirmDeleteLine=Czy na pewno chcesz usunąć ten wiersz?
+PDFStandardExpenseReports=Standardowy szablon do generowania dokumentu PDF do raportu wydatków
+ExpenseReportLine=Linia raport z wydatków
 TF_OTHER=Inny
-TF_TRANSPORTATION=Transportation
+TF_TRANSPORTATION=Transport
 TF_LUNCH=Obiad
 TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
+TF_TRAIN=Pociąg
+TF_BUS=Autobus
+TF_CAR=Samochód
+TF_PEAGE=Myto
+TF_ESSENCE=Paliwo
+TF_HOTEL=Schronisko
 TF_TAXI=Taxi
 
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
-AucuneNDF=No expense reports found for this criteria
-AucuneLigne=There is no expense report declared yet
-AddLine=Add a line
-AddLineMini=Add
+ErrorDoubleDeclaration=Masz oświadczył kolejny raport wydatków do podobnego zakresu dat.
+ListTripsAndExpenses=Wykaz raportów kosztowych
+AucuneNDF=Brak raporty wydatków znalezione dla tych kryteriów
+AucuneLigne=Nie ma jeszcze raportu wydatki deklarowane
+AddLine=Dodaj linię
+AddLineMini=Dodać
 
-Date_DEBUT=Period date start
-Date_FIN=Period date end
-ModePaiement=Payment mode
-Note=Note
-Project=Project
+Date_DEBUT=Data okres rozruchu
+Date_FIN=Data zakończenia okresu
+ModePaiement=Sposób płatności
+Note=Uwaga
+Project=Projekt
 
-VALIDATOR=User to inform for approbation
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
-REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+VALIDATOR=Użytkownik poinformować o zatwierdzenie
+VALIDOR=Zatwierdzony przez
+AUTHOR=Nagrany przez
+AUTHORPAIEMENT=Paied przez
+REFUSEUR=Odmowa przez
+CANCEL_USER=Anulowane przez
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=Powód
+MOTIF_CANCEL=Powód
 
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_VALIDE=Validation date
-DateApprove=Approving date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
+DATE_REFUS=Datę Deny
+DATE_SAVE=Data Validation
+DATE_VALIDE=Data Validation
+DateApprove=Data zatwierdzanie
+DATE_CANCEL=Anulowanie daty
+DATE_PAIEMENT=Termin płatności
 
-Deny=Deny
-TO_PAID=Pay
-BROUILLONNER=Reopen
-SendToValid=Sent to approve
-ModifyInfoGen=Edit
-ValidateAndSubmit=Validate and submit for approval
+Deny=Zaprzeczać
+TO_PAID=Płacić
+BROUILLONNER=Otworzyć na nowo
+SendToValid=Wysłany do zatwierdzenia
+ModifyInfoGen=Edycja
+ValidateAndSubmit=Weryfikacja i przedkłada do zatwierdzenia
 
-NOT_VALIDATOR=You are not allowed to approve this expense report
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+NOT_VALIDATOR=Nie masz uprawnień do zatwierdzania tego raportu wydatków
+NOT_AUTHOR=Nie jesteś autorem tego raportu wydatków. Operacja anulowana.
 
-RefuseTrip=Deny an expense report
-ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+RefuseTrip=Odmów raport wydatków
+ConfirmRefuseTrip=Czy na pewno chcesz odrzucić ten raport wydatków?
 
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report ?
+ValideTrip=Zatwierdzić raport wydatków
+ConfirmValideTrip=Czy na pewno chcesz, aby zatwierdzić ten raport wydatków?
 
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+PaidTrip=Zapłać raport wydatków
+ConfirmPaidTrip=Czy na pewno chcesz się status tego raportu wydatków do "Paid" zmienić?
 
-CancelTrip=Cancel an expense report
-ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+CancelTrip=Anuluj raport wydatków
+ConfirmCancelTrip=Czy na pewno chcesz anulować to raport wydatków?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+BrouillonnerTrip=Cofnąć raportu wydatków do statusu "Projekt" n
+ConfirmBrouillonnerTrip=Czy na pewno chcesz przenieść ten raport wydatków do statusu "projektu"?
 
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+SaveTrip=Weryfikacja raportu wydatków
+ConfirmSaveTrip=Czy na pewno chcesz, aby potwierdzić ten raport wydatków?
 
 Synchro_Compta=NDF <-> Compte
 
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+TripSynch=Synchronizacja: Uwagi de frais <-> courant Compte
+TripToSynch=Uwagi de frais à intégrer dans la COMPTA
+AucuneTripToSynch=Aucune pamiętać de Frais n'est pl Statut "odbiorca".
 ViewAccountSynch=Voir le compte
 
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
+ConfirmNdfToAccount=Êtes-vous Sur de vouloir intégrer cette pamiętać de frais dans le compte courant?
+ndfToAccount=Uwaga de frais - integracja
 
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
+ConfirmAccountToNdf=Êtes-vous Sur de vouloir retirer cette note de compte courant frais du?
+AccountToNdf=Uwaga de frais - Retrait
 
-LINE_NOT_ADDED=Ligne non ajoutée :
+LINE_NOT_ADDED=Ligne nie ajoutée:
 NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
+NO_DATE=Aucune data sélectionnée.
+NO_PRICE=Aucun prix Indique.
 
 TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
+TripForPaid=Płatnik
+TripPaid=Odbiorca płatności
 
-NoTripsToExportCSV=No expense report to export for this period.
+NoTripsToExportCSV=Nie raport z wydatków na eksport za ten okres.
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index 467c34b1af8..c1208006aac 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
+HRMArea=Obszaru HRM
 UserCard=Użytkownik karty
 ContactCard=Kontakt karty
 GroupCard=Grupa karty
@@ -86,7 +86,7 @@ MyInformations=Moje dane
 ExportDataset_user_1=Dolibarr Użytkownicy i właściwości
 DomainUser=Domena użytkownika %s
 Reactivate=Przywraca
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+CreateInternalUserDesc=Ta forma pozwala na stworzenie użytkownikowi wewnętrznego do firmy / fundacji. Aby utworzyć użytkownika zewnętrznego (klientami, dostawcami, ...), użyj przycisku "Utwórz Dolibarr użytkownika" z karty kontaktu osoby trzeciej.
 InternalExternalDesc=Wewnętrzny użytkownik jest użytkownikiem, który jest częścią Twojej firmy / fundacji. 
     Zewnętrzny użytkownik jest klientem, dostawcą lub innym kontrahentem. 

     W obu przypadkach uprawnienia określają prawa dostępu do Dolibarr; także zewnętrzny użytkownik może mieć inne menu niż użytkownik wewnętrzny (patrz Strona Główna - Konfiguracja - Wyświetlanie)
 PermissionInheritedFromAGroup=Zezwolenie udzielone ponieważ odziedziczył od jednego z użytkowników grupy.
 Inherited=Odziedziczone
@@ -102,7 +102,7 @@ UserDisabled=Użytkownik %s osób niepełnosprawnych
 UserEnabled=Użytkownik %s aktywowany
 UserDeleted=Użytkownik %s usunięto
 NewGroupCreated=Grupa %s tworzone
-GroupModified=Group %s modified
+GroupModified=Grupa% s zmodyfikowano
 GroupDeleted=Grupa %s usunięto
 ConfirmCreateContact=Czy na pewno chcesz yu Dolibarr utworzyć konto dla tego kontaktu?
 ConfirmCreateLogin=Czy na pewno chcesz, aby utworzyć konto dla tego Dolibarr członkiem?
@@ -113,10 +113,10 @@ YourRole=Swoje role
 YourQuotaOfUsersIsReached=Limitu aktywnych użytkowników został osiągnięty!
 NbOfUsers=Nb użytkowników
 DontDowngradeSuperAdmin=Tylko superadmin niższej wersji superadmin
-HierarchicalResponsible=Supervisor
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
-OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Weekly hours
-ColorUser=Color of the user
+HierarchicalResponsible=Kierownik
+HierarchicView=Hierarchiczny widok
+UseTypeFieldToChange=Użyj pola do zmiany Rodzaj
+OpenIDURL=Adres URL OpenID
+LoginUsingOpenID=Użyj do logowania OpenID
+WeeklyHours=Tygodniowy czas
+ColorUser=Kolor użytkownik
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index d1cb2e1ebb1..1fd493ae683 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -14,13 +14,13 @@ WithdrawalReceiptShort=Odbiór
 LastWithdrawalReceipts=Ostatnia %s wycofania wpływy
 WithdrawedBills=Withdrawed faktur
 WithdrawalsLines=Wycofania linie
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
+RequestStandingOrderToTreat=Wniosek o stałych zleceń do przetwarzania
+RequestStandingOrderTreated=Wniosek o stałych zleceń przetworzonych
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Jeszcze nie możliwe. Wycofaj stan musi być ustawiony na "dobro", zanim uzna odrzucić na konkretnych liniach.
 CustomersStandingOrders=Stałych zleceń klienta
 CustomerStandingOrder=Klient zlecenie stałe
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
+NbOfInvoiceToWithdraw=Nb. z faktury z wycofania wniosku
+NbOfInvoiceToWithdrawWithInfo=Nb. z faktury z wycofać wniosek o klientów posiadających zdefiniowane dane konta bankowego
 InvoiceWaitingWithdraw=Faktura czeka na wycofać
 AmountToWithdraw=Kwota do wycofania
 WithdrawsRefused=Wycofuje odmówił
@@ -47,7 +47,7 @@ RefusedData=Od odrzucenia
 RefusedReason=Powodem odrzucenia
 RefusedInvoicing=Rozliczeniowych odrzucenia
 NoInvoiceRefused=Nie za odrzucenie
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Faktura odmówił (Naładuj odrzucenie do klienta)
 Status=Status
 StatusUnknown=Nieznany
 StatusWaiting=Czekanie
@@ -76,14 +76,14 @@ WithBankUsingRIB=Na rachunkach bankowych z wykorzystaniem RIB
 WithBankUsingBANBIC=Na rachunkach bankowych z wykorzystaniem IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Konto bankowe do odbioru odstępuje
 CreditDate=Kredyt na
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=Nie można wygenerować plik paragon wycofania dla danego kraju:% s (Twój kraj nie jest obsługiwany)
 ShowWithdraw=Pokaż Wypłata
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Jeśli jednak faktura nie co najmniej jeden wypłaty płatności jeszcze przetworzone, nie będzie ustawiony jako zapłaci, aby umożliwić zarządzanie wycofanie wcześniej.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
-StatisticsByLineStatus=Statistics by status of lines
+DoStandingOrdersBeforePayments=Zakładka ta pozwala na żądanie zlecenia stałego. Gdy to zrobisz, przejdź do menu bankowości> Wycofanie zarządzać zlecenia stałego. Gdy zlecenia stałego jest zamknięty, płatność na fakturze będą automatycznie zapisywane, a faktura zamknięte, jeśli pozostała do zapłaty jest null.
+WithdrawalFile=Plik Wycofanie
+SetToStatusSent=Ustaw status "Plik Wysłane"
+ThisWillAlsoAddPaymentOnInvoice=Odnosi się to także płatności faktur i będzie je sklasyfikować jako "Paid"
+StatisticsByLineStatus=Statystyki według stanu linii
 
 ### Notifications
 InfoCreditSubject=Płatność z %s zamówienia stojących przez bank
@@ -93,5 +93,5 @@ InfoTransMessage=Stojąc %s zamówienie zostało przesłanych do banku przez %s
 InfoTransData=Kwota: %s 
     Metode: %s 
     Data: %s
 InfoFoot=Jest to zautomatyzowany wiadomość wysłana przez Dolibarr
 InfoRejectSubject=Zlecenie stałe odmówił
-InfoRejectMessage=Hello,

    the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.

    --
    %s
+InfoRejectMessage=Witaj, 

     zlecenie stałe z faktury% s związany z firmą% s, z kwoty% s zostało odrzucone przez bank. 

     - 
     % S
 ModeWarning=Opcja dla trybu rzeczywistego nie był ustawiony, zatrzymujemy po tej symulacji
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 511241d55c0..4db200257e3 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -3,26 +3,26 @@ Foundation=Empresa/Instituição
 VersionProgram=Versão do programa
 VersionLastInstall=Versão da instalação inicial
 VersionLastUpgrade=Versão da última atualização
-SessionId=ID da sessao
+SessionId=ID da sessão
 SessionSaveHandler=Manipulador para salvar sessões.
-SessionSavePath=Localizacao da sessao guardada
+SessionSavePath=Localização da sessão guardada
 PurgeSessions=Remover sessões
 ConfirmPurgeSessions=Você tem certeza de que deseja desconectar todas as sessões? Isto irá desconectar TODOS usuários (exceto você).
 NoSessionListWithThisHandler=Salvar manipulador de sessão configurado no PHP não permite listar todas as sessões em execução.
 LockNewSessions=Bloquear novas conexões
 ConfirmLockNewSessions=Você tem certeza que quer restringir qualquer nova conexão Dolibarr para si mesmo. Apenas usuário %s será capaz de se conectar depois.
 UnlockNewSessions=Remover bloqueio conexão
-YourSession=Sua sessao
-Sessions=Sessão de usuarios
-WebUserGroup=usuario/grupo do servidor web
+YourSession=Sua sessão
+Sessions=Sessão de usuários
+WebUserGroup=Usuário/grupo do servidor web
 NoSessionFound=Seu PHP parece não permitir listar as sessões ativas. Diretório usado para salvar sessões (%s) pode ser protegido (por exemplo, pelas permissões do sistema operacional ou por diretiva PHP "open_basedir").
 HTMLCharset=Charset das páginas HTML geradas
 DBStoringCharset=Charset base de dados para armazenamento de dados
 DBSortingCharset=Charset base de dados para classificar os dados
 WarningModuleNotActive=Módulo %s deve ser ativado
 WarningOnlyPermissionOfActivatedModules=Atenção, somente as permissões relacionados com os módulos ativados que aparecem aqui. Pode ativar os outros módulos na página configuração->Módulos
-DolibarrSetup=Instalação do ERP
-DolibarrUser=Usuário ERP
+DolibarrSetup=Instalação ou atualização do Dolibarr
+DolibarrUser=Usuário do Dolibarr
 InternalUser=Usuário Interno
 ExternalUser=Usuário Externo
 InternalUsers=Usuários Internos
@@ -34,6 +34,8 @@ RemoveLock=Exclua o arquivo %s se tem permissão da ferramenta de atuali
 RestoreLock=Substituir o arquivo %s e apenas dar direito de ler a esse arquivo, a fim de proibir novas atualizações.
 ErrorModuleRequireDolibarrVersion=Erro, este módulo requer uma versão %s ou superior do ERP
 DictionarySetup=Configuração Dicionário
+Chartofaccounts=Plano de contas
+Fiscalyear=Exercícios Fiscais
 ErrorReservedTypeSystemSystemAuto=Valores 'system' e 'systemauto' para o tipo é reservado. Você pode usar "usuário" como valor para adicionar seu próprio registro
 ErrorCodeCantContainZero=Código não pode conter valor 0
 DisableJavascript=Desative as funções de JavaScript e Ajax (Recomendado para deficientes visuais ou navegadores somente texto)
@@ -69,7 +71,9 @@ MenuLimits=Limites e Precisão
 DetailPosition=Número de ordem para a posição do menu
 PersonalizedMenusNotSupported=Menus personalizados não são suportados
 NotConfigured=Modulo nao configurado
+Setup=Configuração do Sistema
 Activation=Ativação
+Active=Ativo
 SetupShort=Configuracao
 OtherSetup=Outras configuracoes
 CurrentValueSeparatorThousand=Separador milhar
@@ -207,7 +211,6 @@ MenuAdmin=Editor menu
 DoNotUseInProduction=Não utilizar em produção
 ThisIsProcessToFollow=Está aqui o procedimento a seguir:
 FindPackageFromWebSite=Encontre um pacote que oferece recurso desejado (por exemplo, no site oficial % s).
-DownloadPackageFromWebSite=Descarregar o pacote
 SetupIsReadyForUse=A Instalação está finalizada e o ERP está liberada para usar com o novo componente
 NotExistsDirect=O diretório alternativo para o root não foi definido
 InfDirAlt=Desde a versão 3, é possível definir um diretorio root alternativo. Esta funcoa permitepermite que você armazene, no mesmo lugar, plug-ins e templates personalizados 
     apenas crie um diretório na raiz do Dolibarr. (Por exemplo: custom) 
    
@@ -324,12 +327,13 @@ Module51Desc=Gestão de correspondência do massa
 Module52Name=Estoques de produtos
 Module52Desc=Administração de estoques de produtos
 Module53Desc=Administração de serviços
+Module54Name=Contratos/Assinaturas
+Module54Desc=Gerenciamento de contratos (serviços ou assinaturas recorrentes)
 Module55Name=Códigos de barra
 Module55Desc=Administração dos códigos de barra
 Module56Name=Telefonia
 Module56Desc=Administração da telefonia
 Module57Name=Débitos Diretos
-Module57Desc=Administração de débitos diretos e créditos bancários
 Module59Desc=Adicione função para gerar uma conta Bookmark4u desde uma conta do ERP
 Module70Desc=Administração de Intervenções
 Module75Name=Notas de despesas e deslocamentos
@@ -351,15 +355,13 @@ Module700Desc=Administração de Bolsas
 Module1200Desc=Interface com o sistema de seguimento de incidências Mantis
 Module1400Name=Contabilidade
 Module1400Desc=Gestão de Contabilidade (partes duplas)
-Module1780Name=Categorias
-Module1780Desc=Administração de categorias (produtos, Fornecedores e clientes)
 Module2000Name=Editor WYSIWYG
 Module2000Desc=Permitir editar alguma área de texto usando um editor avançado
-Module2300Desc=Gerenciamento de tarefas agendadas
 Module2400Desc=Administração da agenda e das ações
 Module2500Name=Administração Eletrônica de Documentos
 Module2600Name=Webservices
 Module2600Desc=Ativar o servidor de serviços web Dolibarr
+Module2650Name=WebServices (cliente)
 Module2700Name=Sobrescrito
 Module2700Desc=Usar o serviço on-line Gravatar (www.gravatar.com) para mostrar fotos de usuários / membros (que se encontra com os seus e-mails). Precisa de um acesso à Internet
 Module2800Desc=Cliente de FTP
@@ -370,13 +372,11 @@ Module5000Desc=Permite-lhe gerenciar várias empresas
 Module6000Desc=Gestão de fluxo de trabalho
 Module20000Name=Sair da configuração de pedidos
 Module39000Name=Lote de produto
-Module39000Desc=Número do lote, para gestão da data de validade para venda dos produtos
 Module50000Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com PayBox
 Module50100Desc=Caixa registradora
 Module50200Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com Paypal
 Module50400Name=Contabilidade (avançada)
 Module50400Desc=Gestão de Contabilidade (partes duplas)
-Module54000Desc=Imprimir via Cups IPP Impressora.
 Module55000Name=Abrir Enquete
 Module55000Desc=Módulo para fazer pesquisas on-line (como Doodle, Studs, Rdvz ...)
 Module59000Name=Margems
@@ -397,10 +397,12 @@ Permission44=Eliminar projetos
 Permission91=Consultar Impostos e ICMS
 Permission92=Criar/Modificar Impostos e ICMS
 Permission93=Eliminar Impostos e ICMS
+Permission101=Consultar Expedições
+Permission102=Criar/Modificar Expedições
+Permission104=Confirmar Expedições
 Permission106=Envios de exportação
+Permission109=Eliminar Expedições
 Permission112=Criar/Modificar quantidade/eliminar registros bancários
-Permission113=Configurar contas financeiras (criar, controlar as categorias)
-Permission114=Exportar transações e registros bancários
 Permission115=Exportar transações e extratos
 Permission116=Captar transferências entre contas
 Permission117=Gerenciar envio de cheques
@@ -412,8 +414,11 @@ Permission151=Consultar Débitos Diretos
 Permission152=Configurar Débitos Diretos
 Permission153=Consultar Débitos Diretos
 Permission154=Crédito / recusar ordens permanentes recibos
+Permission161=Leia contratos / assinaturas
+Permission171=Leia viagens e despesas (próprios e de seus subordinados)
 Permission172=Criar/Modificar viagens e gastos
 Permission173=Remover viagens e gastos
+Permission174=Leia todas as viagens e despesas
 Permission178=Exportar viagens e gastos
 Permission194=Consultar Linhas da Lagura de Banda
 Permission205=Gerenciar Ligações
@@ -465,6 +470,8 @@ Permission701=Criar/Modificar Bolsas
 Permission702=Eliminar Bolsas
 Permission703=Excluir doações
 Permission1001=Consultar estoques
+Permission1002=Criar / modificar armazéns
+Permission1003=Excluir Armazéns
 Permission1004=Consultar movimentos de estoque
 Permission1005=Criar/Modificar movimentos de estoque
 Permission1101=Consultar ordens de envio
@@ -481,8 +488,6 @@ Permission1237=Pedidos a fornecedores Export e seus detalhes
 Permission1251=Execute as importações em massa de dados externos para o banco de dados (carga de dados)
 Permission1321=Exportar faturas a clientes, atributos e cobranças
 Permission1421=Exportar faturas de clientes e atributos
-Permission23002 =Criar/atualizar tarefa agendada
-Permission23003 =Apagar tarefa agendada
 Permission2401=Ler ações (eventos ou tarefas) vinculadas na sua conta
 Permission2402=Criar/Modificar/Eliminar ações (eventos ou tarefas) vinculadas na sua conta
 Permission2403=Consultar ações (acontecimientos ou tarefas) de outros
@@ -521,6 +526,7 @@ DictionaryOrderMethods=Métodos de compra
 DictionarySource=Origem das propostas / ordens
 DictionaryAccountancyplan=Plano de contas
 DictionaryAccountancysystem=Modelos para o plano de contas
+DictionaryEMailTemplates=Modelos de E-mails
 SetupSaved=configuração guardada
 BackToDictionaryList=Voltar para a lista de dicionários
 VATReceivedOnly=Impostos especiais não faturaveis
@@ -553,10 +559,13 @@ CalcLocaltax3Desc=Relatorio de taxas locais e o total de taxas locais de vendas
 NbOfDays=N� de Dias
 AlwaysActive=Sempre Ativo
 UpdateRequired=Parâmetros sistema necessita de uma atualização. Para atualizar click em  e-mail)
 OSCommerceErrorConnectOkButWrongDatabase=a login se ha estabelecido, mas a base de dados não parece de OSCommerce.
 OSCommerceTestOk=a login à servidor '%s' sobre a base '%s' por o Usuário '%s' é correta.
 OSCommerceTestKo1=a login à servidor '%s' sobre a base '%s' por o Usuário '%s' não se pode efetuar.
 OSCommerceTestKo2=a login à servidor '%s' por o Usuário '%s' ha falhado.
+StockSetup=Configuração do módulo Armazém / Warehouse
 Menu=Seleção dos menus
 MenuHandler=Gerente de menus
 HideUnauthorizedMenu=Esconder menus não autorizadas (cinza)
@@ -1016,4 +1023,8 @@ FiscalYear=Ano fiscal
 FiscalYearCard=Ficha ano fiscal
 DeleteFiscalYear=Remover ano fiscal
 ConfirmDeleteFiscalYear=Voçê tem certeza que quer deleitar este ano fical ?
+AlwaysEditable=Sempre pode ser editado
+NbMajMin=Número mínimo de caracteres maiúsculos
+NbNumMin=Número mínimo de caracteres numéricos
+NbSpeMin=Número mínimo de caracteres especiais
 TypePaymentDesc=0: Pagamento para Cliente, 1: Pagamento para Fornecedor, 2: Pagamentos para Clientes e Fornecedores
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index 07a485a30f7..a1a02cb7e67 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -18,6 +18,7 @@ ActionsToDoBy=Eventos atribuídos à
 ActionsDoneBy=Eventos concluído por
 ActionsForUser=Eventos para o usuário
 ActionsForUsersGroup=Eventos para todos os usuários do grupo
+ActionAssignedTo=Evento atribuído a
 AllMyActions=Todos meus eventos/tarefas
 AllActions=Todas os eventos/tarefas
 ViewList=Exibir lista
@@ -32,18 +33,18 @@ AgendaExtSitesDesc=Esta página permite importar calendários de fontes externas
 ActionsEvents=Para qual eventos o Dolibarr irá criar uma atividade na agenda automaticamente
 PropalValidatedInDolibarr=Proposta %s validada
 InvoiceValidatedInDolibarr=Fatura %s validada
+InvoiceValidatedInDolibarrFromPos=Fatura %s validada no POS
 InvoiceBackToDraftInDolibarr=Fatura %s volta ao estado de rascunho
 OrderValidatedInDolibarr=Pedido %s validado
+OrderCanceledInDolibarr=Pedido %s cancelado
 OrderApprovedInDolibarr=Pedido %s aprovado
 OrderRefusedInDolibarr=Pedido %s recusado
 OrderBackToDraftInDolibarr=Pedido %s volta ao estado de rascunho
-OrderCanceledInDolibarr=Pedido %s cancelado
 ProposalSentByEMail=Proposta comercial %s enviada por e-mail
 OrderSentByEMail=Pedido do cliente %s enviado por e-mail
 InvoiceSentByEMail=Fatura do cliente %s enviada por e-mail
 SupplierOrderSentByEMail=Pedido do fornecedor %s enviado por e-mail
 SupplierInvoiceSentByEMail=Fatura do fornecedor %s enviada por e-mail
-ShippingSentByEMail=Entrega %s enviado por e-mail
 ShippingValidated=Envio %s validado
 NewCompanyToDolibarr=Fornecedor criado
 DateActionPlannedStart=Data de início do planejamento
@@ -52,7 +53,6 @@ DateActionDoneStart=Data real de início
 DateActionDoneEnd=Data real de fim
 DateActionEnd=Data de término
 AgendaUrlOptions1=Você também pode adicionar os seguintes parâmetros para filtrar o resultado:
-AgendaUrlOptions2=Usuário=%s permitir apenas resultados para atividades atribuídas, criadas ou concluídas pelo usuário %s.
 AgendaUrlOptions3=logina=%s para restringir açoes de propriedade do usuario %s.
 AgendaUrlOptions4=Usuário=%s permitir apenas resultados para atividades atribuídas ao usuário %s.
 AgendaUrlOptionsProject=project=PROJECT_ID para restringir a saida de açoes associadas ao projeto PROJECT_ID.
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index a807b965562..7e43fc08c29 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -2,45 +2,46 @@
 Bill=Fatura
 Bills=Faturas
 BillsCustomers=Faturas de Clientes
-BillsCustomer=Fatura de Cliente
+BillsCustomer=Fatura a Clientes
 BillsSuppliers=Faturas de Fornecedores
 BillsCustomersUnpaid=Faturas de Clientes Pendentes de Cobrança
-BillsCustomersUnpaidForCompany=Faturas cliente nao pagas para %s
+BillsCustomersUnpaidForCompany=Faturas cliente não pagas para %s
 BillsSuppliersUnpaid=Faturas de Fornecedores Pendentes de Pagamento
 BillsSuppliersUnpaidForCompany=Faturas do fornecedor não pagas para %s
 BillsLate=Atrasos de Pagamento
-BillsStatistics=Estatísticas faturas a clientes
+BillsStatistics=Estatísticas de faturas a clientes
 BillsStatisticsSuppliers=Estatísticas faturas de Fornecedores
 DisabledBecauseNotErasable=Ação desativada porque não pode ser cancelada
 InvoiceStandard=Fatura Padrão
 InvoiceStandardAsk=Fatura Padrão
 InvoiceStandardDesc=Este tipo de fatura é a fatura tradicional. Também é conhecida como Fatura de Débito.
-InvoiceDeposit=Depositar Fatura
-InvoiceDepositAsk=Depositar Fatura
+InvoiceDeposit=Fatura de depósito
+InvoiceDepositAsk=Fatura de depósito
 InvoiceDepositDesc=Este tipo de fatura é feita com um depósito quando foi recebido.
 InvoiceProForma=Fatura Pro-Forma
 InvoiceProFormaAsk=Fatura Pro-Forma
 InvoiceProFormaDesc=Fatura Pro-Forma é uma verdadeira imagem de uma fatura, mas não tem valor contábil.
-InvoiceReplacement=Substituição da Fatura
-InvoiceReplacementAsk=Substituição da Fatura para Fatura
+InvoiceReplacement=Fatura de substituição
+InvoiceReplacementAsk=Fatura de substituição para Fatura
 InvoiceReplacementDesc=A fatura retificada serve para cancelar e para substituir uma fatura existente em que ainda não existe pagamentos.

    Nota: só uma fatura sem nenhum pagamento pode retificar se. Sim esta última não está fechada, passará automaticamente ao estado 'abandonada'.
 InvoiceAvoirAsk=Nota de Crédito para Corrigir a Fatura
 InvoiceAvoirDesc=A Nota de Crédito é uma fatura negativa destinada a compensar um valor de uma fatura que difere do valor realmente pago (por ter pago a mais ou por devolução de produtos, por Exemplo).

    Nota: Tenha em conta que a fatura original a corrigir deve ter sido fechada (' paga' ou ' paga parcialmente ') para poder realizar uma nota de crédito.
 invoiceAvoirWithLines=Criar Nota de Crédito conforme a fatura  original
 invoiceAvoirWithPaymentRestAmount=Cirar nota de credito com restante não pago da fatura original
 invoiceAvoirLineWithPaymentRestAmount=Nota de credito para valor restante não pago
-ReplaceInvoice=Retificar a Fatura %s
-ReplacementInvoice=Substituição da Fatura
+ReplaceInvoice=Substituir a Fatura %s
+ReplacementInvoice=Fatura de substituição
 ReplacedByInvoice=Substituído por Fatura %s
 ReplacementByInvoice=Substituído por Fatura
-CorrectInvoice=Correção de Fatura %s
-CorrectionInvoice=Correção de Fatura
-UsedByInvoice=Aplicar sobre a fatura %s
+CorrectInvoice=Corrigir Fatura %s
+CorrectionInvoice=Fatura de correção
+UsedByInvoice=Usada para pagar a fatura %s
 NotConsumed=Sem Consumo
 NoReplacableInvoice=Sem Faturas Retificáveis
 NoInvoiceToCorrect=Sem Faturas a Corrigir
+InvoiceHasAvoir=Corrigida por uma ou mais faturas
 CardBill=Ficha Fatura
-PredefinedInvoices=Fatura Predefinida
+PredefinedInvoices=Faturas Predefinidas
 Invoice=Fatura
 Invoices=Faturas
 InvoiceLine=Linha de Fatura
@@ -176,6 +177,8 @@ ExcessReceived=Recebido em Excesso
 EscompteOffered=Desconto (Pagamento antecipado)
 SendBillRef=Confirmação de fatura %s
 SendReminderBillRef=Lembrete de confirmação de fatura %s
+StandingOrders=Débitos Diretos
+StandingOrder=Débito Direto
 NoDraftBills=Nenhuma Fatura Rascunho
 NoOtherDraftBills=Nenhuma Outra Fatura Rascunho
 NoDraftInvoices=Nenhuma Fatura Rascunho
@@ -190,6 +193,7 @@ NoInvoice=Nenhuma Fatura
 ClassifyBill=Classificar a Fatura
 SupplierBillsToPay=Faturas de Fornecedores a Pagar
 CustomerBillsUnpaid=Faturas de Clientes Pendentes de Cobrança
+DispenseMontantLettres=Faturas escrita atraves proceduras mecanogaficas são dispensed pelos pedidos em cartas.
 NonPercuRecuperable=Sem Recuperação
 SetConditions=Definir Condições de Pagamento
 SetMode=Definir Modo de Pagamento
@@ -306,7 +310,6 @@ DisabledBecausePayments=Não é possível uma vez já que existem alguns pagamen
 CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento já que há pelo menos uma fatura classificada como pago
 ExpectedToPay=Esperando pagamento
 PayedByThisPayment=Pago
-ClosePaidInvoicesAutomatically=Classifique "Paid" todas as faturas padrão ou a substituição inteiramente paga.
 ClosePaidCreditNotesAutomatically=Classificar "pagou" todas as notas de crédito totalmente pago de volta.
 AllCompletelyPayedInvoiceWillBeClosed=Todos fatura que permanecer sem pagar será automaticamente fechada ao status de "Paid".
 ToMakePaymentBack=pagar tudo
@@ -314,7 +317,7 @@ NoteListOfYourUnpaidInvoices=Atenção: Esta lista inclue somente faturas para t
 RevenueStamp=Selo da receita
 YouMustCreateInvoiceFromThird=Esta opção só está disponível ao criar fatura de terceiros
 PDFCrabeDescription=Modelo de fatura completo (ICMS, método de pagamento a mostrar, logotipo...)
-TerreNumRefModelDesc1=Mostrarr número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0
+TerreNumRefModelDesc1=Mostrar número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0
 MarsNumRefModelDesc1=Mostrar número com formato %syymm-nnnn padrão para faturas e %syymm-nnnn para notas de crédito onde yy é o ano, mm mês e nnnn é uma sequência, sem interrupção e não pode mostrar o valor 0
 TerreNumRefModelError=O projeto começa começado por $syymm já existe e não é compatível com este modelo de seq�ência. Remova-o ou renomei-o para ativar este módulo.
 TypeContact_facture_internal_SALESREPFOLL=Responsável do acompanhamento da fatura do cliente
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index 539954acb35..241cec78db8 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -1,50 +1,16 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Rubrica
-Rubriques=Rubricas
-categories=Categorias
 In=Em
-ThirdPartyCategoriesArea=Área Categorias de Fornecedores
-MembersCategoriesArea=Área categorias membros
-ContactsCategoriesArea=Contatos area categorias
 NoSubCat=Esta categoria não contém Nenhuma subcategoria.
-ErrSameCatSelected=Selecionou a mesma categoria varias vezes
-ErrForgotCat=Esqueceu de escolher a categoria
 ErrForgotField=Esqueceu de atribuir um campo
 ErrCatAlreadyExists=Este nome esta sendo utilizado
-ImpossibleAddCat=Impossível Adicionar a categoria
-ObjectAlreadyLinkedToCategory=O elemento já está associado a esta categoria
-MemberIsInCategories=Este membro deve as seguintes categorias de membros
-ContactIsInCategories=Este contato pertence as seguentes categorias contatos
-CompanyHasNoCategory=Esta empresa não se encontra em Nenhuma categoria em particular
-MemberHasNoCategory=Este membro nao esta em nenhuma categoria
-ContactHasNoCategory=Este contato nao esta em nenhuma categoria
-ClassifyInCategory=Esta categoria não contém clientes
 ContentsVisibleByAll=O Conteúdo Será Visivel por Todos?
 ContentsVisibleByAllShort=Conteúdo visivel por todos
 ContentsNotVisibleByAllShort=Conteúdo não visivel por todos
-CategoriesTree=Tipos de categoria
-ConfirmDeleteCategory=Tem certeza que quer eliminar esta categoria?
-RemoveFromCategoryConfirm=Tem certeza que quer eliminar o link entre a transação e a categoria?
-MembersCategoryShort=Categoria de membros
-MembersCategoriesShort=Categoria de membros
-ContactCategoriesShort=Categorias contatos
 ThisCategoryHasNoProduct=Esta categoria não contém nenhum produto.
 ThisCategoryHasNoSupplier=Esta categoria não contém a nenhum fornecedor.
 ThisCategoryHasNoCustomer=Esta categoria não contém a nenhum cliente.
 ThisCategoryHasNoMember=Esta categoria nao contem nenhum membro.
 ThisCategoryHasNoContact=Esta categoria nao contem nenhum contato.
-CatSupList=Lista de categorias de fornecedores
-CatCusList=Lista de Categorias de Clientes/Perspectivas
-CatProdList=Lista de Categorias de Produtos
-CatMemberList=Lista de membros categorias
-CatContactList=Lista de categorias contatos e do contato
-CatSupLinks=Linkes entre fornecedores e catogorias
-CatCusLinks=Linkes entre clientes/prospetivas e categorias
-CatProdLinks=Linkes entre produtos/servicos e categorias
-CatMemberLinks=Linkes entre membros e categorias
-DeleteFromCat=Excluir da categoria
 ExtraFieldsCategories=atributos complementares
-CategoriesSetup=Configuração de categorias
-CategorieRecursiv=Ligação com a categoria automaticamente
 CategorieRecursivHelp=Se ativado, o produto também será ligada a categoria original quando adicionando em uma subcategoria
 AddProductServiceIntoCategory=Adicione o seguinte produto / serviço
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index 36a14dfc527..2c7721204b6 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -9,20 +9,14 @@ URLToLaunchCronJobs=URL para checar e iniciar os cron se necessario
 OrToLaunchASpecificJob=Ou checkar e iniciar um specifico trabalho
 KeyForCronAccess=Chave seguranca para URL que lanca tarefas cron
 FileToLaunchCronJobs=Linha de comando para iniciar tarefas agendadas
-CronExplainHowToRunUnix=No ambiente Unix você deve usar crontab para executar linha de comando a cada minuto
-CronExplainHowToRunWin=No ambiente Microsoft (tm) Windows você pode usar ferramentas tarefa agendada para executar a linha de comando cada minuto
+CronExplainHowToRunUnix=No ambiente Unix você deve usar a seguinte entrada crontab para executar a linha de comando a cada 5 minutos
+CronExplainHowToRunWin=Em ambiente Microsoft (tm)  Windows,  Você PODE USAR Ferramentas de Tarefa agendada Para executar a Linha de Comando de Cada 5 Minutos
 CronJobs=Trabalhos programados
+CronListActive=Lista de tarefas ativas / Programadas
 CronListInactive=Lista de trabalhos nao ativos
 CronDateLastRun=Ultimo acionamento
 CronLastOutput=Saida do ultimo acionamento
 CronLastResult=Codigo do ultimo resultado
-CronList=Lista trabalhos
-CronDelete=Apagar tarefas cron
-CronConfirmDelete=Tem certeza que deseja apagar este trabalho cron ?
-CronExecute=Lançar trabalho
-CronConfirmExecute=Tem certeza que quer executar esta tarefa agora ?
-CronInfo=Tarefas permitem de executar aòoes nao planejadas
-CronWaitingJobs=Trabalhos na espera
 CronTask=Trabalho
 CronNone=Nenhum
 CronDtStart=Data inicio
diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang
index 2d8c7d33d13..a4d3db1317d 100644
--- a/htdocs/langs/pt_BR/donations.lang
+++ b/htdocs/langs/pt_BR/donations.lang
@@ -4,11 +4,23 @@ Donations=Doações
 DonationRef=Doaçaõ ref.
 Donor=Dador
 Donors=Dadores
+AddDonation=Criar uma doação
+NewDonation=Nova Doação
 ShowDonation=Mostrar doaçaõ
 DonationsPaid=Doações pagas
+DonationsReceived=Doações Recebidas
+PublicDonation=Doação Pública
+DonationsNumber=Número de Doações
+DonationsArea=Área de Doações
 DonationStatusPaid=Doaçaõ recebida
+DonationStatusPromiseValidatedShort=Validada
 DonationReceipt=Recibo doaçaõ
+DonationsModels=Modelo de documento de recepção de Doação
 LastModifiedDonations=As ultimas %s doações modificadaas
 SearchADonation=Buscar doaçaõ
 DonationRecipient=Recipiente doaçaõ
 IConfirmDonationReception=Declaro o recebimento como doaçaõ, de seguinte montante.
+MinimumAmount=O montante mínimo é de %s
+DONATION_ART200=Mostrar o artigo 200 do CGI se você está preocupado
+DONATION_ART238=Mostrar o artigo 238 do CGI se você está preocupado
+DONATION_ART885=Mostrar o artigo 885 do CGI se você está preocupado
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 6bdc570f7f9..37c2f0b6559 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -18,7 +18,6 @@ ErrorFromToAccountsMustDiffers=a conta origem e destino devem ser diferentes.
 ErrorBadThirdPartyName=Nome de Fornecedor incorreto
 ErrorProdIdIsMandatory=Obrigatório
 ErrorBadCustomerCodeSyntax=a sintaxis do código cliente é incorreta
-ErrorBadBarCodeSyntax=A sintaxe do código de barras esta  incorreta
 ErrorBarCodeRequired=Código de barras necessário
 ErrorBarCodeAlreadyUsed=Código de barras já utilizado
 ErrorUrlNotValid=O Endereço do Site está incorreta
@@ -63,9 +62,8 @@ ErrorRefAlreadyExists=a referencia utilizada para a criação já existe
 ErrorRecordHasChildren=não se pode eliminar o registo porque tem hijos.
 ErrorRecordIsUsedCantDelete=Não é possível excluir registro. Ele já é usado ou incluídos em outro objeto.
 ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display.
-ErrorContactEMail=Um erro técnico ocorrido. Por favor, contate o administrador para seguinte e-mail% s en fornecer o código de erro% s em sua mensagem, ou ainda melhor, adicionando uma cópia de tela da página.
+ErrorContactEMail=Ocorreu um erro técnico. Por favor, contate o administrador no seguinte e-mail %s e forneça o seguinte código de erro %s em sua mensagem. Ou, se possível, adicione uma foto da tela - print screen.
 ErrorWrongValueForField=Valor errado para o número do campo% s (valor '% s' não corresponde regra% s)
-ErrorFieldValueNotIn=Valor errado para o número do campo% s (valor '% s' não é um valor disponível no campo% s da tabela% s)
 ErrorFieldRefNotIn=Valor errado para o número do campo% s (valor '% s' não é um% s ref existente)
 ErrorsOnXLines=Erros no registro de origem% s (s)
 ErrorSpecialCharNotAllowedForField=Os caracteres especiais não são permitidos para o campo "% s"
@@ -95,6 +93,7 @@ ErrorLoginDoesNotExists=a conta de usuário de %s não foi encontrado.
 ErrorLoginHasNoEmail=Este usuário não tem e-mail. impossível continuar.
 ErrorBadValueForCode=Valor incorreto para o código. volte a \ttentar com um Novo valor...
 ErrorBothFieldCantBeNegative=Campos% se% s não pode ser tanto negativo
+ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade nas linhas das notas de clientes não pode ser negativa
 ErrorWebServerUserHasNotPermission=Conta de usuário usado para executar servidor não tem permissão
 ErrUnzipFails=Falha ao descompactar com ZipArchive
 ErrNoZipEngine=Não esta instaladoo programa para descompactar o arquivo% s neste PHP
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index 5dddd399559..69d44f38411 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -2,6 +2,7 @@
 MailTargets=Destinatários
 MailRecipient=Destinatário
 MailTo=Destinatário(s)
+MailCC=Copiar para
 MailFile=Arquivo
 ResetMailing=Limpar Mailing
 MailingResult=Resultado do envio de e-mails
@@ -27,6 +28,7 @@ ConfirmCloneEMailing=Voce tem certeza que quer clonar este e-mailing ?
 CloneContent=Clonar mensagem
 CloneReceivers=Clonar recebidores
 DateLastSend=Data ultimo envio
+DateSending=Data envio
 CheckRead=Ler recebidor
 YourMailUnsubcribeOK=O e-mail %s foi removido com sucesso da lista
 MailtoEMail=Hyper-link ao e-mail
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index e7008da51cd..2c65942015a 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -40,6 +40,7 @@ ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de contribuição so
 ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
 SelectDate=Selecionar uma data
 SeeAlso=Ver tambem %s
+SeeHere=veja aqui
 BackgroundColorByDefault=Cor do fundo padrão
 FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique no "Anexar arquivo" para proceder.
 NbOfEntries=Nr. de entradas
@@ -50,9 +51,12 @@ LevelOfFeature=Nível de funções
 DefinedAndHasThisValue=Definido e valor para
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr está configurado em modo de autenticação %s ao arquivo de configuração conf.php.
     Eso significa que a base de dados das Senhas é externa a Dolibarr, por eso toda modificação deste campo pode resultar sem efeito alguno.
 PasswordForgotten=Esqueceu de da sua senha?
+SeeAbove=Mencionar anteriormente
 LastConnexion=último login
 PreviousConnexion=último login
 ConnectedOnMultiCompany=Conectado no ambiente
+AuthenticationMode=Modo autenticação
+RequestedUrl=Url solicitada
 DatabaseTypeManager=Tipo de gerente de base de dados
 RequestLastAccess=Petição último acesso e a base de dados
 RequestLastAccessInError=Petição último acesso e a base de dados errado
@@ -71,22 +75,40 @@ Closed2=Encerrado
 Enabled=Ativado
 Disable=Desativar
 Disabled=Desativado
+AddLink=Adicionar link
+Update=Modificar
 AddActionToDo=Adicionar ação a realizar
 AddActionDone=Adicionar ação realizada
+ConfirmSendCardByMail=Quer enviar esta ficha por e-mail?
+Delete=Eliminar
+Remove=Retirar
+Validate=Confirmar
+ToValidate=A Confirmar
+SaveAs=Guardar como
 TestConnection=Teste a login
+ToClone=Cópiar
 ConfirmClone=Selecciones dados que deseja Cópiar.
+NoCloneOptionsSpecified=Não existem dados definidos para copiar
 Go=Ir
 Run=Attivo
+Show=Ver
+ShowCardHere=Mostrar cartão
 Upload=Enviar Arquivo
+ChooseLangage=Escolher o seu idioma
 Resize=Modificar tamanho
 Recenter=Recolocar no centro
 User=Usuário
 Users=Usuário
+NoUserGroupDefined=Nenhum grupo definido pelo usuário
 PasswordRetype=Repetir Senha
 NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
+PersonalValue=Valor Personalizado
 CurrentValue=Valor atual
+MultiLanguage=Multi Idioma
+RefOrLabel=Ref. da etiqueta
 DefaultModel=Modelo Padrão
 Action=Ação
+About=Acerca de
 NumberByMonth=Numero por mes
 Limit=Límite
 DevelopmentTeam=Equipe de Desenvolvimento
@@ -96,19 +118,30 @@ Connection=Login
 Now=Agora
 DateStart=Data Inicio
 DateEnd=Data Fim
+DateModification=Data Modificação
+DateModificationShort=Data Modif.
 DateLastModification=Data última Modificação
 DateValidation=Data Validação
+DateDue=Data Vencimento
+DateValue=Data Valor
+DateValueShort=Data Valor
+DateOperation=Data Operação
+DateOperationShort=Data Op.
 DateLimit=Data Límite
+DateRequest=Data Consulta
+DateProcess=Data Processo
 DurationDay=Día
 Day=Día
 days=Dias
+Weeks=Semandas
 Morning=Manha
 Quadri=Trimistre
 UseLocalTax=Incluindo taxa
-Copy=Cópiar
 Default=Padrao
 DefaultValue=Valor por default
+DefaultGlobalValue=Valor global
 UnitPrice=Preço Unit.
+UnitPriceHT=Preço Base
 UnitPriceTTC=Preço Unit. Total
 PriceU=Preço Unit.
 PriceUHT=Preço Unit.
@@ -154,10 +187,12 @@ ActionUncomplete=Imcompleto
 CompanyFoundation=Companhia/Fundação
 ContactsForCompany=Contatos desta empresa
 ContactsAddressesForCompany=Contatos/Endereços do Cliente ou Fornecedor
+AddressesForCompany=Endereços para este terceiro
 ActionsOnCompany=Ações nesta sociedade
 ActionsOnMember=Eventos deste membro
 NActions=%s ações
 RequestAlreadyDone=Pedido ja registrado
+RemoveFilter=Eliminar filtro
 GeneratedOn=Gerado a %s
 Available=Disponivel
 NotYetAvailable=Ainda não disponível
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 677d7eefba3..d816efbdacd 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -1,14 +1,21 @@
 # Dolibarr language file - Source file is en_US - orders
+OrdersArea=Área de Pedidos de Clientes
 OrderId=ID Pedido
 OrderLine=Linha de Comando
 OrderToProcess=Pedido a se processar
 CustomerOrder=Pedido de Cliente
-OrdersToBill=Pedidos por Faturar
+CustomersOrders=Pedidos de clientes
+OrdersToValid=Pedidos de Clientes a Confirmar
+OrdersToBill=Pedidos de Clientes Entregues
+OrdersInProcess=Pedidos de Clientes em Processo
+OrdersToProcess=Pedidos de Clientes à processar
 SuppliersOrdersToProcess=Pedidos de fornecedor a se processar
 StatusOrderSentShort=Em processo
 StatusOrderSent=Envio em processo
+StatusOrderOnProcessShort=Pedido
 StatusOrderToBillShort=Entregue
 StatusOrderToBill2Short=A se faturar
+StatusOrderOnProcess=Pedido - Aguardando Recebimento
 StatusOrderToBill=A Faturar
 StatusOrderToBill2=A Faturar
 ShippingExist=Existe envio
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 010797bc380..f946e4512e3 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -25,7 +25,6 @@ Notify_PROPAL_SENTBYMAIL=Proposta comercial enviada por e-mail
 Notify_BILL_PAYED=Fatura cliente paga
 Notify_BILL_CANCEL=Fatura cliente cancelada
 Notify_BILL_SENTBYMAIL=Fatura cliente enviada por e-mail
-Notify_ORDER_SUPPLIER_VALIDATE=Pedido fornecedor validado
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Pedido fornecedor enviado por e-mail
 Notify_BILL_SUPPLIER_VALIDATE=Fatura fornecedor validada
 Notify_BILL_SUPPLIER_PAYED=Fatura fornecedor paga
@@ -41,7 +40,6 @@ Notify_PROJECT_CREATE=criação de projeto
 Notify_TASK_CREATE=Tarefa criada
 Notify_TASK_MODIFY=Tarefa alterada
 Notify_TASK_DELETE=Tarefa excluída
-SeeModuleSetup=Ver modulo configurações
 TotalSizeOfAttachedFiles=Tamanho Total dos Arquivos/Documentos Anexos
 LinkedObject=Arquivo Anexo
 PredefinedMailTest=Esse e um teste de envio.⏎\nAs duas linhas estao separadas por retono de linha.⏎\n⏎\n__SIGNATURE__
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index d30c9cbbf8b..8e6cd71053a 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -7,8 +7,12 @@ MassBarcodeInit=Inicialização de código de barras.
 MassBarcodeInitDesc=Esta página pode ser usado para inicializar um código de barras em objetos que não têm código de barras definidas. Verifique antes que a instalação do módulo de código de barras é completa.
 ProductAccountancyBuyCode=Codigo contabilidade (compras)
 ProductAccountancySellCode=Codigo contabilidade (vendas)
-ProductsOnSellAndOnBuy=Produtos não para venda ou compra
-ServicesOnSellAndOnBuy=Serviços não para venda ou compra
+ProductsAndServicesOnSell=Produtos e Serviços para venda ou para compra
+ProductsOnSell=Produto para venda ou para compra
+ProductsNotOnSell=Produto fora de venda e de compra
+ProductsOnSellAndOnBuy=Produtos para venda e compra
+ServicesOnSell=Serviços para venda ou para compra
+ServicesOnSellAndOnBuy=Serviços para venda e compra
 LastRecorded=últimos Produtos/Serviços em Venda Registados
 LastRecordedProductsAndServices=Os %s últimos Produtos/Perviços Registados
 LastModifiedProductsAndServices=Os %s últimos Produtos/Serviços Registados
@@ -32,6 +36,7 @@ MinPrice=Preço mínimo de venda
 MinPriceHT=Minimo preço de venda (líquido de imposto)
 MinPriceTTC=Minimo preço de venda (inc. taxa)
 CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS)
+ContractStatusClosed=Encerrado
 ContractStatusToRun=Para començar
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto
 ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço.
@@ -55,6 +60,7 @@ ProductAssociationList=Lista de produtos/serviços associados : Nome do produto/
 ProductParentList=Lista de pacote produtos/serviços com este produto como componente
 ErrorAssociationIsFatherOfThis=Um dos produtos selecionados é pai do produto em curso
 ConfirmDeleteProduct=? Tem certeza que quer eliminar este produto/serviço?
+ConfirmDeletePicture=? Tem certeza que quer eliminar esta foto?
 ConfirmDeleteProductLine=Tem certeza que quer eliminar esta linha de produto?
 NoStockForThisProduct=Não existe estoque deste produto
 NoStock=Sem estoque
@@ -96,6 +102,7 @@ AddThisServiceCard=Criar ficha serviço
 HelpAddThisServiceCard=Esta opção permite de criar ou clonar um serviço caso o mesmo não existe.
 AlwaysUseNewPrice=Usar sempre preço atual do produto/serviço
 AlwaysUseFixedPrice=Usar preço fixo
+PriceByQuantity=Diferentes preços por quantidade
 PriceByQuantityRange=Intervalo de quantidade
 ProductsDashboard=Resumo de produtos/serviços
 HelpUpdateOriginalProductLabel=Permite editar o nome do produto
@@ -128,8 +135,9 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definição do código ou valor do c
 BarCodeDataForProduct=Informações de código de barras do produto% s:
 BarCodeDataForThirdparty=Informações de código de barras do fornecedor:
 ResetBarcodeForAllRecords=Definir o valor de código de barras para todos os registros (isto também irá repor valor de código de barras já definido com novos valores)
+PriceByCustomer=Preço diferente para cada cliente
 PriceCatalogue=Preço único por produto / serviço
-PricingRule=As regras de tarifação
+PricingRule=Regras para os preços dos clientes
 AddCustomerPrice=Adicione preço por parte dos clientes
 ForceUpdateChildPriceSoc=Situado mesmo preço em outros pedidos dos clientes
 PriceByCustomerLog=Preço por cliente
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 1b32494e7c8..e16645e7107 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -9,11 +9,14 @@ MyTasksDesc=Esta exibição é limitado a projetos ou tarefas que você é um co
 TasksPublicDesc=Essa exibição apresenta todos os projetos e tarefas que você tem permissão para ler.
 TasksDesc=Essa exibição apresenta todos os projetos e tarefas (suas permissões de usuário concede-lhe ver tudo).
 AddProject=Criar projeto
+DeleteAProject=Eliminar um Projeto
+DeleteATask=Eliminar uma Tarefa
 ConfirmDeleteAProject=Tem certeza que quer eliminar este projeto?
 ConfirmDeleteATask=Tem certeza que quer eliminar esta tarefa?
 OfficerProject=Responsável do Projeto
 LastProjects=Os %s últimos Projetos
 ShowProject=Adicionar Projeto
+NoProject=Nenhum Projeto Definido
 NbOpenTasks=No Tarefas Abertas
 NbOfProjects=No de Projetos
 TimeSpent=Tempo Dedicado
@@ -74,8 +77,7 @@ SelectElement=Selecionar componente
 AddElement=Link para componente
 UnlinkElement=Desligar elemento
 DocumentModelBaleine=Modelo de relatório de um projeto completo (logo. ..)
-PlannedWorkload =carga horária planejada
-WorkloadOccupation=Carga horária empregada
+PlannedWorkload=carga horária planejada
 ProjectReferers=Fazendo referência a objetos
 SearchAProject=Buscar um projeto
 ProjectMustBeValidatedFirst=O projeto tem que primeiramente ser validado
diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang
index a17cd46bf39..a1e3c7bb152 100644
--- a/htdocs/langs/pt_BR/sendings.lang
+++ b/htdocs/langs/pt_BR/sendings.lang
@@ -3,7 +3,6 @@ RefSending=Ref. Envio
 SendingsArea=Área Envios
 LastSendings=Os %s últimos Envios
 QtyReceived=Quant. Recibida
-KeepToShip=Fica por Enviar
 StatusSendingValidated=Validado (produtos a enviar o enviados)
 Carriers=Transportadoras
 Carrier=Transportadora
@@ -22,11 +21,8 @@ SendShippingRef=Submeter para envio %s
 ActionsOnShipping=Eventos no envio
 LinkToTrackYourPackage=Atalho para rastreamento do pacote
 ShipmentCreationIsDoneFromOrder=No momento a criaçao de um novo envio e feito da ficha de pedido.
-RelatedShippings=Envios relativos
 ShipmentLine=Linha de envio
 CarrierList=Lista de transportadoras
-SendingRunning=Produto da ordem do cliente ja enviado
-SuppliersReceiptRunning=Produto do pedido do fornecedor ja recebido
 SendingMethodCATCH=Remoção pelo cliente
 SendingMethodTRANS=Transportadora
 SendingMethodCOLSUI=Acompanhamento
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 4822d5d1436..748c36ddb11 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separador
 ExtrafieldCheckBox=Caixa de verificação
 ExtrafieldRadio=Botão
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Despesas especiais (impostos, contribuições sociais, dividendos)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salários
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notificações
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Bolsas
@@ -508,14 +511,14 @@ Module1400Name=Perito de Contabilidade
 Module1400Desc=Perido de gestão da Contabilidade (dupla posição)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categorías
-Module1780Desc=Gestão de categorías (produtos, Fornecedores e clientes)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=Editor WYSIWYG
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Gestão de tarefas agendadas
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Gestão da agenda e das acções
 Module2500Name=Gestão Electrónica de Documentos
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Criar/modificar salários
 Permission514=Apagar salários
 Permission517=Exportar salários
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Ler serviços
 Permission532=Criar / modificar serviços
 Permission534=Apagar serviços
@@ -746,6 +754,7 @@ Permission1185=Aprovar pedidos a Fornecedores
 Permission1186=Enviar pedidos a Fornecedores
 Permission1187=Receber pedidos de Fornecedores
 Permission1188=Fechar pedidos a Fornecedores
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Obter resultado de uma exportação
 Permission1202=Criar/Modificar Exportações
 Permission1231=Consultar facturas de Fornecedores
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Executar importações em massa de dados externos em bases de dados (dados de carga)
 Permission1321=Exportar facturas a clientes, atributos e cobranças
 Permission1421=Exportar facturas de clientes e atributos
-Permission23001 = Ler tarefa agendada
-Permission23002 = Criar/alterar tarefa agendada
-Permission23003 = Eliminar tarefa agendada
-Permission23004 = Executar tarefa agendada
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Ler acções (eventos ou tarefas) vinculadas na sua conta
 Permission2402=Criar/Modificar/Eliminar acções (eventos ou tarefas) vinculadas na sua conta
 Permission2403=Consultar acções (acontecimientos ou tarefas) de outros
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Devolve um código contabilistico composto de 401 segu
 ModuleCompanyCodePanicum=Devolve um código contabilistico vazio.
 ModuleCompanyCodeDigitaria=Devolve um código contabilistico composto por o código do Terceiro. O código está formado por caracter ' C ' na primeira posição seguido dos 5 primeiros caracteres do código do Terceiro.
 UseNotifications=Usar Notificações
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documentos modelos
 DocumentModelOdt=Crie documentos a partir dos modelos OpenDocuments (ficheiros .ODT ou .ODS para o KOffice, OpenOffice, TextEdit,...)
 WatermarkOnDraft=Marca d'
@@ -1557,6 +1566,7 @@ SuppliersSetup=Fornecedor de configuração do módulo
 SuppliersCommandModel=Complete modelo de ordem do fornecedor (logo. ..)
 SuppliersInvoiceModel=Modelo completo da factura do fornecedor (logo. ..)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=MaxMind GeoIP instalação do módulo
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 74a87737d21..3c906efba05 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Factura Validada
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Factura %s voltou ao estado de rascunho
 InvoiceDeleteDolibarr=Fatura %s apagada
-OrderValidatedInDolibarr= Encomenda %s validada
+OrderValidatedInDolibarr=Encomenda %s validada
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Encomenda %s cancelada
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Encomenda %s aprovada
 OrderRefusedInDolibarr=Encomenda %s recusada
 OrderBackToDraftInDolibarr=Encomenda %s voltou ao estado de rascunho
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 8a28a423f86..b7a851ff0b0 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Pagamentos efectuados
 PaymentsBackAlreadyDone=Devolução de pagamentos efetuados
 PaymentRule=Estado do Pagamento
 PaymentMode=Forma de Pagamento
-PaymentConditions=Tipo de Pagamento
-PaymentConditionsShort=Tipo de Pagamento
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Montante a Pagar
 ValidatePayment=Validar pagamento
 PaymentHigherThanReminderToPay=Pagamento superior ao resto a pagar
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual
 ConfirmRemoveDiscount=Tem certeza de que deseja remover este desconto?
 RelatedBill=factura relacionados
 RelatedBills=facturas relacionadas
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Última fatura relacionada
 WarningBillExist=Aviso, já existe uma ou mais faturas
 
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index 92a16ef7f3d..9fb4a949c6f 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categoria
-Categories=Categorias
-Rubrique=Categoria
-Rubriques=Categorias
-categories=categorias
-TheCategorie=A Categoria
-NoCategoryYet=Nenhuma Categoria Deste Tipo Criada
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=em
 AddIn=Adicionar em
 modify=Modificar
 Classify=Classificar
-CategoriesArea=Área Categorias
-ProductsCategoriesArea=Área Categorias de Produtos e Serviços
-SuppliersCategoriesArea=Área Categorias Fornecedores
-CustomersCategoriesArea=Área Categorias Clientes
-ThirdPartyCategoriesArea=Área Categorias de Terceiros
-MembersCategoriesArea=Os membros da zona categorias
-ContactsCategoriesArea=Área categorias dos contactos
-MainCats=Categorias Principais
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Sub-Categorias
 CatStatistics=Estatísticas
-CatList=Lista de Categorias
-AllCats=Todas as Categorias
-ViewCat=Ver Categoria
-NewCat=Nova Categoria
-NewCategory=Nova Categoria
-ModifCat=Modificar uma Categoria
-CatCreated=Categoria Criada
-CreateCat=Adicionar uma Categoria
-CreateThisCat=Adicionar esta Categoria
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Confirmar os campos
 NoSubCat=Esta categoria não contem Nenhuma subcategoria.
 SubCatOf=Subcategoria
-FoundCats=Categorias Encontradas
-FoundCatsForName=Categorias Encontradas com o Nome:
-FoundSubCatsIn=Subcategorias Encontradas na Categoria
-ErrSameCatSelected=Seleccionou a mesma categoria varias vezes
-ErrForgotCat=Esqueceu-se escolher a categoria
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Esqueceu-se atribuir um campo
 ErrCatAlreadyExists=Este nome esta ser utilizado
-AddProductToCat=Adicionar este produto a uma categoria?
-ImpossibleAddCat=Impossivel adicionar a categoria
-ImpossibleAssociateCategory=Impossível associar a categoria
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=Foi adicionado com êxito.
-ObjectAlreadyLinkedToCategory=O elemento já está emparelhado a esta categoria
-CategorySuccessfullyCreated=A Categoria %s foi inserida com sucesso
-ProductIsInCategories=Este produto/serviço encontra-se nas seguintes categorias
-SupplierIsInCategories=Este fornecedor encontra-se nas seguintes categorias
-CompanyIsInCustomersCategories=Esta empresa encontra-se nas seguintes categorias
-CompanyIsInSuppliersCategories=Esta empresa encontra-se nas seguintes categorias de Fornecedores
-MemberIsInCategories=Este membro possui a seguinte membros categorias
-ContactIsInCategories=Este contato pertence às seguintes categorias de contatos
-ProductHasNoCategory=Este produto/serviço não se encontra em nenhuma categoria em particular
-SupplierHasNoCategory=Este fornecedor não se encontra em Nenhuma categoria em particular
-CompanyHasNoCategory=Esta empresa não se encontra em nenhuma categoria em particular
-MemberHasNoCategory=Este membro não está em nenhuma categoria
-ContactHasNoCategory=Este contato não está em nenhuma categoria
-ClassifyInCategory=Esta categoria não contem clientes
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Nenhuma
-NotCategorized=Sem categoria
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Esta categoria já existe na mesma localização
 ReturnInProduct=Voltar à ficha produto/serviço
 ReturnInSupplier=Voltar à ficha fornecedor
@@ -66,22 +64,22 @@ ReturnInCompany=Voltar à ficha cliente/cliente potencial
 ContentsVisibleByAll=O conteúdo será visível por todos?
 ContentsVisibleByAllShort=Conteúdo visível por todos
 ContentsNotVisibleByAllShort=Conteúdo não visível por todos
-CategoriesTree=Árvore de Categorias
-DeleteCategory=Eliminar Categoria
-ConfirmDeleteCategory=Está seguro de querer eliminar esta categoria?
-RemoveFromCategory=Eliminar link com categoria
-RemoveFromCategoryConfirm=Está seguro de querer eliminar o link entre a transacção e a categoria?
-NoCategoriesDefined=Nenhuma Categoria Definida
-SuppliersCategoryShort=Categoria Fornecedores
-CustomersCategoryShort=Categoria Clientes
-ProductsCategoryShort=Categoria Produtos
-MembersCategoryShort=Membros da categoria
-SuppliersCategoriesShort=Categorias Fornecedores
-CustomersCategoriesShort=Categorias Clientes
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Cat. Clientes/Potenciais
-ProductsCategoriesShort=Categorias Produtos
-MembersCategoriesShort=categorias de membros
-ContactCategoriesShort=Categorias dos contactos
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Esta categoria não contem nenhum produto.
 ThisCategoryHasNoSupplier=Esta categoria não contem a nenhum fornecedor.
 ThisCategoryHasNoCustomer=Esta categoria não contem a nenhum cliente.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Esta categoria não contém qualquer contato.
 AssignedToCustomer=Atribuir a um cliente
 AssignedToTheCustomer=Atribuido a um cliente
 InternalCategory=Categoria Interna
-CategoryContents=Conteúdo da Categoria
-CategId=Id Categoria
-CatSupList=Lista de fornecedores categorias
-CatCusList=Lista de clientes / perspectiva categorias
-CatProdList=Lista dos produtos categorias
-CatMemberList=Categorias Lista de membros
-CatContactList=Lista de categorias de contato e contato
-CatSupLinks=Ligações entre os fornecedores e categorias
-CatCusLinks=Ligações entre os clientes/prospetos e categorias
-CatProdLinks=Ligações entre produtos/serviços e categorias
-CatMemberLinks=Ligações entre os membros e categorias
-DeleteFromCat=Remover da categoria
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Apagar Imagem
 ConfirmDeletePicture=Confirmar eliminação da imagem?
 ExtraFieldsCategories=Atributos Complementares
-CategoriesSetup=Configurar Categorias
-CategorieRecursiv=Ligar automaticamente com a categoria fonte 
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Se ativado, o produto também irá estar ligado à categoria fonte quando adicionar a uma subcategoria
 AddProductServiceIntoCategory=Adicioanr o produto/serviço seguinte
-ShowCategory=Mostrar categoria
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index 9c45da9a4da..bcac2727da0 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Resultado da última execução
 CronLastResult=Last result code
 CronListOfCronJobs=Lista de tarefas agendadas
 CronCommand=Comando
-CronList=Lista de tarefas
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Lançar tarefa
-CronConfirmExecute= Tem certeza que deseja executar esta tarefa agora
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Tarefa
-CronNone= Nenhuma
+CronNone=Nenhuma
 CronDtStart=Data de Início
 CronDtEnd=Data Fim
 CronDtNextLaunch=Próximo execução
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informação
 # Common
diff --git a/htdocs/langs/pt_PT/donations.lang b/htdocs/langs/pt_PT/donations.lang
index 0c3c915fb2f..3f5bf5256c8 100644
--- a/htdocs/langs/pt_PT/donations.lang
+++ b/htdocs/langs/pt_PT/donations.lang
@@ -6,6 +6,8 @@ Donor=Doador
 Donors=Doadores
 AddDonation=Crie uma donativo
 NewDonation=Novo Donativo
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Mostrar Donativo
 DonationPromise=Promessa de Doação
 PromisesNotValid=Promessas Não Validadas
@@ -21,6 +23,8 @@ DonationStatusPaid=Donativo Recebido
 DonationStatusPromiseNotValidatedShort=Não Validada
 DonationStatusPromiseValidatedShort=Validado
 DonationStatusPaidShort=Recebido
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validar promessa
 DonationReceipt=Recibo do Donativo
 BuildDonationReceipt=Criar Recibo
@@ -36,3 +40,4 @@ FrenchOptions=Opções para França
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 6ebfe918305..871b9d90af0 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Os parâmetros de configuração obrigatórios ainda não estão definidos
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index cdcc999daa0..48a6a9a29e3 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Lista de todas as notificações de e-mail enviado
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index b017d2c856e..f010590cf30 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -352,6 +352,7 @@ Status=Estado
 Favorite=Favoritos
 ShortInfo=Informação
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. fornecedor
 RefPayment=Ref. pagamento
 CommercialProposalsShort=Orçamentos
@@ -394,8 +395,8 @@ Available=Disponível
 NotYetAvailable=Ainda não disponivel
 NotAvailable=Não disponivel
 Popularity=Popularidade
-Categories=Categorias
-Category=Categoria
+Categories=Tags/categories
+Category=Tag/category
 By=Por
 From=De
 to=Para
@@ -694,6 +695,7 @@ AddBox=Adicionar Caixa
 SelectElementAndClickRefresh=Selecione um elemento e actualize a pagina
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Segunda-feira
 Tuesday=Terça-feira
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 8b26b315b94..a361d438b1e 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Área de Pedidos de Clientes
+OrdersArea=Area de Pedidos de clientes
 SuppliersOrdersArea=Área de Pedidos a Fornecedores
 OrderCard=Ficha Pedido
 OrderId=Id da Encomenda
@@ -64,7 +64,8 @@ ShipProduct=Enviar Produto
 Discount=Desconto
 CreateOrder=Criar Pedido
 RefuseOrder=Rejeitar o Pedido
-ApproveOrder=Aceitar o Pedido
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Confirmar o Pedido
 UnvalidateOrder=Pedido inválido
 DeleteOrder=Eliminar o pedido
@@ -102,6 +103,8 @@ ClassifyBilled=Classificar "Facturado"
 ComptaCard=Ficha Contabilidade
 DraftOrders=Rascunhos de Pedidos
 RelatedOrders=Pedidos Anexos
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Pedidos em Processo
 RefOrder=Ref. Pedido
 RefCustomerOrder=Ref. Pedido Cliente
@@ -118,6 +121,7 @@ PaymentOrderRef=Pagamento de Pedido %s
 CloneOrder=Copiar pedido
 ConfirmCloneOrder=Tem certeza de que deseja copiar este fim %s?
 DispatchSupplierOrder=Para receber %s fornecedor
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representante ordem do cliente seguimento
 TypeContact_commande_internal_SHIPPING=Representante transporte seguimento
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 764d37222a5..058cd2eca8e 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validação Ficha Intervenção
 Notify_FICHINTER_SENTBYMAIL=Intervenções enviadas por correio
 Notify_BILL_VALIDATE=Validação factura
 Notify_BILL_UNVALIDATE=Fatura do cliente não validada
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Fornecedor fim aprovado
 Notify_ORDER_SUPPLIER_REFUSE=Fornecedor fim recusado
 Notify_ORDER_VALIDATE=Pedido do cliente validado
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Proposta comercial enviada por correio
 Notify_BILL_PAYED=Fatura de Cliente paga
 Notify_BILL_CANCEL=Fatura do cliente cancelada
 Notify_BILL_SENTBYMAIL=Fatura do cliente enviada pelo correio
-Notify_ORDER_SUPPLIER_VALIDATE=Para fornecedor validado
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Para fornecedor enviada por correio
 Notify_BILL_SUPPLIER_VALIDATE=Fatura do fornecedor validado
 Notify_BILL_SUPPLIER_PAYED=Fatura do fornecedor paga
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Criação do projeto
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Número Ficheiros/Documentos anexos
 TotalSizeOfAttachedFiles=Tamanho Total dos Ficheiros/Documentos anexos
 MaxSize=Tamanho Máximo
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Factura %s validados
 EMailTextProposalValidated=O %s proposta foi validada.
 EMailTextOrderValidated=O %s pedido foi validado.
 EMailTextOrderApproved=Pedido %s Aprovado
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Pedido %s Aprovado por %s
 EMailTextOrderRefused=Pedido %s Reprovado
 EMailTextOrderRefusedBy=Pedido %s Reprovado por %s
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index a543f3549d6..913d8cddb47 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index 31d5119f907..b4bf887b4dd 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedores Associado
 ListContractAssociatedProject=Lista de Contratos Associados ao Projeto
 ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista de eventos associados ao projeto
 ActivityOnProjectThisWeek=Atividade do Projeto nesta Semana
 ActivityOnProjectThisMonth=Actividade do Projecto neste Mês
@@ -130,13 +131,15 @@ AddElement=Ligar ao elemento
 UnlinkElement=Desligar o elemento
 # Documents models
 DocumentModelBaleine=modelo de um projeto completo do relatório (logo. ..)
-PlannedWorkload = Carga de trabalho planeada
-WorkloadOccupation= Afectação da carga de trabalho
+PlannedWorkload=Carga de trabalho planeada
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Procurar um projeto
 ProjectMustBeValidatedFirst=Primeiro deve validar o projeto
 ProjectDraft=Esboço de projetos
 FirstAddRessourceToAllocateTime=Associar um recuirso para alocar a hora
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index ca9bf9bce91..3ea181e8313 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. de Envio
 Sending=Envio
 Sendings=Envios
+AllSendings=All Shipments
 Shipment=Envio
 Shipments=Envios
 ShowSending=Show Sending
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index b57b823e0fd..81944fcd5a3 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index d91192821e9..b9036a91790 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -8,9 +8,9 @@ VersionExperimental=Experimental
 VersionDevelopment=Dezvoltare
 VersionUnknown=Necunoscut
 VersionRecommanded=Recomandat
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
+FileCheck= Integritate Fișiere
+FilesMissing= Fișiere Lipsa
+FilesUpdated= Fișiere Actualizate
 FileCheckDolibarr=Check Dolibarr Files Integrity
 XmlNotFound=Xml File of Dolibarr Integrity Not Found
 SessionId=ID Sesiune
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio buton
 ExtrafieldCheckBoxFromList= Checkbox din tabel
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Lista de parametri trebuie să fie ca cheie, valoare 

     pentru exemplul: 
     1, valoare1 
     2, valoare2 
     3, value3 
     ... 

     Pentru a avea listă în funcție de o alta:
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Lista de parametri trebuie să fie de tip cheie, valoare 

     pentru exemplul: 
     1, valoare1 
     2, valoare2 
     3, value3 
     ...
 ExtrafieldParamHelpradio=Lista de parametri trebuie să fie de tip  cheie, valoare 

     pentru exemplul: 
     1, valoare1 
     2, valoare2 
     3, value3 
     ...
@@ -494,11 +495,13 @@ Module500Name=Cheltuieli speciale( taxe, contributii sociale, dividende)
 Module500Desc=Managementul cheltuielilor speciale cum ar fi taxele , contribuţiile sociale, dividendele si salariile
 Module510Name=Salarii
 Module510Desc=Managementul salariilor angajatilor si a plaţiilor
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notificări
 Module600Desc=Trimite notificări prin email la unele evenimente de afaceri Dolibarr la contactele terților (configurare definită pe fiecare terţ)
 Module700Name=Donatii
 Module700Desc=MAnagementul Donaţiilor
-Module770Name=Expense Report
+Module770Name=Raport Cheltuieli
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
 Module1120Name=Supplier commercial proposal
 Module1120Desc=Request supplier commercial proposal and prices
@@ -506,16 +509,16 @@ Module1200Name=Mantis
 Module1200Desc=Mantis integrare
 Module1400Name=Contabilitate
 Module1400Desc=Management Contabilitate de gestiune (partidă dublă)
-Module1520Name=Document Generation
+Module1520Name=Generare Document 
 Module1520Desc=Mass mail document generation
-Module1780Name=Categorii
-Module1780Desc=Categorii de "management (produse, furnizori şi clienţi)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fckeditor
 Module2000Desc=WYSIWYG Editor
 Module2200Name=Preţuri dinamice
 Module2200Desc=Activați utilizarea expresii matematice pentru prețuri
 Module2300Name=Cron
-Module2300Desc=Managementul taskurilor programate
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Acţiuni / activităţi de ordine de zi şi de gestionare a
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Citeşte salarii
 Permission512=Creare / Modificare salarii
 Permission514=Şterge salarii
 Permission517=Export salarii
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Citeşte servicii
 Permission532=Creare / Modificare servicii
 Permission534=Ştergere servicii
@@ -746,6 +754,7 @@ Permission1185=Aprobaţi furnizor ordinelor
 Permission1186=Comanda furnizor ordinelor
 Permission1187=Confirmarea de primire de furnizor de comenzi
 Permission1188=Inchide furnizor ordinelor
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Obţineţi rezultatul unui export
 Permission1202=Creare / Modificare de export
 Permission1231=Citeşte facturile furnizor
@@ -758,10 +767,10 @@ Permission1237=Export comenzi furnizori şi alte detalii
 Permission1251=Run masa importurile de date externe în baza de date (date de sarcină)
 Permission1321=Export client facturi, atribute şi plăţile
 Permission1421=Export client ordinele şi atribute
-Permission23001 = Citeste sarcină programată
-Permission23002 = Creare/Modificare sarcină programată
-Permission23003 = Ştergeţi o sarcină programată
-Permission23004 = Execută sarcină programată
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Citeşte acţiuni (evenimente sau sarcini) legate de acest cont
 Permission2402=Crea / modifica / delete acţiuni (evenimente sau sarcini) legate de acest cont
 Permission2403=Citeşte acţiuni (evenimente sau sarcini) de alţii
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Întoarceţi-vă un cod de contabilitate construit de
 ModuleCompanyCodePanicum=Întoarceţi-vă un gol de contabilitate cod.
 ModuleCompanyCodeDigitaria=Contabilitate cod depinde de o terţă parte de cod. Acest cod este format din caractere "C" în prima poziţie, urmat de primele 5 caractere de-a treia parte de cod.
 UseNotifications=Utilizaţi notificări
-NotificationsDesc=Funcţia E-mailuri cu notificări vă permite să trimiteți în linişte mail automat, pentru unele evenimente Dolibarr. Targetele pot fi definite: 
     * Pe contactele terţilor  (clienti sau furnizori), un terţ terță o dată
     * Sau prin stabilirea unei adrese target de e-mail globală de la pagina de configurare a modulului.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documente şabloane
 DocumentModelOdt=Generare din modelele OpenDocument (Fichier .ODT ou .ODS OpenOffice, KOffice, TextEdit…)
 WatermarkOnDraft=Watermark pe schiţa de document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Furnizorul modul de configurare
 SuppliersCommandModel=Finalizarea şablon de ordine furnizorul (logo. ..)
 SuppliersInvoiceModel=Model complet de factura furnizorului (logo. ..)
 SuppliersInvoiceNumberingModel=Modele numerotaţie al facturilor furnizori
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul de configurare
 PathToGeoIPMaxmindCountryDataFile=Calea către fișierul care conține Maxmind  tranlatarea IP la  țară. 
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index 50ca3ae994c..5e8e04e5de9 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Factura %s validată
 InvoiceValidatedInDolibarrFromPos=Factura %s validată din POS
 InvoiceBackToDraftInDolibarr=Factura %s revenită de statutul schiţă
 InvoiceDeleteDolibarr=Factura %s ştearsă
-OrderValidatedInDolibarr= Comanda %s validată
+OrderValidatedInDolibarr=Comanda %s validată
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Comanda  %s anulată
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Comanda %s aprobată
 OrderRefusedInDolibarr=Comanda %s refuzată
 OrderBackToDraftInDolibarr=Comanda %s revenită de statutul schiţă
@@ -91,3 +94,5 @@ WorkingTimeRange=Rang timp muncă
 WorkingDaysRange=Rang zile muncă
 AddEvent=Creare eveniment
 MyAvailability=Disponibilitatea mea
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 2365a67dac4..f642ec13a7b 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Plăţi deja efectuate
 PaymentsBackAlreadyDone=Plaţi Return  deja efectuate
 PaymentRule=Mod de Plată
 PaymentMode=Tip de plată
-PaymentConditions=Termen de plată
-PaymentConditionsShort=Termen de plată
+PaymentTerm=Conditii de plata
+PaymentConditions=Conditiile de plata
+PaymentConditionsShort=Conditiile de plata
 PaymentAmount=Sumă de plată
 ValidatePayment=Validează plata
 PaymentHigherThanReminderToPay=Plată mai mare decât restul de  plată
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Valoarea totală a celor două noi reduceri
 ConfirmRemoveDiscount=Sigur doriţi să eliminaţi acest discount?
 RelatedBill=Factură asociată
 RelatedBills=Facturi asociate
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Ultima Factură asociată
 WarningBillExist=Avertisment, una sau mai multe facturi există deja
 
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 89e052dbc09..56b08765c26 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Categorie
-Categories=Categorii
-Rubrique=Categorie
-Rubriques=Categorii
-categories=categorii
-TheCategorie=Categoria
-NoCategoryYet=Nicio categorie de acest tip creată
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=În
 AddIn=Adăugă în
 modify=modifică
 Classify=Clasează
-CategoriesArea=CATEGORII
-ProductsCategoriesArea=Categorii Produse / Servicii
-SuppliersCategoriesArea=Categorii Furnizori
-CustomersCategoriesArea=Categorii Clienţii
-ThirdPartyCategoriesArea=Categorii Terţi
-MembersCategoriesArea=Categorii  Membrii
-ContactsCategoriesArea=Categorii Contacte
-MainCats=Categorii Principale
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategorii
 CatStatistics=Statistici
-CatList=Listă categorii
-AllCats=Toate categoriile
-ViewCat=Vezi categoria
-NewCat=Adaugă categorie
-NewCategory=Categorie nouă
-ModifCat=Modifică categorie
-CatCreated=Categorie creată
-CreateCat=Crează categorie
-CreateThisCat=Crează această categorie
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validează  câmpurile
 NoSubCat=Nicio subcategorie.
 SubCatOf=Subcategorie
-FoundCats=Categorii găsite
-FoundCatsForName=Categorii găsite pentru numele:
-FoundSubCatsIn=Subcategorii găsit în categoria
-ErrSameCatSelected=Le-aţi selectat în aceeaşi categorie de mai multe ori
-ErrForgotCat=Ai uitat să alegeţi categoria
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Ai uitat să completezi un câmp
 ErrCatAlreadyExists=Acest nume este deja folosit
-AddProductToCat=Adăugi acest produs la o categorie?
-ImpossibleAddCat=Imposibil de adăugat la categoria
-ImpossibleAssociateCategory=Imposibil de asociat la categoria
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully= %s a fost adaugat cu succes.
-ObjectAlreadyLinkedToCategory=Elementul este deja legat de această categorie.
-CategorySuccessfullyCreated=Categoria %s a fost adăugată cu succes.
-ProductIsInCategories=Produsul/ serviciu este în următoarele categorii
-SupplierIsInCategories=Acest furnizorul este în următoarele categorii
-CompanyIsInCustomersCategories=Această societate este în următoarele  categorii de clienţi / perspecte
-CompanyIsInSuppliersCategories=Această societate este în următoarele  categorii de furnizori
-MemberIsInCategories=Acest membru este în următoarele categorii de membri
-ContactIsInCategories=Acest contact face parte din următoarele categorii de contacte
-ProductHasNoCategory=Acest produs / serviciu nu este în nicio categorie
-SupplierHasNoCategory=Acest furnizor nu este în nici o categorie
-CompanyHasNoCategory=Aceasta companie nu este în nici o categorie
-MemberHasNoCategory=Acest membru nu este în nici o categorie
-ContactHasNoCategory=Acest contact nu este în nici o categorie
-ClassifyInCategory=Clasează în categoria
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Niciunul
-NotCategorized=Fără categorie
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Această categorie  există deja cu această referinţă
 ReturnInProduct=Inapoi la  Fişa produs / serviciu
 ReturnInSupplier=Inapoi la Fişa furnizor
@@ -66,22 +64,22 @@ ReturnInCompany=Inapoi la  Fişa client / prospect
 ContentsVisibleByAll=Conţinutul va fi vizibil pentru toţi
 ContentsVisibleByAllShort=Conţinut vizibil de către toţi
 ContentsNotVisibleByAllShort=Conţinutul nu va fi vizibil pentru toţi
-CategoriesTree=Arborescenţă Categorii 
-DeleteCategory=Şterge categorie
-ConfirmDeleteCategory=Sigur  doriţi să ştergeţi această categorie?
-RemoveFromCategory=Eliminaţi link-ul cu Categoria
-RemoveFromCategoryConfirm=Sigur  doriţi să eliminaţi legătura dintre tranzacţie şi de categorie?
-NoCategoriesDefined=Nicio categorie definită
-SuppliersCategoryShort=Categorie Furnizori
-CustomersCategoryShort=Categorie Clienţii
-ProductsCategoryShort=Categorie Produse
-MembersCategoryShort=Categorie Membrii
-SuppliersCategoriesShort=Categorii Furnizori
-CustomersCategoriesShort=Categorii Clienţii
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Categorii  Clienţi / Prospecte
-ProductsCategoriesShort=Categorii Produse
-MembersCategoriesShort=Categorii Membrii
-ContactCategoriesShort=Categorii Contacte
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Această categorie nu conţine nici un produs.
 ThisCategoryHasNoSupplier=Această categorie nu conţine nici un furnizor.
 ThisCategoryHasNoCustomer=Această categorie nu conţine nici un client.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Această categorie nu conţine nici un contact
 AssignedToCustomer=Atribuie la un client
 AssignedToTheCustomer=Atribuit la clientul
 InternalCategory=Categorie internă
-CategoryContents=Conţinutul Categoriei
-CategId=ID Categorie
-CatSupList=Lista Categorii furnizori
-CatCusList=Lista Categorii clienţi / prospecte
-CatProdList=Lista Categorii  produse
-CatMemberList=Lista Categorii membrii
-CatContactList=Lista categoriilor de contacte şi contactelor
-CatSupLinks=Legături dintre furnizori şi categorii
-CatCusLinks=Legături dintre clienţi/prospecte şi categorii
-CatProdLinks=Legături dintre produse/servicii şi categorii
-CatMemberLinks=Legături dintre membrii şi categorii
-DeleteFromCat=Elimină din categorii
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Şterge Foto
 ConfirmDeletePicture=Confirmaţi ştergere foto ?
 ExtraFieldsCategories=Atribute complementare
-CategoriesSetup=Setare Categorii
-CategorieRecursiv=Link automat către categoria părinte
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Dacă este activat, produsul va fi legat către categoria părinte atunci când este adăugat în subcategorie
 AddProductServiceIntoCategory=Add  următoarele produseservicii
-ShowCategory=Arată categorie
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang
index 14370ebe680..971a22ca59c 100644
--- a/htdocs/langs/ro_RO/commercial.lang
+++ b/htdocs/langs/ro_RO/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Prospecte contactate
 DateActionPlanned=Dată realizare prevăzută
 DateActionDone=Dată realizare efectivă
 ActionAskedBy=Eveniment înregistrat de
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Eveniment atribuit lui
 ActionDoneBy=Eveniment realizat de către
 ActionUserAsk=Raportat de
 ErrorStatusCantBeZeroIfStarted=Dacă câmpul "Data reală debut  realizare" este completat, acţiunea este începută  (sau terminată), astfel câmpul "Status" nu poate fi 0%%.
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 381d59c19bc..dc3786315b3 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Ieşirea ultimei rulări
 CronLastResult=Codul ultimului rezultat
 CronListOfCronJobs=Lista joburilor programate
 CronCommand=Comandă
-CronList=Lista joburi
-CronDelete= Sterge joburi cron
-CronConfirmDelete= Sunteţi sigur ca doriţi ştergerea acestui job cron ?
-CronExecute=Lansează job
-CronConfirmExecute= Sunteţi sigur de execuţia acestui job acum
-CronInfo= Joburile permit executarea sarcinilor care au fost planificate
-CronWaitingJobs=Joburi în aşteptare
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= Niciunul
+CronNone=Niciunul
 CronDtStart=Dată începere
 CronDtEnd=Data de final
 CronDtNextLaunch=Urmatoarea execuţie
@@ -75,6 +75,7 @@ CronObjectHelp=Numele obiectului de încărcat. 
     De exemplu să aducă metod
 CronMethodHelp=Metoda obiectului de încărcat. 
     De exemplu să aducă metoda de obiect Produs Dolibarr  /htdocs/product/class/product.class.php, valoarea metodei  este  fecth
 CronArgsHelp=Argumentele metodei . 
     De exemplu să aducă metoda  obiect ului Produs Dolibarr  /htdocs/product/class/product.class.php, valoarea parametrilor pot fi este  0, ProductRef
 CronCommandHelp=Linia de comandă de sistem pentru a executa.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informatie
 # Common
diff --git a/htdocs/langs/ro_RO/donations.lang b/htdocs/langs/ro_RO/donations.lang
index 4037e2ffbb7..76fabb73acb 100644
--- a/htdocs/langs/ro_RO/donations.lang
+++ b/htdocs/langs/ro_RO/donations.lang
@@ -6,6 +6,8 @@ Donor=Donator
 Donors=Donatori
 AddDonation=Crează o donaţie
 NewDonation=Donaţie nouă
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Afişează donaţia
 DonationPromise=Promisiune Donaţie
 PromisesNotValid=Promisiune nevalidată
@@ -21,6 +23,8 @@ DonationStatusPaid=Donatie plătită
 DonationStatusPromiseNotValidatedShort=Schiţă
 DonationStatusPromiseValidatedShort=Validată
 DonationStatusPaidShort=Plătită
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validează promisiune
 DonationReceipt=Chitanţă donaţie
 BuildDonationReceipt=Crează chitanţa
@@ -36,3 +40,4 @@ FrenchOptions=Opțiuni pentru Franța
 DONATION_ART200=Afiseaza articolului 200 din CGI dacă sunteți îngrijorat
 DONATION_ART238=Afiseaza articolului 238 din CGI dacă sunteți îngrijorat
 DONATION_ART885=Afiseaza articol 885 din CGI dacă sunteți îngrijorat
+DonationPayment=Donation payment
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 8e73996c24d..18da25a1466 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Eroare Necunoscută '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere
 ErrorTryToMakeMoveOnProductRequiringBatchData=Eroare, se incerarca să se facă o mișcare de stoc, fără informații de lot / serie, pe un produs care necesită  informații de lot /serie
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 0865602554a..81a2cb43ea9 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Lista toate notificările e-mail trimis
 MailSendSetupIs=Configurarea trimiterii  e-mail a fost de configurat la '%s'.  Acest mod nu poate fi utilizat pentru a trimite email-uri în masă.
 MailSendSetupIs2=Trebuie mai întâi să mergi, cu un cont de administrator, în meniu%sHome - Setup - EMails%s  pentru a schimba parametrul  '%s' de utilizare în modul '%s'.  Cu acest mod, puteți introduce configurarea serverului SMTP furnizat de furnizorul de servicii Internet și de a folosi facilitatea Mass email .
 MailSendSetupIs3=Daca aveti intrebari cu privire la modul de configurare al serverului SMTP, puteți cere la %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 0b2b2e1411c..4a16d72e5b1 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. furnizor
 RefPayment=Ref. plată
 CommercialProposalsShort=Oferte Comerciale
@@ -394,8 +395,8 @@ Available=Disponibil
 NotYetAvailable=Nedisponibil încă
 NotAvailable=Nedisponibil
 Popularity=Popularitate
-Categories=Categorii
-Category=Categorie
+Categories=Tags/categories
+Category=Tag/category
 By=Pe
 From=De la
 to=la
@@ -694,6 +695,7 @@ AddBox=Adauga box
 SelectElementAndClickRefresh=Selectează un element şi click Refresh
 PrintFile=Printeaza Fisierul %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Luni
 Tuesday=Marţi
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 90ef9c964c1..f1e88e8c9c2 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Expediază produs
 Discount=Discount
 CreateOrder=Crează Comanda
 RefuseOrder=Refuză comanda
-ApproveOrder=Acceptă comanda
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validează comanda
 UnvalidateOrder=Devalidează comandă
 DeleteOrder=Şterge comada
@@ -102,6 +103,8 @@ ClassifyBilled=Clasează facturată
 ComptaCard=Fişă Contabilitate
 DraftOrders=Comenzi schiţă
 RelatedOrders=Comenzi reatasate
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Comenzi în curs de tratare
 RefOrder=Ref. comanda
 RefCustomerOrder=Ref. Comandă Client
@@ -118,6 +121,7 @@ PaymentOrderRef=Plata comandă %s
 CloneOrder=Clonează comanda
 ConfirmCloneOrder=Sigur doriţi să clonaţi acestă comandă %s ?
 DispatchSupplierOrder=Recepţia comenzii furnizorul ui%s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Responsabil urmărire comandă client
 TypeContact_commande_internal_SHIPPING=Responsabil urmărire expediere comandă client
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 123684dfc4e..3daa906f181 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Validate intervenţie
 Notify_FICHINTER_SENTBYMAIL=Intervenţie trimisă prin mail
 Notify_BILL_VALIDATE=Factura client validată
 Notify_BILL_UNVALIDATE=Factura client nevalidată
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Furnizor pentru a aprobat
 Notify_ORDER_SUPPLIER_REFUSE=Furnizor pentru a refuzat
 Notify_ORDER_VALIDATE=Comandă client validată
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Ofertă comercială  trimisă prin mail
 Notify_BILL_PAYED=Factura platita clienţilor
 Notify_BILL_CANCEL=Factura client anulat
 Notify_BILL_SENTBYMAIL=Factura client trimis prin e-mail
-Notify_ORDER_SUPPLIER_VALIDATE=Pentru furnizorul validate
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Pentru furnizorul trimis prin e-mail
 Notify_BILL_SUPPLIER_VALIDATE=Factura furnizorului validate
 Notify_BILL_SUPPLIER_PAYED=Factura platita cu furnizorul
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Creare proiect
 Notify_TASK_CREATE=Task creat
 Notify_TASK_MODIFY=Task modificat
 Notify_TASK_DELETE=Task sters
-SeeModuleSetup=Vezi setare modul
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Numărul de ataşat fişiere / documente
 TotalSizeOfAttachedFiles=Total marimea ataşat fişiere / documente
 MaxSize=Mărimea maximă a
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Factura %s validată
 EMailTextProposalValidated=Oferta %s a fost validată.
 EMailTextOrderValidated=Comanda %s a fost validată
 EMailTextOrderApproved=Comanda %s a fost  aprobată
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Comanda %s aprobată de către %s
 EMailTextOrderRefused=Comanda %s a fost refuzată
 EMailTextOrderRefusedBy=Comanda %s a fost refuzată de către %s
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 35cd6613d46..06cb6979f25 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Preţul minim recomandat este: %s
 PriceExpressionEditor=Editor expresie preț
 PriceExpressionSelected=Expresie preț selectatată
 PriceExpressionEditorHelp1="pret = 2 + 2" sau "2 + 2" pentru setarea pretului. Foloseste ; tpentru separarea expresiilor
-PriceExpressionEditorHelp2=Puteți accesa ExtraFields cu variabile, cum ar fi  #options_myextrafieldkey# 
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In ambele preturi produs/serviciu si furnizori sunt disponibile variabilele:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In pret produs/serviciu numai: #supplier_min_price#
    In pret furnizor numai: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Mod  preț
 PriceNumeric=Număr
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+DefaultPrice=Preț Implicit
+ComposedProductIncDecStock=Mărește/micșorează stoc pe schimbări sintetice
+ComposedProduct=Sub-produs
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 143ed2e0a43..075afb106c0 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -8,10 +8,10 @@ SharedProject=Toată lumea
 PrivateProject=Contacte  proiect
 MyProjectsDesc=Această vedere  este limitată la proiecte sau sarcini  pentru care sunteţi contact(indiferent de tip).
 ProjectsPublicDesc=Această vedere prezintă toate proiectele la care aveţi permisiunea să le  citiţi.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Această vedere prezintă toate proiectele şi activităţile  care sunt permise să le  citiţi.
 ProjectsDesc=Această vedere prezintă toate proiectele  (permisiuni de utilizator va acorda permisiunea de a vizualiza totul).
 MyTasksDesc=Această vedere  este limitată la proiecte sau sarcini  pentru care sunteţi contact(indiferent de tip).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Numai proiectele deschise sunt vizibile (proiecte cu statutul draft sau închise nu sunt vizibile).
 TasksPublicDesc=Această vedere prezintă toate proiectele şi activităţile  care sunt permise să le  citiţi.
 TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni de utilizator va acorda permisiunea de a vizualiza totul).
 ProjectsArea=Proiecte
@@ -31,8 +31,8 @@ NoProject=Niciun proiect definit sau responsabil
 NbOpenTasks=Nr  taskuri deschise
 NbOfProjects=Nr proiecte
 TimeSpent=Timp comsumat
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Timpul consumat  da tine
+TimeSpentByUser=Timp consumat pe utilizator
 TimesSpent=Timpi consumaţi
 RefTask=Ref. Task
 LabelTask=Eticheta Task
@@ -71,7 +71,8 @@ ListSupplierOrdersAssociatedProject=Lista  comenzi  furnizori  asociate la proie
 ListSupplierInvoicesAssociatedProject=Lista facturi furnizori  asociate  la proiect
 ListContractAssociatedProject=Lista contracte  asociate  la  proiect
 ListFichinterAssociatedProject=Lista intervenţii  asociate  la  proiectului
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListExpenseReportsAssociatedProject=Lista rapoartelor cheltuieli  asociate proiectului
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Lista evenimentelor  asociate la proiectului
 ActivityOnProjectThisWeek=Activitatea de pe proiect în această săptămână
 ActivityOnProjectThisMonth=Activitatea de pe proiect în această lună
@@ -130,13 +131,15 @@ AddElement=Link către element
 UnlinkElement=Element nelegat
 # Documents models
 DocumentModelBaleine=Modelul de rapor al unui proiect complet t (logo. ..)
-PlannedWorkload = Volum de lucru Planificat
-WorkloadOccupation= Volum de lucru Procent
+PlannedWorkload=Volum de lucru Planificat
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Obiecte asociate
 SearchAProject=Cauta proiect
 ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi
 ProjectDraft=Proiecte schiţă
 FirstAddRessourceToAllocateTime=Asociază o resursă la timpul alocat
-InputPerTime=Input per time
-InputPerDay=Input per day
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+InputPerDay=Intrare pe zi
+InputPerWeek=Input per week
+InputPerAction=Input per action
+TimeAlreadyRecorded=Timpul consumat deja înregistrat pentru această sarcină / zi și utilizator %s
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index fd669e5577a..94d4d7d5fe2 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. Livrare
 Sending=Livrare
 Sendings=Livrari
+AllSendings=All Shipments
 Shipment=Livrare
 Shipments=Livrari
 ShowSending=Arata expedieri
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index 19ea854686f..b2d32356eee 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Lista comenzi furnizori
 MenuOrdersSupplierToBill=Comenzi Furnizor de facturat
 NbDaysToDelivery= Intârziere Livrare in zile
 DescNbDaysToDelivery=Cea mai mare intarziere este afisata in lista produsului comandat
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index bb9b358c045..c908cea5084 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -1,56 +1,56 @@
 # Dolibarr language file - en_US - Accounting Expert
-CHARSET=UTF-8
+CHARSET=Кодировка UTF-8
 
-Accounting=Accounting
-Globalparameters=Global parameters
+Accounting=Бухгалтерия
+Globalparameters=Глобальные параметры
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
-Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
+Fiscalyear=Финансовые года
+Menuaccount=Учётные записи бухгалтерии
+Menuthirdpartyaccount=Учётные записи контрагентов
+MenuTools=Инструменты
 
 ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
-Export=Export
-Modelcsv=Model of export
+Journaux=Журналы
+JournalFinancial=Финансовые журналы
+Exports=Экспорт
+Export=Экспорт
+Modelcsv=Модель экспорта
 OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
+Selectmodelcsv=Выбрать модель экспорта
+Modelcsv_normal=Классический экспорт
 Modelcsv_CEGID=Export towards CEGID Expert
 BackToChartofaccounts=Return chart of accounts
-Back=Return
+Back=Назад
 
 Definechartofaccounts=Define a chart of accounts
 Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
+Validate=Подтвердить
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 Ventilation=Breakdown
-ToDispatch=To dispatch
-Dispatched=Dispatched
+ToDispatch=На отправку
+Dispatched=Отправленный
 
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
+CustomersVentilation=Распределение клиентов
+SuppliersVentilation=Распределение поставщиков
+TradeMargin=Торговая наценка
+Reports=Отчёты
+ByCustomerInvoice=По счетам клиентов
+ByMonth=По месяцам
 NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
+Update=Обновить
+List=Список
+Create=Создать
 UpdateAccount=Modification of an accounting account
 UpdateMvts=Modification of a movement
 WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
+Bookkeeping=Главная книга
 AccountBalanceByMonth=Account balance by month
 
 AccountingVentilation=Breakdown accounting
 AccountingVentilationSupplier=Breakdown accounting supplier
 AccountingVentilationCustomer=Breakdown accounting customer
-Line=Line
+Line=Строка
 
 CAHTF=Total purchase supplier HT
 InvoiceLines=Lines of invoice to be ventilated
@@ -60,11 +60,11 @@ IntoAccount=In the accounting account
 Ventilate=Ventilate
 VentilationAuto=Automatic breakdown
 
-Processing=Processing
-EndProcessing=The end of processing
+Processing=Обрабатывается
+EndProcessing=Конец обработки
 AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
+SelectedLines=Выделенные строки
+Lineofinvoice=Строка счёта
 VentilatedinAccount=Ventilated successfully in the accounting account
 NotVentilatedinAccount=Not ventilated in the accounting account
 
@@ -79,12 +79,12 @@ AccountLengthDesc=Function allowing to feign a length of accounting account by r
 ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
 ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
 
-ACCOUNTING_SELL_JOURNAL=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=Журнал продаж
+ACCOUNTING_PURCHASE_JOURNAL=Журнал платежей
+ACCOUNTING_BANK_JOURNAL=Банковский журнал
+ACCOUNTING_CASH_JOURNAL=Журнал наличных средств
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Журнал "Разное"
+ACCOUNTING_SOCIAL_JOURNAL=Социальный журнал
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
@@ -94,57 +94,57 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
 ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
 
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
-Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
+Doctype=Тип документа
+Docdate=Дата
+Docref=Ссылка
+Numerocompte=Бухгалтерский счёт
+Code_tiers=Контрагент
+Labelcompte=Метка бухгалтерского счёта
+Debit=Дебит
+Credit=Кредит
+Amount=Количество
 Sens=Sens
-Codejournal=Journal
+Codejournal=Журнал
 
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Удалить записи главной книги
 
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
-DescBankJournal=Bank journal including all the types of payments other than cash
-CashJournal=Cash journal
-DescCashJournal=Cash journal including the type of payment cash
+SellsJournal=Журнал продаж
+PurchasesJournal=Журнал покупок
+DescSellsJournal=Журнал продаж
+DescPurchasesJournal=Журнал покупок
+BankJournal=Банковский журнал
+DescBankJournal=Банковский журнал включает в себя все платежи с типом оплаты отличным от "наличные".
+CashJournal=Журнал наличных средств
+DescCashJournal=Журнал наличных средств включает в себя тип оплаты -  "наличными"
 
-CashPayment=Cash Payment
+CashPayment=Платёж наличными средствами
 
-SupplierInvoicePayment=Payment of invoice supplier
-CustomerInvoicePayment=Payment of invoice customer
+SupplierInvoicePayment=Платёж счёта поставщика
+CustomerInvoicePayment=Платёж счёта клиента
 
-ThirdPartyAccount=Thirdparty account
+ThirdPartyAccount=Бухгалтерский счёт контрагента
 
 NewAccountingMvt=New movement
 NumMvts=Number of movement
 ListeMvts=List of the movement
-ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+ErrorDebitCredit=Дебит и кредит не могут иметь значения одновременно
 
-ReportThirdParty=List thirdparty account
+ReportThirdParty=Список бухгалтерских счетов контрагентов
 DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Список бухгалтерских счетов
 
 Pcgversion=Version of the plan
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
-Active=Statement
+Pcgtype=Класс бухгалтерского счёта
+Pcgsubtype=Подкласс бухгалтерского счёта
+Accountparent=Владелец бухгалтерского счёта
+Active=Официальный отчёт
 
-NewFiscalYear=New fiscal year
+NewFiscalYear=Новый финансовый год
 
 DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover HT
-TotalMarge=Total sales margin
+TotalMarge=Итоговая наценка на продажи
 DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
 DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
 ChangeAccount=Change the accounting account for lines selected by the account:
@@ -153,7 +153,7 @@ DescVentilSupplier=Consult here the annual breakdown accounting of your invoices
 DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Подтверждать автоматически
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 9a7af148909..05a964942aa 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
+Foundation=Фонд
 Version=Версия
 VersionProgram=Версия программы
 VersionLastInstall=Версия первоначальной установки
@@ -8,11 +8,11 @@ VersionExperimental=Экспериментальная
 VersionDevelopment=Разработка
 VersionUnknown=Неизвестно
 VersionRecommanded=Рекомендуемые
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Целостность файлов
+FilesMissing=Отсутсвующие файлы
+FilesUpdated=Обновлённые файлы
+FileCheckDolibarr=Проверить целостность файлов системы Dolibarr
+XmlNotFound=Файл Xml, содержащий описание целостности файлов системы Dolibarr не найден  
 SessionId=ID сессии
 SessionSaveHandler=Обработчик для сохранения сессий
 SessionSavePath=Хранение сессии локализации
@@ -30,7 +30,7 @@ HTMLCharset=Кодировка для генерируемых HTML-страни
 DBStoringCharset=Кодировка базы данных для хранения данных
 DBSortingCharset=Кодировка базы данных для сортировки данных
 WarningModuleNotActive=Модуль %s должен быть включен
-WarningOnlyPermissionOfActivatedModules=в русском переводе нет "Главная->Установка->Модули". Есть "Начало->Настройка->Модули".
+WarningOnlyPermissionOfActivatedModules=Здесь приведены только права доступа, связанные с активированными модулями. Вы можете активировать другие модули на странице Главная->Установка->Модули.
 DolibarrSetup=Установка или обновление Dolibarr
 DolibarrUser=Пользователь Dolibarr
 InternalUser=Внутренний пользователь
@@ -50,8 +50,8 @@ ErrorModuleRequireDolibarrVersion=Ошибка, этот модуль требу
 ErrorDecimalLargerThanAreForbidden=Ошибка, точность выше, чем %s, не поддерживается.
 DictionarySetup=Настройка словаря
 Dictionary=Словари
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Chartofaccounts=Схема учётных записей
+Fiscalyear=Финансовые года
 ErrorReservedTypeSystemSystemAuto=Значение 'system' и 'systemauto' для типа зарезервировано. Вы можете использовать значение 'user' для добавления вашей собственной записи
 ErrorCodeCantContainZero=Код не может содержать значение 0
 DisableJavascript=Отключить JavaScript и Ajax (Рекомендуется если пользователи пользуются текстовыми браузерами)
@@ -74,7 +74,7 @@ ShowPreview=Предварительный просмотр
 PreviewNotAvailable=Предварительный просмотр не доступен
 ThemeCurrentlyActive=Активная тема
 CurrentTimeZone=Текущий часовой пояс в настройках PHP
-MySQLTimeZone=TimeZone MySql (database)
+MySQLTimeZone=Часовой пояс БД (MySQL)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Пробел
 Table=Таблица
@@ -84,8 +84,8 @@ Mask=Маска
 NextValue=Следующее значение
 NextValueForInvoices=Следующее значение (счета-фактуры)
 NextValueForCreditNotes=Следующее значение (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
+NextValueForDeposit=Следующее значение (депозиты)
+NextValueForReplacements=Следующее значение (замены)
 MustBeLowerThanPHPLimit=Примечание: ваш PHP ограничивает размер загружаемого файла до %s %s независимо от значения этого параметра
 NoMaxSizeByPHPLimit=Примечание: в вашей конфигурации PHP установлено no limit
 MaxSizeForUploadedFiles=Максимальный размер загружаемых файлов (0 для запрещения каких-либо загрузок)
@@ -113,9 +113,9 @@ OtherOptions=Другие опции
 OtherSetup=Другие настройки
 CurrentValueSeparatorDecimal=Десятичный разделитель
 CurrentValueSeparatorThousand=Разделитель разрядов
-Destination=Destination
+Destination=Назначение
 IdModule=ID модуля
-IdPermissions=Permissions ID
+IdPermissions=ID прав доступа
 Modules=Модули
 ModulesCommon=Основные модули
 ModulesOther=Другие модули
@@ -246,9 +246,9 @@ OfficialWebSiteFr=Французский официальный веб-сайт
 OfficialWiki=Dolibarr Wiki
 OfficialDemo=Dolibarr Online Demo
 OfficialMarketPlace=Официальный рынок внешних модулей / дополнений
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
+OfficialWebHostingService=Связанные сервисы веб-хостинга (облачный хостинг)
+ReferencedPreferredPartners=Предпочитаемые партнёры
+OtherResources=Другие ресурсы
 ForDocumentationSeeWiki=Для документации пользователя или разработчика (Doc, FAQs...),
     взгляните на Dolibarr Wiki:
    %s
 ForAnswersSeeForum=Для любых других вопросов / помощи, вы можете использовать Dolibarr форум:
    %s
 HelpCenterDesc1=Этот раздел может помочь вам получить помощь службы поддержки по Dolibarr.
@@ -299,7 +299,7 @@ DoNotUseInProduction=Не используйте на Production-версии
 ThisIsProcessToFollow=Это установка для обработки:
 StepNb=Шаг %s
 FindPackageFromWebSite=Найти пакет, который обеспечивает функции вы хотите (например, на официальном веб-сайте %s).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=Загрузить пакет %s.
 UnpackPackageInDolibarrRoot=Распакуйте пакет Dolibarr файл в корневой каталог %s
 SetupIsReadyForUse=Установка закончена, и Dolibarr готов к использованию с этого нового компонента.
 NotExistsDirect=Альтернативная root директория не определена.
    
@@ -309,13 +309,13 @@ YouCanSubmitFile=Выберите модуль:
 CurrentVersion=Текущая версия Dolibarr
 CallUpdatePage=Перейдите на страницу, которая обновляет структуру базы данных и данные %s.
 LastStableVersion=Последняя стабильная версия
-UpdateServerOffline=Update server offline
+UpdateServerOffline=Сервер обновления недоступен
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
    {000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. 
    {000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. 
    {000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. 
    {dd} day (01 to 31).
    {mm} month (01 to 12).
    {yy}, {yyyy} or {y} year over 2, 4 or 1 numbers. 
    
 GenericMaskCodes2={cccc} the client code on n characters
    {cccc000} the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.
    {tttt} The code of thirdparty type on n characters (see dictionary-thirdparty types).
    
 GenericMaskCodes3=Все другие символы в маске останутся нетронутыми. 
     Пространства, не допускается. 
    
 GenericMaskCodes4a=Пример на 99-м% х третья сторона TheCompany сделали 2007-01-31: 
    
 GenericMaskCodes4b=Пример на сторонних из 2007-03-01: 
    
-GenericMaskCodes4c=Example on product created on 2007-03-01:
    
+GenericMaskCodes4c=Например, товар созданный 2007-03-01:
    
 GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
    {0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX
 GenericNumRefModelDesc=Возвращает настраиваемое число в соответствии с заданной маской.
 ServerAvailableOnIPOrPort=Сервер доступен по адресу %s порт %s
@@ -340,7 +340,7 @@ LanguageFilesCachedIntoShmopSharedMemory=Файлы .lang, загружены в
 ExamplesWithCurrentSetup=Примеры с текущего запуска программы установки
 ListOfDirectories=Список каталогов с шаблонами OpenDocument
 ListOfDirectoriesForModelGenODT=Список каталогов, содержащих файлы с шаблонами формата OpenDocument. 

     Добавьте сюда полный путь к директории. 
     Добавить возврат каретки между ГБ каталога. 
     Чтобы добавить каталог GED модуль, добавить здесь DOL_DATA_ROOT / рэп / yourdirectoryname. 

     Файлы в этих каталогах должны заканчиваться. ODT.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+NumberOfModelFilesFound=Количество найденных файлов-шаблонов в форматах ODT/ODS , найденных в этих папках
 ExampleOfDirectoriesForModelGen=Примеры синтаксиса: 
     C: \\ MYDIR 
     / Главная / MYDIR 
     DOL_DATA_ROOT / рэп / ecmdir
 FollowingSubstitutionKeysCanBeUsed=
     Чтобы узнать, как создать свой ODT шаблоны документов, прежде чем хранение их в этих каталогах, прочитать вики документации:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
@@ -361,34 +361,35 @@ PDFDesc=Вы можете настроить каждый глобальные 
 PDFAddressForging=Правила подделать адрес коробки
 HideAnyVATInformationOnPDF=Скрыть все информацию, связанную с НДС на создаваемых PDF
 HideDescOnPDF=Скрыть описания продуктов в генерируемом PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide products lines details on generated PDF
+HideRefOnPDF=Скрывать артикул товара на созданном PDF файле
+HideDetailsOnPDF=Скрывать строки с товарами на созданном PDF файле
 Library=Библиотека
 UrlGenerationParameters=Параметры для обеспечения адресов
 SecurityTokenIsUnique=Используйте уникальный параметр securekey для каждого URL
 EnterRefToBuildUrl=Введите ссылку на объект %s
 GetSecuredUrl=Получить рассчитывается URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch mass convert
+ButtonHideUnauthorized=Прятать кнопки, действия с которыми не разрешены, вместо того, чтобы делать их неактивными
+OldVATRates=Предыдущее значение НДС
+NewVATRates=Новое значение НДС
+PriceBaseTypeToChange=Изменить цены с базой их эталонного значения, определенной на
+MassConvert=Запустить массовое преобразование
 String=String
-TextLong=Long text
-Int=Integer
-Float=Float
-DateAndTime=Date and hour
-Unique=Unique
-Boolean=Boolean (Checkbox)
+TextLong=Текст
+Int=Целое
+Float=С плавающей запятой
+DateAndTime=Дата и время
+Unique=Уникальный
+Boolean=Двоичный (флажок)
 ExtrafieldPhone = Телефон
 ExtrafieldPrice = Цена
-ExtrafieldMail = Email
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
+ExtrafieldMail = Адрес электронной почты
+ExtrafieldSelect = Выбрать список
+ExtrafieldSelectList = Выбрать из таблицы
 ExtrafieldSeparator=Разделитель
-ExtrafieldCheckBox=Checkbox
-ExtrafieldRadio=Radio button
+ExtrafieldCheckBox=флажок
+ExtrafieldRadio=Переключатель
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -398,17 +399,17 @@ LibraryToBuildPDF=Библиотека, использованная для ге
 WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
    To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:
    1 : local tax apply on products and services without vat (vat is not applied on local tax)
    2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
    3 : local tax apply on products without vat (vat is not applied on local tax)
    4 : local tax apply on products before vat (vat is calculated on amount + localtax)
    5 : local tax apply on services without vat (vat is not applied on local tax)
    6 : local tax apply on services before vat (vat is calculated on amount + localtax)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s
+LinkToTestClickToDial=Введите номер телефона для ссылки с целью тестирования ClickToDial  пользователя %s
 RefreshPhoneLink=Обновить ссылку
-LinkToTest=Clickable link generated for user %s (click phone number to test)
+LinkToTest=Ссылка создана для пользователя %s (нажмите на телефонный номер, чтобы протестировать)
 KeepEmptyToUseDefault=Оставьте пустым для использования значения по умолчанию
 DefaultLink=Ссылка по умолчанию
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ValueOverwrittenByUserSetup=Предупреждение: это значение может быть перезаписано в настройках пользователя (каждый пользователь может задать свои настройки ссылки clicktodial)
 ExternalModule=Внешний модуль - установлен в директорию %s
 BarcodeInitForThirdparties=Массовое создание штрих-кодов для Контрагентов
 BarcodeInitForProductsOrServices=Массовое создание или удаление штрих-кода для Товаров или Услуг
 CurrentlyNWithoutBarCode=На данный момент у вас есть %s записей в %s, %s без назначенного штрих-кода.
-InitEmptyBarCode=Init value for next %s empty records
+InitEmptyBarCode=Начальное значения для следующих %s пустых записей
 EraseAllCurrentBarCode=Стереть все текущие значения штрих-кодов
 ConfirmEraseAllCurrentBarCode=Вы уверены, что хотите стереть все текущие значения штрих-кодов?
 AllBarcodeReset=Все значения штрих-кодов были удалены
@@ -417,7 +418,7 @@ NoRecordWithoutBarcodeDefined=Нет записей без назначенно
 
 # Modules
 Module0Name=Пользователи и группы
-Module0Desc=Пользователи и группы управления
+Module0Desc=Управление пользователями и группами 
 Module1Name=Третьи стороны
 Module1Desc=Фирмы и контакты управления
 Module2Name=Коммерческие
@@ -448,14 +449,14 @@ Module52Name=Акции
 Module52Desc=Акции 'управлению продуктами
 Module53Name=Услуги
 Module53Desc=Услуги по управлению
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Контакты/Подписки
+Module54Desc=Управление договорами (услугами или связанными подписками)
 Module55Name=Штрих-коды
 Module55Desc=Штрих-коды управления
 Module56Name=Телефония
 Module56Desc=Телефония интеграции
 Module57Name=Постоянные заказы
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Desc=Регулярные заказы и управление отменами. Также включает в себя создание SEPA-файла для европейских стран.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial интеграции
 Module59Name=Bookmark4u
@@ -486,58 +487,60 @@ Module320Name=RSS Подача
 Module320Desc=Добавить RSS канал внутри Dolibarr экране страниц
 Module330Name=Закладки
 Module330Desc=Закладки управления
-Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Name=Проекты/Возможности/Покупка
+Module400Desc=Управление проектами, возможностями или потенциальными клиентами. Вы можете назначить какой-либо элемент (счет, заказ, предложение, посредничество, ...) к проекту и получить вид  в представлении проекта.
 Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграции
-Module500Name=Special expenses (tax, social contributions, dividends)
-Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
+Module500Name=Специальные расходы (налоги, социальные выплаты, дивиденды)
+Module500Desc=Управление специальными расходами, такими как налоги, социальные выплаты, дивиденды и зарплаты
 Module510Name=Зарплаты
-Module510Desc=Management of employees salaries and payments
+Module510Desc=Управление зарплатами сотрудников и платежами
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Уведомления
-Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
+Module600Desc=Отправлять уведомления контактам контрагентов по электронной почте о некоторых бизнес-событиях системы Dolibarr (настройка задана для каждого контрагента)
 Module700Name=Пожертвования
 Module700Desc=Пожертвования управления
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Отчёт о затратах
+Module770Desc=Управление и утверждение отчётов о затратах (на транспорт, еду)
+Module1120Name=Коммерческое предложение поставщика
+Module1120Desc=Запросить у поставщика коммерческое предложение и цены
 Module1200Name=Mantis
 Module1200Desc=Mantis интеграции
 Module1400Name=Бухгалтерия эксперт
 Module1400Desc=Бухгалтерия управления для экспертов (двойная сторон)
-Module1520Name=Document Generation
+Module1520Name=Создание документов
 Module1520Desc=Mass mail document generation
-Module1780Name=Категории
-Module1780Desc=Категории управления (продукции, поставщиков и заказчиков)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG редактор
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Управление запланированными заданиями
+Module2200Name=Динамическое ценообразование
+Module2200Desc=Разрешить использовать математические операции для цен
+Module2300Name=Планировщик Cron
+Module2300Desc=Scheduled job management
 Module2400Name=Повестка дня
 Module2400Desc=Деятельность / задачи и программы управления
 Module2500Name=Электронное управление
 Module2500Desc=Сохранение и обмен документами
 Module2600Name=WebServices
 Module2600Desc=Включить сервер услуг Dolibarr Сети
-Module2650Name=WebServices (client)
+Module2650Name=модуль WebServices  (для клиента)
 Module2650Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Использование онлайн Gravatar службы (www.gravatar.com), чтобы показать фото пользователей / участников (нашли с их электронной почты). Необходимость доступа в Интернет
-Module2800Desc=FTP Client
+Module2800Desc=Клиент FTP
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind возможности преобразования
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
+Module3100Desc=Добавить кнопку Skype в карточку сторонников / контрагентов/ контактов
 Module5000Name=Multi-компании
 Module5000Desc=Позволяет управлять несколькими компаниями
 Module6000Name=Бизнес-Процесс
-Module6000Desc=Workflow management
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product batch
+Module6000Desc=Управление рабочим процессом
+Module20000Name=Управляение Заявлениями на отпуск
+Module20000Desc=Объявление и проверка заявлений на отпуск работников
+Module39000Name=Серийный номер товара
 Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
 Module50000Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с PayBox
@@ -547,16 +550,16 @@ Module50200Name=Paypal
 Module50200Desc=Модуль предлагает онлайн страницу оплаты с помощью кредитной карты с Paypal
 Module50400Name=Accounting (advanced)
 Module50400Desc=Accounting management (double parties)
-Module54000Name=PrintIPP
-Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
+Module54000Name=Модуль PrintIPP
+Module54000Desc=Прямая печать (без открытия документа) использует интерфейс Cups IPP  (Принтер должен быть доступен с сервера, и система печати CUPS  должна быть установлена на сервере). 
 Module55000Name=Управление Бизнес-Процессами
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Desc=Модуль для проведения онлайн голосований (такой как  Doodle, Studs, Rdvz, ...)
 Module59000Name=Наценки
 Module59000Desc=Модуль управления наценками
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module150010Name=Batch number, eat-by date and sell-by date
-Module150010Desc=batch number, eat-by date and sell-by date management for product
+Module60000Name=Комиссионные
+Module60000Desc=Модуль для управления комиссионными
+Module150010Name=Серийный номер, срок годности и дата продажи
+Module150010Desc=Управление Серийным номером, сроком годности и датой продажи товара
 Permission11=Читать счета
 Permission12=Создание/Изменение счета-фактуры
 Permission13=Unvalidate счетов
@@ -586,7 +589,7 @@ Permission67=Экспорт мероприятий
 Permission71=Читать участники
 Permission72=Создать / изменить участники
 Permission74=Удалить участники
-Permission75=Setup types of membership
+Permission75=Настройка типов участия
 Permission76=Экспорт данных
 Permission78=Читать подписки
 Permission79=Создать / изменить подписку
@@ -605,12 +608,12 @@ Permission95=Читать сообщения
 Permission101=Читать отправок
 Permission102=Создать / изменить отправок
 Permission104=Проверка отправок
-Permission106=Export sendings
+Permission106=Экспортировать настройки
 Permission109=Удалить отправок
 Permission111=Читать финансовой отчетности
 Permission112=Создать / изменить / удалить и сравнить сделок
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
+Permission113=Настройка финансовых учётных записей (создание, изменение категорий)
+Permission114=Согласовать транзакции
 Permission115=Экспортные операции и выписки со счета
 Permission116=Перераспределение средств между счетами
 Permission117=Управление чеки диспетчерского
@@ -627,22 +630,22 @@ Permission151=Прочитайте Регламент
 Permission152=Настройка Регламент
 Permission153=Прочитайте Регламент поступления
 Permission154=Кредитные / отказаться регламент поступления
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission171=Read trips and expenses (own and his subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
+Permission161=Открыть котракты/подписки
+Permission162=Создать/изменить котракты/подписки
+Permission163=Активировать усгулу/подписку на контракте
+Permission164=Отключить услугу/подписку на контракте
+Permission165=Удалить контракты/подписки
+Permission171=Просмотреть поездки и расходы (собсвенные и подразделений)
+Permission172=Создать/изменить поездки и расходы
+Permission173=Удалить поездки и расходы
+Permission174=Просмотр поездок и расходов
+Permission178=Экспорт поездок и расходов
 Permission180=Читать поставщиков
 Permission181=Читать поставщик заказов
 Permission182=Создать / изменить поставщика заказы
 Permission183=Проверка поставщиком заказов
 Permission184=Одобрить поставщик заказов
-Permission185=Order or cancel supplier orders
+Permission185=Поставновка в заказа или отмена заказов поставщиков
 Permission186=Прием заказов поставщику
 Permission187=Закрыть поставщик заказов
 Permission188=Отмена заказов поставщику
@@ -664,13 +667,13 @@ Permission222=Создать / изменить emailings (тема, получ
 Permission223=Проверка emailings (позволяет посылать)
 Permission229=Удалить emailings
 Permission237=Просмотреть получателей и информацию
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
+Permission238=Ручная отправка почты
+Permission239=Удалить почту после подтверждения или отправки
 Permission241=Читать категорий
 Permission242=Создать / изменить категорий
 Permission243=Удаление категории
 Permission244=Посмотреть содержание скрытых категорий
-Permission251=Читайте другие пользователи и группы
+Permission251=Просмотреть других пользователей и группы
 PermissionAdvanced251=Читайте другие пользователи
 Permission252=Создать / изменить другими пользователями, группами и ваш permisssions
 Permission253=Изменение пароля другого пользователя
@@ -693,7 +696,7 @@ Permission300=Читать штрих-коды
 Permission301=Создать / изменить штрих-коды
 Permission302=Удалить штрих-коды
 Permission311=Читать услуги
-Permission312=Assign service/subscription to contract
+Permission312=Назначить услугу/подписку договору
 Permission331=Читать закладок
 Permission332=Создать / изменить закладки
 Permission333=Удаление закладок
@@ -710,10 +713,15 @@ Permission401=Читать скидки
 Permission402=Создать / изменить скидки
 Permission403=Проверить скидку
 Permission404=Удалить скидки
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
+Permission510=Открыть Зарплаты
+Permission512=Создать/изменить зарплаты
+Permission514=Удалить зарплаты
+Permission517=Экспорт зарплат
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Читать услуги
 Permission532=Создать / изменить услуг
 Permission534=Удаление услуги
@@ -723,15 +731,15 @@ Permission701=Читать пожертвований
 Permission702=Создать / изменить пожертвований
 Permission703=Удалить пожертвований
 Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
+Permission772=Создание/изменение отчётов о затратах
+Permission773=Удаление отчётов о затратах
 Permission774=Read all expense reports (even for user not subordinates)
 Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission776=Оплата отчётов о затратах
+Permission779=Экспорт отчётов о затратах
 Permission1001=Читать запасов
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
+Permission1002=Создать/изменить склады
+Permission1003=Удалить склады
 Permission1004=Читать фондового движения
 Permission1005=Создать / изменить фондового движения
 Permission1101=Читать доставка заказов
@@ -746,6 +754,7 @@ Permission1185=Одобрить поставщик заказов
 Permission1186=Заказ поставщику заказов
 Permission1187=Подтвердить получение поставщиками заказов
 Permission1188=Закрыть поставщик заказов
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Получите результат экспорта
 Permission1202=Создать / Изменить экспорт
 Permission1231=Читать поставщиком счета-фактуры
@@ -754,14 +763,14 @@ Permission1233=Проверка счета-фактуры поставщика
 Permission1234=Удалить поставщиком счета-фактуры
 Permission1235=Отправить поставщиком счетов по электронной почте
 Permission1236=Экспорт поставщиком счета-фактуры, качества и платежей
-Permission1237=Export supplier orders and their details
+Permission1237=Детализированный экспорт заказов поставщика
 Permission1251=Запуск массового импорта внешних данных в базу данных (загрузка данных)
 Permission1321=Экспорт клиентом счета-фактуры, качества и платежей
 Permission1421=Экспорт заказов и атрибуты
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Читать действия (события или задачи), связанные с его счета
 Permission2402=Создать / изменить / удалить действия (события или задачи), связанные с его счета
 Permission2403=Читать мероприятия (задачи, события или) других
@@ -772,43 +781,43 @@ Permission2501=Читайте документы
 Permission2502=Добавить или удалить документы
 Permission2503=Отправить или удалять документы
 Permission2515=Настройка документов, справочников
-Permission2801=Use FTP client in read mode (browse and download only)
-Permission2802=Use FTP client in write mode (delete or upload files)
+Permission2801=Использовать FTP  клиент в режиме только для чтения (просмотр и загрузка файлов)
+Permission2802=Использовать FTP клиент в режиме для записи (удаление или загрузка файлов)
 Permission50101=Использовать Торговую точку
 Permission50201=Прочитано сделок
 Permission50202=Импортных операций
 Permission54001=Печать
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
+Permission55001=Открыть опросы
+Permission55002=Создать/изменить опросы
+Permission59001=Открыть коммерческие маржи
+Permission59002=Задать коммерческие маржи
 Permission59003=Read every user margin
 DictionaryCompanyType=Тип Контрагента
-DictionaryCompanyJuridicalType=Juridical kinds of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Cantons
+DictionaryCompanyJuridicalType=Юридические виды контрагентов
+DictionaryProspectLevel=Потенциальный уровень предполагаемого клиента
+DictionaryCanton=Штат/провинция
 DictionaryRegion=Регионы
 DictionaryCountry=Страны
 DictionaryCurrency=Валюты
 DictionaryCivility=Вежливое обращение
-DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
+DictionaryActions=Тип событий по повестке дня
+DictionarySocialContributions=Типы социальных выплат
+DictionaryVAT=Значения НДС или налога с продаж
+DictionaryRevenueStamp=Количество акцизных марок
 DictionaryPaymentConditions=Условия оплаты
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
+DictionaryPaymentModes=Режимы оплаты
+DictionaryTypeContact=Типы Контактов/Адресов
+DictionaryEcotaxe=Экологический налог Ecotax (WEEE)
 DictionaryPaperFormat=Форматы бумаги
 DictionaryFees=Тип оплаты
 DictionarySendingMethods=Способы доставки
 DictionaryStaff=Персонал
 DictionaryAvailability=Задержка доставки
-DictionaryOrderMethods=Ordering methods
+DictionaryOrderMethods=Методы заказов
 DictionarySource=Происхождение Коммерческих предложений / Заказов
 DictionaryAccountancyplan=План счетов
 DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
+DictionaryEMailTemplates=Шаблоны электронных писем
 SetupSaved=Настройки сохранены
 BackToModuleList=Вернуться к списку модулей
 BackToDictionaryList=Назад к списку словарей
@@ -819,7 +828,7 @@ VATIsNotUsedDesc=По умолчанию, предлагаемый НДС 0, к
 VATIsUsedExampleFR=Во Франции, это означает, компаний или организаций, имеющих реальной финансовой системы (упрощенное реальных или нормальный реальный). Система, в которой НДС не объявлены.
 VATIsNotUsedExampleFR=Во Франции, это означает, объединений, которые не объявили НДС или компаний, организаций и свободных профессий, которые выбрали микропредприятиях бюджетной системы (НДС в франшиза) и оплачивается франшиза НДС без НДС декларации. Этот выбор будет отображаться ссылка "не применимо НДС - арт-293B из CGI" на счетах-фактурах.
 ##### Local Taxes #####
-LTRate=Rate
+LTRate=Ставка
 LocalTax1IsUsed=Использовать второй налог
 LocalTax1IsNotUsed=Не использовать второй налог
 LocalTax1IsUsedDesc=Использовать второй тип налога (отличный от НДС)
@@ -835,21 +844,21 @@ LocalTax2Management=Третий тип налога
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES= RE управления
-LocalTax1IsUsedDescES= RE ставка по умолчанию при создании перспективы, счета, заказы и т.д. последующей стандартных правил: 
     Если те покупатель не подвергается RE, RE по умолчанию = 0. Конец правления. 
     Если покупатель подвергается RE затем RE по умолчанию. Конец правления. 
    
+LocalTax1IsUsedDescES= RE ставка по умолчанию при создании потенциального клиента, счета, заказы и т.д. последующей стандартных правил: 
     Если те покупатель не подвергается RE, RE по умолчанию = 0. Конец правления. 
     Если покупатель подвергается RE затем RE по умолчанию. Конец правления. 
    
 LocalTax1IsNotUsedDescES= По умолчанию предлагается RE 0. Конец правления.
 LocalTax1IsUsedExampleES= В Испании они являются профессионалами с учетом некоторых конкретных разделов испанский ИАЭ.
 LocalTax1IsNotUsedExampleES= В Испании они являются профессиональными и общества и при условии соблюдения определенных слоев испанского ИАЭ.
 LocalTax2ManagementES= IRPF управления
-LocalTax2IsUsedDescES= RE ставка по умолчанию при создании перспективы, счета, заказы и т.д. последующей стандартных правил: 
     Если продавец не подвергается IRPF, то IRPF по умолчанию = 0. Конец правления. 
     Если продавец подвергается IRPF то IRPF по умолчанию. Конец правления. 
    
+LocalTax2IsUsedDescES= RE ставка по умолчанию при создании потенциального клиента, счета, заказы и т.д. последующей стандартных правил: 
     Если продавец не подвергается IRPF, то IRPF по умолчанию = 0. Конец правления. 
     Если продавец подвергается IRPF то IRPF по умолчанию. Конец правления. 
    
 LocalTax2IsNotUsedDescES= По умолчанию предлагается IRPF 0. Конец правления.
 LocalTax2IsUsedExampleES= В Испании, фрилансеры и независимые специалисты, которые оказывают услуги и компаний, которые выбрали налоговой системы модулей.
 LocalTax2IsNotUsedExampleES= В Испании они бизнес не облагается налогом на системе модулей.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Отчёты
+CalcLocaltax1ES=Продажи - Покупки
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2ES=Покупки
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3ES=Продажи
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Метки, используемые по умолчанию, если нет перевода можно найти код
 LabelOnDocuments=Этикетка на документах
@@ -918,7 +927,7 @@ PermanentLeftSearchForm=Постоянный поиск формы на лево
 DefaultLanguage=Язык по умолчанию (код языка)
 EnableMultilangInterface=Включить многоязычный интерфейс
 EnableShowLogo=Показать логотип на левом меню
-EnableHtml5=Enable Html5 (Developement - Only available on Eldy template)
+EnableHtml5=Включить Html5 (В разработке - отображается только при использовании темы от Eldy)
 SystemSuccessfulyUpdated=Система была успешно обновлена
 CompanyInfo=Информация о Компании / фонде
 CompanyIds=Компания / фундамент тождествам
@@ -963,14 +972,14 @@ EventsSetup=Настройка журналов событий
 LogEvents=Безопасность ревизии события
 Audit=Аудит
 InfoDolibarr=Информация о Dolibarr
-InfoBrowser=Infos Browser
+InfoBrowser=Информация браузера
 InfoOS=Информация об OS
 InfoWebServer=Информация о Web-Сервере
 InfoDatabase=Информация о базе данных
 InfoPHP=Информация о PHP
 InfoPerf=Информация о производительности
-BrowserName=Browser name
-BrowserOS=Browser OS
+BrowserName=Имя браузера
+BrowserOS=Операционная система браузера
 ListEvents=Аудит событий
 ListOfSecurityEvents=Список Dolibarr безопасность события
 SecurityEventsPurged=Безопасность событий очищены
@@ -1043,8 +1052,8 @@ MAIN_PROXY_PASS=Пароль для использования прокси-се
 DefineHereComplementaryAttributes=Определить здесь все атрибуты, а не уже доступны по умолчанию, и что вы хотите быть поддерживается %s.
 ExtraFields=Дополнительные атрибуты
 ExtraFieldsLines=Дополнительные атрибуты (строки)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Дополнительные атбрибуты (строки заказа)
+ExtraFieldsSupplierInvoicesLines=Дополнительные атрибуты (строки счёта)
 ExtraFieldsThirdParties=Дополнительные атрибуты (контрагенты)
 ExtraFieldsContacts=Дополнительные атрибуты (контакт/адрес)
 ExtraFieldsMember=Дополнительные атрибуты (Участник)
@@ -1055,7 +1064,7 @@ ExtraFieldsSupplierOrders=Дополнительные атрибуты (Зак
 ExtraFieldsSupplierInvoices=Дополнительные атрибуты (Счета-фактуры)
 ExtraFieldsProject=Дополнительные атрибуты (Проекты)
 ExtraFieldsProjectTask=Дополнительные атрибуты (Задачи)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+ExtraFieldHasWrongValue=Атрибут %s  имеет неправильное значение.
 AlphaNumOnlyCharsAndNoSpace=только буквы и цифры без пробелов
 AlphaNumOnlyLowerCharsAndNoSpace=только латинские строчные буквы и цифры без пробелов
 SendingMailSetup=Настройка отправки по электронной почте
@@ -1063,35 +1072,35 @@ SendmailOptionNotComplete=Предупреждение, на некоторых
 PathToDocuments=Путь к документам
 PathDirectory=Каталог
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
+TranslationSetup=Настройка перевода
 TranslationDesc=Выбор языка, видимого на экране, может быть изменен:
    * Глобально из меню Главная - Настройка - Display
    * Только для пользователя User display карточки пользователя (нажмите на Логин вверху экрана).
-TotalNumberOfActivatedModules=Total number of activated feature modules: %s
+TotalNumberOfActivatedModules=Полное количество активированных функций модулей: %s
 YouMustEnableOneModule=Вы должны включить минимум 1 модуль
 ClassNotFoundIntoPathWarning=Класс %s не найден по PHP пути
 YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
+OnlyFollowingModulesAreOpenedToExternalUsers=Примечание. Следующие модули открыты для внешних пользователей (Какими бы ни были права доступа для этих пользователей)  
+SuhosinSessionEncrypt=Хранилище сессий шифровано системой SUHOSIN
+ConditionIsCurrently=Текущее состояние %s
 YouUseBestDriver=Вы используете драйвер %s, который на текущий момент является самым подходящим
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
+YouDoNotUseBestDriver=Вы используете устройство %s, но драйвер этого устройства %s не рекомендуется ипользовать. 
 NbOfProductIsLowerThanNoPb=У вас только %s Товаров/Услуг в базе данных. Это не требует никакой оптимизации.
-SearchOptim=Search optimization
+SearchOptim=Поисковая оптимизация
 YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
-BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
+BrowserIsOK=Вы используете браузер %s. Это хороший выбор с точки зрения производительности и безопасности.
 BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+XDebugInstalled=XDebug загружен.
+XCacheInstalled=XCache загружен.
 AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-FieldEdition=Edition of field %s
-FixTZ=TimeZone fix
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
+FieldEdition=Редакция поля %s
+FixTZ=Исправление часового пояса
+FillThisOnlyIfRequired=Например, +2 (заполняйте это поле только тогда, когда ваш часовой пояс отличается от того, который используется на сервере)
 GetBarCode=Получить штрих-код
-EmptyNumRefModelDesc=The code is free. This code can be modified at any time.
+EmptyNumRefModelDesc=Код свободен. Вы можете модифицировать этот код в любое время. 
 ##### Module password generation
 PasswordGenerationStandard=Возврат пароля, полученных в соответствии с внутренними Dolibarr алгоритма: 8 символов, содержащих общие цифры и символы в нижнем регистре.
 PasswordGenerationNone=Не предлагать любые сгенерированного пароля. Пароль необходимо ввести вручную.
 ##### Users setup #####
-UserGroupSetup=Пользователи и группы модуль настройки
+UserGroupSetup=Настройка модуля Пользователи и группы 
 GeneratePassword=Предложить генерируемого пароля
 RuleForGeneratedPasswords=Правило предложили генерировать пароли
 DoNotSuggest=Не предложить какой-либо пароль
@@ -1107,15 +1116,15 @@ ModuleCompanyCodeAquarium=Вернуться бухгалтерские код 
 ModuleCompanyCodePanicum=Возврат порожних бухгалтерские код.
 ModuleCompanyCodeDigitaria=Бухгалтерия код зависит от третьей стороны кода. Код состоит из символов "С" в первой позиции следуют первые 5 символов сторонних код.
 UseNotifications=Использование уведомлений
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Документы шаблоны
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=Создавать документы из шаблонов форматов OpenDocuments (.ODT or .ODS файлы для OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark по проекту документа
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
+JSOnPaimentBill=Активировать фунцию автозаполнения строк платежа в платёжной форме
 CompanyIdProfChecker=Профессиональные Id уникальным
 MustBeUnique=Должно быть уникальным?
 MustBeMandatory=Обязательно создавать Контрагентов?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
+MustBeInvoiceMandatory=Обязательно подтверждать счета?
 Miscellaneous=Разнообразный
 ##### Webcal setup #####
 WebCalSetup=Webcalendar ссылке Настройка
@@ -1129,7 +1138,7 @@ WebCalServer=Сервер хостинга календарных данных
 WebCalDatabaseName=Название базы данных
 WebCalUser=Пользователя для доступа к базе данных
 WebCalSetupSaved=Webcalendar настройки успешно сохранены.
-WebCalTestOk=Connection to server '%s' on database '%s' with user '%s' successful.
+WebCalTestOk=Соединение с сервером '%s' к БД '%s' с именем пользователя '%s' выполнено успешно.
 WebCalTestKo1=Соединение с сервером ' %s' успешными, но база данных ' %s' не может быть достигнута.
 WebCalTestKo2=Соединение с сервером ' %s' пользователя ' %s' провалилась.
 WebCalErrorConnectOkButWrongDatabase=Подключение удалось, но база данных не будет смотреть Webcalendar данных.
@@ -1171,9 +1180,9 @@ AddDeliveryAddressAbility=Добавить дату доставки спосо
 UseOptionLineIfNoQuantity=Соответствие продукта / услуги с нулевой суммой считается вариант
 FreeLegalTextOnProposal=Свободный текст на коммерческие предложения
 WatermarkOnDraftProposal=Водяные знаки на черновиках Коммерческих предложений ("Нет" если пусто)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Запрос банковского счёта для предложения
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
+AskPriceSupplierSetup=Настройка модуля запросов цен поставщиков
 AskPriceSupplierNumberingModules=Price requests suppliers numbering models
 AskPriceSupplierPDFModules=Price requests suppliers documents models
 FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
@@ -1183,7 +1192,7 @@ BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination o
 OrdersSetup=Приказ 'Management Setup
 OrdersNumberingModules=Приказы нумерации модулей
 OrdersModelModule=Заказ документов моделей
-HideTreadedOrders=Hide the treated or cancelled orders in the list
+HideTreadedOrders=Прятать отменённые заказы в списке
 ValidOrderAfterPropalClosed=Чтобы проверить порядок после предложения ближе, позволяет не шаг за временное распоряжение
 FreeLegalTextOnOrders=Свободный текст распоряжения
 WatermarkOnDraftOrders=Водяные знаки на черновиках Заказов ("Нет" если пусто)
@@ -1196,15 +1205,15 @@ ClickToDialUrlDesc=Url called when a click on phone picto is done.  Dans l'url,
 Bookmark4uSetup=Bookmark4u модуль настройки
 ##### Interventions #####
 InterventionsSetup=Выступления модуль настройки
-FreeLegalTextOnInterventions=В свободной форме о вмешательстве документов
+FreeLegalTextOnInterventions=Дополнительный текст на документах посредничества
 FicheinterNumberingModules=Вмешательство нумерации модулей
 TemplatePDFInterventions=Вмешательство карту документы моделей
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+WatermarkOnDraftInterventionCards=Водяной знак на документах посредничества (нет если не задано)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Настройка модуля Договоры/подписки
 ContractsNumberingModules=Контракты нумерации модулей
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
+TemplatePDFContracts=Модели документов контрактов
+FreeLegalTextOnContracts=Дополнительный текст к доворам
 WatermarkOnDraftContractCards=Водяной знак на черновиках контрактов ("Нет" если пусто)
 ##### Members #####
 MembersSetup=Члены модуль настройки
@@ -1248,7 +1257,7 @@ LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=Полное Д.Н.
 LDAPServerExample=Адрес сервера (например: lokalny_host, 192.168.0.2, LDAPS: / / ldap.example.com /)
 LDAPServerDnExample=Complete DN (ex: dc=company,dc=Полное DN (пример: компания DC=, DC= COM)
 LDAPPasswordExample=Пароль администратора
-LDAPDnSynchroActive=Пользователи и группы синхронизации
+LDAPDnSynchroActive=Пользователи и группы синхронизация
 LDAPDnSynchroActiveExample=LDAP для Dolibarr или Dolibarr LDAP для синхронизации
 LDAPDnContactActive=Контакты "синхронизации
 LDAPDnContactActiveYes=Активированное синхронизации
@@ -1274,15 +1283,15 @@ LDAPTestSynchroContact=Тест контакта синхронизации
 LDAPTestSynchroUser=Тест пользователя синхронизации
 LDAPTestSynchroGroup=Тест группы синхронизации
 LDAPTestSynchroMember=Тест участника синхронизации
-LDAPTestSearch= Test a LDAP search
+LDAPTestSearch= Тестировать поиск LDAP 
 LDAPSynchroOK=Синхронизация успешные испытания
 LDAPSynchroKO=Сбой синхронизации тест
 LDAPSynchroKOMayBePermissions=Сбой синхронизации испытания. Убедитесь, что соединение с сервером правильно настроен, и позволяет LDAP udpates
 LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP соединение с сервером LDAP успешного (Server= %s, Порт= %s)
 LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP соединение с сервером LDAP Failed (Server= %s, Порт= %s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=Соединение и авторизация с сервером  LDAP прошла успешно (Сервер=%s, Порт=%s, Администратор=%s, Пароль=%s)
 LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=Подключение / Authentificate для LDAP-сервера Ошибка (Server= %s, Порт= %s, Admin= %s, Пароль= %s)
-LDAPUnbindSuccessfull=Disconnect successful
+LDAPUnbindSuccessfull=Соединение остановлено успешно
 LDAPUnbindFailed=Разъединить Failed
 LDAPConnectToDNSuccessfull=Подключение АС Д.Н. ( %s) Russie
 LDAPConnectToDNFailed=Подключение АС Д.Н. ( %s) choue
@@ -1315,7 +1324,7 @@ LDAPFieldPhoneExample=Пример: telephonenumber
 LDAPFieldHomePhone=Личный номер телефона
 LDAPFieldHomePhoneExample=Пример: homephone
 LDAPFieldMobile=Сотовый телефон
-LDAPFieldMobileExample=Example : mobile
+LDAPFieldMobileExample=Например, мобильный
 LDAPFieldFax=Номер факса
 LDAPFieldFaxExample=Пример: facsimiletelephonenumber
 LDAPFieldAddress=Улица
@@ -1338,8 +1347,8 @@ LDAPFieldSid=SID
 LDAPFieldSidExample=Пример: objectsid
 LDAPFieldEndLastSubscription=Дата окончания подписки
 LDAPFieldTitle=Должность/Функция
-LDAPFieldTitleExample=Example: title
-LDAPParametersAreStillHardCoded=LDAP parameters are still hardcoded (in contact class)
+LDAPFieldTitleExample=Например, заголовок
+LDAPParametersAreStillHardCoded=Параметры авторизации LDAP  недоступны (заданы жёстко в php-классе контакта)
 LDAPSetupNotComplete=Установка не завершена (переход на другие вкладки)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Нет администратора или пароль предусмотрено. LDAP доступ будет анонимным и в режиме только для чтения.
 LDAPDescContact=Эта страница позволяет определить название атрибутов LDAP в LDAP дерева для каждого данных по Dolibarr контакты.
@@ -1348,23 +1357,23 @@ LDAPDescGroups=Эта страница позволяет определить 
 LDAPDescMembers=Эта страница позволяет определить название атрибутов LDAP в LDAP дерева для каждого данных по Dolibarr участники модуля.
 LDAPDescValues=Пример значения для OpenLDAP с загружены следующие схемы: core.schema, cosine.schema, inetorgperson.schema). Если вы используете thoose ценности и OpenLDAP, модифицировать LDAP конфигурационный файл slapd.conf, чтобы все thoose схемы загрузки.
 ForANonAnonymousAccess=Для аутентифицированных доступа (для записи, например)
-PerfDolibarr=Performance setup/optimizing report
+PerfDolibarr=Настройки производительности/отчёты о оптимизации
 YouMayFindPerfAdviceHere=На этой странице вы найдете некоторые заметки и советы по улучшению производительности.
 NotInstalled=Не установлено, так что ваш сервер не может "тормозить" из-за этого.
-ApplicativeCache=Applicative cache
+ApplicativeCache=Прикладной кеш
 MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
    More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
    Note that a lot of web hosting provider does not provide such cache server.
 MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Files of type %s are cached by HTTP server
-FilesOfTypeNotCached=Files of type %s are not cached by HTTP server
-FilesOfTypeCompressed=Files of type %s are compressed by HTTP server
-FilesOfTypeNotCompressed=Files of type %s are not compressed by HTTP server
+OPCodeCache=Кэш OPCode
+NoOPCodeCacheFound=Кэш OPCode не найден. Возможно, вы используете другой кеш (XCache или eAccelerator хорошее решение), может вы не используете кеш OPCode вовсе (это плохое решение).
+HTTPCacheStaticResources=Кеш HTTP  для статичных ресурсов (файлы стилей, изображений, скриптов)
+FilesOfTypeCached=Файлы типа  %s кешируются HTTP  сервером
+FilesOfTypeNotCached=Файлы типа  %s не кешируются HTTP  сервером
+FilesOfTypeCompressed=Файлы типа  %s  сжимаются HTTP  сервером
+FilesOfTypeNotCompressed=Файлы типа  %s  сжимаются не HTTP  сервером
 CacheByServer=Кэшируется сервером
 CacheByClient=Кэшируется броузером
-CompressionOfResources=Compression of HTTP responses
+CompressionOfResources=Сжатие HTTP заголовков
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
 ProductSetup=Продукты модуль настройки
@@ -1392,7 +1401,7 @@ SyslogSimpleFile=Файл
 SyslogFilename=Имя файла и путь
 YouCanUseDOL_DATA_ROOT=Вы можете использовать DOL_DATA_ROOT / dolibarr.log в лог-файл в Dolibarr "документы" каталог. Вы можете установить различные пути для хранения этого файла.
 ErrorUnknownSyslogConstant=Постоянная %s не известны журнала постоянная
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=Windows© поддерживает только LOG_USER
 ##### Donations #####
 DonationsSetup=Пожертвования модуль настройки
 DonationsReceiptModel=Шаблон дарения получения
@@ -1410,33 +1419,33 @@ BarcodeDescUPC=Штрих-код типа СКП
 BarcodeDescISBN=Штрих-код типа ISBN
 BarcodeDescC39=Штрих-код типа C39
 BarcodeDescC128=Штрих-код типа C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
    For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
+GenbarcodeLocation=Путь для запуска к утилите генерации штри-кодов (используется для некоторых типов штрих-кодов). Должна быть совместима с командой "genbarcode".
    Например, /usr/local/bin/genbarcode
+BarcodeInternalEngine=Внутренние средства управления
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
 WithdrawalsSetup=Снятие модуля настройки
 ##### ExternalRSS #####
 ExternalRSSSetup=Внешние RSS импорт установки
 NewRSS=Новые RSS Feed
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrl=Ссылка RSS
+RSSUrlExample=Интересные RSS-ленты
 ##### Mailing #####
 MailingSetup=Отправка модуля настройки
 MailingEMailFrom=Отправитель EMail (С) по электронной почте было отправлено по электронной почте: модуль
 MailingEMailError=Вернуться EMail (ошибки-до) для сообщений электронной почты с ошибками
-MailingDelay=Seconds to wait after sending next message
+MailingDelay=Время ожидания в секундах перед отправкой следующего сообщения
 ##### Notification #####
-NotificationSetup=EMail notification module setup
+NotificationSetup=Настройка модуля уведомлений по электронной почте
 NotificationEMailFrom=Отправитель EMail (С) по электронной почте направил уведомление
-ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
+ListOfAvailableNotifications=Список событий по которым вы можете отсылать уведомления, для каждого контрагента (используйте карточку контрагента для настройки) или формализованные письма (список зависит от активированных модулей)
 FixedEmailTarget=Fixed email target
 ##### Sendings #####
 SendingsSetup=Отправка модуля настройки
 SendingsReceiptModel=Отправка получения модели
 SendingsNumberingModules=Отправки нумерации модулей
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Поддержка листов отгрузки для доставок клиенту
 NoNeedForDeliveryReceipts=В большинстве случаев отправок поступления используются как бюллетени для заказчика поставки (перечень продуктов для передачи), и бюллетени, которые recevied и подписывается заказчиком. Поэтому поставки продукции квитанции является дублирует функции и редко активирована.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Дополнительный текст для поставок
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Продукция Поставки получения нумерации модуль
 DeliveryOrderModel=Продукция Поставки получения модели
@@ -1449,16 +1458,16 @@ FCKeditorForCompany=WYSIWIG создание / издание компаний 
 FCKeditorForProduct=WYSIWIG создания / выпуска продукции / услуг описание и сведения
 FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.
 FCKeditorForMailing= WYSIWIG создание / издание рассылок
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Outils->eMailing)
+FCKeditorForUserSignature=Редактор WYSIWIG  для создания/изменения подписи пользователя
+FCKeditorForMail=Редактор WYSIWIG для создания или редактирования всех сообщений электронной почты (кроме Опции->Сообщения эл. почты)
 ##### OSCommerce 1 #####
 OSCommerceErrorConnectOkButWrongDatabase=Подключение удалось, но база данных не будет смотреть на OSCommerce данных (Ключевые% не найдено в таблице %s).
 OSCommerceTestOk=Соединение с сервером ' %s' на базе ' %s' пользователя ' %s' успешно.
 OSCommerceTestKo1=Соединение с сервером ' %s' успешными, но база данных ' %s' не может быть достигнута.
 OSCommerceTestKo2=Соединение с сервером ' %s' пользователя ' %s' провалилась.
 ##### Stock #####
-StockSetup=Warehouse module setup
-UserWarehouse=Use user personal warehouses
+StockSetup=Конфигурация модуля Склад
+UserWarehouse=Использовать персональные склады для пользователя
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
 MenuDeleted=Меню исключить
@@ -1494,8 +1503,8 @@ ConfirmDeleteLine=Вы уверены, что хотите удалить эту
 ##### Tax #####
 TaxSetup=Налоги, социальные взносы и дивиденды модуль настройки
 OptionVatMode=Вариант d'exigibilit де TVA
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Кассовый
+OptionVATDebitOption=Принцип начисления
 OptionVatDefaultDesc=НДС из-за: 
     - По доставке / оплате товаров 
     - На оплату услуг
 OptionVatDebitOptionDesc=НДС из-за: 
     - По доставке / оплате товаров 
     - На счета (дебетовой) на услуги
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
@@ -1507,15 +1516,15 @@ SupposedToBeInvoiceDate=Счет дата, используемая
 Buy=Покупать
 Sell=Продавать
 InvoiceDateUsed=Счет дата, используемая
-YourCompanyDoesNotUseVAT=Ваша компания была определена не использовать НДС (начало - Настройка - компания / фонд), так что нет НДС на эту настройку.
+YourCompanyDoesNotUseVAT=Ваша компания была определена не использовать НДС (Главная - Настройка - компания / фонд), так что нет НДС на эту настройку.
 AccountancyCode=Бухгалтерия код
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCodeSell=Бух. код продаж
+AccountancyCodeBuy=Бух. код покупок
 ##### Agenda #####
 AgendaSetup=Акции и повестки модуль настройки
 PasswordTogetVCalExport=Ключевые разрешить экспорт ссылке
 PastDelayVCalExport=Не экспортировать события старше
-AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
+AGENDA_USE_EVENT_TYPE=Использовать типы событий (управление в меню Настройки-Словари-Типы событий списка мероприятий)
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
 AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
@@ -1524,7 +1533,7 @@ ClickToDialDesc=Этот модуль позволяет добавлять ик
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Точка продаж
 CashDeskSetup=Кассовое модуль настройки
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Общий контрагент, используемый для продаж 
 CashDeskBankAccountForSell=Денежные счета, используемого для продает
 CashDeskBankAccountForCheque= Счет будет использоваться для получения выплат чеком
 CashDeskBankAccountForCB= Учетной записи для использования на получение денежных выплат по кредитным картам
@@ -1557,9 +1566,10 @@ SuppliersSetup=Поставщик модуля установки
 SuppliersCommandModel=Полный шаблон для поставщика (logo. ..)
 SuppliersInvoiceModel=Полный шаблон поставщиком счета-фактуры (logo. ..)
 SuppliersInvoiceNumberingModel=Способ нумерации счетов-фактур Поставщика
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind модуля установки
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Путь к файлу Maxmind, который требуется для геолокации. 
    Например,
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=Обратите внимание, что Ваш IP, чтобы страны файл данных должен быть в директории вашего PHP может читать (Проверьте ваши установки PHP open_basedir и файловой системы разрешений).
 YouCanDownloadFreeDatFileTo=Вы можете скачать бесплатную демонстрационную версию страны GeoIP MaxMind файл на %s.
 YouCanDownloadAdvancedDatFileTo=Вы также можете скачать более полную версию, с обновлениями, в стране GeoIP MaxMind файл на %s.
@@ -1572,32 +1582,37 @@ TasksNumberingModules=Модуль нумерации Задач
 TaskModelModule=Tasks reports document model
 ##### ECM (GED) #####
 ECMSetup = GED Setup
-ECMAutoTree = Automatic tree folder and document
+ECMAutoTree = Автоматическое дерево папок и документов
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-AlwaysEditable=Can always be edited
+FiscalYears=Финансовые года
+FiscalYear=Финансовый год
+FiscalYearCard=Карточка финансового года
+NewFiscalYear=Новый финансовый год
+EditFiscalYear=Изменить финансовый год
+OpenFiscalYear=Открыть финансовый год
+CloseFiscalYear=Закрыть финансовый год
+DeleteFiscalYear=Удалить финансовый год
+ConfirmDeleteFiscalYear=Вы точно хотите удалить этот финансовый год?
+Opened=Открыты
+Closed=Закрыты
+AlwaysEditable=Всегда может быть отредактировано
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
+NbMajMin=Минимальное количество символов в врехнем регистре
+NbNumMin=Минимальное количество цифр
+NbSpeMin=Минимальное количество специальных символов
+NbIteConsecutive=Максимальное количество повторяющихся повторяющихся одинаковых символов
 NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+SalariesSetup=Настройка модуля зарплат
+SortOrder=Порядок сортировки
 Format=Формат
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
+IncludePath=Путь к заголовочным файлам (задан в переменной %s)
+ExpenseReportsSetup=Настройка модуля Отчёты о затратах
+TemplatePDFExpenseReports=Шаблон документа для создания отчёта о затратах
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index 0b73270073e..907b0e05c15 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -6,11 +6,11 @@ Agenda=Повестка дня
 Agendas=Повестка дня
 Calendar=Календарь
 Calendars=Календари
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
+LocalAgenda=Внутренний календарь
+ActionsOwnedBy=Событие принадлежит 
 AffectedTo=Ответств.
 DoneBy=Сделано
-Event=Event
+Event=Событие
 Events=События
 EventsNb=Количество событий
 MyEvents=Мои события
@@ -23,20 +23,20 @@ MenuToDoActions=Все незавершенные события
 MenuDoneActions=Все прекращенные события
 MenuToDoMyActions=Мои незавершенные события
 MenuDoneMyActions=Мои прекращенные события
-ListOfEvents=List of events (internal calendar)
-ActionsAskedBy=Действия зарегистрированы
-ActionsToDoBy=События назначенные
+ListOfEvents=Список событий из внутреннего календаря
+ActionsAskedBy=События созданы
+ActionsToDoBy=события назначены
 ActionsDoneBy=Действия, проделанную
-ActionsForUser=Events for user
-ActionsForUsersGroup=Events for all users of group
-ActionAssignedTo=Event assigned to
+ActionsForUser=События пользователя
+ActionsForUsersGroup=События всех пользователей в группе
+ActionAssignedTo=Событие назначено для
 AllMyActions= Все мои действия / задачи
 AllActions= Все ле действия / задачи
 ViewList=Посмотреть список
 ViewCal=Просмотр календаря
 ViewDay=Обзор дня
 ViewWeek=Обзор недели
-ViewPerUser=Per user view
+ViewPerUser=Просмотр по пользователям
 ViewWithPredefinedFilters= Вид с встроенные фильтры
 AutoActions= Автоматическое заполнение дня
 AgendaAutoActionDesc= Определить здесь события, для которого вы хотите Dolibarr создать автоматическое действие в повестку дня. Если ничего не будет проверяться (по умолчанию), только вручную действия, будут включены в повестку дня.
@@ -45,12 +45,15 @@ AgendaExtSitesDesc=Эта страница позволяет настроить
 ActionsEvents=События, за которые Dolibarr создадут действий в повестку дня автоматически
 PropalValidatedInDolibarr=Предложение проверены
 InvoiceValidatedInDolibarr=Счет проверены
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Счёт %s подтверждён с платёжного терминала
 InvoiceBackToDraftInDolibarr=Счет %s вернуться к проекту статус
 InvoiceDeleteDolibarr=Счет-фактура %s удалена
-OrderValidatedInDolibarr= Заказ %s проверен
+OrderValidatedInDolibarr=Заказ %s проверен
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Заказ %s отменен
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Заказ %s утвержден
-OrderRefusedInDolibarr=Order %s refused
+OrderRefusedInDolibarr=Заказ %s  отклонён
 OrderBackToDraftInDolibarr=Заказ %s возращен в статус черновик
 OrderCanceledInDolibarr=Заказ %s отменен
 ProposalSentByEMail=Коммерческое предложение %s отправлены по электронной почте
@@ -58,8 +61,8 @@ OrderSentByEMail=Заказ покупателя %s отправлен по эл
 InvoiceSentByEMail=Счет-фактура клиента %s отправлен по электронной почте
 SupplierOrderSentByEMail=Поставщик порядке %s отправлены по электронной почте
 SupplierInvoiceSentByEMail=Поставщиком счета %s отправлены по электронной почте
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
+ShippingSentByEMail=Посылка %s отправлена с помощью EMail
+ShippingValidated= Отправка %s  подтверждена
 InterventionSentByEMail=Intervention %s sent by EMail
 NewCompanyToDolibarr= Третья группа создала
 DateActionPlannedStart= Планируемая дата начала
@@ -73,21 +76,23 @@ AgendaUrlOptions2=login=%s to restrict output to actions created by or as
 AgendaUrlOptions3=logina=%s to restrict output to actions owned by a user %s.
 AgendaUrlOptions4=logint=logint= %s ограничить выход на действия пользователя, пострадавших %s.
 AgendaUrlOptionsProject=project=PROJECT_ID to restrict output to actions associated to project PROJECT_ID.
-AgendaShowBirthdayEvents=Показать рождения контакты
+AgendaShowBirthdayEvents=Показывать дни рождения контактов
 AgendaHideBirthdayEvents=Скрыть рождения контакты
 Busy=Занят
 ExportDataset_event1=Список запланированных мероприятий
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Диапазон рабочих дней в неделе по умолчанию (Например, 1-5 или 1-6)
+DefaultWorkingHours=Диапазон рабочих часов в день (Например, с 9-18)
 # External Sites ical
 ExportCal=Экспорт календаря
 ExtSites=Внешние календари
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Показывать внешние календари (заданные в глобальных настройках) в повестке дня. Не окажет влияния на внешние календари, заданные пользователями.
 ExtSitesNbOfAgenda=Количество календарей
 AgendaExtNb=Календарь NB %s
 ExtSiteUrlAgenda=URL для доступа. Ческих файлов
 ExtSiteNoLabel=Нет описания
-WorkingTimeRange=Working time range
-WorkingDaysRange=Working days range
-AddEvent=Create event
-MyAvailability=My availability
+WorkingTimeRange=Диапазон рабочего времени
+WorkingDaysRange=Диапазон рабочих дней
+AddEvent=Создать событие
+MyAvailability=Моя доступность
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 7325c4e6538..22beeaf591f 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -8,7 +8,7 @@ FinancialAccount=Учетная запись
 FinancialAccounts=Счета
 BankAccount=Банковский счет
 BankAccounts=Банковские счета
-ShowAccount=Show Account
+ShowAccount=Показать учётную запись
 AccountRef=Финансовые счета исх
 AccountLabel=Финансовые счета этикетки
 CashAccount=Денежные счета
@@ -33,11 +33,11 @@ AllTime=Сначала
 Reconciliation=Примирение
 RIB=Bank Account Number
 IBAN=IBAN номера
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=Номер счета IBAN верный
+IbanNotValid=Номер счета IBAN не верный
 BIC=BIC / SWIFT число
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=Номер BIC/SWIFT верный
+SwiftNotValid=Номер BIC/SWIFT не верный
 StandingOrders=Постоянные заказы
 StandingOrder=Постоянная порядка
 Withdrawals=Снятие
@@ -110,7 +110,7 @@ ConciliatedBy=Conciliated путем
 DateConciliating=Согласительную дата
 BankLineConciliated=Сделка conciliated
 CustomerInvoicePayment=Заказчиком оплаты
-CustomerInvoicePaymentBack=Customer payment back
+CustomerInvoicePaymentBack=Банк для платежей клиента
 SupplierInvoicePayment=Поставщик оплаты
 WithdrawalPayment=Снятие оплаты
 SocialContributionPayment=Социальный вклад оплаты
@@ -153,13 +153,13 @@ ShowAllAccounts=Шоу для всех учетных записей
 FutureTransaction=Сделки в Futur. Ни в коем случае к согласительной процедуре.
 SelectChequeTransactionAndGenerate=Выбор / фильтр проверяет, включать в получении депозита проверки и нажмите кнопку "Создать".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
+EventualyAddCategory=Укажите категорию для классификации записей
 ToConciliate=To conciliate?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-BankDashboard=Bank accounts summary
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
+ThenCheckLinesAndConciliate=Проверьте последние строки в выписке по счёту из банка и нажмите
+BankDashboard=Суммарная информация по банковским счетам
+DefaultRIB=Номер счета BAN по умолчанию
+AllRIB=Все номера счетов BAN
+LabelRIB=Метка номера счета BAN
+NoBANRecord=Нет записи с номером счета BAN
+DeleteARib=Удалить запись в номером счета BAN
+ConfirmDeleteRib=Вы точно хотите удалить запись с номером счета BAN ?
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 35392a8c81e..5b8e7625201 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -1,33 +1,33 @@
 # Dolibarr language file - Source file is en_US - bills
-Bill=Счет-фактура
-Bills=Счета-фактуры
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+Bill=Счёт
+Bills=Счета
+BillsCustomers=Счета клиентов
+BillsCustomer=Счёт клиентов
+BillsSuppliers=Счета поставщиков
+BillsCustomersUnpaid=Неоплаченные счета клиентов
 BillsCustomersUnpaidForCompany=Неоплаченные счета-фактуры Покупателю для %s
 BillsSuppliersUnpaid=Неоплаченные счетов-фактуры Поставщиков
 BillsSuppliersUnpaidForCompany=Неоплаченные счета-фактуры поставщика для %s
 BillsLate=Просроченные платежи
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatistics=Статистика счетов клиентов
+BillsStatisticsSuppliers=Статистика счетов поставщиков
 DisabledBecauseNotErasable=Неактивны, потому что не могут быть стерты
 InvoiceStandard=Стандартный счет-фактура
 InvoiceStandardAsk=Стандартный счет-фактура
-InvoiceStandardDesc=Такой вид счета-фактуры является общим.
+InvoiceStandardDesc=Такой вид счёта является общим.
 InvoiceDeposit=Счета-фактура на взнос
 InvoiceDepositAsk=Счета-фактура на взнос
 InvoiceDepositDesc=Этот вид счета-фактуры оформляется при получении взноса.
-InvoiceProForma=Формальный счет-фактура
+InvoiceProForma=Формальный счёт
 InvoiceProFormaAsk=Формальный счет-фактура
 InvoiceProFormaDesc=Формальный счет-фактура является образом подлинного счета-фактуры, но не имеет бухгалтерской учетной стоимости.
 InvoiceReplacement=Замена счета-фактуры
 InvoiceReplacementAsk=Замена счета-фактуры на другой
-InvoiceReplacementDesc=Replacement invoice is used to cancel and replace completely an invoice with no payment already received.

    Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc=Замена счёта  используется для отмены и замены всего счёта, когда оплата по нему ещё не получена. \n

     Примечание: только неоплаченные счета могут быть заменены. Если счёт, который вы заменяете, ещё не закрыт, он будет автоматически закрыт и помечен "потерянный".  
 InvoiceAvoir=Кредитовое авизо
 InvoiceAvoirAsk=Кредитовое авизо для исправления счета-фактуры
 InvoiceAvoirDesc=Кредитовое авизо - это 'обратный' счет-фактура, который используется для решения проблемы, когда выставлен счета-фактуры в сумме отличной от действительно оплаченной (если клиентом оплатил слишком много по ошибке, или не наоборот - не оплатил счет-фактуру полностью, поскольку он вернулся некоторые продукты, например).
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
+invoiceAvoirWithLines=Создать кредитное авизо со строками из оригинального счёта
 invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
 invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
 ReplaceInvoice=Заменить счет-фактуру %s
@@ -58,7 +58,7 @@ Payment=Платеж
 PaymentBack=Возврат платежа
 Payments=Платежи
 PaymentsBack=Возвраты платежа
-PaidBack=Paid back
+PaidBack=Возврат платежа
 DatePayment=Дата платежа
 DeletePayment=Удалить платеж
 ConfirmDeletePayment=Вы уверены, что хотите удалить этот платеж?
@@ -71,13 +71,14 @@ ReceivedCustomersPaymentsToValid=Полученные платежи покуп
 PaymentsReportsForYear=Отчеты о платежах за %s
 PaymentsReports=Отчеты о платежах
 PaymentsAlreadyDone=Платежи уже сделаны
-PaymentsBackAlreadyDone=Payments back already done
+PaymentsBackAlreadyDone=Возврат платежа произведён.
 PaymentRule=Правила оплаты
 PaymentMode=Тип платежа
+PaymentTerm=Условия платежа
 PaymentConditions=Условия платежа
 PaymentConditionsShort=Условия платежа
 PaymentAmount=Сумма платежа
-ValidatePayment=Validate payment
+ValidatePayment=Подтвердть платёж
 PaymentHigherThanReminderToPay=Платеж больше, чем в напоминании об оплате
 HelpPaymentHigherThanReminderToPay=Внимание, сумма оплаты по одному или нескольким документам выше остатка к оплате. 
     Измените вашу запись, или подтвердите и подумать о создании кредитового авизо на превышения, полученные за каждый переплаченный счет-фактуру.
 HelpPaymentHigherThanReminderToPaySupplier=Attention, the payment amount of one or more bills is higher than the rest to pay. 
     Edit your entry, otherwise confirm.
@@ -87,8 +88,8 @@ ClassifyCanceled=Классифицировать как 'Аннулирован
 ClassifyClosed=Классифицировать как 'Закрыт'
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Создать счет-фактуру
-AddBill=Create invoice or credit note
-AddToDraftInvoices=Add to draft invoice
+AddBill=Создать счёт или кредитное авизо
+AddToDraftInvoices=Добавить проект счёта
 DeleteBill=Удалить счет-фактуру
 SearchACustomerInvoice=Поиск счета-фактуры Покупателю
 SearchASupplierInvoice=Поиск счета-фактуры Поставщика
@@ -99,7 +100,7 @@ DoPaymentBack=Возвратить платеж
 ConvertToReduc=Преобразовать в будущую скидку
 EnterPaymentReceivedFromCustomer=Ввести платеж, полученный от покупателя
 EnterPaymentDueToCustomer=Произвести платеж за счет Покупателя
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DisabledBecauseRemainderToPayIsZero=Отключено, потому что оставшаяся оплата нулевая
 Amount=Сумма
 PriceBase=Ценовая база
 BillStatus=Статус счета-фактуры
@@ -154,9 +155,9 @@ ConfirmCancelBill=Вы уверены, что хотите отменить сч
 ConfirmCancelBillQuestion=Почему вы хотите классифицировать этот счет-фактуру как 'Аннулирован'?
 ConfirmClassifyPaidPartially=Вы  уверены, что хотите изменить статус счет-фактуры %s  на 'Оплачен'?
 ConfirmClassifyPaidPartiallyQuestion=Этот счет-фактура не оплачен полностью. Укажите причины закрытия счета-фактуры?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Оставить неоплаченной (%s %s) предоставленную скидку, потому что платёж был сделан перед соглашением. Я уплачу НДС с помощью кредитного авизо.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Оставить неоплаченной (%s %s) предоставленную скидку, потому что платёж был сделан перед соглашением. Я подтверждаю потерю НДС на этой скидке.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Оставить неоплаченной (%s %s) предоставленную скидку, потому что платёж был сделан перед соглашением. Я восстановлю НДС на этой скидке без кредитного авизо.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Плохой Покупатель
 ConfirmClassifyPaidPartiallyReasonProductReturned=Продукция частично возвращена
 ConfirmClassifyPaidPartiallyReasonOther=Сумма, аннулированная по другим причинам
@@ -189,20 +190,20 @@ AlreadyPaid=Уже оплачен
 AlreadyPaidBack=Already paid back
 AlreadyPaidNoCreditNotesNoDeposits=Уже оплачен (без кредитовых авизо и взносов)
 Abandoned=Брошен
-RemainderToPay=Remaining unpaid
+RemainderToPay=Оставить неоплаченным
 RemainderToTake=Remaining amount to take
 RemainderToPayBack=Remaining amount to pay back
-Rest=Pending
+Rest=В ожидании
 AmountExpected=Заявленная сумма
 ExcessReceived=Полученный излишек
 EscompteOffered=Предоставлена скидка (за досрочный платеж)
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
+SendBillRef=Представление счёта %s
+SendReminderBillRef=Представление счёта %s (напоминание)
 StandingOrders=Регламенты
 StandingOrder=Регламент
 NoDraftBills=Нет проектов счетов-фактур
 NoOtherDraftBills=Нет других проектов счетов-фактур
-NoDraftInvoices=No draft invoices
+NoDraftInvoices=Нет проектов счетов
 RefBill=Референс Счета-фактуры
 ToBill=Для выставления
 RemainderToBill=Остаток к выставлению
@@ -222,13 +223,13 @@ NonPercuRecuperable=Не подлежащий взысканию
 SetConditions=Установить условия оплаты
 SetMode=Установить режим оплаты
 Billed=Выставлен
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RepeatableInvoice=Шаблоны счёта
+RepeatableInvoices=Шаблоны счетов
+Repeatable=Шаблон
+Repeatables=Шаблоны
+ChangeIntoRepeatableInvoice=Конвертировать в шаблон счёта
+CreateRepeatableInvoice=Создать шаблон счёта
+CreateFromRepeatableInvoice=Создать из шаблона счёта
 CustomersInvoicesAndInvoiceLines=Счета-фактуры Покупателям и строки счетов-фактур
 CustomersInvoicesAndPayments=Счета-фактуры Покупателям и платежи
 ExportDataset_invoice_1=Счета-фактуры Покупателям и строки счетов-фактур
@@ -242,12 +243,12 @@ Discount=Скидка
 Discounts=Скидки
 AddDiscount=Создать абсолютную скидку
 AddRelativeDiscount=Создать относительная скидка
-EditRelativeDiscount=Edit relative discount
+EditRelativeDiscount=Отредактировать относительную скидку
 AddGlobalDiscount=Добавить скидку
 EditGlobalDiscounts=Редактировать абсолютной скидки
 AddCreditNote=Создать кредитовое авизо
 ShowDiscount=Показать скидку
-ShowReduc=Show the deduction
+ShowReduc=Показать вычет
 RelativeDiscount=Относительная скидка
 GlobalDiscount=Глобальная скидка
 CreditNote=Кредитовое авизо
@@ -284,7 +285,7 @@ InvoiceNotChecked=Счет-фактура не выбран
 CloneInvoice=Дублировать счет-фактуру
 ConfirmCloneInvoice=Вы уверены, что хотите дублировать счет-фактуру %s?
 DisabledBecauseReplacedInvoice=Действия отключены поскольку счет-фактура был заменен
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+DescTaxAndDividendsArea=Эта зона представляет суммарную информацию по платежам на специальные расходы. Только записи с платежами в течении фиксированного года будут показаны.
 NbOfPayments=Кол-во платежей
 SplitDiscount=Разделить скидку на две
 ConfirmSplitDiscount=Вы уверены, что хотите разделить эту скидку %s %s на 2 меньшие скидки?
@@ -293,8 +294,10 @@ TotalOfTwoDiscountMustEqualsOriginal=Сумма двух новых скидок
 ConfirmRemoveDiscount=Вы уверены, что хотите удалить эту скидку?
 RelatedBill=Связанный счет-фактура
 RelatedBills=Связанные счета-фактуры
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+WarningBillExist=Предупреждение! Счёт (или счета) уже существуют
 
 # PaymentConditions
 PaymentConditionShortRECEP=Немедленно
@@ -309,12 +312,12 @@ PaymentConditionShort60DENDMONTH=60 дней в конце месяца
 PaymentCondition60DENDMONTH=60 дней в конце месяца
 PaymentConditionShortPT_DELIVERY=Доставка
 PaymentConditionPT_DELIVERY=О доставке
-PaymentConditionShortPT_ORDER=On order
-PaymentConditionPT_ORDER=On order
+PaymentConditionShortPT_ORDER=В заказе
+PaymentConditionPT_ORDER=В заказе
 PaymentConditionShortPT_5050=50-50
-PaymentConditionPT_5050=50%% in advance, 50%% on delivery
-FixAmount=Fix amount
-VarAmount=Variable amount (%% tot.)
+PaymentConditionPT_5050=50%% аванс, 50%% после доставки
+FixAmount=Фиксированное значение
+VarAmount=Произвольное значение (%% от суммы)
 # PaymentType
 PaymentTypeVIR=Взнос в Банк
 PaymentTypeShortVIR=Взнос в Банк
@@ -348,7 +351,7 @@ ChequeNumber=Чек N
 ChequeOrTransferNumber=Чек/Перевод N
 ChequeMaker=Проверьте отправителя
 ChequeBank=Банк чека
-CheckBank=Check
+CheckBank=Проверить
 NetToBePaid=Чистыми к оплате
 PhoneNumber=Тел.
 FullPhoneNumber=Телефон
@@ -392,11 +395,11 @@ PayedByThisPayment=Оплачен этим платежом
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
 AllCompletelyPayedInvoiceWillBeClosed=Все счета, без остатка к оплате будут автоматически закрыты со статусом "Оплачен".
-ToMakePayment=Pay
-ToMakePaymentBack=Pay back
-ListOfYourUnpaidInvoices=List of unpaid invoices
-NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
-RevenueStamp=Revenue stamp
+ToMakePayment=Платить
+ToMakePaymentBack=Возврат платежа
+ListOfYourUnpaidInvoices=Список неоплаченных счетов
+NoteListOfYourUnpaidInvoices=Примечание: Этот список содержит счета только тех контрагентов, которые связаны с нами, как представители по сбыту.
+RevenueStamp=Штамп о уплате налогов
 YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
 PDFCrabeDescription=Шаблон Счета-фактуры Crabe. Полный шаблон (вспомогательные опции НДС, скидки, условия платежей, логотип и т.д. ..)
 TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
@@ -420,11 +423,11 @@ InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
 Progress=Progress
-ModifyAllLines=Modify all lines
+ModifyAllLines=Изменить все строки
 CreateNextSituationInvoice=Create next situation
 NotLastInCycle=This invoice in not the last in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
 DisabledBecauseFinal=This situation is final.
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
 NoSituations=No opened situations
-InvoiceSituationLast=Final and general invoice
+InvoiceSituationLast=Финальный и основной счёт
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index eacd9d94a10..7cdba89fb3f 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=Информация RSS
 BoxLastProducts=Последние %s товары / услуги
-BoxProductsAlertStock=Products in stock alert
+BoxProductsAlertStock=Предупреждение о появлении товара на складе
 BoxLastProductsInContract=Последние %s проданные товары / услуги
 BoxLastSupplierBills=Последние счета-фактуры от поставщиков
 BoxLastCustomerBills=Последние счета-фактуры покупателям
@@ -12,13 +12,14 @@ BoxLastProspects=Последние измененные потенциальн
 BoxLastCustomers=Последние измененные покупатели
 BoxLastSuppliers=Последние измененные поставщики
 BoxLastCustomerOrders=Последние заказы покупателей
+BoxLastValidatedCustomerOrders=Последние проверенные заказы клиента
 BoxLastBooks=Последние сделки
 BoxLastActions=Последние действия
 BoxLastContracts=Последние договоры
 BoxLastContacts=Последние контакты / адреса
 BoxLastMembers=Последнее участники
 BoxFicheInter=Последние мероприятия
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Открытые остатки на счетах
 BoxSalesTurnover=Оборот по продажам
 BoxTotalUnpaidCustomerBills=Общая сумма неоплаченных счетов-фактур покупателям
 BoxTotalUnpaidSuppliersBills=Общая сумма неоплаченных счетов-фактур поставщиков
@@ -26,27 +27,30 @@ BoxTitleLastBooks=Последние %s зарегистрированных с
 BoxTitleNbOfCustomers=Кол-во покупателей
 BoxTitleLastRssInfos=Последние %s новостей от %s
 BoxTitleLastProducts=Последние %s измененные товары / услуги
-BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Последние %s измененные заказы покупателей
+BoxTitleProductsAlertStock=Предупреждение о появлении товара на складе
+BoxTitleLastCustomerOrders=Последние %s  заказы клиента
+BoxTitleLastModifiedCustomerOrders=Последние %s  изменённых заказов клиента
 BoxTitleLastSuppliers=Последние %s зарегистрированных поставщиков
 BoxTitleLastCustomers=Последние %s зарегистрированных покупателей
 BoxTitleLastModifiedSuppliers=Последнее %s измененных поставщиков
 BoxTitleLastModifiedCustomers=Последнее %s измененных покупателей
-BoxTitleLastCustomersOrProspects=Последние %s зарегистрированных покупателей и потенциальных клиентов
-BoxTitleLastPropals=Последние %s зарегистрированных предложений
+BoxTitleLastCustomersOrProspects=Последние %s  клиенты или потенциальные клиенты
+BoxTitleLastPropals=Последние %s  предложений
+BoxTitleLastModifiedPropals=Последние %s  изменённых предложений
 BoxTitleLastCustomerBills=Последние %s счетов-фактур покупателям
+BoxTitleLastModifiedCustomerBills=Последние %s  изменённых счетов клиентов
 BoxTitleLastSupplierBills=Последние %s счетов-фактур поставщиков
-BoxTitleLastProspects=Последние %s зарегистрированных потенциальных клиентов
+BoxTitleLastModifiedSupplierBills=Последние %s  изменённых счетов поставщика
 BoxTitleLastModifiedProspects=Последнее %s измененных потенциальных клиентов
 BoxTitleLastProductsInContract=Последние %s товаров / услуг в договорах
-BoxTitleLastModifiedMembers=Последние %s измененных участников
+BoxTitleLastModifiedMembers=Последние %s  участников
 BoxTitleLastFicheInter=%s последних измененных мероприятий
-BoxTitleOldestUnpaidCustomerBills=%s самых старых неоплаченных счетов-фактур покупателям
-BoxTitleOldestUnpaidSupplierBills=%s самых старых неоплаченных счетов-фактур поставщиков
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleOldestUnpaidCustomerBills=%s самых старых неоплаченных счетов клиентов
+BoxTitleOldestUnpaidSupplierBills=%s самых старых неоплаченных счетов поставщиков
+BoxTitleCurrentAccounts=Открытые остатки на счетах
 BoxTitleSalesTurnover=Оборот по продажам
-BoxTitleTotalUnpaidCustomerBills=Неоплаченные счета-фактуры покупателям
-BoxTitleTotalUnpaidSuppliersBills=Неоплаченные счета-фактуры поставщиков
+BoxTitleTotalUnpaidCustomerBills=Неоплаченные счета клиента
+BoxTitleTotalUnpaidSuppliersBills=Не оплаченные счета  поставщица
 BoxTitleLastModifiedContacts=Последние %s измененных контактов / адресов
 BoxMyLastBookmarks=Мои последние %s закладок
 BoxOldestExpiredServices=Старейшие активных истек услуги
@@ -74,18 +78,19 @@ NoRecordedProducts=Нет зарегистрированных товаров /
 NoRecordedProspects=Нет зарегистрированных потенциальных клиентов
 NoContractedProducts=Нет законтрактованных товаров / услуг
 NoRecordedContracts=Нет введенных договоров
-NoRecordedInterventions=No recorded interventions
+NoRecordedInterventions=Нет записанных мероприятий
 BoxLatestSupplierOrders=Последние заказы поставщикам
-BoxTitleLatestSupplierOrders=%s последних заказов поставщикам
-NoSupplierOrder=No recorded supplier order
-BoxCustomersInvoicesPerMonth=Customer invoices per month
-BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-BoxCustomersOrdersPerMonth=Customer orders per month
-BoxSuppliersOrdersPerMonth=Supplier orders per month
+BoxTitleLatestSupplierOrders=Последние %s заказов поставщика 
+BoxTitleLatestModifiedSupplierOrders=Последние %s  изменённых заказов поставщика
+NoSupplierOrder=Нет записанные заказов поставщика
+BoxCustomersInvoicesPerMonth=Счета клиентов по месяцам
+BoxSuppliersInvoicesPerMonth=Счета поставщиков по месяцам
+BoxCustomersOrdersPerMonth=Заказы клиента по месяцам
+BoxSuppliersOrdersPerMonth=Заказы поставщика по месяцам
 BoxProposalsPerMonth=Предложений в месяц
 NoTooLowStockProducts=Ни один из продуктов не достиг минимума складского запаса
-BoxProductDistribution=Products/Services distribution
-BoxProductDistributionFor=Distribution of %s for %s
+BoxProductDistribution=РаспространениеТоваров/Услуг
+BoxProductDistributionFor=Распространение %s  для %s
 ForCustomersInvoices=Счета-фактуры Покупателей
-ForCustomersOrders=Customers orders
+ForCustomersOrders=Заказы клиентов
 ForProposals=Предложения
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 221d09fdfc2..cf56a703dd7 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -9,10 +9,10 @@ CashDeskBankCheque=Банковский счет (чек)
 CashDeskWarehouse=Склад
 CashdeskShowServices=Продажа услуг
 CashDeskProducts=Продукты
-CashDeskStock=Акции
+CashDeskStock=Запасы на складе
 CashDeskOn=на
 CashDeskThirdParty=Третье лицо
-# CashdeskDashboard=Point of sale access
+CashdeskDashboard=Доступ к точкам продажи
 ShoppingCart=Корзина
 NewSell=Новые продать
 BackOffice=Бэк-офис
@@ -36,5 +36,5 @@ BankToPay=Пополнять счета
 ShowCompany=Показать компании
 ShowStock=Показать склад
 DeleteArticle=Нажмите, чтобы удалить эту статью
-# FilterRefOrLabelOrBC=Search (Ref/Label)
-# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+FilterRefOrLabelOrBC=Поиск (ссылке/метке)
+UserNeedPermissionToEditStockToUsePos=Вы просите уменьшить запас на складе при создании счёта, поэтому пользователь, использующий POS-терминал, должен иметь права доступа для редактирования запаса на складе.
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index 7def19ba998..8da468cf547 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Категория
-Categories=Категории
-Rubrique=Категория
-Rubriques=Категории
-categories=категории
-TheCategorie=Категория
-NoCategoryYet=Категория такого типа не создана
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=В
 AddIn=Добавить в
 modify=изменить
 Classify=Добавить
-CategoriesArea=Раздел категорий
-ProductsCategoriesArea=Раздел категорий Товаров/Услуг
-SuppliersCategoriesArea=Раздел категорий Поставщиков
-CustomersCategoriesArea=Раздел категорий Покупателей
-ThirdPartyCategoriesArea=Раздел категорий Контрагентов
-MembersCategoriesArea=Раздел категорий участников
-ContactsCategoriesArea=Раздел категорий Контактов
-MainCats=Основные категории
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Подкатегории
 CatStatistics=Статистика
-CatList=Список категорий
-AllCats=Все категории
-ViewCat=Просмотреть категорию
-NewCat=Добавить категорию
-NewCategory=Новая категория
-ModifCat=Изменить категорию
-CatCreated=Категория создана
-CreateCat=Создать категорию
-CreateThisCat=Создать эту категорию
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Проверить поля
 NoSubCat=Нет подкатегории.
 SubCatOf=Подкатегория
-FoundCats=Найдено категорий
-FoundCatsForName=Найдено категорей по имени:
-FoundSubCatsIn=Подкатегории, найденные в категории
-ErrSameCatSelected=Вы выбрали одну и ту же категорию несколько раз
-ErrForgotCat=Вы забыли выбрать категорию
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Вы забыли заполнить поля
 ErrCatAlreadyExists=Это имя уже используется
-AddProductToCat=Добавить этот продукт в категорию?
-ImpossibleAddCat=Невозможно добавить категорию
-ImpossibleAssociateCategory=Невозможно связать категорию с
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s успешно добавлена.
-ObjectAlreadyLinkedToCategory=Элемент уже связан с этой категорией.
-CategorySuccessfullyCreated=Категория %s успешно добавлена.
-ProductIsInCategories=Товар/услуга принадлежит к следующим категориям
-SupplierIsInCategories=Контрагент принадлежит к следующим категориям поставщиков
-CompanyIsInCustomersCategories=Этот контрагент принадлежит к следующим категориям покупателей/потенциальных клиентов
-CompanyIsInSuppliersCategories=Этот контрагент принадлежит к следующим категориям поставщиков
-MemberIsInCategories=Этот участник принадлежит к следующим категориям участников
-ContactIsInCategories=Этот контакт принадлежит к следующим категориям контактов
-ProductHasNoCategory=Этот товар/услуга не принадлежит к какой-либо категории
-SupplierHasNoCategory=Этот поставщик не принадлежит к какой-либо категории
-CompanyHasNoCategory=Эта компания не принадлежит к какой-либо категории
-MemberHasNoCategory=Этот участник не принадлежит к какой-либо категории
-ContactHasNoCategory=Этот контакт не принадлежит к какой-либо категории
-ClassifyInCategory=Внести в категорию
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Нет
-NotCategorized=Без категории
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Категория к таким кодом уже существует
 ReturnInProduct=Назад к карточке товара/услуги
 ReturnInSupplier=Назад к карточке поставщика
@@ -66,22 +64,22 @@ ReturnInCompany=Назад к карточке покупателя/потенц
 ContentsVisibleByAll=Содержимое будет доступно всем
 ContentsVisibleByAllShort=Содержимое доступно всем
 ContentsNotVisibleByAllShort=Содержание не доступно всем
-CategoriesTree=Дерево категорий
-DeleteCategory=Удалить категорию
-ConfirmDeleteCategory=Вы уверены, что хотите удалить эту категорию?
-RemoveFromCategory=Удалить связь с категорией
-RemoveFromCategoryConfirm=Вы уверены, что хотите удалить связь операции и категории?
-NoCategoriesDefined=Категории не определены
-SuppliersCategoryShort=Категория Поставщика
-CustomersCategoryShort=Категории Покупателей
-ProductsCategoryShort=Категории Товаров
-MembersCategoryShort=Категории участников
-SuppliersCategoriesShort=Категории Поставщиков
-CustomersCategoriesShort=Категории Покупателей
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Категории Покупателей/Потенц. клиентов
-ProductsCategoriesShort=Категории Товаров
-MembersCategoriesShort=Категории участников
-ContactCategoriesShort=Категории контактов
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=В этой категории нет товаров.
 ThisCategoryHasNoSupplier=В этой категории нет поставщиков.
 ThisCategoryHasNoCustomer=В этой категории нет покупателей.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Эта категория не содержит ни о
 AssignedToCustomer=Установленное для покупателя
 AssignedToTheCustomer=Установленное для покупателя
 InternalCategory=Внутренняя категория
-CategoryContents=Содержание категории
-CategId=Код категории
-CatSupList=Список категорий поставщиков
-CatCusList=Список категорий покупателей / потенц. клиентов
-CatProdList=Список категорий продуктов
-CatMemberList=Список категорий участников
-CatContactList=Список категорий контактов и контактов
-CatSupLinks=Связи между поставщиками и категориями
-CatCusLinks=Связи между клиентами/потенц. клиентами и категориями
-CatProdLinks=Связи между Продуктами/Услугами и категориями
-CatMemberLinks=Связи между участниками и категориями
-DeleteFromCat=Удалить из категории
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Удалить изображение
 ConfirmDeletePicture=Подтверждаете удаление изображения?
 ExtraFieldsCategories=Дополнительные атрибуты
-CategoriesSetup=Настройка категорий
-CategorieRecursiv=Автоматически связать с родительской категорией
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Если активировать, то продукт будет связан с родительской категорией при добавлении в подкатегорию
-AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+AddProductServiceIntoCategory=Добавить следующий товар/услугу
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/ru_RU/commercial.lang b/htdocs/langs/ru_RU/commercial.lang
index f60182a8f80..b105861f7da 100644
--- a/htdocs/langs/ru_RU/commercial.lang
+++ b/htdocs/langs/ru_RU/commercial.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Коммерческие
-CommercialArea=Коммерческие площади
-CommercialCard=Коммерческая карту
-CustomerArea=Клиенты область
+Commercial=Коммерция
+CommercialArea=Раздел коммерции
+CommercialCard=Карточка коммерции
+CustomerArea=Раздел клиентов
 Customer=Клиент
-Customers=Заказчики
-Prospect=Проспект
-Prospects=Перспективы
-DeleteAction=Удалить действия / задачи
-NewAction=Новые меры / задачи
-AddAction=Create event/task
-AddAnAction=Create an event/task
-AddActionRendezVous=Create a Rendez-vous event
-Rendez-Vous=Свидание
-ConfirmDeleteAction=Вы уверены, что хотите удалить эту задачу?
-CardAction=Действия карточки
+Customers=Клиенты
+Prospect=Потенциальный клиент
+Prospects=Потенциальные клиенты
+DeleteAction=Удалить событие / задачу
+NewAction=Новое событие / задача
+AddAction=Создать событие/задачу
+AddAnAction=Создать событие/задачу
+AddActionRendezVous=Создать назначенное событие
+Rendez-Vous=Назначенное
+ConfirmDeleteAction=Вы уверены, что хотите удалить эту задачу/событие?
+CardAction=Карточка события
 PercentDone=Процент завершенности
 ActionOnCompany=Задача о компании
 ActionOnContact=Задача о контакте
@@ -33,7 +33,7 @@ ErrorWrongCode=Неверный код
 NoSalesRepresentativeAffected=Нет частности торговый представитель пострадавших
 ShowCustomer=Показать заказчика
 ShowProspect=Показать проспект
-ListOfProspects=Список перспективы
+ListOfProspects=Список потенциальных клиентов
 ListOfCustomers=Список клиентов
 LastDoneTasks=Последние %s завершенных задач
 LastRecordedTasks=Последние зарегистрированные задач
@@ -44,8 +44,8 @@ DoneActions=Совершено действия
 DoneActionsFor=Совершено меры для %s
 ToDoActions=Неполные действия
 ToDoActionsFor=Неполные действия %s
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
+SendPropalRef=Представление коммерческого предложения %s
+SendOrderRef=Представление заказа %s
 StatusNotApplicable=Не применяется
 StatusActionToDo=Чтобы сделать
 StatusActionDone=Готово
@@ -62,7 +62,7 @@ LastProspectContactDone=Контакт сделали
 DateActionPlanned=Сроки действия, запланированные на
 DateActionDone=Сроки действия сделали
 ActionAskedBy=Действий, заданных
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Событие связано с
 ActionDoneBy=Действий, проделанную
 ActionUserAsk=Зарегистрировано
 ErrorStatusCantBeZeroIfStarted=Если поле 'Дата сделали' заполнен, действие начинается (или закончили), так что поле "Статус" не может быть 0%%.
@@ -71,7 +71,7 @@ ActionAC_FAX=Отправить факс
 ActionAC_PROP=Отправить предложение по Email
 ActionAC_EMAIL=Отправить электронное письмо
 ActionAC_RDV=Встречи
-ActionAC_INT=Intervention on site
+ActionAC_INT=Вмешательство на сайте
 ActionAC_FAC=Отправить платежную
 ActionAC_REL=Отправить платежную (напоминание)
 ActionAC_CLO=Закрыть
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index d453f1b3fba..31d81132f6a 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -18,7 +18,7 @@ NewCompany=Новая компания (проспект, покупатель,
 NewThirdParty=Новые третьей стороне (проспект, клиента, поставщика)
 NewSocGroup=Новая группа компаний
 NewPrivateIndividual=Новое физическое лицо (проспект, клиента, поставщика)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateDolibarrThirdPartySupplier=Создать контрагента (поставщика)
 ProspectionArea=Область потенциальных клиентов
 SocGroup=Группа компаний
 IdThirdParty=Код контрагента
@@ -37,7 +37,7 @@ ThirdParty=Контрагент
 ThirdParties=Контрагенты
 ThirdPartyAll=Контрагенты (все)
 ThirdPartyProspects=Потенциальные клиенты
-ThirdPartyProspectsStats=Перспективы
+ThirdPartyProspectsStats=Потенциальные клиенты
 ThirdPartyCustomers=Покупатели
 ThirdPartyCustomersStats=Заказчики
 ThirdPartyCustomersWithIdProf12=Покупатели с %s или %s
@@ -82,8 +82,8 @@ Poste= Должность
 DefaultLang=Язык по умолчанию
 VATIsUsed=НДС используется
 VATIsNotUsed=НДС не используется
-CopyAddressFromSoc=Fill address with thirdparty address
-NoEmailDefined=There is no email defined
+CopyAddressFromSoc=Заполните адрес адресом контагента
+NoEmailDefined=Не задан адрес элетронной почты
 ##### Local Taxes #####
 LocalTax1IsUsedES= RE используется
 LocalTax1IsNotUsedES= RE не используется
@@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF используется
 LocalTax2IsNotUsedES= IRPF не используется
 LocalTax1ES=Повторно
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeLocaltax1ES=Тип налога RE
+TypeLocaltax2ES=Тип налога IRPF 
+TypeES=Тип
 ThirdPartyEMail=%s
 WrongCustomerCode=Неверный код Покупателя
 WrongSupplierCode=Неверный код Поставщика
@@ -101,18 +101,18 @@ CustomerCodeModel=Шаблон кода Покупателя
 SupplierCodeModel=Шаблон кода Поставщика
 Gencod=Штрих-код
 ##### Professional ID #####
-ProfId1Short=Проф ID 1
-ProfId2Short=Проф ID 2
-ProfId3Short=Проф ID 3
-ProfId4Short=Проф ID 4
-ProfId5Short=Проф ID 5
-ProfId6Short=Prof. id 5
+ProfId1Short=Основной государственный регистрационный номер
+ProfId2Short=Идентификационный номер налогоплательщика 
+ProfId3Short=Код причины постановки на учет
+ProfId4Short=Код общероссийского классификатора предприятий и организаций
+ProfId5Short=Код 5
+ProfId6Short=Код 5
 ProfId1=Профессиональный ID 1
 ProfId2=Профессиональный ID 2
 ProfId3=Профессиональный ID 3
 ProfId4=Профессиональный ID 4
 ProfId5=Профессиональный ID 5
-ProfId6=Professional ID 6
+ProfId6=Профессиональный ID 6
 ProfId1AR=Проф Id 1 (CUIL)
 ProfId2AR=Проф Id 2 (Revenu скоты)
 ProfId3AR=-
@@ -132,9 +132,9 @@ ProfId4BE=-
 ProfId5BE=-
 ProfId6BE=-
 ProfId1BR=-
-ProfId2BR=IE (Inscricao Estadual)
-ProfId3BR=IM (Inscricao Municipal)
-ProfId4BR=CPF
+ProfId2BR=Номер IE (Для Бразилии, государственной регистрации юридических лиц) 
+ProfId3BR=Номер IM (для Бразилии)
+ProfId4BR=Номер CPF (Для Бразилии)
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
 ProfId1CH=-
@@ -259,17 +259,17 @@ AvailableGlobalDiscounts=Доступны абсолютные скидки
 DiscountNone=Нет
 Supplier=Поставщик
 CompanyList=Список компаний
-AddContact=Добавить контакт/адрес
-AddContactAddress=Add contact/address
+AddContact=Создать контакт
+AddContactAddress=Создать контакт/адрес
 EditContact=Изменить контакт / адреса
-EditContactAddress=Edit contact/address
+EditContactAddress=Редактировать контакт/адрес
 Contact=Контакт
 ContactsAddresses=Контакты/Адреса
-NoContactDefinedForThirdParty=No contact defined for this third party
+NoContactDefinedForThirdParty=Не задан контакт для этого контрагента
 NoContactDefined=У этого контрагента не указаны контакты
 DefaultContact=Контакт по умолчанию
-AddCompany=Добавить компанию
-AddThirdParty=Добавить контрагента
+AddCompany=Создать компанию
+AddThirdParty=Создать контрагента
 DeleteACompany=Удалить компанию
 PersonalInformations=Личные данные
 AccountancyCode=Бухгалтерский код
@@ -287,7 +287,7 @@ LastProspect=Последний
 ProspectToContact=Потенциальный клиент для связи
 CompanyDeleted=Компания " %s" удалена из базы данных.
 ListOfContacts=Список контактов/адресов
-ListOfContactsAddresses=List of contacts/adresses
+ListOfContactsAddresses=Список контактов/адресов
 ListOfProspectsContacts=Список контактов потенциальных клиентов
 ListOfCustomersContacts=Список контактов покупателей
 ListOfSuppliersContacts=Список контактов поставщиков
@@ -306,7 +306,7 @@ NoContactForAnyProposal=Этот контакт не является конта
 NoContactForAnyContract=Этот контакт не является контактом договора
 NoContactForAnyInvoice=Этот контакт не является контактом счета-фактуры
 NewContact=Новый контакт/адрес
-NewContactAddress=New contact/address
+NewContactAddress=Новый контакт/адрес
 LastContacts=Последние контакты
 MyContacts=Мои контакты
 Phones=Телефоны
@@ -367,10 +367,10 @@ ExportCardToFormat=Экспорт карточки в формате
 ContactNotLinkedToCompany=Контакт не связан с каким-либо контрагентом
 DolibarrLogin=Имя пользователя Dolibarr
 NoDolibarrAccess=Нет доступа к Dolibarr
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Контрагенты (компании, фонды, физические лица) и свойства
 ExportDataset_company_2=Контакты и свойства
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
+ImportDataset_company_1=Контрагенты (компании, фонды, физические лица) и свойства
+ImportDataset_company_2=Контакты/Адреса (контрагенты и другие) и атрибуты
 ImportDataset_company_3=Банковские реквизиты
 PriceLevel=Уровень цен
 DeliveriesAddress=Адреса доставки
@@ -379,8 +379,8 @@ DeliveryAddressLabel=Бирка с адресом доставки
 DeleteDeliveryAddress=Удалить адрес доставки
 ConfirmDeleteDeliveryAddress=Вы уверены, что хотите удалить этот адрес доставки?
 NewDeliveryAddress=Новый адрес доставки
-AddDeliveryAddress=Добавить адрес
-AddAddress=Добавить адрес
+AddDeliveryAddress=Создать адрес
+AddAddress=Создать адрес
 NoOtherDeliveryAddress=Альтернативный адрес доставки не задан
 SupplierCategory=Категория поставщика
 JuridicalStatus200=Независимый
@@ -397,18 +397,18 @@ YouMustCreateContactFirst=Вы должны сначала создать кон
 ListSuppliersShort=Список поставщиков
 ListProspectsShort=Список потенц. клиентов
 ListCustomersShort=Список покупателей
-ThirdPartiesArea=Third parties and contact area
+ThirdPartiesArea=Область контрагентов и контактов
 LastModifiedThirdParties=Последние %s измененных контрагентов
 UniqueThirdParties=Всего уникальных контрагентов
 InActivity=Открыто
 ActivityCeased=Закрыто
 ActivityStateFilter=Статус активности
-ProductsIntoElements=List of products into %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Reached max. for outstanding bill
+ProductsIntoElements=Список товаров в %s
+CurrentOutstandingBill=Валюта неуплаченного счёта
+OutstandingBill=Максимальный неуплаченный счёт
+OutstandingBillReached=Достигнут максимум неуплаченного счёта
 MonkeyNumRefModelDesc=Вернуть номер с форматом %syymm-NNNN для кода покупателя и %syymm NNNN-код для кода поставщиков, где yy - это год, мм - месяц и NNNN - непрерывная последовательность без возврата к 0.
 LeopardNumRefModelDesc=Код покупателю/поставщику не присваивается. Он может быть изменен в любое время.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+ManagingDirectors=Имя управляющего или управляющих (Коммерческого директора, директора, президента...)
+SearchThirdparty=Поиск контрагента
+SearchContact=Поиск контакта
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index f6c71001a14..2b8adba6916 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - compta
 Accountancy=Бухгалтерия
-AccountancyCard=Бухгалтерия карту
+AccountancyCard=Карточка бухгалтерии 
 Treasury=Казначейство
 MenuFinancial=Финансовые
 TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation
@@ -19,8 +19,8 @@ AmountToBeCharged=Общая сумма для оплаты:
 AccountsGeneral=Счета
 Account=Учетная запись
 Accounts=Счета
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Исходный счёт
+Accountsparent=Исходные счета
 BillsForSuppliers=Законопроекты для поставщиков
 Income=Поступления
 Outcome=Итог
@@ -50,8 +50,8 @@ LT2PaidES=Платные IRPF
 LT1PaidES=RE Paid
 LT2CustomerES=IRPF продаж
 LT2SupplierES=IRPF покупки
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
+LT1CustomerES=Продажи ранее проданного товара/услуги
+LT1SupplierES=Покупки ранее проданного товара/услуги
 VATCollected=НДС собрали
 ToPay=Для оплаты
 ToGet=Чтобы вернуться
@@ -74,7 +74,7 @@ PaymentCustomerInvoice=Заказчиком оплаты счетов-факту
 PaymentSupplierInvoice=Поставщик оплате счета-фактуры
 PaymentSocialContribution=Социальный вклад оплаты
 PaymentVat=НДС платеж
-PaymentSalary=Salary payment
+PaymentSalary=Выплата зарплаты
 ListPayment=Список платежей
 ListOfPayments=Список платежей
 ListOfCustomerPayments=Список клиентов платежи
@@ -84,11 +84,11 @@ DateStartPeriod=Дата начала периода
 DateEndPeriod=Дата окончания периода
 NewVATPayment=Новые оплаты НДС
 newLT2PaymentES=Новые IRPF оплаты
-newLT1PaymentES=New RE payment
+newLT1PaymentES=Новое полашение
 LT2PaymentES=IRPF оплаты
 LT2PaymentsES=IRPF платежей
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=Погашение
+LT1PaymentsES=Погашения
 VATPayment=Оплата НДС
 VATPayments=НДС Платежи
 SocialContributionsPayments=Социальные отчисления платежей
@@ -101,9 +101,9 @@ AccountNumberShort=Номер счета
 AccountNumber=Номер счета
 NewAccount=Новый счет
 SalesTurnover=Оборот по продажам
-SalesTurnoverMinimum=Minimum sales turnover
+SalesTurnoverMinimum=Минимальный товарооборот
 ByThirdParties=Бу-третьих сторон
-ByUserAuthorOfInvoice=На счету автора
+ByUserAuthorOfInvoice=По счету автора
 AccountancyExport=Бухгалтерия экспорт
 ErrorWrongAccountancyCodeForCompany=Плохо заказчику бухгалтерские код %s
 SuppliersProductsSellSalesTurnover=Генерируемый оборот по продажам поставщиков продукции.
@@ -115,7 +115,7 @@ NewCheckDeposit=Новая проверка депозит
 NewCheckDepositOn=Новый депозит проверить на счету: %s
 NoWaitingChecks=Не дожидаясь проверок на хранение.
 DateChequeReceived=Чек при ввода даты
-NbOfCheques=Nb чеков
+NbOfCheques=Кол-во чеков
 PaySocialContribution=Оплатить социального взноса
 ConfirmPaySocialContribution=Вы уверены, что хотите классифицировать этот социальный вклад, как оплачивается?
 DeleteSocialContribution=Удалить социального взноса
@@ -146,14 +146,14 @@ DepositsAreNotIncluded=- Депозитные счета-фактуры и не
 DepositsAreIncluded=- Депозитные счета включены
 LT2ReportByCustomersInInputOutputModeES=Доклад третьей стороной IRPF
 LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+VATReportByCustomersInInputOutputMode=Отчёт по собранному и оплаченному НДС клиента
+VATReportByCustomersInDueDebtMode=Отчёт по собранному и оплаченному НДС клиента
+VATReportByQuartersInInputOutputMode=Отчёт по собранной и оплаченной ставке НДС 
+LT1ReportByQuartersInInputOutputMode=Отчёт по ставке RE
+LT2ReportByQuartersInInputOutputMode=Отчёт по ставке IRPF
+VATReportByQuartersInDueDebtMode=Отчёт по собранной и оплаченной ставке НДС 
+LT1ReportByQuartersInDueDebtMode=Отчёт по ставке RE
+LT2ReportByQuartersInDueDebtMode=Отчёт по ставке IRPF
 SeeVATReportInInputOutputMode=См. LE отношения %sTVA encaissement %s для режима де CALCUL стандарт
 SeeVATReportInDueDebtMode=См. LE отношения %sTVA сюр dbit %s для режима де CALCUL AVEC вариант SUR LES dbits
 RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
@@ -183,9 +183,9 @@ DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than o
 Pcg_version=Pcg version
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
-AccountancyDashboard=Accountancy summary
+InvoiceLinesToDispatch=Строки счёта для отправки
+InvoiceDispatched=Отправленные счета
+AccountancyDashboard=Суммарная информация по бухгалтерии
 ByProductsAndServices=По продуктам и услугам
 RefExt=External ref
 ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
@@ -204,4 +204,4 @@ ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdpartie
 ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
 CloneTax=Clone a social contribution
 ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+CloneTaxForNextMonth=Клонировать для следующего месяца
diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang
index d64ad647ab7..6b4dbd73495 100644
--- a/htdocs/langs/ru_RU/contracts.lang
+++ b/htdocs/langs/ru_RU/contracts.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=Раздел договоров
 ListOfContracts=Список договоров
-LastModifiedContracts=Last %s modified contracts
+LastModifiedContracts=Последние %s изменённых контактов
 AllContracts=Все договоры
 ContractCard=Карточка договора
 ContractStatus=Статус договора
@@ -19,7 +19,7 @@ ServiceStatusLateShort=Истек
 ServiceStatusClosed=Закрытые
 ServicesLegend=Услуги легенда
 Contracts=Договоры
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Контракты и строка с контрактами
 Contract=Договор
 NoContracts=Нет договоров
 MenuServices=Услуги
@@ -28,33 +28,33 @@ MenuRunningServices=Запуск служб
 MenuExpiredServices=Истекшим сроком службы
 MenuClosedServices=Закрытые услуги
 NewContract=Новый договор
-AddContract=Create contract
+AddContract=Создать контракт
 SearchAContract=Искать договор
 DeleteAContract=Удалить договор
-CloseAContract=Закрыть контракта
+CloseAContract=Закрыть договор
 ConfirmDeleteAContract=Вы уверены, что хотите удалить этот контракт, и на все свои услуги?
 ConfirmValidateContract=Вы уверены, что хотите проверить этот договор?
 ConfirmCloseContract=Это позволит закрыть все услуги (активный или нет). Вы уверены, что хотите закрыть этот договор?
 ConfirmCloseService=Вы действительно хотите закрыть эту услугу с даты %s?
-ValidateAContract=Проверить контракт
+ValidateAContract=Проверить договор
 ActivateService=Активировать услугу
 ConfirmActivateService=Вы уверены, что хотите, чтобы активировать данную услугу с даты %s?
-RefContract=Contract reference
+RefContract=Справка о договоре
 DateContract=Дата договора
 DateServiceActivate=Дата активации услуги
-DateServiceUnactivate=Сроки службы unactivation
-DateServiceStart=Дата начала службы
-DateServiceEnd=Дата окончания службы
+DateServiceUnactivate=Дата деактивации услуги
+DateServiceStart=Дата начала услуги
+DateServiceEnd=Дата окончания услуги
 ShowContract=Показать договор
 ListOfServices=Список услуг
 ListOfInactiveServices=Перечень услуг не активен
 ListOfExpiredServices=Список с истекшим сроком службы
 ListOfClosedServices=Список закрытых услуги
-ListOfRunningContractsLines=Список запуска контракта линий
+ListOfRunningContractsLines=Список запущенных линий по договору
 ListOfRunningServices=Список запущенных служб
 NotActivatedServices=Не активируется услуг (в том числе утверждены контракты)
-BoardNotActivatedServices=Услуги для активации среди утверждены контракты
-LastContracts=Last %s contracts
+BoardNotActivatedServices=Услуги для активации среди подтвержденных договоров
+LastContracts=Последние %s контрактов
 LastActivatedServices=Последнее %s активированных услуг
 LastModifiedServices=Последнее% с измененными услуги
 EditServiceLine=Изменить направление
@@ -68,16 +68,16 @@ DateStartReal=Реальная дата начала
 DateStartRealShort=Реальная дата начала
 DateEndReal=Реальная дата окончания
 DateEndRealShort=Реальная дата окончания
-NbOfServices=Nb услуг
-CloseService=Закрыть службы
-ServicesNomberShort=%s служба (ы)
-RunningServices=Запуск служб
-BoardRunningServices=Истекшие Запуск услуги
-ServiceStatus=Положение о службе
-DraftContracts=Проекты контрактов
-CloseRefusedBecauseOneServiceActive=Контракт не может быть закрыто, пока, по крайней мере один открытый службе по нему
-CloseAllContracts=Закрыть все контракты
-DeleteContractLine=Удалить контракт линия
+NbOfServices=Кол-во услуг
+CloseService=Закрыть услугу
+ServicesNomberShort=%s услуга (услуги)
+RunningServices=Запущенные услуги
+BoardRunningServices=Истекшие запущенные услуги
+ServiceStatus=Статус услуги
+DraftContracts=Проекты договоров
+CloseRefusedBecauseOneServiceActive=Договор не может быть закрыт, пока, по крайней мере, существует одна открытая услуга по нему.
+CloseAllContracts=Закрыть все строки договора
+DeleteContractLine=Удалить строку договора
 ConfirmDeleteContractLine=Вы уверены, что хотите удалить этот контракт линию?
 MoveToAnotherContract=Переместите службу в другой договор.
 ConfirmMoveToAnotherContract=Я выбранного новая цель договора и подтвердить, я хочу перейти эту услугу в этом договоре.
@@ -87,12 +87,12 @@ ExpiredSince=Срок действия
 RelatedContracts=Связанные договоры
 NoExpiredServices=Не истек активных услуг
 ListOfServicesToExpireWithDuration=Список услуг, истекающих в ближайшие %s дней
-ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
+ListOfServicesToExpireWithDurationNeg=Список услуг истёк более %s дней назад
 ListOfServicesToExpire=Список истекающих услуг
 NoteListOfYourExpiredServices=Этот список содержит только услуги по договорам с Контрагентами, с которыми связаны как торговый представитель
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+StandardContractsTemplate=Стандартный шаблон контракта
+ContactNameAndSignature=Для %s,  имя и подпись
+OnlyLinesWithTypeServiceAreUsed=Только строки с типом "Услуга" могут быть клонированы.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Торговый представитель подписания контракта
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index 9cfdaf5e1d9..9cef3657708 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -1,46 +1,46 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 About = О
-CronAbout = About Cron
-CronAboutPage = Cron about page
+CronAbout = О Планировщике
+CronAboutPage = Страница о планировщике
 # Right
-Permission23101 = Read Scheduled task
-Permission23102 = Create/update Scheduled task
+Permission23101 = Открыть запланированную задачу
+Permission23102 = Создать/удалить запланированное задание
 Permission23103 = Удалить запланированное задание
 Permission23104 = Выполнить запланированное задание
 # Admin
 CronSetup= Настройки запланированных заданий
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
-OrToLaunchASpecificJob=Or to check and launch a specific job
-KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to launch cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+URLToLaunchCronJobs=Ссылка для проверки и запуска заданий планировщика cron (если требуется)
+OrToLaunchASpecificJob=Или проверить и запустить специальную задачу
+KeyForCronAccess=Ключ безопасности для запуска запланированных заданий
+FileToLaunchCronJobs=Командная строка для запуска запланированных заданий. 
+CronExplainHowToRunUnix=В системах Unix-like вы должны задать crontab для выполнения команды каждые 5 минут.
+CronExplainHowToRunWin=В Майкрософт Windows © вы должны использовать Планировщик для запуска команды каждые 5 минут. 
 # Menu
 CronJobs=Запланированные задания
-CronListActive=List of active/scheduled jobs
+CronListActive=Список активных/запланированных заданий
 CronListInactive=Список неактивных заданий
 # Page list
 CronDateLastRun=Последний раз выполнено
-CronLastOutput=Last run output
-CronLastResult=Last result code
+CronLastOutput=Последний вывод команды
+CronLastResult=Последний код возврата команды
 CronListOfCronJobs=Список запланированных заданий
 CronCommand=Команда
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
-CronTask=Job
-CronNone= Никакой
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
+CronTask=Задание
+CronNone=Никакой
 CronDtStart=Начальная дата
 CronDtEnd=Конечная дата
 CronDtNextLaunch=Следующий запуск
 CronDtLastLaunch=Последний запуск
 CronFrequency=Частота
-CronClass=Classe
+CronClass=Класс
 CronMethod=Метод
 CronModule=Модуль
 CronAction=Действие
@@ -50,14 +50,14 @@ CronStatusInactive=Выключено
 CronNoJobs=Нет зарегистрированных заданий
 CronPriority=Приоритет
 CronLabel=Описание
-CronNbRun=Nb. launch
+CronNbRun=Кол-во запусков
 CronEach=Каждый
 JobFinished=Задание запущено и завершено
 #Page card
 CronAdd= Добавить задание
-CronHourStart= Start Hour and date of task
-CronEvery= And execute task each
-CronObject= Instance/Object to create
+CronHourStart= Время и дата для запуска задачи
+CronEvery= И выполнять задачу каждые
+CronObject= Экземпляр / объект для создания
 CronArgs=Параметры
 CronSaveSucess=Сохранено успешно
 CronNote=Комментарий
@@ -65,23 +65,24 @@ CronFieldMandatory=Поле %s является обязательным
 CronErrEndDateStartDt=Дата окончания не может быть раньше даты начала
 CronStatusActiveBtn=Включено
 CronStatusInactiveBtn=Выключать
-CronTaskInactive=This job is disabled
-CronDtLastResult=Last result date
-CronId=Id
-CronClassFile=Classes (filename.class.php)
+CronTaskInactive=Задание отключено
+CronDtLastResult=Дата последнего выполнения
+CronId=ID
+CronClassFile=Классы (filename.class.php)
 CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of module is product
 CronClassFileHelp=The file name to load. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is product.class.php
 CronObjectHelp=The object name to load. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is Product
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
-CronCommandHelp=The system command line to execute.
+CronCommandHelp=Команда для выполнения
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Информация
 # Common
 CronType=Тип задачи
-CronType_method=Call method of a Dolibarr Class
-CronType_command=Shell command
-CronMenu=Cron
-CronCannotLoadClass=Cannot load class %s or object %s
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
-TaskDisabled=Task disabled
+CronType_method=Вызов метода из класса системы Dolibarr 
+CronType_command=Команда командной строки
+CronMenu=Планировщик
+CronCannotLoadClass=Невозможно загрузить класс %s или объект %s
+UseMenuModuleToolsToAddCronJobs=Используйте меню "Главная - Настройки модулей -Список заданий"  для просмотра и редактирования запланированных заданий. 
+TaskDisabled=Задача отключена
diff --git a/htdocs/langs/ru_RU/deliveries.lang b/htdocs/langs/ru_RU/deliveries.lang
index 86064863ed2..adf4353859c 100644
--- a/htdocs/langs/ru_RU/deliveries.lang
+++ b/htdocs/langs/ru_RU/deliveries.lang
@@ -23,4 +23,6 @@ GoodStatusDeclaration=Указанные выше товары получены
 Deliverer=Доставщик:
 Sender=Отправитель
 Recipient=Получатель
-# ErrorStockIsNotEnough=There's not enough stock
+ErrorStockIsNotEnough=There's not enough stock
+Shippable=Возможно к отправке
+NonShippable=Не возможно к отправке
diff --git a/htdocs/langs/ru_RU/dict.lang b/htdocs/langs/ru_RU/dict.lang
index 5da032e8b7e..c22717d4ef4 100644
--- a/htdocs/langs/ru_RU/dict.lang
+++ b/htdocs/langs/ru_RU/dict.lang
@@ -290,7 +290,9 @@ CurrencySingXOF=Франк КФА ЦБЗАГ
 CurrencyXPF=CFP франков
 CurrencySingXPF=Франк КФП
 CurrencyCentSingEUR=цент
-CurrencyThousandthSingTND=thousandth
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
+CurrencyThousandthSingTND=тысячный
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Интернет
 DemandReasonTypeSRC_CAMP_MAIL=Почтовый кампании
@@ -299,27 +301,27 @@ DemandReasonTypeSRC_CAMP_PHO=Телефон кампании
 DemandReasonTypeSRC_CAMP_FAX=Факс кампании
 DemandReasonTypeSRC_COMM=Коммерческие контакты
 DemandReasonTypeSRC_SHOP=Магазин контакт
-DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_WOM=Из уст в уста
 DemandReasonTypeSRC_PARTNER=Партнер
 DemandReasonTypeSRC_EMPLOYEE=Сотрудник
 DemandReasonTypeSRC_SPONSORING=Спонсорство
 #### Paper formats ####
-PaperFormatEU4A0=Format 4A0
-PaperFormatEU2A0=Format 2A0
-PaperFormatEUA0=Format A0
-PaperFormatEUA1=Format A1
-PaperFormatEUA2=Format A2
-PaperFormatEUA3=Format A3
-PaperFormatEUA4=Format A4
-PaperFormatEUA5=Format A5
-PaperFormatEUA6=Format A6
-PaperFormatUSLETTER=Format Letter US
-PaperFormatUSLEGAL=Format Legal US
-PaperFormatUSEXECUTIVE=Format Executive US
-PaperFormatUSLEDGER=Format Ledger/Tabloid
-PaperFormatCAP1=Format P1 Canada
-PaperFormatCAP2=Format P2 Canada
-PaperFormatCAP3=Format P3 Canada
-PaperFormatCAP4=Format P4 Canada
-PaperFormatCAP5=Format P5 Canada
-PaperFormatCAP6=Format P6 Canada
+PaperFormatEU4A0=Формат 4A0
+PaperFormatEU2A0=Формат 2A0
+PaperFormatEUA0=Формат A0
+PaperFormatEUA1=Формат А1
+PaperFormatEUA2=Формат А2
+PaperFormatEUA3=Формат А3
+PaperFormatEUA4=Формат А4
+PaperFormatEUA5=Формат А5
+PaperFormatEUA6=Формат А6
+PaperFormatUSLETTER=Формат Letter US
+PaperFormatUSLEGAL=Формат Legal US
+PaperFormatUSEXECUTIVE=Формат Executive US
+PaperFormatUSLEDGER=Формат таблоида
+PaperFormatCAP1=Формат P1  Канада
+PaperFormatCAP2=Формат P2  Канада
+PaperFormatCAP3=Формат P3 Канада
+PaperFormatCAP4=Формат P4  Канада
+PaperFormatCAP5=Формат P5 Канада
+PaperFormatCAP6=Формат P6  Канада
diff --git a/htdocs/langs/ru_RU/donations.lang b/htdocs/langs/ru_RU/donations.lang
index e8339fe9701..40e38961a45 100644
--- a/htdocs/langs/ru_RU/donations.lang
+++ b/htdocs/langs/ru_RU/donations.lang
@@ -1,12 +1,14 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Пожертвование
 Donations=Пожертвования
-DonationRef=Donation ref.
+DonationRef= ref. пожертвования
 Donor=Донор
 Donors=Доноры
-AddDonation=Create a donation
+AddDonation=Создать пожертование
 NewDonation=Новое пожертвование
-ShowDonation=Show donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
+ShowDonation=Показать пожертование
 DonationPromise=Обещание пожертвования
 PromisesNotValid=Неподтвержденные обещания
 PromisesValid=Подтвержденные обещания
@@ -21,18 +23,21 @@ DonationStatusPaid=Полученное пожертвование
 DonationStatusPromiseNotValidatedShort=Проект
 DonationStatusPromiseValidatedShort=Подтверждено
 DonationStatusPaidShort=Получено
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Подтвердить обещание
-DonationReceipt=Donation receipt
+DonationReceipt=Получатель пожертования
 BuildDonationReceipt=Создать подтверждение получения
 DonationsModels=Модели документов для подтверждение получения пожертвования
 LastModifiedDonations=Последние %s измененных пожертвований
 SearchADonation=Поиск пожертвования
-DonationRecipient=Donation recipient
-ThankYou=Thank You
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationRecipient=Получатель пожертования
+ThankYou=Спасибо
+IConfirmDonationReception=Получатель объявляет приём, как пожертвование, в следующем размере
+MinimumAmount=Минимальное пожертвование %s
+FreeTextOnDonations=Текст для показа в нижней части 
+FrenchOptions=Настройки для Франции
+DONATION_ART200=Если вы обеспокоены, показывать выдержку статьи 200 из CGI
+DONATION_ART238=Если вы обеспокоены, показывать выдержку статьи 238 из CGI
+DONATION_ART885=Если вы обеспокоены, показывать выдержку статьи 885 из CGI
+DonationPayment=Donation payment
diff --git a/htdocs/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
index 18e063ef298..07ce2ffd803 100644
--- a/htdocs/langs/ru_RU/ecm.lang
+++ b/htdocs/langs/ru_RU/ecm.lang
@@ -1,57 +1,57 @@
 # Dolibarr language file - Source file is en_US - ecm
 MenuECM=Документы
 DocsMine=Мои документы
-DocsGenerated=Сгенерирована документы
-DocsElements=Элементы документы
-DocsThirdParties=Документы третьих сторон
+DocsGenerated=Сгенерированые документы
+DocsElements=Элементы документов
+DocsThirdParties=Документы контрагентов
 DocsContracts=Документы контрактов
-DocsProposals=Документы предложения
-DocsOrders=Документы, приказы
-DocsInvoices=Документы, счета-фактуры
-ECMNbOfDocs=Nb документов в директории
-ECMNbOfDocsSmall=Nb документа.
-ECMSection=Каталог
-ECMSectionManual=Руководство по каталогу
-ECMSectionAuto=Автоматический каталог
-ECMSectionsManual=Руководство по каталогам
-ECMSectionsAuto=Автоматическое каталоги
-ECMSections=Каталоги
+DocsProposals=Документы предложений
+DocsOrders=Документы заказов
+DocsInvoices=Документы счетов
+ECMNbOfDocs=Кол-во документов в директории
+ECMNbOfDocsSmall=Кол-во док-в.
+ECMSection=Директория
+ECMSectionManual=Директория в ручном режиме
+ECMSectionAuto=Директория в автоматическом режиме
+ECMSectionsManual=Ручное дерево директории
+ECMSectionsAuto=Автоматическое дерево директории
+ECMSections=Директории
 ECMRoot=Корневая
-ECMNewSection=Новый каталог
-ECMAddSection=Добавить руководства каталог
+ECMNewSection=Новая директория
+ECMAddSection=Добавить директорию
 ECMNewDocument=Новый документ
 ECMCreationDate=Дата создания
 ECMNbOfFilesInDir=Количество файлов в каталоге
-ECMNbOfSubDir=Количество суб-директории
-ECMNbOfFilesInSubDir=Number of files in sub-directories
-ECMCreationUser=Creator
-ECMArea=EDM area
-ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
+ECMNbOfSubDir=Количество поддиректорий
+ECMNbOfFilesInSubDir=Количество файлов в поддиректориях
+ECMCreationUser=Создатель
+ECMArea=Зона электронного документооборота
+ECMAreaDesc=Зона ЭД (Электронный документооборот) позволяет вам сохранять, распространять, быстро искать все типы документов в системе   Dolibarr.
 ECMAreaDesc2=* Автоматическая справочники заполняются автоматически при добавлении документов с карточкой элемента. 
     * Руководство каталогов можно использовать для сохранения документов, не связанных с конкретным элементом.
 ECMSectionWasRemoved=Каталог %s удален.
-ECMDocumentsSection=Документ каталога
+ECMDocumentsSection=Документ из директории
 ECMSearchByKeywords=Поиск по ключевым словам
-ECMSearchByEntity=Поиск объекта
-ECMSectionOfDocuments=Справочные документы
-ECMTypeManual=Руководство
-ECMTypeAuto=Автоматическая
-ECMDocsBySocialContributions=Documents linked to social contributions
+ECMSearchByEntity=Поиск по объекту
+ECMSectionOfDocuments=Директории документов
+ECMTypeManual=Ручной
+ECMTypeAuto=Автоматический
+ECMDocsBySocialContributions=Документы, связанные с отчислениями на социальные нужды
 ECMDocsByThirdParties=Документы, связанные с третьими сторонами
 ECMDocsByProposals=Документы, связанные с предложениями
 ECMDocsByOrders=Документы, связанные с заказчиками заказов
 ECMDocsByContracts=Документы, связанные с контрактами
 ECMDocsByInvoices=Документы, связанные с заказчиками счетами
 ECMDocsByProducts=Документы, связанные с продуктами
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMNoDirectoryYet=Нет создали каталог
-ShowECMSection=Показать каталог
+ECMDocsByProjects=Документы, связанные с проектрами
+ECMDocsByUsers=Документы, связанные с пользователями
+ECMDocsByInterventions=Документы, связанные с меропрятиями
+ECMNoDirectoryYet=Директория не создана
+ShowECMSection=Показать директорию
 DeleteSection=Удаление директории
-ConfirmDeleteSection=Можете ли вы подтвердить, вы хотите удалить каталог %s?
-ECMDirectoryForFiles=Относительная каталог файлов
-CannotRemoveDirectoryContainsFiles=Удалена не представляется возможным, поскольку в нем содержатся некоторые файлы
+ConfirmDeleteSection=Вы точно хотите удалить директорию %s?
+ECMDirectoryForFiles=Относительная директория для файлов
+CannotRemoveDirectoryContainsFiles=Директория не может быть удалена, потому что содержит файлы
 ECMFileManager=Файловый менеджер
-ECMSelectASection=Выберите каталог на левом дереве ...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+ECMSelectASection=Выберите директорию на левом дереве ...
+DirNotSynchronizedSyncFirst=Эта директория была создана или изменена не с помощью модуля электронного документооборота. Вы должны нажать "Обновить", чтобы синхронизировать данные на диске и базу данных и иметь возможность их использования. 
 
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 839f620bd6c..6f7e5cc2210 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Нет ошибок, мы принимаем
 # Errors
 Error=Ошибка
 Errors=Ошибки
-ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorButCommitIsDone=Обнаружены ошибки, но мы подтвердиле несмотря на это
 ErrorBadEMail=EMail %s неправильно
 ErrorBadUrl=Url %s неправильно
 ErrorLoginAlreadyExists=Логин %s уже существует.
@@ -27,7 +27,7 @@ ErrorProdIdIsMandatory=%s является обязательным
 ErrorBadCustomerCodeSyntax=Плохо синтаксис для заказчика код
 ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
 ErrorCustomerCodeRequired=Требуется код клиента
-ErrorBarCodeRequired=Bar code required
+ErrorBarCodeRequired=Требуется штрих-код
 ErrorCustomerCodeAlreadyUsed=Код клиента уже используется
 ErrorBarCodeAlreadyUsed=Bar code already used
 ErrorPrefixRequired=Префикс обязателен
@@ -61,13 +61,13 @@ ErrorFileSizeTooLarge=Размер файла слишком велик.
 ErrorSizeTooLongForIntType=Размер слишком долго для целого типа (%s цифр максимум)
 ErrorSizeTooLongForVarcharType=Размер слишком долго для струнного типа (%s символов максимум)
 ErrorNoValueForSelectType=Пожалуйста, заполните значение для выпадающего списка
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
+ErrorNoValueForCheckBoxType=Пожалуйста, заполните значение для списка флажков
+ErrorNoValueForRadioType=Пожалуйста, заполните  значени для списка переключателей
 ErrorBadFormatValueList=The list value cannot have more than one come : %s, but need at least one: llave,valores
 ErrorFieldCanNotContainSpecialCharacters=Поле %s не содержит специальных символов.
 ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
 ErrorNoAccountancyModuleLoaded=Нет бухгалтерского модуля активируется
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorExportDuplicateProfil=Имя этого профиля уже сущесвует для этого набора для экспорта.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP соответствия не является полной.
 ErrorLDAPMakeManualTest=. LDIF файл был создан в директории %s. Попробуйте загрузить его вручную из командной строки, чтобы иметь больше информации об ошибках.
 ErrorCantSaveADoneUserWithZeroPercentage=Не удается сохранить действие с "Статут не началась", если поле "проделанной" также заполнены.
@@ -92,7 +92,7 @@ ErrorBadMask=Ошибка на маску
 ErrorBadMaskFailedToLocatePosOfSequence=Ошибка, маска без порядкового номера
 ErrorBadMaskBadRazMonth=Ошибка, плохое значение сброса
 ErrorMaxNumberReachForThisMask=Max number reach for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
+ErrorCounterMustHaveMoreThan3Digits=Счётчик должен иметь более 3 цифр
 ErrorSelectAtLeastOne=Ошибка. Выберите хотя бы одну запись.
 ErrorProductWithRefNotExist=Изделие с %s ссылки не существуют
 ErrorDeleteNotPossibleLineIsConsolidated=Удаление невозможно, потому что запись связана с банком transation, который согласован
@@ -116,51 +116,57 @@ ErrorLoginDoesNotExists=Пользователь с логином %s н
 ErrorLoginHasNoEmail=Этот пользователь не имеет адреса электронной почты. Процесс прерван.
 ErrorBadValueForCode=Плохо значения типов кода. Попробуйте еще раз с новой стоимости ...
 ErrorBothFieldCantBeNegative=Поля %s и %s не может быть и отрицательным
-ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
+ErrorQtyForCustomerInvoiceCantBeNegative=Количество строк в счетах клиента не может быть отрицательным
 ErrorWebServerUserHasNotPermission=Учетная запись пользователя %s используется для выполнения веб-сервер не имеет разрешения для этого
 ErrorNoActivatedBarcode=Нет штрих-кодов типа активированного
-ErrUnzipFails=Failed to unzip %s with ZipArchive
-ErrNoZipEngine=No engine to unzip %s file in this PHP
-ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
+ErrUnzipFails=Невозможно распаковать %s с помощью  ZipArchive
+ErrNoZipEngine=Нет доступного модуля в PHP для распаковки файла %s
+ErrorFileMustBeADolibarrPackage=Файл %s  должен быть архивом zip системы Dolibarr 
 ErrorFileRequired=It takes a package Dolibarr file
-ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
-ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
+ErrorPhpCurlNotInstalled=Модуль CURL для PHP  не установлен, он необходим для работы с PayPal
+ErrorFailedToAddToMailmanList=Невозможно добавить запись %s в список %s  системы Mailman или в базу  SPIP
+ErrorFailedToRemoveToMailmanList=Невозможно удалить  запись %s из  списка %s  системы Mailman или  базы  SPIP
 ErrorNewValueCantMatchOldValue=Новое значение не может быть равно старому
-ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
+ErrorFailedToValidatePasswordReset=Невозможно обновить пароль. Может быть, обновление пароля уже выполнено (так как вы использовали одноразовую ссылку). Если это не так, попробуйте обновить пароль ещё раз. 
+ErrorToConnectToMysqlCheckInstance=Не удалось соединиться с БД. Проверьте, запущен ли сервер БД MySQL (в большинстве случаев, вы можете запустить его командой  'sudo /etc/init.d/mysql start')  
 ErrorFailedToAddContact=Ошибка при добавлении контакта
 ErrorDateMustBeBeforeToday=Дата не может быть больше сегодняшней
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
-ErrorPHPNeedModule=Error, your PHP must have module %s installed to use this feature.
+ErrorPHPNeedModule=Ошибка. Ваш PHP  должен иметь модуль %s для использования этой функции. 
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
-ErrorWarehouseMustDiffers=Source and target warehouses must differs
+ErrorWarehouseMustDiffers=Исходящий и входящий склад должны отличаться
 ErrorBadFormat=Неправильный формат!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
-ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
+ErrorCantDeletePaymentSharedWithPayedInvoice=Не удается удалить платёж, поскольку есть по крайней мере один счет со статусом 'оплачен'
+ErrorPriceExpression1=Невозможно назначить константой '%s'
+ErrorPriceExpression2=Невозможно задать заново встроенную функцию  '%s'
+ErrorPriceExpression3=Необъявленная переменная  '%s' в задании функции
+ErrorPriceExpression4=Недопустимый символ '%s'
+ErrorPriceExpression5=Непредвиденный '%s'
+ErrorPriceExpression6=Неверное количество аргументов  (%s задано, %s ожидалось)
+ErrorPriceExpression8=Непредвиденные оператор '%s'
+ErrorPriceExpression9=Произошла неожиданная ошибка
 ErrorPriceExpression10=Iperator '%s' lacks operand
 ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
+ErrorPriceExpression14=Деление на ноль
+ErrorPriceExpression17=Необъявленная переменная  '%s'
+ErrorPriceExpression19=Выражение не найдено
+ErrorPriceExpression20=Пустое выражение
+ErrorPriceExpression21=Пустой результат  '%s'
+ErrorPriceExpression22=Отрицательный результат  '%s'
+ErrorPriceExpressionInternal=Внутренняя ошибка '%s'
+ErrorPriceExpressionUnknown=Неизвестная ошибка '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Исходящий и входящий склад должны отличаться
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Обязательные параметры не определены
@@ -172,12 +178,12 @@ WarningPassIsEmpty=Внимание, базы данных пароль пуст
 WarningConfFileMustBeReadOnly=Внимание, ваш конфигурационный файл (htdocs / CONF / conf.php) может быть переписан на веб-сервере. Это серьезная дыра в безопасности. Изменение разрешений на файл находится в режиме только для чтения для операционной системы пользователя используется веб-сервер. Если вы используете Windows FAT и формат для Вашего диска, вы должны знать, что эта файловая система не позволяет добавить разрешения на файл, поэтому не может быть полностью безопасным.
 WarningsOnXLines=Предупреждения об источнике %s линий
 WarningNoDocumentModelActivated=Ни одна из моделей, для генерации документов, была активирована. Модель будет выбранные по умолчанию, пока вы не проверить ваш модуль установки.
-WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file install.lock into directory %s. Missing this file is a security hole.
+WarningLockFileDoesNotExists=Передупреждение. Как только установка завершена, вы должны отключить возможности установки/переноса. Это возможно сделать, добавив файл install.lock в каталог %s. Если вы не сделаете это, это будет являться брешью в безопасности. 
 WarningUntilDirRemoved=Это предупреждение остается активным до тех пор, пока эта директория присутствует (отображается только для администратора пользователей).
 WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
 WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
 WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningNotRelevant=Irrelevant operation for this dataset
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
-WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
-WarningTooManyDataPleaseUseMoreFilters=Too many data. Please use more filters
+WarningNotRelevant=Ненужная операция для этого набора данных
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Функция отключена, когда отображение оадптировано для слабовидящих или текстовых браузеров. 
+WarningPaymentDateLowerThanInvoiceDate=Дата платежа (%s)  меньше, чем дата  (%s)  счёта  %s.
+WarningTooManyDataPleaseUseMoreFilters=Слишком много данных. Пожалуйста, используйте дополнительные фильтры 
diff --git a/htdocs/langs/ru_RU/exports.lang b/htdocs/langs/ru_RU/exports.lang
index 8b787afcef0..bd8d61a5a9f 100644
--- a/htdocs/langs/ru_RU/exports.lang
+++ b/htdocs/langs/ru_RU/exports.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Экспорт области
-ImportArea=Импорт области
+ExportsArea=Раздел экспорта
+ImportArea=Раздел импорта
 NewExport=Новый экспорт
 NewImport=Новые импортные
 ExportableDatas=Экспортировать данные
@@ -64,7 +64,7 @@ ChooseFormatOfFileToImport=Выберите формат файла для ис
 ChooseFileToImport=Выберите файл для импорта выберите пункт о picto %s ...
 SourceFileFormat=Формат исходного файла
 FieldsInSourceFile=Поля в исходном файле
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+FieldsInTargetDatabase=Целевые поля в БД системы Dolibarr  (жирным - обязательные)
 Field=Поле
 NoFields=Нет поля
 MoveField=Перемещение поля %s номер столбца
@@ -111,14 +111,14 @@ SourceExample=Пример возможных значений данных
 ExampleAnyRefFoundIntoElement=Любая ссылка на элемент найден %s
 ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary %s
 CSVFormatDesc=Разделителями-запятыми файл (формат. CSV). 
     Это текстовый формат файла, в котором поля разделены сепаратором [%s]. Если разделитель находится внутри области содержания, поля окружены круглый характер [%s]. Escape характер бежать вокруг характер [%s].
-Excel95FormatDesc=Excel file format (.xls)
    This is native Excel 95 format (BIFF5).
-Excel2007FormatDesc=Excel file format (.xlsx)
    This is native Excel 2007 format (SpreadsheetML).
+Excel95FormatDesc=Формат файла Excel (.xls)
    Это формат Excel 95  (BIFF5).
+Excel2007FormatDesc=Формат файла Excel  (.xlsx)
    Это формат Excel версий старше 2007  (SpreadsheetML).
 TsvFormatDesc=Tab Separated Value file format (.tsv)
    This is a text file format where fields are separated by a tabulator [tab].
 ExportFieldAutomaticallyAdded=Field %s was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all lines will own their own id and will differ).
 CsvOptions=Csv Options
-Separator=Separator
+Separator=Разделитель
 Enclosure=Enclosure
-SuppliersProducts=Suppliers Products
+SuppliersProducts=Товары поставщиков
 BankCode=Код банка
 DeskCode=Код описания
 BankAccountNumber=Номер счета
@@ -131,4 +131,4 @@ ExportNumericFilter='NNNNN' filters by one value
    'NNNNN+NNNNN' filters over a
 SelectFilterFields=If you want to filter on some values, just input values here.
 FilterableFields=Champs Filtrables
 FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
+FilteredFieldsValues=Значение для фильтрации
diff --git a/htdocs/langs/ru_RU/ftp.lang b/htdocs/langs/ru_RU/ftp.lang
index 157293d09da..cb2cf6926e1 100644
--- a/htdocs/langs/ru_RU/ftp.lang
+++ b/htdocs/langs/ru_RU/ftp.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - ftp
 FTPClientSetup=Настройка модуля FTP-клиента
 NewFTPClient=Настройка нового соединения FTP
-FTPArea=FTP-область
-FTPAreaDesc=На этом экране вам показано содержимое FTP-сервера
-SetupOfFTPClientModuleNotComplete=Установка модуля FTP-клиента, по-видимому, не завершена
-FTPFeatureNotSupportedByYourPHP=Ваша версия PHP не поддерживает FTP-функций
+FTPArea=Раздел FTP
+FTPAreaDesc=На этом экране вам показано представление содержимого FTP-сервера
+SetupOfFTPClientModuleNotComplete=Настройка модуля FTP-клиента, по-видимому, не завершена
+FTPFeatureNotSupportedByYourPHP=Ваша версия PHP не поддерживает функции FTP
 FailedToConnectToFTPServer=Не удалось подключиться к FTP-серверу (сервер %s, порт %s)
-FailedToConnectToFTPServerWithCredentials=Не удалось войти на FTP-сервер с указанными Логином и паролем
+FailedToConnectToFTPServerWithCredentials=Не удалось войти на FTP-сервер с указанными логином и паролем
 FTPFailedToRemoveFile=Не удалось удалить файл %s.
-FTPFailedToRemoveDir=Не удалось удалить каталог %s (Проверьте разрешения и убедитесь, что каталог пуст).
-# FTPPassiveMode=Passive mode
+FTPFailedToRemoveDir=Не удалось удалить каталог %s (Проверьте права доступа и убедитесь, что каталог пуст).
+FTPPassiveMode=Пассивный режим
diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 5d133e0bbf7..941e40ee0b4 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -1,41 +1,41 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
-MenuReportMonth=Monthly statement
-MenuAddCP=Make a leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-NotConfigModCP=You must configure the module Leaves to view this page. To do this,  click here .
-NoCPforUser=You don't have any available day.
-AddCP=Make a leave request
+HRM=Отдел кадров
+Holidays=Отпуска
+CPTitreMenu=Отпуска
+MenuReportMonth=Ежемесячная выписка
+MenuAddCP=Подать аявление на отпуск
+NotActiveModCP=Вы должны включить модуль "Отпуска" для просмотра этой страницы
+NotConfigModCP=Вы должны настроить модуль "Отпуска" для просмотра этой страницы. Для этого нажмите здесь .
+NoCPforUser=У вас нет доступных дней отдыха.
+AddCP=Подать заявление на отпуск
 Employe=Сотрудник
 DateDebCP=Начальная дата
 DateFinCP=Конечная дата
 DateCreateCP=Дата создания
 DraftCP=Проект
-ToReviewCP=Awaiting approval
+ToReviewCP=Ожидают утверждения
 ApprovedCP=Утверждено
 CancelCP=Отменено
 RefuseCP=Отказано
 ValidatorCP=Утвердивший
-ListeCP=List of leaves
+ListeCP=Список отпусков
 ReviewedByCP=Проверит
 DescCP=Описание
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least %s day(s) before them.
-MenuConfCP=Edit balance of leaves
-UpdateAllCP=Update the leaves
-SoldeCPUser=Leaves balance is %s days.
+SendRequestCP=Создать заявление на отпуск
+DelayToRequestCP=Заявления об отпуске могут создаваться не ранее чем через %s (дней)
+MenuConfCP=Отредактировать график отпусков
+UpdateAllCP=Обновить отпуска
+SoldeCPUser=График отпусков  %s дней.
 ErrorEndDateCP=Выберите конечную дату позже чем начальную.
 ErrorSQLCreateCP=Ошибка SQL возникла во время создания:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
+ErrorIDFicheCP=Возникла ошибка, заявление на отпуск отсутствует.
 ReturnCP=Вернуться на предыдущую страницу
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosCP=Information of the leave request
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
+ErrorUserViewCP=У вас нет прав доступа для просмотра этого заявления на отпуск
+InfosCP=Информация о заявление на отпуск
+InfosWorkflowCP=Информация о рабочем процессе
+RequestByCP=Запрошен 
+TitreRequestCP=Оставить запрос
+NbUseDaysCP=Количество истраченных дней отпуска
 EditCP=Редактировать
 DeleteCP=Удалить
 ActionValidCP=Проверить
@@ -43,106 +43,106 @@ ActionRefuseCP=Отказать
 ActionCancelCP=Отмена
 StatutCP=Статус
 SendToValidationCP=Отправить на проверку
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-CantUpdate=You cannot update this leave request.
-NoDateDebut=Вы должны выбрать начальную дату
-NoDateFin=Вы должны выбрать конечную дату
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
+TitleDeleteCP=Удалить заявление на отпуск
+ConfirmDeleteCP=Подтверждаете удаление этого заявления на отпуск?
+ErrorCantDeleteCP=У вас нет прав доступа для удаления этого заявления на отпуск.
+CantCreateCP=У вас нет прав доступа для создания заявлений на отпуск.
+InvalidValidatorCP=Вы должны выбрать того, кто будет утверждать ваше заявление на отпуск.
+CantUpdate=Вы не можете обновить это заявление на отпуск.
+NoDateDebut=Вы должны выбрать начальную дату.
+NoDateFin=Вы должны выбрать конечную дату.
+ErrorDureeCP=Ваше заявление на отпуск не включает в себя рабочие дни. 
+TitleValidCP=Утвердить заявление на отпуск
+ConfirmValidCP=Вы точно хотите утвердить заявление на отпуск?
 DateValidCP=Дата утверждена
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=Вы должны выбрать причину отказа на запрос о выходных днях
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
+TitleToValidCP=Отправить заявление на отпуск
+ConfirmToValidCP=Вы точно хотите отправить заявление на отпуск?
+TitleRefuseCP=Отклонить заявление на отпуск
+ConfirmRefuseCP=Вы точно хотите отклонить  заявление на отпуск?
+NoMotifRefuseCP=Вы должны выбрать причину отказа принять заявление на отпуск.
+TitleCancelCP=Отменить  заявление на отпуск
+ConfirmCancelCP=Вы точно хотите отменить  заявление на отпуск?
 DetailRefusCP=Причина отказа
 DateRefusCP=Дата отказа
 DateCancelCP=Дата отмены
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
+DefineEventUserCP=Задать исключительный отпуск для пользователя
+addEventToUserCP=Задать отпуск
 MotifCP=Причина
 UserCP=Пользователь
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of leave requests
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
+ErrorAddEventToUserCP=Возникла ошибка при добавлении исключительного отпуска.
+AddEventToUserOkCP=Добавление исключительного отпуска успешно завершено. 
+MenuLogCP=Посмотреть журнал заявлений на отпуск
+LogCP=Журнал обновлений доступных выходных дней
+ActionByCP=Выполнено 
 UserUpdateCP=Для пользователя
 PrevSoldeCP=Предыдущий баланс
 NewSoldeCP=Новый баланс
-alreadyCPexist=A leave request has already been done on this period.
+alreadyCPexist=Заявление на отпуск в этот период уже существует.
 UserName=Имя
 Employee=Сотрудник
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
+FirstDayOfHoliday=Первый день отпуска
+LastDayOfHoliday=Последний день отпуска
 HolidaysMonthlyUpdate=Ежемесячное обновление
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
+ManualUpdate=Ручное обновление
+HolidaysCancelation=Отмена заявления на отпуск
 
 ## Configuration du Module ##
-ConfCP=Configuration of leave request module
+ConfCP=Настройки модуля заявлений на отпуск
 DescOptionCP=Описание опции
 ValueOptionCP=Значение
-GroupToValidateCP=Group with the ability to approve leave requests
+GroupToValidateCP=Группа с возможностями для утверждения заявлений на отпуск
 ConfirmConfigCP=Проверить конфигурацию
-LastUpdateCP=Last automatic update of leaves allocation
+LastUpdateCP=Последнее автоматическое обновление распределения отпусков
 UpdateConfCPOK=Обновлено успешно
 ErrorUpdateConfCP=Во время обновления произошла ошибка. Пожалуйста, попробуйте еще раз.
-AddCPforUsers=Please add the balance of leaves allocation of users by clicking here.
-DelayForSubmitCP=Deadline to make a leave requests
-AlertapprobatortorDelayCP=Prevent the approbator if the leave request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
-nbUserCP=Number of users supported in the module Leaves
-nbHolidayDeductedCP=Number of leave days to be deducted per day of vacation taken
-nbHolidayEveryMonthCP=Number of leave days added every month
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-TitleOptionMainCP=Main settings of leave request
-TitleOptionEventCP=Settings of leave requets for events
+AddCPforUsers=Пожалуйста, задайте баланс распределения  отпусков пользователей. Для этого,  нажмите сюда.
+DelayForSubmitCP=Крайний срок подачи заявлений на отпуск
+AlertapprobatortorDelayCP=Предупреждать утверждающего, если заявление на отпуск подано после крайнего срока
+AlertValidatorDelayCP=Предупреждать утверждающего, если заявление на отпуск подано после крайнего срока
+AlertValidorSoldeCP=Предупреждать утверждающего, если заявление на отпуск нарушает график отпусков
+nbUserCP=Количество пользователей в модуле "Отпуска"
+nbHolidayDeductedCP=Количество вычитаемых выходных из дней отпуска ринимаем
+nbHolidayEveryMonthCP=Количество дней отдыха, добавляемых  каждый месяц
+Module27130Name= Управление заявлениями на отпуск
+Module27130Desc= Управление заявлениями на отпуск
+TitleOptionMainCP=Основные настройки заявления на отпуск
+TitleOptionEventCP=Настройка заявлений на отпуск для модуля "События"
 ValidEventCP=Проверить
-UpdateEventCP=Update events
+UpdateEventCP=Обновить события
 CreateEventCP=Создать
-NameEventCP=Event name
-OkCreateEventCP=The addition of the event went well.
-ErrorCreateEventCP=Error creating the event.
-UpdateEventOkCP=The update of the event went well.
-ErrorUpdateEventCP=Error while updating the event.
-DeleteEventCP=Delete Event
-DeleteEventOkCP=The event has been deleted.
-ErrorDeleteEventCP=Error while deleting the event.
-TitleDeleteEventCP=Delete a exceptional leave
-TitleCreateEventCP=Create a exceptional leave
-TitleUpdateEventCP=Edit or delete a exceptional leave
+NameEventCP=Имя события
+OkCreateEventCP=Добавление событие прошло успешно.
+ErrorCreateEventCP=Ошибка при создании события
+UpdateEventOkCP=Обновление события прошло успешно.
+ErrorUpdateEventCP=Ошибка при обновлении события
+DeleteEventCP=Удалить событие
+DeleteEventOkCP=Событие удалено. 
+ErrorDeleteEventCP=Ошибка  при удалении данного события.
+TitleDeleteEventCP=Удалить исключительный отпуск
+TitleCreateEventCP=Создать исключительный отпуск
+TitleUpdateEventCP=Изменить или удалить исключительный отпуск
 DeleteEventOptionCP=Удалить
 UpdateEventOptionCP=Обновить
-ErrorMailNotSend=An error occurred while sending email:
-NoCPforMonth=No leave this month.
-nbJours=Number days
-TitleAdminCP=Configuration of Leaves
+ErrorMailNotSend=Произошла ошибка при отправке электронного письма:
+NoCPforMonth=Нет отпуска в этом месяце
+nbJours=Количество дней
+TitleAdminCP=Настройка модуля "Отпуска"
 #Messages
-Hello=Hello
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-Permission20000=Read you own leave requests
-Permission20001=Create/modify your leave requests
-Permission20002=Create/modify leave requests for everybody
-Permission20003=Delete leave requests
-Permission20004=Setup users available vacation days
-Permission20005=Review log of modified leave requests
-Permission20006=Read leaves monthly report
+Hello=Здравствуйте
+HolidaysToValidate=Подтверждение заявления на отпуск
+HolidaysToValidateBody=Ниже список заявлений на отпуск, которые требуют подтверждения
+HolidaysToValidateDelay=Это заявление на отпуск будет рассмотрено в период менее, чем %s дней.
+HolidaysToValidateAlertSolde=У пользователя, который оставил это заявление на отпуск нет достаточного количество доступных дней. 
+HolidaysValidated=Подтверждённые заявления на отпуск
+HolidaysValidatedBody=Ваше заявление на отпуск с  %s по %s  подтверждено.
+HolidaysRefused=Заявление отклонено.
+HolidaysRefusedBody=Ваше заявление на отпуск с  %s по %s отклонено по следующей причине: 
+HolidaysCanceled=Отменённые заявления на отпуск
+HolidaysCanceledBody=Ваше заявление на отпуск с  %s по %s отменено. 
+Permission20000=Посмотреть мои заявления на отпуск
+Permission20001=Создать/изменить мои заявления на отпуск
+Permission20002=Создать/изменить заявления на отпуск для всех
+Permission20003=Удалить заявления на отпуск
+Permission20004=Настройка доступных дней отпуска для пользователей
+Permission20005=посмотреть журнал изменённых заявлений на отпуск
+Permission20006=Посмотреть отчёт  о отпусках по месяцам
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index 2d2279104f8..854a530bc0f 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Мы постарались сделать Dolibarr настройки настолько прост, насколько это возможно. Просто следуйте инструкциям, шаг за шагом.
+InstallEasy=Мы постарались сделать установку Dolibarr настолько простой, насколько это возможно. Просто следуйте инструкциям по установке, шаг за шагом.
 MiscellaneousChecks=Условия проверки
 DolibarrWelcome=Добро пожаловать на Dolibarr
 ConfFileExists=Файл конфигурации %s существует.
 ConfFileDoesNotExists=Файл конфигурации %s не существует!
 ConfFileDoesNotExistsAndCouldNotBeCreated=Файл конфигурации %s не существует и не может быть создан!
 ConfFileCouldBeCreated=Файл конфигурации %s может быть создан.
-ConfFileIsNotWritable=Файл конфигурации %s не для записи. Проверка разрешений. Для первой установки, Ваш веб-сервер должен быть предоставлен чтобы иметь возможность писать в этом файле конфигурации во время процесса ( "Chmod 666", например, Unix подобные ОС).
-ConfFileIsWritable=Файл конфигурации %s на запись.
+ConfFileIsNotWritable=Файл конфигурации %s недоступен для записи. Проверьте права доступа. Для первой установки, Ваш веб-сервер должен быть предоставлен чтобы иметь права доступа для записи в этот файл во время всего процесса установки ( Используйте команду "сhmod" в ОС типа Unix, c маской 666).
+ConfFileIsWritable=Файл конфигурации %s доступен для записи.
 ConfFileReload=Перезагрузить всю информацию из файла конфигурации.
-PHPSupportSessions=Это PHP поддерживает сессии.
-PHPSupportPOSTGETOk=Это PHP поддерживает переменные POST и GET.
-PHPSupportPOSTGETKo=Можно настроить ваш PHP не поддерживает переменные и POST или GET. Проверьте параметр variables_order в php.ini.
-PHPSupportGD=Эта поддержка PHP GD графические функции.
-PHPSupportUTF8=Эта поддержка UTF8 PHP функций.
-PHPMemoryOK=Ваш PHP макс сессии памяти установлен в %s. Это должно быть достаточно.
+PHPSupportSessions=Эта версия PHP поддерживает сессии.
+PHPSupportPOSTGETOk=Эта версия PHP поддерживает переменные POST и GET.
+PHPSupportPOSTGETKo=Возможно,  ваша версия PHP не поддерживает переменные и POST или GET. Проверьте параметр variables_order в php.ini.
+PHPSupportGD=Эта версия PHP  поддерживает библиотеку.
+PHPSupportUTF8=Эта версия PHP поддерживает UTF8 функции.
+PHPMemoryOK= Максимально допустимый размер памяти для сессии установлен в %s. Это должно быть достаточно.
 PHPMemoryTooLow=Ваш PHP макс сессии памяти установлен в %s байт. Это должно быть слишком низким. Измените свой php.ini установить параметр memory_limit, по крайней мере %s байт.
 Recheck=Нажмите здесь для более significative тест
 ErrorPHPDoesNotSupportSessions=Ваш PHP установки не поддерживает сессии. Эта функция требует, чтобы Dolibarr работает. Проверьте настройки PHP.
@@ -111,7 +111,7 @@ FreshInstall=Свежие установить
 FreshInstallDesc=Используйте этот режим, если это ваш первый установке. Если нет, то этот режим можно восстановить предыдущий неполной установке, но если вы хотите обновить версию, выберите "Обновить" режиме.
 Upgrade=Обновление
 UpgradeDesc=Используйте этот режим, если вы заменили старый Dolibarr файлы с файлами из новой версии. Это позволит обновить базу данных и данных.
-Start=Начало
+Start=Главная
 InstallNotAllowed=Установка не разрешено conf.php разрешений
 NotAvailable=Не имеется
 YouMustCreateWithPermission=Вы должны создать файл %s и установить запись по этому вопросу для веб-сервера во время установки.
@@ -154,9 +154,9 @@ MigrationShippingDelivery2=Oppgrader lagring av shipping 2
 MigrationFinished=Миграция завершена
 LastStepDesc=Последний шаг: Определить здесь Логин и пароль, которые вы планируете использовать для подключения к программному обеспечению. Как не потерять эту, как это внимание, чтобы управлять всеми другими.
 ActivateModule=Активировать модуль %s
-ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+ShowEditTechnicalParameters=Показать расширенные параметры (для опытных пользователей)
+WarningUpgrade=Предупреждение!\nВы уже сделали резервную копию вашей БД?\nМы рекомендуем вам сделать это. Например, в случае каких-то ошибок в СУБД (например, в mysql версии 5.5.40), часть данных или таблиц может быть потеряна в результате этого действия. Сделайте резервную копию вашей БД прямо сейчас, перед запуском процесса миграции. \nНажмите ОК для запуска процесса миграции.. 
+ErrorDatabaseVersionForbiddenForMigration=Версия вашей СУБД %s. Она содержит критическую ошибку, которая приводит к потере данных, если вы меняете структуру БД, как это требуется в процессе миграции. По этой причине, перенос не будет осуществлён до момента, пока вы не обновите вашу СУБД до работоспособной версии (версии с критическими ошибками %s)
 
 #########
 # upgrade
@@ -208,7 +208,7 @@ MigrationProjectTaskTime=Oppdater tid i sekunder
 MigrationActioncommElement=Обновление данных о действиях
 MigrationPaymentMode=Миграция данных для оплаты режим
 MigrationCategorieAssociation=Миграция категорий
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationEvents=Перенос событий для добавления владельца в таблицу присваиванья
 
 ShowNotAvailableOptions=Показать недоступные опции
 HideNotAvailableOptions=Скрыть недоступные опции
diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang
index 8e5b1d3c14f..4801bb8b554 100644
--- a/htdocs/langs/ru_RU/interventions.lang
+++ b/htdocs/langs/ru_RU/interventions.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=Вмешательство
+Intervention=Посредничество
 Interventions=Мероприятия
-InterventionCard=Вмешательство карту
-NewIntervention=Новая интервенция
-AddIntervention=Create intervention
+InterventionCard=Карточка посредничества
+NewIntervention=Новое посредничество
+AddIntervention=СОздать посредничество
 ListOfInterventions=Перечень мероприятий
-EditIntervention=Editer вмешательства
-ActionsOnFicheInter=Действия по вмешательству
+EditIntervention=Редактировать посредничество
+ActionsOnFicheInter=Действия над посредничеством
 LastInterventions=Последнее% с мероприятиями
 AllInterventions=Все мероприятия
 CreateDraftIntervention=Создание проекта
 CustomerDoesNotHavePrefix=Клиент не имеет префикс
-InterventionContact=Вмешательство контакт
-DeleteIntervention=Удалить вмешательства
-ValidateIntervention=Проверка вмешательства
-ModifyIntervention=Изменить вмешательства
-DeleteInterventionLine=Исключить вмешательство линия
+InterventionContact=Контакт посредничества
+DeleteIntervention=Удалить посредничество
+ValidateIntervention=Подтверждение посредничества
+ModifyIntervention=Изменение посредничества
+DeleteInterventionLine=Удалить строку посредничества
 ConfirmDeleteIntervention=Вы уверены, что хотите удалить это вмешательство?
-ConfirmValidateIntervention=Вы уверены, что хотите проверить это вмешательство?
-ConfirmModifyIntervention=Вы уверены, что хотите изменить это вмешательство?
-ConfirmDeleteInterventionLine=Вы уверены, что хотите удалить эту строку вмешательства?
-NameAndSignatureOfInternalContact=Имя и подпись вмешательства:
+ConfirmValidateIntervention=Вы уверены, что хотите проверить это посредничество %s?
+ConfirmModifyIntervention=Вы уверены, что хотите изменить это посредничество?
+ConfirmDeleteInterventionLine=Вы уверены, что хотите удалить эту строку посредничества?
+NameAndSignatureOfInternalContact=Имя и подпись посредничества:
 NameAndSignatureOfExternalContact=Имя и подпись клиента:
 DocumentModelStandard=Стандартная модель документа для выступлений
 InterventionCardsAndInterventionLines=Interventions and lines of interventions
@@ -28,20 +28,20 @@ InterventionClassifyBilled=Classify "Billed"
 InterventionClassifyUnBilled=Classify "Unbilled"
 StatusInterInvoiced=Объявленный
 RelatedInterventions=Связанные с ней мероприятия
-ShowIntervention=Показать вмешательства
+ShowIntervention=Показать посредничества
 SendInterventionRef=Submission of intervention %s
 SendInterventionByMail=Send intervention by Email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-SearchAnIntervention=Search an intervention
+InterventionCreatedInDolibarr=Посредничество %s создано
+InterventionValidatedInDolibarr=Посредничество %s проверено
+InterventionModifiedInDolibarr=Посредничество %s изменено
+InterventionClassifiedBilledInDolibarr=Посредничество %s готово к созданию счёта.
+InterventionClassifiedUnbilledInDolibarr=Посредничество %s не готово к созданию счёта.
+InterventionSentByEMail=Посредничество %s отправлено по электронной почте.
+InterventionDeletedInDolibarr=Посредничество %s  удалено
+SearchAnIntervention=Поиск посредничества
 ##### Types de contacts #####
-TypeContact_fichinter_internal_INTERREPFOLL=Представители следующих мер вмешательства
-TypeContact_fichinter_internal_INTERVENING=Вмешательство
+TypeContact_fichinter_internal_INTERREPFOLL=Представители следующие  посредничества
+TypeContact_fichinter_internal_INTERVENING=Посредничество
 TypeContact_fichinter_external_BILLING=Платежная заказчика контакт
 TypeContact_fichinter_external_CUSTOMER=После деятельность заказчика контакт
 # Modele numérotation
diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang
index 81ba28a1c8f..726045b2701 100644
--- a/htdocs/langs/ru_RU/languages.lang
+++ b/htdocs/langs/ru_RU/languages.lang
@@ -10,10 +10,10 @@ Language_da_DA=Датский
 Language_da_DK=Датский
 Language_de_DE=Немецкий
 Language_de_AT=Немецкий (Австрия)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Немецкий (Швейцария)
 Language_el_GR=Греческий
 Language_en_AU=Английский (Австралия)
-Language_en_CA=English (Canada)
+Language_en_CA=Английский (Канада)
 Language_en_GB=Английский (Великобритания)
 Language_en_IN=Английский (Индия)
 Language_en_NZ=Английский (Новая Зеландия)
diff --git a/htdocs/langs/ru_RU/mailmanspip.lang b/htdocs/langs/ru_RU/mailmanspip.lang
index 391592018f8..634208bb91c 100644
--- a/htdocs/langs/ru_RU/mailmanspip.lang
+++ b/htdocs/langs/ru_RU/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanSpipSetup=Настройка модуля систем Mailman и SPIP
+MailmanTitle=Система управления электронными рассылками Mailman
+TestSubscribe=Для проверки подписки  на лист рассылки системы Mailman 
+TestUnSubscribe=Для проверки отказа от подписки  на лист рассылки системы Mailman 
 MailmanCreationSuccess=Тест подписки выполнен успешно
-MailmanDeletionSuccess=Тест отписки завершен успешно
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
-SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
+MailmanDeletionSuccess=Тест отказа от подписки завершен успешно
+SynchroMailManEnabled=Будет выполнено обновление системы Mailman 
+SynchroSpipEnabled=Будет выполнено обновление системы SPIP
+DescADHERENT_MAILMAN_ADMINPW=Пароль администратора системы Mailman 
+DescADHERENT_MAILMAN_URL=Ссылка на рассылки системы Mailman 
+DescADHERENT_MAILMAN_UNSUB_URL=Ссылка на отказ от рассылки системы Mailman
+DescADHERENT_MAILMAN_LISTS=Список (списки) для автоматический подписки новых участников (разделитель - запятая)
+SPIPTitle=Система управления публикациями SPIP 
+DescADHERENT_SPIP_SERVEUR=Сервер системы SPIP 
+DescADHERENT_SPIP_DB=Имя БД системы SPIP 
+DescADHERENT_SPIP_USER=Логин БД системы SPIP 
+DescADHERENT_SPIP_PASS=Пароль БД системы SPIP 
+AddIntoSpip=Добавить в систему SPIP 
+AddIntoSpipConfirmation=Вы точно хотите добавить этого участника в систему SPIP?
+AddIntoSpipError=Не удалось добавить участника в систему SPIP 
+DeleteIntoSpip=Удалить из системы SPIP
+DeleteIntoSpipConfirmation=Вы точно хотите удалить этого участника из системы SPIP?
+DeleteIntoSpipError=Не удалось удалить участника из системы SPIP
+SPIPConnectionFailed=Не удалось установить соединение с системой SPIP 
+SuccessToAddToMailmanList=Добавление %s  в список рассылки системы Mailman %s или в БД системы SPIP успешно выполнено
+SuccessToRemoveToMailmanList=Удаление %s  из списка рассылки системы Mailman %s или из БД системы SPIP успешно выполнено
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 670a7e81b4c..d3aa823b20d 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -43,7 +43,7 @@ MailingStatusSentCompletely=Отправлено полностью
 MailingStatusError=Ошибка
 MailingStatusNotSent=Не отправлено
 MailSuccessfulySent=Электронная почта успешно отправлено (% от S в %s)
-MailingSuccessfullyValidated=EMailing successfully validated
+MailingSuccessfullyValidated=Электронная почта успешно подтверждена 
 MailUnsubcribe=Отказаться от рассылки
 Unsuscribe=Отказаться от рассылки
 MailingStatusNotContact=Не писать
@@ -73,7 +73,7 @@ DateLastSend=Дата последней отправки
 DateSending=Дата отправки
 SentTo=Направлено в %s
 MailingStatusRead=Читать
-CheckRead=Read Receipt
+CheckRead=Открыть получателя
 YourMailUnsubcribeOK=The email %s  is correctly unsubcribe from mailing list
 MailtoEMail=Ссылка на email
 ActivateCheckRead=Разрешить использовать ссылку "Отказаться от подписки"
@@ -81,7 +81,7 @@ ActivateCheckReadKey=Key use to encrypt URL use for "Read Receipt" and "Unsubcri
 EMailSentToNRecipients=Email отправлено %s получателям.
 XTargetsAdded=%s recipients added into target list
 EachInvoiceWillBeAttachedToEmail=A document using default invoice document template will be created and attached to each email.
-MailTopicSendRemindUnpaidInvoices=Reminder of invoice %s (%s)
+MailTopicSendRemindUnpaidInvoices=Уведомление по счёту %s (%s)
 SendRemind=Отправить напоминание по Email
 RemindSent=%s напоминания(й) отправлено
 AllRecipientSelectedForRemind=All thirdparties selected and if an email is set (note that one mail per invoice will be sent)
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Список всех уведомлений по эле
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index e98cf570ed8..3e780d1aa50 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -14,7 +14,7 @@ FormatDateShortJava=dd.MM.yyyy
 FormatDateShortJavaInput=dd.MM.yyyy
 FormatDateShortJQuery=dd.mm.yy
 FormatDateShortJQueryInput=dd.mm.yy
-FormatHourShortJQuery=HH:MI
+FormatHourShortJQuery=ЧЧ:ММ
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
@@ -26,7 +26,7 @@ FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Подключение к базе данных
 NoTranslation=Нет перевода
 NoRecordFound=Запись не найдена
-NoError=Ошибок нет
+NoError=Нет ошибки
 Error=Ошибка
 ErrorFieldRequired=Поле '%s' обязательно для заполнения
 ErrorFieldFormat=Поле '%s' имеет неверное значение
@@ -46,7 +46,7 @@ ErrorFileNotUploaded=Файл не был загружен. Убедитесь,
 ErrorInternalErrorDetected=Обнаружена ошибка
 ErrorNoRequestRan=Никаких запросов не было запущено
 ErrorWrongHostParameter=Неверный параметр хоста
-ErrorYourCountryIsNotDefined=Ваша страна не определена. Перейдите Начало-Настройки-Редактировать и снова отправьте форму.
+ErrorYourCountryIsNotDefined=Ваша страна не определена. Перейдите Главная-Настройки-Редактировать и снова отправьте форму.
 ErrorRecordIsUsedByChild=Не удалось удалить эту запись. Эта запись используется, по крайней мере, одной дочерней записью.
 ErrorWrongValue=Неправильное значение
 ErrorWrongValueForParameterX=Неправильное значение параметра %s
@@ -62,10 +62,10 @@ ErrorFailedToSaveFile=Ошибка, не удалось сохранить фа
 SetDate=Установить дату
 SelectDate=Выбрать дату
 SeeAlso=Смотрите также %s
-SeeHere=See here
+SeeHere=Посмотрите сюда
 BackgroundColorByDefault=Цвет фона по умолчанию
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
+FileNotUploaded=Файл не загружен
+FileUploaded=Файл успешно загружен
 FileWasNotUploaded=Файл выбран как вложение, но пока не загружен. Для этого нажмите "Вложить файл".
 NbOfEntries=Кол-во записей
 GoToWikiHelpPage=Читать он-лайн помощь (нужен доступ к Интернету)
@@ -83,7 +83,7 @@ PasswordForgotten=Забыли пароль?
 SeeAbove=См. выше
 HomeArea=Начальная область
 LastConnexion=Последнее подключение
-PreviousConnexion=Предыдущее подключение
+PreviousConnexion=Предыдущий вход
 ConnectedOnMultiCompany=Подключено к объекту
 ConnectedSince=Подключено с
 AuthenticationMode=Режим аутентификации
@@ -108,7 +108,7 @@ Yes=Да
 no=нет
 No=Нет
 All=Все
-Home=Начало
+Home=Главная
 Help=Помощь
 OnlineHelp=Он-лайн помощь
 PageWiki=Страница Wiki
@@ -141,7 +141,7 @@ Cancel=Отмена
 Modify=Изменить
 Edit=Редактировать
 Validate=Проверить
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Проверить и Утвердить
 ToValidate=На проверке
 Save=Сохранить
 SaveAs=Сохранить как
@@ -150,7 +150,7 @@ ToClone=Дублировать
 ConfirmClone=Выберите данные, которые вы хотите дублировать:
 NoCloneOptionsSpecified=Данные для дублирования не определены.
 Of=из
-Go=Go
+Go=Выполнить
 Run=Выполнить
 CopyOf=Копия
 Show=Показать
@@ -159,7 +159,7 @@ Search=Поиск
 SearchOf=Поиск
 Valid=Действительный
 Approve=Одобрить
-Disapprove=Disapprove
+Disapprove=Не утверждать
 ReOpen=Переоткрыть
 Upload=Отправить файл
 ToLink=Ссылка
@@ -173,7 +173,7 @@ User=Пользователь
 Users=Пользователи
 Group=Группа
 Groups=Группы
-NoUserGroupDefined=No user group defined
+NoUserGroupDefined=Не задана группа для пользователя
 Password=Пароль
 PasswordRetype=Повторите ваш пароль
 NoteSomeFeaturesAreDisabled=Обратите внимание, что многие возможности/модули отключены в этой демонстрации.
@@ -211,8 +211,8 @@ Limit=Лимит
 Limits=Лимиты
 DevelopmentTeam=Команда разработчиков
 Logout=Выход
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s
-Connection=Подключение
+NoLogoutProcessWithAuthMode=Нет возможности разрыва соединения с этим режимим аунтетификации %s
+Connection=Войти
 Setup=Настройка
 Alert=Оповещение
 Previous=Предыдущий
@@ -221,7 +221,7 @@ Cards=Карточки
 Card=Карточка
 Now=Сейчас
 Date=Дата
-DateAndHour=Date and hour
+DateAndHour=Дата и час
 DateStart=Дата начала
 DateEnd=Дата окончания
 DateCreation=Дата создания
@@ -264,7 +264,7 @@ days=дней
 Hours=Часов
 Minutes=Минут
 Seconds=Секунд
-Weeks=Weeks
+Weeks=Недели
 Today=Сегодня
 Yesterday=Вчера
 Tomorrow=Завтра
@@ -273,7 +273,7 @@ Afternoon=После полудня
 Quadri=Квадри
 MonthOfDay=Месяц дня
 HourShort=ч
-MinuteShort=mn
+MinuteShort=мин.
 Rate=Курс
 UseLocalTax=Включить налог
 Bytes=Байт
@@ -298,7 +298,7 @@ UnitPriceHT=Цена за единицу (нетто)
 UnitPriceTTC=Цена за единицу
 PriceU=Цена ед.
 PriceUHT=Цена ед. (нетто)
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=Запрошена цена единицы за вычетом налогов
 PriceUTTC=Цена ед.
 Amount=Сумма
 AmountInvoice=Сумма счета-фактуры
@@ -324,7 +324,7 @@ SubTotal=Итого
 TotalHTShort=Всего (без налога)
 TotalTTCShort=Всего (вкл-я налог)
 TotalHT=Всего (без налога)
-TotalHTforthispage=Total (net of tax) for this page
+TotalHTforthispage=Итог (с вычетом налогов) для этой страницы
 TotalTTC=Всего (вкл-я налог)
 TotalTTCToYourCredit=Всего (вкл-я налог) с Вашей кредитной
 TotalVAT=Всего НДС
@@ -349,9 +349,10 @@ FullList=Полный список
 Statistics=Статистика
 OtherStatistics=Другие статистические данные
 Status=Статус
-Favorite=Favorite
+Favorite=Любимые
 ShortInfo=Инфо
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. поставщика
 RefPayment=Ref. оплаты
 CommercialProposalsShort=Коммерческие предложения
@@ -366,7 +367,7 @@ ActionNotApplicable=Не применяется
 ActionRunningNotStarted=Не начато
 ActionRunningShort=Начато
 ActionDoneShort=Завершено
-ActionUncomplete=Uncomplete
+ActionUncomplete=Не завершено
 CompanyFoundation=Компания/Организация
 ContactsForCompany=Контакты/адреса контрагента
 ContactsAddressesForCompany=Контак/Адреса для этого стороннего лица
@@ -375,7 +376,7 @@ ActionsOnCompany=Действия для этого контрагента
 ActionsOnMember=События об этом члене
 NActions=%s действий
 NActionsLate=% с опозданием
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Запрос уже зарегистрован
 Filter=Фильтр
 RemoveFilter=Удалить фильтр
 ChartGenerated=Диаграмма сгенерирована
@@ -394,8 +395,8 @@ Available=Доступно
 NotYetAvailable=Пока не доступно
 NotAvailable=Не доступно
 Popularity=Популярность
-Categories=Категории
-Category=Категория
+Categories=Tags/categories
+Category=Tag/category
 By=Автор
 From=От
 to=к
@@ -503,7 +504,7 @@ Keyword=Ключевое слово
 Legend=Легенда
 FillTownFromZip=Заполнить город по индексу
 Fill=Заполнить
-Reset=Reset
+Reset=Сбросить
 ShowLog=Показать журнал
 File=Файл
 Files=Файлы
@@ -519,13 +520,13 @@ NbOfCustomers=Количество клиентов
 NbOfLines=Количество строк
 NbOfObjects=Количество объектов
 NbOfReferers=Количество реферралов
-Referers=Refering objects
+Referers=Ссылающиеся объекты
 TotalQuantity=Общее количество
 DateFromTo=С %s по %s
 DateFrom=С %s
 DateUntil=До %s
 Check=Проверить
-Uncheck=Uncheck
+Uncheck=Снять 
 Internal=Внутренний
 External=Внешний
 Internals=Внутренние
@@ -564,7 +565,7 @@ MailSentBy=Отправлено по Email
 TextUsedInTheMessageBody=Текст Email
 SendAcknowledgementByMail=Отправить Подтверждение по Email
 NoEMail=Нет Email
-NoMobilePhone=No mobile phone
+NoMobilePhone=Нет мобильного телефона
 Owner=Владелец
 DetectedVersion=Обнаруженная версия
 FollowingConstantsWillBeSubstituted=Следующие константы будут подменять соответствующие значения.
@@ -601,7 +602,7 @@ MenuECM=Документы
 MenuAWStats=AWStats
 MenuMembers=Члены
 MenuAgendaGoogle=Google agenda
-ThisLimitIsDefinedInSetup=Лимит Dolibarr (Меню Начало-Настройки-Безопасность): %s Кб, лимит PHP: %s Кб
+ThisLimitIsDefinedInSetup=Лимит Dolibarr (Меню Главная-Настройки-Безопасность): %s Кб, лимит PHP: %s Кб
 NoFileFound=Нет документов, сохраненных в этом каталоге
 CurrentUserLanguage=Текущий язык
 CurrentTheme=Текущая тема
@@ -620,7 +621,7 @@ AddNewLine=Добавить новую строку
 AddFile=Добавить файл
 ListOfFiles=Список доступных файлов
 FreeZone=Беспошлинный ввоз
-FreeLineOfType=Free entry of type
+FreeLineOfType=Свободная запись типа
 CloneMainAttributes=Клонирование объекта с его основными атрибутами
 PDFMerge=Слияние PDF
 Merge=Слияние
@@ -657,7 +658,7 @@ OptionalFieldsSetup=Дополнительная настройка атрибу
 URLPhoto=Адрес фотографии/логотипа
 SetLinkToThirdParty=Ссылка на другой третьей стороне
 CreateDraft=Создать проект
-SetToDraft=Back to draft
+SetToDraft=Назад к черновику
 ClickToEdit=Нажмите, чтобы изменить
 ObjectDeleted=Объект удален %s
 ByCountry=По стране
@@ -668,7 +669,7 @@ ByYear=По годам
 ByMonth=по месяцам
 ByDay=Днем
 BySalesRepresentative=По торговым представителем
-LinkedToSpecificUsers=Linked to a particular user contact
+LinkedToSpecificUsers=Связан с особым контактом пользователя
 DeleteAFile=Удалить файл
 ConfirmDeleteAFile=Вы уверены, что хотите удалить файл?
 NoResults=Нет результатов
@@ -676,8 +677,8 @@ ModulesSystemTools=Настройки модулей
 Test=Тест
 Element=Элемент
 NoPhotoYet=Пока недо доступных изображений
-HomeDashboard=Home summary
-Deductible=Deductible
+HomeDashboard=Суммарная информация
+Deductible=Подлежащий вычету
 from=от
 toward=к
 Access=Доступ
@@ -685,15 +686,16 @@ HelpCopyToClipboard=Для копировани в буфер обмена ис
 SaveUploadedFileWithMask=Сохранить файл на сервер под именем "%s" (иначе "%s")
 OriginFileName=Изначальное имя файла
 SetDemandReason=Установить источник
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+SetBankAccount=Задать счёт в банке
+AccountCurrency=Валюта счёта
 ViewPrivateNote=Посмотреть заметки
 XMoreLines=%s строк(и) скрыто
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show transaction
+PublicUrl=Публичная ссылка
+AddBox=Добавить бокс
+SelectElementAndClickRefresh=Выберите элемент и нажмите обновить
+PrintFile=Печать файл %s
+ShowTransaction=Показать транзакции
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Понедельник
 Tuesday=Вторник
diff --git a/htdocs/langs/ru_RU/margins.lang b/htdocs/langs/ru_RU/margins.lang
index 15722615c4a..433e46a3a1c 100644
--- a/htdocs/langs/ru_RU/margins.lang
+++ b/htdocs/langs/ru_RU/margins.lang
@@ -5,30 +5,30 @@ Margins=Наценки
 TotalMargin=Общая наценка
 MarginOnProducts=Наценка / Товары
 MarginOnServices=Наценка / Услуги
-MarginRate=Margin rate
+MarginRate=Ставка наценки
 MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
+DisplayMarginRates=Отобразить ставки наценки
 DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
+InputPrice=Исходная цена
+margin=Управление доходом с наценок
+margesSetup=Настройка управления доходомом с наценок
 MarginDetails=Детали наценки
-ProductMargins=Product margins
-CustomerMargins=Customer margins
+ProductMargins=Товарные наценки
+CustomerMargins=Наценки клиентов
 SalesRepresentativeMargins=Sales representative margins
-UserMargins=User margins
+UserMargins=Пользовательские наценки
 ProductService=Продукт или Услуга
 AllProducts=Все продукты и услуги
 ChooseProduct/Service=Выберите продукт или услугу
 StartDate=Начальная дата
 EndDate=Конечная дата
-Launch=Начало
+Launch=Главная
 ForceBuyingPriceIfNull=Force buying price if null
 ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
 MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
+UseDiscountAsProduct=Как товар
+UseDiscountAsService=Как услуга
+UseDiscountOnTotal=Включить подитог
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Тип наценки
 MargeBrute=Наценка по строке
@@ -40,6 +40,6 @@ UnitCharges=Unit charges
 Charges=Charges
 AgentContactType=Commercial agent contact type
 AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
+rateMustBeNumeric=Ставка должна быть числом
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
+ShowMarginInfos=Показать инф-цию о наценке
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index b7750075fd8..77d60e90402 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -8,7 +8,7 @@ Members=Участники
 MemberAccount=Вход для зарегистрированных участников
 ShowMember=Показать карточку участника
 UserNotLinkedToMember=Пользователь не связан с участником
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
+ThirdpartyNotLinkedToMember=Контр-агент не связан с участником
 MembersTickets=Члены Билеты
 FundationMembers=Члены фонда
 Attributs=Атрибуты
@@ -85,7 +85,7 @@ SubscriptionLateShort=Поздно
 SubscriptionNotReceivedShort=Никогда не получил
 ListOfSubscriptions=Список подписчиков
 SendCardByMail=Отправить карту
-AddMember=Create member
+AddMember=Создать участника
 NoTypeDefinedGoToSetup=Ни один из членов определенных типов. Переход к установке - членов типов
 NewMemberType=Новый член типа
 WelcomeEMail=Приветственное Email-письмо
@@ -125,12 +125,12 @@ Date=Свидание
 DateAndTime=Дата и время
 PublicMemberCard=Член общественного карту
 MemberNotOrNoMoreExpectedToSubscribe=Члены, не больше и не ожидается, подписаться
-AddSubscription=Create subscription
+AddSubscription=Создать подписку
 ShowSubscription=Показать подписки
 MemberModifiedInDolibarr=Член Изменения в Dolibarr
 SendAnEMailToMember=Отправить по электронной почте информацию члена
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Тема письма, которое будет получено в случае автоматически подписки гостя
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Тело письма, которое будет получено в случае автоматическоей подписки гостя
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Тема сообщения для государств-членов autosubscription
 DescADHERENT_AUTOREGISTER_MAIL=EMail для государств-членов autosubscription
 DescADHERENT_MAIL_VALID_SUBJECT=EMail тему член валидации
@@ -141,7 +141,7 @@ DescADHERENT_MAIL_RESIL_SUBJECT=EMail тему член resiliation
 DescADHERENT_MAIL_RESIL=EMail для членов resiliation
 DescADHERENT_MAIL_FROM=Отправитель EMail для автоматического письма
 DescADHERENT_ETIQUETTE_TYPE=Этикетки формате
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
+DescADHERENT_ETIQUETTE_TEXT=Текст, который будет напечетан на адресном листе пользователя
 DescADHERENT_CARD_TYPE=Формат карт страницы
 DescADHERENT_CARD_HEADER_TEXT=Текст печатается на верхней части членов карты
 DescADHERENT_CARD_TEXT=Текст печатается на члена карты
@@ -155,7 +155,7 @@ NoThirdPartyAssociatedToMember=Никакая третья сторона, св
 ThirdPartyDolibarr=Dolibarr третья сторона
 MembersAndSubscriptions= Участники и Подписки
 MoreActions=Дополнительные меры по записи
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
+MoreActionsOnSubscription=Дополнительные действия, предложенные по умолчанию, которые будут производтся при новой подписке
 MoreActionBankDirect=Создание прямой записи транзакций на счета
 MoreActionBankViaInvoice=Создание счета-фактуры и оплаты по счету
 MoreActionInvoiceOnly=Создание счета без каких-либо оплаты
@@ -170,8 +170,8 @@ LastSubscriptionAmount=Последняя сумма подписки
 MembersStatisticsByCountries=Члены статистику по странам
 MembersStatisticsByState=Члены статистики штата / провинции
 MembersStatisticsByTown=Члены статистики города
-MembersStatisticsByRegion=Members statistics by region
-MemberByRegion=Members by region
+MembersStatisticsByRegion=Статистика участников по регионам
+MemberByRegion=Участники по регионам
 NbOfMembers=Количество членов
 NoValidatedMemberYet=Нет проверки члены найдены
 MembersByCountryDesc=Этот экран покажет вам статистику членов странами. Графический зависит однако от Google сервис график онлайн и доступна, только если подключение к Интернету работает.
@@ -197,10 +197,10 @@ Collectivités=Организаций
 Particuliers=Личный
 Entreprises=Компании
 DOLIBARRFOUNDATION_PAYMENT_FORM=Чтобы сделать вашу подписку оплаты с помощью банковского перевода, см. стр. http://wiki.dolibarr.org/index.php/Subscribe . 
     Для оплаты с помощью кредитной карты или Paypal, нажмите на кнопку в нижней части этой страницы. 
    
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=Members by nature
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to warn when Dolibarr receive a confirmation of a validated payment for subscription
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+ByProperties=По характеристикам
+MembersStatisticsByProperties=Стастистика участников по характеристикам
+MembersByNature=Участники по природе
+VATToUseForSubscriptions=Значение НДС, для ипользования в подписках
+NoVatOnSubscription=Нет НДС для подписок
+MEMBER_PAYONLINE_SENDEMAIL=Адрес электронно почты, куда будут отправляться предупреждения, когда будет получено подтверждение о завершенном платеже за подписку
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Товар, который будет использован, чтобы включить подписку в счёт: %s
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index aec90dd9d16..45a378e74c6 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -16,20 +16,20 @@ SupplierOrder=Для поставщиков
 SuppliersOrders=Поставщики заказ
 SuppliersOrdersRunning=Текущие поставщиков заказов
 CustomerOrder=Для клиентов
-CustomersOrders=Customers orders
+CustomersOrders=Заказы клиентов
 CustomersOrdersRunning=Текущие клиентов заказы
 CustomersOrdersAndOrdersLines=Клиент приказов и распоряжений линий
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
+OrdersToValid=Заказы клиентов для подтверждения
+OrdersToBill=Доставленные заказы клиентов
+OrdersInProcess=Заказы клиентов в обработке
+OrdersToProcess=Заказы клиентов для обработки
 SuppliersOrdersToProcess=Поставщика заказов для обработки
 StatusOrderCanceledShort=Отменен
 StatusOrderDraftShort=Черновик
 StatusOrderValidatedShort=Подтвержденные
 StatusOrderSentShort=В процессе
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
+StatusOrderSent=Поставки в процессе
+StatusOrderOnProcessShort=Заказано
 StatusOrderProcessedShort=Обработано
 StatusOrderToBillShort=В законопроекте
 StatusOrderToBill2Short=Для выставления
@@ -41,8 +41,8 @@ StatusOrderReceivedAllShort=Все полученные
 StatusOrderCanceled=Отменен
 StatusOrderDraft=Проект (должно быть подтверждено)
 StatusOrderValidated=Подтвержденные
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcess=Заказано - ожидает приёма
+StatusOrderOnProcessWithValidation=Заказано - ожидает приёма или подтверждения
 StatusOrderProcessed=Обработано
 StatusOrderToBill=В законопроекте
 StatusOrderToBill2=Для выставления
@@ -51,32 +51,33 @@ StatusOrderRefused=Отказался
 StatusOrderReceivedPartially=Частично получил
 StatusOrderReceivedAll=Все полученные
 ShippingExist=Отгрузки существует
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ProductQtyInDraft=Количество товаров в проектах заказов
+ProductQtyInDraftOrWaitingApproved=Количество товаров в проектах или одобренных заказах, но не со статусом "заказан"
 DraftOrWaitingApproved=Проект или утверждены еще не заказал
 DraftOrWaitingShipped=Проект или подтверждены не отгружен
 MenuOrdersToBill=Заказы на законопроект
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=Оплачиваемые заказы
 SearchOrder=Поиск тем
-SearchACustomerOrder=Search a customer order
-SearchASupplierOrder=Search a supplier order
+SearchACustomerOrder=Поиск заказа клиента
+SearchASupplierOrder=Поиск заказа поставщика
 ShipProduct=Судно продукта
 Discount=Скидка
 CreateOrder=Создать заказ
 RefuseOrder=Отписаться порядка
-ApproveOrder=Принять порядок
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Проверка порядка
 UnvalidateOrder=Unvalidate порядке
 DeleteOrder=Удалить тему
 CancelOrder=Отмена порядка
-AddOrder=Create order
+AddOrder=Создать заказ
 AddToMyOrders=Добавить в мои заказы
 AddToOtherOrders=Добавить в других заказов
-AddToDraftOrders=Add to draft order
+AddToDraftOrders=Добавить проект заказа
 ShowOrder=Показать порядок
 NoOpenedOrders=Нет открыл заказов
 NoOtherOpenedOrders=Никакие другие открыли заказов
-NoDraftOrders=No draft orders
+NoDraftOrders=Нет проектов заказов
 OtherOrders=Другие заказы
 LastOrders=Последнее %s заказов
 LastModifiedOrders=Последнее% с измененными заказов
@@ -86,7 +87,7 @@ NbOfOrders=Количество заказов
 OrdersStatistics=Приказы Статистика
 OrdersStatisticsSuppliers=Поставщик заказов статистика
 NumberOfOrdersByMonth=Количество заказов в месяц
-AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Количество заказов по месяцам (за вычетом налогов)
 ListOfOrders=Список заказов
 CloseOrder=Закрыть тему
 ConfirmCloseOrder=Вы уверены, что хотите, чтобы закрыть эту тему? После того, как заказ является закрытым, он может быть выставлен счет.
@@ -97,11 +98,13 @@ ConfirmUnvalidateOrder=Вы уверены, что хотите, чтобы во
 ConfirmCancelOrder=Вы уверены, что хотите отменить этот заказ?
 ConfirmMakeOrder=Вы уверены, что хотите, чтобы подтвердить вы сделали этот заказ на %s?
 GenerateBill=Создать счет-фактуру
-ClassifyShipped=Classify delivered
+ClassifyShipped=Отметить доставленным
 ClassifyBilled=Классифицировать "Billed"
 ComptaCard=Бухгалтерия карту
 DraftOrders=Проект распоряжения
 RelatedOrders=Похожие заказов
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=В процессе заказов
 RefOrder=Ref. заказ
 RefCustomerOrder=Ref. Для клиента
@@ -118,6 +121,7 @@ PaymentOrderRef=Оплата заказа %s
 CloneOrder=Клон порядка
 ConfirmCloneOrder=Вы уверены, что хотите клон этого приказа %s?
 DispatchSupplierOrder=Прием %s поставщиком для
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Представитель следующие меры для клиентов
 TypeContact_commande_internal_SHIPPING=Представитель следующие меры судоходства
@@ -134,7 +138,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Постоянная COMMANDE_SUPPLIER_
 Error_COMMANDE_ADDON_NotDefined=Постоянная COMMANDE_ADDON не определена
 Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Не удалось загрузить модуль файл ' %s'
 Error_FailedToLoad_COMMANDE_ADDON_File=Не удалось загрузить модуль файл ' %s'
-Error_OrderNotChecked=No orders to invoice selected
+Error_OrderNotChecked=Не выбраны заказы для выставления счёта
 # Sources
 OrderSource0=Коммерческое предложение
 OrderSource1=Интернет
@@ -148,19 +152,19 @@ AddDeliveryCostLine=Добавить доставки Стоимость лин
 # Documents models
 PDFEinsteinDescription=Для полной модели (logo. ..)
 PDFEdisonDescription=Простая модель для
-PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=Целиком заполненный  счёт (логотип...)
 # Orders modes
 OrderByMail=Почта
 OrderByFax=Факс
 OrderByEMail=EMail
 OrderByWWW=Интернет
 OrderByPhone=Телефон
-CreateInvoiceForThisCustomer=Bill orders
-NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
-Ordered=Ordered
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Оплатить заказы
+NoOrdersToInvoice=Нет заказов для оплаты
+CloseProcessedOrdersAutomatically=Отметить "В обработке" все выделенные заказы
+OrderCreation=Создание заказа
+Ordered=Заказано
+OrderCreated=Ваши заказы созданы
+OrderFail=Возникла ошибка при создании заказов
+CreateOrders=Создать заказы
+ToBillSeveralOrderSelectCustomer=Для создания счёта на несколько заказов, сначала нажмите на клиента, затем выберете  "%s".
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 867240f9b84..d920d4cb765 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -8,10 +8,11 @@ BirthdayDate=День рождения
 DateToBirth=Дата рождения
 BirthdayAlertOn= рождения активного оповещения
 BirthdayAlertOff= рождения оповещения неактивные
-Notify_FICHINTER_VALIDATE=Проверка вмешательства
+Notify_FICHINTER_VALIDATE=Посредничество подтверждено
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Проверка векселя
-Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_BILL_UNVALIDATE=Счёт клиента не подтверждён
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Поставщик утвердил порядок
 Notify_ORDER_SUPPLIER_REFUSE=Поставщик порядке отказалась
 Notify_ORDER_VALIDATE=Kundeordre validert
@@ -28,33 +29,33 @@ Notify_PROPAL_SENTBYMAIL=Коммерческое предложение по п
 Notify_BILL_PAYED=Клиенту счет оплачен
 Notify_BILL_CANCEL=Клиенту счет-фактура отменен
 Notify_BILL_SENTBYMAIL=Клиенту счет-фактура высылается по почте
-Notify_ORDER_SUPPLIER_VALIDATE=Поставщик целью проверки
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Поставщик поручение, отправленные по почте
 Notify_BILL_SUPPLIER_VALIDATE=Поставщик проверки счета
 Notify_BILL_SUPPLIER_PAYED=Поставщик оплачен счет-фактура
 Notify_BILL_SUPPLIER_SENTBYMAIL=Поставщиком счета по почте
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=Счёт поставщика отменён
 Notify_CONTRACT_VALIDATE=Договор проверку
-Notify_FICHEINTER_VALIDATE=Вмешательство проверку
+Notify_FICHEINTER_VALIDATE=Посредничество проверено.
 Notify_SHIPPING_VALIDATE=Доставка проверку
 Notify_SHIPPING_SENTBYMAIL=Доставка по почте
 Notify_MEMBER_VALIDATE=Член проверки
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=Участник изменён
 Notify_MEMBER_SUBSCRIPTION=Член подписки
 Notify_MEMBER_RESILIATE=Член resiliated
 Notify_MEMBER_DELETE=Член удален
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+Notify_PROJECT_CREATE=Создание проекта
+Notify_TASK_CREATE=Задача создана
+Notify_TASK_MODIFY=Задача изменена
+Notify_TASK_DELETE=Задача удалена
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Количество прикрепленных файлов / документов
 TotalSizeOfAttachedFiles=Общий размер присоединенных файлов / документы
 MaxSize=Максимальный размер
 AttachANewFile=Присоединить новый файл / документ
 LinkedObject=Связанные объект
 Miscellaneous=Разное
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Количество адресов (количество адресов электронной почты получателей)
 PredefinedMailTest=Dette er en test post. \\ NDe to linjer er atskilt med en vognretur.
 PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fet skrift). 
     De to linjene er skilt med en vognretur.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
@@ -81,16 +82,16 @@ ModifiedBy=Модифицированное% по S
 ValidatedBy=Подтверждено %s
 CanceledBy=Отменена %s
 ClosedBy=Закрытые% по S
-CreatedById=User id who created
-ModifiedById=User id who made last change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made last change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
+CreatedById=ID пользователя, который создал
+ModifiedById=ID пользователя, который сделал последнее изменение
+ValidatedById=ID пользователя, который подтвердил
+CanceledById=ID пользователя, который отменил
+ClosedById=ID пользователя, который закрыл
+CreatedByLogin=Логин пользователя, который создал
+ModifiedByLogin=Логин пользователя, который сделал последнее изменение
+ValidatedByLogin=Логин пользователя, который подтвердил
+CanceledByLogin=Логин пользователя, который отменил
+ClosedByLogin=Логин пользователя, который закрыл
 FileWasRemoved=Файл был удален
 DirWasRemoved=Каталог был удален
 FeatureNotYetAvailableShort=Имеющиеся в следующей версии
@@ -158,22 +159,23 @@ StatsByNumberOfEntities=Статистика в ряде организаций
 NumberOfProposals=Количество предложений на последние 12 месяцев
 NumberOfCustomerOrders=Количество заказов на последние 12 месяцев
 NumberOfCustomerInvoices=Количество клиентских счетов в последние 12 месяцев
-NumberOfSupplierOrders=Number of supplier orders on last 12 month
+NumberOfSupplierOrders=Количество заказов поставщиков за последние 12 месяцев
 NumberOfSupplierInvoices=Количество поставщиком счета-фактуры на последние 12 месяцев
 NumberOfUnitsProposals=Antall enheter på forslag på siste 12 mnd
 NumberOfUnitsCustomerOrders=Количество единиц по заказам на последние 12 месяцев
 NumberOfUnitsCustomerInvoices=Количество единиц на счетах клиента в последние 12 месяцев
-NumberOfUnitsSupplierOrders=Number of units on supplier orders on last 12 month
+NumberOfUnitsSupplierOrders=Количество единиц в заказах поставщиков за последние 12 месяцев
 NumberOfUnitsSupplierInvoices=Количество единиц по поставщиком счета-фактуры на последние 12 месяцев
-EMailTextInterventionValidated=Вмешательство %s проверены
+EMailTextInterventionValidated=Посредничество %s проверено.
 EMailTextInvoiceValidated=Счет %s проверены
 EMailTextProposalValidated=Forslaget %s har blitt validert.
 EMailTextOrderValidated=Ordren %s har blitt validert.
 EMailTextOrderApproved=Приказ% с утвержденными
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Приказ %s одобрен %s
 EMailTextOrderRefused=Приказ %s отказала
 EMailTextOrderRefusedBy=Приказ %s отказано %s
-EMailTextExpeditionValidated=The shipping %s has been validated.
+EMailTextExpeditionValidated=Отправка %s подтверждена
 ImportedWithSet=Импорт данных
 DolibarrNotification=Автоматические уведомления
 ResizeDesc=Skriv inn ny bredde eller ny høyde. Forhold vil bli holdt under resizing ...
@@ -195,35 +197,35 @@ StartUpload=Начать загрузку
 CancelUpload=Отмена загрузки
 FileIsTooBig=Файлы слишком велик
 PleaseBePatient=Пожалуйста, будьте терпеливы ...
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
+RequestToResetPasswordReceived=Получен запрос на изменение вашего пароля в системе Dolibarr
+NewKeyIs=Ваши новые ключи для доступа
+NewKeyWillBe=Ваш новый ключ для доступа к ПО будет
+ClickHereToGoTo=Нажмите сюда, чтобы перейти к %s
+YouMustClickToChange=Однако, вы должны сначала нажать на ссылку для подтверждения изменения пароля
+ForgetIfNothing=Если вы не запрашивали эти изменения, забудьте про это электронное письмо.  Ваши данные в безопасности.
 
 ##### Calendar common #####
 AddCalendarEntry=Добавить запись в календаре %s
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-ContractCanceledInDolibarr=Contract %s canceled
-ContractClosedInDolibarr=Contract %s closed
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-PaymentDoneInDolibarr=Payment %s done
-CustomerPaymentDoneInDolibarr=Customer payment %s done
-SupplierPaymentDoneInDolibarr=Supplier payment %s done
-MemberValidatedInDolibarr=Member %s validated
+NewCompanyToDolibarr=Компания %s  добавлена
+ContractValidatedInDolibarr=Контакт %s подтверждён
+ContractCanceledInDolibarr=Контакт %s отменён
+ContractClosedInDolibarr=Контакт %s закрыт
+PropalClosedSignedInDolibarr=Ком. предложение  %s подписано
+PropalClosedRefusedInDolibarr=Ком. предложение %s отклонено
+PropalValidatedInDolibarr=Ком. предложение %s  подтвердено
+PropalClassifiedBilledInDolibarr=Коммерческое предложение  %s  отмечено оплаченным
+InvoiceValidatedInDolibarr=Счёт %s подтверждён
+InvoicePaidInDolibarr=Счёт %s  оплачен
+InvoiceCanceledInDolibarr=Счёт %s  отменён
+PaymentDoneInDolibarr=Платёж  %s  завершён
+CustomerPaymentDoneInDolibarr=Платёж клиента %s  завершён
+SupplierPaymentDoneInDolibarr=Платёж поставщика %s  завершён
+MemberValidatedInDolibarr=Участник %s  подтверждён
 MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentDeletedInDolibarr=Shipment %s deleted
+MemberDeletedInDolibarr=Участник  %s удалён
+MemberSubscriptionAddedInDolibarr=Подписка участника %s  добавлена
+ShipmentValidatedInDolibarr=Отправка %s  проверена
+ShipmentDeletedInDolibarr=Отправка %s удалена
 ##### Export #####
 Export=Экспорт
 ExportsArea=Экспорт области
diff --git a/htdocs/langs/ru_RU/paybox.lang b/htdocs/langs/ru_RU/paybox.lang
index ffa474a9646..0e9bf7ca0d1 100644
--- a/htdocs/langs/ru_RU/paybox.lang
+++ b/htdocs/langs/ru_RU/paybox.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox модуль настройки
+PayBoxSetup=Настройка модуля PayBox 
 PayBoxDesc=Этот модуль предложить страниц, чтобы платеж по Paybox клиентами. Это может быть использовано для свободного платежа или за плату по тому или иному объекту Dolibarr (счетов-фактур, порядка, ...)
 FollowingUrlAreAvailableToMakePayments=После URL, можно предложить страницу к клиенту сделать платеж по Dolibarr объектов
 PaymentForm=Форма оплаты
@@ -10,10 +10,10 @@ ToComplete=Для завершения
 YourEMail=Электронная почта для подтверждения оплаты
 Creditor=Кредитор
 PaymentCode=Код платежа
-PayBoxDoPayment=Перейти на оплату
+PayBoxDoPayment=Перейти к оплате
 YouWillBeRedirectedOnPayBox=Вы будете перенаправлены по обеспеченным Paybox страницу для ввода данных кредитной карточки
 PleaseBePatient=Пожалуйста, будьте терпеливы
-Continue=Следующий
+Continue=Далее
 ToOfferALinkForOnlinePayment=URL-адрес для оплаты %s
 ToOfferALinkForOnlinePaymentOnOrder=URL предложить %s онлайн платежей пользовательский интерфейс для заказа
 ToOfferALinkForOnlinePaymentOnInvoice=URL предложить %s онлайн платежей пользовательский интерфейс для счета
@@ -32,9 +32,9 @@ VendorName=Имя поставщика
 CSSUrlForPaymentForm=CSS-стилей URL для оплаты форме
 MessageOK=Сообщение на странице проверки возвращение оплаты
 MessageKO=Сообщение на странице отменен возврат оплаты
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+NewPayboxPaymentReceived=Новый платёж Paybox поулчен.
+NewPayboxPaymentFailed=Попытка нового платежа Paybox не удалась
+PAYBOX_PAYONLINE_SENDEMAIL=Адрес электронной почты, куда будет высылаться уведомление о платеже (успешном или нет)
+PAYBOX_PBX_SITE=Значение PBX SITE
+PAYBOX_PBX_RANG=Значение PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Значение PBX ID
diff --git a/htdocs/langs/ru_RU/paypal.lang b/htdocs/langs/ru_RU/paypal.lang
index 09164b84068..cdf9c920b88 100644
--- a/htdocs/langs/ru_RU/paypal.lang
+++ b/htdocs/langs/ru_RU/paypal.lang
@@ -1,25 +1,25 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal модуль установки
+PaypalSetup=Настройка модуля PayPal 
 PaypalDesc=Этот модуль предлагает страниц, чтобы выплаты по PayPal клиентами. Это может быть использовано для свободного оплаты или оплаты на определенный объект Dolibarr (счет-фактура, заказ, ...)
 PaypalOrCBDoPayment=Оплатить с помощью кредитной карты или Paypal
 PaypalDoPayment=Оплатить с помощью Paypal
 PaypalCBDoPayment=Оплата кредитной картой
-PAYPAL_API_SANDBOX=Режим тестирования / песочнице
+PAYPAL_API_SANDBOX=Режим тестирования / песочницы
 PAYPAL_API_USER=API имя пользователя
 PAYPAL_API_PASSWORD=API пароль
 PAYPAL_API_SIGNATURE=API подпись
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Предложение платежа "Интеграл" (кредитные карточки + Paypal) или "PayPal", только
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-PAYPAL_CSS_URL=Optionnal адрес таблицы стилей CSS на странице оплаты
-ThisIsTransactionId=Это идентификатор сделки: %s
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Предлагает платеж "Интегральный" (кредитные карты + Paypal) или только "PayPal"
+PaypalModeIntegral=Интегральный
+PaypalModeOnlyPaypal=только PayPal
+PAYPAL_CSS_URL=Ссылка на собственные стили CSS на странице оплаты (необязательная)
+ThisIsTransactionId=Это идентификатор транзакции: %s
 PAYPAL_ADD_PAYMENT_URL=Добавить адрес Paypal оплата при отправке документа по почте
 PAYPAL_IPN_MAIL_ADDRESS=Адрес электронной почты для мгновенного уведомления об оплате (IPN)
-PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n
-YouAreCurrentlyInSandboxMode=Вы в настоящее время в "песочнице" режим
-NewPaypalPaymentReceived=New Paypal payment received
-NewPaypalPaymentFailed=New Paypal payment tried but failed
-PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed
-PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
+PredefinedMailContentLink=Вы можете нажать на защищённую ссылку нижи для совершения платежа (PayPal), если вы ещё его не производили.\n\n%s\n
+YouAreCurrentlyInSandboxMode=В настоящее время вы в режиме "песочницы"
+NewPaypalPaymentReceived=Получен новый платёж Paypal 
+NewPaypalPaymentFailed=Попытка нового Paypal  платежа не удалась
+PAYPAL_PAYONLINE_SENDEMAIL=Адрес электронной почты, куда будут высылаться уведомления о платежах (успешных или нет)
+ReturnURLAfterPayment=Ссылка, куда будет возвращаться пользователь после оплаты
+ValidationOfPaypalPaymentFailed=Проверка платежа  Paypal не удалась
+PaypalConfirmPaymentPageWasCalledButFailed=Вызвана страница подтверждения платежа Paypal, но подтверждение от  Paypal не поулчено.
diff --git a/htdocs/langs/ru_RU/printipp.lang b/htdocs/langs/ru_RU/printipp.lang
index 835e6827f12..13656b20f47 100644
--- a/htdocs/langs/ru_RU/printipp.lang
+++ b/htdocs/langs/ru_RU/printipp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - printipp
-PrintIPPSetup=Setup of Direct Print module
-PrintIPPDesc=This module adds a Print button to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PRINTIPP_ENABLED=Show "Direct print" icon in document lists
-PRINTIPP_HOST=Print server
-PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoPrinterFound=No printers found (check your CUPS setup)
-FileWasSentToPrinter=File %s was sent to printer
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-CupsServer=CUPS Server
+PrintIPPSetup=Установка модуля Прямой Печати
+PrintIPPDesc=Этот модуль добавляет кнопку Печати c последующей отправкой документов напрямую на принтер. Для этого требуется система Linux с установленным CUPS.
+PRINTIPP_ENABLED=Показать иконку "Прямая печать" в списке документов
+PRINTIPP_HOST=Сервер печати
+PRINTIPP_PORT=Порт
+PRINTIPP_USER=Логин
+PRINTIPP_PASSWORD=Пароль
+NoPrinterFound=Ни один принтер не найден (проверьте настройки CUPS)
+FileWasSentToPrinter=Файл %s был отправлен на печать
+NoDefaultPrinterDefined=Принтер по умолчанию не установлен
+DefaultPrinter=Принтер по умолчанию
+Printer=Принтер
+CupsServer=Сервер CUPS
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
index 45263681965..9fd48b424d4 100644
--- a/htdocs/langs/ru_RU/productbatch.lang
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -1,21 +1,21 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
-ProductStatusOnBatchShort=Yes
-ProductStatusNotOnBatchShort=No
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
-l_eatby=Eat-by date
-l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Batch: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ManageLotSerial=Использовать номер партии/серийный номер
+ProductStatusOnBatch=Да (требуется номер партии/серийный номер)
+ProductStatusNotOnBatch=Нет (номер партии/серийный номер не требуется)
+ProductStatusOnBatchShort=Да
+ProductStatusNotOnBatchShort=Нет
+Batch=Номер партии/Серийный номер
+atleast1batchfield=Дата окончания срока годности или дата продажи или номер партии
+batch_number=Номер партии/серийный номер
+l_eatby=Дата окончания срока годности
+l_sellby=Дата продажи
+DetailBatchNumber=Детали по номеру партии/серийному номеру
+DetailBatchFormat=Номер партии/Серийный номер: %s - Дата окончания срока годности : %s - Дата продажи: %s (Кол-во : %d)
+printBatch=Номер партии: %s
+printEatby=Дата окончания срока годности: %s
+printSellby=Дата продажи: %s
+printQty=Кол-во:%d
+AddDispatchBatchLine=Добавить строку Срока годности
+BatchDefaultNumber=Не задана
+WhenProductBatchModuleOnOptionAreForced=Когда модуль Номер партии/Серийный номер включен, увеличение или уменьшение запаса на складе будет сброшено к последнему выбору и не может быть отредактировано. Другие настройки вы можете задавать по вашему желанию.
+ProductDoesNotUseBatchSerial=Этот товар не использует номер партии/серийный номер
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index b777ee9ed23..f87ac582067 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -1,131 +1,131 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Продукт исх.
-ProductLabel=Продукт этикетки
-ProductServiceCard=Товары / Услуги-карты
-Products=Продукция
+ProductLabel=Этикетка товара
+ProductServiceCard=Карточка Товаров/Услуг
+Products=Товары
 Services=Услуги
-Product=Продукт
-Service=Службы
-ProductId=Товар / услуга ID
+Product=Товар
+Service=Услуга
+ProductId=ID товара / услуги 
 Create=Создать
 Reference=Справка
-NewProduct=Новый продукт
+NewProduct=Новый товар
 NewService=Новая услуга
-ProductCode=Код продукта
-ServiceCode=Служба код
-ProductVatMassChange=Mass VAT change
+ProductCode=Код товара
+ServiceCode=Код услуги
+ProductVatMassChange=Массовое изменение НДС
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Бухгалтерия код (купить)
-ProductAccountancySellCode=Бухгалтерия код (продать)
-ProductOrService=Продукт или услуга
-ProductsAndServices=Продукты и услуги
-ProductsOrServices=Продукты и услуги
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductAccountancyBuyCode=Код бухгалтерии  (купли)
+ProductAccountancySellCode=Код бухгалтерии (продажи)
+ProductOrService=Товар или Услуга
+ProductsAndServices=Товары и Услуги
+ProductsOrServices=Товары  или Услуги
+ProductsAndServicesOnSell=Товары и Услуги для покупки или продажи
+ProductsAndServicesNotOnSell=Товары или Услуги не для продажи
 ProductsAndServicesStatistics=Продукты и услуги статистика
 ProductsStatistics=Продукты статистика
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
+ProductsOnSell=Товар для покупки или продажи
+ProductsNotOnSell=Товар не для покупки и не для продажи
+ProductsOnSellAndOnBuy=Товар для продажи и покупки
+ServicesOnSell=Услуга для покупки или для продажи
+ServicesNotOnSell=Услуга не для продажи
+ServicesOnSellAndOnBuy=Услуга для продажи и покупки
 InternalRef=Внутренние ссылки
 LastRecorded=Последние продукты / услуги по продаже зарегистрировано
-LastRecordedProductsAndServices=Последнее %s зарегистрированные продукции / услуг
-LastModifiedProductsAndServices=Последнее %s модифицированных продуктов / услуг
-LastRecordedProducts=Последнее% с продуктами зарегистрировано
-LastRecordedServices=Последнее %s услуги зарегистрированы
-LastProducts=Последние продукты
-CardProduct0=Продукт-карты
-CardProduct1=Служба карту
-CardContract=Контракт карту
+LastRecordedProductsAndServices=Последние %s зарегистрированные товары / услуги
+LastModifiedProductsAndServices=Последние %s изменённые товары / услуги
+LastRecordedProducts=Последние %s   зарегистрированные товары
+LastRecordedServices=Последние %s зарегистрированные услуги 
+LastProducts=Последние товары
+CardProduct0=Карточка товара
+CardProduct1=Карточка услуги
+CardContract=Карточка контакта
 Warehouse=Склад
 Warehouses=Склады
 WarehouseOpened=Склад открыт
-WarehouseClosed=Склад закрыто
-Stock=Фондовый
-Stocks=Акции
+WarehouseClosed=Склад закрыт
+Stock=Склад
+Stocks=Склады
 Movement=Движение
-Movements=Перевозкой
-Sell=Реализация
+Movements=Движения
+Sell=Продажи
 Buy=Покупает
 OnSell=На продажу
 OnBuy=Приобретенная
-NotOnSell=Из Продать
+NotOnSell=Не для продажи
 ProductStatusOnSell=На продажу
-ProductStatusNotOnSell=За продажу
+ProductStatusNotOnSell=Не для продажи
 ProductStatusOnSellShort=На продажу
-ProductStatusNotOnSellShort=За продажу
-ProductStatusOnBuy=Доступный
-ProductStatusNotOnBuy=Устаревший
-ProductStatusOnBuyShort=Доступный
-ProductStatusNotOnBuyShort=Устаревший
-UpdatePrice=Обновление цен
-AppliedPricesFrom=Прикладная ценам от
+ProductStatusNotOnSellShort=Не для продажи
+ProductStatusOnBuy=Для покупки
+ProductStatusNotOnBuy=Не для покупки
+ProductStatusOnBuyShort=Для покупки
+ProductStatusNotOnBuyShort=Не для покупки
+UpdatePrice=Обновить  цену
+AppliedPricesFrom=Применить цены от
 SellingPrice=Продажная цена
 SellingPriceHT=Продажная цена (за вычетом налогов)
 SellingPriceTTC=Продажная цена (вкл. налоги)
-PublicPrice=Государственные цены
+PublicPrice=Официальные цены
 CurrentPrice=Текущая цена
 NewPrice=Новая цена
 MinPrice=Миним. продажная цена
 MinPriceHT=Минимальная цена продажи (net of tax)
 MinPriceTTC=Минимальная цена продажи (inc. tax)
-CantBeLessThanMinPrice=В продаже цена не может быть ниже минимального позволило этот продукт (S% без учета налогов)
-ContractStatus=Контракт статус
+CantBeLessThanMinPrice=Продажная цена не может быть ниже минимальной для этого товара (%s без налогов). Это сообщение также возникает, если вы задаёте слишком большую скидку.
+ContractStatus=Статус контакта
 ContractStatusClosed=Закрытые
-ContractStatusRunning=Запуск
-ContractStatusExpired=истек
-ContractStatusOnHold=Не работает
+ContractStatusRunning=В работе
+ContractStatusExpired=истекли
+ContractStatusOnHold=Не в работе
 ContractStatusToRun=To get running
-ContractNotRunning=Этот контракт не выполняется
+ContractNotRunning=Этот контракт не в работе
 ErrorProductAlreadyExists=Продукции с учетом% уже существует.
 ErrorProductBadRefOrLabel=Неправильное значение для справки или этикетку.
 ErrorProductClone=Возникла проблема при попытке дублирования продукта или услуги
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Ошибка. Цена не может быть ниже минимальной цены. 
 Suppliers=Поставщики
 SupplierRef=Поставщик исх.
-ShowProduct=Показать продукта
-ShowService=Показать служба
-ProductsAndServicesArea=Продукты и услуги области
-ProductsArea=Продукт области
+ShowProduct=Показать товар
+ShowService=Показать услугу
+ProductsAndServicesArea=Раздел товаров и услуг
+ProductsArea=Раздел товаров
 ServicesArea=Службы района
 AddToMyProposals=Добавить к моим предложениям
 AddToOtherProposals=Добавить к другим предложениям
 AddToMyBills=Добавить к моим законопроектов
 AddToOtherBills=Добавить к другим законопроектам
-CorrectStock=Правильно запас
+CorrectStock=Исправить склад
 AddPhoto=Добавить фото
 ListOfStockMovements=Список акций движения
 BuyingPrice=Покупка цене
-SupplierCard=Поставщик карту
-CommercialCard=Коммерческая карту
-AllWays=Путь найти свой продукт в запасе
+SupplierCard=Карточка поставщика
+CommercialCard=Коммерческая карточка
+AllWays=Путь для поиска вашего товара на складе
 NoCat=Ваш продукт не находится в какой-либо категории
-PrimaryWay=Первичный путь
-PriceRemoved=Цена удален
+PrimaryWay=Основной путь
+PriceRemoved=Цена удалена
 BarCode=Штрих-код
 BarcodeType=Штрих-код типа
 SetDefaultBarcodeType=Установить тип штрих-кода
-BarcodeValue=Баркод стоимости
-NoteNotVisibleOnBill=Примечание (не видимые на счетах-фактурах, предложения ...)
+BarcodeValue=Значение штрих-кода
+NoteNotVisibleOnBill=Примечание (не видимые на счетах-фактурах, предложениях ...)
 CreateCopy=Создать копию
 ServiceLimitedDuration=Если продукт является услугой с ограниченной длительности:
-MultiPricesAbility=Several level of prices per product/service
-MultiPricesNumPrices=Кол-во Цена
-MultiPriceLevelsName=Цена категорий
-AssociatedProductsAbility=Activate the virtual package feature
-AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this virtual package product
+MultiPricesAbility=Несколько уровней цен для товаров/услуг
+MultiPricesNumPrices=Кол-во цен
+MultiPriceLevelsName=Категории цен
+AssociatedProductsAbility=Включить режим виртуальной упаковки товара
+AssociatedProducts=Упаковка товара
+AssociatedProductsNumber=Количество товаров в этой виртуальной упоковке
 ParentProductsNumber=Number of parent packaging product
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a virtual package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any virtual package product
+IfZeroItIsNotAVirtualProduct=Если задан 0, то этот товар не виртуальная упаковка
+IfZeroItIsNotUsedByVirtualProduct=Если задан 0, то этот товар не будет использован ни в какой виртуальной упаковке
 EditAssociate=Ассоциированные
 Translation=Перевод
-KeywordFilter=Ключевое слово фильтр
+KeywordFilter=Фильтр ключевых слов
 CategoryFilter=Категория фильтр
 ProductToAddSearch=Поиск продукта для добавления
 AddDel=Добавить / Удалить
@@ -139,14 +139,14 @@ ConfirmDeleteProduct=Вы уверены, что хотите удалить э
 ProductDeleted=Товар / Услуга " %s" исключены из базы данных.
 DeletePicture=Удалить изображение
 ConfirmDeletePicture=Вы уверены, что хотите удалить эту фотографию?
-ExportDataset_produit_1=Продукты и услуги
+ExportDataset_produit_1=Товары
 ExportDataset_service_1=Услуги
-ImportDataset_produit_1=Продукты
+ImportDataset_produit_1=Товары
 ImportDataset_service_1=Услуги
-DeleteProductLine=Удалить продукции
-ConfirmDeleteProductLine=Вы уверены, что хотите удалить этот продукт линии?
-NoProductMatching=Нет продукта / услуги соответствуют Вашим критериям
-MatchingProducts=Соответствие продукции / услуг
+DeleteProductLine=Удалить строку товара
+ConfirmDeleteProductLine=Вы уверены, что хотите удалить эту строку с товаром?
+NoProductMatching=Нет товара / услуги соответствующих Вашим критериям
+MatchingProducts=Соответствие товаров / услуг
 NoStockForThisProduct=Нет запасов для данного продукта
 NoStock=Нет фондовая
 Restock=Пополнять
@@ -154,19 +154,19 @@ ProductSpecial=Специальные
 QtyMin=Минимальное кол-во
 PriceQty=Цена на такое количество
 PriceQtyMin=Цена для этого мин. кол-ва (без скидки)
-VATRateForSupplierProduct=VAT Rate (for this supplier/product)
-DiscountQtyMin=Default discount for qty
+VATRateForSupplierProduct=Значение НДС (для этого поставщика/товара)
+DiscountQtyMin=Скидка по умолчанию за количество
 NoPriceDefinedForThisSupplier=Нет цена / Qty определенных для этого поставщика / продукта
 NoSupplierPriceDefinedForThisProduct=Нет поставщиком цена / Qty определенных для этого продукта
 RecordedProducts=Продукты зарегистрировано
-RecordedServices=Services recorded
+RecordedServices=Услуги записаны
 RecordedProductsAndServices=Товары / услуги зарегистрированы
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
+PredefinedProductsToSell=Определённый заранее товар для  продажи
+PredefinedServicesToSell=Определённая заранее услуга для  продажи
 PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
+PredefinedProductsToPurchase=Определённый заранее товар для  покупки
+PredefinedServicesToPurchase=Определённая заранее услуга для покупки
+PredefinedProductsAndServicesToPurchase=Определённые заранее товары/услуги для  покупки
 GenerateThumb=Генерируйте пальца
 ProductCanvasAbility=Используйте специальные "холст" аддонами
 ServiceNb=Служба # %s
@@ -184,13 +184,13 @@ ProductIsUsed=Этот продукт используется
 NewRefForClone=Ссылка нового продукта / услуги
 CustomerPrices=Клиенты цены
 SuppliersPrices=Поставщики цены
-SuppliersPricesOfProductsOrServices=Suppliers prices (of products or services)
+SuppliersPricesOfProductsOrServices=Цены поставщика (за товары или услуги)
 CustomCode=Пользовательский код
 CountryOrigin=Страна происхождения
 HiddenIntoCombo=Скрытые в списках выбора
 Nature=Природа
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
+ProductCodeModel=Ссылка на шаблон товара
+ServiceCodeModel=Ссылка на шаблон услуги
 AddThisProductCard=Создать карточку товара
 HelpAddThisProductCard=This option allows you to create or clone a product if it does not exist.
 AddThisServiceCard=Создать карточку услуги
@@ -198,9 +198,9 @@ HelpAddThisServiceCard=This option allows you to create or clone a service if it
 CurrentProductPrice=Текущая цена
 AlwaysUseNewPrice=Всегда использовать текущую цену продукта/услуги
 AlwaysUseFixedPrice=Использовать фиксированную цену
-PriceByQuantity=Different prices by quantity
-PriceByQuantityRange=Quantity range
-ProductsDashboard=Products/Services summary
+PriceByQuantity=Разные цены по количеству
+PriceByQuantityRange=Диапазон количества
+ProductsDashboard=Товары/услуги в общем
 UpdateOriginalProductLabel=Modify original label
 HelpUpdateOriginalProductLabel=Позволяет изменить название товара
 ### composition fabrication
@@ -214,7 +214,7 @@ CostPmpHT=Net total VWAP
 ProductUsedForBuild=Auto consumed by production
 ProductBuilded=Производство завершено
 ProductsMultiPrice=Product multi-price
-ProductsOrServiceMultiPrice=Customers prices (of products or services, multi-prices)
+ProductsOrServiceMultiPrice=Цены клиенты (за товары, услуги, совместные цены)
 ProductSellByQuarterHT=Products turnover quarterly VWAP
 ServiceSellByQuarterHT=Services turnover quarterly VWAP
 Quarter1=I квартал
@@ -223,34 +223,47 @@ Quarter3=III квартал
 Quarter4=IV квартал
 BarCodePrintsheet=Печать штрих-кода
 PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button %s.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+NumberOfStickers=Количество стикеров для печати на странице
+PrintsheetForOneBarCode=Печатать несколько стикеров для одного штрих-кода
+BuildPageToPrint=Создать страницу для печати
+FillBarCodeTypeAndValueManually=Заполнить тип и значение штрих-кода вручную.
+FillBarCodeTypeAndValueFromProduct=Заполнить тип и значение из штрих-кода товара.
+FillBarCodeTypeAndValueFromThirdParty=Заполнить тип и значение из штрих-кода контрагента.
+DefinitionOfBarCodeForProductNotComplete=Тип и значение штрих-кода не заданы для товара %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Тип и значение штрих-кода не заданы для контрагента %s.
 BarCodeDataForProduct=Информация по штрих-коду продукта %s:
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different price for each customer
-PriceCatalogue=Unique price per product/service
-PricingRule=Rules for customer prices
-AddCustomerPrice=Add price by customers
+BarCodeDataForThirdparty=Информация штрих-кода контрагента %s 
+ResetBarcodeForAllRecords=Задать значение штри х-кода ля всех записей (это также установит значение штрих-кода для тех записей, где он был уже задан)
+PriceByCustomer=Различная цена для каждого клиента
+PriceCatalogue=Уникальная цена для товара/услуги
+PricingRule=Правила для цен клиента
+AddCustomerPrice=Добавить цену клиента
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+PriceByCustomerLog=Цена по журналу клиента
+MinimumPriceLimit=Минимальная цена не может быть ниже %s
+MinimumRecommendedPrice=Минимальная рекомендованная цена : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp1="price = 2+2" или "2 + 2"  для задания цены. Используйте ; в качестве разделителя выражений.
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
+PriceNumeric=Номер
+DefaultPrice=Цена по умолчанию
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 91a4da8d284..aa51b63ec92 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
+RefProject=Ref. проект
 ProjectId=ID Проекта
 Project=Проект
 Projects=Проекты
-ProjectStatus=Project status
+ProjectStatus=Статус проекта
 SharedProject=Общий проект
 PrivateProject=Контакты проекта
 MyProjectsDesc=Эта точка зрения ограничена проекты, которые Вы контакте (что бы это тип).
 ProjectsPublicDesc=Эта точка зрения представлены все проекты, которые Вы позволили читать.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Это представление всех проектов и задач, к которым у вас есть доступ.
 ProjectsDesc=Эта точка зрения представляет все проекты (разрешений пользователей предоставить вам разрешение для просмотра всего).
 MyTasksDesc=Эта точка зрения ограничена на проекты или задачи, которые являются для контакта (что бы это тип).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Видны только открытые проекты (проекты на стадии черновика или закрытые проекты не видны)
 TasksPublicDesc=Эта точка зрения представляет всех проектов и задач, которые могут читать.
 TasksDesc=Эта точка зрения представляет всех проектов и задач (разрешений пользователей предоставить вам разрешение для просмотра всего).
 ProjectsArea=Проекты области
 NewProject=Новый проект
-AddProject=Create project
+AddProject=Создать проект
 DeleteAProject=Удаление проекта
 DeleteATask=Удалить задание
 ConfirmDeleteAProject=Вы уверены, что хотите удалить этот проект?
@@ -31,8 +31,8 @@ NoProject=Нет проекта определена
 NbOpenTasks=Nb открытых задач
 NbOfProjects=Nb проектов
 TimeSpent=Время, затраченное
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Затраченное мной время
+TimeSpentByUser=Затраченное пользователем время
 TimesSpent=Время, проведенное
 RefTask=Ref. задача
 LabelTask=Этикетка задачи
@@ -40,8 +40,8 @@ TaskTimeSpent=Время, потраченное на задачи
 TaskTimeUser=Пользователь
 TaskTimeNote=Заметка
 TaskTimeDate=Дата
-TasksOnOpenedProject=Tasks on opened projects
-WorkloadNotDefined=Workload not defined
+TasksOnOpenedProject=Задачи на открытых проектах
+WorkloadNotDefined=Рабочая нагрузка не задана
 NewTimeSpent=Новое время
 MyTimeSpent=Мое время
 MyTasks=Мои задачи
@@ -51,7 +51,7 @@ TaskDateStart=Дата начала задачи
 TaskDateEnd=Дата завершения задачи
 TaskDescription=Описание задачи
 NewTask=Новые задачи
-AddTask=Create task
+AddTask=Создать задачу
 AddDuration=Добавить продолжительность
 Activity=Мероприятие
 Activities=Задачи / мероприятия
@@ -60,8 +60,8 @@ MyActivities=Мои задачи / мероприятия
 MyProjects=Мои проекты
 DurationEffective=Эффективная длительность
 Progress=Прогресс
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+ProgressDeclared=Заданный ход выполнения проекта
+ProgressCalculated=Вычисленный  ход выполнения проекта
 Time=Время
 ListProposalsAssociatedProject=Списки коммерческих предложений, связанных с проектом
 ListOrdersAssociatedProject=Списки заказы, связанные с проектом
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Список поставщиков сче
 ListContractAssociatedProject=Перечень договоров, связанных с проектом
 ListFichinterAssociatedProject=Список мероприятий, связанных с проектом
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Список мероприятий, связанных с проектом
 ActivityOnProjectThisWeek=Деятельность по проекту на этой неделе
 ActivityOnProjectThisMonth=Деятельность по проектам в этом месяце
@@ -91,13 +92,13 @@ ActionsOnProject=Действия по проекту
 YouAreNotContactOfProject=Вы не контакт этого частного проекта
 DeleteATimeSpent=Удалить времени
 ConfirmDeleteATimeSpent=Вы уверены, что хотите удалить этот раз провели?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
+DoNotShowMyTasksOnly=Также видеть  задачи, не назначенные мне
+ShowMyTasksOnly=Видеть только задачи, назначенные мне
 TaskRessourceLinks=Библиография
 ProjectsDedicatedToThisThirdParty=Проектов, посвященных этой третьей стороне
 NoTasks=Нет задач, для этого проекта
 LinkedToAnotherCompany=Связь с другими третий участник
-TaskIsNotAffectedToYou=Task not assigned to you
+TaskIsNotAffectedToYou=Задачи, не назначенные вам
 ErrorTimeSpentIsEmpty=Время, проведенное пуста
 ThisWillAlsoRemoveTasks=Это действие приведет к удалению всех задач проекта (%s задач на данный момент), и все входы затраченного времени.
 IfNeedToUseOhterObjectKeepEmpty=Если некоторые объекты (счет-фактура, заказ, ...), принадлежащей другому третьему лицу, должна быть увязана с проектом по созданию, держать этот пустой иметь проект, несколько третьих лиц.
@@ -106,11 +107,11 @@ CloneTasks=Дублировать задачи
 CloneContacts=Дублировать контакты
 CloneNotes=Дублировать заметки
 CloneProjectFiles=Дублировать файлы, связанные с проектом
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now ?
+CloneTaskFiles=Клонировать задачу (задачи), объединять файлы (если задача клонирована)
+CloneMoveDate=Обновить даты проекта/задач на текущую дату?
 ConfirmCloneProject=Вы уверены, что хотите дублировать этот проект?
 ProjectReportDate=Изменить дату задачи в соответствии с датой начала проекта
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
+ErrorShiftTaskDate=Невозможно сдвинуть дату задачи по причине новой даты начала проекта
 ProjectsAndTasksLines=Проекты и задачи
 ProjectCreatedInDolibarr=Проект %s создан
 TaskCreatedInDolibarr=Задача %s создана
@@ -119,24 +120,26 @@ TaskDeletedInDolibarr=Задача %s удалена
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Руководитель проекта
 TypeContact_project_external_PROJECTLEADER=Руководитель проекта
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Содействующий
+TypeContact_project_external_PROJECTCONTRIBUTOR=Содействующий
 TypeContact_project_task_internal_TASKEXECUTIVE=Целевая исполнительной
 TypeContact_project_task_external_TASKEXECUTIVE=Целевая исполнительной
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Содействующий
+TypeContact_project_task_external_TASKCONTRIBUTOR=Содействующий
 SelectElement=Выберите элемент
-AddElement=Link to element
-UnlinkElement=Unlink element
+AddElement=Ссылка на элемент
+UnlinkElement=Убрать ссылку на элемент
 # Documents models
 DocumentModelBaleine=доклад полной проекта модели (logo. ..)
-PlannedWorkload = Запланированная нагрузка
-WorkloadOccupation= Workload affectation
-ProjectReferers=Refering objects
-SearchAProject=Search a project
-ProjectMustBeValidatedFirst=Project must be validated first
-ProjectDraft=Draft projects
+PlannedWorkload=Запланированная нагрузка
+PlannedWorkloadShort=Рабочая нагрузка
+WorkloadOccupation=Задание рабочей нагрузки
+ProjectReferers=Ссылающиеся объекты
+SearchAProject=Поиск проекта
+ProjectMustBeValidatedFirst=Проект должен быть сначала подтверждён
+ProjectDraft=Черновики проектов
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
index 8c932b56578..74aa5773852 100644
--- a/htdocs/langs/ru_RU/propal.lang
+++ b/htdocs/langs/ru_RU/propal.lang
@@ -8,24 +8,24 @@ ProposalsOpened=Открытие коммерческих предложений
 Prop=Коммерческие предложения
 CommercialProposal=Коммерческое предложение
 CommercialProposals=Коммерческие предложения
-ProposalCard=Предложение карты
+ProposalCard=Карточка предложения
 NewProp=Новое коммерческое предложение
 NewProposal=Новое коммерческое предложение
 NewPropal=Новое предложение
 Prospect=Проспект
-ProspectList=Проспект список
+ProspectList=Список проспектов
 DeleteProp=Удалить коммерческого предложения
 ValidateProp=Проверка коммерческого предложения
-AddProp=Добавить предложение
+AddProp=Создать предложение
 ConfirmDeleteProp=Вы уверены, что хотите удалить это коммерческое предложение?
 ConfirmValidateProp=Вы уверены, что хотите проверить эту коммерческое предложение?
-LastPropals=Последнее% с предложениями
+LastPropals=Последние %s  предложений
 LastClosedProposals=Последнее% с закрытых предложений
 LastModifiedProposals=Последнее% с измененными предложения
 AllPropals=Все предложения
 LastProposals=Последние предложения
 SearchAProposal=Поиск предложений
-ProposalsStatistics=Коммерческие предложения Статистика
+ProposalsStatistics=Статистика коммерческих предложений 
 NumberOfProposalsByMonth=Количество в месяц
 AmountOfProposalsByMonthHT=Сумма в месяц (за вычетом налогов)
 NbOfProposals=Количество коммерческих предложений
@@ -55,8 +55,6 @@ NoOpenedPropals=Нет открыли коммерческие предложе
 NoOtherOpenedPropals=Никакие другие открыли коммерческие предложения
 RefProposal=Коммерческие предложения исх
 SendPropalByMail=Отправить коммерческое предложение по почте
-FileNotUploaded=Файл не был загружен
-FileUploaded=Этот файл был успешно загружен
 AssociatedDocuments=Документы, связанные с предложением:
 ErrorCantOpenDir=Не удается открыть каталог
 DatePropal=Дата предложения
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Пропал% не найдены
 Estimate=Оценка:
 EstimateShort=Расчетный показатель
 OtherPropals=Другие предложения
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Добавить проект коммерческого предложения
+NoDraftProposals=Нет проектов коммерческих дредложений
 CopyPropalFrom=Создание коммерческого предложения, копируя существующие предложения
 CreateEmptyPropal=Создайте пустую коммерческих предложений vierge либо из списка товаров / услуг
 DefaultProposalDurationValidity=По умолчанию коммерческого предложения действительности продолжительность (в днях)
@@ -97,6 +95,6 @@ TypeContact_propal_external_CUSTOMER=Абонентский отдел след
 # Document models
 DocModelAzurDescription=Полный текст предложения модели (logo. ..)
 DocModelJauneDescription=Желтый предложение модель
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalCreate=Default model creation
+DefaultModelPropalToBill=Шаблон по умолчанию, когда закрывается коммерческое предложение (для создания счёта)
+DefaultModelPropalClosed=Шаблон по умолчанию, когда закрывается коммерческое предложение (не оплаченное)
diff --git a/htdocs/langs/ru_RU/resource.lang b/htdocs/langs/ru_RU/resource.lang
index 32bdd92f884..fa071f1bdd7 100644
--- a/htdocs/langs/ru_RU/resource.lang
+++ b/htdocs/langs/ru_RU/resource.lang
@@ -1,34 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Ресурсы
+MenuResourceAdd=Новый ресурс
+MenuResourcePlanning=Планирование ресурсов
+DeleteResource=Удалить ресурс
+ConfirmDeleteResourceElement=Подтвердите удаление ресурса для этого элемента
+NoResourceInDatabase=Нет ресурсов в базе данных
+NoResourceLinked=Нет связанных ресурсов
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Список ресурсов
+ResourceSingular=Ресурс
+ResourceCard=Карточка ресурса
+AddResource=Создать ресурс
+ResourceFormLabel_ref=Имя ресурса
+ResourceType=Тип ресурса
+ResourceFormLabel_description=Описание ресурса
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Ресурс связан с элементом
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Показать карту планирования ресурсов
+GotoDate=К дате
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Элемент ресурсов
+ResourceCreatedWithSuccess=Ресурс успешно создан
+RessourceLineSuccessfullyDeleted=Ресурс успешно удалён
+RessourceLineSuccessfullyUpdated=Ресурс успешно обновлён
+ResourceLinkedWithSuccess=Связь ресурса установлена успешно
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Карточка ресурса
+ConfirmDeleteResource=Подтвердите удаление ресурса
+RessourceSuccessfullyDeleted=Ресурс успешно удалён
+DictionaryResourceType=Тип ресурсов
 
-SelectResource=Select resource
+SelectResource=Выберете ресурс
diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
index 6ec5eaae2fd..8429f995703 100644
--- a/htdocs/langs/ru_RU/salaries.lang
+++ b/htdocs/langs/ru_RU/salaries.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - users
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Бухгалтерский код для выплат зарплаты
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Бухгалтерский код для финансовых выплат
 Salary=Зарплата
 Salaries=Зарплаты
 Employee=Сотрудник
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
-CurrentSalary=Current salary
+NewSalaryPayment=Новая выплата зарплаты
+SalaryPayment=Выплата зарплаты
+SalariesPayments=Выплата зарплат
+ShowSalaryPayment=Показать выплату зарплаты
+THM=Средняя расценка почасовой оплаты
+TJM=Средняя расценка дневной оплаты
+CurrentSalary=Текущая зарплата
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index efb3246b409..5266b0bc135 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -1,85 +1,86 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. отправка
-Sending=Отправка
-Sendings=Отправок
-Shipment=Отправка
+RefSending=Ref. поставки
+Sending=Поставки
+Sendings=Поставки
+AllSendings=All Shipments
+Shipment=Поставка
 Shipments=Поставки
-ShowSending=Show Sending
-Receivings=Receipts
-SendingsArea=Отправок области
-ListOfSendings=Список отправок
-SendingMethod=Отправка метод
-SendingReceipt=Отправка получения
-LastSendings=Последнее %s отправок
-SearchASending=Поиск направления
-StatisticsOfSendings=Статистика отправок
-NbOfSendings=Число отправок
-NumberOfShipmentsByMonth=Number of shipments by month
-SendingCard=Shipment card
-NewSending=Новые направления
-CreateASending=Создать отправке
-CreateSending=Создать отправке
+ShowSending=Показать Отправку
+Receivings=Получатели
+SendingsArea=Раздел поставок
+ListOfSendings=Список поставок
+SendingMethod=Метод отправки
+SendingReceipt=Получатель
+LastSendings=Последнее %s поставок
+SearchASending=Поиск поставки
+StatisticsOfSendings=Статистика поставок
+NbOfSendings=Число поставок
+NumberOfShipmentsByMonth=Количество поставок по месяцам
+SendingCard=Карточка поставки
+NewSending=Новая поставка
+CreateASending=Создать поставку
+CreateSending=Создать поставку
 QtyOrdered=Количество заказанных
-QtyShipped=Количество отгружен
-QtyToShip=Количество судов
-QtyReceived=Количество получил
-KeepToShip=Remain to ship
-OtherSendingsForSameOrder=Другие отправок с этой целью
-DateSending=Дата отправки порядка
-DateSendingShort=Дата отправки порядка
-SendingsForSameOrder=Отправок с этой целью
-SendingsAndReceivingForSameOrder=Отправок и receivings в таком порядке
-SendingsToValidate=Отправка на проверку
-StatusSendingCanceled=Отменен
+QtyShipped=Количество отгруженных
+QtyToShip=Количество для отправки
+QtyReceived=Количество получено
+KeepToShip=Осталось отправить
+OtherSendingsForSameOrder=Другие поставки для этого заказа
+DateSending=Дата отправки заказа
+DateSendingShort=Дата отправки заказа
+SendingsForSameOrder=Поставок для этого заказа
+SendingsAndReceivingForSameOrder=Поставки и получения для этого заказа
+SendingsToValidate=Поставки для проверки
+StatusSendingCanceled=Отменена
 StatusSendingDraft=Черновик
-StatusSendingValidated=Удостоверенная (продукты для судна или уже отгружен)
+StatusSendingValidated=Утверждена (товары для отправки или уже отправлены)
 StatusSendingProcessed=Обработано
-StatusSendingCanceledShort=Отменен
+StatusSendingCanceledShort=Отменена
 StatusSendingDraftShort=Черновик
-StatusSendingValidatedShort=Подтвержденные
+StatusSendingValidatedShort=Утверждена
 StatusSendingProcessedShort=Обработано
-SendingSheet=Shipment sheet
+SendingSheet=Лист поставки
 Carriers=Перевозчики
 Carrier=Перевозчик
-CarriersArea=Перевозчики области
+CarriersArea=Раздел перевозчика
 NewCarrier=Новый перевозчик
-ConfirmDeleteSending=Вы уверены, что хотите удалить эту отправку?
-ConfirmValidateSending=Вы уверены, что хотите valdate этой передаче?
-ConfirmCancelSending=Вы уверены, что хотите отменить отправку?
-GenericTransport=Общие транспорт
-Enlevement=Полученной клиентом
+ConfirmDeleteSending=Вы уверены, что хотите удалить эту поставку?
+ConfirmValidateSending=Вы уверены, что хотите подтвердить эту поставку со ссылкой %s ?
+ConfirmCancelSending=Вы уверены, что хотите отменить эту поставку?
+GenericTransport=Основной транспорт
+Enlevement=Получен клиентом
 DocumentModelSimple=Простая модель документа
-DocumentModelMerou=Mérou модели A5
-WarningNoQtyLeftToSend=Внимание, без продуктов, ожидающих отправки.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Планируемая дата поставки
-DateReceived=Дата доставки получили
-SendShippingByEMail=Отправить доставкой по EMail
-SendShippingRef=Submission of shipment %s
-ActionsOnShipping=Acions на судоходство
-LinkToTrackYourPackage=Ссылка на дорожку ваш пакет
-ShipmentCreationIsDoneFromOrder=На данный момент, создание новой партии производится с целью карту.
-RelatedShippings=Related shipments
-ShipmentLine=Shipment line
-CarrierList=List of transporters
-SendingRunning=Product from ordered customer orders
-SuppliersReceiptRunning=Product from ordered supplier orders
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+DocumentModelMerou=Модель A5
+WarningNoQtyLeftToSend=Внимание, нет товаров ожидающих отправки.
+StatsOnShipmentsOnlyValidated=Статистика собирается только на утверждённые поставки. Используемая дата - дата утверждения поставки (планируемая дата доставки не всегда известна)
+DateDeliveryPlanned=Планируемая дата доставки
+DateReceived=Дата доставки получена
+SendShippingByEMail=Отправить поставкой по EMail
+SendShippingRef=Представление поставки %s
+ActionsOnShipping=События поставки
+LinkToTrackYourPackage=Ссылка на номер для отслеживания посылки
+ShipmentCreationIsDoneFromOrder=На данный момент, создание новой поставки закончено из карточки заказа.
+RelatedShippings=Связанные поставки
+ShipmentLine=Линия поставки
+CarrierList=Список перевозчиков
+SendingRunning=Товар из уже заказанных клиентом
+SuppliersReceiptRunning=Товар из уже  заказанных поставщиком
+ProductQtyInCustomersOrdersRunning=Количество товара в открытых заказах клиента
+ProductQtyInSuppliersOrdersRunning=Количество товара в открытых заказах поставщика
+ProductQtyInShipmentAlreadySent=Количество товара из открытого заказа клиента уже отправлено. 
+ProductQtyInSuppliersShipmentAlreadyRecevied=Количество товара из открытого заказа поставщика уже получено. 
 
 # Sending methods
-SendingMethodCATCH=Catch заказчиком
-SendingMethodTRANS=Transporter
+SendingMethodCATCH=Получено заказчиком
+SendingMethodTRANS=Перевозчик
 SendingMethodCOLSUI=Colissimo
 # ModelDocument
 DocumentModelSirocco=Простая модель документа для доставки квитанций
 DocumentModelTyphon=Более полная модель документа для доставки квитанций (logo. ..)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Постоянное EXPEDITION_ADDON_NUMBER не определена
-SumOfProductVolumes=Sum of product volumes
-SumOfProductWeights=Sum of product weights
+SumOfProductVolumes=Сумма сторон товара
+SumOfProductWeights=Вес товара в сумме
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseNumber= Детали склада
+DetailWarehouseFormat= В:%s (Кол-во : %d)
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index d89cb572fa1..4a7251f66e2 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -9,7 +9,7 @@ WarehouseOpened=Склад открыт
 WarehouseClosed=Склад закрыт
 WarehouseSource=Источник склад
 WarehouseSourceNotDefined=Склад не определен,
-AddOne=Add one
+AddOne=Добавить
 WarehouseTarget=Целевой показатель на складе
 ValidateSending=Удалить отправку
 CancelSending=Отменить отправку
@@ -23,7 +23,7 @@ ErrorWarehouseLabelRequired=Склад этикетке необходимо
 CorrectStock=Правильно запас
 ListOfWarehouses=Список складов
 ListOfStockMovements=Список акций движения
-StocksArea=Warehouses area
+StocksArea=Раздел "Склад"
 Location=Вместо
 LocationSummary=Сокращенное наименование расположение
 NumberOfDifferentProducts=Кол-во различных продуктов
@@ -36,7 +36,7 @@ StockCorrection=Правильно запас
 StockTransfer=Перевод остатков
 StockMovement=Трансфер
 StockMovements=Фондовый переводы
-LabelMovement=Movement label
+LabelMovement=Отметка о перемещении
 NumberOfUnit=Количество единиц
 UnitPurchaseValue=Себестоимость единицы
 TotalStock=Всего на складе
@@ -47,10 +47,10 @@ PMPValue=Значение
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Склады стоимости
 UserWarehouseAutoCreate=Создать запас автоматически при создании пользователя
-IndependantSubProductStock=Product stock and subproduct stock are independant
+IndependantSubProductStock=Запас товара на складе и запас суб-товара на складе не связаны
 QtyDispatched=Количество направил
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
+QtyDispatchedShort=Кол-во отправлено
+QtyToDispatchShort=Кол-во на отправку
 OrderDispatch=Приказ диспетчерского
 RuleForStockManagementDecrease=Правило для управления запасами сокращение
 RuleForStockManagementIncrease=Правило для управления запасами увеличить
@@ -62,11 +62,11 @@ ReStockOnValidateOrder=Увеличение реальных запасов по
 ReStockOnDispatchOrder=Увеличение реальных запасов на ручной посылаем в склады, после получения заказа поставщиком
 ReStockOnDeleteInvoice=Увеличить реальные остатки при удалении счета-фактуры
 OrderStatusNotReadyToDispatch=Заказ еще не или не более статуса, который позволяет отправку товаров на складе склады.
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
+StockDiffPhysicTeoric=Объяснение разницы между физическим и теоретическими запасами на складе
 NoPredefinedProductToDispatch=Нет предопределенного продуктов для данного объекта. Так что не диспетчеризации в акции не требуется.
 DispatchVerb=Отправка
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Граница предупреждения
+StockLimit=Граница предупреждения о запасе на складе
 PhysicalStock=Физическая запас
 RealStock=Real фондовая
 VirtualStock=Виртуальный запас
@@ -92,21 +92,21 @@ ThisWarehouseIsPersonalStock=Этот склад представляет соб
 SelectWarehouseForStockDecrease=Выберите хранилище, чтобы использовать для снижения акции
 SelectWarehouseForStockIncrease=Выберите склад для использования в запас увеличения
 NoStockAction=No stock action
-LastWaitingSupplierOrders=Orders waiting for receptions
+LastWaitingSupplierOrders=Заказы, ожидающие приёма
 DesiredStock=Желаемый запас
 StockToBuy=На заказ
 Replenishment=Пополнение
 ReplenishmentOrders=Заказ на пополнение
 VirtualDiffersFromPhysical=According to increase/decrease stock options, physical stock and virtual stock (physical + current orders) may differs
-UseVirtualStockByDefault=Use virtual stock by default, instead of physical stock, for replenishment feature
+UseVirtualStockByDefault=Использовать виртуальный запас на складе вместо имеющего место быть, для функции наполнения
 UseVirtualStock=Использовать виртуальный склад
 UsePhysicalStock=Использовать физические запасы
-CurentSelectionMode=Curent selection mode
+CurentSelectionMode=Текущий режим выделения
 CurentlyUsingVirtualStock=Виртуальный запас
 CurentlyUsingPhysicalStock=Физический запас
 RuleForStockReplenishment=Правило для пополнения запасов
 SelectProductWithNotNullQty=Выберите как минимум один продукт с ненулевым кол-вом и Поставщика
-AlertOnly= Alerts only
+AlertOnly= Только предупреждения
 WarehouseForStockDecrease=Склад %s будет использован для уменьшения остатка
 WarehouseForStockIncrease=Склад %s будет использован для увеличения остатка
 ForThisWarehouse=Для этого склада
@@ -115,20 +115,20 @@ ReplenishmentOrdersDesc=This is list of all opened supplier orders including pre
 Replenishments=Пополнения
 NbOfProductBeforePeriod=Количество продукта %s в остатке на начало выбранного периода (< %s)
 NbOfProductAfterPeriod=Количество продукта %s в остатке на конец выбранного периода (< %s)
-MassMovement=Mass movement
+MassMovement=Массовое перемещение
 MassStockMovement=Массовое перемещение остатков
 SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
 RecordMovement=Record transfert
-ReceivingForSameOrder=Receipts for this order
+ReceivingForSameOrder=Получатели заказа
 StockMovementRecorded=Перемещения остатков записаны
-RuleForStockAvailability=Rules on stock requirements
-StockMustBeEnoughForInvoice=Stock level must be enough to add product/service into invoice
-StockMustBeEnoughForOrder=Stock level must be enough to add product/service into order
-StockMustBeEnoughForShipment= Stock level must be enough to add product/service into shipment
+RuleForStockAvailability=Правила и требования к запасу на складе
+StockMustBeEnoughForInvoice=Достаточный запас товара/услуг на складе, чтобы  добавить в счёт
+StockMustBeEnoughForOrder=Достаточный запас товара/услуг на складе, чтобы  добавить в заказ
+StockMustBeEnoughForShipment= Достаточный запас товара/услуг на складе, чтобы  добавить в поставку
 MovementLabel=Label of movement
 InventoryCode=Movement or inventory code
 IsInPackage=Contained into package
-ShowWarehouse=Show warehouse
+ShowWarehouse=Просмотр склада
 MovementCorrectStock=Stock content correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
+MovementTransferStock=Перевозка товара %s на другой склад
 WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index cb0690f2bdf..552d52955a5 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=Поставщики
-AddSupplier=Create a supplier
+AddSupplier=Создать поставщика
 SupplierRemoved=Поставщик удален
 SuppliersInvoice=Счета-фактуры от поставщиков
 NewSupplier=Новый поставщик
@@ -11,26 +11,26 @@ OrderDate=Дата заказа
 BuyingPrice=Закупочная цена
 BuyingPriceMin=Минимальная закупочная цена
 BuyingPriceMinShort=Мин. закупочная цена
-TotalBuyingPriceMin=Total of subproducts buying prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
+TotalBuyingPriceMin=Итог закупочных цен субтоваров
+SomeSubProductHaveNoPrices=Для субтоваров  товаров не указана цена
 AddSupplierPrice=Добавить цену поставщика
-ChangeSupplierPrice=Измеенить цену поставщика
+ChangeSupplierPrice=Изменить цену поставщика
 ErrorQtyTooLowForThisSupplier=Количество слишком мало для данного поставщика или не определена цена на этот продукт для этого поставщика
 ErrorSupplierCountryIsNotDefined=Страна для данного поставщика не определена. Сначала исправьте это.
 ProductHasAlreadyReferenceInThisSupplier=Этот продукт уже ссылку на этот поставщик
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Эта ссылка поставщиком уже связан с ссылкой: %s
 NoRecordedSuppliers=Нет зарегистрированных поставщиков
-SupplierPayment=Поставщик оплаты
-SuppliersArea=Поставщики области
+SupplierPayment=Оплаты поставщика
+SuppliersArea=Раздел поставщиков
 RefSupplierShort=Ref. Поставщик
 Availability=Доступность
-ExportDataset_fournisseur_1=Поставщик списка счетов и счетов-фактур линий
+ExportDataset_fournisseur_1=Список счетов поставщика  и строки счета
 ExportDataset_fournisseur_2=Поставщиком счета-фактуры и платежи
-ExportDataset_fournisseur_3=Supplier orders and order lines
+ExportDataset_fournisseur_3=Заказы поставщика и строки заказа
 ApproveThisOrder=Утвердить этот заказ
-ConfirmApproveThisOrder=Вы уверены, что хотите утвердить этот порядок?
-DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Вы уверены, что хотите лишить этого заказа?
+ConfirmApproveThisOrder=Вы уверены, что хотите утвердить этот заказ %s ?
+DenyingThisOrder=Отменить этот заказ
+ConfirmDenyingThisOrder=Вы уверены, что хотите отменить этот заказ  %s ?
 ConfirmCancelThisOrder=Вы уверены, что хотите отменить этот заказ?
 AddCustomerOrder=Создать клиента порядка
 AddCustomerInvoice=Создать счет-фактуру заказчику
@@ -39,7 +39,8 @@ AddSupplierInvoice=Создать поставщику счет-фактуру
 ListOfSupplierProductForSupplier=Перечень продукции и цен для поставщиков %s
 NoneOrBatchFileNeverRan=Ни одна партия или% не побежал в последнее время
 SentToSuppliers=Отправлено поставщикам
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+ListOfSupplierOrders=Список заказов поставщиков
+MenuOrdersSupplierToBill=Заказы поставщика для выписки счёта
+NbDaysToDelivery=Задержка доставки в днях
+DescNbDaysToDelivery=Самая большая задержка отображается среди списка товаров в заказе
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang
index ceb0857662a..90d1d087ec6 100644
--- a/htdocs/langs/ru_RU/trips.lang
+++ b/htdocs/langs/ru_RU/trips.lang
@@ -1,126 +1,126 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense report
+ExpenseReport=Отчёт о затратах
+ExpenseReports=Отчёты о затратах
+Trip=Отчёт о затратах
+Trips=Отчёты о затратах
+TripsAndExpenses=Отчёты о затратах
+TripsAndExpensesStatistics=Статистика отчётов о затратах
+TripCard=Карточка отчётов о затратах
+AddTrip=Создать отчёт о затратах
+ListOfTrips=Список отчёта о затратах
 ListOfFees=Список сборов
-NewTrip=New expense report
+NewTrip=Новый отчёт о затртатах
 CompanyVisited=Посещенная организация
 Kilometers=Километры
 FeesKilometersOrAmout=Сумма или километры
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-SearchATripAndExpense=Search an expense report
+DeleteTrip=Удалить отчёт о затратах
+ConfirmDeleteTrip=Вы точно хотите удалить этот отчёт о затратах?
+ListTripsAndExpenses=Список отчётов о затратах
+ListToApprove=Ждёт утверждения
+ExpensesArea=Поле отчётов о затратах
+SearchATripAndExpense=Поиск отчёта о затратах
 ClassifyRefunded=Classify 'Refunded'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripSalarie=Informations user
-TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
-ConfirmDeleteLine=Are you sure you want to delete this line ?
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
+ExpenseReportWaitingForApproval=Новый отчёт о затратах направлен на утверждение
+ExpenseReportWaitingForApprovalMessage=Новый отчёт отчёт о затратах отправлен и ждёт утверждения. \nОт пользователя %s\nЗа период %s\nНажмите для проверки: %s
+TripId=ID отчёта о затратах
+AnyOtherInThisListCanValidate=Кого уведомлять для подтверждения.
+TripSociete=Информация о компании
+TripSalarie=Информация о пользователе
+TripNDF=Информация о отчёте о затратах
+DeleteLine=Удалить строку из отчёта о затратах
+ConfirmDeleteLine=Вы точно хотите удалить эту строку?
+PDFStandardExpenseReports=Шаблон отчёта о затратах для создания документа в формате PDF
+ExpenseReportLine=Строка отчёта о затратах
 TF_OTHER=Другое
-TF_TRANSPORTATION=Transportation
+TF_TRANSPORTATION=Транспортировка
 TF_LUNCH=Обед
-TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hostel
-TF_TAXI=Taxi
+TF_METRO=Метро
+TF_TRAIN=Поезд
+TF_BUS=Автобус
+TF_CAR=Машина
+TF_PEAGE=Троллейбус
+TF_ESSENCE=Топливо
+TF_HOTEL=Хостел
+TF_TAXI=Такси
 
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
-AucuneNDF=No expense reports found for this criteria
-AucuneLigne=There is no expense report declared yet
-AddLine=Add a line
-AddLineMini=Add
+ErrorDoubleDeclaration=Вы должны задекларировать другой отчёт о затратах в этом временном диапазоне. 
+ListTripsAndExpenses=Список отчётов о затратах
+AucuneNDF=Нет отчётов о затратах по этому критерию
+AucuneLigne=Нет задекларированных отчётов о затратах
+AddLine=Добавить строку
+AddLineMini=Добавить
 
-Date_DEBUT=Period date start
-Date_FIN=Period date end
-ModePaiement=Payment mode
-Note=Note
-Project=Project
+Date_DEBUT=Дата начала периода
+Date_FIN=Дата конца периода
+ModePaiement=Режим оплаты
+Note=Примечание
+Project=Проект
 
-VALIDATOR=User to inform for approbation
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
-REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+VALIDATOR=Уведомить пользователя о опробации
+VALIDOR=Утверждено
+AUTHOR=Записано
+AUTHORPAIEMENT=Оплачено
+REFUSEUR=Отклонено
+CANCEL_USER=Отменено
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=Причина
+MOTIF_CANCEL=Причина
 
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_VALIDE=Validation date
-DateApprove=Approving date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
+DATE_REFUS=Дата отклонения
+DATE_SAVE=Дата проверки
+DATE_VALIDE=Дата проверки
+DateApprove=Дата утверждения
+DATE_CANCEL=Дата отмены
+DATE_PAIEMENT=Дата платежа
 
-Deny=Deny
-TO_PAID=Pay
-BROUILLONNER=Reopen
-SendToValid=Sent to approve
-ModifyInfoGen=Edit
-ValidateAndSubmit=Validate and submit for approval
+Deny=Отменить
+TO_PAID=Оплатить
+BROUILLONNER=Открыть заново
+SendToValid=Отправить запрос на утверждение
+ModifyInfoGen=Редактировать
+ValidateAndSubmit=Проверить и отправить запрос на утверждение
 
-NOT_VALIDATOR=You are not allowed to approve this expense report
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+NOT_VALIDATOR=Вы не можете утвердить этот отчёт о затратах
+NOT_AUTHOR=Вы не автор этого отчёта о затратах. Операция отменена.
 
-RefuseTrip=Deny an expense report
-ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+RefuseTrip=Отклонить отчёт о затратах
+ConfirmRefuseTrip=Вы точно хотите отклонить этот отчёт о затратах?
 
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report ?
+ValideTrip=Одобрить отчёт о затратах
+ConfirmValideTrip=Вы точно хотите одобрить отчёт о затратах?
 
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+PaidTrip=Оплатить отчёт о затратах
+ConfirmPaidTrip=Вы точно хотите изменит статус этого отчёта о затратах на "Оплачен"?
 
-CancelTrip=Cancel an expense report
-ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+CancelTrip=Отменить отчёт о затратах
+ConfirmCancelTrip=Вы точно хотите отменить отчёт о затратах?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+BrouillonnerTrip=Вернуть отчёту о затратах статус "Черновик"
+ConfirmBrouillonnerTrip=Вы точно хотите изменить статус этого отчёта о затратах на "Черновик"?
 
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+SaveTrip=Проверить отчёт о завтратах
+ConfirmSaveTrip=Вы точно хотите проверить данный отчёт о затратах?
 
-Synchro_Compta=NDF <-> Compte
+Synchro_Compta=NDF <-> Учётная запись
 
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
+TripSynch=Синхронизация: Расходы <-> текущий счёт
+TripToSynch=Примечание: оплата должна быть включена в расчёт
+AucuneTripToSynch=Состояние отчёта о затратах не  "Оплачен".
+ViewAccountSynch=Посмотреть аккаунт
 
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
+ConfirmNdfToAccount=Вы уверены, что хотите включить этот отчет о расходах в текущем счете?
+ndfToAccount=Отчет о расходах - Интеграция
 
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
+ConfirmAccountToNdf=Вы уверены, что хотите удалить этот отчет о расходах текущего счета?
+AccountToNdf=Оценка затрат - вывод
 
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
+LINE_NOT_ADDED=Номер строки добавил:
+NO_PROJECT=Ни один проект не выбран.
+NO_DATE=Ни одна дата не выбрана. 
+NO_PRICE=Цена не указана.
 
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
+TripForValid=Подтвердивший
+TripForPaid=Плательщик
+TripPaid=Плательщик
 
-NoTripsToExportCSV=No expense report to export for this period.
+NoTripsToExportCSV=Нет отчёта о затратах за этот период.
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 7824adbfa51..4df93b40a8c 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
-UserCard=Пользователь карточки
-ContactCard=Контакт-карты
-GroupCard=Группа карту
+HRMArea=Область отдела кадров
+UserCard=Карточка пользователя
+ContactCard=Карточка контакта
+GroupCard=Карточка группы
 NoContactCard=Нет контактов между картой
-Permission=Разрешение
-Permissions=Разрешения
+Permission=Права доступа
+Permissions=Права доступа
 EditPassword=Изменить пароль
-SendNewPassword=Отправить новый пароль
-ReinitPassword=Создать новый пароль
+SendNewPassword=Сгенерировать и отправить новый пароль
+ReinitPassword=Сгенерировать новый пароль
 PasswordChangedTo=Пароль изменен на: %s
 SubjectNewPassword=Ваш новый пароль для Dolibarr
-AvailableRights=Доступные разрешения
-OwnedRights=Собственное разрешение
-GroupRights=Группа разрешений
-UserRights=Пользователь разрешений
+AvailableRights=Доступные права доступа
+OwnedRights=Права доступа владельца
+GroupRights=Права доступа группы
+UserRights=Права доступа пользователя
 UserGUISetup=Пользователь Настройка дисплея
 DisableUser=Выключать
-DisableAUser=Отключение пользователя
+DisableAUser=Отключить пользователя
 DeleteUser=Удалить
 DeleteAUser=Удалить пользователя
 DisableGroup=Отключить
@@ -37,15 +37,15 @@ ConfirmSendNewPassword=Вы уверены, что хотите создать 
 NewUser=Новый пользователь
 CreateUser=Создать пользователя
 SearchAGroup=Поиск группы
-SearchAUser=Поиск пользователей
-LoginNotDefined=Логин не определены.
+SearchAUser=Поиск пользователя
+LoginNotDefined=Логин не определен.
 NameNotDefined=Имя не определено.
 ListOfUsers=Список пользователей
 Administrator=Администратор
 SuperAdministrator=Супер Администратор
 SuperAdministratorDesc=Администратор со всеми правами
 AdministratorDesc=Администратора лица
-DefaultRights=По умолчанию разрешения
+DefaultRights=Права доступа по умолчанию
 DefaultRightsDesc=Определить здесь умолчанию разрешения, что автоматически предоставляются новые созданные пользователем.
 DolibarrUsers=Пользователи Dolibarr
 LastName=Имя
@@ -56,7 +56,7 @@ CreateGroup=Создать группу
 RemoveFromGroup=Удалить из группы
 PasswordChangedAndSentTo=Пароль изменен и направил в %s.
 PasswordChangeRequestSent=Запрос на изменение пароля для %s направлено %s.
-MenuUsersAndGroups=И Пользователи Группы
+MenuUsersAndGroups=Пользователи и Группы
 LastGroupsCreated=Последнее %s созданы группы
 LastUsersCreated=Последнее %s пользователей создаются
 ShowGroup=Показать группы
@@ -86,8 +86,8 @@ MyInformations=Мои данные
 ExportDataset_user_1=Dolibarr пользователей и свойства
 DomainUser=Домен пользователя %s
 Reactivate=Возобновить
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=Внутреннего пользователя является пользователем, который является частью вашей компании / Фонд. 
     Внешний пользователь клиента, поставщика или другого. 

     В обоих случаях разрешение определяет права на Dolibarr, а также внешних пользователей могут иметь разные меню менеджера, чем внутреннего пользователя (См. начало - настройки - дисплей)
+CreateInternalUserDesc=Эта форма позволяет вам создать внутреннего пользователя для вашей компании/фонда. Для создания внешнего пользователя (клиент, поставщик) используйте кнопку "Создать пользователя Dolibarr" из карточки контрагента.
+InternalExternalDesc=Внутреннего пользователя является пользователем, который является частью вашей компании / Фонд. 
     Внешний пользователь клиента, поставщика или другого. 

     В обоих случаях разрешение определяет права на Dolibarr, а также внешних пользователей могут иметь разные меню менеджера, чем внутреннего пользователя (См. Главная - Настройки - дисплей)
 PermissionInheritedFromAGroup=Разрешение предоставляется, поскольку унаследовал от одного из пользователей в группы.
 Inherited=Унаследованный
 UserWillBeInternalUser=Созданный пользователь будет внутреннего пользователя (потому что не связаны с определенным третьим лицам)
@@ -113,10 +113,10 @@ YourRole=Ваша роль
 YourQuotaOfUsersIsReached=Квота активных пользователей будет достигнута!
 NbOfUsers=Кол-во пользователей
 DontDowngradeSuperAdmin=Только суперамин может понизить суперамин
-HierarchicalResponsible=Supervisor
+HierarchicalResponsible=Руководитель
 HierarchicView=Иерархический вид
-UseTypeFieldToChange=Use field Type to change
+UseTypeFieldToChange=Использьзуйте поле Тип для изменения
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Использовать OpenID для входа
-WeeklyHours=Weekly hours
+WeeklyHours=Часов в неделю
 ColorUser=Цвет пользователя
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index e8450fccbba..d05d5fffd61 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-StandingOrdersArea=Постоянные заказы области
-CustomersStandingOrdersArea=Клиенты Регламента области
+StandingOrdersArea=Раздел постоянных заказов
+CustomersStandingOrdersArea=Раздел постоянных заказов клиентов
 StandingOrders=Постоянные заказы
 StandingOrder=Постоянные заказы
-NewStandingOrder=Новый постоянный порядок
+NewStandingOrder=Новый постоянный заказ
 StandingOrderToProcess=Для обработки
 StandingOrderProcessed=Обработано
 Withdrawals=Снятие
@@ -14,15 +14,15 @@ WithdrawalReceiptShort=Квитанция
 LastWithdrawalReceipts=Последнее% с выводом квитанции
 WithdrawedBills=Withdrawed счетов-фактур
 WithdrawalsLines=Снятие линии
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+RequestStandingOrderToTreat=Запрос на обработку постоянных заказов
+RequestStandingOrderTreated=Запрос на обработку постоянных заказов выполнен
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
 CustomersStandingOrders=Клиент Регламент
 CustomerStandingOrder=Для постоянных клиентов
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
+NbOfInvoiceToWithdraw=Номер счёта с запросом на снятие
 NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Счет ждет снимать
-AmountToWithdraw=Сумма снять
+InvoiceWaitingWithdraw=Счет ожидает снятия
+AmountToWithdraw=Сумма снятия
 WithdrawsRefused=Отзывает отказала
 NoInvoiceToWithdraw=Нет счета клиента в оплате режиме "отозвать" ждет. Переход на "Вывод 'вкладки на счету карточки сделать запрос.
 ResponsibleUser=Ответственный пользователь
@@ -35,11 +35,11 @@ ThirdPartyBankCode=Третьей стороной банковский код
 ThirdPartyDeskCode=Третий участник стол код
 NoInvoiceCouldBeWithdrawed=Нет счета withdrawed с успехом. Убедитесь в том, что счета-фактуры на компании с действительным запрета.
 ClassCredited=Классифицировать зачисленных
-ClassCreditedConfirm=Вы уверены, что хотите классифицировать этот вывод получения как кредитуются на ваш счет в банке?
+ClassCreditedConfirm=Вы уверены, что хотите классифицировать это изъятие   как кредит на вашем счету в банке?
 TransData=Дата передачи
 TransMetod=Метод передачи
 Send=Отправить
-Lines=Линии
+Lines=Строки
 StandingOrderReject=Выпуск отклонить
 WithdrawalRefused=Выплаты Refuseds
 WithdrawalRefusedConfirm=Вы уверены, что вы хотите ввести снятия отказа общества
@@ -47,7 +47,7 @@ RefusedData=Дата отказа
 RefusedReason=Причина для отказа
 RefusedInvoicing=Счета отказ
 NoInvoiceRefused=Не заряжайте отказ
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Счёт отклонён (отказ платежа клиентом)
 Status=Статус
 StatusUnknown=Неизвестный
 StatusWaiting=Ожидание
@@ -79,11 +79,11 @@ CreditDate=Кредит на
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Показать Вывод
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Однако, если счет-фактура имеет по крайней мере один вывод оплаты еще не обработан, то он не будет установлен, как оплачиваются, чтобы управлять снятие ранее.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
-WithdrawalFile=Withdrawal file
-SetToStatusSent=Set to status "File Sent"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
-StatisticsByLineStatus=Statistics by status of lines
+DoStandingOrdersBeforePayments=Эта вкладка позволяет сделать запрос на постоянный заказ. Используйте меню Банк-Постоянные заказы для управления постоянными заказами. Когда постоянный заказ закрыт, платёж по счёту будет автоматически записан, и счёт будет закрыть, если нет уведомления о платеже.
+WithdrawalFile=Файл изъятия средств
+SetToStatusSent=Установить статус "Файл отправлен"
+ThisWillAlsoAddPaymentOnInvoice=Это также применит оплату по счетам и установит статус счетов на "Оплачен"
+StatisticsByLineStatus=Статистика статуса по строкам
 
 ### Notifications
 InfoCreditSubject=Оплата постоянных %s порядке банк
diff --git a/htdocs/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
index b312c499df5..97816ff6d9d 100644
--- a/htdocs/langs/ru_RU/workflow.lang
+++ b/htdocs/langs/ru_RU/workflow.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - admin
 WorkflowSetup=Установка модуля Рабочих процессов
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
+WorkflowDesc=Этот модуль спроектирован для изменения поведения автоматических действий в приложении. По умолчанию, рабочий процесс открыт (вы можете делать вещи в том порядке, в каком желаете). Вы можете включить режим автоматических действий, в которых вы заинтересованы. 
 ThereIsNoWorkflowToModify=Существует не рабочий процесс можно изменить для модуля активации.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Создать заказ клиента автоматически после коммерческое предложение подписано
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Создать счет клиента автоматически после коммерческое предложение подписано
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Создать счет клиента автоматически после контракт проверяется
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Создать счет клиента автоматически после заказа клиента закрыт
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Классифицировать связанные коммерческие предложения оплаченными, когда заказ клиента обозначен, как оплаченный
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Классифицировать связанные заказы клиента оплаченными, когда счёт клиента оплачен. 
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Классифицировать связанные заказы клиента оплаченными, когда счёт клиента подтверждён.
diff --git a/htdocs/langs/ru_UA/ecm.lang b/htdocs/langs/ru_UA/ecm.lang
index 48756faaa0b..cb1cb0b6d7c 100644
--- a/htdocs/langs/ru_UA/ecm.lang
+++ b/htdocs/langs/ru_UA/ecm.lang
@@ -1,14 +1,11 @@
 # Dolibarr language file - Source file is en_US - ecm
 MenuECM=Документация
-DocsOrders=Документы заказов
-DocsInvoices=Документы счетов
 ECMNbOfDocs=Кол-во документов в каталоге
 ECMNbOfDocsSmall=Кол-во док.
 ECMSectionManual=Руководство каталог
 ECMSectionsManual=Руководство дерево
 ECMSectionsAuto=Автоматическая дерево
 ECMNbOfSubDir=Количество подкаталогах
-ECMCreationUser=Создатель
 ECMAreaDesc2=* Автоматическое каталоги заполняется автоматически при добавлении документов с карты элемента. 
     * Руководство каталоги могут быть использованы для сохранения документов, не связанных с определенного элемента.
 ECMSectionWasRemoved=Каталог %s была удалена.
 ECMDocumentsSection=Документ каталог
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 93790b6a9c3..8397120c94a 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Oddeľovač
 ExtrafieldCheckBox=Zaškrtávacie políčko
 ExtrafieldRadio=Prepínač
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Upozornenie
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Dary
@@ -508,14 +511,14 @@ Module1400Name=Účtovníctvo
 Module1400Desc=Vedenie účtovníctva (dvojité strany)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategórie
-Module1780Desc=Category management (produkty, dodávatelia a odberatelia)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Nechajte upraviť niektoré textové pole pomocou pokročilého editora
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Plánované správu úloh
+Module2300Desc=Scheduled job management
 Module2400Name=Program rokovania
 Module2400Desc=Udalosti / úlohy a agendy vedenie
 Module2500Name=Elektronický Redakčný
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Prečítajte služby
 Permission532=Vytvoriť / upraviť služby
 Permission534=Odstrániť služby
@@ -746,6 +754,7 @@ Permission1185=Schváliť dodávateľských objednávok
 Permission1186=Objednávky Objednať dodávateľ
 Permission1187=Potvrdenie prijatia dodávateľských objednávok
 Permission1188=Odstrániť dodávateľských objednávok
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Získajte výsledok exportu
 Permission1202=Vytvoriť / Upraviť vývoz
 Permission1231=Prečítajte si dodávateľskej faktúry
@@ -758,10 +767,10 @@ Permission1237=Export dodávateľské objednávky a informácie o nich
 Permission1251=Spustiť Hmotné dovozy externých dát do databázy (načítanie dát)
 Permission1321=Export zákazníkov faktúry, atribúty a platby
 Permission1421=Export objednávok zákazníkov a atribúty
-Permission23001 = Prečítajte si naplánovaná úloha
-Permission23002 = Vytvoriť / aktualizovať naplánovanú úlohu
-Permission23003 = Odstrániť naplánovaná úloha
-Permission23004 = Vykonať naplánované úlohy,
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Prečítajte akcie (udalosti alebo úlohy) ktoré súvisia s jeho účet
 Permission2402=Vytvoriť / upraviť akcie (udalosti alebo úlohy) ktoré súvisia s jeho účet
 Permission2403=Odstrániť akcie (udalosti alebo úlohy) ktoré súvisia s jeho účet
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Vrátiť evidencia kód postavený podľa: 
     %s nas
 ModuleCompanyCodePanicum=Späť prázdny evidencia kód.
 ModuleCompanyCodeDigitaria=Účtovníctvo kód závisí na kóde tretích strán. Kód sa skladá zo znaku "C" na prvom mieste nasleduje prvých 5 znakov kódu tretích strán.
 UseNotifications=Použitie oznámenia
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Dokumenty šablóny
 DocumentModelOdt=Generovanie dokumentov z OpenDocuments šablón (. ODT alebo ODS. Súbory OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vodoznak na návrhu dokumentu
@@ -1557,6 +1566,7 @@ SuppliersSetup=Dodávateľ modul nastavenia
 SuppliersCommandModel=Kompletná šablóna sa s dodávateľmi poriadku (logo. ..)
 SuppliersInvoiceModel=Kompletná šablóna dodávateľskej faktúry (logo. ..)
 SuppliersInvoiceNumberingModel=Dodávateľských faktúr číslovanie modelov
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modul nastavenia
 PathToGeoIPMaxmindCountryDataFile=Cesta k súboru obsahujúci MaxMind IP pre krajiny preklade. 
     Príklady: 
     / Usr / local / share / GeoIP / GeoIP.dat 
     / Usr / share / GeoIP / GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index 36445b83775..9504ee53600 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktúra %s overená
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Faktúra %s vrátiť do stavu návrhu
 InvoiceDeleteDolibarr=Faktúra %s zmazaná
-OrderValidatedInDolibarr= Objednať %s overená
+OrderValidatedInDolibarr=Objednať %s overená
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Objednať %s zrušený
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Objednať %s schválený
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Objednať %s vrátiť do stavu návrhu
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Vytvoriť udalosť
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index cbd81b2852b..955cfee9f0f 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Platby neurobili
 PaymentsBackAlreadyDone=Platby späť neurobili
 PaymentRule=Platba pravidlo
 PaymentMode=Typ platby
-PaymentConditions=Termín vyplatenia
-PaymentConditionsShort=Termín vyplatenia
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Suma platby
 ValidatePayment=Overenie platby
 PaymentHigherThanReminderToPay=Platobné vyššia než upomienke na zaplatenie
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Celkom dva nové zľavy musí byť rovný p
 ConfirmRemoveDiscount=Ste si istí, že chcete odstrániť túto zľavu?
 RelatedBill=Súvisiace faktúra
 RelatedBills=Súvisiace faktúry
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index 36369689d28..699d1137662 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategórie
-Categories=Kategórie
-Rubrique=Kategórie
-Rubriques=Kategórie
-categories=kategórie
-TheCategorie=Kategórie
-NoCategoryYet=Žiadne kategórii tohto typu od
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=V
 AddIn=Pridajte
 modify=upraviť
 Classify=Klasifikovať
-CategoriesArea=Kategórie plocha
-ProductsCategoriesArea=Produkty / služby kategórie oblasti
-SuppliersCategoriesArea=Dodávatelia kategórie oblastí
-CustomersCategoriesArea=Zákazníci kategórie oblastí
-ThirdPartyCategoriesArea=Tretie strany Kategórie plocha
-MembersCategoriesArea=Členovia kategórie oblastí
-ContactsCategoriesArea=Kontakty Kategórie plocha
-MainCats=Hlavné kategórie
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Podkategórie
 CatStatistics=Štatistika
-CatList=Zoznam kategórií
-AllCats=Všetky kategórie
-ViewCat=Zobraziť kategóriu
-NewCat=Pridať kategóriu
-NewCategory=Nová kategória
-ModifCat=Zmeniť kategóriu
-CatCreated=Kategórie vytvoril
-CreateCat=Vytvorenie kategórie
-CreateThisCat=Vytvorenie tejto kategórie
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Overenie poľa
 NoSubCat=Podkategórie.
 SubCatOf=Podkategórie
-FoundCats=Nájdené kategórie
-FoundCatsForName=Kategórie nájdených pre výraz názve:
-FoundSubCatsIn=Podkategórie nájdené v kategórii
-ErrSameCatSelected=Vybrali ste rovnakej kategórie niekoľkokrát
-ErrForgotCat=Zabudli ste si vybrať kategóriu
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Zabudli ste informovať polia
 ErrCatAlreadyExists=Tento názov sa už používa
-AddProductToCat=Pridať tento produkt do kategórie?
-ImpossibleAddCat=Nemožno pridať kategóriu
-ImpossibleAssociateCategory=Nemožno priradiť kategóriu
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s bolo úspešne pridané.
-ObjectAlreadyLinkedToCategory=Element je už pripojený do tejto kategórie.
-CategorySuccessfullyCreated=Táto kategória %s bola pridaná s úspechom.
-ProductIsInCategories=Produktu / služby je vlastníkom nasledujúcich kategóriách
-SupplierIsInCategories=Tretia strana vlastní nasledovanie dodávateľov kategórií
-CompanyIsInCustomersCategories=Táto tretia strana vlastní pre nasledujúce zákazníkov / vyhliadky kategórií
-CompanyIsInSuppliersCategories=Táto tretia strana vlastní nasledovanie dodávateľov kategórií
-MemberIsInCategories=Tento člen je vlastníkom, aby títo členovia kategórií
-ContactIsInCategories=Tento kontakt je vlastníkom do nasledujúcich kategórií kontakty
-ProductHasNoCategory=Tento produkt / služba nie je v žiadnej kategórii
-SupplierHasNoCategory=Tento dodávateľ nie je v žiadnom kategóriách
-CompanyHasNoCategory=Táto spoločnosť nie je v žiadnom kategóriách
-MemberHasNoCategory=Tento člen nie je v žiadnom kategóriách
-ContactHasNoCategory=Tento kontakt nie je v žiadnom kategóriách
-ClassifyInCategory=Zaradenie do kategórie
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Nikto
-NotCategorized=Bez kategórii
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Táto kategória už existuje s týmto čj
 ReturnInProduct=Späť na produkt / službu kartu
 ReturnInSupplier=Späť na dodávateľa karty
@@ -66,22 +64,22 @@ ReturnInCompany=Späť na zákazníka / Vyhliadka karty
 ContentsVisibleByAll=Obsah bude vidieť všetci
 ContentsVisibleByAllShort=Obsah viditeľné všetkými
 ContentsNotVisibleByAllShort=Obsah nie je vidieť všetci
-CategoriesTree=Categories tree
-DeleteCategory=Odstrániť kategóriu
-ConfirmDeleteCategory=Ste si istí, že chcete zmazať túto kategóriu?
-RemoveFromCategory=Odstráňte spojenie s kategóriách
-RemoveFromCategoryConfirm=Ste si istí, že chcete odstrániť väzbu medzi transakcie a kategórie?
-NoCategoriesDefined=Žiadne definované kategórie
-SuppliersCategoryShort=Dodávatelia kategórie
-CustomersCategoryShort=Zákazníci kategórie
-ProductsCategoryShort=Kategórie produktov
-MembersCategoryShort=Členovia kategórie
-SuppliersCategoriesShort=Dodávatelia kategórie
-CustomersCategoriesShort=Zákazníci kategórie
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prospech. kategórie
-ProductsCategoriesShort=Kategórie produktov
-MembersCategoriesShort=Členovia kategórie
-ContactCategoriesShort=Kontakty kategórie
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Táto kategória neobsahuje žiadny produkt.
 ThisCategoryHasNoSupplier=Táto kategória neobsahuje žiadne dodávateľa.
 ThisCategoryHasNoCustomer=Táto kategória neobsahuje žiadne zákazníka.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Táto kategória neobsahuje žiadny kontakt.
 AssignedToCustomer=Pripísané k zákazníkovi
 AssignedToTheCustomer=Priradené zákazníkovi
 InternalCategory=Vnútorné kategórie
-CategoryContents=Kategórie obsah
-CategId=Kategórie id
-CatSupList=Zoznam dodávateľských kategórií
-CatCusList=Zoznam zákazníkov / vyhliadky kategórií
-CatProdList=Zoznam kategórií produktov
-CatMemberList=Zoznam členov kategórií
-CatContactList=Zoznam kontaktných kategórií a kontakt
-CatSupLinks=Väzby medzi dodávateľmi a kategórií
-CatCusLinks=Väzby medzi zákazníkmi / vyhliadky a kategórií
-CatProdLinks=Väzby medzi produktov / služieb a kategórií
-CatMemberLinks=Väzby medzi členmi a kategórií
-DeleteFromCat=Odobrať z kategórie
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index 5161517c219..4217c1002b6 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Posledný beh výstup
 CronLastResult=Posledný kód výsledku
 CronListOfCronJobs=Zoznam naplánovaných úloh
 CronCommand=Príkaz
-CronList=Jobs list
-CronDelete= Odstrániť cron
-CronConfirmDelete= Ste si istí, že chcete zmazať tento cron?
-CronExecute=Začatie práce
-CronConfirmExecute= Naozaj chcete vykonať túto prácu teraz
-CronInfo= Práca umožňujú vykonávať úlohy, ktoré boli plánované
-CronWaitingJobs=Wainting pracovných miest
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Práca
-CronNone= Nikto
+CronNone=Nikto
 CronDtStart=Dátum začatia
 CronDtEnd=Dátum ukončenia
 CronDtNextLaunch=Ďalšie prevedenie
@@ -75,6 +75,7 @@ CronObjectHelp=Názov objektu načítať. 
     Napr načítať metódy objektu v
 CronMethodHelp=Objekt spôsob štartu. 
     Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, hodnota metódy je fecth
 CronArgsHelp=Metóda argumenty. 
     Napr načítať metódy objektu výrobku Dolibarr / htdocs / produktu / trieda / product.class.php, môže byť hodnota paramters byť 0, ProductRef
 CronCommandHelp=Systém príkazového riadka spustiť.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informácie
 # Common
diff --git a/htdocs/langs/sk_SK/donations.lang b/htdocs/langs/sk_SK/donations.lang
index 4c7165f68d3..955c3e3caad 100644
--- a/htdocs/langs/sk_SK/donations.lang
+++ b/htdocs/langs/sk_SK/donations.lang
@@ -6,6 +6,8 @@ Donor=Darca
 Donors=Darcovia
 AddDonation=Create a donation
 NewDonation=Nový darcovstvo
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Zobraziť dar
 DonationPromise=Darčekové sľub
 PromisesNotValid=Nevaliduje sľuby
@@ -21,6 +23,8 @@ DonationStatusPaid=Dotácie prijaté
 DonationStatusPromiseNotValidatedShort=Návrh
 DonationStatusPromiseValidatedShort=Overené
 DonationStatusPaidShort=Prijaté
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Overiť sľub
 DonationReceipt=Darovanie príjem
 BuildDonationReceipt=Build prijatie
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index dc5032cc33a..5a2bb06cb02 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Povinné parametre sú doteraz stanovené
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index fa0c8ce1506..4b82f3d6326 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Vypísať všetky e-maily odosielané oznámenia
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 12ea65a49b3..4efea27615a 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -352,6 +352,7 @@ Status=Postavenie
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref
+ExternalRef=Ref. extern
 RefSupplier=Ref dodávateľ
 RefPayment=Ref platba
 CommercialProposalsShort=Komerčné návrhy
@@ -394,8 +395,8 @@ Available=Dostupný
 NotYetAvailable=Zatiaľ nie je k dispozícii
 NotAvailable=Nie je k dispozícii
 Popularity=Popularita
-Categories=Kategórie
-Category=Kategórie
+Categories=Tags/categories
+Category=Tag/category
 By=Podľa
 From=Z
 to=na
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Pondelok
 Tuesday=Utorok
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index baa18258b8c..fb9ac7fdd5e 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Loď produkt
 Discount=Zľava
 CreateOrder=Vytvoriť objednávku
 RefuseOrder=Odmietnuť objednávku
-ApproveOrder=Prijať objednávku
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Potvrdenie objednávky
 UnvalidateOrder=Unvalidate objednávku
 DeleteOrder=Zmazať objednávku
@@ -102,6 +103,8 @@ ClassifyBilled=Klasifikovať účtované
 ComptaCard=Účtovníctvo karty
 DraftOrders=Návrh uznesenia
 RelatedOrders=Súvisiace objednávky
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=V procese objednávky
 RefOrder=Ref objednávka
 RefCustomerOrder=Ref objednávka zákazníka
@@ -118,6 +121,7 @@ PaymentOrderRef=Platba objednávky %s
 CloneOrder=Clone, aby
 ConfirmCloneOrder=Ste si istí, že chcete kopírovať túto objednávku %s?
 DispatchSupplierOrder=Príjem %s dodávateľských objednávok
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Zástupca nasledujúce-up, aby zákazník
 TypeContact_commande_internal_SHIPPING=Zástupca nasledujúce-up doprava
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index f89916a11c2..ef3ca5bf087 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervencie overená
 Notify_FICHINTER_SENTBYMAIL=Intervencie poštou
 Notify_BILL_VALIDATE=Zákazník faktúra overená
 Notify_BILL_UNVALIDATE=Zákazník faktúra unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Dodávateľ aby schválila
 Notify_ORDER_SUPPLIER_REFUSE=Dodávateľ aby odmietol
 Notify_ORDER_VALIDATE=Zákazníka overená
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Komerčné návrh zaslať poštou
 Notify_BILL_PAYED=Zákazník platí faktúry
 Notify_BILL_CANCEL=Zákazník faktúra zrušená
 Notify_BILL_SENTBYMAIL=Zákazník faktúra zaslaná poštou
-Notify_ORDER_SUPPLIER_VALIDATE=Dodávateľ validované, aby
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Dodávateľ odoslaná poštou
 Notify_BILL_SUPPLIER_VALIDATE=Dodávateľ faktúru overená
 Notify_BILL_SUPPLIER_PAYED=Dodávateľ faktúru platí
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Počet pripojených súborov / dokumentov
 TotalSizeOfAttachedFiles=Celková veľkosť pripojených súborov / dokumentov
 MaxSize=Maximálny rozmer
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Faktúra %s bol overený.
 EMailTextProposalValidated=Návrh %s bol overený.
 EMailTextOrderValidated=Aby %s bol overený.
 EMailTextOrderApproved=Aby %s bol schválený.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Aby %s bol schválený %s.
 EMailTextOrderRefused=Aby %s bola zamietnutá.
 EMailTextOrderRefusedBy=Aby %s bolo odmietnuté podľa %s.
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 667875f4e17..a18d6578662 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 8963a13c602..084f8e57941 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Zoznam dodávateľských faktúr súvisiac
 ListContractAssociatedProject=Zoznam zákaziek súvisiacich s projektom
 ListFichinterAssociatedProject=Zoznam výkonov spojených s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Zoznam udalostí spojených s projektom
 ActivityOnProjectThisWeek=Aktivita na projekte tento týždeň
 ActivityOnProjectThisMonth=Aktivita na projekte tento mesiac
@@ -130,13 +131,15 @@ AddElement=Odkaz na elementu
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=Kompletné projektu model zostavy (logo. ..)
-PlannedWorkload = Plánované zaťaženie
-WorkloadOccupation= Pracovná záťaž pretvárka
+PlannedWorkload=Plánované zaťaženie
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Odkazujúce objekty
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index 1d57822a222..96cb8b60d61 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref náklad
 Sending=Náklad
 Sendings=Zásielky
+AllSendings=All Shipments
 Shipment=Náklad
 Shipments=Zásielky
 ShowSending=Show Sending
diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
index 8917cbe8b4e..cbef03935a5 100644
--- a/htdocs/langs/sk_SK/suppliers.lang
+++ b/htdocs/langs/sk_SK/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index e214389ecea..20e5c2ece1a 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Ločilo
 ExtrafieldCheckBox=Potrditveno polje
 ExtrafieldRadio=Radijski gumb
 ExtrafieldCheckBoxFromList= Potrditveno polje iz tabele
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Seznam parametrov mora biti kot ključ,vrednost

     na primer : 
    1,vrednost1
    2,vrednost2
    3,vrednost3
    ...

    Če želite imeti seznam odvisen od drugega :
    1,vrednost1|parent_list_code:parent_key
    2,vrednost2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Seznam parametrov mora biti kot ključ,vrednost

     na primer : 
    1,vrednost1
    2,vrednost2
    3,vrednost3
    ...
 ExtrafieldParamHelpradio=Seznam parametrov mora biti kot ključ,vrednost

     na primer : 
    1,vrednost1
    2,vrednost2
    3,vrednost3
    ...
@@ -494,6 +495,8 @@ Module500Name=Posebni stroški (davki, socialni prispevki, dividende)
 Module500Desc=Upravljanje posebnih stroškov, kot so davki, socialni prispevki, dividende in plače
 Module510Name=Plače
 Module510Desc=Upravljanje plač in plačil zaposlenim
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Obvestila
 Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih (nastavitev je določena za vsakega partnerja)
 Module700Name=Donacije
@@ -508,14 +511,14 @@ Module1400Name=Računovodstvo
 Module1400Desc=Upravljanje računovodstva (dvostavno)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorije
-Module1780Desc=Upravljanje kategorij (proizvodi, dobavitelji in kupci)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Fck urejevalnik
 Module2000Desc=WYSIWYG urejevalnik
 Module2200Name=Dinamične cene
 Module2200Desc=Omogoči uporabo matematičnih formul za izračun cen
 Module2300Name=Periodično opravilo
-Module2300Desc=Načrtovano upravljanje nalog
+Module2300Desc=Scheduled job management
 Module2400Name=Dnevni red
 Module2400Desc=Upravljanje aktivnosti/nalog in dnevnih redov
 Module2500Name=Upravljanje elektronskih vsebin
@@ -714,6 +717,11 @@ Permission510=Branje plač
 Permission512=Ustvari/spremeni plače
 Permission514=Izbris plač
 Permission517=Izvoz plač
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Branje storitev
 Permission532=Kreiranje/spreminjanje storitev
 Permission534=Brisanje storitev
@@ -746,6 +754,7 @@ Permission1185=Odobritev naročil pri dobaviteljih
 Permission1186=Naročanje naročil pri dobaviteljih
 Permission1187=Prevzemanje naročil pri dobaviteljih
 Permission1188=Zaključevanje naročil pri dobaviteljih
+Permission1190=Approve (second approval) supplier orders
 Permission1201=pregled rezultatov izvoza
 Permission1202=Kreiranje/spreminjanje izvoza
 Permission1231=Branje računov dobavitelja
@@ -758,10 +767,10 @@ Permission1237=Izvoz naročil pri dobavitelju in podrobnosti
 Permission1251=Izvajanje masovnega izvoza zunanjih podatkov v bazo podatkov (nalaganje podatkov)
 Permission1321=Izvoz računov za kupce, atributov in plačil
 Permission1421=Izvoz naročil kupcev in atributov
-Permission23001 = Preberi načrtovano nalogo
-Permission23002 = Ustvari/posodobi načrtovano nalogo
-Permission23003 = Izbriši načrtovano nalogo
-Permission23004 = Izvedi načrtovano nalogo
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Branje aktivnosti (dogodki ali naloge) povezanih s tem uporabnikom
 Permission2402=Kreiranje/spreminjanje aktivnosti (dogodki ali naloge) povezanih s tem uporabnikom
 Permission2403=Brisanje aktivnosti (dogodki ali naloge) povezanih s tem uporabnikom
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Predlaga računovodsko kodo, sestavljeno iz "401" in k
 ModuleCompanyCodePanicum=Predlaga prazno računovodsko kodo.
 ModuleCompanyCodeDigitaria=Računovodska koda je odvisna od kode partnerja. Koda je sestavljena iz črke "C" prvih 5 znakov kode partnerja.
 UseNotifications=Uporaba sporočil
-NotificationsDesc=Funkcija sporočil po E-pošti omogoča tiho pošiljanje avtomatskih e-mailov o nekaterih Dolibarr dogodkih. Ciljo obvestil so lahko definirani kot:
    * kontakti pri partnerjih (kupcih ali dobaviteljih), en partner naenkrat.
    * ali z nastavitvijo globalnega ciljnega email naslova na strani za nastavitev modula.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Predloge dokumentov
 DocumentModelOdt=Ustvari dokumente iz predlog OpenDocuments (.ODT ali .ODS datoteke v programih OpenOffice, KOffice, TextEdit ,...)
 WatermarkOnDraft=Vodni žig na osnutku dokumenta
@@ -1557,6 +1566,7 @@ SuppliersSetup=Nastavitev modula za dobavitelje
 SuppliersCommandModel=Celotna predloga naročila dobavitelja (logo...)
 SuppliersInvoiceModel=Celotna predloga računa dobavitelja (logo...)
 SuppliersInvoiceNumberingModel=Modeli številčenja računov dobaviteljev
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Nastavitev modula GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Pot do datoteke, ki vsebuje Maxmind ip za prevode po državah.
    Primer:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
index 56f78042248..fb6ebe53903 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Potrjen račun %s
 InvoiceValidatedInDolibarrFromPos=Račun %s je potrjen preko POS
 InvoiceBackToDraftInDolibarr=Račun %s se vrača v status osnutka
 InvoiceDeleteDolibarr=Račun %s izbrisan
-OrderValidatedInDolibarr= Potrjeno naročilo %s
+OrderValidatedInDolibarr=Potrjeno naročilo %s
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Naročilo %s odpovedano
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Naročilo %s odobreno
 OrderRefusedInDolibarr=Naročilo %s zavrnjeno
 OrderBackToDraftInDolibarr=Naročilo %s se vrača v status osnutka
@@ -91,3 +94,5 @@ WorkingTimeRange=Delovni čas
 WorkingDaysRange=Delovni dnevi
 AddEvent=Ustvari dogodek
 MyAvailability=Moja dostopnost
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 7f5af4fc0d5..f9a76966115 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Izvršena plačila
 PaymentsBackAlreadyDone=Vrnitev plačila že izvršena
 PaymentRule=Pravilo plačila
 PaymentMode=Način plačila
-PaymentConditions=Rok plačila
-PaymentConditionsShort=Rok plačila
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Znesek plačila
 ValidatePayment=Potrdi plačilo
 PaymentHigherThanReminderToPay=Plačilo višje od opomina
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Vsota obeh novih popustov mora biti enaka o
 ConfirmRemoveDiscount=Ali zares želite odstraniti ta popust ?
 RelatedBill=Podobni račun
 RelatedBills=Povezani računi
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Zadnji povezan račun
 WarningBillExist=Pozor, obstaja že en ali več računov
 
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 53f17b73fa9..3da509d2dd8 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategorija
-Categories=Kategorije
-Rubrique=Rubrika
-Rubriques=Rubrike
-categories=kategorije
-TheCategorie=Kategorija
-NoCategoryYet=Ni kreirana nobena kategorija te vrste
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=V
 AddIn=Dodaj v
 modify=spremeni
 Classify=Razvrsti
-CategoriesArea=Področje kategorij
-ProductsCategoriesArea=Področje kategorij proizvodov/storitev
-SuppliersCategoriesArea=Področje kategorij dobaviteljev
-CustomersCategoriesArea=Področje kategorij kupcev
-ThirdPartyCategoriesArea=Področje kategorij partnerjev
-MembersCategoriesArea=Področje kategorij članov
-ContactsCategoriesArea=Področje kategorij kontaktov
-MainCats=Glavne kategorije
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Podkategorije
 CatStatistics=Statistika
-CatList=Seznam kategorij
-AllCats=Vse kategorije
-ViewCat=Glej kategorijo
-NewCat=Dodaj kategorijo
-NewCategory=Nova kategorija
-ModifCat=Spremeni kategorijo
-CatCreated=Kreirana kategorija
-CreateCat=Kreiraj kategorijo
-CreateThisCat=Kreiraj to kategorijo
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Potrdi polja
 NoSubCat=Ni podkategorije.
 SubCatOf=Podkategorija
-FoundCats=Najdi kategorije
-FoundCatsForName=Najdena kategorija za ime :
-FoundSubCatsIn=Najdena podkategorija v kategoriji
-ErrSameCatSelected=Večkrat ste izbrali enako kategorijo
-ErrForgotCat=Pozabili ste izbrati kategorijo
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Pozabili ste izbrati polje
 ErrCatAlreadyExists=To ime je že uporabljeno
-AddProductToCat=Želite dodati ta proizvod v kategorijo?
-ImpossibleAddCat=Ni možno dodati kategorije
-ImpossibleAssociateCategory=Ni možno vezati kategorije na
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s je bil uspešno dodan.
-ObjectAlreadyLinkedToCategory=Element je že povezan na to kategorijo.
-CategorySuccessfullyCreated=Ta kategorija %s je bila uspešno dodana.
-ProductIsInCategories=Proizvod/storitev pripada naslednji kategoriji
-SupplierIsInCategories=Partner pripada naslednjim kategorijam dobaviteljev
-CompanyIsInCustomersCategories=Ta partner pripada naslednjim kategorijam kupcev/možnih strank
-CompanyIsInSuppliersCategories=Ta partner pripada naslednjim kategorijam dobaviteljev
-MemberIsInCategories=Ta član pripada naslednjim kategorijam
-ContactIsInCategories=Ta kontakt pripada naslednjim kategorijam kontaktov
-ProductHasNoCategory=Ta proizvod/storitev ni vključen v nobeno kategorijo
-SupplierHasNoCategory=Ta dobavitelj ni vključen v nobeno kategorijo
-CompanyHasNoCategory=To podjetje ni vključeno v nobeno kategorijo
-MemberHasNoCategory=Ta član ni v nobeni kategoriji
-ContactHasNoCategory=Ta kontakt ni v nobeni kategoriji
-ClassifyInCategory=Razvrsti v kategorijo
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Nobena
-NotCategorized=Brez kategorije
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Kategorija s to referenco že obstaja
 ReturnInProduct=Nazaj na kartico proizvodov/storitev
 ReturnInSupplier=Nazaj na kartico dobaviteljev
@@ -66,22 +64,22 @@ ReturnInCompany=Nazaj na kartico kupcev/možnih strank
 ContentsVisibleByAll=Vsebina bo vidna vsem
 ContentsVisibleByAllShort=Vsebina vidna vsem
 ContentsNotVisibleByAllShort=Vsebina ni vidna vsem
-CategoriesTree=Drevesna struktura kategorij
-DeleteCategory=Izbriši kategorijo
-ConfirmDeleteCategory=Ali zares želite izbrisati to kategorijo?
-RemoveFromCategory=Odstranite povezavo s kategorijo
-RemoveFromCategoryConfirm=Ali zares želite odstraniti povezavo med transakcijo in kategorijo?
-NoCategoriesDefined=Ni izbrana kategorija
-SuppliersCategoryShort=Kategorija dobaviteljev
-CustomersCategoryShort=Kategorija kupcev
-ProductsCategoryShort=Kategorija proizvodov
-MembersCategoryShort=Kategorija članov
-SuppliersCategoriesShort=Kategorije dobaviteljev
-CustomersCategoriesShort=Kategorije kupcev
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Kategorije kupcev/možnih strank
-ProductsCategoriesShort=Kategorije proizvodov
-MembersCategoriesShort=Kategorije članov
-ContactCategoriesShort=Kategorije kontaktov
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Ta kategorija ne vsebuje nobenega proizvoda.
 ThisCategoryHasNoSupplier=Ta kategorija ne vsebuje nobenega proizvoda.
 ThisCategoryHasNoCustomer=Ta kategorija ne vsebuje nobenega kupca.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Ta kategorija ne vsebuje nobenega kontakta.
 AssignedToCustomer=Dodeljeno kupcu
 AssignedToTheCustomer=Dodeljeno kupcu
 InternalCategory=Interna kategorija
-CategoryContents=Vsebina kategorije
-CategId=ID kategorije
-CatSupList=Seznam kategorij dobaviteljev
-CatCusList=Seznam kategorij kupcev/možnih strank
-CatProdList=Seznam kategorij proizvodov
-CatMemberList=Seznam kategorij članov
-CatContactList=Seznam kategorij kontaktov in kontaktov
-CatSupLinks=Povezave med dobavitelji in kategorijami
-CatCusLinks=Povezave med kupci/možnimi strankami in kategorijami
-CatProdLinks=Povezave med proizvodi/storitvami in kategorijami
-CatMemberLinks=Povezave med člani in kategorijami
-DeleteFromCat=Odstrani iz kategorije
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Izbriši sliko
 ConfirmDeletePicture=Potrdi izbris slike?
 ExtraFieldsCategories=Koplementarni atributi
-CategoriesSetup=Nastavitve kategorij
-CategorieRecursiv=Avtomatsko poveži z nadrejeno kategorijo
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Če je aktivirano, bo proizvod po dodajanju v podkategorijo povezan tudi z nadrejeno kategorijo
 AddProductServiceIntoCategory=Dodaj sledeči produkt/storitev
-ShowCategory=Prikaži kategorijo
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index a6e87be5cfe..e33e79c5442 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Ukaz
-CronList=Seznam nalog
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Zaženi nalogo
-CronConfirmExecute= Si prepričan prekiniti to nalogo sedaj
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Dela na čakanju
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Naloga
-CronNone= Nič
+CronNone=Nič
 CronDtStart=Začetni datum
 CronDtEnd=Končni datum
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Informacija
 # Common
diff --git a/htdocs/langs/sl_SI/donations.lang b/htdocs/langs/sl_SI/donations.lang
index b906a96ec9f..f032b3f8706 100644
--- a/htdocs/langs/sl_SI/donations.lang
+++ b/htdocs/langs/sl_SI/donations.lang
@@ -6,6 +6,8 @@ Donor=Donator
 Donors=Donatorji
 AddDonation=Ustvari donacijo
 NewDonation=Nova donacija
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Prikaži donacijo
 DonationPromise=Obljuba darila
 PromisesNotValid=Nepotrjene obljube
@@ -21,6 +23,8 @@ DonationStatusPaid=Prejeta donacija
 DonationStatusPromiseNotValidatedShort=Osnutek
 DonationStatusPromiseValidatedShort=Potrjena
 DonationStatusPaidShort=Prejeta
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Potrjena obljuba
 DonationReceipt=Prejem donacije
 BuildDonationReceipt=Izdelava potrdila
@@ -36,3 +40,4 @@ FrenchOptions=Opcije za Francijo
 DONATION_ART200=Prikaži člen 200 iz CGI, če se vas tiče
 DONATION_ART238=Prikaži člen 238 iz CGI, če se vas tiče
 DONATION_ART885=Prikaži člen 885 iz CGI, če se vas tiče
+DonationPayment=Donation payment
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 8417f316e28..8f449cc1891 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index e4700cda0c7..22bd3d694f3 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Seznam vseh poslanih e-poštnih obvestil
 MailSendSetupIs=Konfiguracij pošiljanja e-pošte je bila nastavljena na '%s'. Ta način ne more biti uporabljen za masovno pošiljanje.
 MailSendSetupIs2=Najprej morate kot administrator preko menija %sDomov - Nastavitve - E-pošta%s spremeniti parameter '%s' za uporabo načina '%s'. V tem načinu lahko odprete nastavitve SMTP strežnika, ki vam jih omogoča vaš spletni oprerater in uporabite masovno pošiljanje.
 MailSendSetupIs3=Če imate vprašanja o nastavitvi SMTP strežnika, lahko vprašate %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index a41f62aba48..188b3ac0440 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -141,7 +141,7 @@ Cancel=Razveljavi
 Modify=Spremeni
 Edit=Uredi
 Validate=Potrdi
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Potrdi in odobri
 ToValidate=Za potrditev
 Save=Shrani
 SaveAs=Shrani kot
@@ -159,7 +159,7 @@ Search=Išči
 SearchOf=Iskanje
 Valid=Veljaven
 Approve=Potrdi
-Disapprove=Disapprove
+Disapprove=Prekliči odobritev
 ReOpen=Ponovno odpri
 Upload=Dodaj datoteko
 ToLink=Povezava
@@ -221,7 +221,7 @@ Cards=Kartice
 Card=Kartica
 Now=Zdaj
 Date=Datum
-DateAndHour=Date and hour
+DateAndHour=Datum in ura
 DateStart=Začetni datum
 DateEnd=Končni datum
 DateCreation=Datum kreiranja
@@ -298,7 +298,7 @@ UnitPriceHT=Cena enote (neto)
 UnitPriceTTC=Cena enote
 PriceU=C.E.
 PriceUHT=C.E. (neto)
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=Zahtevan P.U. HT
 PriceUTTC=C.E.
 Amount=Znesek
 AmountInvoice=Znesek računa
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Priljubljen
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. dobavitelj
 RefPayment=Ref. plačilo
 CommercialProposalsShort=Komercialne ponudbe
@@ -394,8 +395,8 @@ Available=Na voljo
 NotYetAvailable=Še ni na voljo
 NotAvailable=Ni na voljo
 Popularity=Priljubljenost
-Categories=Kategorije
-Category=Kategorija
+Categories=Tags/categories
+Category=Tag/category
 By=Z
 From=Od
 to=do
@@ -525,7 +526,7 @@ DateFromTo=Od %s do %s
 DateFrom=Od %s
 DateUntil=Do %s
 Check=Preveri
-Uncheck=Uncheck
+Uncheck=Odznači
 Internal=Interno
 External=Eksterno
 Internals=Interni
@@ -693,7 +694,8 @@ PublicUrl=Javni URL
 AddBox=Dodaj okvir
 SelectElementAndClickRefresh=Izberi element in klikni osveži
 PrintFile=Natisni datoteko %s
-ShowTransaction=Show transaction
+ShowTransaction=Prikaži transakcijo
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Ponedeljek
 Tuesday=Torek
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index eb4d92ac319..087279cc90a 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Pošlji izdelek
 Discount=Popust
 CreateOrder=Kreiraj naročilo
 RefuseOrder=Zavrni naročilo
-ApproveOrder=Odobri naročilo
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Potrdi naročilo
 UnvalidateOrder=Unvalidate red
 DeleteOrder=Briši naročilo
@@ -102,6 +103,8 @@ ClassifyBilled=Označi kot "Fakturiran"
 ComptaCard=Računovodska kartica
 DraftOrders=Osnutki naročil
 RelatedOrders=Odvisna naročila
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Naročila v obdelavi
 RefOrder=Ref. naročilo
 RefCustomerOrder=Ref. naročilo kupca
@@ -118,6 +121,7 @@ PaymentOrderRef=Plačilo naročila %s
 CloneOrder=Kloniraj naročilo
 ConfirmCloneOrder=Ali zares želite klonirati to naročilo %s ?
 DispatchSupplierOrder=Prejem naročila od dobavitelja %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Referent za sledenje naročila kupca
 TypeContact_commande_internal_SHIPPING=Referent za sledenje odpreme
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 7b22d4ec296..c10628fb136 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Potrjena intervencija
 Notify_FICHINTER_SENTBYMAIL=Intervencija poslana po EMailu
 Notify_BILL_VALIDATE=Potrjen račun
 Notify_BILL_UNVALIDATE=Račun za kupca ni potrjen
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Odobreno naročilo pri dobavitelju
 Notify_ORDER_SUPPLIER_REFUSE=Zavrnjeno naročilo pri dobavitelju
 Notify_ORDER_VALIDATE=Potrjeno naročilo kupca
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Komercialna ponudba poslana po e-pošti
 Notify_BILL_PAYED=Plačan račun kupca
 Notify_BILL_CANCEL=Preklican račun kupca
 Notify_BILL_SENTBYMAIL=Račun poslan po e-pošti
-Notify_ORDER_SUPPLIER_VALIDATE=Potrjeno naročilo pri dobavitelju
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Naročilo pri dobavitelju poslano po pošti
 Notify_BILL_SUPPLIER_VALIDATE=Potrjen račun dobavitelja
 Notify_BILL_SUPPLIER_PAYED=Plačan račun dobavitelja
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Ustvarjanje projekta
 Notify_TASK_CREATE=Ustvarjena naloga
 Notify_TASK_MODIFY=Spremenjena naloga
 Notify_TASK_DELETE=Izbrisana naloga
-SeeModuleSetup=Glejte nastavitev modula
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Število pripetih datotek/dokumentov
 TotalSizeOfAttachedFiles=Skupna velikost pripetih datotek/dokumentov
 MaxSize=Največja velikost
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Potrjen račun %s
 EMailTextProposalValidated=Potrjena ponudba %s
 EMailTextOrderValidated=Potrjeno naročilo %s
 EMailTextOrderApproved=Odobreno naročilo %s
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Naročilo %s odobril %s
 EMailTextOrderRefused=Zavrnjeno naročilo %s
 EMailTextOrderRefusedBy=Naročilo %s zavrnil %s
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 66b438442e1..2a861958aca 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimalna priporočena cena je : %s
 PriceExpressionEditor=Urejevalnik prikaza cene
 PriceExpressionSelected=Izbran prikaz cene
 PriceExpressionEditorHelp1="cena = 2 + 2" ali "2 + 2" za nastavitev cene. Uporabite ; za ločitev izrazov
-PriceExpressionEditorHelp2=Lahko dostopate do EkstraPolj s spremenljivkami kot #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=Tako za proizvode/storitve, kot za nabavne cene, so na voljo naslednje spremenljivke:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Samo za cene proizvodov/storitev: #supplier_min_price#
    Samo za nabavne cene: #supplier_quantity# in #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Način cene
 PriceNumeric=Številka
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 86aa5c2da19..d0cd6e6d556 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Seznam računov dobaviteljev, povezanih s
 ListContractAssociatedProject=Seznam pogodb, povezanih s projektom
 ListFichinterAssociatedProject=Seznam intervencij, povezanih s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Seznam aktivnosti, povezanih s projektom
 ActivityOnProjectThisWeek=Aktivnosti na projektu v tem tednu
 ActivityOnProjectThisMonth=Aktivnosti na projektu v tem mesecu
@@ -130,13 +131,15 @@ AddElement=Povezava do elementa
 UnlinkElement=Nepovezan element
 # Documents models
 DocumentModelBaleine=Model poročila za celoten projekt (logo...)
-PlannedWorkload = Planirana delovna obremenitev
-WorkloadOccupation= Pretvarjanje delovne obremenitve
+PlannedWorkload=Planirana delovna obremenitev
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Referenčni objekti
 SearchAProject=Iskanje projekta
 ProjectMustBeValidatedFirst=Projekt mora biti najprej potrjen
 ProjectDraft=Osnutek projekta
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
index 5a318a13eb8..21aa1dc06bf 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Referenca pošiljke
 Sending=Odprema
 Sendings=Pošiljke
+AllSendings=All Shipments
 Shipment=Odprema
 Shipments=Odpreme
 ShowSending=Show Sending
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index ef34fc2ba1b..e3604ebde33 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Seznam naročil dobaviitelja
 MenuOrdersSupplierToBill=Zaračunavanje naročil dobavitelja
 NbDaysToDelivery=Zakasnitev dobave v dnevih
 DescNbDaysToDelivery=Največja zakasnitev je prikazana med seznami naročenih proizvodov
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 7232f00e91c..014996eee65 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/sq_AL/donations.lang b/htdocs/langs/sq_AL/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/sq_AL/donations.lang
+++ b/htdocs/langs/sq_AL/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index c9794e8b2ed..f73388ef0cd 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index ae34d563120..69454f180a5 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Avskiljare
 ExtrafieldCheckBox=Kryssruta
 ExtrafieldRadio=Radioknapp
 ExtrafieldCheckBoxFromList= Kryssruta från tabell
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parametrar listan måste vara som nyckel, värde 

     till exempel: 
     1, value1 
     2, värde2 
     3, value3 
     ... 

     För att få en lista beroende på en annan: 
     1, value1 | parent_list_code: parent_key 
     2, värde2 | parent_list_code: parent_key
 ExtrafieldParamHelpcheckbox=Parametrar listan måste vara som nyckel, värde 

     till exempel: 
     1, value1 
     2, värde2 
     3, value3 
     ...
 ExtrafieldParamHelpradio=Parametrar listan måste vara som nyckel, värde 

     till exempel: 
     1, value1 
     2, värde2 
     3, value3 
     ...
@@ -494,6 +495,8 @@ Module500Name=Speciella utgifter (skatt, sociala avgifter, utdelningar)
 Module500Desc=Förvaltning av särskilda kostnader som skatter, sociala avgifter, utdelningar och löner
 Module510Name=Löner
 Module510Desc=Förvaltning av de anställdas löner och betalningar
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Anmälningar
 Module600Desc=Skicka e-postmeddelanden på vissa Dolibarr affärshändelser till kontakter tredjeparts (inställnings definieras på varje tredjeparts)
 Module700Name=Donationer
@@ -508,14 +511,14 @@ Module1400Name=Bokföring
 Module1400Desc=Bokföring och redovisning (dubbel part)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Kategorier
-Module1780Desc=Categorie ledning (produkter, leverantörer och kunder)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKeditor
 Module2000Desc=WYSIWYG Editor
 Module2200Name=Dynamiska priser
 Module2200Desc=Aktivera användningen av matematiska uttryck för priser
 Module2300Name=Cron
-Module2300Desc=Hantera planlagda uppgifter
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Åtgärder / uppgifter och dagordning förvaltning
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Läs Löner
 Permission512=Skapa / ändra löner
 Permission514=Radera löner
 Permission517=Export löner
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Läs tjänster
 Permission532=Skapa / modifiera tjänster
 Permission534=Ta bort tjänster
@@ -746,6 +754,7 @@ Permission1185=Godkänn leverantör order
 Permission1186=Beställ leverantör order
 Permission1187=Bekräfta mottagandet av leverantör order
 Permission1188=Radera leverantör order
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Få resultat av en export
 Permission1202=Skapa / ändra en export
 Permission1231=Läs leverantörsfakturor
@@ -758,10 +767,10 @@ Permission1237=Export leverantörsorder och tillhörande information
 Permission1251=Kör massiv import av externa data till databasen (data last)
 Permission1321=Export kundfakturor, attribut och betalningar
 Permission1421=Export kundorder och attribut
-Permission23001 = Läs planlagd uppgift
-Permission23002 = Skapa / redigera planlagd uppgift
-Permission23003 = Radera planlagd uppgift
-Permission23004 = Utför planlagda uppgifter
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Läs åtgärder (händelser eller uppgifter) kopplade till sitt konto
 Permission2402=Skapa / ändra åtgärder (händelser eller uppgifter) kopplade till sitt konto
 Permission2403=Radera åtgärder (händelser eller uppgifter) kopplade till sitt konto
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Avkastningen en bokföring kod byggd med %s följt av
 ModuleCompanyCodePanicum=Avkastningen en tom bokföring kod.
 ModuleCompanyCodeDigitaria=Bokföring kod beror på tredje part kod. Koden består av tecknet "C" i den första positionen och därefter det första fem bokstäver av tredje part koden.
 UseNotifications=Använd anmälningar
-NotificationsDesc=E-post meddelanden funktionen kan du tyst skicka automatiska e-post, för vissa Dolibarr händelser. Mål av anmälningar kan definieras: 
     * Per tredje parter kontakter (kunder eller leverantörer), en tredje part vid tidpunkten. 
     * Eller genom att sätta ett globalt mål e-postadress på modulens inställningssida.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Dokument mallar
 DocumentModelOdt=Generera dokument från OpenDocuments mallar (.odt eller .ods filer för Openoffice, KOffice, Textedit, ...)
 WatermarkOnDraft=Vattenstämpel utkast
@@ -1557,6 +1566,7 @@ SuppliersSetup=Leverantör modul setup
 SuppliersCommandModel=Fullständig mall av leverantör för (logo. ..)
 SuppliersInvoiceModel=Komplett mall leverantörsfaktura (logo. ..)
 SuppliersInvoiceNumberingModel=Leverantörsfakturor numrerings modeller
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind modul setup
 PathToGeoIPMaxmindCountryDataFile=Sökväg till fil innehåller MaxMind ip till land översättning. 
     Exempel: 
     /usr/local/share/GeoIP/GeoIP.dat 
     /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index fce76b40e62..366c6dfb486 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Faktura %s validerade
 InvoiceValidatedInDolibarrFromPos=Faktura %s validerats från POS
 InvoiceBackToDraftInDolibarr=Faktura %s gå tillbaka till förslaget status
 InvoiceDeleteDolibarr=Faktura %s raderas
-OrderValidatedInDolibarr= Beställ %s validerade
+OrderValidatedInDolibarr=Beställ %s validerade
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Beställ %s avbryts
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Ordningens %s godkänd
 OrderRefusedInDolibarr=Order %s vägrade
 OrderBackToDraftInDolibarr=Beställ %s gå tillbaka till förslaget status
@@ -91,3 +94,5 @@ WorkingTimeRange=Arbetstid intervall
 WorkingDaysRange=Arbetsdagar sträcker
 AddEvent=Skapa event
 MyAvailability=Min tillgänglighet
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 2228c0a85ef..4ffc34b5e39 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Betalningar redan gjort
 PaymentsBackAlreadyDone=Återbetalningar är utförda tidigare
 PaymentRule=Betalningsregel
 PaymentMode=Betalningssätt
-PaymentConditions=Betalningsvillkor
-PaymentConditionsShort=Betalningsvillkor
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Betalningsbelopp
 ValidatePayment=Bekräfta betalning
 PaymentHigherThanReminderToPay=Betalning högre än påminnelse att betala
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Totalt för två nya rabatt måste vara lik
 ConfirmRemoveDiscount=Är du säker på att du vill ta bort denna rabatt?
 RelatedBill=Relaterade faktura
 RelatedBills=Relaterade fakturor
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Senast relaterad faktura
 WarningBillExist=Varning, en eller flera fakturor finns redan
 
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 8d653226bc1..7963867f0be 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategori
-Categories=Kategorier
-Rubrique=Kategori
-Rubriques=Kategorier
-categories=kategorier
-TheCategorie=I kategorin
-NoCategoryYet=Ingen kategori av denna typ skapades
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=I
 AddIn=Lägg till i
 modify=modifiera
 Classify=Klassificera
-CategoriesArea=Kategorier område
-ProductsCategoriesArea=Produkter / tjänster kategorier område
-SuppliersCategoriesArea=Leverantörer kategorier område
-CustomersCategoriesArea=Kunder kategorier område
-ThirdPartyCategoriesArea=Tredje part kategorier område
-MembersCategoriesArea=Medlemmar kategorier område
-ContactsCategoriesArea=Område för kontaktkategorier
-MainCats=Huvudkategorier
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Underkategorier
 CatStatistics=Statistik
-CatList=Lista över kategorier
-AllCats=Alla kategorier
-ViewCat=Visa kategori
-NewCat=Lägg till kategori
-NewCategory=Ny kategori
-ModifCat=Ändra kategori
-CatCreated=Kategori skapade
-CreateCat=Skapa kategori
-CreateThisCat=Skapa denna kategori
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validera fält
 NoSubCat=Inga underkategori.
 SubCatOf=Underkategori
-FoundCats=Hittade kategorier
-FoundCatsForName=Kategorier hittades för namnet:
-FoundSubCatsIn=Underkategorier finns i kategorin
-ErrSameCatSelected=Du har valt samma kategori flera gånger
-ErrForgotCat=Du glömde att välja kategori
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Du glömde att informera fält
 ErrCatAlreadyExists=Detta namn används redan
-AddProductToCat=Lägg till denna produkt till en kategori?
-ImpossibleAddCat=Omöjligt att lägga till kategorin
-ImpossibleAssociateCategory=Omöjligt att associera den kategori
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s har lagts till.
-ObjectAlreadyLinkedToCategory=Element är redan kopplad till denna kategori.
-CategorySuccessfullyCreated=Denna kategori %s har lagts med framgång.
-ProductIsInCategories=Produkt / tjänst äger till följande kategorier
-SupplierIsInCategories=Tredje part är att följande leverantörer kategorier
-CompanyIsInCustomersCategories=Denna tredje part äger att följande kunder / utsikter kategorier
-CompanyIsInSuppliersCategories=Denna tredje part äger att följande leverantörer kategorier
-MemberIsInCategories=Denna medlem äger till följande medlemmar kategorier
-ContactIsInCategories=Denna kontakt ingår i följande kontaktkategorier
-ProductHasNoCategory=Denna produkt / tjänst är inte på något kategorier
-SupplierHasNoCategory=Denna leverantör är inte på något kategorier
-CompanyHasNoCategory=Detta företag är inte på något kategorier
-MemberHasNoCategory=Denna medlem är inte på något kategorier
-ContactHasNoCategory=Denna kontakt tillhör inte någon kategori
-ClassifyInCategory=Klassificera i kategorin
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Ingen
-NotCategorized=Utan kategori
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Denna kategori finns redan med denna ref
 ReturnInProduct=Tillbaka till produkt / tjänst kort
 ReturnInSupplier=Tillbaka till leverantör kort
@@ -66,22 +64,22 @@ ReturnInCompany=Tillbaka till kund / prospektering kort
 ContentsVisibleByAll=Innehållet kommer att vara synlig för alla
 ContentsVisibleByAllShort=Innehållsförteckning synlig för alla
 ContentsNotVisibleByAllShort=Innehåll inte synlig för alla
-CategoriesTree=Kategoriträd
-DeleteCategory=Ta bort kategori
-ConfirmDeleteCategory=Är du säker på att du vill ta bort denna kategori?
-RemoveFromCategory=Ta bort kopplingen till Categorie
-RemoveFromCategoryConfirm=Är du säker på att du vill ta bort koppling mellan transaktionen och den kategorin?
-NoCategoriesDefined=Ingen kategori som definieras
-SuppliersCategoryShort=Leverantörer kategori
-CustomersCategoryShort=Kunder kategori
-ProductsCategoryShort=Produkter kategori
-MembersCategoryShort=Medlemmar kategori
-SuppliersCategoriesShort=Leverantörer kategorier
-CustomersCategoriesShort=Kunder kategorier
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / kommande utvecklingen. kategorier
-ProductsCategoriesShort=Produkter kategorier
-MembersCategoriesShort=Medlemmar kategorier
-ContactCategoriesShort=Kontaktkategorier
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Denna kategori innehåller inte någon produkt.
 ThisCategoryHasNoSupplier=Denna kategori innehåller inte någon leverantör.
 ThisCategoryHasNoCustomer=Denna kategori innehåller inte någon kund.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Denna kategori innehåller inte någon kontakt.
 AssignedToCustomer=Avsatta till en kund
 AssignedToTheCustomer=Avsatta till kunden
 InternalCategory=Intern kategori
-CategoryContents=Kategori innehåll
-CategId=Kategori id
-CatSupList=Lista över leverantör kategorier
-CatCusList=Förteckning över kund / utsikterna kategorier
-CatProdList=Förteckning över produkter kategorier
-CatMemberList=Förteckning över medlemmar kategorier
-CatContactList=Lista över kontaktkategorier och kontakt
-CatSupLinks=Länkar mellan leverantörer och kategorier
-CatCusLinks=Länkar mellan kunder / möjliga kunder och kategorier
-CatProdLinks=Länkar mellan produkter / tjänster och kategorier
-CatMemberLinks=Länkar mellan medlemmar och kategorier
-DeleteFromCat=Ta bort från kategori
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Ta bort bild
 ConfirmDeletePicture=Bekräfta ta bort bild?
 ExtraFieldsCategories=Extra attibut
-CategoriesSetup=Kategorier, inställningar
-CategorieRecursiv=Länka automatiskt med förälderkategori
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Om aktiverad kommer produkten även länkas till förälderkategori när den läggs i en underkategori
 AddProductServiceIntoCategory=Lägg till följande produkt / tjänst
-ShowCategory=Visa kategori
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index 1bb38438cc9..07ae8ba906a 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Sista loppet utgång
 CronLastResult=Senaste resultat code
 CronListOfCronJobs=Lista över schemalagda jobb
 CronCommand=Kommando
-CronList=Listan Jobb
-CronDelete= Radera cron-jobb
-CronConfirmDelete= Är du säker på att du vill ta bort denna cron-jobb?
-CronExecute=Starta jobb
-CronConfirmExecute= Är du säker på att utföra detta jobb nu
-CronInfo= Jobb möjligt att utföra uppgiften som har planerats
-CronWaitingJobs=Wainting jobb
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Jobb
-CronNone= Ingen
+CronNone=Ingen
 CronDtStart=Startdatum
 CronDtEnd=Slutdatum
 CronDtNextLaunch=Nästa exekvering
@@ -75,6 +75,7 @@ CronObjectHelp=Det objektnamn som ska läsas in. 
     För exemple att hämta me
 CronMethodHelp=Objektet metod för att starta. 
     För exemple att hämta metod för Dolibarr Produktobjekt /htdocs/product/class/product.class.php, värdet av metoden är är fecth
 CronArgsHelp=Metoden argument. 
     Till exemple att hämta förfarande för Dolibarr Produkt objekt /htdocs/product/class/product.class.php kan värdet av paramters vara 0, ProductRef
 CronCommandHelp=Systemet kommandoraden som ska köras.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/sv_SE/donations.lang b/htdocs/langs/sv_SE/donations.lang
index a66b54ae5af..e82473ddf20 100644
--- a/htdocs/langs/sv_SE/donations.lang
+++ b/htdocs/langs/sv_SE/donations.lang
@@ -6,6 +6,8 @@ Donor=Givare
 Donors=Givare
 AddDonation=Skapa en donation
 NewDonation=Ny donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Visa donation
 DonationPromise=Gift löfte
 PromisesNotValid=Inte validerade löften
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation fått
 DonationStatusPromiseNotValidatedShort=Förslag
 DonationStatusPromiseValidatedShort=Validerad
 DonationStatusPaidShort=Mottagna
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate löfte
 DonationReceipt=Donation kvitto
 BuildDonationReceipt=Bygg kvitto
@@ -36,3 +40,4 @@ FrenchOptions=Alternativ för Frankrike
 DONATION_ART200=Visar artikel 200 från CGI om du är orolig
 DONATION_ART238=Visar artikel 238 från CGI om du är orolig
 DONATION_ART885=Visar artikel 885 från CGI om du är orolig
+DonationPayment=Donation payment
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 2dfe10cfa08..e66c00e3397 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Okänt fel '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Obligatoriska inställningsparametrarna har ännu inte definierat
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index 73f612bb83f..2dc5eb785cd 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Lista alla e-postmeddelanden skickas
 MailSendSetupIs=Konfiguration av e-post att skicka har ställts in till "% s". Detta läge kan inte användas för att skicka massutskick.
 MailSendSetupIs2=Du måste först gå, med ett administratörskonto, i meny% Shome - Setup - e-post% s för att ändra parameter '% s' för att använda läget "% s". Med det här läget kan du ange inställningar för SMTP-servern från din internetleverantör och använda Mass mejla funktionen.
 MailSendSetupIs3=Om du har några frågor om hur man ställer in din SMTP-server, kan du be att% s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 2c1bb7d593e..89622813889 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorit
 ShortInfo=Info
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. leverantör
 RefPayment=Ref. betalning
 CommercialProposalsShort=Kommersiella förslag
@@ -394,8 +395,8 @@ Available=Tillgängliga
 NotYetAvailable=Ännu inte tillgängligt
 NotAvailable=Inte tillgänglig
 Popularity=Populärast
-Categories=Kategorier
-Category=Kategori
+Categories=Tags/categories
+Category=Tag/category
 By=Genom att
 From=Från
 to=till
@@ -694,6 +695,7 @@ AddBox=Lägg till låda
 SelectElementAndClickRefresh=Välj ett element och klicka på uppdatera
 PrintFile=Skriv ut fil %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Måndag
 Tuesday=Tisdag
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 6b67e495d3f..f7d101378d4 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship produkt
 Discount=Rabatt
 CreateOrder=Skapa ordning
 RefuseOrder=Vägra att
-ApproveOrder=Acceptera att
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Verifiera att
 UnvalidateOrder=Unvalidate För
 DeleteOrder=Radera ordning
@@ -102,6 +103,8 @@ ClassifyBilled=Klassificera "Fakturerade"
 ComptaCard=Bokföring kort
 DraftOrders=Förslag till beslut
 RelatedOrders=Relaterade order
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=I processen order
 RefOrder=Ref. För
 RefCustomerOrder=Ref. kundorder
@@ -118,6 +121,7 @@ PaymentOrderRef=Betalning av att %s
 CloneOrder=Klon för
 ConfirmCloneOrder=Är du säker på att du vill klona denna beställning %s?
 DispatchSupplierOrder=Ta emot leverantör för %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representanten följa upp kundorder
 TypeContact_commande_internal_SHIPPING=Representanten uppföljning sjöfart
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 3144d5f7412..78c95c5c6cd 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validerade
 Notify_FICHINTER_SENTBYMAIL=Ingripande skickas per post
 Notify_BILL_VALIDATE=Kundfaktura validerade
 Notify_BILL_UNVALIDATE=Kundfakturan Fraktpris saknas
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Leverantör för godkänd
 Notify_ORDER_SUPPLIER_REFUSE=Leverantör för vägrat
 Notify_ORDER_VALIDATE=Kundorder validerade
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Kommersiell förslag skickas per post
 Notify_BILL_PAYED=Kundfaktura betalade
 Notify_BILL_CANCEL=Kundfaktura avbryts
 Notify_BILL_SENTBYMAIL=Kundfaktura skickas per post
-Notify_ORDER_SUPPLIER_VALIDATE=Leverantör för validerade
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Leverantör beställning skickas per post
 Notify_BILL_SUPPLIER_VALIDATE=Leverantörsfaktura validerade
 Notify_BILL_SUPPLIER_PAYED=Leverantörsfaktura betalas
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Projekt skapande
 Notify_TASK_CREATE=Task skapade
 Notify_TASK_MODIFY=Task modifierad
 Notify_TASK_DELETE=Uppgift utgår
-SeeModuleSetup=Se modul inställnings
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Antal bifogade filer / dokument
 TotalSizeOfAttachedFiles=Total storlek på bifogade filer / dokument
 MaxSize=Maximal storlek
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Fakturan %s har validerats.
 EMailTextProposalValidated=Förslaget %s har validerats.
 EMailTextOrderValidated=Ordern %s har validerats.
 EMailTextOrderApproved=Ordern %s har godkänts.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Ordern %s har godkänts av %s.
 EMailTextOrderRefused=Ordern %s har avslagits.
 EMailTextOrderRefusedBy=Ordern %s har avslagits %s.
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index e8f20528c1c..401789f8a22 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minsta rekommenderade priset är : %s
 PriceExpressionEditor=Pris uttryck redigerare
 PriceExpressionSelected=Valda pris uttryck
 PriceExpressionEditorHelp1="pris = 2 + 2" eller "2 + 2" för att sätta pris. Använd ; för att skilja uttryck
-PriceExpressionEditorHelp2=För att använda ExtraFields använd variabler som #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=I både produkt- / tjänste- och leverantörspriser är följande variabler tillgängliga:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Endast i produkt- / tjänstepris: #supplier_min_price#
    Endast i leverantörspris: #supplier_quantity# och #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Prisläge
 PriceNumeric=Nummer
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index cdec5ad6557..4d55abdc67c 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Lista över leverantörens fakturor i samb
 ListContractAssociatedProject=Förteckning över avtal i samband med projektet
 ListFichinterAssociatedProject=Lista över åtgärder i samband med projektet
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Förteckning över åtgärder i samband med projektet
 ActivityOnProjectThisWeek=Aktivitet på projekt den här veckan
 ActivityOnProjectThisMonth=Aktivitet på projekt denna månad
@@ -130,13 +131,15 @@ AddElement=Länk till inslag
 UnlinkElement=Ta bort länk elementet
 # Documents models
 DocumentModelBaleine=En fullständig projektets rapport modellen (logo. ..)
-PlannedWorkload = Planerad arbetsbelastning
-WorkloadOccupation= Arbetsbelastning affektation
+PlannedWorkload=Planerad arbetsbelastning
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Med hänvisning objekt
 SearchAProject=Sök ett projekt
 ProjectMustBeValidatedFirst=Projekt måste valideras först
 ProjectDraft=Utkast projekt
 FirstAddRessourceToAllocateTime=Associera en resurse att avsätta tid
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index 1f32d5bebb4..31de11fb426 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. transporten
 Sending=Sändning
 Sendings=Transporter
+AllSendings=All Shipments
 Shipment=Sändning
 Shipments=Transporter
 ShowSending=Visa skickade
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index 34e27b7955e..d11b1ba05e7 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Lista över leverantörsorder
 MenuOrdersSupplierToBill=Leverantörs order att fakturera
 NbDaysToDelivery=Leveransförsening, dagar
 DescNbDaysToDelivery=Den största förseningen visas med produktbeställningslista
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/sw_SW/agenda.lang b/htdocs/langs/sw_SW/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/sw_SW/agenda.lang
+++ b/htdocs/langs/sw_SW/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index 7232f00e91c..014996eee65 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/sw_SW/donations.lang b/htdocs/langs/sw_SW/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/sw_SW/donations.lang
+++ b/htdocs/langs/sw_SW/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index d40e28cb776..4b393ec50c5 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/sw_SW/orders.lang
+++ b/htdocs/langs/sw_SW/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/sw_SW/sendings.lang b/htdocs/langs/sw_SW/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/sw_SW/sendings.lang
+++ b/htdocs/langs/sw_SW/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/sw_SW/suppliers.lang
+++ b/htdocs/langs/sw_SW/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index ed6d1b2709c..fcffe3a92bb 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 7232f00e91c..014996eee65 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/th_TH/donations.lang b/htdocs/langs/th_TH/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/th_TH/donations.lang
+++ b/htdocs/langs/th_TH/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index 18fbfefd1dd..c64c5bf88f0 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/th_TH/suppliers.lang
+++ b/htdocs/langs/th_TH/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 17bc48b1142..a79c5689912 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -8,11 +8,11 @@ VersionExperimental=Deneysel
 VersionDevelopment=Geliştirme
 VersionUnknown=Bilinmeyen
 VersionRecommanded=Önerilen
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Dosya Bütünlüğü
+FilesMissing=Eksik dosyalar
+FilesUpdated=Güncellenmiş Dosyalar
+FileCheckDolibarr=Dolibarr Dosya Bütünlüğünü Denetle
+XmlNotFound=Dolibarr Bütünlüğü Xml Dosyası Bulınamadı
 SessionId=Oturum Kimliği
 SessionSaveHandler=Oturum kayıt yürütücüsü
 SessionSavePath=Oturum kayıt konumu
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Ayırıcı
 ExtrafieldCheckBox=Onay kutusu
 ExtrafieldRadio=Onay düğmesi
 ExtrafieldCheckBoxFromList= Tablodan açılır kutu
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parametre listesi anahtar.değer gibi olmalı, örneğin 

     : 
    1,değer1
    2,değer2
    3,değer3
    ...

    Başka bir listeye bağlı bir liste elde etmek için :
    1,değer1|parent_list_code:parent_key
    2,değer2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parametre listesi anahtar.değer gibi olmalı, örneğin 

     : 
    1,değer1
    2,değer2
    3,değer3
    ...
 ExtrafieldParamHelpradio=Parametre listesi anahtar.değer gibi olmalı, örneğin 

     : 
    1,değer1
    2,değer2
    3,değer3
    ...
@@ -494,28 +495,30 @@ Module500Name=Özel giderler (vergi, sosyal katkı payları, temettüler)
 Module500Desc=Vergiler, sosyal katkı payları, temettüler ve maaşlar gibi özel giderlerin yönetimi
 Module510Name=Ücretler
 Module510Desc=Çalışanların maaş ve ödeme yönetimi
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Duyurlar
 Module600Desc=Üçüncü parti kişilerine bazı Dolibarr iş etkinlikleriyle ilgili Eposta bildirimleri gönderin (her üçüncü parti için ayarlar tanımlanmıştır)
 Module700Name=Bağışlar
 Module700Desc=Bağış yönetimi
-Module770Name=Expense Report
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Gider Raporu
+Module770Desc=Yönetim ve şikayet gider raporları )nakliye, yemek, ...)
+Module1120Name=Tedarikçi teklifi
+Module1120Desc=Tedarikçi teklifi ve fiyatlarını iste
 Module1200Name=Mantis
 Module1200Desc=Mantis entegrasyonu
 Module1400Name=Muhasebe
 Module1400Desc=Muhasebe yönetimi (her iki parti için)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
-Module1780Name=Kategoriler
-Module1780Desc=Kategori yönetimi (ürünler, tedarikçiler ve müşteriler)
+Module1520Name=Belge Oluşturma
+Module1520Desc=Toplu posta belgesi oluşturma
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=FCKdüzenleyici (FCKeditor)
 Module2000Desc=Gelişmiş editör kullanarak bazı metin alanlarının düzenlenmesini sağlar
 Module2200Name=Dinamik Fiyatlar
 Module2200Desc=Fiyatlar için matematik ifadelerin kullanımını etkinleştir
 Module2300Name=Kron
-Module2300Desc=Planlı görev yönetimi
+Module2300Desc=Scheduled job management
 Module2400Name=Gündem
 Module2400Desc=Etkinlikler/görevler ve gündem yönetimi
 Module2500Name=Elektronik İçerik Yönetimi
@@ -642,7 +645,7 @@ Permission181=Tedarikçi siparişi oku
 Permission182=Tedarikçi siparişi oluştur/değiştir
 Permission183=Tedarikçi siparişi doğrula
 Permission184=Tedarikçi siparişi onayla
-Permission185=Order or cancel supplier orders
+Permission185=Tedarikçi siparişlerini iptal et ya da ver
 Permission186=Tedarikçi siparişi al
 Permission187=Tedarikçi siparişi kapat
 Permission188=Tedarikçi siparişi iptal et
@@ -714,6 +717,11 @@ Permission510=Ücretleri oku
 Permission512=Ücret oluştur/değiştir
 Permission514=Ücretleri sil
 Permission517=Ücretleri çıkart
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Hizmet oku
 Permission532=Hizmet oluştur/değiştir
 Permission534=Hizmet sil
@@ -722,13 +730,13 @@ Permission538=Hizmet dışaaktar
 Permission701=Bağış oluştur/değiştir
 Permission702=Bağış sil
 Permission703=Bağış sil
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=Gider raporlarını oku (kendinin veya emrindekilerinin)
+Permission772=Gider raporu oluştur/değiştir
+Permission773=Gider raporu sil
+Permission774=Bütün gider raporlarını oku (emrinde olmayanlarınkini de)
+Permission775=Gider raporu onayla
+Permission776=Ödeme gider raporu
+Permission779=Gider raporları dışaaktarma
 Permission1001=Stok oku
 Permission1002=Depo oluştur/değiştir
 Permission1003=Depo sil
@@ -746,6 +754,7 @@ Permission1185=Tedarikçi siparişi onayla
 Permission1186=Tedarikçi siparişi ver
 Permission1187=Tedarikçi siparişi alındı fişi
 Permission1188=Tedarikçi siparişi kapat
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Bir dışaaktarma sonucu al
 Permission1202=Dışaaktarma oluştur/değiştir
 Permission1231=Tedarikçi faturalarını oku
@@ -758,10 +767,10 @@ Permission1237=Tedarikçi siparişi ve ayrıntılarını dışaaktar
 Permission1251=Dış verilerin veritabanına toplu olarak alınmasını çalıştır (veri yükle)
 Permission1321=Müşteri faturalarını, özniteliklerin ve ödemelerini dışaaktar
 Permission1421=Müşteri siparişleri ve özniteliklerini dışaaktar
-Permission23001 = Planlı görev oku
-Permission23002 = Planlı görev oluştur/güncelle
-Permission23003 = Planlı görev sil
-Permission23004 = Planlı görev yürüt
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Onun hesabına bağlı eylemleri (etkinlikleri veya görevleri) oku
 Permission2402=Onun hesabına bağlı eylemler (etkinlikler veya görevler) oluştur/değiştir
 Permission2403=Onun hesabına bağlı eylemleri (etkinlikleri veya görevleri) sil
@@ -1043,8 +1052,8 @@ MAIN_PROXY_PASS=Proxy sunucusunu kullanacak parola
 DefineHereComplementaryAttributes=Burada bütün öznitelikleri tanımlayın, yalnızca mevcut varsayılanları değil desteklenmenizi istediğiniz %s leri de.
 ExtraFields=Tamamlayıcı öznitelikler
 ExtraFieldsLines=Tamamlayıcı öznitelikler (satırlar)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Tamamlayıcı öznitelikler (sipariş satırları)
+ExtraFieldsSupplierInvoicesLines=Tamamlayıcı öznitelikler (fatura satırları)
 ExtraFieldsThirdParties=Ek öznitelikler (üçüncüparti)
 ExtraFieldsContacts=Ek öznitelikler (kişi/adres)
 ExtraFieldsMember=Tamamlayıcı öznitelikler (üye)
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=%s tarafından oluşturulan bir muhasebe kodunu getir:
 ModuleCompanyCodePanicum=Boş bir muhasebe kodu girin.
 ModuleCompanyCodeDigitaria=Muhasebe kodu üçüncü parti koduna bağlıdır. Kod üçüncü parti kodunun ilk 5 karakterini izleyen birinci konumda "C" karakterinden oluşmaktadır.
 UseNotifications=Bildirimleri kullanın
-NotificationsDesc=Eposta bildirimleri özelliği bazı Dolibarr etkinlikleri ile ilgili sessizce otomatik posta göndermenizi sağlar. Bildirim hedefleri bu şekilde tanımlanır:
    * üçüncü parti kişileri başına (müşteri ya da tedarikçi), her seferinde bir üçüncü parti.
    *
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Belge şablonları
 DocumentModelOdt=OpenDocuments şablonlarından belgeler oluşturun (OpenOffice, KOffice, TextEdit .ODT veya .ODS dosyaları)
 WatermarkOnDraft=Taslak belge üzerinde filigran
@@ -1173,12 +1182,12 @@ FreeLegalTextOnProposal=Teklifler üzerinde serbest metin
 WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste
 ##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+AskPriceSupplierSetup=Tedarikçi fiyat isteği modülü kurulumu
+AskPriceSupplierNumberingModules=Tedarikçi fiyat isteği numaralandırma modülü
+AskPriceSupplierPDFModules=Tedarikçi fiyat isteği belge modelleri
+FreeLegalTextOnAskPriceSupplier=Tedarikçi fiyat isteği üzerinde serbest metin
+WatermarkOnDraftAskPriceSupplier=Taslak tedarikçi fiyat istekleri üzerinde filigran (boşsa yok)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Fiyat isteklerinde hedef banka hesabı iste
 ##### Orders #####
 OrdersSetup=Sipariş yönetimi kurulumu
 OrdersNumberingModules=Sipariş numaralandırma modülü
@@ -1410,7 +1419,7 @@ BarcodeDescUPC=Barkod türü UPC
 BarcodeDescISBN=Barkod türü ISBN
 BarcodeDescC39=Barkod türü C39
 BarcodeDescC128=Barkod türü C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".
    For example: /usr/local/bin/genbarcode
+GenbarcodeLocation=Bar kodu oluşturma komut satırı aracı (bazı bar kodu türleri için iç motor tarafından kullanılır). "genbarcode" ile uyumlu olmalıdır.
    Örneğin: /usr/local/bin/genbarcode
 BarcodeInternalEngine=İç motor
 BarCodeNumberManager=Barkod sayılarını otomatik olarak tanımlayacak yönetici
 ##### Prelevements #####
@@ -1528,10 +1537,10 @@ CashDeskThirdPartyForSell=Satışlar için kullanılacak varsayılan genel üç
 CashDeskBankAccountForSell=Nakit ödemeleri almak için kullanılan varsayılan hesap
 CashDeskBankAccountForCheque= Ödemeleri çek ile almak için kullanılan varsayılan hesap
 CashDeskBankAccountForCB= Nakit ödemeleri kredi kartıyla almak için kullanılan varsayılan hesap
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
+CashDeskDoNotDecreaseStock=Satış Noktasından bir satış yapıldığında stok azaltılmasını engelle ("hayır"sa POS tan yapılan her satışta stok eksiltilmesi yapılır, Stok modülündeki seçenek ayarı ne olursa olsun).
 CashDeskIdWareHouse=Depoyu stok azaltmada kullanmak için zorla ve sınırla
 StockDecreaseForPointOfSaleDisabled=Satış Noktasından stok eksiltme engelli
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
+StockDecreaseForPointOfSaleDisabledbyBatch=POS ta stok eksiltmesi toplu yönetmeyle uyumlu değil
 CashDeskYouDidNotDisableStockDecease=Satış Noktasından satış yapılırken stok eksiltilmesini engellemediniz. Bu durumda depo gereklidir.
 ##### Bookmark #####
 BookmarkSetup=Yerimi modülü kurulumu
@@ -1557,6 +1566,7 @@ SuppliersSetup=Tedarikçi modülü kurulumu
 SuppliersCommandModel=Eksiksiz tedarikçi sipariş şablonu (logo. ..)
 SuppliersInvoiceModel=Eksiksiz tedarikçi fatura şablonu (logo. ..)
 SuppliersInvoiceNumberingModel=Tedarikçi faturaları numaralandırma modelleri
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modülü kurulumu
 PathToGeoIPMaxmindCountryDataFile=Ülke çevirisi için Maxmind ip içeren dosya yolu. 
    Örnekler:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat/GeoIP.dat
@@ -1597,7 +1607,12 @@ SortOrder=Sıralama düzeni
 Format=Biçim
 TypePaymentDesc=0:Müşteri ödeme türü, 1:Tedarikçi ödeme türü, 2:Hem müşteri hem de tedarikçi ödeme türü
 IncludePath=Yolu içerir (%s değişlende tanımlanır)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
-NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+ExpenseReportsSetup=Gider Raporları modülü Ayarları
+TemplatePDFExpenseReports=Gider raporu belgesi oluşturmak için belge şablonları
+NoModueToManageStockDecrease=Otomatik stok eksiltmesi yapabilecek hiçbir modül etkinleştirilmemiş. Stok eksiltmesi yalnızca elle girişle yapılacaktır.
+NoModueToManageStockIncrease=Otomatik stok arttırılması yapabilecek hiçbir modül etkinleştirilmemiş. Stok arttırılması yalnızca elle girişle yapılacaktır.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index 0520ecb6de7..1821f49cad3 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -25,7 +25,7 @@ MenuToDoMyActions=Sonlanmayan etkinliklerim
 MenuDoneMyActions=Sonlanan etkinliklerim
 ListOfEvents=Etkinlik listesi (iç takvim)
 ActionsAskedBy=Etkinliği bildiren
-ActionsToDoBy=Etkinlikten etkilenen
+ActionsToDoBy=Etkinlik için görevlendirilen
 ActionsDoneBy=Etkinliği yapan
 ActionsForUser=Kullanıcı etkinlikleri
 ActionsForUsersGroup=Grupun tüm üyelerine ait etkinlikler
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=%s Faturası doğrulandı
 InvoiceValidatedInDolibarrFromPos=POS tan doğrulanan fatura %s
 InvoiceBackToDraftInDolibarr=%s Faturasını taslak durumuna geri götür
 InvoiceDeleteDolibarr=%s faturası silindi
-OrderValidatedInDolibarr= %s Siparişi doğrulandı
+OrderValidatedInDolibarr=%s Siparişi doğrulandı
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=%s Siparişi iptal edildi
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=%s Siparişi onayladı
 OrderRefusedInDolibarr=Reddedilen teklif %s
 OrderBackToDraftInDolibarr=%s Siparişini taslak durumuna geri götür
@@ -91,3 +94,5 @@ WorkingTimeRange=Çalışma saati aralığı
 WorkingDaysRange=Çalışma günleri aralığı
 AddEvent=Etkinlik oluştur
 MyAvailability=Uygunluğum
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 4f843b6a57b..77b0858125d 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -33,11 +33,11 @@ AllTime=Başlangıç
 Reconciliation=Uzlaşma
 RIB=Banka Hesap Numarası
 IBAN=IBAN numarası
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
+IbanValid=IBAN Geçerli
+IbanNotValid=IBAN Geçersiz
 BIC=BIC/SWIFT numarası
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
+SwiftValid=BIC/SWIFT Geçerli
+SwiftNotValid=BIC/SWIFT Geçersiz
 StandingOrders=Ödeme talimatları
 StandingOrder=Ödeme talimatı
 Withdrawals=Para çekmeler
@@ -152,7 +152,7 @@ BackToAccount=Hesaba geri dön
 ShowAllAccounts=Tüm hesaplar için göster
 FutureTransaction=Gelecekteki işlem. Hiçbir şekilde uzlaştırılamaz.
 SelectChequeTransactionAndGenerate=Çek tahsilat makbuzunun içereceği çekleri seç/süz ve “Oluştur” a tıkla.
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+InputReceiptNumber=Uzlaştırma ile ilişkili banka hesap özetini seç. Sıralanabilir bir sayısal değer kullan: YYYYMM ya da YYYYMMDD
 EventualyAddCategory=Sonunda, kayıtları sınıflandırmak için bir kategori belirtin
 ToConciliate=Uzlaştırılacak mı?
 ThenCheckLinesAndConciliate=Sonra, banka hesap özetindeki kalemleri işaretleyin ve tıklayın
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 75337d23cc2..b799ca33cd3 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -26,7 +26,7 @@ InvoiceReplacementAsk=Fatura değiştirme yapılacak fatura
 InvoiceReplacementDesc=Fatura değiştirme henüz tahsilat yapılmamış bir faturanın iptal edilmesi ve tamamen değiştirilmesi için kullanılır.

    Not: Yalnızca ödeme yapılmamış faturalar değiştirilebilir. Değiştirdiğiniz fatura eğer henüz kapataılmamışsa, kullanılmamak üzere otomatik olarak kapatılacaktır.
 InvoiceAvoir=İade faturası
 InvoiceAvoirAsk=İade faturası fatura düzeltmek için kullanılır
-InvoiceAvoirDesc=İade Faturasıbir eksi fatura olup fatura tutarının gerçekte ödenen tutardan farklı olması durumunda kullanılır (çünkü müşteri yanlışlıkla fazla ödeme yapmıştır, ya da tamamını ödemeyecektir, örneğin bazı malları iade ettiğinden).
+InvoiceAvoirDesc=İade Faturası bir eksi fatura olup fatura tutarının gerçekte ödenen tutardan farklı olması durumunda kullanılır (çünkü müşteri yanlışlıkla fazla ödeme yapmıştır, ya da tamamını ödemeyecektir, örneğin bazı malları iade ettiğinden).
 invoiceAvoirWithLines=İlk faturadan alınan kalemlerle İade Faturası oluştur
 invoiceAvoirWithPaymentRestAmount=İlk faturanın ödenmemiş bakiyeli İade Faturası
 invoiceAvoirLineWithPaymentRestAmount=Ödenmemiş kalan tutar için İade Faturası
@@ -62,7 +62,7 @@ PaidBack=Geri ödenen
 DatePayment=Ödeme tarihi
 DeletePayment=Ödeme sil
 ConfirmDeletePayment=Bu ödemeyi silmek istediğinizden emin misiniz?
-ConfirmConvertToReduc=Bu iade faturasını ya da nakit avans faturasını mutlak bir indirime dönüştürmek istiyor musunuz? 
    Bu tutar diğer indirimlerin arasına kaydedilecek olup bu müşteri için mevcut ya da ileride kesilecek faturada indirim olarak kullanılabilecektir.
+ConfirmConvertToReduc=Bu iade faturasını ya da nakit avans faturasını mutlak bir indirime dönüştürmek istiyor musunuz? 
     Bu tutar diğer indirimlerin arasına kaydedilecek olup bu müşteri için mevcut ya da ileride kesilecek faturada indirim olarak kullanılabilecektir.
 SupplierPayments=Tedarikçi ödemeleri
 ReceivedPayments=Alınan ödemeler
 ReceivedCustomersPayments=Müşterilerden alınan ödemeler
@@ -74,12 +74,13 @@ PaymentsAlreadyDone=Halihazırda yapılmış ödemeler
 PaymentsBackAlreadyDone=Zaten yapılmış geri ödemeler
 PaymentRule=Ödeme kuralı
 PaymentMode=Ödeme türü
-PaymentConditions=Ödeme şartı
-PaymentConditionsShort=Ödeme şartı
+PaymentTerm=Ödeme koşulu
+PaymentConditions=Ödeme koşulları
+PaymentConditionsShort=Ödeme koşulları
 PaymentAmount=Ödeme tutarı
 ValidatePayment=Ödeme doğrula
 PaymentHigherThanReminderToPay=Ödeme hatırlatmasından daha yüksek ödeme
-HelpPaymentHigherThanReminderToPay=Dikkat, bir ya da daha çok faturanın ödeme tutarı ödenecek bakiyeden yüksektir.
    Girişinizi düzeltin, aksi durumda her fazla ödenen fatura için bir iade faturası oluşturmayı onaylayın ve düşünün.
+HelpPaymentHigherThanReminderToPay=Dikkat, bir ya da daha çok faturanın ödeme tutarı ödenecek bakiyeden yüksektir.
     Girişinizi düzeltin, aksi durumda her fazla ödenen fatura için bir iade faturası oluşturmayı onaylayın ve düşünün.
 HelpPaymentHigherThanReminderToPaySupplier=Dikkat, bir ya da daha çok faturanın ödeme tutarı ödenecek bakiyeden yüksektir.
    Girişinizi düzeltin, aksi durumda onaylayın.
 ClassifyPaid=Sınıflandırma ‘Ödendi’
 ClassifyPaidPartially=Sınıflandırma ‘Kısmen ödendi’
@@ -165,7 +166,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Bazı ülkelerde, bu seçenek
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Eğer diğerlerinin hiçbiri uymuyorsa bu seçimi kullanın
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Bir Kötü müşteri borçlarını ödemeyi reddeden müşteridir.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Bu seçenek, bazı ürün iadelerinden dolayı ödeme tamamlanamazsa, kullanılır.
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Bu seçeneği, eğer diğerlerinin hiçbiri uymazsa kullanın, örneğin aşağıdaki durumda:-istenen tutar çok önemli çünkü indirim unutulmuştur
    Bütün durumlarda, istenen fazla tutar muhasebe sisteminde bir iade faturası oluşturularak düzeltilir.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Bu seçeneği, eğer diğerlerinin hiçbiri uymazsa kullanın, örneğin aşağıdaki durumda:
    - bazı ürünlerin geri sevkedilmesinden dolayı ödeme tamalanamzsa
    - istenen tutar çok önemli çünkü indirim unutulmuştur.
     Bütün durumlarda, istenen fazla tutar muhasebe sisteminde bir iade faturası oluşturularak düzeltilir.
 ConfirmClassifyAbandonReasonOther=Diğer
 ConfirmClassifyAbandonReasonOtherDesc=Diğer bütün durumlarda bu seçenek kullanılacaktır. Örneğin; bir fatura değiştirmeyi tasarladığınızda.
 ConfirmCustomerPayment=Bu ödeme girişini %s %s için onaylıyor musunuz?
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=İki yeni indirimin toplamı orijinal indir
 ConfirmRemoveDiscount=Bu indirimi kaldırmak istediğinizden emin misiniz?
 RelatedBill=İlgili fatura
 RelatedBills=İlgili faturalar
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Son ilgili fatura
 WarningBillExist=Uyarı, bir yada çok fatura zaten var
 
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index e440ab7c4f4..3eeda08ff73 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Kategori
-Categories=Kategoriler
-Rubrique=Kategori
-Rubriques=Kategoriler
-categories=kategoriler
-TheCategorie=Kategori
-NoCategoryYet=Bu türde oluşturulan Kategori yok
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=İçinde
 AddIn=Eklenti
 modify=değiştir
 Classify=Sınıflandır
-CategoriesArea=Kategoriler alanı
-ProductsCategoriesArea=Ürün/Hizmet kategorileri alanı
-SuppliersCategoriesArea=Tedarikçi kategorileri alanı
-CustomersCategoriesArea=Müşteri kategorileri alanı
-ThirdPartyCategoriesArea=Üçüncü parti kategorileri alanı
-MembersCategoriesArea=Üye kategorileri alanı
-ContactsCategoriesArea=Kişi kategorileri alanı
-MainCats=Ana kategoriler
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Alt kategoriler
 CatStatistics=İstatistikler
-CatList=Kategori Listesi
-AllCats=Tüm kategoriler
-ViewCat=Kategori görüntüle
-NewCat=Kategori ekle
-NewCategory=Yeni kategori
-ModifCat=Kategori değiştir
-CatCreated=Kategori oluşturuldu
-CreateCat=Kategori oluştur
-CreateThisCat=Bu kategoriyi oluştur
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Alanları doğrula
 NoSubCat=Alt kategori yok.
 SubCatOf=Alt kategori
-FoundCats=Kategoriler bulundu
-FoundCatsForName=Bu ad için kategoriler bulundu:
-FoundSubCatsIn=Kategori içinde alt kategoriler bulundu
-ErrSameCatSelected=Birkaç kez aynı kategoriyi seçtiniz
-ErrForgotCat=Kategori seçmeyi unuttunuz
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Alanlara bilgi girmeyi unuttunuz
 ErrCatAlreadyExists=Bu ad zaten kullanılıyor
-AddProductToCat=Bu ürünü bir kategoriye mi ekleyeceksiniz?
-ImpossibleAddCat=Kategori eklemek olanaksız
-ImpossibleAssociateCategory=Kategoriyle ilişkilendirmek olanaksız
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s başarıyla eklendi.
-ObjectAlreadyLinkedToCategory=Öğe zaten bu kategoriye bağlıdır.
-CategorySuccessfullyCreated=Bu kategoriye %s başarı ile eklendi.
-ProductIsInCategories=Ürün/hizmet aşağıdaki kategorilere aittir
-SupplierIsInCategories=Üçüncü parti aşağıdaki tedarikçi kategorilerine aittir
-CompanyIsInCustomersCategories=Bu üçüncü parti aşağıdaki müşteri/aday kategorilerine aittir
-CompanyIsInSuppliersCategories=Bu üçüncü parti aşağıdaki tedarikçi kategorilerine aittir
-MemberIsInCategories=Bu üye, aşağıdaki üye kategorilerine aittir
-ContactIsInCategories=Bu kişi aşağıdaki kişi kategorilerine sahip
-ProductHasNoCategory=Bu ürün/hizmet herhangi bir kategoride yoktur
-SupplierHasNoCategory=Bu tedarikçi herhangi bir kategoride yoktur
-CompanyHasNoCategory=Bu firma herhangi bir kategoride yoktur
-MemberHasNoCategory=Bu üye herhangi bir kategoride yoktur
-ContactHasNoCategory=Bu kişi herhangi bir kategoride değil
-ClassifyInCategory=Kategoride Sınıflandır
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Hiçbiri
-NotCategorized=Kategorisiz
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Bu kategori zaten bu ilgi ile var
 ReturnInProduct=Ürün/hizmet kartına geri dön
 ReturnInSupplier=Tedarikçi kartına geri dön
@@ -66,22 +64,22 @@ ReturnInCompany=Müşteri/aday kartına geri dön
 ContentsVisibleByAll=İçerik herkes tarafından görülebilir
 ContentsVisibleByAllShort=Içerik herkes tarafından görülebilir
 ContentsNotVisibleByAllShort=İçerik herkes tarafından görülemez
-CategoriesTree=Kategori ağacı
-DeleteCategory=Kategori sil
-ConfirmDeleteCategory=Bu kategoriyi silmek istediğinizden emin misiniz?
-RemoveFromCategory=Kategori bağlantısını kaldır
-RemoveFromCategoryConfirm=İşlem ile kategori arasındaki bağlantıyı kaldırmak istediğinizden emin misiniz?
-NoCategoriesDefined=Tanımlı kategori yok
-SuppliersCategoryShort=Tedarikçi kategorisi
-CustomersCategoryShort=Müşteri kategorisi
-ProductsCategoryShort=Ürün kategorisi
-MembersCategoryShort=Üye kategorisi
-SuppliersCategoriesShort=Tedarikçi kategorileri
-CustomersCategoriesShort=Müşteri kategorileri
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Müşt./aday kategorileri
-ProductsCategoriesShort=Ürün kategorileri
-MembersCategoriesShort=Üye kategorileri
-ContactCategoriesShort=Kişi kategorileri
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Bu kategori herhangi bir ürün içermiyor.
 ThisCategoryHasNoSupplier=Bu kategori herhangi bir tedarikçi içermiyor.
 ThisCategoryHasNoCustomer=Bu kategori herhangi bir müşteri içermiyor.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Bu kategori herhangi bir kişi içermiyor.
 AssignedToCustomer=Bir müşteriye atanmış
 AssignedToTheCustomer=Müşteriye atanmış
 InternalCategory=İç kategori
-CategoryContents=Kategori içeriği
-CategId=Kategori kimliği
-CatSupList=Tedarikçi kategorileri listesi
-CatCusList=Müşteri/beklenti kategorileri listesi
-CatProdList=Ürün kategorileri Listesi
-CatMemberList=Üye kategorileri Listesi
-CatContactList=Kişi kategorileri ve kişi listesi
-CatSupLinks=Tedarikçiler ve kategoriler arasındaki bağlantılar
-CatCusLinks=Müşteriler/adaylar ve kategoriler arasındaki bağlantılar
-CatProdLinks=Ürünler/hizmetler ve kategoriler arasındaki bağlantılar
-CatMemberLinks=Üyeler ve kategoriler arasındaki bağlantılar
-DeleteFromCat=Kategoriden kaldır
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Resim silindi
 ConfirmDeletePicture=Resim silmeyi onayla
 ExtraFieldsCategories=Tamamlayıcı öznitelikler
-CategoriesSetup=Kategori ayarları
-CategorieRecursiv=Ana kategoriyle otomatik bağlantılı
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Etkinse, ürün bir alt kategoriye eklenirken aynı zamanda ana kategoriye de eklenecektir
 AddProductServiceIntoCategory=Aşağıdaki ürünü/hizmeti ekle
-ShowCategory=Kategori göster
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index 88f8c321083..6666aa25183 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -51,7 +51,7 @@ StatusActionToDo=Yapılacaklar
 StatusActionDone=Tamamla
 MyActionsAsked=Kayıt ettiğim etkinlikler
 MyActionsToDo=Yapacağım etkinlikler
-MyActionsDone=Beni etkileyen etkinlikler
+MyActionsDone=Görevlendirildiğim etkinlikler
 StatusActionInProcess=İşlemde
 TasksHistoryForThisContact=Bu kişi için etkinlikler
 LastProspectDoNotContact=Görüşülmeyecek
@@ -62,7 +62,7 @@ LastProspectContactDone=Görüşme yapıldı
 DateActionPlanned=Planlanan etkinlik tarihi
 DateActionDone=Etkinliğin yapıldığı tarih
 ActionAskedBy=Etkinliği bildiren
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Etkinlik için görevlendirilen
 ActionDoneBy=Etkinliği yapan
 ActionUserAsk=Raporlayan
 ErrorStatusCantBeZeroIfStarted=Eğer Yapıldığı tarih alanı doluysa, etkinlik başlamıştır (veya bitmiştir),  bu durumda 'Durum' alanı 0%% olamaz.
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 6b452607545..2874d14febd 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -107,7 +107,7 @@ ProfId3Short=Prof id3
 ProfId4Short=Prof id4
 ProfId5Short=Prof id 5
 ProfId6Short=Prof. id 5
-ProfId1=Profesyonel ID 1
+ProfId1=Ticaret Sicil No
 ProfId2=Profesyonel ID 2
 ProfId3=Profesyonel ID 3
 ProfId4=Profesyonel ID 4
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index ef18a5fb522..5eeac707788 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -19,7 +19,7 @@ ServiceStatusLateShort=Süresi dolmuş
 ServiceStatusClosed=Kapalı
 ServicesLegend=Hizmetler göstergesi
 Contracts=Sözleşmeler
-ContractsAndLine=Contracts and line of contracts
+ContractsAndLine=Sözleşmeler ve satırları
 Contract=Sözleşme
 NoContracts=Sözleşme yok
 MenuServices=Hizmetler
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 3a55dd2b134..824ad2f4fa5 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Son çalıştırma çıktısı
 CronLastResult=Son sonuç kodu
 CronListOfCronJobs=Planlı işler listesi
 CronCommand=Komut
-CronList=İş listesi
-CronDelete= Cron işi sil
-CronConfirmDelete= Bu cron işini silmek istediğinizden emin misiniz?
-CronExecute=İş başlat
-CronConfirmExecute= Şimdi bu işi yürütmek istediğinizden emin misiniz
-CronInfo= Planllanmış işi yürütecek görevi sağlayan işler
-CronWaitingJobs=Bekleyen işler
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=İş
-CronNone= Hiçbiri
+CronNone=Hiçbiri
 CronDtStart=Başlama tarihi
 CronDtEnd=Son tarih
 CronDtNextLaunch=Sonraki yürütme
@@ -75,6 +75,7 @@ CronObjectHelp=Yüklenecek nesne adı. 
     Örneğin; Dolibarr Ürün nesnesi a
 CronMethodHelp=Çalıştırılacak nesne yöntemi. 
     Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/product/class/product.class.php, yöntem değeri fecth
 CronArgsHelp=Yöntem parametreleri. 
     Örneğin; Dolibarr Ürün nesnesi alım yöntemi /htdocs/product/class/product.class.php, parametre değerleri 0, ProductRef olabilir
 CronCommandHelp=Yürütülecek sistem komut satırı.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Bilgi
 # Common
@@ -84,4 +85,4 @@ CronType_command=Kabuk komutu
 CronMenu=Kron
 CronCannotLoadClass=%s sınıfı ya da %s nesnesi yüklenemiyor
 UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Giriş - Modül araçları - İş listesi" menüsüne gidin.
-TaskDisabled=Task disabled
+TaskDisabled=Görev engellendi
diff --git a/htdocs/langs/tr_TR/donations.lang b/htdocs/langs/tr_TR/donations.lang
index 234a7e4c859..d9c9d4c6ba4 100644
--- a/htdocs/langs/tr_TR/donations.lang
+++ b/htdocs/langs/tr_TR/donations.lang
@@ -6,6 +6,8 @@ Donor=Bağışçı
 Donors=Bağışçılar
 AddDonation=Bir bağış oluştur
 NewDonation=Yeni bağış
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Bağış göster
 DonationPromise=Hibe sözü
 PromisesNotValid=Doğrulanmamış sözler
@@ -21,6 +23,8 @@ DonationStatusPaid=Bağış alındı
 DonationStatusPromiseNotValidatedShort=Taslak
 DonationStatusPromiseValidatedShort=Doğrulanmış
 DonationStatusPaidShort=Alınan
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Söz doğrula
 DonationReceipt=Bağış makbuzu
 BuildDonationReceipt=Makbuz oluştur
@@ -36,3 +40,4 @@ FrenchOptions=Fransa için seçenekler
 DONATION_ART200=Eğer ilgileniyorsanız CGI den 200 öğe göster
 DONATION_ART238=Eğer ilgileniyorsanız CGI den 238 öğe göster
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 269f6173807..384513df1f5 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Kaynak ve hedef banka hesapları farklı olmalıd
 ErrorBadThirdPartyName=Üçüncü parti adı için hatalı değer
 ErrorProdIdIsMandatory=Bu %s zorunludur
 ErrorBadCustomerCodeSyntax=Hatalı müşteri kodu
-ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
+ErrorBadBarCodeSyntax=Barkod için hatalı sözdizimi. Belki hatalı bir barkod türü ayarladınız ya da taranan değerle eşleşmeyen barkod numaralandırma maskesi tanımladınız.
 ErrorCustomerCodeRequired=Müşteri kodu gereklidir
 ErrorBarCodeRequired=Bar kod gerekli
 ErrorCustomerCodeAlreadyUsed=Müşteri kodu zaten kullanılmış
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Bu özelliğin çalışması için Javascript engel
 ErrorPasswordsMustMatch=Her iki yazdığınız şifrenin birbiriyle eşleşmesi gerekir
 ErrorContactEMail=Teknik bir hata oluştu. Lütfen, aşağıdaki %s Eposta ile yöneticiye danışın, mesajınızda %s hata kodunu belirtin ve hatta bir ekran görünümünü de eklerseniz daha iyi olur.
 ErrorWrongValueForField=%s alan numarası için yanlış değer ('%s' değeri '%s' regex kuralı ile uyuşmuyor)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
+ErrorFieldValueNotIn=%s alan sayısı için hatalı değer ('%s' değeri %s = %s tablosundaki %s alanı içinde mevcut değil)
 ErrorFieldRefNotIn=Alan numarası %s için yanlış değer (değer '%s' bir %s ref mevcut değildir)
 ErrorsOnXLines=% kaynak satırlarındaki hatalar
 ErrorFileIsInfectedWithAVirus=Virüs koruma programı dosyayı doğrulayamıyor (dosyaya bir virüs bulaşmış olabilir)
@@ -160,7 +160,13 @@ ErrorPriceExpressionInternal=İç hata '%s'
 ErrorPriceExpressionUnknown=Bilinmeyen hata '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Kaynak ve hedef depolar farklı olmalı
 ErrorTryToMakeMoveOnProductRequiringBatchData=Hata, parti/seri bilgisi gerektiren ürün için parti/seri bilgisi olmadan stok hareketi yapılmaya çalışılıyor.
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Bütün kabul girişleri bu eylemin yapılmasına izin verilmeden önce doğrulanmalıdır.
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index 731c1b2d344..4fdb366c95d 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -156,7 +156,7 @@ LastStepDesc=Son adım: Burada yazılıma bağlanmayı düşün
 ActivateModule=%s modülünü etkinleştir
 ShowEditTechnicalParameters=Gelişmiş parametreleri (uzman modu) göstermek/düzenlemek için burayı tıklayın
 WarningUpgrade=Uyarı:\nÖnce bir veritabanı yedeklemesi yaptınız mı?\nBu son derece önerilir: örneğin; veritabanı sistemindeki bazı hatalar nedeniyle (örneğin mysql sürüm 5.5.40) bu işlem sırasında bazı veriler ve tablolar kaybolabilir. Bu yüzden taşımaya başlamadan önce veritabanının tam bir dökümünün olması son derece önerilir.\n\nTaşıma işlemini başlatmak için Tamam'a tıklayın...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+ErrorDatabaseVersionForbiddenForMigration=Veritabanınızın sürümü %s. Veritabanınızın yapısını değiştirirseniz veri kaybı yapacak bir kritik hata vardır, taşıma işlemi tarafından istenmesi gibi. Bu nedenle, veritabanınızı daha yüksek kararlı bir sürüme yükseltinceye kadar taşımaya izin verilmeyecektir (bilinen hatalar listesi sürümü: %s)
 
 #########
 # upgrade
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index 128034c94d7..d59aeeb8f71 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Gönderilen tüm e-posta bildirimleri listesi
 MailSendSetupIs=Yapılandırma e postası '%s' için ayarlandı. Bu mod toplu epostalama için kullanılamaz.
 MailSendSetupIs2='%s' Modunu kullanmak için '%s' parametresini değiştirecekseniz, önce yönetici hesabı ile %sGiriş - Ayarlar - Epostalar%s menüsüne gitmelisiniz. Bu mod ile İnternet Servis Sağlayıcınız tarafından sağlanan SMTP sunucusu ayarlarını girebilir ve Toplu eposta özelliğini kullanabilirsiniz.
 MailSendSetupIs3=SMTP sunucusunun nasıl yapılandırılacağı konusunda sorunuz varsa, %s e sorabilirsiniz.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 36d6a87625e..8de51040fd5 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -141,7 +141,7 @@ Cancel=İptal
 Modify=Değiştir
 Edit=Düzenle
 Validate=Doğrula
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=Doğrula ve onayla
 ToValidate=Doğrulanacak
 Save=Kaydet
 SaveAs=Farklı kaydet
@@ -159,7 +159,7 @@ Search=Ara
 SearchOf=Ara
 Valid=Geçerli
 Approve=Onayla
-Disapprove=Disapprove
+Disapprove=Onaylama
 ReOpen=Yeniden aç
 Upload=Dosya gönder
 ToLink=Bağlantı
@@ -221,7 +221,7 @@ Cards=Kartlar
 Card=Kart
 Now=Şimdi
 Date=Tarih
-DateAndHour=Date and hour
+DateAndHour=Tarih ve saat
 DateStart=Başlama tarihi
 DateEnd=Bitiş tarih
 DateCreation=Oluşturma tarihi
@@ -298,7 +298,7 @@ UnitPriceHT=Birim fiyat (net)
 UnitPriceTTC=Birim fiyat
 PriceU=B.F.
 PriceUHT=B.F. (net)
-AskPriceSupplierUHT=P.U. HT Requested
+AskPriceSupplierUHT=P.U. HT Gerekiyor
 PriceUTTC=B.F.
 Amount=Tutar
 AmountInvoice=Fatura tutarı
@@ -352,6 +352,7 @@ Status=Durum
 Favorite=Sık kullanılan
 ShortInfo=Bilgi.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. tedarikçi
 RefPayment=Ref. ödeme
 CommercialProposalsShort=Teklifler
@@ -394,8 +395,8 @@ Available=Mevcut
 NotYetAvailable=Henüz mevcut değil
 NotAvailable=Uygun değil
 Popularity=Popülerlik
-Categories=Kategoriler
-Category=Kategori
+Categories=Tags/categories
+Category=Tag/category
 By=Tarafından
 From=Başlama
 to=Bitiş
@@ -525,7 +526,7 @@ DateFromTo=%s den %s e kadar
 DateFrom=%s den
 DateUntil=%s e Kadar
 Check=Denetle
-Uncheck=Uncheck
+Uncheck=İşareti kaldır
 Internal=İç
 External=Dış
 Internals=İçler
@@ -693,7 +694,8 @@ PublicUrl=Genel URL
 AddBox=Kutu ekle
 SelectElementAndClickRefresh=Bir öğe seçin ve Yenile'ye tıkla
 PrintFile=%s Dosyasını Yazdır
-ShowTransaction=Show transaction
+ShowTransaction=İşlemi göster
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Pazartesi
 Tuesday=Salı
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index d203ffa5a23..375c91d7e01 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -42,7 +42,7 @@ StatusOrderCanceled=İptal edilmiş
 StatusOrderDraft=Taslak (doğrulanması gerekir)
 StatusOrderValidated=Doğrulanmış
 StatusOrderOnProcess=Sipariş edildi - Teslime hazır
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcessWithValidation=Sipariş edildi - Kabul ya da doğrulama için beklemede
 StatusOrderProcessed=İşlenmiş
 StatusOrderToBill=Teslim edildi
 StatusOrderToBill2=Faturalanacak
@@ -59,12 +59,13 @@ MenuOrdersToBill=Teslim edilen siparişler
 MenuOrdersToBill2=Faturalanabilir siparişler
 SearchOrder=Sipariş ara
 SearchACustomerOrder=Müşteri siparişi ara
-SearchASupplierOrder=Search a supplier order
+SearchASupplierOrder=Bir tedarikçi siparişi ara
 ShipProduct=Ürünü sevket
 Discount=İndirim
 CreateOrder=Sipariş oluştur
 RefuseOrder=Siparişi reddet
-ApproveOrder=Sipariş kabul et
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Doğrulamak amacıyla
 UnvalidateOrder=Siparişten doğrulamayı kaldır
 DeleteOrder=Sipariş sil
@@ -102,6 +103,8 @@ ClassifyBilled=Faturalı olarak sınıflandır
 ComptaCard=Muhasebe kartı
 DraftOrders=Taslak siparişler
 RelatedOrders=İlgili siparişler
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=İşlemdeki siparişler
 RefOrder=Sipariş ref.
 RefCustomerOrder=Müşteri sipariş ref.
@@ -118,6 +121,7 @@ PaymentOrderRef=Sipariş %s ödemesi
 CloneOrder=Siparişi klonla
 ConfirmCloneOrder=Bu %s siparişi klonlamak istediğinizden emin misiniz?
 DispatchSupplierOrder=%s tedarikçi siparişini al
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Müşteri siparişi izleme temsilcisi
 TypeContact_commande_internal_SHIPPING=Sevkiyat izleme temsilcisi
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index f8f84232e9d..b1cd3b07cb0 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Müdahale doğrulandı
 Notify_FICHINTER_SENTBYMAIL=Müdahale posta ile gönderildi
 Notify_BILL_VALIDATE=Müşteri faturası onaylandı
 Notify_BILL_UNVALIDATE=Müşteri faturasından doğrulama kaldırıldı
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Tedarikçi siparişi onaylandı
 Notify_ORDER_SUPPLIER_REFUSE=Tedarikçi siparişi reddedildi
 Notify_ORDER_VALIDATE=Müşteri siparişi onaylandı
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Teklif posta ile gönderildi
 Notify_BILL_PAYED=Müşteri faturası ödendi
 Notify_BILL_CANCEL=Müşteri faturası iptal edildi
 Notify_BILL_SENTBYMAIL=Müşteri faturası postayla gönderildi
-Notify_ORDER_SUPPLIER_VALIDATE=Tedarikçi faturası onaylandı
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Tedarikçi siparişi posta ile gönderildi
 Notify_BILL_SUPPLIER_VALIDATE=Tedarikçi faturası onaylandı
 Notify_BILL_SUPPLIER_PAYED=Tedarikçi faturası ödendi
@@ -47,20 +48,20 @@ Notify_PROJECT_CREATE=Proje oluşturma
 Notify_TASK_CREATE=Görev oluşturuldu
 Notify_TASK_MODIFY=Görev bilgileri değiştirildi
 Notify_TASK_DELETE=Görev silindi
-SeeModuleSetup=Modül kurulumuna bak
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Eklenen dosya/belge sayısı
 TotalSizeOfAttachedFiles=Eklenen dosyaların/belgelerin toplam boyutu
 MaxSize=Ençok boyut
 AttachANewFile=Yeni bir dosya/belge ekle
 LinkedObject=Bağlantılı nesne
 Miscellaneous=Çeşitli
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
+NbOfActiveNotifications=Bildirim sayısı (alıcı epostaları sayısı)
 PredefinedMailTest=Bu bir deneme postasıdır.\nİki satır enter tuşu ile ayrılmıştır.
 PredefinedMailTestHtml=Bu bir deneme postası (deneme sözcüğü koyu olmalı).
    İki satır enter tuşu ile ayrılmıştır.
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nSize faturanız  __FACREF__ için ödeme yapılmamış göründüğünü belirtmek isteriz. Anımsatma amacıyla ilgili fatura ekte sunulmuştur.\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz bilgilerinize sunulmuştur __PROPREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
-PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nFiyat isteği sunulmuştur__ASKREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFatura buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Fatura %s doğrulanmıştır.
 EMailTextProposalValidated=Teklif % doğrulanmıştır.
 EMailTextOrderValidated=Sipariş %s doğrulanmıştır.
 EMailTextOrderApproved=Sipariş %s onaylanmıştır.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=%s Siparişi %s tarafından onaylanmıştır.
 EMailTextOrderRefused=%s Teklifi reddedilmiştir.
 EMailTextOrderRefusedBy=%s Teklifi %tarafından reddedilmiştir.
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
index 24ea291a110..c7f701bb522 100644
--- a/htdocs/langs/tr_TR/productbatch.lang
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Parti/Seri numarası
 l_eatby=Son yenme tarihi
 l_sellby=Son satış tarihi
 DetailBatchNumber=Parti/Seri ayrıntıları
-DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+DetailBatchFormat=Parti/Seri: %s - Son Yenme: %s - Son Satış: %s (Mik: %d)
 printBatch=Parti: %s
 printEatby=Son Yenme: %s
 printSellby=Son satış: %s
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index fdf8b1a3b98..52332a5fff5 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Önerilen enaz fiyat: %s
 PriceExpressionEditor=Fiyat ifadesi düzenleyici
 PriceExpressionSelected=Seçili fiyat ifadesi
 PriceExpressionEditorHelp1=Fiyat ayarlaması için "fiyat = 2 + 2" ya da "2 + 2". Terimleri ayırmak için ; kullan
-PriceExpressionEditorHelp2=EkAlanlara #options_myextrafieldkey# gibi değişkenlerle erişebilirsiniz
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=Ürün/hizmet ve tedarikçi fiyatlarının her ikisinde de bu değişkenler bulunmaktadır:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=Ürün/hizmet fiyatında yalnızca: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Fiyat biçimi
 PriceNumeric=Sayı
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+DefaultPrice=Varsayılan fiyat
+ComposedProductIncDecStock=Ana değişimde stok Arttır/Eksilt
+ComposedProduct=Yan ürün
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index b9531646c0b..143f3d1350a 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -8,10 +8,10 @@ SharedProject=Herkes
 PrivateProject=Proje ilgilileri
 MyProjectsDesc=Bu görünüm ilgilisi olduğunuz projelerle sınırlıdır (türü ne olursa olsun).
 ProjectsPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri içerir.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
+ProjectsPublicTaskDesc=Bu görünüm, okumanıza izin verilen tüm proje ve görevleri sunar.
 ProjectsDesc=Bu görünüm tüm projeleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
 MyTasksDesc=Bu görünüm ilgilisi olduğunuz projelerle ya da görevlerle sınırlıdır (türü ne olursa olsun).
-OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
+OnlyOpenedProject=Yalnızca açık projeler görünürdür (taslak ya da kapalı durumdaki projeler görünmez)
 TasksPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri ve görevleri içerir.
 TasksDesc=Bu görünüm tüm projeleri ve görevleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
 ProjectsArea=Projeler alanı
@@ -31,8 +31,8 @@ NoProject=Tanımlı ya da sahip olunan hiçbir proje yok
 NbOpenTasks=Açık görev sayısı
 NbOfProjects=Proje sayısı
 TimeSpent=Harcanan süre
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Tarafınızdan harcanan süre
+TimeSpentByUser=Kullanıcı tarafından harcanan süre
 TimesSpent=Harcanan süre
 RefTask=Görev ref.
 LabelTask=Görev etiketi
@@ -71,7 +71,8 @@ ListSupplierOrdersAssociatedProject=Proje ile ilgili tedarikçi siparişlerinin
 ListSupplierInvoicesAssociatedProject=Proje ile ilgili tedarikçi faturalarının listesi
 ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi
 ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListExpenseReportsAssociatedProject=Bu proje ile ilişkili gider raporları listesi
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Proje ile ilgili etkinliklerin listesi
 ActivityOnProjectThisWeek=Projede bu haftaki etkinlik
 ActivityOnProjectThisMonth=Projede bu ayki etkinlik
@@ -130,13 +131,15 @@ AddElement=Öğeye bağlan
 UnlinkElement=Öğenin bağlantısını kaldır
 # Documents models
 DocumentModelBaleine=Eksiksiz bir proje rapor modeli (logo. ..)
-PlannedWorkload = Planlı işyükü
-WorkloadOccupation= İş yükü benzetmesi
+PlannedWorkload=Planlı işyükü
+PlannedWorkloadShort=İşyükü
+WorkloadOccupation=İşyükü ataması
 ProjectReferers=Yönlendirme nesneleri
 SearchAProject=Bir proje ara
 ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır
 ProjectDraft=Taslak projeler
 FirstAddRessourceToAllocateTime=Zaman ayırmak için bir kaynak ilişkilendirin
-InputPerTime=Input per time
-InputPerDay=Input per day
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
+InputPerDay=Günlük giriş
+InputPerWeek=Haftalık giriş
+InputPerAction=Eylem başına giriş
+TimeAlreadyRecorded=Bu görev ve kullanıcı %s için harcanan süre zaten kayıtlı
diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index 1d5aa85d140..4bc47248b7f 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -10,4 +10,4 @@ SalariesPayments=Ücret ödemeleri
 ShowSalaryPayment=Ücret ödemesi göster
 THM=Ortalama saat ücreti
 TJM=Ortalama günlük ücret
-CurrentSalary=Current salary
+CurrentSalary=Güncel maaş
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index 9a202a374f2..6b6781c4276 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Sevkiyat ref.
 Sending=Sevkiyat
 Sendings=Sevkiyatlar
+AllSendings=All Shipments
 Shipment=Sevkiyat
 Shipments=Sevkiyatlar
 ShowSending=Gönderimi göster
@@ -23,7 +24,7 @@ QtyOrdered=Sipariş mikt.
 QtyShipped=Sevkedilen mikt.
 QtyToShip=Sevk edilecek mikt.
 QtyReceived=Alınan mikt.
-KeepToShip=Remain to ship
+KeepToShip=Gönderilmek için kalır
 OtherSendingsForSameOrder=Bu sipariş için diğer sevkiyatlar
 DateSending=Sipariş gönderme tarihi
 DateSendingShort=Sipariş gönderme tarihi
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 8856d87badd..3360b2afbb7 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -47,7 +47,7 @@ PMPValue=Ağırlıklı ortalama fiyat
 PMPValueShort=AOF
 EnhancedValueOfWarehouses=Depolar değeri
 UserWarehouseAutoCreate=Bir kullanıcı oluştururken otomatik olarak bir stok oluştur
-IndependantSubProductStock=Product stock and subproduct stock are independant
+IndependantSubProductStock=Ürün stoku ve yan ürün stoku bağımsızdır
 QtyDispatched=Sevkedilen miktar
 QtyDispatchedShort=Dağıtılan mik
 QtyToDispatchShort=Dağıtılacak mik
@@ -111,7 +111,7 @@ WarehouseForStockDecrease=%s deposu stok eksiltme için kullanılacaktır
 WarehouseForStockIncrease=%s deposu stok arttırma için kullanılacaktır
 ForThisWarehouse=Bu depo için
 ReplenishmentStatusDesc=Bu liste istenen stoktan daha az stoklu bütün ürünler içindir (ya da eğer onay kutusunda "yalnızca uyarı" işaretliyse, uyarı değerinden az olan) ve bu farkı kapatmanız için tedarikçi siparişi oluşturmanızı önerir.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
+ReplenishmentOrdersDesc=Bu, öntanımlı ürünleri de içeren tüm açık tedarikçi siparişleri listesidir. Burada yalnızca öntanımlı ürünleri içeren açık siparişler, stokları etkileyebilir, görünür.
 Replenishments=İkmal
 NbOfProductBeforePeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) önceki miktarıdır
 NbOfProductAfterPeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) sonraki miktarıdır
@@ -131,4 +131,4 @@ IsInPackage=Pakette içerilir
 ShowWarehouse=Depo göster
 MovementCorrectStock=%s ürünü için stok içeriği düzeltmesi
 MovementTransferStock=%s ürününün başka bir depoya stok aktarılması
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Parti modülü açıksa burada kaynak depo tanımlanmalıdır. Hareket için parti/seri gereken ürün için hangi parti/serinin mevcut olduğunun listelenmesi için kullanılacaktır. Farklı depolardan ürün göndermek isterseniz, yalnızca sevkiyatı birkaç adımda yapın.
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index b4b16859cc1..87ead1dd32e 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -29,7 +29,7 @@ ExportDataset_fournisseur_2=Tedarikçi faturaları ve ödemeleri
 ExportDataset_fournisseur_3=Tedarikçi siparişleri ve sipariş satırları
 ApproveThisOrder=Bu siparişi onayla
 ConfirmApproveThisOrder=%s siparişini onaylamak istediğinizden emin misiniz?
-DenyingThisOrder=Deny this order
+DenyingThisOrder=Bu siparişi reddet
 ConfirmDenyingThisOrder=%s siparişini reddetmek istediğinizden emin misiniz?
 ConfirmCancelThisOrder=%s siparişini iptal etmek istediğinizden emin misiniz?
 AddCustomerOrder=Müşteri siparişi oluştur
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Tedarikçi siparişleri listesi
 MenuOrdersSupplierToBill=Faturalanacak tedarikçi siparişleri
 NbDaysToDelivery=Gün olarak teslim süresi
 DescNbDaysToDelivery=Sipariş ürün listesindeki en uzun teslim süresi
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index 30c0831f5ac..97448e921fb 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -1,126 +1,126 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
-Trip=Expense report
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense report
+ExpenseReport=Gider raporu
+ExpenseReports=Gider raporları
+Trip=Gider raporu
+Trips=Gider raporları
+TripsAndExpenses=Giderler raporları
+TripsAndExpensesStatistics=Gider raporları istatistkleri
+TripCard=Gider raporu kartı
+AddTrip=Gider raporu oluştur
+ListOfTrips=Gider raporu listesi
 ListOfFees=Ücretler listesi
-NewTrip=New expense report
+NewTrip=Yeni gider raporu
 CompanyVisited=Ziyaret edilen firma/kuruluş
 Kilometers=Kilometre
 FeesKilometersOrAmout=Tutar ya da kilometre
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-SearchATripAndExpense=Search an expense report
+DeleteTrip=Gider raporu sil
+ConfirmDeleteTrip=Bu gider raporunu silmek istediğinizden emin misiniz?
+ListTripsAndExpenses=Giderler raporları listesi
+ListToApprove=Onay bekliyor
+ExpensesArea=Gider raporları alanı
+SearchATripAndExpense=Bir gider raporu ara
 ClassifyRefunded=Sınıflandırma 'İade edildi'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripSalarie=Informations user
-TripNDF=Informations expense report
-DeleteLine=Delete a ligne of the expense report
-ConfirmDeleteLine=Are you sure you want to delete this line ?
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
+ExpenseReportWaitingForApproval=Onay için yeni bir gider raporu sunulmuştur
+ExpenseReportWaitingForApprovalMessage=Yeni bir gider raporu sunulmuş olup onay için beklemektedir.\n- Kullanıcı: %s\n- Dönem: %s\nDoğrulamak için buraya tıklayın: %s
+TripId=Gider raporu kimliği
+AnyOtherInThisListCanValidate=Doğrulama için bilgilendirilecek kişi
+TripSociete=Firma bilgisi
+TripSalarie=Kullanıcı bilgisi
+TripNDF=Gider raporu bilgileri
+DeleteLine=Gider raporundan bir satır sil
+ConfirmDeleteLine=Bu satırı silmek istediğinizden emin misiniz?
+PDFStandardExpenseReports=Bu gider raporu için PDF belgesi oluşturulacak standart şablon
+ExpenseReportLine=Gider rapor satırı
 TF_OTHER=Diğer
-TF_TRANSPORTATION=Transportation
+TF_TRANSPORTATION=Nakliye
 TF_LUNCH=Öğle yemeği
 TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
+TF_TRAIN=Tren
+TF_BUS=Otobüs
+TF_CAR=Araba
+TF_PEAGE=Geçiş parası
+TF_ESSENCE=Yakıt
 TF_HOTEL=Hostel
-TF_TAXI=Taxi
+TF_TAXI=Taksi
 
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-ListTripsAndExpenses=List of expense reports
-AucuneNDF=No expense reports found for this criteria
-AucuneLigne=There is no expense report declared yet
-AddLine=Add a line
-AddLineMini=Add
+ErrorDoubleDeclaration=Benzer bir tarih aralığı için başka bir gider raporu bildirdiniz.
+ListTripsAndExpenses=Giderler raporları listesi
+AucuneNDF=Bu kriter uyan hiç gider raporu bulunamadı
+AucuneLigne=Bildirilen hiç gider raporu yok
+AddLine=Satır ekle
+AddLineMini=Ekle
 
-Date_DEBUT=Period date start
-Date_FIN=Period date end
-ModePaiement=Payment mode
-Note=Note
-Project=Project
+Date_DEBUT=Dönem tarihi başı
+Date_FIN=Dönem tarihi sonu
+ModePaiement=Ödeme biçimi
+Note=Not
+Project=Proje
 
-VALIDATOR=User to inform for approbation
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paied by
-REFUSEUR=Denied by
-CANCEL_USER=Canceled by
+VALIDATOR=Onama için bilgilendirilecek kullanıcı
+VALIDOR=Onaylayan
+AUTHOR=Kaydeden
+AUTHORPAIEMENT=Ödeyen
+REFUSEUR=Reddeden
+CANCEL_USER=İptal eden
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=Neden
+MOTIF_CANCEL=Neden
 
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_VALIDE=Validation date
-DateApprove=Approving date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
+DATE_REFUS=Ret tarihi
+DATE_SAVE=Onay tarihi
+DATE_VALIDE=Onay tarihi
+DateApprove=Onaylama tarihi
+DATE_CANCEL=İptal etme tarihi
+DATE_PAIEMENT=Ödeme tarihi
 
-Deny=Deny
-TO_PAID=Pay
-BROUILLONNER=Reopen
-SendToValid=Sent to approve
-ModifyInfoGen=Edit
-ValidateAndSubmit=Validate and submit for approval
+Deny=Ret
+TO_PAID=Öde
+BROUILLONNER=Yeniden aç
+SendToValid=Onay için gönder
+ModifyInfoGen=Düzenle
+ValidateAndSubmit=Doğrula ve onay için gönder
 
-NOT_VALIDATOR=You are not allowed to approve this expense report
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+NOT_VALIDATOR=Bu gider raporunu onaylama yetiniz yok
+NOT_AUTHOR=Bu gider raporunu yazan siz değilsiniz. İşlem iptal edildi.
 
-RefuseTrip=Deny an expense report
-ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+RefuseTrip=Bir gider raporu reddet
+ConfirmRefuseTrip=Bu gider raporunu reddetmek istediğinizden emin misiniz?
 
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report ?
+ValideTrip=Gider raporunu onayla
+ConfirmValideTrip=Bu gider raporunu onaylamak istediğinizden emin misiniz?
 
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+PaidTrip=Bir gider raporu öde
+ConfirmPaidTrip=Bu gider raporunun durumunu "Ödendi" olarak değiştirmek istediğinizden emin misiniz?
 
-CancelTrip=Cancel an expense report
-ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+CancelTrip=Bir gider raporu iptal et
+ConfirmCancelTrip=Bu gider raporunu iptal etmek istediğinizden emin misiniz?
 
-BrouillonnerTrip=Move back expense report to status "Draft"n
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+BrouillonnerTrip=Gider raporun geri "Taslak" durumuna döndür
+ConfirmBrouillonnerTrip=Bu gider raporunu "Taslak" durumuna döndürmek istediğinizden emin misiniz?
 
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+SaveTrip=Gider raporunu doğrula
+ConfirmSaveTrip=Bu gider raporunu doğrulamak istediğinizden emin misiniz?
 
-Synchro_Compta=NDF <-> Compte
+Synchro_Compta=NDF <-> Hesap
 
-TripSynch=Synchronisation : Notes de frais <-> Compte courant
-TripToSynch=Notes de frais à intégrer dans la compta
-AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
-ViewAccountSynch=Voir le compte
+TripSynch=Senkronizasyon: Gider Raporu <-> Cari Hesap
+TripToSynch=Hesaba işlenecek gider raporu
+AucuneTripToSynch="Ödendi" durumunda hiç gider raporu yok
+ViewAccountSynch=Hesabı incele
 
-ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
-ndfToAccount=Note de frais - Intégration
+ConfirmNdfToAccount=Bu gider raporunu geçerli hesaba işlemek istediğinizden emin misiniz?
+ndfToAccount=Gider raporu - Entegrasyon
 
-ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
-AccountToNdf=Note de frais - Retrait
+ConfirmAccountToNdf=Bu gider raporunu geçerli hesaptan silmek istediğinizden emin misini?
+AccountToNdf=Gider Raporu - Para çekme
 
-LINE_NOT_ADDED=Ligne non ajoutée :
-NO_PROJECT=Aucun projet sélectionné.
-NO_DATE=Aucune date sélectionnée.
-NO_PRICE=Aucun prix indiqué.
+LINE_NOT_ADDED=Hiç satır eklenmedi:
+NO_PROJECT=Hiçbir proje seçilmemiştir.
+NO_DATE=Hiçbir tarih seçilmemiştir.
+NO_PRICE=Hiçbir fiyat belirtilmiştir.
 
-TripForValid=à Valider
-TripForPaid=à Payer
-TripPaid=Payée
+TripForValid=Doğrulanacak
+TripForPaid=Ödenecek
+TripPaid=Ödendi
 
-NoTripsToExportCSV=No expense report to export for this period.
+NoTripsToExportCSV=Bu dönem için dışaaktarılacak gider raporu yok.
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index c244a6aacf4..ea96fc8e07f 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index d45452deaa2..65adcd2c421 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 7232f00e91c..014996eee65 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index e7e9da7dc1b..b3778e84736 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLastRssInfos=Rss information
+BoxLastRssInfos=Інформація RSS
 BoxLastProducts=Last %s products/services
 BoxProductsAlertStock=Products in stock alert
 BoxLastProductsInContract=Last %s contracted products/services
@@ -7,46 +7,50 @@ BoxLastSupplierBills=Last supplier's invoices
 BoxLastCustomerBills=Last customer's invoices
 BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices
 BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices
-BoxLastProposals=Last commercial proposals
+BoxLastProposals=Останні комерційні пропозиції
 BoxLastProspects=Last modified prospects
 BoxLastCustomers=Last modified customers
 BoxLastSuppliers=Last modified suppliers
-BoxLastCustomerOrders=Last customer orders
+BoxLastCustomerOrders=Останні замовлення покупця
+BoxLastValidatedCustomerOrders=Last validated customer orders
 BoxLastBooks=Last books
-BoxLastActions=Last actions
-BoxLastContracts=Last contracts
-BoxLastContacts=Last contacts/addresses
-BoxLastMembers=Last members
+BoxLastActions=Останні дії
+BoxLastContracts=Останні контракти
+BoxLastContacts=Останні контакти / адреси
+BoxLastMembers=Останні учасники
 BoxFicheInter=Last interventions
 BoxCurrentAccounts=Opened accounts balance
 BoxSalesTurnover=Sales turnover
 BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
 BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
 BoxTitleLastBooks=Last %s recorded books
-BoxTitleNbOfCustomers=Number of clients
+BoxTitleNbOfCustomers=Кількість покупців
 BoxTitleLastRssInfos=Last %s news from %s
 BoxTitleLastProducts=Last %s modified products/services
 BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Last %s modified customer orders
+BoxTitleLastCustomerOrders=Last %s customer orders
+BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
 BoxTitleLastSuppliers=Last %s recorded suppliers
 BoxTitleLastCustomers=Last %s recorded customers
 BoxTitleLastModifiedSuppliers=Last %s modified suppliers
 BoxTitleLastModifiedCustomers=Last %s modified customers
-BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects
-BoxTitleLastPropals=Last %s recorded proposals
+BoxTitleLastCustomersOrProspects=Last %s customers or prospects
+BoxTitleLastPropals=Last %s proposals
+BoxTitleLastModifiedPropals=Last %s modified proposals
 BoxTitleLastCustomerBills=Last %s customer's invoices
+BoxTitleLastModifiedCustomerBills=Last %s modified customer invoices
 BoxTitleLastSupplierBills=Last %s supplier's invoices
-BoxTitleLastProspects=Last %s recorded prospects
+BoxTitleLastModifiedSupplierBills=Last %s modified supplier invoices
 BoxTitleLastModifiedProspects=Last %s modified prospects
 BoxTitleLastProductsInContract=Last %s products/services in a contract
-BoxTitleLastModifiedMembers=Last %s modified members
+BoxTitleLastModifiedMembers=Last %s members
 BoxTitleLastFicheInter=Last %s modified intervention
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices
+BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
+BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
 BoxTitleCurrentAccounts=Opened account's balances
 BoxTitleSalesTurnover=Sales turnover
-BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices
-BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's invoices
+BoxTitleTotalUnpaidCustomerBills=Несплачені рахунки клієнта
+BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
 BoxTitleLastModifiedContacts=Last %s modified contacts/addresses
 BoxMyLastBookmarks=My last %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
@@ -76,7 +80,8 @@ NoContractedProducts=No products/services contracted
 NoRecordedContracts=No recorded contracts
 NoRecordedInterventions=No recorded interventions
 BoxLatestSupplierOrders=Latest supplier orders
-BoxTitleLatestSupplierOrders=%s latest supplier orders
+BoxTitleLatestSupplierOrders=Last %s supplier orders
+BoxTitleLatestModifiedSupplierOrders=Last %s modified supplier orders
 NoSupplierOrder=No recorded supplier order
 BoxCustomersInvoicesPerMonth=Customer invoices per month
 BoxSuppliersInvoicesPerMonth=Supplier invoices per month
@@ -87,5 +92,5 @@ NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
 ForCustomersInvoices=Customers invoices
-ForCustomersOrders=Customers orders
-ForProposals=Proposals
+ForCustomersOrders=Замовлення клієнтів
+ForProposals=Пропозиції
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/uk_UA/donations.lang b/htdocs/langs/uk_UA/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/uk_UA/donations.lang
+++ b/htdocs/langs/uk_UA/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 7a211198822..957c62b923c 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -9,9 +9,9 @@ MailTargets=Targets
 MailRecipients=Recipients
 MailRecipient=Recipient
 MailTitle=Description
-MailFrom=Sender
+MailFrom=Відправник
 MailErrorsTo=Errors to
-MailReply=Reply to
+MailReply=Відповісти
 MailTo=Receiver(s)
 MailCC=Copy to
 MailCCC=Cached copy to
@@ -69,10 +69,10 @@ CloneEMailing=Clone Emailing
 ConfirmCloneEMailing=Are you sure you want to clone this emailing ?
 CloneContent=Clone message
 CloneReceivers=Cloner recipients
-DateLastSend=Date of last sending
-DateSending=Date sending
+DateLastSend=Дата останньої відправки
+DateSending=Дата відправки
 SentTo=Sent to %s
-MailingStatusRead=Read
+MailingStatusRead=Читати
 CheckRead=Read Receipt
 YourMailUnsubcribeOK=The email %s  is correctly unsubcribe from mailing list
 MailtoEMail=Hyper link to email
@@ -126,10 +126,10 @@ DeliveryReceipt=Delivery Receipt
 YouCanUseCommaSeparatorForSeveralRecipients=You can use the comma separator to specify several recipients.
 TagCheckMail=Track mail opening
 TagUnsubscribe=Unsubscribe link
-TagSignature=Signature sending user
+TagSignature=Підпис відправника
 TagMailtoEmail=Recipient EMail
 # Module Notifications
-Notifications=Notifications
+Notifications=Оповіщення
 NoNotificationsWillBeSent=No email notifications are planned for this event and company
 ANotificationsWillBeSent=1 notification will be sent by email
 SomeNotificationsWillBeSent=%s notifications will be sent by email
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 05b5f395001..4e4c5fba031 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 9782c2ea27f..3df78528d98 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Notifications
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=Donations
@@ -508,14 +511,14 @@ Module1400Name=Accounting
 Module1400Desc=Accounting management (double parties)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Categories
-Module1780Desc=Category management (products, suppliers and customers)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Allow to edit some text area using an advanced editor
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=Agenda
 Module2400Desc=Events/tasks and agenda management
 Module2500Name=Electronic Content Management
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Read services
 Permission532=Create/modify services
 Permission534=Delete services
@@ -746,6 +754,7 @@ Permission1185=Approve supplier orders
 Permission1186=Order supplier orders
 Permission1187=Acknowledge receipt of supplier orders
 Permission1188=Delete supplier orders
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Get result of an export
 Permission1202=Create/Modify an export
 Permission1231=Read supplier invoices
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=Run mass imports of external data into database (data load)
 Permission1321=Export customer invoices, attributes and payments
 Permission1421=Export customer orders and attributes
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Read actions (events or tasks) linked to his account
 Permission2402=Create/modify actions (events or tasks) linked to his account
 Permission2403=Delete actions (events or tasks) linked to his account
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Return an accountancy code built by:
    %s followed by
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
 UseNotifications=Use notifications
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
@@ -1557,6 +1566,7 @@ SuppliersSetup=Supplier module setup
 SuppliersCommandModel=Complete template of supplier order (logo...)
 SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 04e2ae30de8..55fde86864b 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= Order %s validated
+OrderValidatedInDolibarr=Order %s validated
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Order %s canceled
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Order %s approved
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=Order %s go back to draft status
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 7232f00e91c..014996eee65 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=Payment rule
 PaymentMode=Payment type
-PaymentConditions=Payment term
-PaymentConditionsShort=Payment term
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=Payment amount
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=Payment higher than reminder to pay
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to
 ConfirmRemoveDiscount=Are you sure you want to remove this discount ?
 RelatedBill=Related invoice
 RelatedBills=Related invoices
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 22914931db1..7c293065433 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Category
-Categories=Categories
-Rubrique=Category
-Rubriques=Categories
-categories=categories
-TheCategorie=The category
-NoCategoryYet=No category of this type created
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=In
 AddIn=Add in
 modify=modify
 Classify=Classify
-CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services categories area
-SuppliersCategoriesArea=Suppliers categories area
-CustomersCategoriesArea=Customers categories area
-ThirdPartyCategoriesArea=Third parties categories area
-MembersCategoriesArea=Members categories area
-ContactsCategoriesArea=Contacts categories area
-MainCats=Main categories
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Subcategories
 CatStatistics=Statistics
-CatList=List of categories
-AllCats=All categories
-ViewCat=View category
-NewCat=Add category
-NewCategory=New category
-ModifCat=Modify category
-CatCreated=Category created
-CreateCat=Create category
-CreateThisCat=Create this category
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Validate the fields
 NoSubCat=No subcategory.
 SubCatOf=Subcategory
-FoundCats=Found categories
-FoundCatsForName=Categories found for the name :
-FoundSubCatsIn=Subcategories found in the category
-ErrSameCatSelected=You selected the same category several times
-ErrForgotCat=You forgot to choose the category
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=You forgot to inform the fields
 ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a category?
-ImpossibleAddCat=Impossible to add the category
-ImpossibleAssociateCategory=Impossible to associate the category to
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this category.
-CategorySuccessfullyCreated=This category %s has been added with success.
-ProductIsInCategories=Product/service owns to following categories
-SupplierIsInCategories=Third party owns to following suppliers categories
-CompanyIsInCustomersCategories=This third party owns to following customers/prospects categories
-CompanyIsInSuppliersCategories=This third party owns to following suppliers categories
-MemberIsInCategories=This member owns to following members categories
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=This product/service is not in any categories
-SupplierHasNoCategory=This supplier is not in any categories
-CompanyHasNoCategory=This company is not in any categories
-MemberHasNoCategory=This member is not in any categories
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=Classify in category
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=None
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
 ReturnInProduct=Back to product/service card
 ReturnInSupplier=Back to supplier card
@@ -66,22 +64,22 @@ ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
-CategoriesTree=Categories tree
-DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
-RemoveFromCategory=Remove link with categorie
-RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the category ?
-NoCategoriesDefined=No category defined
-SuppliersCategoryShort=Suppliers category
-CustomersCategoryShort=Customers category
-ProductsCategoryShort=Products category
-MembersCategoryShort=Members category
-SuppliersCategoriesShort=Suppliers categories
-CustomersCategoriesShort=Customers categories
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products categories
-MembersCategoriesShort=Members categories
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=Assigned to a customer
 AssignedToTheCustomer=Assigned to the customer
 InternalCategory=Internal category
-CategoryContents=Category contents
-CategId=Category id
-CatSupList=List of supplier categories
-CatCusList=List of customer/prospect categories
-CatProdList=List of products categories
-CatMemberList=List of members categories
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index 28dfc7770b2..5adc428b628 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= None
+CronNone=None
 CronDtStart=Start date
 CronDtEnd=End date
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/uz_UZ/donations.lang b/htdocs/langs/uz_UZ/donations.lang
index f7aed91cf81..2e9c619194f 100644
--- a/htdocs/langs/uz_UZ/donations.lang
+++ b/htdocs/langs/uz_UZ/donations.lang
@@ -6,6 +6,8 @@ Donor=Donor
 Donors=Donors
 AddDonation=Create a donation
 NewDonation=New donation
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=Gift promise
 PromisesNotValid=Not validated promises
@@ -21,6 +23,8 @@ DonationStatusPaid=Donation received
 DonationStatusPromiseNotValidatedShort=Draft
 DonationStatusPromiseValidatedShort=Validated
 DonationStatusPaidShort=Received
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Validate promise
 DonationReceipt=Donation receipt
 BuildDonationReceipt=Build receipt
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 700e6344d7d..52e9f6aeae4 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 7a211198822..89c71da9123 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=List all email notifications sent
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index f34681e8530..711c3e0752c 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -352,6 +352,7 @@ Status=Status
 Favorite=Favorite
 ShortInfo=Info.
 Ref=Ref.
+ExternalRef=Ref. extern
 RefSupplier=Ref. supplier
 RefPayment=Ref. payment
 CommercialProposalsShort=Commercial proposals
@@ -394,8 +395,8 @@ Available=Available
 NotYetAvailable=Not yet available
 NotAvailable=Not available
 Popularity=Popularity
-Categories=Categories
-Category=Category
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=From
 to=to
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index 8efafa5e94e..3d4f381c40b 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Discount
 CreateOrder=Create Order
 RefuseOrder=Refuse order
-ApproveOrder=Accept order
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +103,8 @@ ClassifyBilled=Classify billed
 ComptaCard=Accountancy card
 DraftOrders=Draft orders
 RelatedOrders=Related orders
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=In process orders
 RefOrder=Ref. order
 RefCustomerOrder=Ref. customer order
@@ -118,6 +121,7 @@ PaymentOrderRef=Payment of order %s
 CloneOrder=Clone order
 ConfirmCloneOrder=Are you sure you want to clone this order %s ?
 DispatchSupplierOrder=Receiving supplier order %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
 TypeContact_commande_internal_SHIPPING=Representative following-up shipping
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 08747ea884b..9b2de3eeb90 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Intervention validated
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Supplier order approved
 Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_ORDER_VALIDATE=Customer order validated
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
 Notify_BILL_PAYED=Customer invoice payed
 Notify_BILL_CANCEL=Customer invoice canceled
 Notify_BILL_SENTBYMAIL=Customer invoice sent by mail
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order validated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Supplier order sent by mail
 Notify_BILL_SUPPLIER_VALIDATE=Supplier invoice validated
 Notify_BILL_SUPPLIER_PAYED=Supplier invoice payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=The invoice %s has been validated.
 EMailTextProposalValidated=The proposal %s has been validated.
 EMailTextOrderValidated=The order %s has been validated.
 EMailTextOrderApproved=The order %s has been approved.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=The order %s has been approved by %s.
 EMailTextOrderRefused=The order %s has been refused.
 EMailTextOrderRefusedBy=The order %s has been refused by %s.
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 3a18cda69e7..c29232087b9 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 0a12f4c64b7..03c11382a2d 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated wit
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=List of events associated with the project
 ActivityOnProjectThisWeek=Activity on project this week
 ActivityOnProjectThisMonth=Activity on project this month
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=A complete project's report model (logo...)
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index b1ff55f71c1..84088c3e023 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Ref. shipment
 Sending=Shipment
 Sendings=Shipments
+AllSendings=All Shipments
 Shipment=Shipment
 Shipments=Shipments
 ShowSending=Show Sending
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index baf573c66ac..d9de79fe84d 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 76900923d16..9d0f82a4cb0 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -13,7 +13,7 @@ ConfigAccountingExpert=Cấu hình của các chuyên gia kế toán mô-đun
 Journaux=Tạp chí
 JournalFinancial=Tạp chí tài chính
 Exports=Xuất khẩu
-Export=Export
+Export=Xuất dữ liệu
 Modelcsv=Mô hình xuất khẩu
 OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
 Selectmodelcsv=Chọn một mô hình xuất khẩu
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index a88043962f5..a4988430362 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Nút radio
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Danh sách các thông số phải như quan trọng, giá trị 

     ví dụ: 
     1, value1 
     2, value2 
     3, value3 
     ... 

     Để có danh sách tùy thuộc vào khác: 
     1, value1 | parent_list_code: parent_key 
     2, value2 | parent_list_code: parent_key
 ExtrafieldParamHelpcheckbox=Danh sách các thông số phải như quan trọng, giá trị 

     ví dụ: 
     1, value1 
     2, value2 
     3, value3 
     ...
 ExtrafieldParamHelpradio=Danh sách các thông số phải như quan trọng, giá trị 

     ví dụ: 
     1, value1 
     2, value2 
     3, value3 
     ...
@@ -494,6 +495,8 @@ Module500Name=Chi phí đặc biệt (thuế, đóng góp xã hội, cổ tức)
 Module500Desc=Quản lý chi phí đặc biệt như thuế, đóng góp xã hội, cổ tức và tiền lương
 Module510Name=Tiền lương
 Module510Desc=Quản lý lao động tiền lương và các khoản thanh toán
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=Thông báo
 Module600Desc=Gửi thông báo EMail trên một số sự kiện kinh doanh Dolibarr để liên hệ của bên thứ ba (thiết lập được xác định trên mỗi thirdparty)
 Module700Name=Tài trợ
@@ -508,14 +511,14 @@ Module1400Name=Kế toán
 Module1400Desc=Kế toán quản trị (đôi bên)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=Loại
-Module1780Desc=Quản lý danh mục (sản phẩm, nhà cung cấp và khách hàng)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=Trình soạn thảo WYSIWYG
 Module2000Desc=Cho phép chỉnh sửa một số vùng văn bản bằng cách sử dụng một biên tập viên cao cấp
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Quản lý công việc theo lịch trình
+Module2300Desc=Scheduled job management
 Module2400Name=Chương trình nghị sự
 Module2400Desc=Sự kiện / nhiệm vụ và quản lý chương trình nghị sự
 Module2500Name=Quản lý nội dung điện tử
@@ -714,6 +717,11 @@ Permission510=Đọc Lương
 Permission512=Tạo / sửa đổi tiền lương
 Permission514=Xóa lương
 Permission517=Xuất khẩu lương
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=Đọc thông tin dịch vụ
 Permission532=Tạo / thay đổi các dịch vụ
 Permission534=Xóa dịch vụ
@@ -746,6 +754,7 @@ Permission1185=Phê duyệt đơn đặt hàng nhà cung cấp
 Permission1186=Đơn đặt hàng nhà cung cấp thứ tự
 Permission1187=Xác nhận đã nhận đơn đặt hàng nhà cung cấp
 Permission1188=Xóa đơn đặt hàng nhà cung cấp
+Permission1190=Approve (second approval) supplier orders
 Permission1201=Nhận kết quả của một xuất khẩu
 Permission1202=Tạo / Sửa đổi một xuất khẩu
 Permission1231=Đọc hóa đơn nhà cung cấp
@@ -758,10 +767,10 @@ Permission1237=Đơn đặt hàng nhà cung cấp xuất khẩu và chi tiết c
 Permission1251=Chạy nhập khẩu khối lượng của dữ liệu bên ngoài vào cơ sở dữ liệu (tải dữ liệu)
 Permission1321=Xuất dữ liệu Hóa đơn của khách hàng, các thuộc tính và thanh toán
 Permission1421=Xuất dữ liệu Đơn đặt hàng và các thuộc tính
-Permission23001 = Đọc thông tin Lịch trình công việc
-Permission23002 = Tạo / cập nhật theo lịch trình công việc
-Permission23003 = Xóa Lịch trình công việc
-Permission23004 = Thực hiện Lịch trình công việc
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=Đọc hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
 Permission2402=Tạo / sửa đổi các hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
 Permission2403=Xóa hành động (sự kiện hay tác vụ) liên quan đến tài khoản của mình
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=Quay trở lại một mã số kế toán được x
 ModuleCompanyCodePanicum=Trả lại một mã kế toán sản phẩm nào.
 ModuleCompanyCodeDigitaria=Kế toán đang phụ thuộc vào mã của bên thứ ba. Các mã được bao gồm các ký tự "C" ở vị trí đầu tiên theo sau là 5 ký tự đầu tiên của mã của bên thứ ba.
 UseNotifications=Sử dụng thông báo
-NotificationsDesc=Email thông báo tính năng cho phép bạn để âm thầm gửi mail tự động, cho một số sự kiện Dolibarr. Mục tiêu của thông báo có thể được định nghĩa: 
     * Mỗi các bên thứ ba liên hệ (khách hàng hoặc nhà cung cấp), một bên thứ ba tại thời gian. 
     * Hoặc bằng cách thiết lập một địa chỉ email mục tiêu toàn cầu về trang thiết lập mô-đun.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=Tài liệu mẫu
 DocumentModelOdt=Tạo tài liệu từ OpenDocuments mẫu (.odt hoặc .ods tập tin cho OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Watermark vào dự thảo văn bản
@@ -1557,6 +1566,7 @@ SuppliersSetup=Thiết lập mô-đun nhà cung cấp
 SuppliersCommandModel=Hoàn thành mẫu đơn đặt hàng nhà cung cấp (logo ...)
 SuppliersInvoiceModel=Toàn bộ mẫu của nhà cung cấp hóa đơn (biểu tượng ...)
 SuppliersInvoiceNumberingModel=Nhà cung cấp hoá đơn đánh số mô hình
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Thiết lập mô-đun GeoIP MaxMind
 PathToGeoIPMaxmindCountryDataFile=Đường dẫn đến tập tin có chứa MaxMind ip dịch nước. 
     Ví dụ: 
     /usr/local/share/GeoIP/GeoIP.dat 
     /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index bb938979f9c..54b83d5ce8d 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=Hoá đơn %s xác nhận
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Hoá đơn %s trở lại trạng thái soạn thảo
 InvoiceDeleteDolibarr=Hoá đơn %s bị xóa
-OrderValidatedInDolibarr= Thứ tự %s xác nhận
+OrderValidatedInDolibarr=Thứ tự %s xác nhận
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=Thứ tự %s hủy bỏ
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=Thứ tự %s đã được phê duyệt
 OrderRefusedInDolibarr=Thứ tự %s từ chối
 OrderBackToDraftInDolibarr=Thứ tự %s trở lại trạng thái soạn thảo
@@ -91,3 +94,5 @@ WorkingTimeRange=Phạm vi thời gian làm việc
 WorkingDaysRange=Ngày làm việc trong khoảng
 AddEvent=Tạo sự kiện
 MyAvailability=Sẵn có của tôi
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index d30df986f9f..2811dca1571 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -1,16 +1,16 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Hoá đơn
 Bills=Hoá đơn
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+BillsCustomers=Hóa đơn khách hàng
+BillsCustomer=Hóa đơn khách hàng
+BillsSuppliers=Hóa đơn nhà cung cấp
+BillsCustomersUnpaid=Hóa đơn khách hàng chưa thanh toán
 BillsCustomersUnpaidForCompany=Hoá đơn chưa thanh toán của khách hàng cho %s
 BillsSuppliersUnpaid=Hoá đơn chưa thanh toán của nhà cung cấp
 BillsSuppliersUnpaidForCompany=Hoá đơn chưa thanh toán của nhà cung cấp cho %s
 BillsLate=Khoản thanh toán trễ
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatistics=Thống kê hóa đơn khách hàng
+BillsStatisticsSuppliers=Thống kê hóa đơn nhà cung cấp
 DisabledBecauseNotErasable=Vô hiệu hóa vì không thể bị xóa
 InvoiceStandard=Hóa đơn tiêu chuẩn
 InvoiceStandardAsk=Hóa đơn tiêu chuẩn
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=Thanh toán đã được thực hiện
 PaymentsBackAlreadyDone=Thanh toán đã được thực hiện trở lại
 PaymentRule=Quy tắc thanh toán
 PaymentMode=Phương thức thanh toán
-PaymentConditions=Thời hạn thanh toán
-PaymentConditionsShort=Thời hạn thanh toán
+PaymentTerm=Điều khoản thanh toán
+PaymentConditions=Điều khoản thanh toán
+PaymentConditionsShort=Payment terms
 PaymentAmount=Số tiền thanh toán
 ValidatePayment=Xác nhận thanh toán
 PaymentHigherThanReminderToPay=Thanh toán cao hơn so với lời nhắc nhở phải trả
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Tổng của hai giảm giá mới phải b
 ConfirmRemoveDiscount=Bạn có chắc là bạn muốn loại bỏ giảm giá này?
 RelatedBill=Hóa đơn liên quan
 RelatedBills=Hoá đơn liên quan
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Tất cả các hóa đơn
 WarningBillExist=Cảnh báo, một hoặc nhiều hóa đơn đã tồn tại
 
@@ -348,7 +351,7 @@ ChequeNumber=Kiểm tra N °
 ChequeOrTransferNumber=Kiểm tra / Chuyển N °
 ChequeMaker=Kiểm tra máy phát
 ChequeBank=Ngân hàng Kiểm tra
-CheckBank=Check
+CheckBank=Séc
 NetToBePaid=Net để được thanh toán
 PhoneNumber=Điện thoại
 FullPhoneNumber=Điện thoại
@@ -419,12 +422,12 @@ InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
-Progress=Progress
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
+Progress=Tiến trình
+ModifyAllLines=Sửa mọi dòng
+CreateNextSituationInvoice=Tạo vị trí tiếp theo
 NotLastInCycle=This invoice in not the last in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
+DisabledBecauseNotLastInCycle=Vị trí tiếp theo đã tồn tại
+DisabledBecauseFinal=Vị trí này là cuối cùng
 CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+NoSituations=Không có vị trí nào mở
 InvoiceSituationLast=Final and general invoice
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index 70049b18354..329e7329918 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=Danh mục
-Categories=Loại
-Rubrique=Danh mục
-Rubriques=Loại
-categories=loại
-TheCategorie=Các thể loại
-NoCategoryYet=Không có loại của loại hình này tạo ra
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=Trong
 AddIn=Thêm vào
 modify=sửa đổi
 Classify=Phân loại
-CategoriesArea=Loại khu vực
-ProductsCategoriesArea=Khu vực sản phẩm / dịch vụ loại
-SuppliersCategoriesArea=Khu vực Nhà cung cấp loại
-CustomersCategoriesArea=Khu vực khách hàng mục
-ThirdPartyCategoriesArea=Khu vực bên thứ ba loại
-MembersCategoriesArea=Thành viên khu vực loại
-ContactsCategoriesArea=Khu vực Liên hệ loại
-MainCats=Loại chính
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=Tiểu thể loại
 CatStatistics=Thống kê
-CatList=Danh sách các loại
-AllCats=Tất cả thể loại
-ViewCat=Xem thể loại
-NewCat=Thêm thể loại
-NewCategory=Thể loại mới
-ModifCat=Sửa đổi thể loại
-CatCreated=Loại tạo
-CreateCat=Tạo ra thể loại
-CreateThisCat=Tạo ra thể loại này
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=Xác nhận các lĩnh vực
 NoSubCat=Không có tiểu thể loại.
 SubCatOf=Danh mục con
-FoundCats=Tìm thấy loại
-FoundCatsForName=Loại được tìm thấy cho tên:
-FoundSubCatsIn=Tiểu thể tìm thấy trong các loại
-ErrSameCatSelected=Bạn đã chọn cùng một loại nhiều lần
-ErrForgotCat=Bạn quên chọn thể loại
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=Bạn quên thông báo cho các lĩnh vực
 ErrCatAlreadyExists=Tên này đã được sử dụng
-AddProductToCat=Thêm sản phẩm này vào một danh mục?
-ImpossibleAddCat=Không thể thêm các loại
-ImpossibleAssociateCategory=Không thể kết hợp các thể loại để
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s đã được thêm thành công.
-ObjectAlreadyLinkedToCategory=Yếu tố đã được liên kết với thể loại này.
-CategorySuccessfullyCreated=Thể loại này %s đã được thêm thành công.
-ProductIsInCategories=Sản phẩm / dịch vụ để sở hữu loại sau
-SupplierIsInCategories=Sở hữu của bên thứ ba để cung cấp các loại sau đây
-CompanyIsInCustomersCategories=Bên thứ ba này sở hữu để sau khách hàng / khách hàng tiềm năng loại
-CompanyIsInSuppliersCategories=Bên thứ ba này sở hữu để sau nhà cung cấp các loại
-MemberIsInCategories=Thành viên này sở hữu để các thành viên sau đây loại
-ContactIsInCategories=Liên hệ này sở hữu để liên lạc sau loại
-ProductHasNoCategory=Đây sản phẩm / dịch vụ không có trong bất kỳ loại
-SupplierHasNoCategory=Nhà cung cấp này không có trong bất kỳ loại
-CompanyHasNoCategory=Công ty này không có trong bất kỳ loại
-MemberHasNoCategory=Thành viên này không có trong bất kỳ loại
-ContactHasNoCategory=Liên hệ này không có trong bất kỳ loại
-ClassifyInCategory=Phân loại trong thể loại
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=Không
-NotCategorized=Nếu không có loại
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Thể loại này đã tồn tại với ref này
 ReturnInProduct=Về sản phẩm / dịch vụ thẻ
 ReturnInSupplier=Về thẻ nhà cung cấp
@@ -66,22 +64,22 @@ ReturnInCompany=Về khách hàng / thẻ tiềm năng
 ContentsVisibleByAll=Các nội dung sẽ được hiển thị tất cả
 ContentsVisibleByAllShort=Nội dung có thể nhìn thấy tất cả
 ContentsNotVisibleByAllShort=Nội dung không thể nhìn thấy bởi tất cả
-CategoriesTree=Loại cây
-DeleteCategory=Xóa thể loại
-ConfirmDeleteCategory=Bạn Bạn có chắc chắn muốn xóa thể loại này?
-RemoveFromCategory=Hủy bỏ liên kết với categorie
-RemoveFromCategoryConfirm=Bạn Bạn có chắc chắn muốn xóa liên kết giữa các giao dịch và danh mục?
-NoCategoriesDefined=Không có loại được xác định
-SuppliersCategoryShort=Loại nhà cung cấp
-CustomersCategoryShort=Loại khách hàng
-ProductsCategoryShort=Danh mục sản phẩm
-MembersCategoryShort=Loại thành viên
-SuppliersCategoriesShort=Nhà cung cấp các loại
-CustomersCategoriesShort=Khách hàng mục
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prosp. loại
-ProductsCategoriesShort=Danh mục sản phẩm
-MembersCategoriesShort=Thành viên loại
-ContactCategoriesShort=Liên hệ loại
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=Thể loại này không chứa bất kỳ sản phẩm.
 ThisCategoryHasNoSupplier=Thể loại này không chứa bất kỳ nhà cung cấp.
 ThisCategoryHasNoCustomer=Thể loại này không chứa bất kỳ khách hàng.
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=Thể loại này không chứa bất kỳ liên lạc.
 AssignedToCustomer=Giao cho một khách hàng
 AssignedToTheCustomer=Giao cho khách hàng
 InternalCategory=Loại nội bộ
-CategoryContents=Danh mục nội dung
-CategId=Category id
-CatSupList=Danh sách các loại nhà cung cấp
-CatCusList=Danh sách khách hàng / loại khách hàng tiềm năng
-CatProdList=Danh sách sản phẩm loại
-CatMemberList=Danh sách thành viên loại
-CatContactList=Danh sách các hạng mục liên lạc và tiếp xúc
-CatSupLinks=Liên kết giữa nhà cung cấp và các loại
-CatCusLinks=Mối liên hệ giữa khách hàng / khách hàng tiềm năng và các loại
-CatProdLinks=Liên kết giữa các sản phẩm / dịch vụ và các loại
-CatMemberLinks=Liên kết giữa các thành viên và các loại
-DeleteFromCat=Di chuyển từ mục
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Ảnh xóa
 ConfirmDeletePicture=Xác nhận xoá hình ảnh?
 ExtraFieldsCategories=Thuộc tính bổ sung
-CategoriesSetup=Loại thiết lập
-CategorieRecursiv=Liên kết với các chủ đề chính tự động
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=Nếu được kích hoạt, sản phẩm này cũng sẽ liên quan đến chủ đề chính khi thêm vào một tiểu thể loại
 AddProductServiceIntoCategory=Thêm sản phẩm / dịch vụ sau đây
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index 20956d32a97..1698b670d91 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Bài đầu ra chạy
 CronLastResult=Cuối mã kết quả
 CronListOfCronJobs=Danh sách công việc dự kiến
 CronCommand=Lệnh
-CronList=Danh sách công việc
-CronDelete= Xóa công việc cron
-CronConfirmDelete= Bạn Bạn có chắc chắn muốn xóa công việc định kỳ này?
-CronExecute=Việc ra mắt
-CronConfirmExecute= Bạn có chắc chắn để thực hiện công việc này ngay bây giờ
-CronInfo= Việc cho phép để thực hiện nhiệm vụ đã được lên kế hoạch
-CronWaitingJobs=Wainting việc làm
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Công việc
-CronNone= Không
+CronNone=Không
 CronDtStart=Ngày bắt đầu
 CronDtEnd=Ngày kết thúc
 CronDtNextLaunch=Thực hiện tiếp theo
@@ -75,6 +75,7 @@ CronObjectHelp=Tên đối tượng để tải. 
     Đối với exemple phư
 CronMethodHelp=Phương pháp đối tượng để khởi động. 
     Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của phương pháp là fecth
 CronArgsHelp=Các đối số phương pháp. 
     Đối với exemple phương pháp của Dolibarr đối tượng sản phẩm /htdocs/product/class/product.class.php lấy, giá trị của paramters có thể là 0, ProductRef
 CronCommandHelp=Các dòng lệnh hệ thống để thực thi.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Thông tin
 # Common
diff --git a/htdocs/langs/vi_VN/donations.lang b/htdocs/langs/vi_VN/donations.lang
index 3fd817258c2..a4b1a10ee1c 100644
--- a/htdocs/langs/vi_VN/donations.lang
+++ b/htdocs/langs/vi_VN/donations.lang
@@ -6,6 +6,8 @@ Donor=Nhà tài trợ
 Donors=Các nhà tài trợ
 AddDonation=Create a donation
 NewDonation=Thêm tài trợ mới
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Hiển thị tài trợ
 DonationPromise=Hứa tài trợ
 PromisesNotValid=Chưa xác nhận khoản tài trợ
@@ -21,6 +23,8 @@ DonationStatusPaid=Đã nhận được khoản tài trợ
 DonationStatusPromiseNotValidatedShort=Dự thảo
 DonationStatusPromiseValidatedShort=Đã xác nhận
 DonationStatusPaidShort=Đã nhận
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=Xác nhận tài trợ
 DonationReceipt=Nhận tài trợ
 BuildDonationReceipt=Tạo Phiếu thu tài trợ
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 2f1ec444337..982dea2342d 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Thiết lập các thông số bắt buộc chưa được xác định
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 89dd796dbf0..3bec956d767 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=Liệt kê tất cả các thông báo email gửi
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 62ee8e2af29..55c30b98a9c 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -352,6 +352,7 @@ Status=Tình trạng
 Favorite=Yêu thích
 ShortInfo=Thông tin.
 Ref=Tài liệu tham khảo.
+ExternalRef=Ref. extern
 RefSupplier=Tài liệu tham khảo. nhà cung cấp
 RefPayment=Tài liệu tham khảo. thanh toán
 CommercialProposalsShort=Đề nghị thương mại
@@ -394,8 +395,8 @@ Available=Có sẵn
 NotYetAvailable=Chưa có
 NotAvailable=Không có sẵn
 Popularity=Phổ biến
-Categories=Loại
-Category=Danh mục
+Categories=Tags/categories
+Category=Tag/category
 By=By
 From=Từ
 to=để
@@ -694,6 +695,7 @@ AddBox=Thêm vào hộp
 SelectElementAndClickRefresh=Chọn một phần tử và nhấn Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=Thứ hai
 Tuesday=Thứ ba
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index 16df451c547..340e3f907fa 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=Ship product
 Discount=Giảm giá
 CreateOrder=Tạo đơn hàng
 RefuseOrder=Từ chối đơn hàng
-ApproveOrder=Chấp nhận đơn hàng
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=Xác nhận đặt hàng
 UnvalidateOrder=Đơn hàng chưa xác nhận
 DeleteOrder=Xóa đơn hàng
@@ -102,6 +103,8 @@ ClassifyBilled=Phân loại hóa đơn
 ComptaCard=Thẻ kế toán
 DraftOrders=Dự thảo đơn đặt hàng
 RelatedOrders=Đơn đặt hàng liên quan
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=Trong quá trình các đơn đặt hàng
 RefOrder=Số tham chiếu đơn hàng
 RefCustomerOrder=Số tham chiếu đơn đặt hàng của khách hàng
@@ -118,6 +121,7 @@ PaymentOrderRef=Thanh toán đơn đặt hàng %s
 CloneOrder=Sao chép đơn đặt hàng
 ConfirmCloneOrder=Bạn có chắc chắn bạn muốn sao chép đơn đặt hàng này %s ?
 DispatchSupplierOrder=Tiếp nhận đơn đặt hàng nhà cung cấp %s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Đại diện theo dõi đơn đặt hàng
 TypeContact_commande_internal_SHIPPING=Đại diện theo dõi vận chuyển
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index 7bbe0059342..06622eb717b 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=Can thiệp xác nhận
 Notify_FICHINTER_SENTBYMAIL=Can thiệp gửi qua đường bưu điện
 Notify_BILL_VALIDATE=Hóa đơn khách hàng xác nhận
 Notify_BILL_UNVALIDATE=Hóa đơn của khách hàng unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=Để nhà cung cấp đã được phê duyệt
 Notify_ORDER_SUPPLIER_REFUSE=Để nhà cung cấp từ chối
 Notify_ORDER_VALIDATE=Đơn đặt hàng được xác nhận
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=Đề nghị thương mại gửi qua đường bưu đ
 Notify_BILL_PAYED=Hóa đơn của khách hàng payed
 Notify_BILL_CANCEL=Hóa đơn của khách hàng bị hủy bỏ
 Notify_BILL_SENTBYMAIL=Hóa đơn của khách hàng gửi qua đường bưu điện
-Notify_ORDER_SUPPLIER_VALIDATE=Nhà cung cấp để xác nhận
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Để nhà cung cấp gửi qua đường bưu điện
 Notify_BILL_SUPPLIER_VALIDATE=Nhà cung cấp hóa đơn xác nhận
 Notify_BILL_SUPPLIER_PAYED=Nhà cung cấp hóa đơn payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Dự án sáng tạo
 Notify_TASK_CREATE=Nhiệm vụ tạo
 Notify_TASK_MODIFY=Nhiệm vụ sửa đổi
 Notify_TASK_DELETE=Công tác xóa
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=Số đính kèm tập tin / tài liệu
 TotalSizeOfAttachedFiles=Tổng dung lượng của các file đính kèm / tài liệu
 MaxSize=Kích thước tối đa
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=Hóa đơn% s đã được xác nhận.
 EMailTextProposalValidated=Đề nghị% s đã được xác nhận.
 EMailTextOrderValidated=Trình tự% s đã được xác nhận.
 EMailTextOrderApproved=Trình tự% s đã được phê duyệt.
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=Trình tự% s đã được phê duyệt bởi% s.
 EMailTextOrderRefused=Trình tự% s đã bị từ chối.
 EMailTextOrderRefusedBy=Trình tự% s đã bị từ chối bởi% s.
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 4278c8abe94..45d964cbe14 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Giá đề nghị tối thiểu là: %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 13576931acd..d82f0ae1e33 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=Danh sách các hóa đơn của nhà cung
 ListContractAssociatedProject=Danh sách các hợp đồng được gắn với dự án
 ListFichinterAssociatedProject=Danh sách các sự can thiệp được gắn với dự án
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=Danh sách các hoạt động được gắn với dự án
 ActivityOnProjectThisWeek=Các hoạt động của dự án trong tuần này
 ActivityOnProjectThisMonth=Các hoạt động của dự án trong tháng này
@@ -130,13 +131,15 @@ AddElement=Liên kết đến yếu tố
 UnlinkElement=Yếu tố Bỏ liên kết
 # Documents models
 DocumentModelBaleine=Mô hình báo cáo hoàn chỉnh của dự án (lôgô...)
-PlannedWorkload = Tải tiến trình công việc đã dự định
-WorkloadOccupation= Sử dụng tiến trình công việc
+PlannedWorkload=Tải tiến trình công việc đã dự định
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Các đối tượng tham chiếu
 SearchAProject=Tìm kiếm một dự án
 ProjectMustBeValidatedFirst=Dự án phải được xác nhận đầu tiên
 ProjectDraft=Dự thảo dự án
 FirstAddRessourceToAllocateTime=Kết hợp một ressource để phân bổ thời gian
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/vi_VN/resource.lang b/htdocs/langs/vi_VN/resource.lang
index 32bdd92f884..29e3f914fbf 100644
--- a/htdocs/langs/vi_VN/resource.lang
+++ b/htdocs/langs/vi_VN/resource.lang
@@ -1,34 +1,34 @@
 
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Tài nguyên
+MenuResourceAdd=Tạo tài nguyên
+MenuResourcePlanning=Tài nguyên đang kế hoạch
+DeleteResource=Xóa tài nguyên
+ConfirmDeleteResourceElement=Xác nhận xóa tài nguyên này
+NoResourceInDatabase=Chưa có tài nguyên trong cơ sở dữ liệu
+NoResourceLinked=Chưa có tài nguyên được liên kết
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Danh sách tài nguyên
+ResourceSingular=Tài nguyên
+ResourceCard=Thẻ tài nguyên
+AddResource=Tạo tài nguyên
+ResourceFormLabel_ref=Tên tài nguyên
+ResourceType=Loại tài nguyên
+ResourceFormLabel_description=Mô tả tài nguyên
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Tài nguyên được liên kết tới các thành phần
 
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Hiển thị tài nguyên đang kế hoạch
+GotoDate=Đến ngày
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Các tài nguyên thành tố
+ResourceCreatedWithSuccess=Đã tạo tài nguyên thành công
+RessourceLineSuccessfullyDeleted=Đầu mối tài nguyên đã được xóa thành công
+RessourceLineSuccessfullyUpdated=Đầu mối tài nguyên đã được cập nhật thành công
+ResourceLinkedWithSuccess=Liên kết tài nguyên thành công
 
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Thẻ tài nguyên
+ConfirmDeleteResource=Xác nhận xóa tài nguyên này
+RessourceSuccessfullyDeleted=Đã xóa tài nguyên thành công
+DictionaryResourceType=Loại tài nguyên
 
-SelectResource=Select resource
+SelectResource=Chọn tài nguyên
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index c6581043f86..567a4ba2f52 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=Tài liệu tham khảo. lô hàng
 Sending=Lô hàng
 Sendings=Lô hàng
+AllSendings=All Shipments
 Shipment=Lô hàng
 Shipments=Lô hàng
 ShowSending=Show Sending
@@ -15,7 +16,7 @@ SearchASending=Tìm kiếm hàng
 StatisticsOfSendings=Thống kê cho lô hàng
 NbOfSendings=Số lô hàng
 NumberOfShipmentsByMonth=Số lô hàng theo tháng
-SendingCard=Shipment card
+SendingCard=Thẻ hàng
 NewSending=Lô hàng mới
 CreateASending=Tạo một lô hàng
 CreateSending=Tạo lô hàng
@@ -23,7 +24,7 @@ QtyOrdered=Số lượng đặt hàng
 QtyShipped=Số lượng vận chuyển
 QtyToShip=Số lượng xuất xưởng
 QtyReceived=Số lượng nhận được
-KeepToShip=Remain to ship
+KeepToShip=Giữ tàu
 OtherSendingsForSameOrder=Lô hàng khác về đơn hàng này
 DateSending=Ngày gửi đơn đặt hàng
 DateSendingShort=Ngày gửi đơn đặt hàng
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index bd00d3e0e7b..6d54d374454 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=Danh sách các đơn đặt hàng nhà cung cấp
 MenuOrdersSupplierToBill=Đơn đặt hàng nhà cung cấp cho hóa đơn
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index e363452059b..78957073466 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -47,7 +47,7 @@ RefusedData=Ngày từ chối
 RefusedReason=Lý do từ chối
 RefusedInvoicing=Thanh toán từ chối
 NoInvoiceRefused=Không sạc từ chối
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=Hóa đơn bị từ chối (Khách hàng từ chối thanh toán)
 Status=Tình trạng
 StatusUnknown=Không biết
 StatusWaiting=Chờ
@@ -76,7 +76,7 @@ WithBankUsingRIB=Đối với tài khoản ngân hàng sử dụng RIB
 WithBankUsingBANBIC=Đối với tài khoản ngân hàng sử dụng IBAN / BIC / SWIFT
 BankToReceiveWithdraw=Tài khoản ngân hàng để nhận Bỏ cuộc
 CreditDate=Về tín dụng
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
+WithdrawalFileNotCapable=Không thể tạo file biên lai rút tiền cho quốc gia của bạn %s (Quốc gia của bạn không được hỗ trợ)
 ShowWithdraw=Hiện Rút
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Tuy nhiên, nếu hóa đơn có ít nhất một thanh toán rút chưa qua chế biến, nó sẽ không được thiết lập như là trả tiền để cho phép quản lý thu hồi trước.
 DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 150b021dcae..8b3c55d91b6 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -142,7 +142,7 @@ Box=资讯框
 Boxes=资讯框
 MaxNbOfLinesForBoxes=资讯框最大行数
 PositionByDefault=默认顺序
-Position=Position
+Position=位置
 MenusDesc=菜单管理器定义两菜单中的内容(横向和纵向菜单栏)。
 MenusEditorDesc=菜单编辑器允许您定义个性化的菜单项。请谨慎使用，以免造成部分菜单项无法访问，影响 Dolibarr 的稳定性。
    一些模块会添加菜单项(通常在 所有(All)菜单下)。如果您错误的移除了其中的一些菜单项，可以通过禁用/重新启用相应的模块来恢复。
 MenuForUsers=用户菜单
@@ -299,7 +299,7 @@ DoNotUseInProduction=请勿用于生产环境
 ThisIsProcessToFollow=以下为软体的安装过程：
 StepNb=第 %s 步骤
 FindPackageFromWebSite=搜索你需要的功能(例如在官方 %s )。
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=下载包 %S。
 UnpackPackageInDolibarrRoot=解压缩到 Dolibarr 的根目录  %s 下
 SetupIsReadyForUse=安装完成，Dolibarr 已可以使用此新组件。
 NotExistsDirect=未设置可选备用根目录。
    
@@ -389,6 +389,7 @@ ExtrafieldSeparator=分隔符
 ExtrafieldCheckBox=复选框
 ExtrafieldRadio=单选框
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -448,8 +449,8 @@ Module52Name=库存
 Module52Desc=产品库存的管理
 Module53Name=服务
 Module53Desc=服务的管理
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=合同/订阅
+Module54Desc=合同管理(服务或常规订阅)
 Module55Name=条码
 Module55Desc=条码的管理
 Module56Name=电话
@@ -494,6 +495,8 @@ Module500Name=特别费用（税，社会公益，股息）
 Module500Desc=特别费用如税收，社会公益，分红及工资管理
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=通知
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=捐赠
@@ -508,14 +511,14 @@ Module1400Name=会计
 Module1400Desc=会计管理(双方)
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=分类
-Module1780Desc=分类的管理(产品、供应商和客户)
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=所见即所得编辑器
 Module2000Desc=允许在一些文本编辑区中使用所见即所得编辑器
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=任务排程管理
+Module2300Desc=Scheduled job management
 Module2400Name=日程
 Module2400Desc=事件/任务和日程管理
 Module2500Name=电子内容管理
@@ -714,6 +717,11 @@ Permission510=查看工资
 Permission512=创建/修改工资
 Permission514=删除工资
 Permission517=导出工资
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=阅读服务
 Permission532=建立/修改服务
 Permission534=删除服务
@@ -746,6 +754,7 @@ Permission1185=批准采购订单
 Permission1186=整理采购订单
 Permission1187=通知供应商已收货
 Permission1188=删除采购订单
+Permission1190=Approve (second approval) supplier orders
 Permission1201=取得导出结果
 Permission1202=建立/修改导出信息
 Permission1231=读取采购账单
@@ -758,10 +767,10 @@ Permission1237=导出采购订单及其详情
 Permission1251=导入大量外部数据到数据库(载入资料)
 Permission1321=导出销售账单、属性及其付款资讯
 Permission1421=导出销售订单及属性资讯
-Permission23001 = 阅读计划任务
-Permission23002 = 创建/更新计划任务
-Permission23003 = 删除计划任务
-Permission23004 = 执行计划任务
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=读取关联至此用户账户的动作(事件或任务)
 Permission2402=建立/修改关联至此用户账户的动作(事件或任务)
 Permission2403=删除关联至此用户账户的动作(事件或任务)
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=根据以下编码原则返回会计编号: 
    以 %s
 ModuleCompanyCodePanicum=只会回传一个空的会计编号
 ModuleCompanyCodeDigitaria=会计编号取决于第三方的编号。代码以C开头，后跟第三方单位的 5 位代码
 UseNotifications=使用通知
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=文件模板
 DocumentModelOdt=从开放文档模板软件(OpenOffice, KOffice, TextEdit,...等)生成(.ODT，.ODS）模板文档。
 WatermarkOnDraft=为草稿文档加水印
@@ -1557,6 +1566,7 @@ SuppliersSetup=供应商模块设置
 SuppliersCommandModel=采购合同的完整模板(标识...)
 SuppliersInvoiceModel=采购账单的完整模板(标识...)
 SuppliersInvoiceNumberingModel=采购账单编号模块
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Maxmind Geoip 模块设置
 PathToGeoIPMaxmindCountryDataFile=包含Maxmind 国家/IP转换库的文件路径。
    例如: /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index 4e379a7415c..34f59b5dd9e 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=发票%s的验证
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=发票的%s去回到草案状态
 InvoiceDeleteDolibarr=删除  %s  发票
-OrderValidatedInDolibarr= 订购%s的验证
+OrderValidatedInDolibarr=订购%s的验证
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=为了%s取消
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=为了%s批准
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=为了%s回到草案状态
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 873e55377a3..aba7e1595c3 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=付款已完成
 PaymentsBackAlreadyDone=返回已经完成付款
 PaymentRule=付款规则
 PaymentMode=付款方式
-PaymentConditions=付款方式
-PaymentConditionsShort=付款方式
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=付款金额
 ValidatePayment=验证付款
 PaymentHigherThanReminderToPay=付款支付更高的比提醒
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=两个新的折扣总额必须等于原来
 ConfirmRemoveDiscount=你确定要删除此折扣？
 RelatedBill=相关发票
 RelatedBills=有关发票
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index 2b0e2a388f3..69bd75a4ac8 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=类别
-Categories=分类
-Rubrique=类别
-Rubriques=分类
-categories=类别
-TheCategorie=类别
-NoCategoryYet=没有这种类型的类创建
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=在
 AddIn=加入
 modify=修改
 Classify=分类
-CategoriesArea=分类区
-ProductsCategoriesArea=产品/服务类别领域
-SuppliersCategoriesArea=供应商分类区
-CustomersCategoriesArea=客户分类区
-ThirdPartyCategoriesArea=第三方分类区
-MembersCategoriesArea=成员类别面积
-ContactsCategoriesArea=联系分类
-MainCats=主要类别
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=小类
 CatStatistics=统计
-CatList=分类列表
-AllCats=所有类别
-ViewCat=查看分类
-NewCat=新增类别
-NewCategory=新的类别
-ModifCat=修改类别
-CatCreated=类别
-CreateCat=创建类别
-CreateThisCat=创建此类别
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=验证领域
 NoSubCat=无子。
 SubCatOf=子类别
-FoundCats=发现类
-FoundCatsForName=分类找到的名称：
-FoundSubCatsIn=小类类别中找到
-ErrSameCatSelected=您选择的是同一类几次
-ErrForgotCat=你忘了选择类别
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=你忘了通知领域
 ErrCatAlreadyExists=此名称已被使用
-AddProductToCat=添加此产品类别？
-ImpossibleAddCat=无法添加类别
-ImpossibleAssociateCategory=不可能关联的类别
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s是添加成功。
-ObjectAlreadyLinkedToCategory=元已链接到这一类。
-CategorySuccessfullyCreated=本分类%s已被添加成功。
-ProductIsInCategories=产品/服务，以拥有以下类别
-SupplierIsInCategories=第三方拥有对以下类别的供应商
-CompanyIsInCustomersCategories=这个第三方拥有对以下客户/前景类别
-CompanyIsInSuppliersCategories=这个第三方拥有对以下类别的供应商
-MemberIsInCategories=该成员拥有，以下列成员类别
-ContactIsInCategories=此联系拥有以下联系人分类
-ProductHasNoCategory=此产品/服务是没有任何类别
-SupplierHasNoCategory=这个供应商是不以任何类别
-CompanyHasNoCategory=这家公司不以任何类别
-MemberHasNoCategory=该成员没有任何类别
-ContactHasNoCategory=这联系没有在任何分类
-ClassifyInCategory=分类类别
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=无
-NotCategorized=没有类别
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=此类别已存在此号
 ReturnInProduct=返回产品/服务卡
 ReturnInSupplier=返回供应商卡
@@ -66,22 +64,22 @@ ReturnInCompany=返回到客户/前景卡
 ContentsVisibleByAll=内容将所有可见
 ContentsVisibleByAllShort=所有内容可见
 ContentsNotVisibleByAllShort=所有内容不可见
-CategoriesTree=Categories tree
-DeleteCategory=删除类别
-ConfirmDeleteCategory=你确定要删除这个分类？
-RemoveFromCategory=删除连接的类别：
-RemoveFromCategoryConfirm=你确定要删除之间的交易和类别的联系？
-NoCategoriesDefined=任何一类的定义
-SuppliersCategoryShort=供应商类别
-CustomersCategoryShort=客户分类
-ProductsCategoryShort=产品类别
-MembersCategoryShort=成员类别
-SuppliersCategoriesShort=供应商分类
-CustomersCategoriesShort=客户分类
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=Custo. / Prosp。类别
-ProductsCategoriesShort=产品分类
-MembersCategoriesShort=成员：
-ContactCategoriesShort=联系分类
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=本分类不包含任何产品。
 ThisCategoryHasNoSupplier=本分类不包含任何供应商。
 ThisCategoryHasNoCustomer=本分类不包含任何客户。
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=本分类不包含任何联系人。
 AssignedToCustomer=分配给客户
 AssignedToTheCustomer=分配给客户
 InternalCategory=内部类
-CategoryContents=分类内容
-CategId=分类编号
-CatSupList=供应商分类列表
-CatCusList=客户名单/前景类别
-CatProdList=产品类别列表
-CatMemberList=类别的成员名单
-CatContactList=联系人类别和联系列表
-CatSupLinks=供应商及个类别之间的相关链接
-CatCusLinks=客户/前景和类别之间的相关链接
-CatProdLinks=产品/服务和类别之间的相关链接
-CatMemberLinks=成员和类别之间的相关链接
-DeleteFromCat=从类别中删除
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index 2cc313aad59..1d91917d229 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=最后运行结果
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=命令
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= 无
+CronNone=无
 CronDtStart=开始日期
 CronDtEnd=结束日期
 CronDtNextLaunch=接下来执行
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=信息
 # Common
diff --git a/htdocs/langs/zh_CN/donations.lang b/htdocs/langs/zh_CN/donations.lang
index 0cd5d256a2c..792ff432989 100644
--- a/htdocs/langs/zh_CN/donations.lang
+++ b/htdocs/langs/zh_CN/donations.lang
@@ -6,6 +6,8 @@ Donor=捐赠者
 Donors=捐赠者
 AddDonation=Create a donation
 NewDonation=新捐赠
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=显示捐赠
 DonationPromise=礼品的承诺
 PromisesNotValid=未验证的承诺
@@ -21,6 +23,8 @@ DonationStatusPaid=收到的捐款
 DonationStatusPromiseNotValidatedShort=草案
 DonationStatusPromiseValidatedShort=验证
 DonationStatusPaidShort=收稿
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=验证承诺
 DonationReceipt=捐款收据
 BuildDonationReceipt=建立收据
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index e4adeba918d..ddd31e68a0c 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=强制设置参数尚未定义
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index 7ce895780f5..f285247cb51 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=列出所有发送电子邮件通知
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index ecfa96b7692..eda0b175528 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -352,6 +352,7 @@ Status=状态
 Favorite=Favorite
 ShortInfo=信息。
 Ref=号码
+ExternalRef=Ref. extern
 RefSupplier=号。供应商
 RefPayment=号。付款
 CommercialProposalsShort=报价单
@@ -394,8 +395,8 @@ Available=可用的
 NotYetAvailable=尚未提供
 NotAvailable=不适用
 Popularity=声望
-Categories=分类
-Category=类别
+Categories=Tags/categories
+Category=Tag/category
 By=由
 From=From
 to=至
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=星期一
 Tuesday=星期二
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index 973b5713bb8..41d8a87078e 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=航运产品
 Discount=折扣
 CreateOrder=创建订单
 RefuseOrder=拒绝订单
-ApproveOrder=接受订单
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=验证订单
 UnvalidateOrder=未验证订单
 DeleteOrder=删除订单
@@ -102,6 +103,8 @@ ClassifyBilled=归类“已付账”
 ComptaCard=会计证
 DraftOrders=草案订单
 RelatedOrders=相关订单
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=处理中订单
 RefOrder=订单号码
 RefCustomerOrder=客户订单号
@@ -118,6 +121,7 @@ PaymentOrderRef=订单付款%s
 CloneOrder=克隆订单
 ConfirmCloneOrder=你确定要克隆这个订单%s吗 ？
 DispatchSupplierOrder=接收供应商的订单%s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=代表跟进客户订单
 TypeContact_commande_internal_SHIPPING=代表跟进航运
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index e775c8b18fb..24695554bd0 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=干预验证
 Notify_FICHINTER_SENTBYMAIL=通过邮件发送的干预
 Notify_BILL_VALIDATE=客户发票验证
 Notify_BILL_UNVALIDATE=未经验证客户发票
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=供应商为了批准
 Notify_ORDER_SUPPLIER_REFUSE=供应商的订单被拒绝
 Notify_ORDER_VALIDATE=验证客户订单
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=通过邮件发送的商业提案
 Notify_BILL_PAYED=客户发票payed
 Notify_BILL_CANCEL=客户发票取消
 Notify_BILL_SENTBYMAIL=通过邮件发送的客户发票
-Notify_ORDER_SUPPLIER_VALIDATE=供应商为了验证
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=通过邮件发送的供应商的订单
 Notify_BILL_SUPPLIER_VALIDATE=供应商发票验证
 Notify_BILL_SUPPLIER_PAYED=供应商发票payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=所附文件数/文件
 TotalSizeOfAttachedFiles=所附文件的总大小/文件
 MaxSize=最大尺寸
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=发票%s已被确认。
 EMailTextProposalValidated=这项建议%s已经验证。
 EMailTextOrderValidated=该命令%s已被验证。
 EMailTextOrderApproved=该命令%s已被批准。
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=该命令%s已被%s的批准
 EMailTextOrderRefused=该命令%s已被拒绝。
 EMailTextOrderRefusedBy=该命令%s已经拒绝%s的
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 2ac2df060d9..0f455e6b8a9 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index b8326f1613d..7a9d56f4b1e 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=名单与项目相关的供应商的发票
 ListContractAssociatedProject=名单与项目有关的合同
 ListFichinterAssociatedProject=名单与项目相关的干预措施
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=名单与项目有关的行动
 ActivityOnProjectThisWeek=对项目活动周
 ActivityOnProjectThisMonth=本月初对项目活动
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=一个完整的项目报告模型（logo. ..）
-PlannedWorkload = 计划的工作量
-WorkloadOccupation= 工作量的分配
+PlannedWorkload=计划的工作量
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=参考对象
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index 2b316b2c21d..875bb69e4a4 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=号。装船
 Sending=装船
 Sendings=出货
+AllSendings=All Shipments
 Shipment=装船
 Shipments=出货
 ShowSending=Show Sending
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index fb95ba7355c..9d6a6e207eb 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 5ce0072aebb..418fbd5385d 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -389,6 +389,7 @@ ExtrafieldSeparator=Separator
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...

    In order to have the list depending on another :
    1,value1|parent_list_code:parent_key
    2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value

     for example : 
    1,value1
    2,value2
    3,value3
    ...
@@ -494,6 +495,8 @@ Module500Name=Special expenses (tax, social contributions, dividends)
 Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
 Module510Name=Salaries
 Module510Desc=Management of employees salaries and payments
+Module520Name=Loan
+Module520Desc=Management of loans
 Module600Name=通知
 Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
 Module700Name=捐贈
@@ -508,14 +511,14 @@ Module1400Name=會計
 Module1400Desc=會計管理（雙方）
 Module1520Name=Document Generation
 Module1520Desc=Mass mail document generation
-Module1780Name=分類
-Module1780Desc=分類的管理（產品，供應商和客戶）
+Module1780Name=Tags/Categories
+Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
 Module2000Name=fckeditor的
 Module2000Desc=所見即所得的編輯器
 Module2200Name=Dynamic Prices
 Module2200Desc=Enable the usage of math expressions for prices
 Module2300Name=Cron
-Module2300Desc=Scheduled task management
+Module2300Desc=Scheduled job management
 Module2400Name=議程
 Module2400Desc=行動/任務和議程管理
 Module2500Name=電子內容管理
@@ -714,6 +717,11 @@ Permission510=Read Salaries
 Permission512=Create/modify salaries
 Permission514=Delete salaries
 Permission517=Export salaries
+Permission520=Read Loans
+Permission522=Create/modify loans
+Permission524=Delete loans
+Permission525=Access loan calculator
+Permission527=Export loans
 Permission531=閲讀服務
 Permission532=建立/修改服務
 Permission534=刪除服務
@@ -746,6 +754,7 @@ Permission1185=核准供應商訂單
 Permission1186=整理供應商訂單
 Permission1187=告知供應商訂單的接收資訊
 Permission1188=刪除供應商訂單
+Permission1190=Approve (second approval) supplier orders
 Permission1201=取得一個匯出結果
 Permission1202=建立/修改一個匯出
 Permission1231=讀取供應商發票(invoice)
@@ -758,10 +767,10 @@ Permission1237=Export supplier orders and their details
 Permission1251=執行外部資料大量匯入資料庫的功能(載入資料)
 Permission1321=匯出客戶的發票(invoice)、屬性及其付款資訊
 Permission1421=匯出商業訂單及屬性資訊
-Permission23001 = Read Scheduled task
-Permission23002 = Create/update Scheduled task
-Permission23003 = Delete Scheduled task
-Permission23004 = Execute Scheduled task
+Permission23001=Read Scheduled job
+Permission23002=Create/update Scheduled job
+Permission23003=Delete Scheduled job
+Permission23004=Execute Scheduled job
 Permission2401=閲讀的行動（事件或任務）連結到其戶口
 Permission2402=建立/修改行動（事件或任務）連結到其戶口
 Permission2403=（事件或任務）與他的帳戶刪除操作
@@ -1107,7 +1116,7 @@ ModuleCompanyCodeAquarium=根據以下編碼原則返回會計編號: 
    以 %s
 ModuleCompanyCodePanicum=只會回傳一個空的會計編號
 ModuleCompanyCodeDigitaria=會計代碼依賴於第三方的代碼。該代碼是字元組成的“C”的第一個位置的前5第三方代碼字元之後。
 UseNotifications=使用通知
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one third party at time.
    * or by setting a global target email address on module setup page.
+NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
    * per third parties contacts (customers or suppliers), one contact at time.
    * or by setting global target email addresses in module setup page.
 ModelModules=文件範本
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=在草稿文件上產生浮水印字串(如果以下文字框不是空字串)
@@ -1557,6 +1566,7 @@ SuppliersSetup=供應商模組設置
 SuppliersCommandModel=完整的供應商訂單文件範本（logo. ..）
 SuppliersInvoiceModel=完整的供應商發票(invoice)文件範本（logo. ...）
 SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=geoip的Maxmind模組設置
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat
@@ -1601,3 +1611,8 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
+YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+ListOfNotificationsPerContact=List of notifications per contact*
+ListOfFixedNotifications=List of fixed notifications
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+Threshold=Threshold
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index 081cd8dd75f..bd5c1ee90eb 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -48,7 +48,10 @@ InvoiceValidatedInDolibarr=發票%s的驗證
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=發票的%s去回到草案狀態
 InvoiceDeleteDolibarr=Invoice %s deleted
-OrderValidatedInDolibarr= 採購訂單%s已驗證
+OrderValidatedInDolibarr=採購訂單%s已驗證
+OrderDeliveredInDolibarr=Order %s classified delivered
+OrderCanceledInDolibarr=為了%s取消
+OrderBilledInDolibarr=Order %s classified billed
 OrderApprovedInDolibarr=為了%s批準
 OrderRefusedInDolibarr=Order %s refused
 OrderBackToDraftInDolibarr=為了%s回到草案狀態
@@ -91,3 +94,5 @@ WorkingTimeRange=Working time range
 WorkingDaysRange=Working days range
 AddEvent=Create event
 MyAvailability=My availability
+ActionType=Event type
+DateActionBegin=Start event date
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 2bf9461e0e1..fc3b6fb731e 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -74,8 +74,9 @@ PaymentsAlreadyDone=付款已完成
 PaymentsBackAlreadyDone=Payments back already done
 PaymentRule=付款規則
 PaymentMode=付款方式
-PaymentConditions=付款條件
-PaymentConditionsShort=付款天數
+PaymentTerm=Payment term
+PaymentConditions=Payment terms
+PaymentConditionsShort=Payment terms
 PaymentAmount=付款金額
 ValidatePayment=Validate payment
 PaymentHigherThanReminderToPay=付款支付更高的比提醒
@@ -293,6 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=兩個新的折扣總額必須等於原來
 ConfirmRemoveDiscount=你確定要刪除此折扣？
 RelatedBill=相關發票
 RelatedBills=有關發票
+RelatedCustomerInvoices=Related customer invoices
+RelatedSupplierInvoices=Related supplier invoices
 LatestRelatedBill=Latest related invoice
 WarningBillExist=Warning, one or more invoice already exist
 
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 85497e00361..668b104c214 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -1,64 +1,62 @@
 # Dolibarr language file - Source file is en_US - categories
-Category=類別
-Categories=分類
-Rubrique=類別
-Rubriques=分類
-categories=類別
-TheCategorie=類別
-NoCategoryYet=尚未有分類標籤被建立在此分類
+Rubrique=Tag/Category
+Rubriques=Tags/Categories
+categories=tags/categories
+TheCategorie=The tag/category
+NoCategoryYet=No tag/category of this type created
 In=在
 AddIn=加入
 modify=修改
 Classify=分類
-CategoriesArea=分類區
-ProductsCategoriesArea=產品/服務類別領域
-SuppliersCategoriesArea=供應商分類區
-CustomersCategoriesArea=客戶分類區
-ThirdPartyCategoriesArea=第三方分類區
-MembersCategoriesArea=成員類別面積
-ContactsCategoriesArea=Contacts categories area
-MainCats=主要類別
+CategoriesArea=Tags/Categories area
+ProductsCategoriesArea=Products/Services tags/categories area
+SuppliersCategoriesArea=Suppliers tags/categories area
+CustomersCategoriesArea=Customers tags/categories area
+ThirdPartyCategoriesArea=Third parties tags/categories area
+MembersCategoriesArea=Members tags/categories area
+ContactsCategoriesArea=Contacts tags/categories area
+MainCats=Main tags/categories
 SubCats=子類別
 CatStatistics=統計
-CatList=分類列表
-AllCats=所有類別
-ViewCat=查看分類
-NewCat=新增類別
-NewCategory=建立新的分類標籤
-ModifCat=修改類別
-CatCreated=類別
-CreateCat=建立分類標籤
-CreateThisCat=建立
+CatList=List of tags/categories
+AllCats=All tags/categories
+ViewCat=View tag/category
+NewCat=Add tag/category
+NewCategory=New tag/category
+ModifCat=Modify tag/category
+CatCreated=Tag/category created
+CreateCat=Create tag/category
+CreateThisCat=Create this tag/category
 ValidateFields=驗證欄位
 NoSubCat=無子類別
 SubCatOf=子類別
-FoundCats=發現類
-FoundCatsForName=分類找到的名稱：
-FoundSubCatsIn=小類類別中找到
-ErrSameCatSelected=您選擇的是同一類幾次
-ErrForgotCat=你忘了選擇類別
+FoundCats=Found tags/categories
+FoundCatsForName=Tags/categories found for the name :
+FoundSubCatsIn=Subcategories found in the tag/category
+ErrSameCatSelected=You selected the same tag/category several times
+ErrForgotCat=You forgot to choose the tag/category
 ErrForgotField=你忘了通知領域
 ErrCatAlreadyExists=此名稱已被使用
-AddProductToCat=添加此產品類別？
-ImpossibleAddCat=無法添加類別
-ImpossibleAssociateCategory=不可能關聯的類別
+AddProductToCat=Add this product to a tag/category?
+ImpossibleAddCat=Impossible to add the tag/category
+ImpossibleAssociateCategory=Impossible to associate the tag/category to
 WasAddedSuccessfully=%s是添加成功。
-ObjectAlreadyLinkedToCategory=元已鏈接到這一類。
-CategorySuccessfullyCreated=本分類%s已被添加成功。
-ProductIsInCategories=產品/服務，以擁有以下類別
-SupplierIsInCategories=第三方擁有對以下類別的供應商
-CompanyIsInCustomersCategories=這個客戶擁有下列客戶/潛在分類標籤
-CompanyIsInSuppliersCategories=個供應商擁有下列供應商分類標籤
-MemberIsInCategories=該成員擁有，以下列成員類別
-ContactIsInCategories=This contact owns to following contacts categories
-ProductHasNoCategory=此產品/服務是沒有任何類別
-SupplierHasNoCategory=這個供應商是不以任何類別
-CompanyHasNoCategory=這家公司沒有任何分類標籤
-MemberHasNoCategory=該成員沒有任何類別
-ContactHasNoCategory=This contact is not in any categories
-ClassifyInCategory=分類類別
+ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
+CategorySuccessfullyCreated=This tag/category %s has been added with success.
+ProductIsInCategories=Product/service owns to following tags/categories
+SupplierIsInCategories=Third party owns to following suppliers tags/categories
+CompanyIsInCustomersCategories=This third party owns to following customers/prospects tags/categories
+CompanyIsInSuppliersCategories=This third party owns to following suppliers tags/categories
+MemberIsInCategories=This member owns to following members tags/categories
+ContactIsInCategories=This contact owns to following contacts tags/categories
+ProductHasNoCategory=This product/service is not in any tags/categories
+SupplierHasNoCategory=This supplier is not in any tags/categories
+CompanyHasNoCategory=This company is not in any tags/categories
+MemberHasNoCategory=This member is not in any tags/categories
+ContactHasNoCategory=This contact is not in any tags/categories
+ClassifyInCategory=Classify in tag/category
 NoneCategory=無
-NotCategorized=Without category
+NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=此類別已存在此號
 ReturnInProduct=返回產品/服務卡
 ReturnInSupplier=返回供應商卡
@@ -66,22 +64,22 @@ ReturnInCompany=返回到客戶/前景卡
 ContentsVisibleByAll=內容將所有可見
 ContentsVisibleByAllShort=所有內容可見
 ContentsNotVisibleByAllShort=所有內容不可見
-CategoriesTree=Categories tree
-DeleteCategory=刪除分類標籤
-ConfirmDeleteCategory=你確定要刪除這個分類標籤？
-RemoveFromCategory=刪除連接的分類標籤：
-RemoveFromCategoryConfirm=你確定要移除關聯的分類標籤？
-NoCategoriesDefined=沒有任何分類標籤被定義
-SuppliersCategoryShort=供應商分類標籤
-CustomersCategoryShort=客戶分類標籤
-ProductsCategoryShort=產品分類標籤
-MembersCategoryShort=成員分類標籤
-SuppliersCategoriesShort=供應商分類標籤
-CustomersCategoriesShort=客戶分類標籤
+CategoriesTree=Tags/categories tree
+DeleteCategory=Delete tag/category
+ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
+RemoveFromCategory=Remove link with tag/categorie
+RemoveFromCategoryConfirm=Are you sure you want to remove link between the transaction and the tag/category ?
+NoCategoriesDefined=No tag/category defined
+SuppliersCategoryShort=Suppliers tags/category
+CustomersCategoryShort=Customers tags/category
+ProductsCategoryShort=Products tags/category
+MembersCategoryShort=Members tags/category
+SuppliersCategoriesShort=Suppliers tags/categories
+CustomersCategoriesShort=Customers tags/categories
 CustomersProspectsCategoriesShort=客戶/潛在分類標籤
-ProductsCategoriesShort=產品分類標籤
-MembersCategoriesShort=成員分類標籤
-ContactCategoriesShort=Contacts categories
+ProductsCategoriesShort=Products tags/categories
+MembersCategoriesShort=Members tags/categories
+ContactCategoriesShort=Contacts tags/categories
 ThisCategoryHasNoProduct=這個類別不含任何產品。
 ThisCategoryHasNoSupplier=這個類別不含任何供應商。
 ThisCategoryHasNoCustomer=這個類別不含任何客戶。
@@ -90,23 +88,23 @@ ThisCategoryHasNoContact=This category does not contain any contact.
 AssignedToCustomer=分配給客戶
 AssignedToTheCustomer=分配給客戶
 InternalCategory=內部類
-CategoryContents=分類內容
-CategId=分類編號
-CatSupList=供應商分類列表
-CatCusList=客戶名單/前景類別
-CatProdList=產品類別列表
-CatMemberList=類別的成員名單
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
-DeleteFromCat=Remove from category
+CategoryContents=Tag/category contents
+CategId=Tag/category id
+CatSupList=List of supplier tags/categories
+CatCusList=List of customer/prospect tags/categories
+CatProdList=List of products tags/categories
+CatMemberList=List of members tags/categories
+CatContactList=List of contact tags/categories and contact
+CatSupLinks=Links between suppliers and tags/categories
+CatCusLinks=Links between customers/prospects and tags/categories
+CatProdLinks=Links between products/services and tags/categories
+CatMemberLinks=Links between members and tags/categories
+DeleteFromCat=Remove from tags/category
 DeletePicture=Picture delete
 ConfirmDeletePicture=Confirm picture deletion?
 ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
+CategoriesSetup=Tags/categories setup
+CategorieRecursiv=Link with parent tag/category automatically
 CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show category
+ShowCategory=Show tag/category
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index a2b5296ad01..aac41414f2c 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -26,15 +26,15 @@ CronLastOutput=Last run output
 CronLastResult=Last result code
 CronListOfCronJobs=List of scheduled jobs
 CronCommand=Command
-CronList=Jobs list
-CronDelete= Delete cron jobs
-CronConfirmDelete= Are you sure you want to delete this cron job ?
-CronExecute=Launch job
-CronConfirmExecute= Are you sure to execute this job now
-CronInfo= Jobs allow to execute task that have been planned
-CronWaitingJobs=Wainting jobs
+CronList=Scheduled job
+CronDelete=Delete scheduled jobs
+CronConfirmDelete=Are you sure you want to delete this scheduled jobs ?
+CronExecute=Launch scheduled jobs
+CronConfirmExecute=Are you sure to execute this scheduled jobs now ?
+CronInfo=Scheduled job module allow to execute job that have been planned
+CronWaitingJobs=Waiting jobs
 CronTask=Job
-CronNone= 無
+CronNone=無
 CronDtStart=開始日期
 CronDtEnd=結束日期
 CronDtNextLaunch=Next execution
@@ -75,6 +75,7 @@ CronObjectHelp=The object name to load. 
     For exemple to fetch method of Doli
 CronMethodHelp=The object method to launch. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is fecth
 CronArgsHelp=The method arguments. 
     For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be 0, ProductRef
 CronCommandHelp=The system command line to execute.
+CronCreateJob=Create new Scheduled Job
 # Info
 CronInfoPage=Information
 # Common
diff --git a/htdocs/langs/zh_TW/donations.lang b/htdocs/langs/zh_TW/donations.lang
index 5f5db905084..432861fa8bf 100644
--- a/htdocs/langs/zh_TW/donations.lang
+++ b/htdocs/langs/zh_TW/donations.lang
@@ -6,6 +6,8 @@ Donor=捐贈者
 Donors=捐助者
 AddDonation=Create a donation
 NewDonation=新捐贈
+DeleteADonation=Delete a donation
+ConfirmDeleteADonation=Are you sure you want to delete this donation ?
 ShowDonation=Show donation
 DonationPromise=禮品的承諾
 PromisesNotValid=未驗證的承諾
@@ -21,6 +23,8 @@ DonationStatusPaid=收到的捐款
 DonationStatusPromiseNotValidatedShort=草案
 DonationStatusPromiseValidatedShort=驗證
 DonationStatusPaidShort=收稿
+DonationTitle=Donation receipt
+DonationDatePayment=Payment date
 ValidPromess=驗證承諾
 DonationReceipt=Donation receipt
 BuildDonationReceipt=建立收據
@@ -36,3 +40,4 @@ FrenchOptions=Options for France
 DONATION_ART200=Show article 200 from CGI if you are concerned
 DONATION_ART238=Show article 238 from CGI if you are concerned
 DONATION_ART885=Show article 885 from CGI if you are concerned
+DonationPayment=Donation payment
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 4245e06fb04..e0cd34688ce 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -161,6 +161,12 @@ ErrorPriceExpressionUnknown=Unknown error '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
+ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
+ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
+ErrorGlobalVariableUpdater2=Missing parameter '%s'
+ErrorGlobalVariableUpdater3=The requested data was not found in result
+ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
+ErrorGlobalVariableUpdater5=No global variable selected
 
 # Warnings
 WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 61cba6b14a7..31cd73cca94 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -139,3 +139,5 @@ ListOfNotificationsDone=列出所有發送電子郵件通知
 MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
 MailSendSetupIs2=You must first go, with an admin account, into menu %sHome - Setup - EMails%s to change parameter '%s' to use mode '%s'. With this mode, you can enter setup of the SMTP server provided by your Internet Service Provider and use Mass emailing feature.
 MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
+YouCanAlsoUseSupervisorKeyword=You can also add the keyword __SUPERVISOREMAIL__ to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+NbOfTargetedContacts=Current number of targeted contact emails
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 825700c91da..f2feec280dc 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -352,6 +352,7 @@ Status=狀態
 Favorite=Favorite
 ShortInfo=Info.
 Ref=編號
+ExternalRef=Ref. extern
 RefSupplier=供應商編號
 RefPayment=付款號
 CommercialProposalsShort=商業建議
@@ -394,8 +395,8 @@ Available=可用的
 NotYetAvailable=尚未提供
 NotAvailable=不適用
 Popularity=聲望
-Categories=分類
-Category=類別
+Categories=Tags/categories
+Category=Tag/category
 By=由
 From=From
 to=至
@@ -694,6 +695,7 @@ AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
 PrintFile=Print File %s
 ShowTransaction=Show transaction
+GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 # Week day
 Monday=星期一
 Tuesday=星期二
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index acf0e5c9696..d843668c5cd 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -64,7 +64,8 @@ ShipProduct=船舶產品
 Discount=折扣
 CreateOrder=創建訂單
 RefuseOrder=拒絕訂單
-ApproveOrder=接受訂單
+ApproveOrder=Approve order
+Approve2Order=Approve order (second level)
 ValidateOrder=驗證訂單
 UnvalidateOrder=Unvalidate秩序
 DeleteOrder=刪除訂單
@@ -102,6 +103,8 @@ ClassifyBilled=分類“帳單”
 ComptaCard=會計證
 DraftOrders=草案訂單
 RelatedOrders=有關命令
+RelatedCustomerOrders=Related customer orders
+RelatedSupplierOrders=Related supplier orders
 OnProcessOrders=處理中的訂單
 RefOrder=訂單號碼
 RefCustomerOrder=客戶訂單號
@@ -118,6 +121,7 @@ PaymentOrderRef=清繳秩序%
 CloneOrder=複製訂單
 ConfirmCloneOrder=你確定要複製這個 %s 訂單嗎?
 DispatchSupplierOrder=接收供應商的訂單%s
+FirstApprovalAlreadyDone=First approval already done
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=代替客戶下單
 TypeContact_commande_internal_SHIPPING=代替客戶寄送
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 49b687412d6..2cf747a9bd4 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -12,6 +12,7 @@ Notify_FICHINTER_VALIDATE=幹預驗證
 Notify_FICHINTER_SENTBYMAIL=Intervention sent by mail
 Notify_BILL_VALIDATE=客戶發票驗證
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_APPROVE=供應商為了批準
 Notify_ORDER_SUPPLIER_REFUSE=供應商的訂單被拒絕
 Notify_ORDER_VALIDATE=驗證客戶訂單
@@ -28,7 +29,7 @@ Notify_PROPAL_SENTBYMAIL=通過郵件發送的商業提案
 Notify_BILL_PAYED=客戶發票payed
 Notify_BILL_CANCEL=客戶發票取消
 Notify_BILL_SENTBYMAIL=通過郵件發送的客戶發票
-Notify_ORDER_SUPPLIER_VALIDATE=供應商為了驗證
+Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
 Notify_ORDER_SUPPLIER_SENTBYMAIL=通過郵件發送的供應商的訂單
 Notify_BILL_SUPPLIER_VALIDATE=供應商發票驗證
 Notify_BILL_SUPPLIER_PAYED=供應商發票payed
@@ -47,7 +48,7 @@ Notify_PROJECT_CREATE=Project creation
 Notify_TASK_CREATE=Task created
 Notify_TASK_MODIFY=Task modified
 Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See module setup
+SeeModuleSetup=See setup of module %s
 NbOfAttachedFiles=所附文件數/文件
 TotalSizeOfAttachedFiles=附件大小總計
 MaxSize=檔案最大
@@ -170,6 +171,7 @@ EMailTextInvoiceValidated=發票%s已被確認。
 EMailTextProposalValidated=這項建議%s已經驗證。
 EMailTextOrderValidated=該命令%s已被驗證。
 EMailTextOrderApproved=該命令%s已被批準。
+EMailTextOrderValidatedBy=The order %s has been recorded by %s.
 EMailTextOrderApprovedBy=該命令%s已被%s批準
 EMailTextOrderRefused=該命令%s已被拒絕。
 EMailTextOrderRefusedBy=該命令%s已經%s拒絕
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 60d05dae9f0..756bdf38dc2 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -245,12 +245,25 @@ MinimumRecommendedPrice=Minimum recommended price is : %s
 PriceExpressionEditor=Price expression editor
 PriceExpressionSelected=Selected price expression
 PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
+PriceExpressionEditorHelp2=You can access ExtraFields with variables like #extrafield_myextrafieldkey# and global variables with #global_mycode#
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
    #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
 PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
    In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp5=Available global values:
 PriceMode=Price mode
 PriceNumeric=Number
 DefaultPrice=Default price
 ComposedProductIncDecStock=Increase/Decrease stock on parent change
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimun supplier price
+MinSupplierPrice=Minimum supplier price
+DynamicPriceConfiguration=Dynamic price configuration
+GlobalVariables=Global variables
+GlobalVariableUpdaters=Global variable updaters
+GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterHelp0=Parses JSON data from specified URL, VALUE specifies the location of relevant value,
+GlobalVariableUpdaterHelpFormat0=format is {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService data
+GlobalVariableUpdaterHelp1=Parses WebService data from specified URL, NS specifies the namespace, VALUE specifies the location of relevant value, DATA should contain the data to send and METHOD is the calling WS method
+GlobalVariableUpdaterHelpFormat1=format is {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data, "to": "send"}}
+UpdateInterval=Update interval (minutes)
+LastUpdated=Last updated
+CorrectlyUpdated=Correctly updated
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 4c29cb68aad..af14269d041 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -72,6 +72,7 @@ ListSupplierInvoicesAssociatedProject=名單與項目相關的供應商的發票
 ListContractAssociatedProject=名單與項目有關的合同
 ListFichinterAssociatedProject=名單與項目相關的幹預措施
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
+ListDonationsAssociatedProject=List of donations associated with the project
 ListActionsAssociatedProject=名單與項目有關的行動
 ActivityOnProjectThisWeek=對項目活動周
 ActivityOnProjectThisMonth=本月初對項目活動
@@ -130,13 +131,15 @@ AddElement=Link to element
 UnlinkElement=Unlink element
 # Documents models
 DocumentModelBaleine=一個完整的項目報告模型（logo. ..）
-PlannedWorkload = Planned workload
-WorkloadOccupation= Workload affectation
+PlannedWorkload=Planned workload
+PlannedWorkloadShort=Workload
+WorkloadOccupation=Workload assignation
 ProjectReferers=Refering objects
 SearchAProject=Search a project
 ProjectMustBeValidatedFirst=Project must be validated first
 ProjectDraft=Draft projects
 FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
-InputPerTime=Input per time
 InputPerDay=Input per day
+InputPerWeek=Input per week
+InputPerAction=Input per action
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 55380896853..9e6201c8bee 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -2,6 +2,7 @@
 RefSending=出貨單編號
 Sending=出貨
 Sendings=出貨
+AllSendings=All Shipments
 Shipment=出貨
 Shipments=出貨
 ShowSending=Show Sending
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index b7f31a8d40a..23bc2d647a7 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -43,3 +43,4 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest delay is display among order product list
+UseDoubleApproval=Use double approval (the second approval will be any user of a defined user group)

From 8d892e19c1cf3d804754d5b1bb85e4815daa458b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur 
Date: Thu, 2 Apr 2015 13:56:32 +0200
Subject: [PATCH 296/412] Sync from transifex

---
 htdocs/langs/en_GB/banks.lang        | 10 +---------
 htdocs/langs/en_GB/compta.lang       |  7 -------
 htdocs/langs/en_GB/main.lang         | 22 ++++++++++++++--------
 htdocs/langs/es_AR/banks.lang        |  2 ++
 htdocs/langs/es_AR/commercial.lang   |  2 ++
 htdocs/langs/es_AR/suppliers.lang    |  2 ++
 htdocs/langs/es_CO/banks.lang        |  2 ++
 htdocs/langs/es_CO/commercial.lang   |  2 ++
 htdocs/langs/es_CO/externalsite.lang |  2 ++
 htdocs/langs/es_CO/salaries.lang     |  5 +++++
 htdocs/langs/es_CO/suppliers.lang    |  2 ++
 htdocs/langs/pt_BR/link.lang         |  8 ++++++++
 12 files changed, 42 insertions(+), 24 deletions(-)
 delete mode 100644 htdocs/langs/en_GB/compta.lang
 create mode 100644 htdocs/langs/es_AR/banks.lang
 create mode 100644 htdocs/langs/es_AR/commercial.lang
 create mode 100644 htdocs/langs/es_AR/suppliers.lang
 create mode 100644 htdocs/langs/es_CO/banks.lang
 create mode 100644 htdocs/langs/es_CO/commercial.lang
 create mode 100644 htdocs/langs/es_CO/externalsite.lang
 create mode 100644 htdocs/langs/es_CO/salaries.lang
 create mode 100644 htdocs/langs/es_CO/suppliers.lang
 create mode 100644 htdocs/langs/pt_BR/link.lang

diff --git a/htdocs/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang
index 289acc55386..e58cf5e72b5 100644
--- a/htdocs/langs/en_GB/banks.lang
+++ b/htdocs/langs/en_GB/banks.lang
@@ -1,10 +1,2 @@
 # Dolibarr language file - Source file is en_US - banks
-ValidateCheckReceipt=Validate this cheque receipt ?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt, no change will be possible once this is done ?
-DeleteCheckReceipt=Delete this cheque receipt ?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this cheque receipt ?
-BankChecks=Bank cheques
-BankChecksToReceipt=Cheques waiting for deposit
-ShowCheckReceipt=Show cheque deposit receipt
-NumberOfCheques=Nb of cheque
-SelectChequeTransactionAndGenerate=Select/filter cheques to include into the cheque deposit receipt and click on "Create".
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/en_GB/compta.lang b/htdocs/langs/en_GB/compta.lang
deleted file mode 100644
index 8bd70a68704..00000000000
--- a/htdocs/langs/en_GB/compta.lang
+++ /dev/null
@@ -1,7 +0,0 @@
-# Dolibarr language file - Source file is en_US - compta
-CheckReceipt=Cheque deposit
-CheckReceiptShort=Cheque deposit
-NewCheckDeposit=New cheque deposit
-NoWaitingChecks=No cheques waiting for deposit.
-DateChequeReceived=Cheque reception date
-NbOfCheques=Nb of cheques
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index c571a7a7272..3dbf77cffe0 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -4,17 +4,23 @@ FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
-FormatDateShort=%m/%d/%Y
+FormatDateShort=%d/%m/%Y
 FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJava=dd/MM/yyyy
 FormatDateShortJavaInput=MM/dd/yyyy
 FormatDateShortJQuery=mm/dd/yy
 FormatDateShortJQueryInput=mm/dd/yy
-FormatHourShort=%I:%M %p
+FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%b %d, %Y
-FormatDateText=%B %d, %Y
-FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%b %d, %Y, %I:%M %p
-FormatDateHourText=%B %d, %Y, %I:%M %p
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
+AmountVAT=Amount VAT
+TotalVAT=Total VAT
+IncludedVAT=Included VAT
+TTC=Inc. VAT
+VAT=VAT
+VATRate=VAT Rate
diff --git a/htdocs/langs/es_AR/banks.lang b/htdocs/langs/es_AR/banks.lang
new file mode 100644
index 00000000000..e58cf5e72b5
--- /dev/null
+++ b/htdocs/langs/es_AR/banks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - banks
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/es_AR/commercial.lang b/htdocs/langs/es_AR/commercial.lang
new file mode 100644
index 00000000000..18d8db06801
--- /dev/null
+++ b/htdocs/langs/es_AR/commercial.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - commercial
+ActionAffectedTo=Event assigned to
diff --git a/htdocs/langs/es_AR/suppliers.lang b/htdocs/langs/es_AR/suppliers.lang
new file mode 100644
index 00000000000..5213cec4e07
--- /dev/null
+++ b/htdocs/langs/es_AR/suppliers.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - suppliers
+DenyingThisOrder=Deny this order
diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
new file mode 100644
index 00000000000..e58cf5e72b5
--- /dev/null
+++ b/htdocs/langs/es_CO/banks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - banks
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
diff --git a/htdocs/langs/es_CO/commercial.lang b/htdocs/langs/es_CO/commercial.lang
new file mode 100644
index 00000000000..18d8db06801
--- /dev/null
+++ b/htdocs/langs/es_CO/commercial.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - commercial
+ActionAffectedTo=Event assigned to
diff --git a/htdocs/langs/es_CO/externalsite.lang b/htdocs/langs/es_CO/externalsite.lang
new file mode 100644
index 00000000000..41f70db06fe
--- /dev/null
+++ b/htdocs/langs/es_CO/externalsite.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - externalsite
+ExampleMyMenuEntry=Mi entrada en el menú
diff --git a/htdocs/langs/es_CO/salaries.lang b/htdocs/langs/es_CO/salaries.lang
new file mode 100644
index 00000000000..a9438eb4f66
--- /dev/null
+++ b/htdocs/langs/es_CO/salaries.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Código contable para pagos de salarios
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Código contable para cargo financiero
+THM=Valor de hora promedio
+TJM=Valor día promedio
diff --git a/htdocs/langs/es_CO/suppliers.lang b/htdocs/langs/es_CO/suppliers.lang
new file mode 100644
index 00000000000..5213cec4e07
--- /dev/null
+++ b/htdocs/langs/es_CO/suppliers.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - suppliers
+DenyingThisOrder=Deny this order
diff --git a/htdocs/langs/pt_BR/link.lang b/htdocs/langs/pt_BR/link.lang
new file mode 100644
index 00000000000..fc6685ef08d
--- /dev/null
+++ b/htdocs/langs/pt_BR/link.lang
@@ -0,0 +1,8 @@
+# Dolibarr language file - Source file is en_US - link
+LinkANewFile=Vincular um novo arquivo/documento
+LinkedFiles=Arquivos vinculados e documentos
+NoLinkFound=Não há links registrados
+LinkComplete=O arquivo foi associada com sucesso
+ErrorFileNotLinked=O arquivo não pôde ser vinculado
+ErrorFailedToDeleteLink=Falha ao remover link '%s'
+ErrorFailedToUpdateLink=Falha ao atualizar link '%s'

From acbeb2b360ff480b38caee404a910a1ff4f53b63 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur 
Date: Thu, 2 Apr 2015 14:03:52 +0200
Subject: [PATCH 297/412] Fix en_GB

---
 htdocs/langs/en_GB/main.lang | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index 3dbf77cffe0..79c78254e46 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -5,17 +5,17 @@ FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
-FormatDateShortInput=%m/%d/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
-FormatDateShortJavaInput=MM/dd/yyyy
-FormatDateShortJQuery=mm/dd/yy
-FormatDateShortJQueryInput=mm/dd/yy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
 FormatDateHourShort=%d/%m/%Y %H:%M
-FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourSecShort=%d/%m/%Y  %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 AmountVAT=Amount VAT

From 761409caf6d13c75b93f2eb08dc88e98892723df Mon Sep 17 00:00:00 2001
From: Laurent Destailleur 
Date: Thu, 2 Apr 2015 15:17:07 +0200
Subject: [PATCH 298/412] Fix sql error

---
 htdocs/core/modules/modFournisseur.class.php | 414 +++++++++----------
 1 file changed, 207 insertions(+), 207 deletions(-)

diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 1f1a8072e1e..98e30953998 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -67,194 +67,194 @@ class modFournisseur extends DolibarrModules
 		                    "/fournisseur/facture/temp"
 		                    );
 
-            // Dependances
-            $this->depends = array("modSociete");
-            $this->requiredby = array();
-            $this->langfiles = array('bills', 'companies', 'suppliers', 'orders');
+		// Dependances
+		$this->depends = array("modSociete");
+		$this->requiredby = array();
+		$this->langfiles = array('bills', 'companies', 'suppliers', 'orders');
 
-            // Config pages
-            $this->config_page_url = array("supplier_order.php");
+		// Config pages
+		$this->config_page_url = array("supplier_order.php");
 
-            // Constantes
-            $this->const = array();
-			$r=0;
+		// Constantes
+		$this->const = array();
+		$r=0;
 
-            $this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_PDF";
-            $this->const[$r][1] = "chaine";
-            $this->const[$r][2] = "muscadet";
-			$this->const[$r][3] = 'Nom du gestionnaire de generation des bons de commande en PDF';
-			$this->const[$r][4] = 0;
-			$r++;
+		$this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "muscadet";
+		$this->const[$r][3] = 'Nom du gestionnaire de generation des bons de commande en PDF';
+		$this->const[$r][4] = 0;
+		$r++;
 
-            $this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_NUMBER";
-            $this->const[$r][1] = "chaine";
-            $this->const[$r][2] = "mod_commande_fournisseur_muguet";
-			$this->const[$r][3] = 'Nom du gestionnaire de numerotation des commandes fournisseur';
-			$this->const[$r][4] = 0;
-			$r++;
+		$this->const[$r][0] = "COMMANDE_SUPPLIER_ADDON_NUMBER";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "mod_commande_fournisseur_muguet";
+		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des commandes fournisseur';
+		$this->const[$r][4] = 0;
+		$r++;
 
-			$this->const[$r][0] = "INVOICE_SUPPLIER_ADDON_PDF";
-            $this->const[$r][1] = "chaine";
-            $this->const[$r][2] = "canelle";
-			$this->const[$r][3] = 'Nom du gestionnaire de generation des factures fournisseur en PDF';
-			$this->const[$r][4] = 0;
-			$r++;
+		$this->const[$r][0] = "INVOICE_SUPPLIER_ADDON_PDF";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "canelle";
+		$this->const[$r][3] = 'Nom du gestionnaire de generation des factures fournisseur en PDF';
+		$this->const[$r][4] = 0;
+		$r++;
 
-			$this->const[$r][0] = "INVOICE_SUPPLIER_ADDON_NUMBER";
-            $this->const[$r][1] = "chaine";
-            $this->const[$r][2] = "mod_facture_fournisseur_cactus";
-			$this->const[$r][3] = 'Nom du gestionnaire de numerotation des factures fournisseur';
-			$this->const[$r][4] = 0;
-			$r++;
+		$this->const[$r][0] = "INVOICE_SUPPLIER_ADDON_NUMBER";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "mod_facture_fournisseur_cactus";
+		$this->const[$r][3] = 'Nom du gestionnaire de numerotation des factures fournisseur';
+		$this->const[$r][4] = 0;
+		$r++;
 
-            // Boxes
-            $this->boxes = array(
-            	0=>array('file'=>'box_graph_invoices_supplier_permonth.php','enabledbydefaulton'=>'Home'),
-            	1=>array('file'=>'box_graph_orders_supplier_permonth.php','enabledbydefaulton'=>'Home'),
-            	2=>array('file'=>'box_fournisseurs.php','enabledbydefaulton'=>'Home'),
-            	3=>array('file'=>'box_factures_fourn_imp.php','enabledbydefaulton'=>'Home'),
-            	4=>array('file'=>'box_factures_fourn.php','enabledbydefaulton'=>'Home'),
-            	5=>array('file'=>'box_supplier_orders.php','enabledbydefaulton'=>'Home'),
-            );
+		// Boxes
+		$this->boxes = array(
+		0=>array('file'=>'box_graph_invoices_supplier_permonth.php','enabledbydefaulton'=>'Home'),
+		1=>array('file'=>'box_graph_orders_supplier_permonth.php','enabledbydefaulton'=>'Home'),
+		2=>array('file'=>'box_fournisseurs.php','enabledbydefaulton'=>'Home'),
+		3=>array('file'=>'box_factures_fourn_imp.php','enabledbydefaulton'=>'Home'),
+		4=>array('file'=>'box_factures_fourn.php','enabledbydefaulton'=>'Home'),
+		5=>array('file'=>'box_supplier_orders.php','enabledbydefaulton'=>'Home'),
+		);
 
-            // Permissions
-            $this->rights = array();
-            $this->rights_class = 'fournisseur';
-            $r=0;
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'fournisseur';
+		$r=0;
 
-            $r++;
-            $this->rights[$r][0] = 1181;
-            $this->rights[$r][1] = 'Consulter les fournisseurs';
-            $this->rights[$r][2] = 'r';
-            $this->rights[$r][3] = 1;
-            $this->rights[$r][4] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 1181;
+		$this->rights[$r][1] = 'Consulter les fournisseurs';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'lire';
 
-            $r++;
-            $this->rights[$r][0] = 1182;
-            $this->rights[$r][1] = 'Consulter les commandes fournisseur';
-            $this->rights[$r][2] = 'r';
-            $this->rights[$r][3] = 1;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 1182;
+		$this->rights[$r][1] = 'Consulter les commandes fournisseur';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'lire';
 
-            $r++;
-            $this->rights[$r][0] = 1183;
-            $this->rights[$r][1] = 'Creer une commande fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'creer';
+		$r++;
+		$this->rights[$r][0] = 1183;
+		$this->rights[$r][1] = 'Creer une commande fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'creer';
 
-            $r++;
-            $this->rights[$r][0] = 1184;
-            $this->rights[$r][1] = 'Valider une commande fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'valider';
+		$r++;
+		$this->rights[$r][0] = 1184;
+		$this->rights[$r][1] = 'Valider une commande fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'valider';
 
-            $r++;
-            $this->rights[$r][0] = 1185;
-            $this->rights[$r][1] = 'Approuver une commande fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'approuver';
+		$r++;
+		$this->rights[$r][0] = 1185;
+		$this->rights[$r][1] = 'Approuver une commande fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'approuver';
 
-            $r++;
-            $this->rights[$r][0] = 1186;
-            $this->rights[$r][1] = 'Commander une commande fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'commander';
+		$r++;
+		$this->rights[$r][0] = 1186;
+		$this->rights[$r][1] = 'Commander une commande fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'commander';
 
-            $r++;
-            $this->rights[$r][0] = 1187;
-            $this->rights[$r][1] = 'Receptionner une commande fournisseur';
-            $this->rights[$r][2] = 'd';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'receptionner';
+		$r++;
+		$this->rights[$r][0] = 1187;
+		$this->rights[$r][1] = 'Receptionner une commande fournisseur';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'receptionner';
 
-            $r++;
-            $this->rights[$r][0] = 1188;
-            $this->rights[$r][1] = 'Supprimer une commande fournisseur';
-            $this->rights[$r][2] = 'd';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'supprimer';
+		$r++;
+		$this->rights[$r][0] = 1188;
+		$this->rights[$r][1] = 'Supprimer une commande fournisseur';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'supprimer';
 
-            $r++;
-            $this->rights[$r][0] = 1231;
-            $this->rights[$r][1] = 'Consulter les factures fournisseur';
-            $this->rights[$r][2] = 'r';
-            $this->rights[$r][3] = 1;
-            $this->rights[$r][4] = 'facture';
-            $this->rights[$r][5] = 'lire';
+		$r++;
+		$this->rights[$r][0] = 1231;
+		$this->rights[$r][1] = 'Consulter les factures fournisseur';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 1;
+		$this->rights[$r][4] = 'facture';
+		$this->rights[$r][5] = 'lire';
 
-            $r++;
-            $this->rights[$r][0] = 1232;
-            $this->rights[$r][1] = 'Creer une facture fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'facture';
-            $this->rights[$r][5] = 'creer';
+		$r++;
+		$this->rights[$r][0] = 1232;
+		$this->rights[$r][1] = 'Creer une facture fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'facture';
+		$this->rights[$r][5] = 'creer';
 
-            $r++;
-            $this->rights[$r][0] = 1233;
-            $this->rights[$r][1] = 'Valider une facture fournisseur';
-            $this->rights[$r][2] = 'w';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'facture';
-            $this->rights[$r][5] = 'valider';
+		$r++;
+		$this->rights[$r][0] = 1233;
+		$this->rights[$r][1] = 'Valider une facture fournisseur';
+		$this->rights[$r][2] = 'w';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'facture';
+		$this->rights[$r][5] = 'valider';
 
-            $r++;
-            $this->rights[$r][0] = 1234;
-            $this->rights[$r][1] = 'Supprimer une facture fournisseur';
-            $this->rights[$r][2] = 'd';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'facture';
-            $this->rights[$r][5] = 'supprimer';
+		$r++;
+		$this->rights[$r][0] = 1234;
+		$this->rights[$r][1] = 'Supprimer une facture fournisseur';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'facture';
+		$this->rights[$r][5] = 'supprimer';
 
-            $r++;
-            $this->rights[$r][0] = 1235;
-			$this->rights[$r][1] = 'Envoyer les factures par mail';
-			$this->rights[$r][2] = 'a';
-			$this->rights[$r][3] = 0;
-			$this->rights[$r][4] = 'supplier_invoice_advance';
-			$this->rights[$r][5] = 'send';
+		$r++;
+		$this->rights[$r][0] = 1235;
+		$this->rights[$r][1] = 'Envoyer les factures par mail';
+		$this->rights[$r][2] = 'a';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'supplier_invoice_advance';
+		$this->rights[$r][5] = 'send';
 
-            $r++;
-            $this->rights[$r][0] = 1236;
-            $this->rights[$r][1] = 'Exporter les factures fournisseurs, attributs et reglements';
-            $this->rights[$r][2] = 'r';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'facture';
-            $this->rights[$r][5] = 'export';
+		$r++;
+		$this->rights[$r][0] = 1236;
+		$this->rights[$r][1] = 'Exporter les factures fournisseurs, attributs et reglements';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'facture';
+		$this->rights[$r][5] = 'export';
 
-            $r++;
-            $this->rights[$r][0] = 1237;
-            $this->rights[$r][1] = 'Exporter les commande fournisseurs, attributs';
-            $this->rights[$r][2] = 'r';
-            $this->rights[$r][3] = 0;
-            $this->rights[$r][4] = 'commande';
-            $this->rights[$r][5] = 'export';
+		$r++;
+		$this->rights[$r][0] = 1237;
+		$this->rights[$r][1] = 'Exporter les commande fournisseurs, attributs';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'commande';
+		$this->rights[$r][5] = 'export';
 
-            // Exports
-            //--------
-            $r=0;
+		// Exports
+		//--------
+		$r=0;
 
-            $r++;
-            $this->export_code[$r]=$this->rights_class.'_'.$r;
-            $this->export_label[$r]='Factures fournisseurs et lignes de facture';
-            $this->export_icon[$r]='bill';
-            $this->export_permission[$r]=array(array("fournisseur","facture","export"));
-            $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.ref_supplier'=>"RefSupplier",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.total_tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_public'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.accountancy_code_buy'=>'ProductAccountancyBuyCode');
-            //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
-            $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
-            $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.remise_percent'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva'=>"invoice_line",'fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product','p.accountancy_code_buy'=>'product');
-            $this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$r++;
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='Factures fournisseurs et lignes de facture';
+		$this->export_icon[$r]='bill';
+		$this->export_permission[$r]=array(array("fournisseur","facture","export"));
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.ref_supplier'=>"RefSupplier",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.total_tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_public'=>"InvoiceNote",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel','p.accountancy_code_buy'=>'ProductAccountancyBuyCode');
+		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'fd.rowid'=>'invoice_line','fd.description'=>"invoice_line",'fd.tva_tx'=>"invoice_line",'fd.qty'=>"invoice_line",'fd.remise_percent'=>"invoice_line",'fd.total_ht'=>"invoice_line",'fd.total_ttc'=>"invoice_line",'fd.tva'=>"invoice_line",'fd.product_type'=>'invoice_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product','p.accountancy_code_buy'=>'product');
+		$this->export_dependencies_array[$r]=array('invoice_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields
 		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
 		$resql=$this->db->query($sql);
@@ -289,26 +289,26 @@ class modFournisseur extends DolibarrModules
 			}
 		}
 		// End add axtra fields
-            $this->export_sql_start[$r]='SELECT DISTINCT ';
-            $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
-            $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object';
-            $this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'facture_fourn_det as fd';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-            $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
-            $this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .=' , '.MAIN_DB_PREFIX.'facture_fourn_det as fd';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
+		$this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
 
-            $r++;
-            $this->export_code[$r]=$this->rights_class.'_'.$r;
-            $this->export_label[$r]='Factures fournisseurs et reglements';
-            $this->export_icon[$r]='bill';
-            $this->export_permission[$r]=array(array("fournisseur","facture","export"));
-            $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.ref_supplier'=>"RefSupplier",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.total_tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_public'=>"InvoiceNote",'p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber');
-            //$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
-            $this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
-            $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment');
-            $this->export_dependencies_array[$r]=array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$r++;
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='Factures fournisseurs et reglements';
+		$this->export_icon[$r]='bill';
+		$this->export_permission[$r]=array(array("fournisseur","facture","export"));
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"InvoiceId",'f.ref'=>"InvoiceRef",'f.ref_supplier'=>"RefSupplier",'f.datec'=>"InvoiceDateCreation",'f.datef'=>"DateInvoice",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.total_tva'=>"TotalVAT",'f.paye'=>"InvoicePaid",'f.fk_statut'=>'InvoiceStatus','f.note_public'=>"InvoiceNote",'p.rowid'=>'PaymentId','pf.amount'=>'AmountPayment','p.datep'=>'DatePayment','p.num_paiement'=>'PaymentNumber');
+		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
+		$this->export_TypeFields_array[$r]=array('s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.total_tva'=>"Number",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'pf.amount'=>'Number','p.datep'=>'Date','p.num_paiement'=>'Number');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"invoice",'f.ref'=>"invoice",'f.ref_supplier'=>"invoice",'f.datec'=>"invoice",'f.datef'=>"invoice",'f.total_ht'=>"invoice",'f.total_ttc'=>"invoice",'f.total_tva'=>"invoice",'f.paye'=>"invoice",'f.fk_statut'=>'invoice','f.note_public'=>"invoice",'p.rowid'=>'payment','pf.amount'=>'payment','p.datep'=>'payment','p.num_paiement'=>'payment');
+		$this->export_dependencies_array[$r]=array('payment'=>'p.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields
 		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn'";
 		$resql=$this->db->query($sql);
@@ -343,33 +343,33 @@ class modFournisseur extends DolibarrModules
 			}
 		}
 		// End add axtra fields
-            $this->export_sql_start[$r]='SELECT DISTINCT ';
-            $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
-            $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn as p ON pf.fk_paiementfourn = p.rowid';
-            $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
-            $this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'facture_fourn as f';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_extrafields as extra ON f.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn as p ON pf.fk_paiementfourn = p.rowid';
+		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
 
-            $r++;
-            $this->export_code[$r]=$this->rights_class.'_'.$r;
-            $this->export_label[$r]='Commandes fournisseurs et lignes de commandes';
-            $this->export_icon[$r]='order';
-            $this->export_permission[$r]=array(array("fournisseur","commande","export"));
-            $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"OrderId",'f.ref'=>"Ref",'f.ref_supplier'=>"RefSupplier",'f.date_creation'=>"DateCreation",'f.date_commande'=>"OrderDate",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.fk_statut'=>'Status','f.note_private'=>"NotePrivate",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.total_tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
-            $this->export_TypeFields_array[$r]=array('s.rowid'=>"company",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.date_creation'=>"Date",'f.date_commande'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.fk_statut'=>'Status','f.note_private'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Number",'fd.qty'=>"Number",'fd.remise_percent'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.total_tva'=>"Number",'fd.product_type'=>'Boolean','fd.fk_product'=>'List:Product:label','p.ref'=>'Text','p.label'=>'Text');
-            $this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"order",'f.ref'=>"order",'f.ref_supplier'=>"order",'f.date_creation'=>"order",'f.date_commande'=>"order",'f.total_ht'=>"order",'f.total_ttc'=>"order",'f.tva'=>"order",'f.fk_statut'=>'order','f.note_private'=>"order",'fd.rowid'=>'order_line','fd.description'=>"order_line",'fd.tva_tx'=>"order_line",'fd.qty'=>"order_line",'fd.remise_percent'=>"order_line",'fd.total_ht'=>"order_line",'fd.total_ttc'=>"order_line",'fd.total_tva'=>"order_line",'fd.product_type'=>'order_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product');
-            $this->export_dependencies_array[$r]=array('order_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$r++;
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='Commandes fournisseurs et lignes de commandes';
+		$this->export_icon[$r]='order';
+		$this->export_permission[$r]=array(array("fournisseur","commande","export"));
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"OrderId",'f.ref'=>"Ref",'f.ref_supplier'=>"RefSupplier",'f.date_creation'=>"DateCreation",'f.date_commande'=>"OrderDate",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.fk_statut'=>'Status','f.note_private'=>"NotePrivate",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.total_tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		$this->export_TypeFields_array[$r]=array('s.rowid'=>"company",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.date_creation'=>"Date",'f.date_commande'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.fk_statut'=>'Status','f.note_private'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Number",'fd.qty'=>"Number",'fd.remise_percent'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.total_tva'=>"Number",'fd.product_type'=>'Number','fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"order",'f.ref'=>"order",'f.ref_supplier'=>"order",'f.date_creation'=>"order",'f.date_commande'=>"order",'f.total_ht'=>"order",'f.total_ttc'=>"order",'f.tva'=>"order",'f.fk_statut'=>'order','f.note_private'=>"order",'fd.rowid'=>'order_line','fd.description'=>"order_line",'fd.tva_tx'=>"order_line",'fd.qty'=>"order_line",'fd.remise_percent'=>"order_line",'fd.total_ht'=>"order_line",'fd.total_ttc'=>"order_line",'fd.total_tva'=>"order_line",'fd.product_type'=>'order_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product');
+		$this->export_dependencies_array[$r]=array('order_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
-            $this->export_sql_start[$r]='SELECT DISTINCT ';
-            $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
-            $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseur as f, '.MAIN_DB_PREFIX.'commande_fournisseurdet as fd';
-            $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
-            $this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
-            $this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
+		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseur as f, '.MAIN_DB_PREFIX.'commande_fournisseurdet as fd';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
+		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
+		$this->export_sql_end[$r] .=' AND f.entity = '.$conf->entity;
 
 	}
 

From f3ad345930100553bcb91a33325e61e41ac296b1 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur 
Date: Thu, 2 Apr 2015 16:59:20 +0200
Subject: [PATCH 299/412] Add loan lang file

---
 htdocs/langs/ar_SA/loan.lang | 53 ++++++++++++++++++++++++++++++++++++
 htdocs/langs/bg_BG/loan.lang | 53 ++++++++++++++++++++++++++++++++++++
 htdocs/langs/bn_BD/loan.lang | 53 ++++++++++++++++++++++++++++++++++++
 htdocs/langs/bs_BA/loan.lang | 53 ++++++++++++++++++++++++++++++++++++
 htdocs/langs/ca_ES/loan.lang | 53 ++++++++++++++++++++++++++++++++++++
 htdocs/langs/cs_CZ/loan.lang | 53 ++++++++++++++++++++++++++++++++++++
 htdocs/langs/da_DK/loan.lang | 53 ++++++++++++++++++++++++++++++++++++
 htdocs/langs/de_DE/loan.lang | 53 ++++++++++++++++++++++++++++++++++++
 htdocs/langs/el_GR/loan.lang | 53 ++++++++++++++++++++++++++++++++++++
 9 files changed, 477 insertions(+)
 create mode 100644 htdocs/langs/ar_SA/loan.lang
 create mode 100644 htdocs/langs/bg_BG/loan.lang
 create mode 100644 htdocs/langs/bn_BD/loan.lang
 create mode 100644 htdocs/langs/bs_BA/loan.lang
 create mode 100644 htdocs/langs/ca_ES/loan.lang
 create mode 100644 htdocs/langs/cs_CZ/loan.lang
 create mode 100644 htdocs/langs/da_DK/loan.lang
 create mode 100644 htdocs/langs/de_DE/loan.lang
 create mode 100644 htdocs/langs/el_GR/loan.lang

diff --git a/htdocs/langs/ar_SA/loan.lang b/htdocs/langs/ar_SA/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/ar_SA/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
     This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/bg_BG/loan.lang b/htdocs/langs/bg_BG/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/bg_BG/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
     This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/bn_BD/loan.lang b/htdocs/langs/bn_BD/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/bn_BD/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
     This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/bs_BA/loan.lang b/htdocs/langs/bs_BA/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/bs_BA/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
     This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/ca_ES/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
     This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/cs_CZ/loan.lang b/htdocs/langs/cs_CZ/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/cs_CZ/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
     This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/da_DK/loan.lang b/htdocs/langs/da_DK/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/da_DK/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
     This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/de_DE/loan.lang b/htdocs/langs/de_DE/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/de_DE/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
     This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/el_GR/loan.lang b/htdocs/langs/el_GR/loan.lang
new file mode 100644
index 00000000000..cc7f19037aa
--- /dev/null
+++ b/htdocs/langs/el_GR/loan.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Loan
+Loans=Loans
+NewLoan=New Loan
+ShowLoan=Show Loan
+PaymentLoan=Loan payment
+ShowLoanPayment=Show Loan Payment
+Capital=Capital
+Insurance=Insurance
+Interest=Interest
+Nbterms=Number of terms
+LoanAccountancyCapitalCode=Accountancy code capital
+LoanAccountancyInsuranceCode=Accountancy code insurance
+LoanAccountancyInterestCode=Accountancy code interest
+LoanPayment=Loan payment
+ConfirmDeleteLoan=Confirm deleting this loan
+LoanDeleted=Loan Deleted Successfully
+ConfirmPayLoan=Confirm classify paid this loan
+LoanPaid=Loan Paid
+ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
+ErrorLoanLength=Loan length has to be numeric and greater than zero.
+ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+# Calc
+LoanCalc=Bank Loans Calculator
+PurchaseFinanceInfo=Purchase & Financing Information
+SalePriceOfAsset=Sale Price of Asset
+PercentageDown=Percentage Down
+LengthOfMortgage=Length of Mortgage
+AnnualInterestRate=Annual Interest Rate
+ExplainCalculations=Explain Calculations
+ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+MortgagePaymentInformation=Mortgage Payment Information
+DownPayment=Down Payment
+DownPaymentDesc=The down payment = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
+InterestRateDesc=The interest rate = The annual interest percentage divided by 100
+MonthlyFactorDesc=The monthly factor = The result of the following formula
+MonthlyInterestRateDesc=The monthly interest rate = The annual interest rate divided by 12 (for the 12 months in a year)
+MonthTermDesc=The month term of the loan in months = The number of years you've taken the loan out for times 12
+MonthlyPaymentDesc=The montly payment is figured out using the following formula
+AmortizationPaymentDesc=The amortization breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
+AmountFinanced=Amount Financed
+AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: %s over %s years
+Totalsforyear=Totals for year
+MonthlyPayment=Monthly Payment
+LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
     This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    
+GoToInterest=%s will go towards INTEREST
+GoToPrincipal=%s will go towards PRINCIPAL
+YouWillSpend=You will spend %s on your house in year %s
+# Admin
+ConfigLoan=Configuration of the module loan
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default

From 424124434547f7346a82e262cc4930b817fdc600 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur 
Date: Thu, 2 Apr 2015 17:35:07 +0200
Subject: [PATCH 300/412] Fix: class not defined

---
 htdocs/core/modules/modFournisseur.class.php  | 15 +++--
 htdocs/langs/en_US/main.lang                  |  4 ++
 htdocs/langs/en_US/trips.lang                 |  1 -
 htdocs/product/stats/commande.php             | 24 +++----
 htdocs/product/stats/commande_fournisseur.php | 62 +++++++++----------
 htdocs/theme/eldy/style.css.php               |  2 +-
 6 files changed, 59 insertions(+), 49 deletions(-)

diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 6bc4cc70e77..2e42c1f8b66 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -406,15 +406,20 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .=' WHERE f.fk_soc = s.rowid';
         $this->export_sql_end[$r] .=' AND f.entity IN ('.getEntity('supplier_invoice',1).')';
 
-
+		// Order
 		$r++;
 		$this->export_code[$r]=$this->rights_class.'_'.$r;
 		$this->export_label[$r]='Commandes fournisseurs et lignes de commandes';
 		$this->export_icon[$r]='order';
 		$this->export_permission[$r]=array(array("fournisseur","commande","export"));
-		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"OrderId",'f.ref'=>"Ref",'f.ref_supplier'=>"RefSupplier",'f.date_creation'=>"DateCreation",'f.date_commande'=>"OrderDate",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.fk_statut'=>'Status','f.note_public'=>"NotePublic",'f.note_private'=>"NotePrivate",'fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.total_tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
-		$this->export_TypeFields_array[$r]=array('s.rowid'=>"company",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.date_creation'=>"Date",'f.date_commande'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.fk_statut'=>'Status','f.note_public'=>"Text",'f.note_private'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Number",'fd.qty'=>"Number",'fd.remise_percent'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.total_tva'=>"Number",'fd.product_type'=>'Number','fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text');
-		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','f.rowid'=>"order",'f.ref'=>"order",'f.ref_supplier'=>"order",'f.date_creation'=>"order",'f.date_commande'=>"order",'f.total_ht'=>"order",'f.total_ttc'=>"order",'f.tva'=>"order",'f.fk_statut'=>'order','f.note_public'=>"order",'f.note_private'=>"order",'fd.rowid'=>'order_line','fd.description'=>"order_line",'fd.tva_tx'=>"order_line",'fd.qty'=>"order_line",'fd.remise_percent'=>"order_line",'fd.total_ht'=>"order_line",'fd.total_ttc'=>"order_line",'fd.total_tva'=>"order_line",'fd.product_type'=>'order_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product');
+		$this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','c.code'=>'CountryCode','s.phone'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','s.idprof5'=>'ProfId5','s.idprof6'=>'ProfId6','s.tva_intra'=>'VATIntra','f.rowid'=>"OrderId",'f.ref'=>"Ref",'f.ref_supplier'=>"RefSupplier",'f.date_creation'=>"DateCreation",'f.date_commande'=>"OrderDate",'f.total_ht'=>"TotalHT",'f.total_ttc'=>"TotalTTC",'f.tva'=>"TotalVAT",'f.fk_statut'=>'Status','f.date_approve'=>'DateApprove','f.date_approve2'=>'DateApprove2','f.note_public'=>"NotePublic",'f.note_private'=>"NotePrivate",'ua1.login'=>'ApprovedBy','ua2.login'=>'ApprovedBy2','fd.rowid'=>'LineId','fd.description'=>"LineDescription",'fd.tva_tx'=>"LineVATRate",'fd.qty'=>"LineQty",'fd.remise_percent'=>"Discount",'fd.total_ht'=>"LineTotalHT",'fd.total_ttc'=>"LineTotalTTC",'fd.total_tva'=>"LineTotalVAT",'fd.product_type'=>'TypeOfLineServiceOrProduct','fd.fk_product'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel');
+		if (empty($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL))
+		{
+			unset($this->export_fields_array['f.date_approve2']);
+			unset($this->export_fields_array['ua2.login']);
+		}
+		$this->export_TypeFields_array[$r]=array('s.rowid'=>"company",'s.nom'=>'Text','s.address'=>'Text','s.cp'=>'Text','s.ville'=>'Text','c.code'=>'Text','s.tel'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.idprof5'=>'Text','s.idprof6'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.ref_supplier'=>"Text",'f.date_creation'=>"Date",'f.date_commande'=>"Date",'f.total_ht'=>"Number",'f.total_ttc'=>"Number",'f.tva'=>"Number",'f.fk_statut'=>'Status','f.date_approve'=>'Date','f.date_approve2'=>'Date','f.note_public'=>"Text",'f.note_private'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Number",'fd.qty'=>"Number",'fd.remise_percent'=>"Number",'fd.total_ht'=>"Number",'fd.total_ttc'=>"Number",'fd.total_tva'=>"Number",'fd.product_type'=>'Number','fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text');
+		$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','c.code'=>'company','s.phone'=>'company','s.siren'=>'company','s.siret'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.idprof5'=>'company','s.idprof6'=>'company','s.tva_intra'=>'company','ua1.login'=>'user','ua2.login'=>'user','fd.rowid'=>'order_line','fd.description'=>"order_line",'fd.tva_tx'=>"order_line",'fd.qty'=>"order_line",'fd.remise_percent'=>"order_line",'fd.total_ht'=>"order_line",'fd.total_ttc'=>"order_line",'fd.total_tva'=>"order_line",'fd.product_type'=>'order_line','fd.fk_product'=>'product','p.ref'=>'product','p.label'=>'product');
 		$this->export_dependencies_array[$r]=array('order_line'=>'fd.rowid','product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 		// Add extra fields object
 		$sql="SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseur'";
@@ -494,6 +499,8 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseur as f';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua1 ON ua1.rowid = f.fk_user_approve';
+		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as ua2 ON ua2.rowid = f.fk_user_approve2';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseur_extrafields as extra ON f.rowid = extra.fk_object,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'commande_fournisseurdet as fd';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseurdet_extrafields as extraline ON fd.rowid = extraline.fk_object';
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 671f1363498..bd2112cf871 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -242,6 +242,8 @@ DatePlanShort=Date planed
 DateRealShort=Date real.
 DateBuild=Report build date
 DatePayment=Date of payment
+DateApprove=Approving date
+DateApprove2=Approving date (second approval)
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -408,6 +410,8 @@ OtherInformations=Other informations
 Quantity=Quantity
 Qty=Qty
 ChangedBy=Changed by
+ApprovedBy=Approved by
+ApprovedBy2=Approved by (second approval)
 ReCalculate=Recalculate
 ResultOk=Success
 ResultKo=Failure
diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang
index c84b8905562..b7d661478f6 100644
--- a/htdocs/langs/en_US/trips.lang
+++ b/htdocs/langs/en_US/trips.lang
@@ -69,7 +69,6 @@ MOTIF_CANCEL=Reason
 DATE_REFUS=Deny date
 DATE_SAVE=Validation date
 DATE_VALIDE=Validation date
-DateApprove=Approving date
 DATE_CANCEL=Cancelation date
 DATE_PAIEMENT=Payment date
 
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index a1e538f4559..81b251d795b 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -126,7 +126,7 @@ if ($id > 0 || ! empty($ref))
 
 		print '';
 
-		if ($user->rights->commande->lire) 
+		if ($user->rights->commande->lire)
 		{
 			$sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, c.rowid, d.total_ht as total_ht, c.ref,";
 			$sql .= " c.ref_client,";
@@ -147,7 +147,7 @@ if ($id > 0 || ! empty($ref))
 			if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 			if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 			$sql.= " ORDER BY $sortfield $sortorder ";
-	            
+
 	        //Calcul total qty and amount for global if full scan list
 	        $total_ht=0;
 	        $total_qty=0;
@@ -162,21 +162,21 @@ if ($id > 0 || ! empty($ref))
 	        		}
 	        	}
 	        }
-	            
+
 			$sql.= $db->plimit($conf->liste_limit +1, $offset);
-	
+
 			$result = $db->query($sql);
 			if ($result)
 			{
 				$num = $db->num_rows($result);
-	 			
+
 				if (! empty($id))
 	            	$option .= '&id='.$product->id;
 	            if (! empty($search_month))
 	            	$option .= '&search_month='.$search_month;
 	            if (! empty($search_year))
 	            	$option .= '&search_year='.$search_year;
-	            
+
 	            print '
    ' . "\n";
 	            if (! empty($sortfield))
 	            	print '';
@@ -186,7 +186,7 @@ if ($id > 0 || ! empty($ref))
 	            	print '';
 	            	$option .= '&page=' . $page;
 	            }
-	
+
 				print_barre_liste($langs->trans("CustomersOrders"),$page,$_SERVER["PHP_SELF"],"&id=$product->id",$sortfield,$sortorder,'',$num,$totalrecords,'');
 				print '
    ';
 			    print $langs->trans('Period').' ('.$langs->trans("OrderDate") .') - ';
@@ -197,7 +197,7 @@ if ($id > 0 || ! empty($ref))
 				print '';
 			    print '
    ';
 				print '';
-	
+
 				$i = 0;
 	            print '
     '; + print ''; + print ''; + print '
    ' . $langs->trans('Date') . ''; - $form->select_date('', 're', '', '', '', "crea_commande", 1, 1); + //$form->select_date($dateorder, 're', '', '', '', "crea_commande", 1, 1); + $form->select_date('', 're', '', '', '', "crea_commande", 1, 1); // Always autofill date with current date print '
    '.$langs->trans("Parameter").''.$langs->trans("Value").' 
    '; - print $langs->trans("UseDoubleApproval").''; - print $form->selectyesno('SUPPLIER_ORDER_DOUBLE_APPROVAL', $conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL); - print '
    '.$form->select_dolgroups($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP,'SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP', 1); + print $langs->trans("UseDoubleApproval").'
    '; + print $langs->trans("IfSetToYesDontForgetPermission"); + print '    		'; + print $form->selectyesno('SUPPLIER_ORDER_DOUBLE_APPROVAL', $conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL, 1); print ''; print ''; print "
    '; + print $langs->trans("GroupOfUserForSecondApproval").''; + print $form->select_dolgroups($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP,'SUPPLIER_ORDER_DOUBLE_APPROVAL_GROUP', 1); + print ''; + print ''; + print "
    '; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index eb63f76319f..34e86acee60 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -395,12 +395,12 @@ class Form $htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace('"',""",$htmltext); - if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip + if ($tooltipon == 2 || $tooltipon == 3) $paramfortooltipimg=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip else $paramfortooltipimg =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag - if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip + if ($tooltipon == 1 || $tooltipon == 3) $paramfortooltiptd=' class="classfortooltip inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td tag to store tooltip else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag $s=""; - if (empty($notabs)) $s.=''; + if (empty($notabs)) $s.='
    '; elseif ($notabs == 2) $s.='
    '; if ($direction < 0) { $s.='<'.$tag.$paramfortooltipimg; @@ -412,8 +412,8 @@ class Form // Use another method to help avoid having a space in value in order to use this value with jquery // TODO add this in css //if ($text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.(($direction < 0)?' ':'').$text.(($direction > 0)?' ':'').''; - $paramfortooltiptd.= (($direction < 0)?' class="inline-block" style="padding-left: 3px !important;"':''); - $paramfortooltiptd.= (($direction > 0)?' class="inline-block" style="padding-right: 3px !important;"':''); + $paramfortooltiptd.= (($direction < 0)?' class="inline-block" style="padding: 0px; padding-left: 3px !important;"':''); + $paramfortooltiptd.= (($direction > 0)?' class="inline-block" style="padding: 0px; padding-right: 3px !important;"':''); if ((string) $text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.$text.''; if ($direction > 0) { $s.='<'.$tag.$paramfortooltipimg; diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php index d2014837373..bc63d9c51ac 100644 --- a/htdocs/core/class/html.formcompany.class.php +++ b/htdocs/core/class/html.formcompany.class.php @@ -455,7 +455,7 @@ class FormCompany { $out.= '
    '; $out.= ''; print ''; + print_fiche_titre($langs->trans("ToOrder"),'',''); print '
    '; - print ''; + //print ''; print ''; print '
    '.$langs->trans("ToOrder").'
    '.$langs->trans("ToOrder").'
    '.$langs->trans("OrderDate").''; $date_com = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); print $form->select_date($date_com,'','','','',"commande"); @@ -2726,6 +2774,7 @@ elseif (! empty($object->id)) print '
    '; print ''; + print "
    "; } if ($user->rights->fournisseur->commande->receptionner && ($object->statut == 3 || $object->statut == 4)) @@ -2733,12 +2782,12 @@ elseif (! empty($object->id)) /* * Receptionner (action=livraison) */ - print '
    '; print '
    '; print ''; print ''; + print_fiche_titre($langs->trans("Receive"),'',''); print ''; - print ''; + //print ''; print '\n"; @@ -2758,8 +2807,15 @@ elseif (! empty($object->id)) print ''; print "
    '.$langs->trans("Receive").'
    '.$langs->trans("Receive").'
    '.$langs->trans("DeliveryDate").''; print $form->select_date('','','','','',"commande"); print "
    \n"; print "
    \n"; + print "
    "; } + // List of actions on element + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; + $formactions=new FormActions($db); + $somethingshown=$formactions->showactions($object,'order_supplier',$socid); + + // List of actions on element /* Hidden because" available into "Log" tab print '
    '; diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 9475719732d..b1b4eccbf56 100644 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -385,6 +385,8 @@ ALTER TABLE llx_commande ADD COLUMN fk_incoterms integer; ALTER TABLE llx_commande ADD COLUMN location_incoterms varchar(255); ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_incoterms integer; ALTER TABLE llx_commande_fournisseur ADD COLUMN location_incoterms varchar(255); +ALTER TABLE llx_commande_fournisseur ADD COLUMN date_approve2 datetime after date_approve; +ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_approve2 integer after fk_user_approve; ALTER TABLE llx_facture ADD COLUMN fk_incoterms integer; ALTER TABLE llx_facture ADD COLUMN location_incoterms varchar(255); ALTER TABLE llx_facture_fourn ADD COLUMN fk_incoterms integer; diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 17027e16960..247c8e8d6af 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -36,11 +36,13 @@ create table llx_commande_fournisseur date_creation datetime, -- date de creation date_valid datetime, -- date de validation date_approve datetime, -- date de approve + date_approve2 datetime, -- date de approve 2 (when double approving is accivated) date_commande date, -- date de la commande fk_user_author integer, -- user making creation fk_user_modif integer, -- user making last change fk_user_valid integer, -- user validating fk_user_approve integer, -- user approving + fk_user_approve2 integer, -- user approving 2 (when double approving is accivated) source smallint NOT NULL, -- not used, except by setting this to 42 for orders coming for replenishment and 0 in other case ? fk_statut smallint default 0, amount_ht real default 0, diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 2edde818919..d204ca67dbb 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1565,6 +1565,7 @@ SuppliersSetup=Supplier module setup SuppliersCommandModel=Complete template of supplier order (logo...) SuppliersInvoiceModel=Complete template of supplier invoice (logo...) SuppliersInvoiceNumberingModel=Supplier invoices numbering models +IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval ##### GeoIPMaxmind ##### GeoIPMaxmindSetup=GeoIP Maxmind module setup PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
    Examples:
    /usr/local/share/GeoIP/GeoIP.dat
    /usr/share/GeoIP/GeoIP.dat diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 71e26bc21a4..278fb39f0ee 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -64,7 +64,8 @@ ShipProduct=Ship product Discount=Discount CreateOrder=Create Order RefuseOrder=Refuse order -ApproveOrder=Accept order +ApproveOrder=Approve order +Approve2Order=Approve order (second level) ValidateOrder=Validate order UnvalidateOrder=Unvalidate order DeleteOrder=Delete order @@ -120,6 +121,7 @@ PaymentOrderRef=Payment of order %s CloneOrder=Clone order ConfirmCloneOrder=Are you sure you want to clone this order %s ? DispatchSupplierOrder=Receiving supplier order %s +FirstApprovalAlreadyDone=First approval already done ##### Types de contacts ##### TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order TypeContact_commande_internal_SHIPPING=Representative following-up shipping diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 84b47983d5c..c59894fd3dc 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -1587,8 +1587,9 @@ else if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1); print '
    '; - print $formcompany->select_juridicalstatus($object->forme_juridique_code,$object->country_code); + print $formcompany->select_juridicalstatus($object->forme_juridique_code,$object->country_code,'',0); print '
    ".$langs->trans("Project").""; - $formproject->select_projects(-1, GETPOST("fk_project"),'fk_project', 0, 1, 0, 1); + $formproject->select_projects(-1, GETPOST("fk_projet"),'fk_projet', 0, 1, 0, 1); print "
    '.$langs->trans('Project').''; - $formproject->select_projects(-1, $object->fk_project,'fk_project', 0, 1, 0, 1); + $formproject->select_projects(-1, $object->fk_projet,'fk_projet', 0, 1, 0, 1); print '
    '.$langs->trans("Date").''; - if ($tablename == 'expensereport_det') print $langs->trans("User"); + if ($tablename == 'expensereport_det' || 'don') print $langs->trans("User"); else print $langs->trans("ThirdParty"); print ''.$langs->trans("AmountHT").''; if (! $qualifiedfortotal) print ''; - print (isset($element->total_ht)?price($element->total_ht):' '); + print (isset($total_ht_by_line)?price($total_ht_by_line):' '); if (! $qualifiedfortotal) print ''; print ''; if (! $qualifiedfortotal) print ''; - print (isset($element->total_ttc)?price($element->total_ttc):' '); + print (isset($total_ttc_by_line)?price($total_ttc_by_line):' '); if (! $qualifiedfortotal) print ''; print '
    '.$name.''.$i.''.price($total_ht).''.price($total_ttc).'
    '.$name.''.$i.''.price($total_ht).''.price($total_ttc).'
    '; print ''; @@ -209,7 +209,7 @@ if ($id > 0 || ! empty($ref)) print_liste_field_titre($langs->trans("AmountHT"),$_SERVER["PHP_SELF"],"c.total_ht","",$option,'align="right"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"c.fk_statut","",$option,'align="right"',$sortfield,$sortorder); print "\n"; - + if ($num > 0) { $var=True; @@ -217,7 +217,7 @@ if ($id > 0 || ! empty($ref)) { $objp = $db->fetch_object($result); $var=!$var; - + print ''; print '"; print '\n"; print '\n"; - print ''; + print ''; print "\n"; $i++; - + if (!empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { $total_ht+=$objp->total_ht; $total_qty+=$objp->qty; diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index 1b324d99bbf..f0444356bcc 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -46,7 +46,7 @@ $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product // Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array $hookmanager->initHooks(array ( - 'productstatssupplyorder' + 'productstatssupplyorder' )); $mesg = ''; @@ -76,7 +76,7 @@ if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) { * View */ -$commandefournstatic = new CommandeFournisseur($db); +$supplierorderstatic = new CommandeFournisseur($db); $societestatic = new Societe($db); $form = new Form($db); @@ -85,55 +85,55 @@ $formother = new FormOther($db); if ($id > 0 || ! empty($ref)) { $product = new Product($db); $result = $product->fetch($id, $ref); - + $parameters = array ( - 'id' => $id + 'id' => $id ); $reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - + llxHeader("", "", $langs->trans("CardProduct" . $product->type)); - + if ($result > 0) { $head = product_prepare_head($product, $user); $titre = $langs->trans("CardProduct" . $product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); - + $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - + print '
    '; $orderstatic->id=$objp->commandeid; @@ -232,10 +232,10 @@ if ($id > 0 || ! empty($ref)) print dol_print_date($db->jdate($objp->date_commande))."'.$objp->qty."'.price($objp->total_ht)."'.$commandestatic->LibStatut($objp->statut,$objp->facture,5).''.$orderstatic->LibStatut($objp->statut,$objp->facture,5).'
    '; - + // Reference print ''; print ''; print ''; - + // Libelle print ''; print ''; - + // Status (to sell) print ''; - + // Status (to buy) print ''; - + show_stats_for_company($product, $socid); - + print "
    ' . $langs->trans("Ref") . ''; print $form->showrefnav($product, 'ref', '', 1, 'ref'); print '
    ' . $langs->trans("Label") . '' . $product->libelle . '
    ' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')'; print $product->getLibStatut(2, 0); print '
    ' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')'; print $product->getLibStatut(2, 1); print '
    "; - + print ''; - + if ($user->rights->fournisseur->commande->lire) { $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,"; $sql .= " c.rowid, d.total_ht as total_ht, c.ref,"; @@ -158,7 +158,7 @@ if ($id > 0 || ! empty($ref)) { if ($socid) $sql .= " AND c.fk_soc = " . $socid; $sql .= " ORDER BY $sortfield $sortorder "; - + // Calcul total qty and amount for global if full scan list $total_ht = 0; $total_qty = 0; @@ -173,20 +173,20 @@ if ($id > 0 || ! empty($ref)) { } } } - + $sql .= $db->plimit($conf->liste_limit + 1, $offset); - + $result = $db->query($sql); if ($result) { $num = $db->num_rows($result); - + if (! empty($id)) $option .= '&id=' . $product->id; if (! empty($search_month)) $option .= '&search_month=' . $search_month; if (! empty($search_year)) $option .= '&search_year=' . $search_year; - + print '' . "\n"; if (! empty($sortfield)) print ''; @@ -196,7 +196,7 @@ if ($id > 0 || ! empty($ref)) { print ''; $option .= '&page=' . $page; } - + print_barre_liste($langs->trans("SuppliersOrders"), $page, $_SERVER["PHP_SELF"], "&id=$product->id", $sortfield, $sortorder, '', $num, $totalrecords, ''); print '
    '; print $langs->trans('Period') . ' (' . $langs->trans("OrderDate") . ') - '; @@ -207,7 +207,7 @@ if ($id > 0 || ! empty($ref)) { print ''; print '
    '; print ''; - + $i = 0; print ''; print ''; @@ -219,19 +219,19 @@ if ($id > 0 || ! empty($ref)) { print_liste_field_titre($langs->trans("AmountHT"), $_SERVER["PHP_SELF"], "c.total_ht", "", $option, 'align="right"', $sortfield, $sortorder); print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"], "c.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder); print "\n"; - + if ($num > 0) { $var = True; while ( $i < $num && $i < $conf->liste_limit ) { $objp = $db->fetch_object($result); $var = ! $var; - + print ''; print '\n"; $societestatic->fetch($objp->socid); print ''; @@ -240,10 +240,10 @@ if ($id > 0 || ! empty($ref)) { print dol_print_date($db->jdate($objp->date_commande)) . ""; print '\n"; print '\n"; - print ''; + print ''; print "\n"; $i ++; - + if (! empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { $total_ht += $objp->total_ht; $total_qty += $objp->qty; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index aa9cc9fe862..0537d13b80d 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1917,7 +1917,7 @@ table.liste td { background-color: #f9f9f9; } tr.pair td, tr.impair td { - padding: 4px; + padding: 2px; border-bottom: 1px solid #ddd; } div.liste_titre .tagtd { From 5a17a512125344fb17a333bbb4d3539d6db848b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 2 Apr 2015 18:11:30 +0200 Subject: [PATCH 301/412] Update box_actions.php --- htdocs/core/boxes/box_actions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index 2b251a6599f..0f6e48a1520 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -95,6 +95,7 @@ class box_actions extends ModeleBoxes $late = ''; $objp = $db->fetch_object($result); $datelimite = $db->jdate($objp->dp); + $actionstatic->id = $objp->id; $actionstatic->label = $objp->label; $actionstatic->type_label = $objp->type_label; $actionstatic->code = $objp->code; @@ -108,7 +109,6 @@ class box_actions extends ModeleBoxes //($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label) $label = empty($objp->label)?$objp->type_label:$objp->label; - $tooltip = $langs->trans('Action'.$objp->code).': '.$label; $this->info_box_contents[$line][] = array( 'td' => 'align="left"', 'text' => $actionstatic->getNomUrl(1), From e480177d9c271c7ff23cd53a3d38e2eca074d530 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 2 Apr 2015 18:44:02 +0200 Subject: [PATCH 302/412] Fix error of triggers not reported to user --- htdocs/fourn/commande/card.php | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 89323ec7751..505e0847573 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -180,7 +180,8 @@ if (empty($reshook)) // Set project if ($action == 'classin' && $user->rights->fournisseur->commande->creer) { - $object->setProject($projectid); + $result=$object->setProject($projectid); + if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } if ($action == 'setremisepercent' && $user->rights->fournisseur->commande->creer) @@ -223,7 +224,7 @@ if (empty($reshook)) { $db->rollback(); - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -448,7 +449,7 @@ if (empty($reshook)) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -619,7 +620,7 @@ if (empty($reshook)) } // If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step - if ($user->rights->fournisseur->commande->approuver && ! (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))) + if (empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $user->rights->fournisseur->commande->approuver && ! (! empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))) { $action='confirm_approve'; // can make standard or first level approval also if permission is set } @@ -670,8 +671,8 @@ if (empty($reshook)) exit; } else - { - setEventMessage($object->error, 'errors'); + { + setEventMessages($object->error, $object->errors, 'errors'); } } } @@ -686,7 +687,7 @@ if (empty($reshook)) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -703,7 +704,7 @@ if (empty($reshook)) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -718,7 +719,7 @@ if (empty($reshook)) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } @@ -741,7 +742,7 @@ if (empty($reshook)) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $action=''; } } @@ -786,7 +787,7 @@ if (empty($reshook)) } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } From 8d7fb7b0f670633dcd3cb597a598225db4af2548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 2 Apr 2015 18:48:47 +0200 Subject: [PATCH 303/412] Travis Fix don.class.php --- htdocs/don/class/don.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php index 080d0adb806..33706ddd841 100644 --- a/htdocs/don/class/don.class.php +++ b/htdocs/don/class/don.class.php @@ -709,13 +709,13 @@ class Don extends CommonObject * Classify the donation as paid, the donation was received * * @param int $id id of donation - * @param int $modepayment mode de payment + * @param int $modepayment mode of payment * @return int <0 if KO, >0 if OK */ - function set_paid($id, $modepaiement='') + function set_paid($id, $modepayment='') { $sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2"; - if ($modepaiement) + if ($modepayment) { $sql .= ", fk_payment=$modepayment"; } From 9921eb8496b80941fddcacb25f12e4a7d178195d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 2 Apr 2015 19:41:19 +0200 Subject: [PATCH 304/412] Fix error when upgating price --- htdocs/product/admin/product.php | 4 ++++ htdocs/product/class/product.class.php | 11 +++++++---- htdocs/product/price.php | 20 ++++++++++++++------ 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index 2d0c1cca468..c3de8edd468 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -54,6 +54,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) $select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity'); } +// Clean param +if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) $conf->global->PRODUIT_MULTIPRICES_LIMIT = 5; + + /* * Actions diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 16b5a4b1e4e..397f06ce156 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -1146,6 +1146,9 @@ class Product extends CommonObject $now=dol_now(); + // Clean parameters + if (empty($this->price_by_qty)) $this->price_by_qty=0; + // Add new price $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price,fk_product,fk_user_author,price,price_ttc,price_base_type,tosell,tva_tx,recuperableonly,"; $sql.= " localtax1_tx, localtax2_tx, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) "; @@ -1153,7 +1156,7 @@ class Product extends CommonObject $sql.= " ".$this->localtax1_tx.",".$this->localtax2_tx.",".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity.",".($this->fk_price_expression > 0?$this->fk_price_expression:'null'); $sql.= ")"; - dol_syslog(get_class($this)."_log_price", LOG_DEBUG); + dol_syslog(get_class($this)."::_log_price", LOG_DEBUG); $resql=$this->db->query($sql); if(! $resql) { @@ -1180,7 +1183,7 @@ class Product extends CommonObject $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price"; $sql.= " WHERE rowid=".$rowid; - dol_syslog(get_class($this)."log_price_delete", LOG_DEBUG); + dol_syslog(get_class($this)."::log_price_delete", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { @@ -1315,7 +1318,7 @@ class Product extends CommonObject $id=$this->id; - dol_syslog(get_class($this)."update_price id=".$id." newprice=".$newprice." newpricebase=".$newpricebase." newminprice=".$newminprice." level=".$level." npr=".$newnpr); + dol_syslog(get_class($this)."::update_price id=".$id." newprice=".$newprice." newpricebase=".$newpricebase." newminprice=".$newminprice." level=".$level." npr=".$newnpr); // Clean parameters if (empty($this->tva_tx)) $this->tva_tx=0; @@ -1393,7 +1396,7 @@ class Product extends CommonObject $sql.= " recuperableonly='".$newnpr."'"; $sql.= " WHERE rowid = ".$id; - dol_syslog(get_class($this)."update_price", LOG_DEBUG); + dol_syslog(get_class($this)."::update_price", LOG_DEBUG); $resql=$this->db->query($sql); if ($resql) { diff --git a/htdocs/product/price.php b/htdocs/product/price.php index da61ccc45b8..3e7ba24d3dd 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -51,12 +51,14 @@ $eid = GETPOST('eid', 'int'); // Security check $fieldvalue = (! empty($id) ? $id : (! empty($ref) ? $ref : '')); $fieldtype = (! empty($ref) ? 'ref' : 'rowid'); -if ($user->societe_id) - $socid = $user->societe_id; +if ($user->societe_id) $socid = $user->societe_id; $result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype); $object = new Product($db); +// Clean param +if (! empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_MULTIPRICES_LIMIT)) $conf->global->PRODUIT_MULTIPRICES_LIMIT = 5; + $error=0; @@ -119,7 +121,8 @@ if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit- $newprice = $newprice_min; //Set price same as min, the user will not see the } - if ($object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq) > 0) { + if ($object->updatePrice($newprice, $newpricebase, $user, $newvat, $newprice_min, $level, $newnpr, $newpsq) > 0) + { if ($object->fk_price_expression != 0) { //Check the expression validity by parsing it $priceparser = new PriceParser($db); @@ -130,7 +133,8 @@ if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit- setEventMessage($priceparser->translatedError(), 'errors'); } } - if (empty($error) && ! empty($conf->dynamicprices->enabled)) { + if (empty($error) && ! empty($conf->dynamicprices->enabled)) + { $ret=$object->setPriceExpression($object->fk_price_expression); if ($ret < 0) { @@ -139,7 +143,8 @@ if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit- setEventMessage($object->error, 'errors'); } } - if (empty($error)) { + if (empty($error)) + { $action = ''; setEventMessage($langs->trans("RecordSaved")); } @@ -147,7 +152,10 @@ if ($action == 'update_price' && ! GETPOST("cancel") && ($user->rights->produit- $action = 'edit_price'; setEventMessage($object->error, 'errors'); } -} else if ($action == 'delete' && $user->rights->produit->supprimer) { +} + +if ($action == 'delete' && $user->rights->produit->supprimer) +{ $result = $object->log_price_delete($user, $_GET ["lineid"]); if ($result < 0) { setEventMessage($object->error, 'errors'); From d71a3c52b4a64c2b007dd5b6d49c7be6cec6bbf1 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Apr 2015 00:28:35 +0200 Subject: [PATCH 305/412] Comments --- htdocs/fourn/commande/card.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 505e0847573..cbbeaa99499 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1970,11 +1970,12 @@ elseif (! empty($object->id)) $cols = 3; include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php'; - // Ligne de 3 colonnes + // Total print ''; print ''; print ''; + // Total VAT print ''; print ''; @@ -1992,6 +1993,7 @@ elseif (! empty($object->id)) print ''; } + // Total TTC print ''; print ''; From 98b1d6170d28f730ade75c0032bb0fdc290ed437 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Apr 2015 01:07:17 +0200 Subject: [PATCH 306/412] Fix style fieldrequired must be used only in create/edit mode. --- htdocs/core/tpl/extrafields_view.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php index 7f0115b83bc..ed47253beee 100644 --- a/htdocs/core/tpl/extrafields_view.tpl.php +++ b/htdocs/core/tpl/extrafields_view.tpl.php @@ -48,7 +48,7 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) print ''; - print ''; - print ''; + print ''; - print ''; - print ''; + print ''; + print ''; } if ($societe->localtax2_assuj=="1") //Localtax2 { print ''; - print ''; - print ''; + print ''; + print ''; } - print ''; + print ''; // Project if (! empty($conf->projet->enabled)) diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index aaee42e9add..7348f3b7590 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2014 Laurent Destailleur + * Copyright (C) 2005-2015 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * * This program is free software; you can redistribute it and/or modify @@ -200,6 +200,30 @@ if ($id > 0 || ! empty($ref)) print $form->editfieldval("Label",'label',$object->label,$object,0); print ''; + // Status + $alreadypaid=$object->getSommePaiement(); + print ''; + + // Amount + print ''; + print ''; + + // Amount Local Taxes + //TODO: Place into a function to control showing by country or study better option + if ($societe->localtax1_assuj=="1") //Localtax1 + { + print ''; + print ''; + print ''; + } + if ($societe->localtax2_assuj=="1") //Localtax2 + { + print ''; + print ''; + print ''; + } + print ''; + print "
    '; - $commandestatic->id = $objp->commandeid; - $commandestatic->ref = $objp->ref; - $commandestatic->statut = $objp->statut; - print $commandestatic->getNomUrl(1); + $supplierorderstatic->id = $objp->commandeid; + $supplierorderstatic->ref = $objp->ref; + $supplierorderstatic->statut = $objp->statut; + print $supplierorderstatic->getNomUrl(1); print "' . $societestatic->getNomUrl(1) . '' . $objp->qty . "' . price($objp->total_ht) . "' . $commandestatic->getLibStatut(4) . '' . $supplierorderstatic->getLibStatut(4) . '
    '.$langs->trans("AmountHT").''.price($object->total_ht,'',$langs,1,-1,-1,$conf->currency).'
    '.$langs->trans("AmountVAT").''.price($object->total_tva,'',$langs,1,-1,-1,$conf->currency).'
    '.$langs->trans("AmountTTC").''.price($object->total_ttc,'',$langs,1,-1,-1,$conf->currency).'
    '; print 'attribute_required[$key])) print ' class="fieldrequired"'; + if ((! empty($action) && ($action == 'create' || $action == 'edit')) && ! empty($extrafields->attribute_required[$key])) print ' class="fieldrequired"'; print '>' . $label . ''; //TODO Improve element and rights detection From 6fe803cd86a74b1a06296772d3a8570d7f251649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Fri, 3 Apr 2015 05:18:47 +0200 Subject: [PATCH 307/412] Created Propal, FactureFourniseur, and Commande constants for status --- htdocs/comm/propal.php | 34 ++-- htdocs/comm/propal/class/propal.class.php | 168 +++++++++++++----- htdocs/comm/propal/note.php | 2 +- htdocs/commande/class/commande.class.php | 60 ++++--- htdocs/core/class/commoninvoice.class.php | 28 +++ .../class/fournisseur.commande.class.php | 6 +- .../fourn/class/fournisseur.facture.class.php | 23 ++- htdocs/fourn/facture/card.php | 42 ++--- 8 files changed, 247 insertions(+), 116 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index be60d721d6a..1abd3bc4818 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -302,7 +302,7 @@ if (empty($reshook)) $object->modelpdf = GETPOST('model'); $object->author = $user->id; // deprecated $object->note = GETPOST('note'); - $object->statut = 0; + $object->statut = Propal::STATUS_DRAFT; $object->fk_incoterms = GETPOST('incoterm_id', 'int'); $object->location_incoterms = GETPOST('location_incoterms', 'alpha'); @@ -549,7 +549,7 @@ if (empty($reshook)) // Reopen proposal else if ($action == 'confirm_reopen' && $user->rights->propal->cloturer && ! GETPOST('cancel')) { // prevent browser refresh from reopening proposal several times - if ($object->statut == 2 || $object->statut == 3 || $object->statut == 4) { + if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) { $object->reopen($user, 1); } } @@ -561,7 +561,7 @@ if (empty($reshook)) $action = 'statut'; } else { // prevent browser refresh from closing proposal several times - if ($object->statut == 1) { + if ($object->statut == Propal::STATUS_VALIDATED) { $object->cloture($user, GETPOST('statut'), GETPOST('note')); } } @@ -575,7 +575,7 @@ if (empty($reshook)) // Reopen proposal else if ($action == 'confirm_reopen' && $user->rights->propal->cloturer && ! GETPOST('cancel')) { // prevent browser refresh from reopening proposal several times - if ($object->statut == 2 || $object->statut == 3 || $object->statut == 4) { + if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) { $object->reopen($user, 1); } } @@ -587,7 +587,7 @@ if (empty($reshook)) $action = 'statut'; } else { // prevent browser refresh from closing proposal several times - if ($object->statut == 1) { + if ($object->statut == Propal::STATUS_VALIDATED) { $object->cloture($user, GETPOST('statut'), GETPOST('note')); } } @@ -1735,7 +1735,7 @@ if ($action == 'create') $absolute_discount = price2num($absolute_discount, 'MT'); $absolute_creditnote = price2num($absolute_creditnote, 'MT'); if ($absolute_discount) { - if ($object->statut > 0) { + if ($object->statut > Propal::STATUS_DRAFT) { print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount, 0, $langs, 0, 0, -1, $conf->currency)); } else { // Remise dispo de type non avoir @@ -1797,7 +1797,7 @@ if ($action == 'create') } else { if (! empty($object->fin_validite)) { print dol_print_date($object->fin_validite, 'daytext'); - if ($object->statut == 1 && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay)) + if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); } else { print ' '; @@ -2081,7 +2081,7 @@ if ($action == 'create') '; - if (! empty($conf->use_javascript_ajax) && $object->statut == 0) { + if (! empty($conf->use_javascript_ajax) && $object->statut == Propal::STATUS_DRAFT) { include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php'; } @@ -2091,7 +2091,7 @@ if ($action == 'create') $ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1); // Form to add new line - if ($object->statut == 0 && $user->rights->propal->creer) + if ($object->statut == Propal::STATUS_DRAFT && $user->rights->propal->creer) { if ($action != 'editline') { @@ -2154,7 +2154,7 @@ if ($action == 'create') if ($action != 'statut' && $action != 'editline') { // Validate - if ($object->statut == 0 && $object->total_ttc >= 0 && count($object->lines) > 0 && + if ($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0 && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->creer)) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->propal->propal_advance->validate))) ) { @@ -2168,18 +2168,18 @@ if ($action == 'create') print '' . $langs->trans("AddAction") . ''; } // Edit - if ($object->statut == 1 && $user->rights->propal->creer) { + if ($object->statut == Propal::STATUS_VALIDATED && $user->rights->propal->creer) { print '
    ' . $langs->trans('Modify') . '
    '; } // ReOpen - if (($object->statut == 2 || $object->statut == 3 || $object->statut == 4) && $user->rights->propal->cloturer) { + if (($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) && $user->rights->propal->cloturer) { print '
    global->MAIN_JUMP_TAG) ? '' : '#reopen') . '"'; print '>' . $langs->trans('ReOpen') . '
    '; } // Send - if ($object->statut == 1 || $object->statut == 2) { + if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED) { if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->propal->propal_advance->send) { print '
    ' . $langs->trans('SendByMail') . '
    '; } else @@ -2187,14 +2187,14 @@ if ($action == 'create') } // Create an order - if (! empty($conf->commande->enabled) && $object->statut == 2) { + if (! empty($conf->commande->enabled) && $object->statut == Propal::STATUS_SIGNED) { if ($user->rights->commande->creer) { print '
    ' . $langs->trans("AddOrder") . '
    '; } } // Create contract - if ($conf->contrat->enabled && $object->statut == 2) { + if ($conf->contrat->enabled && $object->statut == Propal::STATUS_SIGNED) { $langs->load("contracts"); if ($user->rights->contrat->creer) { @@ -2203,7 +2203,7 @@ if ($action == 'create') } // Create an invoice and classify billed - if ($object->statut == 2) { + if ($object->statut == Propal::STATUS_SIGNED) { if (! empty($conf->facture->enabled) && $user->rights->facture->creer) { print '
    ' . $langs->trans("AddBill") . '
    '; @@ -2217,7 +2217,7 @@ if ($action == 'create') } // Close - if ($object->statut == 1 && $user->rights->propal->cloturer) { + if ($object->statut == Propal::STATUS_VALIDATED && $user->rights->propal->cloturer) { print '
    global->MAIN_JUMP_TAG) ? '' : '#close') . '"'; print '>' . $langs->trans('Close') . '
    '; } diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php index ce773b4e953..c1442aa403e 100644 --- a/htdocs/comm/propal/class/propal.class.php +++ b/htdocs/comm/propal/class/propal.class.php @@ -54,19 +54,56 @@ class Propal extends CommonObject var $id; - var $socid; // Id client - var $client; // Objet societe client (a charger par fetch_client) + /** + * ID of the client + * @var int + */ + var $socid; + /** + * Client (loaded by fetch_client) + * @var Societe + */ + var $client; var $contactid; var $fk_project; var $author; var $ref; var $ref_client; - var $statut; // 0 (draft), 1 (validated), 2 (signed), 3 (not signed), 4 (billed) - var $datec; // Date of creation - var $datev; // Date of validation - var $date; // Date of proposal - var $datep; // Same than date + + /** + * Status of the quote + * Check the following constants: + * - STATUS_DRAFT + * - STATUS_VALIDATED + * - STATUS_SIGNED + * - STATUS_NOTSIGNED + * - STATUS_BILLED + * @var int + */ + var $statut; + + /** + * Date of creation + * @var + */ + var $datec; + /** + * Date of validation + * @var + */ + var $datev; + /** + * Date of the quote + * @var + */ + var $date; + + /** + * Same than date ¿? + * @var + */ + var $datep; var $date_livraison; var $fin_validite; @@ -79,9 +116,19 @@ class Propal extends CommonObject var $total_localtax1; // Total Local Taxes 1 var $total_localtax2; // Total Local Taxes 2 var $total_ttc; // Total with tax - var $price; // deprecated (for compatibility) - var $tva; // deprecated (for compatibility) - var $total; // deprecated (for compatibility) + + /** + * @deprecated + */ + var $price; + /** + * @deprecated + */ + var $tva; + /** + * @deprecated + */ + var $total; var $cond_reglement_id; var $cond_reglement_code; @@ -91,10 +138,16 @@ class Propal extends CommonObject var $remise; var $remise_percent; var $remise_absolue; - var $note; // deprecated (for compatibility) + /** + * @deprecated + */ + var $note; var $note_private; var $note_public; - var $fk_delivery_address; // deprecated (for compatibility) + /** + * @deprecated + */ + var $fk_delivery_address; var $fk_address; var $address_type; var $address; @@ -126,6 +179,26 @@ class Propal extends CommonObject var $location_incoterms; var $libelle_incoterms; //Used into tooltip + /** + * Draft status + */ + const STATUS_DRAFT = 0; + /** + * Validated status + */ + const STATUS_VALIDATED = 1; + /** + * Signed quote + */ + const STATUS_SIGNED = 2; + /** + * Not signed quote + */ + const STATUS_NOTSIGNED = 3; + /** + * Billed quote + */ + const STATUS_BILLED = 4; /** * Constructor @@ -361,7 +434,7 @@ class Propal extends CommonObject // Check parameters if ($type < 0) return -1; - if ($this->statut == 0) + if ($this->statut == self::STATUS_DRAFT) { $this->db->begin(); @@ -525,7 +598,7 @@ class Propal extends CommonObject if (empty($qty) && empty($special_code)) $special_code=3; // Set option tag if (! empty($qty) && $special_code == 3) $special_code=0; // Remove option tag - if ($this->statut == 0) + if ($this->statut == self::STATUS_DRAFT) { $this->db->begin(); @@ -650,7 +723,7 @@ class Propal extends CommonObject */ function deleteline($lineid) { - if ($this->statut == 0) + if ($this->statut == self::STATUS_DRAFT) { $line=new PropaleLigne($this->db); @@ -1007,7 +1080,7 @@ class Propal extends CommonObject } $this->id=0; - $this->statut=0; + $this->statut=self::STATUS_DRAFT; if (empty($conf->global->PROPALE_ADDON) || ! is_readable(DOL_DOCUMENT_ROOT ."/core/modules/propale/".$conf->global->PROPALE_ADDON.".php")) { @@ -1192,7 +1265,7 @@ class Propal extends CommonObject $this->location_incoterms = $obj->location_incoterms; $this->libelle_incoterms = $obj->libelle_incoterms; - if ($obj->fk_statut == 0) + if ($obj->fk_statut == self::STATUS_DRAFT) { $this->brouillon = 1; } @@ -1385,8 +1458,8 @@ class Propal extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."propal"; $sql.= " SET ref = '".$num."',"; - $sql.= " fk_statut = 1, date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id; - $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; + $sql.= " fk_statut = ".self::STATUS_VALIDATED.", date_valid='".$this->db->idate($now)."', fk_user_valid=".$user->id; + $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT; dol_syslog(get_class($this)."::valid", LOG_DEBUG); $resql=$this->db->query($sql); @@ -1441,7 +1514,7 @@ class Propal extends CommonObject $this->ref=$num; $this->brouillon=0; - $this->statut = 1; + $this->statut = self::STATUS_VALIDATED; $this->user_valid_id=$user->id; $this->datev=$now; @@ -1476,7 +1549,7 @@ class Propal extends CommonObject if (! empty($user->rights->propal->creer)) { $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET datep = '".$this->db->idate($date)."'"; - $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; + $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT; dol_syslog(get_class($this)."::set_date", LOG_DEBUG); if ($this->db->query($sql) ) @@ -1505,7 +1578,7 @@ class Propal extends CommonObject if (! empty($user->rights->propal->creer)) { $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fin_validite = ".($date_fin_validite!=''?"'".$this->db->idate($date_fin_validite)."'":'null'); - $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; + $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT; if ($this->db->query($sql) ) { $this->fin_validite = $date_fin_validite; @@ -1655,7 +1728,7 @@ class Propal extends CommonObject $remise = price2num($remise); $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET remise_percent = ".$remise; - $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; + $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT; if ($this->db->query($sql) ) { @@ -1689,7 +1762,7 @@ class Propal extends CommonObject $sql = "UPDATE ".MAIN_DB_PREFIX."propal "; $sql.= " SET remise_absolue = ".$remise; - $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; + $sql.= " WHERE rowid = ".$this->id." AND fk_statut = ".self::STATUS_DRAFT; if ($this->db->query($sql) ) { @@ -1797,7 +1870,7 @@ class Propal extends CommonObject $modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED?$conf->global->PROPALE_ADDON_PDF_ODT_CLOSED:$this->modelpdf; $trigger_name='PROPAL_CLOSE_REFUSED'; - if ($statut == 2) + if ($statut == self::STATUS_SIGNED) { $trigger_name='PROPAL_CLOSE_SIGNED'; $modelpdf=$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL?$conf->global->PROPALE_ADDON_PDF_ODT_TOBILL:$this->modelpdf; @@ -1814,7 +1887,7 @@ class Propal extends CommonObject return -2; } } - if ($statut == 4) + if ($statut == self::STATUS_BILLED) { $trigger_name='PROPAL_CLASSIFY_BILLED'; } @@ -1864,11 +1937,11 @@ class Propal extends CommonObject */ function classifyBilled() { - $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET fk_statut = 4'; - $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0 ;'; + $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal SET fk_statut = '.self::STATUS_BILLED; + $sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT.' ;'; if ($this->db->query($sql) ) { - $this->statut=4; + $this->statut=self::STATUS_BILLED; return 1; } else @@ -1896,12 +1969,12 @@ class Propal extends CommonObject */ function set_draft($user) { - $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = 0"; + $sql = "UPDATE ".MAIN_DB_PREFIX."propal SET fk_statut = ".self::STATUS_DRAFT; $sql.= " WHERE rowid = ".$this->id; if ($this->db->query($sql)) { - $this->statut = 0; + $this->statut = self::STATUS_DRAFT; $this->brouillon = 1; return 1; } @@ -1945,7 +2018,7 @@ class Propal extends CommonObject $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; } if ($socid) $sql.= " AND s.rowid = ".$socid; - if ($draft) $sql.= " AND p.fk_statut = 0"; + if ($draft) $sql.= " AND p.fk_statut = ".self::STATUS_DRAFT; if ($notcurrentuser > 0) $sql.= " AND p.fk_user_author <> ".$user->id; $sql.= $this->db->order($sortfield,$sortorder); $sql.= $this->db->plimit($limit,$offset); @@ -2215,7 +2288,7 @@ class Propal extends CommonObject function availability($availability_id) { dol_syslog('Propale::availability('.$availability_id.')'); - if ($this->statut >= 0) + if ($this->statut >= self::STATUS_DRAFT) { $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal'; $sql .= ' SET fk_availability = '.$availability_id; @@ -2249,7 +2322,7 @@ class Propal extends CommonObject function demand_reason($demand_reason_id) { dol_syslog('Propale::demand_reason('.$demand_reason_id.')'); - if ($this->statut >= 0) + if ($this->statut >= self::STATUS_DRAFT) { $sql = 'UPDATE '.MAIN_DB_PREFIX.'propal'; $sql .= ' SET fk_input_reason = '.$demand_reason_id; @@ -2356,11 +2429,11 @@ class Propal extends CommonObject global $langs; $langs->load("propal"); - if ($statut==0) $statuttrans='statut0'; - if ($statut==1) $statuttrans='statut1'; - if ($statut==2) $statuttrans='statut3'; - if ($statut==3) $statuttrans='statut5'; - if ($statut==4) $statuttrans='statut6'; + if ($statut==self::STATUS_DRAFT) $statuttrans='statut0'; + if ($statut==self::STATUS_VALIDATED) $statuttrans='statut1'; + if ($statut==self::STATUS_SIGNED) $statuttrans='statut3'; + if ($statut==self::STATUS_NOTSIGNED) $statuttrans='statut5'; + if ($statut==self::STATUS_BILLED) $statuttrans='statut6'; if ($mode == 0) return $this->labelstatut[$statut]; if ($mode == 1) return $this->labelstatut_short[$statut]; @@ -2393,8 +2466,8 @@ class Propal extends CommonObject $clause = " AND"; } $sql.= $clause." p.entity = ".$conf->entity; - if ($mode == 'opened') $sql.= " AND p.fk_statut = 1"; - if ($mode == 'signed') $sql.= " AND p.fk_statut = 2"; + if ($mode == 'opened') $sql.= " AND p.fk_statut = ".self::STATUS_VALIDATED; + if ($mode == 'signed') $sql.= " AND p.fk_statut = ".self::STATUS_SIGNED; if ($user->societe_id) $sql.= " AND p.fk_soc = ".$user->societe_id; $resql=$this->db->query($sql); @@ -2405,12 +2478,12 @@ class Propal extends CommonObject if ($mode == 'opened') { $delay_warning=$conf->propal->cloture->warning_delay; - $statut = 1; + $statut = self::STATUS_VALIDATED; $label = $langs->trans("PropalsToClose"); } if ($mode == 'signed') { $delay_warning=$conf->propal->facturation->warning_delay; - $statut = 2; + $statut = self::STATUS_SIGNED; $label = $langs->trans("PropalsToBill"); } @@ -2815,7 +2888,14 @@ class PropaleLigne extends CommonObject var $fk_parent_line; var $desc; // Description ligne var $fk_product; // Id produit predefini - var $product_type = 0; // Type 0 = product, 1 = Service + /** + * Product type. + * Use the following constants: + * - Product::TYPE_PRODUCT + * - Product::TYPE_SERVICE + * @var int + */ + var $product_type = Product::TYPE_PRODUCT; var $qty; var $tva_tx; diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 9292684d06f..05cd2db3f04 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -126,7 +126,7 @@ if ($id > 0 || ! empty($ref)) if ($object->fin_validite) { print dol_print_date($object->fin_validite,'daytext'); - if ($object->statut == 1 && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); + if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); } else { diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 259a3bc5d6a..5a7b8261fd7 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -51,8 +51,17 @@ class Commande extends CommonOrder var $id; - var $socid; // Id client - var $client; // Objet societe client (a charger par fetch_client) + /** + * Client ID + * @var int + */ + var $socid; + + /** + * Client (loaded by fetch_client) + * @var Societe + */ + var $client; var $ref; var $ref_client; @@ -69,31 +78,13 @@ class Commande extends CommonOrder * - STATUS_CLOSED * @var int */ - var $statut; // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Delivered=Sent/Received, billed or not) + var $statut; + /** + * @deprecated + */ var $facturee; // deprecated var $billed; // billed or not - /** - * Canceled status - */ - const STATUS_CANCELED = -1; - /** - * Draft status - */ - const STATUS_DRAFT = 0; - /** - * Validated status - */ - const STATUS_VALIDATED = 1; - /** - * Accepted/On process not managed for customer orders - */ - const STATUS_ACCEPTED = 2; - /** - * Closed (Sent/Received, billed or not) - */ - const STATUS_CLOSED = 3; - var $brouillon; var $cond_reglement_id; var $cond_reglement_code; @@ -153,6 +144,27 @@ class Commande extends CommonOrder */ const STOCK_NOT_ENOUGH_FOR_ORDER = -3; + /** + * Canceled status + */ + const STATUS_CANCELED = -1; + /** + * Draft status + */ + const STATUS_DRAFT = 0; + /** + * Validated status + */ + const STATUS_VALIDATED = 1; + /** + * Accepted/On process not managed for customer orders + */ + const STATUS_ACCEPTED = 2; + /** + * Closed (Sent/Received, billed or not) + */ + const STATUS_CLOSED = 3; + /** * Constructor diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index 1a7ebfc34c8..2ca7a0bf0fb 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -60,6 +60,34 @@ abstract class CommonInvoice extends CommonObject */ const TYPE_SITUATION = 5; + /** + * Draft + */ + const STATUS_DRAFT = 0; + + /** + * Validated (need to be paid) + */ + const STATUS_VALIDATED = 1; + + /** + * Classified paid. + * If paid partially, $this->close_code can be: + * - CLOSECODE_DISCOUNTVAT + * - CLOSECODE_BADDEBT + * If paid completelly, this->close_code will be null + */ + const STATUS_CLOSED = 2; + + /** + * Classified abandoned and no payment done. + * $this->close_code can be: + * - CLOSECODE_BADDEBT + * - CLOSECODE_ABANDONED + * - CLOSECODE_REPLACED + */ + const STATUS_ABANDONED = 3; + /** * Return amount of payments already done * diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 3cd07d7fc53..a05695ffeda 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -52,7 +52,11 @@ class CommandeFournisseur extends CommonOrder var $id; - var $ref; // TODO deprecated + /** + * TODO: Remove + * @deprecated + */ + var $ref; var $product_ref; var $ref_supplier; var $brouillon; diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 19cb26cf17b..99e9cca639c 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -55,10 +55,15 @@ class FactureFournisseur extends CommonInvoice var $socid; //Check constants for types var $type = self::TYPE_STANDARD; - //! 0=draft, - //! 1=validated - //! 2=classified paid partially (close_code='discount_vat','badcustomer') or completely (close_code=null), - //! Also 2, should be 3=classified abandoned and no payment done (close_code='badcustomer','abandon' ou 'replaced') + + /** + * Check constants for more info: + * - STATUS_DRAFT + * - STATUS_VALIDATED + * - STATUS_PAID + * - STATUS_ABANDONED + * @var int + */ var $statut; //! 1 si facture payee COMPLETEMENT, 0 sinon (ce champ ne devrait plus servir car insuffisant) var $paye; @@ -438,7 +443,7 @@ class FactureFournisseur extends CommonInvoice $extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true); $this->fetch_optionals($this->id,$extralabels); - if ($this->statut == 0) $this->brouillon = 1; + if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1; $result=$this->fetch_lines(); if ($result < 0) @@ -886,7 +891,7 @@ class FactureFournisseur extends CommonInvoice $error=0; // Protection - if ($this->statut > 0) // This is to avoid to validate twice (avoid errors on logs and stock management) + if ($this->statut > self::STATUS_DRAFT) // This is to avoid to validate twice (avoid errors on logs and stock management) { dol_syslog(get_class($this)."::validate no draft status", LOG_WARNING); return 0; @@ -995,7 +1000,7 @@ class FactureFournisseur extends CommonInvoice if (! $error) { $this->ref = $num; - $this->statut=1; + $this->statut=self::STATUS_VALIDATED; //$this->date_validation=$now; this is stored into log table } @@ -1032,7 +1037,7 @@ class FactureFournisseur extends CommonInvoice $error=0; - if ($this->statut == 0) + if ($this->statut == self::STATUS_DRAFT) { dol_syslog(get_class($this)."::set_draft already draft status", LOG_WARNING); return 0; @@ -1746,7 +1751,7 @@ class FactureFournisseur extends CommonInvoice // Load source object $object->fetch($fromid); $object->id=0; - $object->statut=0; + $object->statut=self::STATUS_DRAFT; // Clear fields $object->ref_supplier=$langs->trans("CopyOf").' '.$object->ref_supplier; diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index e93d06ad530..28fbe44fc9f 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -288,7 +288,7 @@ if (empty($reshook)) elseif ($action == 'deletepaiement' && $user->rights->fournisseur->facture->creer) { $object->fetch($id); - if ($object->statut == 1 && $object->paye == 0) + if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0) { $paiementfourn = new PaiementFourn($db); $result=$paiementfourn->fetch(GETPOST('paiement_id')); @@ -867,8 +867,8 @@ if (empty($reshook)) elseif ($action == 'reopen' && $user->rights->fournisseur->facture->creer) { $result = $object->fetch($id); - if ($object->statut == 2 - || ($object->statut == 3 && $object->close_code != 'replaced')) + if ($object->statut == FactureFournisseur::STATUS_CLOSED + || ($object->statut == FactureFournisseur::STATUS_ABANDONED && $object->close_code != 'replaced')) { $result = $object->set_unpaid($user); if ($result > 0) @@ -1739,8 +1739,8 @@ else print "    \n"; // Ref supplier - print ''; // Third party @@ -1788,8 +1788,8 @@ else print ''; // Label - print ''; - print ''; + print ''; + print ''; /* * List of payments @@ -1853,7 +1853,7 @@ else } print ''; print ''; + $form_permission = $object->statutrights->fournisseur->facture->creer && $object->getSommePaiement() <= 0; + // Date - print ''; // Due date - print ''; // Conditions de reglement par defaut @@ -2081,7 +2083,7 @@ else '; - if (! empty($conf->use_javascript_ajax) && $object->statut == 0) { + if (! empty($conf->use_javascript_ajax) && $object->statut == FactureFournisseur::STATUS_DRAFT) { include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php'; } @@ -2279,7 +2281,7 @@ else } */ // Form to add new line - if ($object->statut == 0 && $user->rights->fournisseur->facture->creer) + if ($object->statut == FactureFournisseur::STATUS_DRAFT && $user->rights->fournisseur->facture->creer) { if ($action != 'editline') { @@ -2310,7 +2312,7 @@ else print '
    '; // Modify a validated invoice with no payments - if ($object->statut == 1 && $action != 'edit' && $object->getSommePaiement() == 0 && $user->rights->fournisseur->facture->creer) + if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'edit' && $object->getSommePaiement() == 0 && $user->rights->fournisseur->facture->creer) { print ''.$langs->trans('Modify').''; } @@ -2329,7 +2331,7 @@ else } // Send by mail - if (($object->statut == 1 || $object->statut == 2)) + if (($object->statut == FactureFournisseur::STATUS_VALIDATED || $object->statut == FactureFournisseur::STATUS_CLOSED)) { if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send) { @@ -2340,13 +2342,13 @@ else // Make payments - if ($action != 'edit' && $object->statut == 1 && $object->paye == 0 && $user->societe_id == 0) + if ($action != 'edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->societe_id == 0) { print ''.$langs->trans('DoPayment').''; // must use facid because id is for payment id not invoice } // Classify paid - if ($action != 'edit' && $object->statut == 1 && $object->paye == 0 && $user->societe_id == 0) + if ($action != 'edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->societe_id == 0) { print ''.$langs->trans('ClassifyPaid').''; @@ -2355,7 +2357,7 @@ else } // Validate - if ($action != 'edit' && $object->statut == 0) + if ($action != 'edit' && $object->statut == FactureFournisseur::STATUS_DRAFT) { if (count($object->lines)) { From d897139f255f397f861f5e04060a7bd13e4223a1 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Fri, 3 Apr 2015 06:54:08 +0200 Subject: [PATCH 308/412] Module member: move field note in note_private --- htdocs/adherents/class/adherent.class.php | 18 +++++++++--------- htdocs/adherents/note.php | 14 +++++++------- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 3 +++ htdocs/install/mysql/tables/llx_adherent.sql | 2 +- htdocs/public/members/new.php | 10 +++++----- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index c8c4f9b9ad4..7a4510119dc 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -5,7 +5,7 @@ * Copyright (C) 2004 Sebastien Di Cintio * Copyright (C) 2004 Benoit Mortier * Copyright (C) 2009-2012 Regis Houssin - * Copyright (C) 2014 Alexandre Spangaro + * Copyright (C) 2014-2015 Alexandre Spangaro * Copyright (C) 2015 Marcos García * * This program is free software; you can redistribute it and/or modify @@ -77,7 +77,7 @@ class Adherent extends CommonObject var $morphy; var $public; - var $note; // Private note + var $note_private; // Private note var $statut; // -1:brouillon, 0:resilie, >=1:valide,paye var $photo; @@ -310,7 +310,7 @@ class Adherent extends CommonObject $sql.= " VALUES ("; $sql.= " '".$this->db->idate($this->datec)."'"; $sql.= ", ".($this->login?"'".$this->db->escape($this->login)."'":"null"); - $sql.= ", ".($user->id>0?$user->id:"null"); // Can be null because member can be createb by a guest or a script + $sql.= ", ".($user->id>0?$user->id:"null"); // Can be null because member can be created by a guest or a script $sql.= ", null, null, '".$this->morphy."'"; $sql.= ", '".$this->typeid."'"; $sql.= ", ".$conf->entity; @@ -445,9 +445,9 @@ class Adherent extends CommonObject $sql.= ", email='".$this->email."'"; $sql.= ", skype='".$this->skype."'"; $sql.= ", phone=" .($this->phone?"'".$this->db->escape($this->phone)."'":"null"); - $sql.= ", phone_perso=" .($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null"); + $sql.= ", phone_perso=" .($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null"); $sql.= ", phone_mobile=" .($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null"); - $sql.= ", note=" .($this->note?"'".$this->db->escape($this->note)."'":"null"); + $sql.= ", note_private=" .($this->note_private?"'".$this->db->escape($this->note_private)."'":"null"); $sql.= ", photo=" .($this->photo?"'".$this->photo."'":"null"); $sql.= ", public='".$this->public."'"; $sql.= ", statut=" .$this->statut; @@ -1053,7 +1053,7 @@ class Adherent extends CommonObject { global $langs; - $sql = "SELECT d.rowid, d.ref_ext, d.civility as civility_id, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note,"; + $sql = "SELECT d.rowid, d.ref_ext, d.civility as civility_id, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note_private,"; $sql.= " d.email, d.skype, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass,"; $sql.= " d.photo, d.fk_adherent_type, d.morphy, d.entity,"; $sql.= " d.datec as datec,"; @@ -1134,7 +1134,7 @@ class Adherent extends CommonObject $this->datevalid = $this->db->jdate($obj->datev); $this->birth = $this->db->jdate($obj->birthday); - $this->note = $obj->note; + $this->note_private = $obj->note_private; $this->morphy = $obj->morphy; $this->typeid = $obj->fk_adherent_type; @@ -1801,7 +1801,7 @@ class Adherent extends CommonObject $this->phone = '0999999999'; $this->phone_perso = '0999999998'; $this->phone_mobile = '0999999997'; - $this->note='No comment'; + $this->note_private='No comment'; $this->birth=time(); $this->photo=''; $this->public=1; @@ -1874,7 +1874,7 @@ class Adherent extends CommonObject if ($this->phone_perso && ! empty($conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO)) $info[$conf->global->LDAP_MEMBER_FIELD_PHONE_PERSO] = $this->phone_perso; if ($this->phone_mobile && ! empty($conf->global->LDAP_MEMBER_FIELD_MOBILE)) $info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile; if ($this->fax && ! empty($conf->global->LDAP_MEMBER_FIELD_FAX)) $info[$conf->global->LDAP_MEMBER_FIELD_FAX] = $this->fax; - if ($this->note && ! empty($conf->global->LDAP_MEMBER_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION] = $this->note; + if ($this->note_private && ! empty($conf->global->LDAP_MEMBER_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION] = $this->note_private; if ($this->birth && ! empty($conf->global->LDAP_MEMBER_FIELD_BIRTHDATE)) $info[$conf->global->LDAP_MEMBER_FIELD_BIRTHDATE] = dol_print_date($this->birth,'dayhourldap'); if (isset($this->statut) && ! empty($conf->global->LDAP_FIELD_MEMBER_STATUS)) $info[$conf->global->LDAP_FIELD_MEMBER_STATUS] = $this->statut; if ($this->datefin && ! empty($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)) $info[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION] = dol_print_date($this->datefin,'dayhourldap'); diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 727b3a9bcdc..f0b202677c1 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -19,7 +19,7 @@ /** * \file htdocs/adherents/note.php * \ingroup member - * \brief Tabe for note of a member + * \brief Tab for note of a member */ require '../main.inc.php'; @@ -54,7 +54,7 @@ if ($action == 'update' && $user->rights->adherent->creer && ! $_POST["cancel"]) { $db->begin(); - $res=$object->update_note(dol_html_entity_decode(GETPOST('note'), ENT_QUOTES)); + $res=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES)); if ($res < 0) { setEventMessage($object->error, 'errors'); @@ -82,7 +82,7 @@ if ($id) dol_fiche_head($head, 'note', $langs->trans("Member"), 0, 'user'); - print ""; + print ""; print ''; print '
    '.$form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).''; - print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)); + print '
    '.$form->editfieldkey("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statutrights->fournisseur->facture->creer)).''; + print $form->editfieldval("RefSupplier",'ref_supplier',$object->ref_supplier,$object,($object->statutrights->fournisseur->facture->creer)); print '
    '.$form->editfieldkey("Label",'label',$object->label,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).''.$form->editfieldval("Label",'label',$object->label,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer)).'
    '.$form->editfieldkey("Label",'label',$object->label,$object,($object->statutrights->fournisseur->facture->creer)).''.$form->editfieldval("Label",'label',$object->label,$object,($object->statutrights->fournisseur->facture->creer)).''.price($objp->amount).''; - if ($object->statut == 1 && $object->paye == 0 && $user->societe_id == 0) + if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->societe_id == 0) { print 'rowid.'">'; print img_delete(); @@ -1891,15 +1891,17 @@ else print '
    '.$form->editfieldkey("Date",'datef',$object->datep,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker').''; - print $form->editfieldval("Date",'datef',$object->datep,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker'); + print '
    '.$form->editfieldkey("Date",'datef',$object->datep,$object,$form_permission,'datepicker').''; + print $form->editfieldval("Date",'datef',$object->datep,$object,$form_permission,'datepicker'); print '
    '.$form->editfieldkey("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker').''; - print $form->editfieldval("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,($object->statut<2 && $user->rights->fournisseur->facture->creer && $object->getSommePaiement() <= 0),'datepicker'); - if ($action != 'editdate_lim_reglement' && $object->statut < 2 && $object->date_echeance && $object->date_echeance < ($now - $conf->facture->fournisseur->warning_delay)) print img_warning($langs->trans('Late')); + print '
    '.$form->editfieldkey("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,$form_permission,'datepicker').''; + print $form->editfieldval("DateMaxPayment",'date_lim_reglement',$object->date_echeance,$object,$form_permission,'datepicker'); + if ($action != 'editdate_lim_reglement' && $object->statut < FactureFournisseur::STATUS_CLOSED && $object->date_echeance && $object->date_echeance < ($now - $conf->facture->fournisseur->warning_delay)) print img_warning($langs->trans('Late')); print '
    '; @@ -129,7 +129,7 @@ if ($id) // Status print ''; - // Note + // Private note print ''; print '"; @@ -150,7 +150,7 @@ if ($id) { print ''; } diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index b1b4eccbf56..1379d7bc6c4 100644 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -512,3 +512,6 @@ create table llx_c_price_global_variable_updater next_update integer DEFAULT 0, last_status text DEFAULT NULL )ENGINE=innodb; + +ALTER TABLE llx_adherent CHANGE COLUMN note note_private text DEFAULT NULL; + diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index e7f9c246834..e6ffee2dc5b 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -54,7 +54,7 @@ create table llx_adherent statut smallint NOT NULL DEFAULT 0, public smallint NOT NULL DEFAULT 0, -- certain champ de la fiche sont ils public ou pas ? datefin datetime, -- date de fin de validite de la cotisation - note text, + note_private text DEFAULT NULL, datevalid datetime, -- date de validation datec datetime, -- date de creation tms timestamp, -- date de modification diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index a6ac9ee1906..8fb06cd783e 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -25,9 +25,9 @@ * \brief Example of form to add a new member * * Note that you can add following constant to change behaviour of page - * MEMBER_NEWFORM_AMOUNT Default amount for autosubscribe form + * MEMBER_NEWFORM_AMOUNT Default amount for auto-subscribe form * MEMBER_NEWFORM_EDITAMOUNT Amount can be edited - * MEMBER_NEWFORM_PAYONLINE Suggest paypemt with paypal of paybox + * MEMBER_NEWFORM_PAYONLINE Suggest payment with paypal of paybox * MEMBER_NEWFORM_DOLIBARRTURNOVER Show field turnover (specific for dolibarr foundation) * MEMBER_URL_REDIRECT_SUBSCRIPTION Url to redirect once subscribe submitted * MEMBER_NEWFORM_FORCETYPE Force type of member @@ -40,7 +40,7 @@ define("NOCSRFCHECK",1); // We accept to go on this page from external web site. // For MultiCompany module. // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php -// TODO This should be useless. Because entity must be retreive from object ref and not from url. +// TODO This should be useless. Because entity must be retrieve from object ref and not from url. $entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); if (is_numeric($entity)) define("DOLENTITY", $entity); @@ -138,7 +138,7 @@ function llxFooterVierge() * Actions */ -// Action called when page is submited +// Action called when page is submitted if ($action == 'add') { // test if login already exists @@ -335,7 +335,7 @@ if ($action == 'add') } } -// Action called after a submited was send and member created succesfully +// Action called after a submitted was send and member created successfully // If MEMBER_URL_REDIRECT_SUBSCRIPTION is set to url we never go here because a redirect was done to this url. // backtopage parameter with an url was set on member submit page, we never go here because a redirect was done to this url. if ($action == 'added') From f38bf5a7d211ff016eaa589c06ecba5656be0e54 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Apr 2015 11:00:52 +0200 Subject: [PATCH 309/412] Fix extrafields were not saved when creating a supplier order Fix removed hooks where we must use trigger --- htdocs/commande/class/commande.class.php | 41 ++++++++----------- .../class/fournisseur.commande.class.php | 6 +++ htdocs/fourn/commande/card.php | 14 +++---- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php index 259a3bc5d6a..edf380b2e36 100644 --- a/htdocs/commande/class/commande.class.php +++ b/htdocs/commande/class/commande.class.php @@ -790,7 +790,7 @@ class Commande extends CommonOrder $this->lines[$i]->fk_fournprice, $this->lines[$i]->pa_ht, $this->lines[$i]->label, - $this->lines[$i]->array_options + $this->lines[$i]->array_options ); if ($result < 0) { @@ -862,28 +862,25 @@ class Commande extends CommonOrder if (! $error) { - $action='create'; + //$action='create'; // Actions on extra fields (by external module or standard code) // FIXME le hook fait double emploi avec le trigger !! - $hookmanager->initHooks(array('orderdao')); + /*$hookmanager->initHooks(array('orderdao')); $parameters=array('socid'=>$this->id); $reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks if (empty($reshook)) { if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used - { + {*/ $result=$this->insertExtraFields(); - if ($result < 0) - { - $error++; - } - } + if ($result < 0) $error++; + /* } } - else if ($reshook < 0) $error++; + else if ($reshook < 0) $error++;*/ } - if (! $notrigger) + if (! $error && ! $notrigger) { // Call trigger $result=$this->call_trigger('ORDER_CREATE',$user); @@ -891,29 +888,27 @@ class Commande extends CommonOrder // End call triggers } - if (!$error) { + if (! $error) + { $this->db->commit(); return $this->id; } - - foreach($this->errors as $errmsg) - { - dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR); - $this->error.=($this->error?', '.$errmsg:$errmsg); - } - $this->db->rollback(); - return -1*$error; - + else + { + $this->db->rollback(); + return -1*$error; + } } else - { + { + $this->error=$this->db->lasterror(); $this->db->rollback(); return -1; } } } else - { + { dol_print_error($this->db); $this->db->rollback(); return -1; diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 3cd07d7fc53..f0abed84cbb 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1066,6 +1066,12 @@ class CommandeFournisseur extends CommonOrder } } + if (! $error) + { + $result=$this->insertExtraFields(); + if ($result < 0) $error++; + } + if (! $error && ! $notrigger) { // Call trigger diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index cbbeaa99499..995c493df51 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -918,22 +918,20 @@ if (empty($reshook)) } $object_id = $object->create($user); - if ($object_id > 0) { dol_include_once('/' . $element . '/class/' . $subelement . '.class.php'); $classname = ucfirst($subelement); $srcobject = new $classname($db); - $srcobject->fetch($object->origin_id); - - $object->set_date_livraison($user, $srcobject->date_livraison); - $object->set_id_projet($user, $srcobject->fk_project); dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines"); $result = $srcobject->fetch($object->origin_id); if ($result > 0) { + $object->set_date_livraison($user, $srcobject->date_livraison); + $object->set_id_projet($user, $srcobject->fk_project); + $lines = $srcobject->lines; if (empty($lines) && method_exists($srcobject, 'fetch_lines')) { @@ -1010,11 +1008,11 @@ if (empty($reshook)) if ($reshook < 0) $error ++; } else { - setEventMessage($srcobject->error, 'errors'); + setEventMessages($srcobject->error, $srcobject->errors, 'errors'); $error ++; } } else { - setEventMessage($object->error, 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); $error ++; } } @@ -1024,7 +1022,7 @@ if (empty($reshook)) if ($id < 0) { $error++; - setEventMessage($langs->trans($object->error), 'errors'); + setEventMessages($object->error, $object->errors, 'errors'); } } } From b01369a32ea5c89d212149d2551f19caf412b743 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Apr 2015 15:25:24 +0200 Subject: [PATCH 310/412] Error management --- htdocs/core/class/stats.class.php | 45 +++++++++++++++++-------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php index 8a4ffd29d68..ff9f29f55ff 100644 --- a/htdocs/core/class/stats.class.php +++ b/htdocs/core/class/stats.class.php @@ -31,7 +31,7 @@ abstract class Stats { protected $db; var $_lastfetchdate=array(); // Dates of cache file read by methods - var $cachefilesuffix=''; // Suffix to add to name of cache file (to avoid file name conflicts) + var $cachefilesuffix=''; // Suffix to add to name of cache file (to avoid file name conflicts) /** * Return nb of elements by month for several years @@ -76,7 +76,7 @@ abstract class Stats dol_syslog(get_class($this).'::'.__FUNCTION__." cache file ".$newpathofdestfile." is not found or older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we can't use it."); } } - + // Load file into $data if ($foundintocache) // Cache file found and is not too old { @@ -203,11 +203,14 @@ abstract class Stats dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk."); if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp); $fp = fopen($newpathofdestfile, 'w'); - fwrite($fp, json_encode($data)); - fclose($fp); - if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK; - @chmod($newpathofdestfile, octdec($newmask)); - + if ($fp) + { + fwrite($fp, json_encode($data)); + fclose($fp); + if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK; + @chmod($newpathofdestfile, octdec($newmask)); + } + else dol_syslog("Failed to write cache file", LOG_ERR); $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt; } @@ -309,21 +312,23 @@ abstract class Stats dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk."); if (! dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp); $fp = fopen($newpathofdestfile, 'w'); - fwrite($fp, json_encode($data)); - fclose($fp); - if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK; - @chmod($newpathofdestfile, octdec($newmask)); - + if ($fp) + { + fwrite($fp, json_encode($data)); + fclose($fp); + if (! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK; + @chmod($newpathofdestfile, octdec($newmask)); + } $this->_lastfetchdate[get_class($this).'_'.__FUNCTION__]=$nowgmt; } return $data; - } - - + } + + // Here we have low level of shared code called by XxxStats.class.php - + /** * Return nb of elements by year * @@ -532,8 +537,8 @@ abstract class Stats return $data; } - - + + /** * Return number or total of product refs * @@ -544,7 +549,7 @@ abstract class Stats function _getAllByProduct($sql, $limit=10) { global $langs; - + $result=array(); $res=array(); @@ -567,6 +572,6 @@ abstract class Stats else dol_print_error($this->db); return $result; - } + } } From 092dd38851e582580de4f8adf5e7863356183173 Mon Sep 17 00:00:00 2001 From: Florian HENRY Date: Fri, 3 Apr 2015 15:33:41 +0200 Subject: [PATCH 311/412] =?UTF-8?q?FIX=20:=20[=20bug=20#1916=20]=20probl?= =?UTF-8?q?=C3=A8me=20d'icone=20pour=20l'=C3=A9tat=20"clos"=20sur=20les=20?= =?UTF-8?q?projets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/theme/bureau2crea/img/statut4.png | Bin 1640 -> 567 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/htdocs/theme/bureau2crea/img/statut4.png b/htdocs/theme/bureau2crea/img/statut4.png index b12bc0d000ccf86ca62574d00783a7a26d3869f7..75f9155a6d2b2bc97bf73cc16531855d5e773917 100644 GIT binary patch delta 542 zcmV+(0^$AW47UW3B!32COGiWi{{a60|De66lK=n!32;bRa{vGf6951U69E94oEQKA z00(qQO+^Ra1Op8qE{OxTN&o->#7RU!R5;6(lQC-(VHkj)_q+ElX;TDUM8UxffIsICnF2=+Ed-^l!Kdy44a~Z0JxZNb3n!js%6E$$#Z8m+$U#NPhzz%>;9-d_*wr^Iin>)2S7b;5>&iy7E zG4uw#OYaX_*A72^S_^zOM0g?fb?#>wZy&APSYW1rnK{Atl*P&rBP=N3`bkX2S2CC4iFc|r zOJW1Q_XmjJ)EMaYgz!ra_?!!8_z{oublREQGUvs)v3~<#nD)+r%;XtBM3|e2BgQ$B zG_`YW5fReV;v9)FhE^DMu{Our;=i)B1=i+-VHaa)8CABTD5lvwL1fY+Xa6h$&E^SF z6r;+P0=ud-_V+v6olf6Ws~0Jk6@WC0@r>eY8E~YjB@DYnQCz690qn}`Ia^DkDE@uU g#;~XQ>ld7V0v;^A?)HM;RsaA107*qoM6N<$f~-aQLjV8( literal 1640 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{L-^Aq1JP;qO z-q+X4Gq1QLF)umQ)5TT^Xo6m5W(qJg%}vbA91YE#%`FWLUEG`;U5uO^Ei9dkES)V3 zjm=?tUGkGlb5rw5V0u#!dW~@E1to>t0-((}MPV=C8 zQ*gV*0H+)@tD;XG=?s&R5hE&|D znS3`}BwXTH{qr+t-sPCh-=t{PyCiReqk)-XmGY8M{iPvQSG%`~=!@*>_`&|gUZX=| zkH8+m{I{VZqFkXIO(vJ3qI0$Lj?T!Ld{^bS;pUk$=l0JtR#R-Mcre%Ux$XPUbDq!n zUVHS3C;s-?`Ip?E&%c;@?jlPM%!y+`4mW z@$(5zmvT(Y|9*OMao%$Mf3_<<&aG}vYYF<0DNykL$VKIv&qqBs&D1GebMThSFLA9+ zvaA*J*2i#~zq|AF+Fo{zN#}bGIi}g^@%7C6`;EnrZ*4-a!m7Qgc>xQfa)aLd^Ex|S zQg-W)-CGWvS`|Fu)w#*S$;~HxMD?|VH#t?ewVLp3b8gKn=Qn&kH{8srFZ_96REPS`+OJe5~p=-07F1_y9>ecvh z-suN^0hu}%KAh5;|M<mRA;uehcYr{^W5w=!zw)mNSGr9-Y4iM-M5t1sbQ zUej}bp2VBCR=z8Y4E`619hXeWwRM*`B{F&0^s~QbwYe&Y@A&s2dy&eM&&=X4GW<8? zKae;-t!|O%{$obEOMJE+jAltXeKGNQ;Su>WcK_!6dzZLx_O3-8zW;R2Cq3`k&Xp~! zyhLjU?|JUvX)d}|R=+i_=70LVI{M4^cY#;KQ*YM#s7+2@ZBe@BSjL*VBkoHt?b;Q- zr* z>9nl#6`}tnGp}#d;l6AVG_|;x+opcsx@&U;XWzAuZHtkSIdeK`BmZr`Y99Rp!zD^4 zZ@( Date: Fri, 3 Apr 2015 17:17:02 +0200 Subject: [PATCH 312/412] NEW Backup and restore tool is easier to use --- htdocs/admin/tools/dolibarr_export.php | 75 +++++++++++++++++++------- htdocs/admin/tools/dolibarr_import.php | 17 ++++-- htdocs/admin/tools/export.php | 58 +++++++++++++------- htdocs/langs/en_US/admin.lang | 9 ++-- htdocs/theme/eldy/style.css.php | 2 +- 5 files changed, 117 insertions(+), 44 deletions(-) diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php index aec78f8aaac..c1f44b7c791 100644 --- a/htdocs/admin/tools/dolibarr_export.php +++ b/htdocs/admin/tools/dolibarr_export.php @@ -111,11 +111,6 @@ jQuery(document).ready(function() { print_fiche_titre($langs->trans("Backup"),'','setup'); print $langs->trans("BackupDesc",DOL_DATA_ROOT).'

    '; -print $langs->trans("BackupDesc2",DOL_DATA_ROOT).'
    '; -print $langs->trans("BackupDescX").'

    '; -print $langs->trans("BackupDesc3",DOL_DATA_ROOT).'
    '; -print $langs->trans("BackupDescY").'

    '; - ?> @@ -124,9 +119,29 @@ print $langs->trans("BackupDescY").'

    '; name="token" value="" /> -
    -'.$langs->trans("DatabaseName").' : '.$dolibarr_main_db_name.''; ?> -
    '.$langs->trans("Status").''.$object->getLibStatut(4).'
    '.$langs->trans("Note").''; if ($action == 'edit' && $user->rights->adherent->creer) @@ -137,12 +137,12 @@ if ($id) print ""; print "id."\">"; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - $doleditor=new DolEditor('note',$object->note,'',280,'dolibarr_notes','',true,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,80); + $doleditor=new DolEditor('note_private',$object->note_private,'',280,'dolibarr_notes','',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,80); $doleditor->Create(); } else { - print nl2br($object->note); + print dol_htmlentitiesbr($object->note_private); } print "
    '; print ''; - print '   '; + print '     '; print ''; print '
    +
    1 + +trans("BackupDesc3",$dolibarr_main_db_name).'
    '; +//print $langs->trans("BackupDescY").'
    '; +print '
    '; +?> + +
    + +trans("BackupDumpWizard")); + +print '
    '; +print ''; +print ''; +print ''; +print '
    '; +print $langs->trans("DatabaseName").' : '.$dolibarr_main_db_name.'
    '; +print '
    '; +?> +
    @@ -182,7 +197,7 @@ print $langs->trans("BackupDescY").'

    '; $fullpathofmysqldump=$conf->global->SYSTEMTOOLS_MYSQLDUMP; } ?>
    -
    @@ -317,7 +332,7 @@ print $langs->trans("BackupDescY").'

    '; $fullpathofpgdump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP; } ?>
    - @@ -357,12 +372,12 @@ print $langs->trans("BackupDescY").'

    ';
    - -
    -trans("Destination"); ?> -: - +trans("Destination"); ?> --> +
    +
    +
    +?> +
    +
    '; +?> - + +
    +
    admin->dir_output.'/backup','files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1); $result=$formfile->list_of_documents($filearray,null,'systemtools','',1,'backup/',1,0,$langs->trans("NoBackupFileAvailable"),0,$langs->trans("PreviousDumpFiles")); print '
    '; +?> +
    +
    + + + +
    + +
    2 +trans("BackupDesc2",DOL_DATA_ROOT).'
    '; +print $langs->trans("BackupDescX").'

    '; +?> +
    + + + + +trans("Restore"),'','setup'); print $langs->trans("RestoreDesc",DOL_DATA_ROOT).'

    '; +?> +
    +1 +trans("RestoreDesc2",DOL_DATA_ROOT).'

    '; -print $langs->trans("RestoreDesc3",DOL_DATA_ROOT).'

    '; +?> +
    +
    + +
    +2 +trans("RestoreDesc3",$dolibarr_main_db_name).'

    '; ?> -
    -'.$langs->trans("DatabaseName").' : '.$dolibarr_main_db_name.''; ?> +trans("DatabaseName").' : '.$dolibarr_main_db_name.''; ?>

    + '; - print ''; + print ''; print ''; print ''; print ''; From 5fa21f37f042d725331c6c415551110eca909236 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 5 Apr 2015 17:13:24 +0200 Subject: [PATCH 324/412] Fix trim label --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 34e86acee60..c661a3d7bda 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -2871,7 +2871,7 @@ class Form { print ''; $i++; From 03b1db138e9e8f706073c5464e5c8f80178e204d Mon Sep 17 00:00:00 2001 From: aspangaro Date: Mon, 6 Apr 2015 08:20:23 +0200 Subject: [PATCH 325/412] Debug --- htdocs/adherents/note.php | 2 +- htdocs/core/class/commonobject.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index f0b202677c1..3a938e74034 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -54,7 +54,7 @@ if ($action == 'update' && $user->rights->adherent->creer && ! $_POST["cancel"]) { $db->begin(); - $res=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES)); + $res=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES), '_private'); if ($res < 0) { setEventMessage($object->error, 'errors'); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index d240c13110b..ac87f1e693d 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1611,7 +1611,7 @@ abstract class CommonObject } if (! in_array($suffix,array('','_public','_private'))) { - dol_syslog(get_class($this)."::upate_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR); + dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR); return -2; } From f40bb3e6aaf31820489d1a43173ab05ff38ea9ab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 11:05:16 +0200 Subject: [PATCH 326/412] fix phpcs --- test/bootstrap.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/test/bootstrap.php b/test/bootstrap.php index 6e80411dca6..27a5be97508 100644 --- a/test/bootstrap.php +++ b/test/bootstrap.php @@ -1,3 +1,26 @@ + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * or see http://www.gnu.org/ + */ + +/** + * \file test/bootstrap.php + * \ingroup test + * \brief PHPUnit test + * \remarks To make test with phpunit + */ + set_time_limit(0); -?> From 8fb14b122ac58f6f8c3f59ac68e38c76166e8cbe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 11:28:06 +0200 Subject: [PATCH 327/412] Fix phpcs --- htdocs/core/db/Database.interface.php | 306 +++++++++++++------------- htdocs/core/db/DoliDB.class.php | 4 +- 2 files changed, 155 insertions(+), 155 deletions(-) diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php index 0fbf22b0745..f27c4e75189 100644 --- a/htdocs/core/db/Database.interface.php +++ b/htdocs/core/db/Database.interface.php @@ -26,95 +26,95 @@ interface Database { /** - * Format a SQL IF + * Format a SQL IF * - * @param string $test Test string (example: 'cd.statut=0', 'field IS NULL') - * @param string $resok resultat si test egal - * @param string $resko resultat si test non egal - * @return string SQL string + * @param string $test Test string (example: 'cd.statut=0', 'field IS NULL') + * @param string $resok resultat si test egal + * @param string $resko resultat si test non egal + * @return string SQL string */ function ifsql($test, $resok, $resko); /** - * Return datas as an array + * Return datas as an array * - * @param resource $resultset Resultset of request - * @return array Array + * @param resource $resultset Resultset of request + * @return array Array */ function fetch_row($resultset); /** - * Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field. - * Function to use to build INSERT, UPDATE or WHERE predica + * Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field. + * Function to use to build INSERT, UPDATE or WHERE predica * - * @param string $param Date TMS to convert - * @return string Date in a string YYYYMMDDHHMMSS + * @param int $param Date TMS to convert + * @return string Date in a string YYYYMMDDHHMMSS */ function idate($param); /** - * Return last error code + * Return last error code * - * @return string lasterrno + * @return string lasterrno */ function lasterrno(); /** * Start transaction * - * @return int 1 if transaction successfuly opened or already opened, 0 if error + * @return int 1 if transaction successfuly opened or already opened, 0 if error */ function begin(); /** - * Create a new database - * Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated - * We force to create database with charset this->forcecharset and collate this->forcecollate + * Create a new database + * Do not use function xxx_create_db (xxx=mysql, ...) as they are deprecated + * We force to create database with charset this->forcecharset and collate this->forcecollate * - * @param string $database Database name to create - * @param string $charset Charset used to store data - * @param string $collation Charset used to sort data - * @param string $owner Username of database owner - * @return resource resource defined if OK, null if KO + * @param string $database Database name to create + * @param string $charset Charset used to store data + * @param string $collation Charset used to sort data + * @param string $owner Username of database owner + * @return resource resource defined if OK, null if KO */ function DDLCreateDb($database, $charset = '', $collation = '', $owner = ''); /** - * Return version of database server into an array + * Return version of database server into an array * - * @return array Version array + * @return array Version array */ function getVersionArray(); /** * Convert a SQL request in Mysql syntax to native syntax * - * @param string $line SQL request line to convert - * @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...) - * @return string SQL request line converted + * @param string $line SQL request line to convert + * @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...) + * @return string SQL request line converted */ static function convertSQLFromMysql($line, $type = 'ddl'); /** - * Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE + * Renvoie le nombre de lignes dans le resultat d'une requete INSERT, DELETE ou UPDATE * - * @param resource $resultset Curseur de la requete voulue - * @return int Nombre de lignes - * @see num_rows + * @param resource $resultset Curseur de la requete voulue + * @return int Nombre de lignes + * @see num_rows */ function affected_rows($resultset); /** - * Return description of last error + * Return description of last error * - * @return string Error text + * @return string Error text */ function error(); /** * Return label of manager * - * @return string Label + * @return string Label */ function getLabel(); @@ -128,58 +128,58 @@ interface Database function DDLListTables($database, $table = ''); /** - * Return last request executed with query() + * Return last request executed with query() * - * @return string Last query + * @return string Last query */ function lastquery(); /** * Define sort criteria of request * - * @param string $sortfield List of sort fields - * @param string $sortorder Sort order - * @return string String to provide syntax of a sort sql string + * @param string $sortfield List of sort fields + * @param string $sortorder Sort order + * @return string String to provide syntax of a sort sql string */ function order($sortfield = 0, $sortorder = 0); /** - * Decrypt sensitive data in database + * Decrypt sensitive data in database * * @param string $value Value to decrypt - * @return string Decrypted value if used + * @return string Decrypted value if used */ function decrypt($value); /** * Return datas as an array * - * @param resource $resultset Resultset of request - * @return array Array + * @param resource $resultset Resultset of request + * @return array Array */ function fetch_array($resultset); /** - * Return last error label + * Return last error label * - * @return string lasterror + * @return string lasterror */ function lasterror(); /** - * Escape a string to insert data + * Escape a string to insert data * - * @param string $stringtoencode String to escape - * @return string String escaped + * @param string $stringtoencode String to escape + * @return string String escaped */ function escape($stringtoencode); /** * Get last ID after an insert INSERT * - * @param string $tab Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql - * @param string $fieldid Field name - * @return int Id of row + * @param string $tab Table name concerned by insert. Ne sert pas sous MySql mais requis pour compatibilite avec Postgresql + * @param string $fieldid Field name + * @return int Id of row */ function last_insert_id($tab, $fieldid = 'rowid'); @@ -193,186 +193,186 @@ interface Database /** * Annulation d'une transaction et retour aux anciennes valeurs * - * @param string $log Add more log to default log line - * @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur + * @param string $log Add more log to default log line + * @return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur */ function rollback($log = ''); /** * Execute a SQL request and return the resultset * - * @param string $query SQL query string - * @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions). + * @param string $query SQL query string + * @param int $usesavepoint 0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions). * Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints. * @param string $type Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...) - * @return resource Resultset of answer + * @return resource Resultset of answer */ function query($query, $usesavepoint = 0, $type = 'auto'); /** * Connexion to server * - * @param string $host database server host - * @param string $login login - * @param string $passwd password - * @param string $name name of database (not used for mysql, used for pgsql) - * @param string $port Port of database server - * @return resource Database access handler - * @see close + * @param string $host database server host + * @param string $login login + * @param string $passwd password + * @param string $name name of database (not used for mysql, used for pgsql) + * @param string $port Port of database server + * @return resource Database access handler + * @see close */ function connect($host, $login, $passwd, $name, $port = 0); /** * Define limits and offset of request * - * @param int $limit Maximum number of lines returned (-1=conf->liste_limit, 0=no limit) - * @param int $offset Numero of line from where starting fetch - * @return string String with SQL syntax to add a limit and offset + * @param int $limit Maximum number of lines returned (-1=conf->liste_limit, 0=no limit) + * @param int $offset Numero of line from where starting fetch + * @return string String with SQL syntax to add a limit and offset */ function plimit($limit = 0, $offset = 0); /** * Return value of server parameters * - * @param string $filter Filter list on a particular value - * @return array Array of key-values (key=>value) + * @param string $filter Filter list on a particular value + * @return array Array of key-values (key=>value) */ function getServerParametersValues($filter = ''); /** - * Return value of server status + * Return value of server status * - * @param string $filter Filter list on a particular value - * @return array Array of key-values (key=>value) + * @param string $filter Filter list on a particular value + * @return array Array of key-values (key=>value) */ function getServerStatusValues($filter = ''); /** - * Return collation used in database + * Return collation used in database * - * @return string Collation value + * @return string Collation value */ function getDefaultCollationDatabase(); /** - * Return number of lines for result of a SELECT + * Return number of lines for result of a SELECT * - * @param resource $resultset Resulset of requests - * @return int Nb of lines - * @see affected_rows + * @param resource $resultset Resulset of requests + * @return int Nb of lines + * @see affected_rows */ function num_rows($resultset); /** - * Return full path of dump program + * Return full path of dump program * * @return string Full path of dump program */ function getPathOfDump(); /** - * Return version of database client driver + * Return version of database client driver * * @return string Version string */ function getDriverInfo(); /** - * Return generic error code of last operation. + * Return generic error code of last operation. * * @return string Error code (Exemples: DB_ERROR_TABLE_ALREADY_EXISTS, DB_ERROR_RECORD_ALREADY_EXISTS...) */ function errno(); /** - * Create a table into database + * Create a table into database * - * @param string $table Nom de la table - * @param array $fields Tableau associatif [nom champ][tableau des descriptions] - * @param string $primary_key Nom du champ qui sera la clef primaire - * @param string $type Type de la table - * @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur - * @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext - * @param string $keys Tableau des champs cles noms => valeur - * @return int <0 if KO, >=0 if OK + * @param string $table Nom de la table + * @param array $fields Tableau associatif [nom champ][tableau des descriptions] + * @param string $primary_key Nom du champ qui sera la clef primaire + * @param string $type Type de la table + * @param array $unique_keys Tableau associatifs Nom de champs qui seront clef unique => valeur + * @param array $fulltext_keys Tableau des Nom de champs qui seront indexes en fulltext + * @param string $keys Tableau des champs cles noms => valeur + * @return int <0 if KO, >=0 if OK */ function DDLCreateTable($table, $fields, $primary_key, $type, $unique_keys = "", $fulltext_keys = "", $keys = ""); /** - * Return list of available charset that can be used to store data in database + * Return list of available charset that can be used to store data in database * * @return array List of Charset */ function getListOfCharacterSet(); /** - * Create a new field into table + * Create a new field into table * - * @param string $table Name of table - * @param string $field_name Name of field to add - * @param string $field_desc Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre] - * @param string $field_position Optionnel ex.: "after champtruc" - * @return int <0 if KO, >0 if OK + * @param string $table Name of table + * @param string $field_name Name of field to add + * @param string $field_desc Tableau associatif de description du champ a inserer[nom du parametre][valeur du parametre] + * @param string $field_position Optionnel ex.: "after champtruc" + * @return int <0 if KO, >0 if OK */ function DDLAddField($table, $field_name, $field_desc, $field_position = ""); /** - * Drop a field from table + * Drop a field from table * - * @param string $table Name of table - * @param string $field_name Name of field to drop - * @return int <0 if KO, >0 if OK + * @param string $table Name of table + * @param string $field_name Name of field to drop + * @return int <0 if KO, >0 if OK */ function DDLDropField($table, $field_name); /** - * Update format of a field into a table + * Update format of a field into a table * - * @param string $table Name of table - * @param string $field_name Name of field to modify - * @param string $field_desc Array with description of field format - * @return int <0 if KO, >0 if OK + * @param string $table Name of table + * @param string $field_name Name of field to modify + * @param string $field_desc Array with description of field format + * @return int <0 if KO, >0 if OK */ function DDLUpdateField($table, $field_name, $field_desc); /** - * Return list of available collation that can be used for database + * Return list of available collation that can be used for database * - * @return array List of Collation + * @return array List of Collation */ function getListOfCollation(); /** - * Return a pointer of line with description of a table or field + * Return a pointer of line with description of a table or field * - * @param string $table Name of table - * @param string $field Optionnel : Name of field if we want description of field - * @return resource Resource + * @param string $table Name of table + * @param string $field Optionnel : Name of field if we want description of field + * @return resource Resource */ function DDLDescTable($table, $field = ""); /** - * Return version of database server + * Return version of database server * - * @return string Version string + * @return string Version string */ function getVersion(); /** - * Return charset used to store data in database + * Return charset used to store data in database * - * @return string Charset + * @return string Charset */ function getDefaultCharacterSetDatabase(); /** - * Create a user and privileges to connect to database (even if database does not exists yet) + * Create a user and privileges to connect to database (even if database does not exists yet) * - * @param string $dolibarr_main_db_host Ip serveur - * @param string $dolibarr_main_db_user Nom user a creer - * @param string $dolibarr_main_db_pass Mot de passe user a creer - * @param string $dolibarr_main_db_name Database name where user must be granted - * @return int <0 if KO, >=0 if OK + * @param string $dolibarr_main_db_host Ip serveur + * @param string $dolibarr_main_db_user Nom user a creer + * @param string $dolibarr_main_db_pass Mot de passe user a creer + * @param string $dolibarr_main_db_name Database name where user must be granted + * @return int <0 if KO, >=0 if OK */ function DDLCreateUser( $dolibarr_main_db_host, @@ -382,85 +382,85 @@ interface Database ); /** - * Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true) - * 19700101020000 -> 3600 with TZ+1 and gmt=0 - * 19700101020000 -> 7200 whaterver is TZ if gmt=1 + * Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true) + * 19700101020000 -> 3600 with TZ+1 and gmt=0 + * 19700101020000 -> 7200 whaterver is TZ if gmt=1 * - * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS) - * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ - * @return timestamp|string Date TMS + * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS) + * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ + * @return int|string Date TMS or '' */ function jdate($string, $gm=false); /** - * Encrypt sensitive data in database - * Warning: This function includes the escape, so it must use direct value + * Encrypt sensitive data in database + * Warning: This function includes the escape, so it must use direct value * - * @param string $fieldorvalue Field name or value to encrypt - * @param int $withQuotes Return string with quotes - * @return string XXX(field) or XXX('value') or field or 'value' + * @param string $fieldorvalue Field name or value to encrypt + * @param int $withQuotes Return string with quotes + * @return string XXX(field) or XXX('value') or field or 'value' */ function encrypt($fieldorvalue, $withQuotes = 0); /** * Validate a database transaction * - * @param string $log Add more log to default log line - * @return int 1 if validation is OK or transaction level no started, 0 if ERROR + * @param string $log Add more log to default log line + * @return int 1 if validation is OK or transaction level no started, 0 if ERROR */ function commit($log = ''); /** - * List information of columns into a table. + * List information of columns into a table. * - * @param string $table Name of table - * @return array Tableau des informations des champs de la table + * @param string $table Name of table + * @return array Array with inforation on table */ function DDLInfoTable($table); /** - * Free last resultset used. + * Free last resultset used. * - * @param resource $resultset Curseur de la requete voulue - * @return void + * @param resource $resultset Fre cursor + * @return void */ function free($resultset = 0); /** - * Close database connexion + * Close database connexion * - * @return boolean True if disconnect successfull, false otherwise - * @see connect + * @return boolean True if disconnect successfull, false otherwise + * @see connect */ function close(); /** - * Return last query in error + * Return last query in error * - * @return string lastqueryerror + * @return string lastqueryerror */ function lastqueryerror(); /** * Return connexion ID * - * @return string Id connexion + * @return string Id connexion */ function DDLGetConnectId(); /** - * Renvoie la ligne courante (comme un objet) pour le curseur resultset + * Renvoie la ligne courante (comme un objet) pour le curseur resultset * - * @param resource $resultset Curseur de la requete voulue - * @return Object Object result line or false if KO or end of cursor + * @param resource $resultset Curseur de la requete voulue + * @return Object Object result line or false if KO or end of cursor */ function fetch_object($resultset); /** - * Select a database + * Select a database * - * @param string $database Name of database - * @return boolean true if OK, false if KO + * @param string $database Name of database + * @return boolean true if OK, false if KO */ function select_db($database); diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php index c7177475a34..0aae168be79 100644 --- a/htdocs/core/db/DoliDB.class.php +++ b/htdocs/core/db/DoliDB.class.php @@ -82,7 +82,7 @@ abstract class DoliDB implements Database * Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field. * Function to use to build INSERT, UPDATE or WHERE predica * - * @param string $param Date TMS to convert + * @param int $param Date TMS to convert * @return string Date in a string YYYYMMDDHHMMSS */ function idate($param) @@ -271,7 +271,7 @@ abstract class DoliDB implements Database * * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS) * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ - * @return int|string Date TMS + * @return int|string Date TMS or '' */ function jdate($string, $gm=false) { From 2627662f5c52c3e8da959b6121c586e238cf804d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 11:36:31 +0200 Subject: [PATCH 328/412] fix value ust be a string --- htdocs/comm/action/class/ical.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php index e7bddb8bd7e..54f97fa2117 100644 --- a/htdocs/comm/action/class/ical.class.php +++ b/htdocs/comm/action/class/ical.class.php @@ -220,8 +220,8 @@ class ICal } if (($key == "DTSTAMP") or ($key == "LAST-MODIFIED") or ($key == "CREATED")) $value = $this->ical_date_to_unix($value); - if ($key == "RRULE" ) $value = $this->ical_rrule($value); - + //if ($key == "RRULE" ) $value = $this->ical_rrule($value); + if (stristr($key,"DTSTART") or stristr($key,"DTEND") or stristr($key,"DTSTART;VALUE=DATE") or stristr($key,"DTEND;VALUE=DATE")) { if (stristr($key,"DTSTART;VALUE=DATE") or stristr($key,"DTEND;VALUE=DATE")) From a5c74a7d959cdb3ad3824450a6ddab51e0584696 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 11:59:58 +0200 Subject: [PATCH 329/412] Clean code --- htdocs/core/class/dolprintipp.class.php | 95 +------------------------ htdocs/printing/index.php | 4 +- 2 files changed, 3 insertions(+), 96 deletions(-) diff --git a/htdocs/core/class/dolprintipp.class.php b/htdocs/core/class/dolprintipp.class.php index 252b742cc9d..4b934b331f3 100644 --- a/htdocs/core/class/dolprintipp.class.php +++ b/htdocs/core/class/dolprintipp.class.php @@ -18,7 +18,7 @@ /** * \file htdocs/core/class/dolprintipp.class.php - * \brief A set of functions for using printIPP + * \brief List jobs printed with driver printipp */ /** @@ -57,78 +57,6 @@ class dolprintIPP } - /** - * Return list of available printers - * - * @return array list of printers - */ - function getlist_available_printers() - { - global $conf,$db; - include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php'; - $ipp = new CupsPrintIPP(); - $ipp->setLog(DOL_DATA_ROOT.'/printipp.log','file',3); // logging very verbose - $ipp->setHost($this->host); - $ipp->setPort($this->port); - $ipp->setUserName($this->userid); - if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password); - $ipp->getPrinters(); - return $ipp->available_printers; - } - - /** - * Print selected file - * - * @param string $file file - * @param string $module module - * - * @return string '' if OK, Error message if KO - */ - function print_file($file, $module) - { - global $conf,$db; - - include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php'; - - $ipp = new CupsPrintIPP(); - $ipp->setLog(DOL_DATA_ROOT.'/dolibarr_printipp.log','file',3); // logging very verbose - $ipp->setHost($this->host); - $ipp->setPort($this->port); - $ipp->setJobName($file,true); - $ipp->setUserName($this->userid); - if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password); - - // select printer uri for module order, propal,... - $sql = 'SELECT rowid,printer_uri,copy FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"'; - $result = $this->db->query($sql); - if ($result) - { - $obj = $this->db->fetch_object($result); - if ($obj) - { - $ipp->setPrinterURI($obj->printer_uri); - } - else - { - if (! empty($conf->global->PRINTIPP_URI_DEFAULT)) - { - $ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT); - } - else - { - return 'NoDefaultPrinterDefined'; - } - } - } - - // Set number of copy - $ipp->setCopies($obj->copy); - $ipp->setData(DOL_DATA_ROOT.'/'.$module.'/'.$file); - $ipp->printJob(); - - return ''; - } - /** * List jobs print * @@ -191,25 +119,4 @@ class dolprintIPP print "
    use_javascript_ajax) { ?> diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php index 1668e4f4c67..ba3da7b443c 100644 --- a/htdocs/admin/tools/export.php +++ b/htdocs/admin/tools/export.php @@ -88,10 +88,10 @@ if (!empty($MemoryLimit)) $form=new Form($db); $formfile = new FormFile($db); -$help_url='EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad'; -llxHeader('','',$help_url); +//$help_url='EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad'; +//llxHeader('','',$help_url); -print_fiche_titre($langs->trans("Backup"),'','setup'); +//print_fiche_titre($langs->trans("Backup"),'','setup'); // Start with empty buffer @@ -165,13 +165,18 @@ if ($what == 'mysql') $paramclear.=' -p"'.str_replace(array('"','`'),array('\"','\`'),$dolibarr_main_db_pass).'"'; } + $_SESSION["commandbackuplastdone"]=$command." ".$paramcrypted; + $_SESSION["commandbackuptorun"]=""; + /* print ''.$langs->trans("RunCommandSummary").':
    '."\n"; print '
    '."\n"; print '
    '; + //print $paramclear; // Now run command and show result print ''.$langs->trans("BackupResult").': '; + */ $errormsg=''; @@ -264,6 +269,9 @@ if ($what == 'mysqlnobin') { backup_tables($outputfile); } + + $_SESSION["commandbackuplastdone"]=""; + $_SESSION["commandbackuptorun"]=""; } // POSTGRESQL @@ -320,7 +328,9 @@ if ($what == 'postgresql') $paramcrypted.=" -w ".$dolibarr_main_db_name; $paramclear.=" -w ".$dolibarr_main_db_name; - print $langs->trans("RunCommandSummaryToLaunch").':
    '."\n"; + $_SESSION["commandbackuplastdone"]=""; + $_SESSION["commandbackuptorun"]=$command." ".$paramcrypted; + /*print $langs->trans("RunCommandSummaryToLaunch").':
    '."\n"; print '
    '."\n"; print '
    '; @@ -330,7 +340,7 @@ if ($what == 'postgresql') print $langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user); print '
    '; - print '
    '; + print '
    ';*/ $what=''; } @@ -339,34 +349,46 @@ if ($what == 'postgresql') // Si on a demande une generation -if ($what) -{ +//if ($what) +//{ if ($errormsg) { + setEventMessage($langs->trans("Error")." : ".$errormsg, 'errors'); + /* print '
    '.$langs->trans("Error")." : ".$errormsg.'
    '; - // print ''.$langs->trans("DownloadErrorFile").'
    '; - print '
    '; print '
    '; + print '
    ';*/ } else - { - print '
    '; - print $langs->trans("BackupFileSuccessfullyCreated").'.
    '; - print $langs->trans("YouCanDownloadBackupFile"); - print '
    '; - print '
    '; + { + if ($what) + { + setEventMessage($langs->trans("BackupFileSuccessfullyCreated").'.
    '.$langs->trans("YouCanDownloadBackupFile")); + /*print '
    '; + print $langs->trans("BackupFileSuccessfullyCreated").'.
    '; + print $langs->trans("YouCanDownloadBackupFile"); + print '
    '; + print '
    ';*/ + } + else + { + setEventMessage($langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user)); + } } -} +//} +/* $filearray=dol_dir_list($conf->admin->dir_output.'/backup','files',0,'','',$sortfield,(strtolower($sortorder)=='asc'?SORT_ASC:SORT_DESC),1); $result=$formfile->list_of_documents($filearray,null,'systemtools','',1,'backup/',1,0,($langs->trans("NoBackupFileAvailable").'
    '.$langs->trans("ToBuildBackupFileClickHere",DOL_URL_ROOT.'/admin/tools/dolibarr_export.php')),0,$langs->trans("PreviousDumpFiles")); print '
    '; +*/ + +// Redirect t backup page +header("Location: dolibarr_export.php"); $time_end = time(); -llxFooter(); - $db->close(); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 3d767ba8524..b24e108c80f 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1018,14 +1018,14 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma NoEventFoundWithCriteria=No security event has been found for such search criterias. SeeLocalSendMailSetup=See your local sendmail setup BackupDesc=To make a complete backup of Dolibarr, you must: -BackupDesc2=* Save content of documents directory (%s) that contains all uploaded and generated files (you can make a zip for example). -BackupDesc3=* Save content of your database into a dump file. For this, you can use following assistant. +BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (you can make a zip for example). +BackupDesc3=Save content of your database (%s) into a dump file. For this, you can use following assistant. BackupDescX=Archived directory should be stored in a secure place. BackupDescY=The generated dump file should be stored in a secure place. BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one RestoreDesc=To restore a Dolibarr backup, you must: -RestoreDesc2=* Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s). -RestoreDesc3=* Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation. Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant. +RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (%s). +RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (%s). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant. RestoreMySQL=MySQL import ForcedToByAModule= This rule is forced to %s by an activated module PreviousDumpFiles=Available database backup dump files @@ -1616,3 +1616,4 @@ ListOfNotificationsPerContact=List of notifications per contact* ListOfFixedNotifications=List of fixed notifications GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses Threshold=Threshold +BackupDumpWizard=Wizard to build database backup dump file diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 0537d13b80d..b356f570cba 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -269,7 +269,7 @@ input, textarea, select { border-bottom:solid 1px rgba(0,0,0,.2); /* box-shadow: 1px 1px 1px rgba(0,0,0,.2) inset;*/ padding:4px; - margin-left:1px; + margin-left:0px; margin-bottom:1px; margin-top:1px; } From afecab3f39fb7cffc9e80b445c804dbde175a546 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Apr 2015 18:42:07 +0200 Subject: [PATCH 313/412] Better error management for dol_uncompress --- htdocs/core/lib/files.lib.php | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index 8cf4bb3473e..bb8d9c9adfd 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -1261,19 +1261,40 @@ function dol_compress_file($inputfile, $outputfile, $mode="gz") */ function dol_uncompress($inputfile,$outputdir) { - global $conf; + global $conf, $langs; if (defined('ODTPHP_PATHTOPCLZIP')) { + dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".constant('ODTPHP_PATHTOPCLZIP').", so we use Pclzip to unzip into ".$outputdir); include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php'; $archive = new PclZip($inputfile); - if ($archive->extract(PCLZIP_OPT_PATH, $outputdir) == 0) return array('error'=>$archive->errorInfo(true)); - else return array(); + $result=$archive->extract(PCLZIP_OPT_PATH, $outputdir); + //var_dump($result); + if (! is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true)); + else + { + $ok=1; $errmsg=''; + // Loop on each file to check result for unzipping file + foreach($result as $key => $val) + { + if ($val['status'] == 'path_creation_fail') + { + $langs->load("errors"); + $ok=0; + $errmsg=$langs->trans("ErrorFailToCreateDir", $val['filename']); + break; + } + } + + if ($ok) return array(); + else return array('error'=>$errmsg); + } } if (class_exists('ZipArchive')) { - $zip = new ZipArchive; + dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir); + $zip = new ZipArchive; $res = $zip->open($inputfile); if ($res === TRUE) { From 106a39305496e80fcd46e533842863c03a3a2a9c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Apr 2015 23:42:56 +0200 Subject: [PATCH 314/412] NEW Add function dolCopyDir to copy directory with recursive content. --- htdocs/core/lib/files.lib.php | 75 +++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index bb8d9c9adfd..d9bae4b5ecb 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -477,15 +477,19 @@ function dol_filemtime($pathoffile) * * @param string $srcfile Source file (can't be a directory) * @param string $destfile Destination file (can't be a directory) - * @param int $newmask Mask for new file (0 by default means $conf->global->MAIN_UMASK) + * @param int $newmask Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666' * @param int $overwriteifexists Overwrite file if exists (1 by default) * @return int <0 if error, 0 if nothing done (dest file already exists and overwriteifexists=0), >0 if OK + * @see dolCopyr */ function dol_copy($srcfile, $destfile, $newmask=0, $overwriteifexists=1) { global $conf; dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists); + + if (empty($srcfile) || empty($destfile)) return -1; + $destexists=dol_is_file($destfile); if (! $overwriteifexists && $destexists) return 0; @@ -523,12 +527,77 @@ function dol_copy($srcfile, $destfile, $newmask=0, $overwriteifexists=1) return 1; } +/** + * Copy a dir to another dir. + * + * @param string $srcfile Source file (a directory) + * @param string $destfile Destination file (a directory) + * @param int $newmask Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666' + * @param int $overwriteifexists Overwrite file if exists (1 by default) + * @return int <0 if error, 0 if nothing done (dest dir already exists and overwriteifexists=0), >0 if OK + * @see dol_copy + */ +function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists) +{ + global $conf; + + $result=0; + + dol_syslog("files.lib.php::dolCopyr srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists); + + if (empty($srcfile) || empty($destfile)) return -1; + + $destexists=dol_is_dir($destfile); + if (! $overwriteifexists && $destexists) return 0; + + $srcfile=dol_osencode($srcfile); + $destfile=dol_osencode($destfile); + + // recursive function to copy + // all subdirectories and contents: + if (is_dir($srcfile)) + { + $dir_handle=opendir($srcfile); + while ($file=readdir($dir_handle)) + { + if ($file!="." && $file!="..") + { + if (is_dir($srcfile."/".$file)) + { + if (!is_dir($destfile."/".$file)) + { + umask(0); + $dirmaskdec=octdec($newmask); + if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK); + $dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files + dol_mkdir($destfile."/".$file, '', decoct($dirmaskdec)); + } + $result=dolCopyDir($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists); + } + else + { + $result=dol_copy($srcfile."/".$file, $destfile."/".$file, $newmask, $overwriteifexists); + } + if ($result < 0) break; + } + } + closedir($dir_handle); + } + else + { + $result=dol_copy($srcfile, $destfile, $newmask, $overwriteifexists); + } + + return $result; +} + + /** * Move a file into another name. * This function differs from dol_move_uploaded_file, because it can be called in any context. * - * @param string $srcfile Source file (can't be a directory) - * @param string $destfile Destination file (can't be a directory) + * @param string $srcfile Source file (can't be a directory. use native php @rename() to move a directory) + * @param string $destfile Destination file (can't be a directory. use native php @rename() to move a directory) * @param string $newmask Mask for new file (0 by default means $conf->global->MAIN_UMASK) * @param int $overwriteifexists Overwrite file if exists (1 by default) * @return boolean True if OK, false if KO From 2ec5595277eb0e3c5a4a3e042b5ffac04fa4d065 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Apr 2015 00:19:03 +0200 Subject: [PATCH 315/412] NEW Can install an external module from admin pages, if web server has permission for and if setup is ok for. --- htdocs/admin/tools/update.php | 164 +++++++++++++++--- htdocs/core/lib/functions.lib.php | 7 +- .../modules/syslog/mod_syslog_chromephp.php | 2 +- htdocs/langs/en_US/admin.lang | 7 +- 4 files changed, 150 insertions(+), 30 deletions(-) diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php index 7c85f820eab..27799ff1e93 100644 --- a/htdocs/admin/tools/update.php +++ b/htdocs/admin/tools/update.php @@ -29,6 +29,8 @@ include_once DOL_DOCUMENT_ROOT . '/core/lib/geturl.lib.php'; $langs->load("admin"); $langs->load("other"); +$action=GETPOST('action','alpha'); + if (! $user->admin) accessforbidden(); if (GETPOST('msg','alpha')) { @@ -43,14 +45,18 @@ $dolibarrroot=preg_replace('/([\\/]+)$/i','',DOL_DOCUMENT_ROOT); $dolibarrroot=preg_replace('/([^\\/]+)$/i','',$dolibarrroot); $dolibarrdataroot=preg_replace('/([\\/]+)$/i','',DOL_DATA_ROOT); +$dirins=DOL_DOCUMENT_ROOT.'/custom'; + + /* * Actions */ -if (GETPOST('action','alpha')=='install') +if ($action=='install') { $error=0; + // $original_file should match format module_modulename-x.y[.z].zip $original_file=basename($_FILES["fileinstall"]["name"]); $newfile=$conf->admin->dir_temp.'/'.$original_file.'/'.$original_file; @@ -72,33 +78,87 @@ if (GETPOST('action','alpha')=='install') if (! $error) { - @dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$original_file); - dol_mkdir($conf->admin->dir_temp.'/'.$original_file); + if ($original_file) + { + @dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$original_file); + dol_mkdir($conf->admin->dir_temp.'/'.$original_file); + } + + $tmpdir=preg_replace('/\.zip$/','',$original_file).'.dir'; + if ($tmpdir) + { + @dol_delete_dir_recursive($conf->admin->dir_temp.'/'.$tmpdir); + dol_mkdir($conf->admin->dir_temp.'/'.$tmpdir); + } $result=dol_move_uploaded_file($_FILES['fileinstall']['tmp_name'],$newfile,1,0,$_FILES['fileinstall']['error']); if ($result > 0) { - $documentrootalt=DOL_DOCUMENT_ROOT.'/extensions'; - $result=dol_uncompress($newfile,$documentrootalt); + $result=dol_uncompress($newfile,$conf->admin->dir_temp.'/'.$tmpdir); + if (! empty($result['error'])) { $langs->load("errors"); setEventMessage($langs->trans($result['error'],$original_file), 'errors'); + $error++; } else { - setEventMessage($langs->trans("SetupIsReadyForUse")); + // Now we move the dir of the module + $modulename=preg_replace('/module_/', '', $original_file); + $modulename=preg_replace('/\-[\d]+\.[\d]+.*$/', '', $modulename); + // Search dir $modulename + $modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/'.$modulename; + //var_dump($modulenamedir); + if (! dol_is_dir($modulenamedir)) + { + $modulenamedir=$conf->admin->dir_temp.'/'.$tmpdir.'/htdocs/'.$modulename; + //var_dump($modulenamedir); + if (! dol_is_dir($modulenamedir)) + { + setEventMessage($langs->trans("ErrorModuleFileSeemsToHaveAWrongFormat"), 'errors'); + $error++; + } + } + + if (! $error) + { + //var_dump($dirins); + @dol_delete_dir_recursive($dirins.'/'.$modulename); + $result=dolCopyDir($modulenamedir, $dirins.'/'.$modulename, '0444', 1); + if ($result <= 0) + { + setEventMessage($langs->trans("ErrorFailedToCopy"), 'errors'); + $error++; + } + } } } + else + { + $error++; + } + } + + if (! $error) + { + setEventMessage($langs->trans("SetupIsReadyForUse")); } } + /* * View */ -$dirins=DOL_DOCUMENT_ROOT.'/extensions'; -$dirins_ok=(is_dir($dirins)); + + +// Set dir where external modules are installed +if (! dol_is_dir($dirins)) +{ + dol_mkdir($dirins); +} +$dirins_ok=(dol_is_dir($dirins)); $wikihelp='EN:Installation_-_Upgrade|FR:Installation_-_Mise_à_jour|ES:Instalación_-_Actualización'; llxHeader('',$langs->trans("Upgrade"),$wikihelp); @@ -143,6 +203,8 @@ else } print '
    '; + +// Upgrade print $langs->trans("Upgrade").'
    '; print '
    '; print $langs->trans("ThisIsProcessToFollow").'
    '; @@ -162,20 +224,76 @@ print $langs->trans("RestoreLock",$dolibarrdataroot.'/install.lock').'
    '; print '
    '; print '
    '; + +// Install external module + +$allowonlineinstall=true; +$allowfromweb=1; +if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) $allowonlineinstall=false; + $fullurl=''.$urldolibarrmodules.''; +$message=''; +if (! empty($allowonlineinstall)) +{ + if (! in_array('/custom',explode(',',$dolibarr_main_url_root_alt))) + { + $message=info_admin($langs->trans("ConfFileMuseContainCustom", DOL_DOCUMENT_ROOT.'/custom', DOL_DOCUMENT_ROOT)); + $allowfromweb=-1; + } + else + { + if ($dirins_ok) + { + if (! is_writable(dol_osencode($dirins))) + { + $langs->load("errors"); + $message=info_admin($langs->trans("ErrorFailedToWriteInDir",$dirins)); + $allowfromweb=0; + } + } + else + { + + $message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample")); + $allowfromweb=0; + } + } +} +else +{ + $message=info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile",$dolibarrdataroot.'/installmodules.lock')); + $allowfromweb=0; +} + + + + + print $langs->trans("AddExtensionThemeModuleOrOther").'
    '; print '
    '; -print $langs->trans("ThisIsProcessToFollow").'
    '; -print ''.$langs->trans("StepNb",1).': '; -print $langs->trans("FindPackageFromWebSite",$fullurl).'
    '; -print ''.$langs->trans("StepNb",2).': '; -print $langs->trans("DownloadPackageFromWebSite",$fullurl).'
    '; -print ''.$langs->trans("StepNb",3).': '; -print $langs->trans("UnpackPackageInDolibarrRoot",$dolibarrroot).'
    '; -if (! empty($conf->global->MAIN_ONLINE_INSTALL_MODULE)) + +if ($allowfromweb < 1) { - if ($dirins_ok) + print $langs->trans("SomethingMakeInstallFromWebNotPossible"); + print $message; + //print $langs->trans("SomethingMakeInstallFromWebNotPossible2"); + print '
    '; +} + + +if ($allowfromweb >= 0) +{ + if ($allowfromweb == 1) print $langs->trans("ThisIsProcessToFollow").'
    '; + else print $langs->trans("ThisIsAlternativeProcessToFollow").'
    '; + print ''.$langs->trans("StepNb",1).': '; + print $langs->trans("FindPackageFromWebSite",$fullurl).'
    '; + print ''.$langs->trans("StepNb",2).': '; + print $langs->trans("DownloadPackageFromWebSite",$fullurl).'
    '; + print ''.$langs->trans("StepNb",3).': '; + + if ($allowfromweb == 1) { + print $langs->trans("UnpackPackageInDolibarrRoot",$dirins).'
    '; print '
    '; print ''; print $langs->trans("YouCanSubmitFile").' '; @@ -184,16 +302,12 @@ if (! empty($conf->global->MAIN_ONLINE_INSTALL_MODULE)) } else { - $message=info_admin($langs->trans("NotExistsDirect",$dirins).$langs->trans("InfDirAlt").$langs->trans("InfDirExample")); - setEventMessage($message, 'warnings'); + print $langs->trans("UnpackPackageInDolibarrRoot",$dirins).'
    '; + print ''.$langs->trans("StepNb",4).': '; + print $langs->trans("SetupIsReadyForUse").'
    '; } } -else -{ - print ''.$langs->trans("StepNb",4).': '; - print $langs->trans("SetupIsReadyForUse").'
    '; -} -print '
    '; + if (! empty($result['return'])) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index f687d79bcd1..d2465afff22 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3728,9 +3728,10 @@ function get_exdir($num,$level=3,$alpha=0,$withoutslash=0) * * @param string $dir Directory to create (Separator must be '/'. Example: '/mydir/mysubdir') * @param string $dataroot Data root directory (To avoid having the data root in the loop. Using this will also lost the warning on first dir PHP has no permission when open_basedir is used) + * @param int $newmask Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0444' * @return int < 0 if KO, 0 = already exists, > 0 if OK */ -function dol_mkdir($dir, $dataroot='') +function dol_mkdir($dir, $dataroot='', $newmask=0) { global $conf; @@ -3767,8 +3768,8 @@ function dol_mkdir($dir, $dataroot='') dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.",LOG_DEBUG); umask(0); - $dirmaskdec=octdec('0755'); - if (! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK); + $dirmaskdec=octdec($newmask); + if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $dirmaskdec=octdec($conf->global->MAIN_UMASK); $dirmaskdec |= octdec('0111'); // Set x bit required for directories if (! @mkdir($ccdir_osencoded, $dirmaskdec)) { diff --git a/htdocs/core/modules/syslog/mod_syslog_chromephp.php b/htdocs/core/modules/syslog/mod_syslog_chromephp.php index 3e24901f5af..9ea39caaf50 100644 --- a/htdocs/core/modules/syslog/mod_syslog_chromephp.php +++ b/htdocs/core/modules/syslog/mod_syslog_chromephp.php @@ -55,7 +55,7 @@ class mod_syslog_chromephp extends LogHandler implements LogHandlerInterface set_include_path($conf->global->SYSLOG_CHROMEPHP_INCLUDEPATH); //print 'rrrrr'.get_include_path(); - $res = include_once('ChromePhp.php'); + $res = @include_once('ChromePhp.php'); if (! $res) $res=@include_once('ChromePhp.class.php'); restore_include_path(); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index b24e108c80f..984b9717dab 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -297,10 +297,11 @@ MenuHandlers=Menu handlers MenuAdmin=Menu editor DoNotUseInProduction=Do not use in production ThisIsProcessToFollow=This is setup to process: +ThisIsAlternativeProcessToFollow=This is an alternative setup to process: StepNb=Step %s FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s). DownloadPackageFromWebSite=Download package %s. -UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory %s +UnpackPackageInDolibarrRoot=Unpack package file into directory dedicated to external modules: %s SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component. NotExistsDirect=The alternative root directory is not defined.
    InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
    Just create a directory at the root of Dolibarr (eg: custom).
    @@ -1617,3 +1618,7 @@ ListOfFixedNotifications=List of fixed notifications GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses Threshold=Threshold BackupDumpWizard=Wizard to build database backup dump file +SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason: +SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do. +InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file %s to allow this feature. +ConfFileMuseContainCustom=Installing an external module from application save the module files into directory %s. To have this directory processed by Dolibarr, you must setup your conf/conf.php to have option
    - $dolibarr_main_url_root_alt enabled to value $dolibarr_main_url_root_alt="/custom"
    - $dolibarr_main_document_root_alt enabled to value "%s/custom" \ No newline at end of file From 9f5ba746a1695718a42ff1f9d6b7b7e76a38fd4b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Apr 2015 00:51:00 +0200 Subject: [PATCH 316/412] Update phpunit tests --- test/phpunit/BuildDocTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php index 99098c432ea..c21c482ab5e 100644 --- a/test/phpunit/BuildDocTest.php +++ b/test/phpunit/BuildDocTest.php @@ -109,7 +109,7 @@ class BuildDocTest extends PHPUnit_Framework_TestCase if (! $conf->projet->enabled) { print __METHOD__." project module not enabled\n"; die(); } if (! $conf->expedition->enabled) { print __METHOD__." shipment module not enabled\n"; die(); } if (! $conf->ficheinter->enabled) { print __METHOD__." intervention module not enabled\n"; die(); } - if (! $conf->deplacement->enabled) { print __METHOD__." trip module not enabled\n"; die(); } + if (! $conf->expensereport->enabled) { print __METHOD__." expensereport module not enabled\n"; die(); } $db->begin(); // This is to have all actions inside a transaction even if test launched without suite. From 747c780f67be76ef39862404a1a62c9e1fc50058 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Apr 2015 02:44:42 +0200 Subject: [PATCH 317/412] Enhance phpunit tests --- test/README | 14 ++++++++------ test/bootstrap.php | 3 +++ test/phpunit/phpunittest.xml | 6 ++++-- 3 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 test/bootstrap.php diff --git a/test/README b/test/README index 4a54bfaf099..44061d7c9da 100644 --- a/test/README +++ b/test/README @@ -31,21 +31,23 @@ If not using Eclipse, to install PHPUnit manually: > phpunit MyFileTest.php If using Eclipse, select the test and click on menu "Run external tools and choose PHPUnit". -* Generate a report of Unit tests code coverage among tested classes only: +* Generate a report of Unit tests code coverage done by one tested class: > cd test -> phpunit -d memory_limit=-1 -d max_input_time=600 -d max_execution_time=600 --configuration ./phpunit/phpunittest.xml --coverage-html ./report --coverage-clover ./report/logs/phpunit.coverage.xml --log-junit ./report/logs/phpunit.xml phpunit/MyClassTest.php +> phpunit -d memory_limit=-1 -d max_input_time=1800 -d max_execution_time=1800 --configuration ./phpunit/phpunittest.xml --coverage-html ./report ./report/logs/phpunit.xml phpunit/MyClassTest.php Note that xdebug must be installed for this feature to work. -* Generate a report of Unit tests code coverage among all Dolibarr classes: -Increase your PHP memory (memory_limit and suhosin.memory_limit in php.ini) to 4G. Note: Version 3.5 need 1.5G +* Generate a report of Unit tests code coverage done by all Dolibarr unit test classes: +Increase your PHP memory (memory_limit and suhosin.memory_limit in php.ini) to 4G. You can check setup with "php -i | grep memory". Note: Version 3.5 need 1.5G > cd test -> phpunit -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 --configuration ./phpunit/phpunittest.xml --coverage-html ./report --coverage-clover ./report/logs/phpunit.coverage.xml --log-junit ./report/logs/phpunit.xml phpunit/AllTests.php +> phpunit -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 --configuration ./phpunit/phpunittest.xml --coverage-html ./report ./report/logs/phpunit.xml phpunit/AllTests.php If there is a timeout before end, try this: > cd test > php -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 /usr/bin/phpunit -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 --configuration ./phpunit/phpunittest.xml --coverage-html ./report phpunit/AllTests.php -puis renice -10 du process php +puis +> sudo renice -10 idprocessphp +> php -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 /usr/bin/phpunit -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 --configuration ./phpunit/phpunittest.xml --coverage-php ./report/codecoverage.php ./report phpunit/AllTests.php PHP-CODESNIFFER diff --git a/test/bootstrap.php b/test/bootstrap.php new file mode 100644 index 00000000000..6e80411dca6 --- /dev/null +++ b/test/bootstrap.php @@ -0,0 +1,3 @@ + diff --git a/test/phpunit/phpunittest.xml b/test/phpunit/phpunittest.xml index ac4e29df3b5..d648edb6814 100644 --- a/test/phpunit/phpunittest.xml +++ b/test/phpunit/phpunittest.xml @@ -11,8 +11,8 @@ stopOnFailure="true" syntaxCheck="true"> - - + + @@ -25,6 +25,7 @@ ../../documents/ ../../htdocs/custom/ ../../htdocs/documents/custom/ + ../../htdocs/nltechno/ ../../htdocs/products/canvas/ ../../htdocs/contact/canvas/ ../../htdocs/societe/canvas/ @@ -48,6 +49,7 @@ ../../documents/ ../../htdocs/custom/ ../../htdocs/documents/custom/ + ../../htdocs/nltechno/ ../../htdocs/products/canvas/ ../../htdocs/contact/canvas/ ../../htdocs/societe/canvas/ From 678e55f9dab302fb7a10d44580fbea453019b03a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Apr 2015 04:11:54 +0200 Subject: [PATCH 318/412] We must add a viewport meta to have font visible on mobile --- htdocs/main.inc.php | 3 ++- test/README | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index da0296e4b00..e4fe0c06e8e 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -975,7 +975,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print "\n"; if (GETPOST('dol_basehref')) print ''."\n"; // Displays meta - print ''."\n"; // Evite indexation par robots + print ''."\n"; // Do not index + print ''; // Scale for mobile device print ''."\n"; if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) print ''."\n"; // Needed for Responsive Web Design $favicon=dol_buildpath('/theme/'.$conf->theme.'/img/favicon.ico',1); diff --git a/test/README b/test/README index 44061d7c9da..c2cff847c0f 100644 --- a/test/README +++ b/test/README @@ -39,15 +39,16 @@ Note that xdebug must be installed for this feature to work. * Generate a report of Unit tests code coverage done by all Dolibarr unit test classes: Increase your PHP memory (memory_limit and suhosin.memory_limit in php.ini) to 4G. You can check setup with "php -i | grep memory". Note: Version 3.5 need 1.5G > cd test -> phpunit -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 --configuration ./phpunit/phpunittest.xml --coverage-html ./report ./report/logs/phpunit.xml phpunit/AllTests.php +> phpunit -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 --configuration ./phpunit/phpunittest.xml --coverage-html ./report phpunit/AllTests.php If there is a timeout before end, try this: > cd test > php -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 /usr/bin/phpunit -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 --configuration ./phpunit/phpunittest.xml --coverage-html ./report phpunit/AllTests.php +ou +> php -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 /usr/bin/phpunit -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 --configuration ./phpunit/phpunittest.xml --coverage-php ./report/codecoverage.php phpunit/AllTests.php puis > sudo renice -10 idprocessphp -> php -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 /usr/bin/phpunit -d suhosin.memory_limit=4G -d memory_limit=-1 -d max_input_time=0 -d max_execution_time=0 --configuration ./phpunit/phpunittest.xml --coverage-php ./report/codecoverage.php ./report phpunit/AllTests.php PHP-CODESNIFFER From 4d6b7b4baec96bf52993652f3b767ba9ecd4c869 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 4 Apr 2015 04:17:07 +0200 Subject: [PATCH 319/412] Clean code --- htdocs/admin/ihm.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index cbbcad66daa..88932c0de44 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -323,8 +323,6 @@ else // Show $var=true; // Language - print_fiche_titre($langs->trans("Language"),'',''); - print '
    '; print ''; print ''; From 40860a84d17b2e54f18d68a66ca2461a3a687cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sat, 4 Apr 2015 17:28:24 +0200 Subject: [PATCH 320/412] Closes #2543: Untranslated "Contract" origin string when creating an invoice from a contract --- ChangeLog | 1 + htdocs/commande/fiche.php | 22 ++++++++++++++++++---- htdocs/compta/facture.php | 24 +++++++++++++++++------- 3 files changed, 36 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2bcf02febf8..9982226def4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ English Dolibarr ChangeLog - Fix: Bad SEPA xml file creation - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment - Fix: Showing system error if not enough stock of product into orders creation with lines +- Fix: [ bug #2543 ] Untranslated "Contract" origin string when creating an invoice from a contract ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 02e6c74c13c..9a844b0a5d5 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -7,7 +7,7 @@ * Copyright (C) 2010-2013 Juanjo Menent * Copyright (C) 2011 Philippe Grand * Copyright (C) 2012-2013 Christophe Battarel - * Copyright (C) 2012 Marcos García + * Copyright (C) 2012-2015 Marcos García * Copyright (C) 2013 Florian Henry * * This program is free software; you can redistribute it and/or modify @@ -1599,9 +1599,23 @@ if ($action == 'create' && $user->rights->commande->creer) { print ''; print ''; - $newclassname = $classname; - if ($newclassname == 'Propal') - $newclassname = 'CommercialProposal'; + switch ($classname) { + case 'Propal': + $newclassname = 'CommercialProposal'; + break; + case 'Commande': + $newclassname = 'Order'; + break; + case 'Expedition': + $newclassname = 'Sending'; + break; + case 'Contrat': + $newclassname = 'Contract'; + break; + default: + $newclassname = $classname; + } + print ''; print ''; print '"; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index a3403e0d9dd..d5c11cf5b63 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -10,6 +10,7 @@ * Copyright (C) 2013 Jean-Francois FERRY * Copyright (C) 2013-2014 Florian Henry * Copyright (C) 2013 Cédric Salvador + * Copyright (C) 2015 Marcos García * * 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 @@ -2294,13 +2295,22 @@ if ($action == 'create') print ''; print ''; - $newclassname = $classname; - if ($newclassname == 'Propal') - $newclassname = 'CommercialProposal'; - elseif ($newclassname == 'Commande') - $newclassname = 'Order'; - elseif ($newclassname == 'Expedition') - $newclassname = 'Sending'; + switch ($classname) { + case 'Propal': + $newclassname = 'CommercialProposal'; + break; + case 'Commande': + $newclassname = 'Order'; + break; + case 'Expedition': + $newclassname = 'Sending'; + break; + case 'Contrat': + $newclassname = 'Contract'; + break; + default: + $newclassname = $classname; + } print ''; print ''; From 611406b75e049623ca4640f7545dc3ec66aa6acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sat, 4 Apr 2015 17:34:06 +0200 Subject: [PATCH 321/412] Closes #2540 Bug: Incorrect HTML in "Bank account" tab of a Thirdparty --- htdocs/societe/rib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/societe/rib.php b/htdocs/societe/rib.php index ea64135bd43..d57a6e75443 100644 --- a/htdocs/societe/rib.php +++ b/htdocs/societe/rib.php @@ -4,6 +4,7 @@ * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2013 Peter Fontaine + * Copyright (C) 2015 Marcos García * * 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 @@ -382,7 +383,7 @@ if ($socid && $action != 'edit' && $action != "create") } if (count($rib_list) == 0) { - print ''; + print ''; } print '
    '.$langs->trans("Parameters").''.$langs->trans("Value").' 
    ' . $langs->trans($newclassname) . '' . $objectsrc->getNomUrl(1) . '
    ' . $langs->trans('TotalHT') . '' . price($objectsrc->total_ht) . '
    ' . $langs->trans('TotalVAT') . '' . price($objectsrc->total_tva) . "
    ' . $langs->trans($newclassname) . '' . $objectsrc->getNomUrl(1) . '
    ' . $langs->trans('TotalHT') . '' . price($objectsrc->total_ht) . '
    '.$langs->trans("NoBANRecord").'
    '.$langs->trans("NoBANRecord").'
    '; From 50091dfe8bbada8fde2e5bc318e6570eaa13b15d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sat, 4 Apr 2015 17:44:52 +0200 Subject: [PATCH 322/412] Closes #2534 SQL error when editing a supplier invoice line --- ChangeLog | 1 + htdocs/fourn/facture/fiche.php | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2bcf02febf8..66ee1ebe57a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ English Dolibarr ChangeLog - Fix: Bad SEPA xml file creation - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment - Fix: Showing system error if not enough stock of product into orders creation with lines +- Fix: [ bug #2534 ] SQL error when editing a supplier invoice line ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index e06ebfa73ca..54299b0beb8 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -7,6 +7,7 @@ * Copyright (C) 2010-2014 Juanjo Menent * Copyright (C) 2013 Philippe Grand * Copyright (C) 2013 Florian Henry + * Copyright (C) 2015 Marcos García * * 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 @@ -521,6 +522,10 @@ elseif ($action == 'update_line' && $user->rights->fournisseur->facture->creer) $localtax2_tx= get_localtax($_POST['tauxtva'], 2, $mysoc,$object->thirdparty); $remise_percent=GETPOST('remise_percent'); + if (empty($remise_percent)) { + $remise_percent = 0; + } + $result=$object->updateline(GETPOST('lineid'), $label, $pu, GETPOST('tauxtva'), $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('idprod'), $price_base_type, 0, $type, $remise_percent); if ($result >= 0) { From 5c8e92d52a8269de43753c60c080f29a797a53db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Sat, 4 Apr 2015 17:52:05 +0200 Subject: [PATCH 323/412] Closes #2535 Bug: Untranslated string in "Linked objects" page of a project --- ChangeLog | 1 + htdocs/projet/element.php | 26 +++++++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2bcf02febf8..5b4440b8567 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ English Dolibarr ChangeLog - Fix: Bad SEPA xml file creation - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment - Fix: Showing system error if not enough stock of product into orders creation with lines +- Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 5a499007fae..80a12964792 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -3,6 +3,7 @@ * Copyright (C) 2004-2010 Laurent Destailleur * Copyright (C) 2005-2010 Regis Houssin * Copyright (C) 2012 Juanjo Menent + * Copyright (C) 2015 Marcos García * * 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 @@ -415,8 +416,31 @@ foreach ($listofreferent as $key => $value) } } + switch ($classname) { + case 'FactureFournisseur': + $newclassname = 'SupplierInvoice'; + break; + case 'Facture': + $newclassname = 'Bill'; + break; + case 'Propal': + $newclassname = 'CommercialProposal'; + break; + case 'Commande': + $newclassname = 'Order'; + break; + case 'Expedition': + $newclassname = 'Sending'; + break; + case 'Contrat': + $newclassname = 'Contract'; + break; + default: + $newclassname = $classname; + } + print '
    '.$classname.''.$langs->trans($newclassname).''.$i.''.price($total_ht).''.price($total_ttc).'
    "; } - /** - * Get printer detail - * - * @param string $uri URI - * @return array List of attributes - */ - function get_printer_detail($uri) - { - global $conf,$db; - - include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php'; - $ipp = new CupsPrintIPP(); - $ipp->setLog(DOL_DATA_ROOT.'/printipp.log','file',3); // logging very verbose - $ipp->setHost($this->host); - $ipp->setPort($this->port); - $ipp->setUserName($this->userid); - if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password); - $ipp->setPrinterURI($uri); - $ipp->getPrinterAttributes(); - return $ipp->printer_attributes; - } } diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php index e8669f44585..48795fbab4c 100644 --- a/htdocs/printing/index.php +++ b/htdocs/printing/index.php @@ -30,8 +30,8 @@ llxHeader("",$langs->trans("Printing")); print_fiche_titre($langs->trans("Printing")); // List Jobs from printing modules -//$printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD); -//$printer->list_jobs('commande'); +$printer = new dolPrintIPP($db,$conf->global->PRINTIPP_HOST,$conf->global->PRINTIPP_PORT,$user->login,$conf->global->PRINTIPP_USER,$conf->global->PRINTIPP_PASSWORD); +$printer->list_jobs('commande'); llxFooter(); From 828dc2c9f411df8f9797762a51a3d212cd0d2176 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 12:22:52 +0200 Subject: [PATCH 330/412] Fix code standard --- .../core/modules/mailings/contacts1.modules.php | 2 +- .../core/modules/mailings/contacts2.modules.php | 2 +- .../core/modules/mailings/contacts3.modules.php | 2 +- .../core/modules/mailings/contacts4.modules.php | 2 +- htdocs/core/modules/mailings/example.modules.php | 4 ++-- htdocs/core/modules/mailings/fraise.modules.php | 4 ++-- .../core/modules/mailings/framboise.modules.php | 4 ++-- .../core/modules/mailings/modules_mailings.php | 6 +++--- .../modules/mailings/thirdparties.modules.php | 2 +- .../core/modules/mailings/xinputfile.modules.php | 4 ++-- .../core/modules/mailings/xinputuser.modules.php | 4 ++-- htdocs/main.inc.php | 16 ++++++++-------- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php index 3f8df87cd7a..5d218376983 100644 --- a/htdocs/core/modules/mailings/contacts1.modules.php +++ b/htdocs/core/modules/mailings/contacts1.modules.php @@ -85,7 +85,7 @@ class mailing_contacts1 extends MailingTargets * For example if this selector is used to extract 500 different * emails from a text file, this function must return 500. * - * @param string $sql Requete sql de comptage + * @param string $sql Requete sql de comptage * @return int */ function getNbOfRecipients($sql='') diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php index fe49ce56b35..b1e22110f5e 100644 --- a/htdocs/core/modules/mailings/contacts2.modules.php +++ b/htdocs/core/modules/mailings/contacts2.modules.php @@ -152,7 +152,7 @@ class mailing_contacts2 extends MailingTargets /** * Return here number of distinct emails returned by your selector. * - * @param string $sql Requete sql de comptage + * @param string $sql Requete sql de comptage * @return int */ function getNbOfRecipients($sql='') diff --git a/htdocs/core/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php index 92640291088..feeb0a2cb55 100644 --- a/htdocs/core/modules/mailings/contacts3.modules.php +++ b/htdocs/core/modules/mailings/contacts3.modules.php @@ -157,7 +157,7 @@ class mailing_contacts3 extends MailingTargets /** * Return here number of distinct emails returned by your selector. * - * @param string $sql Requete sql de comptage + * @param string $sql Requete sql de comptage * @return int Number of recipients */ function getNbOfRecipients($sql='') diff --git a/htdocs/core/modules/mailings/contacts4.modules.php b/htdocs/core/modules/mailings/contacts4.modules.php index 59355b372fe..c0a1c59c01c 100644 --- a/htdocs/core/modules/mailings/contacts4.modules.php +++ b/htdocs/core/modules/mailings/contacts4.modules.php @@ -158,7 +158,7 @@ class mailing_contacts4 extends MailingTargets /** * Return here number of distinct emails returned by your selector. * - * @param string $sql Requete sql de comptage + * @param string $sql Requete sql de comptage * @return int Number of recipients */ function getNbOfRecipients($sql='') diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php index a7eb1b0b839..428285fb20b 100644 --- a/htdocs/core/modules/mailings/example.modules.php +++ b/htdocs/core/modules/mailings/example.modules.php @@ -100,8 +100,8 @@ class mailing_example extends MailingTargets * For example if this selector is used to extract 500 different * emails from a text file, this function must return 500. * - * @param string $sql Requete sql de comptage - * @return int + * @param string $sql Requete sql de comptage + * @return int|string Number of recipient or '?' */ function getNbOfRecipients($sql='') { diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php index dd6e18dfa91..69b018080b8 100644 --- a/htdocs/core/modules/mailings/fraise.modules.php +++ b/htdocs/core/modules/mailings/fraise.modules.php @@ -86,8 +86,8 @@ class mailing_fraise extends MailingTargets * For example if this selector is used to extract 500 different * emails from a text file, this function must return 500. * - * @param string $sql Requete sql de comptage - * @return int Nb of recipients + * @param string $sql Requete sql de comptage + * @return int Nb of recipients */ function getNbOfRecipients($sql='') { diff --git a/htdocs/core/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php index c647466e796..e25ffad5f1b 100644 --- a/htdocs/core/modules/mailings/framboise.modules.php +++ b/htdocs/core/modules/mailings/framboise.modules.php @@ -150,8 +150,8 @@ class mailing_framboise extends MailingTargets * For example if this selector is used to extract 500 different * emails from a text file, this function must return 500. * - * @param string $sql Requete sql de comptage - * @return int Nb of recipients + * @param string $sql Requete sql de comptage + * @return int Nb of recipients */ function getNbOfRecipients($sql='') { diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php index 5561526a7ff..2508440c147 100644 --- a/htdocs/core/modules/mailings/modules_mailings.php +++ b/htdocs/core/modules/mailings/modules_mailings.php @@ -72,8 +72,8 @@ class MailingTargets // This can't be abstract as it is used for some method /** * Retourne nombre de destinataires * - * @param string $sql Requete sql de comptage - * @return int Nb de destinataires si ok, < 0 si erreur + * @param string $sql Sql request to count + * @return int Nb of recipient, or <0 if error */ function getNbOfRecipients($sql) { @@ -85,7 +85,7 @@ class MailingTargets // This can't be abstract as it is used for some method } else { - $this->error=$this->db->error(); + $this->error=$this->db->lasterror(); return -1; } } diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php index df8ec79f988..222711cdf65 100644 --- a/htdocs/core/modules/mailings/thirdparties.modules.php +++ b/htdocs/core/modules/mailings/thirdparties.modules.php @@ -157,7 +157,7 @@ class mailing_thirdparties extends MailingTargets * emails from a text file, this function must return 500. * * @param string $sql Requete sql de comptage - * @return int Nb of recipients + * @return int Nb of recipients */ function getNbOfRecipients($sql='') { diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php index 777621fa432..7b6f8361d24 100644 --- a/htdocs/core/modules/mailings/xinputfile.modules.php +++ b/htdocs/core/modules/mailings/xinputfile.modules.php @@ -73,8 +73,8 @@ class mailing_xinputfile extends MailingTargets * For example if this selector is used to extract 500 different * emails from a text file, this function must return 500. * - * @param string $sql Requete sql de comptage - * @return int '' means NA + * @param string $sql Sql request to count + * @return string '' means NA */ function getNbOfRecipients($sql='') { diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php index 0d01aa53912..7832d1f6a93 100644 --- a/htdocs/core/modules/mailings/xinputuser.modules.php +++ b/htdocs/core/modules/mailings/xinputuser.modules.php @@ -73,8 +73,8 @@ class mailing_xinputuser extends MailingTargets * For example if this selector is used to extract 500 different * emails from a text file, this function must return 500. * - * @param string $sql Requete sql de comptage - * @return int '' means NA + * @param string $sql Sql request to count + * @return string '' means NA */ function getNbOfRecipients($sql='') { diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index e4fe0c06e8e..d0b80db1190 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -111,17 +111,17 @@ function test_sql_and_script_inject($val, $type) /** * Security: Return true if OK, false otherwise. * - * @param string $var Variable name - * @param string $type 1=GET, 0=POST, 2=PHP_SELF - * @return boolean true if there is an injection + * @param string $var Variable name + * @param string $type 1=GET, 0=POST, 2=PHP_SELF + * @return boolean||null true if there is an injection. Stop code if injection found. */ -function analyse_sql_and_script(&$var, $type) +function analyseVarsForSqlAndScriptsInjection(&$var, $type) { if (is_array($var)) { foreach ($var as $key => $value) { - if (analyse_sql_and_script($value,$type)) + if (analyseVarsForSqlAndScriptsInjection($value,$type)) { $var[$key] = $value; } @@ -147,16 +147,16 @@ if ((defined('NOREQUIREDB') || defined('NOREQUIRETRAN')) && ! defined('NOREQUIRE if (! empty($_SERVER["PHP_SELF"])) { $morevaltochecklikepost=array($_SERVER["PHP_SELF"]); - analyse_sql_and_script($morevaltochecklikepost,2); + analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost,2); } // Sanity check on GET parameters if (! empty($_SERVER["QUERY_STRING"])) { $morevaltochecklikeget=array($_SERVER["QUERY_STRING"]); - analyse_sql_and_script($morevaltochecklikeget,1); + analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget,1); } // Sanity check on POST -analyse_sql_and_script($_POST,0); +analyseVarsForSqlAndScriptsInjection($_POST,0); // This is to make Dolibarr working with Plesk if (! empty($_SERVER['DOCUMENT_ROOT'])) set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs'); From 4da737424e8ab119e1690375c3aa7ef9e58f4f51 Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Mon, 6 Apr 2015 10:25:30 +0000 Subject: [PATCH 331/412] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- .../prelevement/class/ligneprelevement.class.php | 2 +- htdocs/core/class/CMailFile.class.php | 8 ++++++-- htdocs/core/class/commoninvoice.class.php | 6 +++--- htdocs/core/class/dolgraph.class.php | 10 +++++----- htdocs/core/class/infobox.class.php | 2 +- htdocs/core/class/ldap.class.php | 6 +++--- htdocs/core/db/sqlite.class.php | 8 ++++---- htdocs/core/lib/barcode.lib.php | 6 +++--- htdocs/core/lib/files.lib.php | 8 ++++---- htdocs/core/modules/livraison/modules_livraison.php | 4 ++-- htdocs/core/modules/printing/modules_printing.php | 2 +- htdocs/core/modules/printing/printgcp.modules.php | 6 +++--- .../supplier_invoice/pdf/pdf_canelle.modules.php | 6 +++--- .../supplier_order/modules_commandefournisseur.php | 4 ++-- htdocs/loan/class/loan.class.php | 6 +++--- .../canvas/service/actions_card_service.class.php | 2 +- htdocs/product/class/productbatch.class.php | 2 +- htdocs/societe/canvas/actions_card_common.class.php | 2 +- .../canvas/company/actions_card_company.class.php | 2 +- .../individual/actions_card_individual.class.php | 2 +- htdocs/societe/class/societe.class.php | 4 ++-- 21 files changed, 51 insertions(+), 47 deletions(-) diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php index 2b71c5c8004..16960b53c46 100644 --- a/htdocs/compta/prelevement/class/ligneprelevement.class.php +++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php @@ -61,7 +61,7 @@ class LignePrelevement * Recupere l'objet prelevement * * @param int $rowid id de la facture a recuperer - * @return void|int + * @return integer */ function fetch($rowid) { diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 61ea308df39..82d675019d1 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -516,6 +516,10 @@ class CMailFile // Encode subject according to RFC 2822 - http://en.wikipedia.org/wiki/MIME#Encoded-Word + + /** + * @param string $stringtoencode + */ function encodetorfc2822($stringtoencode) { global $conf; @@ -639,7 +643,7 @@ class CMailFile /** * Create SMTP headers (mode = 'mail') * - * @return smtp headers + * @return string headers */ function write_smtpheaders() { @@ -690,7 +694,7 @@ class CMailFile * * @param array $filename_list Array of filenames * @param array $mimefilename_list Array of mime types - * @return array mime headers + * @return string mime headers */ function write_mimeheaders($filename_list, $mimefilename_list) { diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php index 1a7ebfc34c8..9e8544bc0e9 100644 --- a/htdocs/core/class/commoninvoice.class.php +++ b/htdocs/core/class/commoninvoice.class.php @@ -188,7 +188,7 @@ abstract class CommonInvoice extends CommonObject * Return label of object status * * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto - * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) + * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @return string Label */ function getLibStatut($mode=0,$alreadypaid=-1) @@ -202,7 +202,7 @@ abstract class CommonInvoice extends CommonObject * @param int $paye Status field paye * @param int $status Id status * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto - * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) + * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @param int $type Type facture * @return string Libelle du statut */ @@ -326,7 +326,7 @@ abstract class CommonInvoice extends CommonObject * Renvoi une date limite de reglement de facture en fonction des * conditions de reglements de la facture et date de facturation * - * @param string $cond_reglement Condition of payment (code or id) to use. If 0, we use current condition. + * @param integer $cond_reglement Condition of payment (code or id) to use. If 0, we use current condition. * @return date Date limite de reglement si ok, <0 si ko */ function calculate_date_lim_reglement($cond_reglement=0) diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php index 15a0535598d..b65c5c8ede4 100644 --- a/htdocs/core/class/dolgraph.class.php +++ b/htdocs/core/class/dolgraph.class.php @@ -115,7 +115,7 @@ class DolGraph * Set Y precision * * @param float $which_prec Precision - * @return string + * @return boolean */ function SetPrecisionY($which_prec) { @@ -187,7 +187,7 @@ class DolGraph * Set y label * * @param string $label Y label - * @return boolean True + * @return boolean|null True */ function SetYLabel($label) { @@ -198,7 +198,7 @@ class DolGraph * Set width * * @param int $w Width - * @return boolean True + * @return boolean|null True */ function SetWidth($w) { @@ -554,7 +554,7 @@ class DolGraph /** * Return min value of all data * - * @return int Max value of all data + * @return double Max value of all data */ function GetFloorMinValue() { @@ -578,7 +578,7 @@ class DolGraph * * @param string $file Image file name to use to save onto disk (also used as javascript unique id) * @param string $fileurl Url path to show image if saved onto disk - * @return void + * @return integer|null */ function draw($file,$fileurl='') { diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php index 14d1bec0841..755e304abfd 100644 --- a/htdocs/core/class/infobox.class.php +++ b/htdocs/core/class/infobox.class.php @@ -30,7 +30,7 @@ class InfoBox /** * Name of positions 0=Home, 1=... * - * @return array Array with list of zones + * @return string[] Array with list of zones */ static function getListOfPagesForBoxes() { diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php index 2783c55ee03..98250ab0db1 100644 --- a/htdocs/core/class/ldap.class.php +++ b/htdocs/core/class/ldap.class.php @@ -349,7 +349,7 @@ class Ldap /** * Change ldap protocol version to use. * - * @return string version + * @return boolean version */ function setVersion() { // LDAP_OPT_PROTOCOL_VERSION est une constante qui vaut 17 @@ -360,7 +360,7 @@ class Ldap /** * changement du referrals. * - * @return string referrals + * @return boolean referrals */ function setReferrals() { // LDAP_OPT_REFERRALS est une constante qui vaut ? @@ -1314,7 +1314,7 @@ class Ldap * Convertit le temps ActiveDirectory en Unix timestamp * * @param string $value AD time to convert - * @return string Unix timestamp + * @return integer Unix timestamp */ function convert_time($value) { diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php index 88efde86394..d09ce11ca43 100644 --- a/htdocs/core/db/sqlite.class.php +++ b/htdocs/core/db/sqlite.class.php @@ -296,7 +296,7 @@ class DoliDBSqlite extends DoliDB * @param string $login login * @param string $passwd password * @param string $name name of database (not used for mysql, used for pgsql) - * @param string $port Port of database server + * @param integer $port Port of database server * @return resource Database access handler * @see close */ @@ -459,7 +459,7 @@ class DoliDBSqlite extends DoliDB /** * Return datas as an array * - * @param Resultset $resultset Resultset of request + * @param resource $resultset Resultset of request * @return array Array */ function fetch_row($resultset) @@ -511,7 +511,7 @@ class DoliDBSqlite extends DoliDB /** * Free last resultset used. * - * @param resultset $resultset Curseur de la requete voulue + * @param integer $resultset Curseur de la requete voulue * @return void */ function free($resultset=0) @@ -629,7 +629,7 @@ class DoliDBSqlite extends DoliDB * * @param string $fieldorvalue Field name or value to encrypt * @param int $withQuotes Return string with quotes - * @return return XXX(field) or XXX('value') or field or 'value' + * @return string XXX(field) or XXX('value') or field or 'value' */ function encrypt($fieldorvalue, $withQuotes=0) { diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php index 243b862ff88..778723c5f3b 100644 --- a/htdocs/core/lib/barcode.lib.php +++ b/htdocs/core/lib/barcode.lib.php @@ -61,7 +61,7 @@ else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION; * * @param string $code Code * @param string $encoding Encoding - * @param string $scale Scale + * @param integer $scale Scale * @param string $mode 'png' or 'jpg' ... * * @@ -159,7 +159,7 @@ function barcode_encode($code,$encoding) * Calculate EAN sum * * @param string $ean EAN to encode - * @return string Sum + * @return integer Sum */ function barcode_gen_ean_sum($ean) { @@ -299,7 +299,7 @@ function barcode_encode_genbarcode($code,$encoding) * @param string $mode png,gif,jpg (default='png') * @param int $total_y the total height of the image ( default: scale * 60 ) * @param array $space default: $space[top] = 2 * $scale; $space[bottom]= 2 * $scale; $space[left] = 2 * $scale; $space[right] = 2 * $scale; - * @return void + * @return string|null */ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0, $space = '') { diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php index d9bae4b5ecb..0af5e917cc5 100644 --- a/htdocs/core/lib/files.lib.php +++ b/htdocs/core/lib/files.lib.php @@ -452,7 +452,7 @@ function dol_count_nb_of_line($file) * Return size of a file * * @param string $pathoffile Path of file - * @return string File size + * @return integer File size */ function dol_filesize($pathoffile) { @@ -598,7 +598,7 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists) * * @param string $srcfile Source file (can't be a directory. use native php @rename() to move a directory) * @param string $destfile Destination file (can't be a directory. use native php @rename() to move a directory) - * @param string $newmask Mask for new file (0 by default means $conf->global->MAIN_UMASK) + * @param integer $newmask Mask for new file (0 by default means $conf->global->MAIN_UMASK) * @param int $overwriteifexists Overwrite file if exists (1 by default) * @return boolean True if OK, false if KO */ @@ -657,7 +657,7 @@ function dol_unescapefile($filename) * @param string $dest_file Target full path filename ($_FILES['field']['name']) * @param int $allowoverwrite 1=Overwrite target file if it already exists * @param int $disablevirusscan 1=Disable virus scan - * @param string $uploaderrorcode Value of PHP upload error code ($_FILES['field']['error']) + * @param integer $uploaderrorcode Value of PHP upload error code ($_FILES['field']['error']) * @param int $nohook Disable all hooks * @param string $varfiles _FILES var name * @return int >0 if OK, <0 or string if KO @@ -989,7 +989,7 @@ function dol_delete_preview($object) * This should allow "grep" search. * This feature is enabled only if option MAIN_DOC_CREATE_METAFILE is set. * - * @param Object $object Object + * @param CommonObject $object Object * @return int 0 if we did nothing, >0 success, <0 error */ function dol_meta_create($object) diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php index 22c25bcfd5f..0a439ed8fe7 100644 --- a/htdocs/core/modules/livraison/modules_livraison.php +++ b/htdocs/core/modules/livraison/modules_livraison.php @@ -42,7 +42,7 @@ abstract class ModelePDFDeliveryOrder extends CommonDocGenerator * Return list of active generation modules * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of templates */ static function liste_modeles($db,$maxfilenamelength=0) @@ -151,7 +151,7 @@ abstract class ModeleNumRefDeliveryOrder * Create object on disk * * @param DoliDB $db objet base de donnee - * @param Object $object object delivery + * @param Livraison $object object delivery * @param string $modele force le modele a utiliser ('' to not force) * @param Translate $outputlangs objet lang a utiliser pour traduction * @return int 0 if KO, 1 if OK diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php index 3b53711f58c..7bb9ac98f58 100644 --- a/htdocs/core/modules/printing/modules_printing.php +++ b/htdocs/core/modules/printing/modules_printing.php @@ -49,7 +49,7 @@ class PrintingDriver * Return list of printing driver * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of drivers */ static function listDrivers($db,$maxfilenamelength=0) diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php index 302adaeb965..a0e0d37d074 100644 --- a/htdocs/core/modules/printing/printgcp.modules.php +++ b/htdocs/core/modules/printing/printgcp.modules.php @@ -254,7 +254,7 @@ class printing_printgcp extends PrintingDriver /** * Login into Google Account * - * @return string true or false + * @return boolean true or false */ function GoogleLogin() { @@ -324,8 +324,8 @@ class printing_printgcp extends PrintingDriver * * @param string $url url to hit * @param array $postfields array of post fields - * @param array $headers array of http headers - * @return array response from curl + * @param string[] $headers array of http headers + * @return string response from curl */ private function makeCurl($url,$postfields=array(),$headers=array()) { diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index 78d7f42fab2..0880cbc58ac 100644 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -819,7 +819,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices * Show payments table * * @param PDF $pdf Object PDF - * @param Object $object Object invoice + * @param FactureFournisseur $object Object invoice * @param int $posy Position y in PDF * @param Translate $outputlangs Object langs for output * @return int <0 if KO, >0 if OK @@ -903,7 +903,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices * Show top header of page. * * @param PDF $pdf Object PDF - * @param Object $object Object to show + * @param FactureFournisseur $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output * @return void @@ -1090,7 +1090,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices * Show footer of page. Need this->emetteur object * * @param PDF $pdf PDF - * @param Object $object Object to show + * @param FactureFournisseur $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text * @return int Return height of bottom margin including footer text diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php index bc544363b39..a968955ea73 100644 --- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php @@ -44,7 +44,7 @@ abstract class ModelePDFSuppliersOrders extends CommonDocGenerator * Return list of active generation models * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of templates */ static function liste_modeles($db,$maxfilenamelength=0) @@ -143,7 +143,7 @@ abstract class ModeleNumRefSuppliersOrders * Create a document onto disk according to template model. * * @param DoliDB $db Database handler - * @param Object $object Object supplier order + * @param CommandeFournisseur $object Object supplier order * @param string $modele Force template to use ('' to not force) * @param Translate $outputlangs Object lang to use for traduction * @param int $hidedetails Hide details of lines diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index c2c0bba6381..85d0694b725 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -321,7 +321,7 @@ class Loan extends CommonObject * Return label of loan status (unpaid, paid) * * @param int $mode 0=label, 1=short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label - * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) + * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @return string Label */ function getLibStatut($mode=0,$alreadypaid=-1) @@ -334,7 +334,7 @@ class Loan extends CommonObject * * @param int $statut Id statut * @param int $mode 0=Label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Label, 5=Short label + Picto - * @param double $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) + * @param integer $alreadypaid 0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise) * @return string Label */ function LibStatut($statut,$mode=0,$alreadypaid=-1) @@ -447,7 +447,7 @@ class Loan extends CommonObject * Information on record * * @param int $id Id of record - * @return void + * @return integer|null */ function info($id) { diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index b36e7b317c6..5926beab083 100644 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -67,7 +67,7 @@ class ActionsCardService * Assign custom values for canvas (for example into this->tpl to be used by templates) * * @param string $action Type of action - * @param string $id Id of object + * @param integer $id Id of object * @param string $ref Ref of object * @return void */ diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php index d6d848b8ef1..ee49302407d 100644 --- a/htdocs/product/class/productbatch.class.php +++ b/htdocs/product/class/productbatch.class.php @@ -462,7 +462,7 @@ class Productbatch extends CommonObject /** * Return all batch detail records for given product and warehouse * - * @param obj $db database object + * @param DoliDB $db database object * @param int $fk_product_stock id product_stock for objet * @param int $with_qty doesn't return line with 0 quantity * @return int <0 if KO, >0 if OK diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php index b94262bbb52..c5389c73452 100644 --- a/htdocs/societe/canvas/actions_card_common.class.php +++ b/htdocs/societe/canvas/actions_card_common.class.php @@ -355,7 +355,7 @@ abstract class ActionsCardCommon * Assign custom values for canvas (for example into this->tpl to be used by templates) * * @param string $action Type of action - * @param string $id Id of object + * @param integer $id Id of object * @param string $ref Ref of object * @return void */ diff --git a/htdocs/societe/canvas/company/actions_card_company.class.php b/htdocs/societe/canvas/company/actions_card_company.class.php index d54af2b8bba..b2c0f82f1e0 100644 --- a/htdocs/societe/canvas/company/actions_card_company.class.php +++ b/htdocs/societe/canvas/company/actions_card_company.class.php @@ -92,7 +92,7 @@ class ActionsCardCompany extends ActionsCardCommon * Assign custom values for canvas (for example into this->tpl to be used by templates) * * @param string $action Type of action - * @param string $id Id of object + * @param integer $id Id of object * @param string $ref Ref of object * @return void */ diff --git a/htdocs/societe/canvas/individual/actions_card_individual.class.php b/htdocs/societe/canvas/individual/actions_card_individual.class.php index 2f00cd4bc27..19921b69d81 100644 --- a/htdocs/societe/canvas/individual/actions_card_individual.class.php +++ b/htdocs/societe/canvas/individual/actions_card_individual.class.php @@ -92,7 +92,7 @@ class ActionsCardIndividual extends ActionsCardCommon * Assign custom values for canvas (for example into this->tpl to be used by templates) * * @param string $action Type of action - * @param string $id Id of object + * @param integer $id Id of object * @param string $ref Ref of object * @return void */ diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 2df9ba0776f..7e2bdeef3a6 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1578,7 +1578,7 @@ class Societe extends CommonObject * * @param User $user Filtre sur un user auteur des remises * @param string $filter Filtre autre - * @param string $maxvalue Filter on max value for discount + * @param integer $maxvalue Filter on max value for discount * @return int <0 if KO, Credit note amount otherwise */ function getAvailableDiscounts($user='',$filter='',$maxvalue=0) @@ -1728,7 +1728,7 @@ class Societe extends CommonObject * @param int $withpicto Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only) * @param string $option Target of link ('', 'customer', 'prospect', 'supplier') * @param int $maxlen Max length of text - * @param string $notooltip 1=Disable tooltip + * @param integer $notooltip 1=Disable tooltip * @return string String with URL */ function getNomUrl($withpicto=0,$option='',$maxlen=0,$notooltip=0) From aca025c9eb25e9930b58472a642aaf1315a4f0e3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 13:11:33 +0200 Subject: [PATCH 332/412] Update doc --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7fefd5100b5..6e779b97463 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -44,11 +44,11 @@ Use clear commit messages with the following structure: 
     FIX|Fix #456 Short description (where #456 is number of bug fix, if it exists. In upper case to appear into ChangeLog)
 or
-CLOSE|Close #456 Short description (where #456 is number feature request, if it exists. In upper case to appear into ChangeLog)
+CLOSE|Close #456 Short description (where #456 is number of feature request, if it exists. In upper case to appear into ChangeLog)
 or
-NEW|New Short description (In upper case to appear into ChangeLog)
+NEW|New Short description (In upper case to appear into ChangeLog, use this if you add a feature not tracked, otherwise use CLOSE #456)
 or
-Short description (when the commit is not introducing feature or closing a bug)
+Short description (when the commit is not introducing feature nor closing a bug)
 
 Long description (Can span accross multiple lines).
    From fa162cb32729e16706b52b22d3d381b926850957 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 14:11:28 +0200 Subject: [PATCH 333/412] Missing field --- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 57cb8745502..5f8fed7fd14 100644 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -64,6 +64,7 @@ create table llx_payment_loan fk_user_modif integer )ENGINE=innodb; +ALTER TABLE llx_extrafields ADD COLUMN fieldrequired integer DEFAULT 0; ALTER TABLE llx_extrafields ADD COLUMN perms varchar(255) after fieldrequired; ALTER TABLE llx_extrafields ADD COLUMN list integer DEFAULT 0 after perms; From b49705d5d0af8da8422c8e6222eb0ab174314daf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 16:13:23 +0200 Subject: [PATCH 334/412] Status and amount of object should always be visible. --- htdocs/core/lib/functions.lib.php | 2 +- .../fourn/class/fournisseur.facture.class.php | 10 +++---- htdocs/fourn/facture/card.php | 15 ++++++----- htdocs/fourn/facture/contact.php | 26 ++++++++++++++++++- htdocs/fourn/facture/document.php | 24 +++++++++++++++++ htdocs/fourn/facture/info.php | 20 +++++++------- htdocs/fourn/facture/note.php | 24 +++++++++++++++++ 7 files changed, 97 insertions(+), 24 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index d2465afff22..b76db5a6d47 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3004,7 +3004,7 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou $cursymbolafter.=($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur); } } - $output=$cursymbolbefore.$output.$end.$cursymbolafter; + $output=$cursymbolbefore.$output.$end.($cursymbolafter?' ':'').$cursymbolafter; return $output; } diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index 99e9cca639c..ceb9a56b946 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -105,7 +105,7 @@ class FactureFournisseur extends CommonInvoice var $fk_incoterms; var $location_incoterms; var $libelle_incoterms; //Used into tooltip - + var $extraparams=array(); /** @@ -428,9 +428,9 @@ class FactureFournisseur extends CommonInvoice //Incoterms $this->fk_incoterms = $obj->fk_incoterms; - $this->location_incoterms = $obj->location_incoterms; + $this->location_incoterms = $obj->location_incoterms; $this->libelle_incoterms = $obj->libelle_incoterms; - + $this->extraparams = (array) json_decode($obj->extraparams, true); $this->socid = $obj->socid; @@ -1408,7 +1408,7 @@ class FactureFournisseur extends CommonInvoice */ function info($id) { - $sql = 'SELECT c.rowid, datec, tms as datem,'; + $sql = 'SELECT c.rowid, datec, tms as datem, '; $sql.= ' fk_user_author, fk_user_valid'; $sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as c'; $sql.= ' WHERE c.rowid = '.$id; @@ -1434,7 +1434,7 @@ class FactureFournisseur extends CommonInvoice } $this->date_creation = $obj->datec; $this->date_modification = $obj->datem; - //$this->date_validation = $obj->datev; Should be stored in log table + //$this->date_validation = $obj->datev; // This field is not available. Should be store into log table and using this function should be replaced with showing content of log (like for supplier orders) } $this->db->free($result); } diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php index 28fbe44fc9f..135592b9c7c 100644 --- a/htdocs/fourn/facture/card.php +++ b/htdocs/fourn/facture/card.php @@ -1964,8 +1964,9 @@ else $alreadypaid=$object->getSommePaiement(); print '
    '.$langs->trans('Status').''.$object->getLibStatut(4,$alreadypaid).'
    '.$langs->trans('AmountHT').''.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).' 
    '.$langs->trans('AmountVAT').''.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).''; + // Amount + print '
    '.$langs->trans('AmountHT').''.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->trans('AmountVAT').''.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).''; if (GETPOST('calculationrule')) $calculationrule=GETPOST('calculationrule','alpha'); else $calculationrule=(empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)?'totalofround':'roundoftotal'); if ($calculationrule == 'totalofround') $calculationrulenum=1; @@ -1982,16 +1983,16 @@ else if ($societe->localtax1_assuj=="1") //Localtax1 { print '
    '.$langs->transcountry("AmountLT1",$societe->country_code).''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).' 
    '.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->transcountry("AmountLT2",$societe->country_code).''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).' 
    '.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->trans('AmountTTC').''.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).' 
    '.$langs->trans('AmountTTC').''.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->trans('Status').''.$object->getLibStatut(4,$alreadypaid).'
    '.$langs->trans('AmountHT').''.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->trans('AmountVAT').''.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->transcountry("AmountLT1",$societe->country_code).''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->transcountry("AmountLT2",$societe->country_code).''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->trans('AmountTTC').''.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'
    "; dol_fiche_end(); diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index c7219c6e415..e6fed653421 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -168,6 +168,30 @@ if ($object->id > 0) print $form->editfieldval("Label",'label',$object->label,$object,0); print '
    '.$langs->trans('Status').''.$object->getLibStatut(4,$alreadypaid).'
    '.$langs->trans('AmountHT').''.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->trans('AmountVAT').''.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->transcountry("AmountLT1",$societe->country_code).''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->transcountry("AmountLT2",$societe->country_code).''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).'
    '.$langs->trans('AmountTTC').''.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).'

    '; print ''; diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php index e45833c53f1..7033d555c0e 100644 --- a/htdocs/fourn/facture/info.php +++ b/htdocs/fourn/facture/info.php @@ -31,11 +31,11 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php'; $langs->load('bills'); -$facid = isset($_GET["facid"])?$_GET["facid"]:''; +$id = GETPOST("facid",'int'); // Security check if ($user->societe_id) $socid=$user->societe_id; -$result = restrictedArea($user, 'fournisseur', $facid, 'facture_fourn', 'facture'); +$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture'); @@ -45,22 +45,22 @@ $result = restrictedArea($user, 'fournisseur', $facid, 'facture_fourn', 'facture llxHeader(); -$fac = new FactureFournisseur($db); -$fac->fetch($_GET["facid"]); -$fac->info($_GET["facid"]); +$object = new FactureFournisseur($db); +$object->fetch($id); +$object->info($id); $soc = new Societe($db); -$soc->fetch($fac->socid); +$soc->fetch($object->socid); -$head = facturefourn_prepare_head($fac); +$head = facturefourn_prepare_head($object); $titre=$langs->trans('SupplierInvoice'); dol_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), 0, 'bill'); print '
    '; -dol_print_object_info($fac); +dol_print_object_info($object); print '
    '; print '
    '; -$db->close(); - llxFooter(); + +$db->close(); diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index 7d68a3c5a95..3a4528d827e 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -139,6 +139,30 @@ if ($object->id > 0) print $form->editfieldval("Label",'label',$object->label,$object,0); print ''; + // Status + $alreadypaid=$object->getSommePaiement(); + print ''.$langs->trans('Status').''.$object->getLibStatut(4,$alreadypaid).''; + + // Amount + print ''.$langs->trans('AmountHT').''.price($object->total_ht,1,$langs,0,-1,-1,$conf->currency).''; + print ''.$langs->trans('AmountVAT').''.price($object->total_tva,1,$langs,0,-1,-1,$conf->currency).''; + + // Amount Local Taxes + //TODO: Place into a function to control showing by country or study better option + if ($societe->localtax1_assuj=="1") //Localtax1 + { + print ''.$langs->transcountry("AmountLT1",$societe->country_code).''; + print ''.price($object->total_localtax1,1,$langs,0,-1,-1,$conf->currency).''; + print ''; + } + if ($societe->localtax2_assuj=="1") //Localtax2 + { + print ''.$langs->transcountry("AmountLT2",$societe->country_code).''; + print ''.price($object->total_localtax2,1,$langs,0,-1,-1,$conf->currency).''; + print ''; + } + print ''.$langs->trans('AmountTTC').''.price($object->total_ttc,1,$langs,0,-1,-1,$conf->currency).''; + print ""; print '
    '; From 3d161deb17053e9e7f16cee4c400501d87bd2e36 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 16:50:26 +0200 Subject: [PATCH 335/412] Fix more robust function --- htdocs/core/lib/functions.lib.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index b76db5a6d47..e8d0cc3f254 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3010,8 +3010,7 @@ function price($amount, $form=0, $outlangs='', $trunc=1, $rounding=-1, $forcerou } /** - * Function that return a number with universal decimal format (decimal separator is '.') from - * an amount typed by a user. + * Function that return a number with universal decimal format (decimal separator is '.') from an amount typed by a user. * Function to use on each input amount before any numeric test or database insert * * @param float $amount Amount to convert/clean @@ -4992,7 +4991,15 @@ function natural_search($fields, $value, $numeric=0) } if ($newcrit != '') { - $newres .= ($i2 > 0 ? ' OR ' : '') . $field . ' '.$operator.' '.price2num($newcrit); + $numnewcrit = price2num($newcrit); + if (is_numeric($numnewcrit)) + { + $newres .= ($i2 > 0 ? ' OR ' : '') . $field . ' '.$operator.' '.$numnewcrit; + } + else + { + $newres .= ($i2 > 0 ? ' OR ' : '') . '1 = 2'; // force false + } $i2++; // a criteria was added to string } } From 19b55cb4c14251885e49124aec9ebe5fca9487c6 Mon Sep 17 00:00:00 2001 From: frederic34 Date: Mon, 6 Apr 2015 18:58:36 +0200 Subject: [PATCH 336/412] Add public note to members --- htdocs/adherents/class/adherent.class.php | 9 ++- htdocs/adherents/note.php | 65 +++---------------- htdocs/admin/ldap_members.php | 11 +++- .../install/mysql/migration/3.7.0-3.8.0.sql | 1 + htdocs/install/mysql/tables/llx_adherent.sql | 1 + htdocs/langs/en_US/admin.lang | 2 + 6 files changed, 32 insertions(+), 57 deletions(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 7a4510119dc..58593935a5f 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -7,6 +7,7 @@ * Copyright (C) 2009-2012 Regis Houssin * Copyright (C) 2014-2015 Alexandre Spangaro * Copyright (C) 2015 Marcos García + * Copyright (C) 2015 Frederic France * * 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 @@ -78,6 +79,7 @@ class Adherent extends CommonObject var $morphy; var $public; var $note_private; // Private note + var $note_public; // Public note var $statut; // -1:brouillon, 0:resilie, >=1:valide,paye var $photo; @@ -448,6 +450,7 @@ class Adherent extends CommonObject $sql.= ", phone_perso=" .($this->phone_perso?"'".$this->db->escape($this->phone_perso)."'":"null"); $sql.= ", phone_mobile=" .($this->phone_mobile?"'".$this->db->escape($this->phone_mobile)."'":"null"); $sql.= ", note_private=" .($this->note_private?"'".$this->db->escape($this->note_private)."'":"null"); + $sql.= ", note_public=" .($this->note_private?"'".$this->db->escape($this->note_public)."'":"null"); $sql.= ", photo=" .($this->photo?"'".$this->photo."'":"null"); $sql.= ", public='".$this->public."'"; $sql.= ", statut=" .$this->statut; @@ -1054,6 +1057,7 @@ class Adherent extends CommonObject global $langs; $sql = "SELECT d.rowid, d.ref_ext, d.civility as civility_id, d.firstname, d.lastname, d.societe as company, d.fk_soc, d.statut, d.public, d.address, d.zip, d.town, d.note_private,"; + $sql.= " d.note_public,"; $sql.= " d.email, d.skype, d.phone, d.phone_perso, d.phone_mobile, d.login, d.pass,"; $sql.= " d.photo, d.fk_adherent_type, d.morphy, d.entity,"; $sql.= " d.datec as datec,"; @@ -1135,6 +1139,7 @@ class Adherent extends CommonObject $this->birth = $this->db->jdate($obj->birthday); $this->note_private = $obj->note_private; + $this->note_public = $obj->note_public; $this->morphy = $obj->morphy; $this->typeid = $obj->fk_adherent_type; @@ -1561,7 +1566,8 @@ class Adherent extends CommonObject $result=''; $label = '' . $langs->trans("ShowMember") . ''; - $label.= '
    ' . $langs->trans('Ref') . ': ' . $this->ref; + if (! empty($this->ref)) + $label.= '
    ' . $langs->trans('Ref') . ': ' . $this->ref; if (! empty($this->firstname) || ! empty($this->lastname)) $label.= '
    ' . $langs->trans('Name') . ': ' . $this->getFullName($langs); $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; @@ -1875,6 +1881,7 @@ class Adherent extends CommonObject if ($this->phone_mobile && ! empty($conf->global->LDAP_MEMBER_FIELD_MOBILE)) $info[$conf->global->LDAP_MEMBER_FIELD_MOBILE] = $this->phone_mobile; if ($this->fax && ! empty($conf->global->LDAP_MEMBER_FIELD_FAX)) $info[$conf->global->LDAP_MEMBER_FIELD_FAX] = $this->fax; if ($this->note_private && ! empty($conf->global->LDAP_MEMBER_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_MEMBER_FIELD_DESCRIPTION] = $this->note_private; + if ($this->note_public && ! empty($conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC)) $info[$conf->global->LDAP_MEMBER_FIELD_NOTE_PUBLIC] = $this->note_public; if ($this->birth && ! empty($conf->global->LDAP_MEMBER_FIELD_BIRTHDATE)) $info[$conf->global->LDAP_MEMBER_FIELD_BIRTHDATE] = dol_print_date($this->birth,'dayhourldap'); if (isset($this->statut) && ! empty($conf->global->LDAP_FIELD_MEMBER_STATUS)) $info[$conf->global->LDAP_FIELD_MEMBER_STATUS] = $this->statut; if ($this->datefin && ! empty($conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION)) $info[$conf->global->LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION] = dol_print_date($this->datefin,'dayhourldap'); diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 3a938e74034..79b7db086e6 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -1,6 +1,7 @@ - * Copyright (C) 2004-2014 Laurent Destailleur +/* Copyright (C) 2004 Rodolphe Quiedeville + * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2015 Frederic France * * 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 @@ -45,26 +46,13 @@ if ($result > 0) $result=$adht->fetch($object->typeid); } +$permissionnote=$user->rights->adherent->creer; // Used by the include of actions_setnotes.inc.php /* * Actions */ -if ($action == 'update' && $user->rights->adherent->creer && ! $_POST["cancel"]) -{ - $db->begin(); - - $res=$object->update_note(dol_html_entity_decode(GETPOST('note_private'), ENT_QUOTES), '_private'); - if ($res < 0) - { - setEventMessage($object->error, 'errors'); - $db->rollback(); - } - else - { - $db->commit(); - } -} +include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once @@ -129,49 +117,16 @@ if ($id) // Status print ''.$langs->trans("Status").''.$object->getLibStatut(4).''; - // Private note - print ''.$langs->trans("Note").''; - print ''; - if ($action == 'edit' && $user->rights->adherent->creer) - { - print ""; - print "id."\">"; - require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; - $doleditor=new DolEditor('note_private',$object->note_private,'',280,'dolibarr_notes','',true,false,$conf->global->FCKEDITOR_ENABLE_SOCIETE,10,80); - $doleditor->Create(); - } - else - { - print dol_htmlentitiesbr($object->note_private); - } - print ""; - - if ($action == 'edit') - { - print ''; - print ''; - print '     '; - print ''; - print ''; - } - print ""; - print "\n"; + print '
    '; - /* - * Actions - */ - print ''; - print '
    '; + $colwidth='20'; + $permission = $user->rights->adherent->creer; // Used by the include of notes.tpl.php + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; - if ($user->rights->adherent->creer && $action != 'edit') - { - print '
    '.$langs->trans('Modify')."
    "; - } - - print "
    "; + dol_fiche_end(); } diff --git a/htdocs/admin/ldap_members.php b/htdocs/admin/ldap_members.php index bddf16f8670..8bac5068143 100644 --- a/htdocs/admin/ldap_members.php +++ b/htdocs/admin/ldap_members.php @@ -65,13 +65,14 @@ if ($action == 'setvalue' && $user->admin) if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_PHONE',GETPOST("fieldphone"),'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_PHONE_PERSO',GETPOST("fieldphoneperso"),'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_MOBILE',GETPOST("fieldmobile"),'chaine',0,'',$conf->entity)) $error++; - if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_SKYPE',GETPOST("fieldskype"),'chaine',0,'',$conf->entity)) $error++; + if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_SKYPE',GETPOST("fieldskype"),'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_FAX',GETPOST("fieldfax"),'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_ADDRESS',GETPOST("fieldaddress"),'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_ZIP',GETPOST("fieldzip"),'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_TOWN',GETPOST("fieldtown"),'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_COUNTRY',GETPOST("fieldcountry"),'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_DESCRIPTION',GETPOST("fielddescription"),'chaine',0,'',$conf->entity)) $error++; + if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_NOTE_PUBLIC',GETPOST("fieldnotepublic"),'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_MEMBER_FIELD_BIRTHDATE',GETPOST("fieldbirthdate"),'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_STATUS',GETPOST("fieldstatus"),'chaine',0,'',$conf->entity)) $error++; if (! dolibarr_set_const($db, 'LDAP_FIELD_MEMBER_END_LASTSUBSCRIPTION', GETPOST("fieldendlastsubscription"),'chaine',0,'',$conf->entity)) $error++; @@ -312,6 +313,14 @@ print ''.$langs->trans("LDAPFieldDescriptionExample").''; print ' '; print ''; +// Public Note +$var=!$var; +print ''.$langs->trans("LDAPFieldNotePublic").''; +print ''; +print ''.$langs->trans("LDAPFieldNotePublicExample").''; +print ' '; +print ''; + // Birthday $var=!$var; print ''.$langs->trans("LDAPFieldBirthdate").''; diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index 85757f85f15..d8f47651153 100644 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -515,4 +515,5 @@ create table llx_c_price_global_variable_updater )ENGINE=innodb; ALTER TABLE llx_adherent CHANGE COLUMN note note_private text DEFAULT NULL; +ALTER TABLE llx_adherent ADD COLUMN note_public text DEFAULT NULL after note_private; diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql index e6ffee2dc5b..493d5b1124d 100644 --- a/htdocs/install/mysql/tables/llx_adherent.sql +++ b/htdocs/install/mysql/tables/llx_adherent.sql @@ -55,6 +55,7 @@ create table llx_adherent public smallint NOT NULL DEFAULT 0, -- certain champ de la fiche sont ils public ou pas ? datefin datetime, -- date de fin de validite de la cotisation note_private text DEFAULT NULL, + note_public text DEFAULT NULL, datevalid datetime, -- date de validation datec datetime, -- date de creation tms timestamp, -- date de modification diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 984b9717dab..753ebc4073c 100755 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1338,6 +1338,8 @@ LDAPFieldCountry=Country LDAPFieldCountryExample=Example : c LDAPFieldDescription=Description LDAPFieldDescriptionExample=Example : description +LDAPFieldNotePublic=Public Note +LDAPFieldNotePublicExample=Example : publicnote LDAPFieldGroupMembers= Group members LDAPFieldGroupMembersExample= Example : uniqueMember LDAPFieldBirthdate=Birthdate From 02e8879d3b3780d762bdfc6789bc147985d1569b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 19:11:31 +0200 Subject: [PATCH 337/412] NEW Feature to build a merged pdf with all unpaid invoice can work for paid invoices. --- .../{impayees.php => mergepdftool.php} | 109 +++++++++++++----- htdocs/core/menus/init_menu_auguria.sql | 9 +- htdocs/core/menus/standard/eldy.lib.php | 21 ++-- htdocs/fourn/facture/list.php | 8 +- htdocs/langs/en_US/bills.lang | 1 + 5 files changed, 107 insertions(+), 41 deletions(-) rename htdocs/compta/facture/{impayees.php => mergepdftool.php} (88%) diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/mergepdftool.php similarity index 88% rename from htdocs/compta/facture/impayees.php rename to htdocs/compta/facture/mergepdftool.php index d91b52b2166..74017da1f17 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/mergepdftool.php @@ -1,7 +1,7 @@ * Copyright (C) 2004 Eric Seigne - * Copyright (C) 2004-2014 Laurent Destailleur + * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2012 Cédric Salvador * Copyright (C) 2014 Raphaël Doursenaud @@ -24,17 +24,19 @@ */ /** - * \file htdocs/compta/facture/impayees.php + * \file htdocs/compta/facture/mergepdftool.php * \ingroup facture - * \brief Page to list and build liste of unpaid invoices + * \brief Page to list and build doc of selected invoices */ require '../../main.inc.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; $langs->load("mails"); $langs->load("bills"); @@ -44,6 +46,18 @@ $action = GETPOST('action','alpha'); $option = GETPOST('option'); $mode=GETPOST('mode'); $builddoc_generatebutton=GETPOST('builddoc_generatebutton'); +$month = GETPOST("month","int"); +$year = GETPOST("year","int"); +$filter = GETPOST("filtre"); + +if (GETPOST('button_search')) +{ + $filter=GETPOST('filtre',2); + if ($filter != 'payed:0') $option=''; +} +if ($option == 'late') $filter = 'paye:0'; +if ($option == 'unpaidall') $filter = 'paye:0'; +if ($mode == 'sendremind' && $filter == '') $filter = 'paye:0'; // Security check if ($user->societe_id) $socid=$user->societe_id; @@ -54,6 +68,20 @@ if (! $user->rights->societe->client->voir || $socid) $diroutputpdf.='/private/' $resultmasssend=''; +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test must be present to be compatible with all browsers +{ + $search_ref=""; + $search_ref_supplier=""; + $search_label=""; + $search_company=""; + $search_amount_no_tax=""; + $search_amount_all_tax=""; + $year=""; + $month=""; + $filter=""; +} + + /* * Action @@ -297,8 +325,14 @@ if ($action == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_s dol_mkdir($diroutputpdf); // Save merged file - $filename=strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))); - if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late"))); + $filename=strtolower(dol_sanitizeFileName($langs->transnoentities("Invoices"))); + if ($filter=='paye:0') + { + if ($option=='late') $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))).'_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Late"))); + else $filename.='_'.strtolower(dol_sanitizeFileName($langs->transnoentities("Unpaid"))); + } + if ($year) $filename.='_'.$year; + if ($month) $filename.='_'.$month; if ($pagecount) { $now=dol_now(); @@ -306,6 +340,9 @@ if ($action == "builddoc" && $user->rights->facture->lire && ! GETPOST('button_s $pdf->Output($file,'F'); if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK)); + + $langs->load("exports"); + setEventMessage($langs->trans('FileSuccessfullyBuilt',$filename.'_'.dol_print_date($now,'dayhourlog'))); } else { @@ -340,9 +377,9 @@ if ($action == 'remove_file') $form = new Form($db); $formfile = new FormFile($db); +$formother = new FormOther($db); -$title=$langs->trans("BillsCustomersUnpaid"); -if ($option=='late') $title=$langs->trans("BillsCustomersUnpaid"); +$title=$langs->trans("MergingPDFTool"); llxHeader('',$title); @@ -410,14 +447,15 @@ $sql.= ",".MAIN_DB_PREFIX."facture as f"; $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture "; $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND f.entity = ".$conf->entity; -$sql.= " AND f.type IN (0,1,3,5) AND f.fk_statut = 1"; -$sql.= " AND f.paye = 0"; +$sql.= " AND f.type IN (0,1,3,5)"; +//$sql.= " AND f.fk_statut = 1"; +//$sql.= " AND f.paye = 0"; if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if (! empty($socid)) $sql .= " AND s.rowid = ".$socid; -if (GETPOST('filtre')) +if ($filter && $filter != -1) // GETPOST('filtre') may be a string { - $filtrearr = explode(",", GETPOST('filtre')); + $filtrearr = explode(",", $filter); foreach ($filtrearr as $fil) { $filt = explode(":", $fil); @@ -427,10 +465,21 @@ if (GETPOST('filtre')) if ($search_ref) $sql .= " AND f.facnumber LIKE '%".$db->escape($search_ref)."%'"; if ($search_refcustomer) $sql .= " AND f.ref_client LIKE '%".$db->escape($search_refcustomer)."%'"; if ($search_societe) $sql .= " AND s.nom LIKE '%".$db->escape($search_societe)."%'"; -if ($search_paymentmode) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode.""; +if ($search_paymentmode) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode.""; if ($search_montant_ht) $sql .= " AND f.total = '".$db->escape($search_montant_ht)."'"; if ($search_montant_ttc) $sql .= " AND f.total_ttc = '".$db->escape($search_montant_ttc)."'"; if (GETPOST('sf_ref')) $sql .= " AND f.facnumber LIKE '%".$db->escape(GETPOST('sf_ref'))."%'"; +if ($month > 0) +{ + if ($year > 0) + $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,$month,false))."' AND '".$db->idate(dol_get_last_day($year,$month,false))."'"; + else + $sql.= " AND date_format(f.datef, '%m') = '$month'"; +} +else if ($year > 0) +{ + $sql.= " AND f.datef BETWEEN '".$db->idate(dol_get_first_day($year,1,false))."' AND '".$db->idate(dol_get_last_day($year,12,false))."'"; +} $sql.= " GROUP BY s.nom, s.rowid, s.email, f.rowid, f.facnumber, f.ref_client, f.increment, f.total, f.tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp,"; $sql.= " f.datef, f.date_lim_reglement, f.paye, f.fk_statut, f.type, fk_mode_reglement"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user "; @@ -438,7 +487,7 @@ $sql.= " ORDER BY "; $listfield=explode(',',$sortfield); foreach ($listfield as $key => $value) $sql.=$listfield[$key]." ".$sortorder.","; $sql.= " f.facnumber DESC"; - +//print $sql; //$sql .= $db->plimit($limit+1,$offset); $resql = $db->query($sql); @@ -454,25 +503,28 @@ if ($resql) $param=""; $param.=(! empty($socid)?"&socid=".$socid:""); - $param.=(! empty($option)?"&option=".$option:""); if ($search_ref) $param.='&search_ref='.urlencode($search_ref); - if ($search_refcustomer) $param.='&search_ref='.urlencode($search_refcustomer); + if ($search_refcustomer) $param.='&search_ref='.urlencode($search_refcustomer); if ($search_societe) $param.='&search_societe='.urlencode($search_societe); if ($search_societe) $param.='&search_paymentmode='.urlencode($search_paymentmode); if ($search_montant_ht) $param.='&search_montant_ht='.urlencode($search_montant_ht); if ($search_montant_ttc) $param.='&search_montant_ttc='.urlencode($search_montant_ttc); if ($late) $param.='&late='.urlencode($late); - + if ($mode) $param.='&mode='.urlencode($mode); $urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder; $urlsource.=str_replace('&','&',$param); - $titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->name):$langs->trans("BillsCustomersUnpaid")); + //$titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->name):$langs->trans("BillsCustomersUnpaid")); + $titre=(! empty($socid)?$langs->trans("BillsCustomersForCompany",$soc->name):$langs->trans("BillsCustomers")); if ($option == 'late') $titre.=' ('.$langs->trans("Late").')'; - else $titre.=' ('.$langs->trans("All").')'; + //else $titre.=' ('.$langs->trans("All").')'; $link=''; - if (empty($option)) $link=''.$langs->trans("ShowUnpaidLateOnly").''; - elseif ($option == 'late') $link=''.$langs->trans("ShowUnpaidAll").''; + if (empty($option) || $option == 'late') $link.=($link?' - ':'').''.$langs->trans("ShowUnpaidAll").''; + if (empty($option) || $option == 'unpaidall') $link.=($link?' - ':'').''.$langs->trans("ShowUnpaidLateOnly").''; + + $param.=(! empty($option)?"&option=".$option:""); + print_fiche_titre($titre,$link); //print_barre_liste($titre,$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',0); // We don't want pagination on this page @@ -574,7 +626,11 @@ if ($resql) print ''; print ''; print ''; - print ' '; + print ''; + print ''; + $syear = $year; + $formother->select_year($syear?$syear:-1,'year',1, 20, 5); + print ''; print ' '; print ''; print ''; @@ -586,21 +642,22 @@ if ($resql) print ' '; print ' '; print ''; + $liststatus=array('paye:0'=>$langs->trans("Unpaid"), 'paye:1'=>$langs->trans("Paid")); + print $form->selectarray('filtre', $liststatus, $filter, 1); + print ''; + print ''; print ''; print ''; - print ''; + print '
    '; if (empty($mode)) { - print ''; if ($conf->use_javascript_ajax) print ''.$langs->trans("All").' / '.$langs->trans("None").''; - print ''; } else { - print ''; if ($conf->use_javascript_ajax) print ''.$langs->trans("All").' / '.$langs->trans("None").''; - print ''; } + print ''; print "\n"; if ($num > 0) diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index f481abdcf0c..37d074b9f16 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -165,9 +165,16 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'accountancy', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture.php?action=create&leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1702__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/fiche-rec.php?leftmenu=customers_bills', 'Repeatable', 1, 'bills', '$user->rights->facture->lire', '', 2, 4, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1703__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/impayees.php?action=facturer&leftmenu=customers_bills', 'Unpaid', 1, 'bills', '$user->rights->facture->lire', '', 2, 5, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1705__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills', 'List', 1, 'bills', '$user->rights->facture->lire', '', 2, 5, __ENTITY__); + +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1720__+MAX_llx_menu__, 'accountancy', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills&search_status=0', 'BillShortStatusDraft', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1721__+MAX_llx_menu__, 'accountancy', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills&search_status=1', 'BillShortStatusNotPaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1722__+MAX_llx_menu__, 'accountancy', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills&search_status=2', 'BillShortStatusPaid', 2, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1723__+MAX_llx_menu__, 'accountancy', '', 1705__+MAX_llx_menu__, '/compta/facture/list.php?leftmenu=customers_bills&search_status=3', 'BillShortStatusCanceled', 2, 'bills', '$user->rights->facture->lire', '', 2, 4, __ENTITY__); + insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/paiement/list.php?leftmenu=customers_bills', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 2, 6, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1710__+MAX_llx_menu__, 'accountancy', '', 1704__+MAX_llx_menu__, '/compta/paiement/rapport.php?leftmenu=customers_bills', 'Reportings', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1703__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/mergepdftool.php?action=facturer&leftmenu=customers_bills', 'MergingPDFTool', 1, 'bills', '$user->rights->facture->lire', '', 2, 7, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1714__+MAX_llx_menu__, 'accountancy', '', 1700__+MAX_llx_menu__, '/compta/facture/stats/index.php?leftmenu=customers_bills', 'Statistics', 1, 'bills', '$user->rights->facture->lire', '', 2, 8, __ENTITY__); -- Accountancy - Orders to bill insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'accountancy', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?leftmenu=orders&viewstatut=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index d6ee928b121..069d672609c 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -741,27 +741,30 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->facture->enabled)) { $langs->load("bills"); - $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("BillsCustomers"),0,$user->rights->facture->lire, '', $mainmenu, 'customers_bills'); - $newmenu->add("/compta/facture.php?action=create&leftmenu=customers_bills",$langs->trans("NewBill"),1,$user->rights->facture->creer); - $newmenu->add("/compta/facture/fiche-rec.php?leftmenu=customers_bills",$langs->trans("Repeatables"),1,$user->rights->facture->lire); + $newmenu->add("/compta/facture/list.php",$langs->trans("BillsCustomers"),0,$user->rights->facture->lire, '', $mainmenu, 'customers_bills'); + $newmenu->add("/compta/facture.php?action=create",$langs->trans("NewBill"),1,$user->rights->facture->creer); + $newmenu->add("/compta/facture/fiche-rec.php",$langs->trans("Repeatables"),1,$user->rights->facture->lire); $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills",$langs->trans("List"),1,$user->rights->facture->lire); - if (empty($leftmenu) || ($leftmenu == 'customers_bills')) { + if (empty($leftmenu) || ($leftmenu == 'customers_bills')) + { $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills&search_status=0",$langs->trans("BillShortStatusDraft"),2,$user->rights->facture->lire); - $newmenu->add("/compta/facture/impayees.php?leftmenu=customers_bills",$langs->trans("BillShortStatusNotPaid"),2,$user->rights->facture->lire); + $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills&search_status=1",$langs->trans("BillShortStatusNotPaid"),2,$user->rights->facture->lire); $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills&search_status=2",$langs->trans("BillShortStatusPaid"),2,$user->rights->facture->lire); $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills&search_status=3",$langs->trans("BillShortStatusCanceled"),2,$user->rights->facture->lire); } - $newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payments",$langs->trans("Payments"),1,$user->rights->facture->lire); + $newmenu->add("/compta/paiement/list.php",$langs->trans("Payments"),1,$user->rights->facture->lire); if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) { - $newmenu->add("/compta/paiement/avalider.php?leftmenu=customers_bills_payments",$langs->trans("MenuToValid"),2,$user->rights->facture->lire); + $newmenu->add("/compta/paiement/avalider.php",$langs->trans("MenuToValid"),2,$user->rights->facture->lire); } - $newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_payments",$langs->trans("Reportings"),2,$user->rights->facture->lire); + $newmenu->add("/compta/paiement/rapport.php",$langs->trans("Reportings"),2,$user->rights->facture->lire); - $newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills", $langs->trans("Statistics"),1,$user->rights->facture->lire); + $newmenu->add("/compta/facture/mergepdftool.php",$langs->trans("MergingPDFTool"),1,$user->rights->facture->lire); + + $newmenu->add("/compta/facture/stats/index.php", $langs->trans("Statistics"),1,$user->rights->facture->lire); } // Suppliers diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php index 3c1b0f06cb6..836d214e19a 100644 --- a/htdocs/fourn/facture/list.php +++ b/htdocs/fourn/facture/list.php @@ -120,7 +120,7 @@ if ($mode == 'search') $now=dol_now(); $form=new Form($db); -$htmlother=new FormOther($db); +$formother=new FormOther($db); $formfile = new FormFile($db); llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores'); @@ -245,7 +245,7 @@ if ($resql) print ' '; print "\n"; - // Lignes des champs de filtre + // Line for filters print ''; print ''; @@ -259,10 +259,8 @@ if ($resql) } print ''; print ''; - //print ' '.$langs->trans('Year').': '; $syear = $year; - //if ($syear == '') $syear = date("Y"); - $htmlother->select_year($syear?$syear:-1,'year',1, 20, 5); + $formother->select_year($syear?$syear:-1,'year',1, 20, 5); print ''; print ' '; print ''; diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index ac8e6da082b..ec455843cb7 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -298,6 +298,7 @@ RelatedCustomerInvoices=Related customer invoices RelatedSupplierInvoices=Related supplier invoices LatestRelatedBill=Latest related invoice WarningBillExist=Warning, one or more invoice already exist +MergingPDFTool=Merging PDF tool # PaymentConditions PaymentConditionShortRECEP=Immediate From 877e60c76f167828a98c135057ae077ef10f8c82 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 19:20:11 +0200 Subject: [PATCH 338/412] Set default filter --- htdocs/compta/facture/mergepdftool.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php index 74017da1f17..8022001fe2a 100644 --- a/htdocs/compta/facture/mergepdftool.php +++ b/htdocs/compta/facture/mergepdftool.php @@ -49,7 +49,6 @@ $builddoc_generatebutton=GETPOST('builddoc_generatebutton'); $month = GETPOST("month","int"); $year = GETPOST("year","int"); $filter = GETPOST("filtre"); - if (GETPOST('button_search')) { $filter=GETPOST('filtre',2); @@ -58,6 +57,7 @@ if (GETPOST('button_search')) if ($option == 'late') $filter = 'paye:0'; if ($option == 'unpaidall') $filter = 'paye:0'; if ($mode == 'sendremind' && $filter == '') $filter = 'paye:0'; +if ($filter == '') $filter = 'paye:0'; // Security check if ($user->societe_id) $socid=$user->societe_id; From 2550c6b0afe821dc6d88dfef69053db981e0d790 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 19:22:58 +0200 Subject: [PATCH 339/412] Must exclude draft and abandon into default filter. --- htdocs/compta/facture/mergepdftool.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/facture/mergepdftool.php b/htdocs/compta/facture/mergepdftool.php index 8022001fe2a..dfa1207e423 100644 --- a/htdocs/compta/facture/mergepdftool.php +++ b/htdocs/compta/facture/mergepdftool.php @@ -448,7 +448,7 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_fac $sql.= " WHERE f.fk_soc = s.rowid"; $sql.= " AND f.entity = ".$conf->entity; $sql.= " AND f.type IN (0,1,3,5)"; -//$sql.= " AND f.fk_statut = 1"; +if ($filter == 'paye:0') $sql.= " AND f.fk_statut = 1"; //$sql.= " AND f.paye = 0"; if ($option == 'late') $sql.=" AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'"; if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; From c148f82452139ced15104efbeeb784ad98830a74 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 19:31:25 +0200 Subject: [PATCH 340/412] Fix warning --- htdocs/core/lib/functions.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index e8d0cc3f254..5efbc507db9 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -724,7 +724,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p // Show tabs $bactive=false; // if =0 we don't use the feature - $limittoshow=($conf->global->MAIN_MAXTABS_IN_CARD?$conf->global->MAIN_MAXTABS_IN_CARD:99); + $limittoshow=(empty($conf->global->MAIN_MAXTABS_IN_CARD)?99:$conf->global->MAIN_MAXTABS_IN_CARD); $displaytab=0; for ($i = 0 ; $i <= $maxkey ; $i++) From 493392d89fd30e591e0762af0181bac7975a3e38 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 6 Apr 2015 19:46:10 +0200 Subject: [PATCH 341/412] Remove warnings --- htdocs/core/class/extrafields.class.php | 8 ++++---- htdocs/core/lib/functions.lib.php | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 16e6af25cc7..a9a44fc27d1 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -568,11 +568,11 @@ class ExtraFields global $conf; if ( empty($elementtype) ) return array(); - + if ($elementtype == 'thirdparty') $elementtype='societe'; $array_name_label=array(); - + // For avoid conflicts with external modules if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label; @@ -602,7 +602,7 @@ class ExtraFields $this->attribute_elementtype[$tab->name]=$tab->elementtype; $this->attribute_unique[$tab->name]=$tab->fieldunique; $this->attribute_required[$tab->name]=$tab->fieldrequired; - $this->attribute_param[$tab->name]=unserialize($tab->param); + $this->attribute_param[$tab->name]=($tab->param ? unserialize($tab->param) : ''); $this->attribute_pos[$tab->name]=$tab->pos; $this->attribute_alwayseditable[$tab->name]=$tab->alwayseditable; $this->attribute_perms[$tab->name]=$tab->perms; @@ -1056,7 +1056,7 @@ class ExtraFields elseif ($type == 'link') { $out=''; - + $param_list=array_keys($param['options']); // 0 : ObjectName // 1 : classPath diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 5efbc507db9..a32f52abc1b 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -729,8 +729,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p for ($i = 0 ; $i <= $maxkey ; $i++) { - - if ((is_numeric($active) && $i == $active) || (! is_numeric($active) && $active == $links[$i][2])) + if ((is_numeric($active) && $i == $active) || (! empty($links[$i][2]) && ! is_numeric($active) && $active == $links[$i][2])) { $isactive=true; $bactive=true; @@ -742,7 +741,7 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p if ($i <=$limittoshow || $isactive ) { - $out.='
    '; + $out.='
    '; if (isset($links[$i][2]) && $links[$i][2] == 'image') { if (!empty($links[$i][0])) From 85d8d06ca45c2bc2c6433760189c267f3d3a5331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Mon, 6 Apr 2015 20:02:29 +0200 Subject: [PATCH 342/412] Travis fix CMailFile.class.php --- htdocs/core/class/CMailFile.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index 82d675019d1..967b764dc65 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -514,11 +514,11 @@ class CMailFile return $res; } - - // Encode subject according to RFC 2822 - http://en.wikipedia.org/wiki/MIME#Encoded-Word - /** - * @param string $stringtoencode + * Encode subject according to RFC 2822 - http://en.wikipedia.org/wiki/MIME#Encoded-Word + * + * @param string $stringtoencode String to encode + * @return string string encoded */ function encodetorfc2822($stringtoencode) { From 1d6a8a46f1729586af52954e21575f42df3d879c Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Apr 2015 02:44:30 +0200 Subject: [PATCH 343/412] To clean an int we must use (int) and not trim() --- htdocs/adherents/class/adherent_type.class.php | 2 +- htdocs/contrat/class/contrat.class.php | 4 ++-- htdocs/expedition/class/expedition.class.php | 6 +++--- htdocs/fourn/class/fournisseur.facture.class.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php index cbf5b428cc0..ee15a261820 100644 --- a/htdocs/adherents/class/adherent_type.class.php +++ b/htdocs/adherents/class/adherent_type.class.php @@ -73,7 +73,7 @@ class AdherentType extends CommonObject { global $conf; - $this->statut=trim($this->statut); + $this->statut=(int) $this->statut; $sql = "INSERT INTO ".MAIN_DB_PREFIX."adherent_type ("; $sql.= "libelle"; diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php index dcabc4e0b52..6797daa46ab 100644 --- a/htdocs/contrat/class/contrat.class.php +++ b/htdocs/contrat/class/contrat.class.php @@ -1131,7 +1131,7 @@ class Contrat extends CommonObject if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier); if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext); if (isset($this->entity)) $this->entity=trim($this->entity); - if (isset($this->statut)) $this->statut=trim($this->statut); + if (isset($this->statut)) $this->statut=(int) $this->statut; if (isset($this->fk_soc)) $this->fk_soc=trim($this->fk_soc); if (isset($this->fk_projet)) $this->fk_projet=trim($this->fk_projet); if (isset($this->fk_commercial_signature)) $this->fk_commercial_signature=trim($this->fk_commercial_signature); @@ -2417,7 +2417,7 @@ class ContratLigne extends CommonObject // Clean parameters $this->fk_contrat=trim($this->fk_contrat); $this->fk_product=trim($this->fk_product); - $this->statut=trim($this->statut); + $this->statut=(int) $this->statut; $this->label=trim($this->label); $this->description=trim($this->description); $this->tva_tx=trim($this->tva_tx); diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php index f357d03eb36..6e8c81450ce 100644 --- a/htdocs/expedition/class/expedition.class.php +++ b/htdocs/expedition/class/expedition.class.php @@ -492,9 +492,9 @@ class Expedition extends CommonObject //Incoterms $this->fk_incoterms = $obj->fk_incoterms; - $this->location_incoterms = $obj->location_incoterms; + $this->location_incoterms = $obj->location_incoterms; $this->libelle_incoterms = $obj->libelle_incoterms; - + $this->db->free($result); if ($this->statut == 0) $this->brouillon = 1; @@ -878,7 +878,7 @@ class Expedition extends CommonObject if (isset($this->fk_delivery_address)) $this->fk_delivery_address=trim($this->fk_delivery_address); if (isset($this->shipping_method_id)) $this->shipping_method_id=trim($this->shipping_method_id); if (isset($this->tracking_number)) $this->tracking_number=trim($this->tracking_number); - if (isset($this->statut)) $this->statut=trim($this->statut); + if (isset($this->statut)) $this->statut=(int) $this->statut; if (isset($this->trueDepth)) $this->trueDepth=trim($this->trueDepth); if (isset($this->trueWidth)) $this->trueWidth=trim($this->trueWidth); if (isset($this->trueHeight)) $this->trueHeight=trim($this->trueHeight); diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php index ceb9a56b946..a76f55567a8 100644 --- a/htdocs/fourn/class/fournisseur.facture.class.php +++ b/htdocs/fourn/class/fournisseur.facture.class.php @@ -577,7 +577,7 @@ class FactureFournisseur extends CommonInvoice // if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1); // if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2); if (isset($this->total_ttc)) $this->total_ttc=trim($this->total_ttc); - if (isset($this->statut)) $this->statut=trim($this->statut); + if (isset($this->statut)) $this->statut=(int) $this->statut; if (isset($this->author)) $this->author=trim($this->author); if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid); if (isset($this->fk_facture_source)) $this->fk_facture_source=trim($this->fk_facture_source); From 918ed34364feef1039f989af6c1ce725f09ee2e8 Mon Sep 17 00:00:00 2001 From: Scrutinizer Auto-Fixer Date: Tue, 7 Apr 2015 00:45:30 +0000 Subject: [PATCH 344/412] Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com --- htdocs/core/filemanagerdol/connectors/php/commands.php | 6 ++++++ .../core/modules/contract/doc/pdf_strato.modules.php | 6 +++--- htdocs/core/modules/import/modules_import.php | 2 +- htdocs/core/modules/mailings/contacts1.modules.php | 2 +- htdocs/core/modules/mailings/fraise.modules.php | 2 +- htdocs/core/modules/product/modules_product.class.php | 2 +- .../project/doc/doc_generic_project_odt.modules.php | 2 +- htdocs/core/modules/propale/modules_propale.php | 4 ++-- htdocs/core/modules/societe/modules_societe.class.php | 4 ++-- .../supplier_invoice/modules_facturefournisseur.php | 2 +- htdocs/paypal/lib/paypal.lib.php | 10 ++++++++++ htdocs/projet/class/task.class.php | 4 ++-- 12 files changed, 31 insertions(+), 15 deletions(-) diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php index 18b54c1c6b8..0dc17d7313c 100644 --- a/htdocs/core/filemanagerdol/connectors/php/commands.php +++ b/htdocs/core/filemanagerdol/connectors/php/commands.php @@ -22,6 +22,9 @@ * This is the File Manager Connector for PHP. */ +/** + * @param string $currentFolder + */ function GetFolders( $resourceType, $currentFolder ) { // Map the virtual path to the local server path. @@ -178,6 +181,9 @@ function CreateFolder( $resourceType, $currentFolder ) // DOL_CHANGE //function FileUpload( $resourceType, $currentFolder, $sCommand ) +/** + * @param string $currentFolder + */ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '') { if (!isset($_FILES)) { diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php index 46364b23d0d..9b5b80ceeaf 100644 --- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php +++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php @@ -452,7 +452,7 @@ class pdf_strato extends ModelePDFContract * Show top header of page. * * @param PDF $pdf Object PDF - * @param Object $object Object to show + * @param CommonObject $object Object to show * @param int $showaddress 0=no, 1=yes * @param Translate $outputlangs Object lang for output * @return void @@ -631,10 +631,10 @@ class pdf_strato extends ModelePDFContract * Show footer of page. Need this->emetteur object * * @param PDF $pdf PDF - * @param Object $object Object to show + * @param CommonObject $object Object to show * @param Translate $outputlangs Object lang for output * @param int $hidefreetext 1=Hide free text - * @return void + * @return integer */ function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0) { diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php index 49fb7decd69..4fa5052a90a 100644 --- a/htdocs/core/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -63,7 +63,7 @@ class ModeleImports * Charge en memoire et renvoie la liste des modeles actifs * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of templates */ function liste_modeles($db,$maxfilenamelength=0) diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php index 5d218376983..558b83ed53f 100644 --- a/htdocs/core/modules/mailings/contacts1.modules.php +++ b/htdocs/core/modules/mailings/contacts1.modules.php @@ -60,7 +60,7 @@ class mailing_contacts1 extends MailingTargets * array of SQL request that returns two field: * One called "label", One called "nb". * - * @return array Array with SQL requests + * @return string[] Array with SQL requests */ function getSqlArrayForStats() { diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php index 69b018080b8..963e8ef0c28 100644 --- a/htdocs/core/modules/mailings/fraise.modules.php +++ b/htdocs/core/modules/mailings/fraise.modules.php @@ -63,7 +63,7 @@ class mailing_fraise extends MailingTargets * array of SQL request that returns two field: * One called "label", One called "nb". * - * @return array Array with SQL requests + * @return string[] Array with SQL requests */ function getSqlArrayForStats() { diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php index 0bfd3f8f03e..e08ea074bbd 100644 --- a/htdocs/core/modules/product/modules_product.class.php +++ b/htdocs/core/modules/product/modules_product.class.php @@ -105,7 +105,7 @@ abstract class ModeleProductCode * Renvoi la liste des modeles de numérotation * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of numbers */ static function liste_modeles($db,$maxfilenamelength=0) diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php index f19d8a0e3a0..6e2601797f8 100644 --- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php +++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php @@ -105,7 +105,7 @@ class doc_generic_project_odt extends ModelePDFProjects /** * Define array with couple substitution key => substitution value * - * @param Object $object Main object to use as data source + * @param Project $object Main object to use as data source * @param Translate $outputlangs Lang object to use for output * @return array Array of substitution */ diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php index 9b0cc1d82a2..9ad90e9e3b5 100644 --- a/htdocs/core/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -43,7 +43,7 @@ abstract class ModelePDFPropales extends CommonDocGenerator * Return list of active generation modules * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of templates */ static function liste_modeles($db,$maxfilenamelength=0) @@ -149,7 +149,7 @@ abstract class ModeleNumRefPropales * Create a document onto disk according to template module. * * @param DoliDB $db Database handler - * @param object $object Object proposal + * @param Propal $object Object proposal * @param string $modele Force model to use ('' to not force) * @param Translate $outputlangs Object langs to use for output * @param int $hidedetails Hide details of lines diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index f1fc05d29db..72090a581ea 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -39,7 +39,7 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator * Return list of active generation modules * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of templates */ static function liste_modeles($db,$maxfilenamelength=0) @@ -142,7 +142,7 @@ abstract class ModeleThirdPartyCode * Renvoi la liste des modeles de numéroation * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of numbers */ static function liste_modeles($db,$maxfilenamelength=0) diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php index 51eb675057e..03dc42280cb 100644 --- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php @@ -41,7 +41,7 @@ abstract class ModelePDFSuppliersInvoices extends CommonDocGenerator * Return list of active generation models * * @param DoliDB $db Database handler - * @param string $maxfilenamelength Max length of value to show + * @param integer $maxfilenamelength Max length of value to show * @return array List of numbers */ static function liste_modeles($db,$maxfilenamelength=0) diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 2e8ab4bf0b8..76ea5ab4834 100644 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -436,6 +436,16 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re ' desc: Product description '-------------------------------------------------------------------------------------------------------------------------------------------- */ +/** + * @param double $paymentAmount + * @param string $currencyCodeType + * @param string $paymentType + * @param string $returnURL + * @param string $cancelURL + * @param string $tag + * @param string $solutionType + * @param string $landingPage + */ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum, $email='', $desc='') { //------------------------------------------------------------------------------------------------------------------------------------ diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php index 5e02efe6463..3fb2586625e 100644 --- a/htdocs/projet/class/task.class.php +++ b/htdocs/projet/class/task.class.php @@ -1331,7 +1331,7 @@ class Task extends CommonObject /** * Return status label of object * - * @param string $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto + * @param integer $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto * @return string Label */ function getLibStatut($mode=0) @@ -1343,7 +1343,7 @@ class Task extends CommonObject * Return status label for an object * * @param int $statut Id statut - * @param string $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto + * @param integer $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto * @return string Label */ function LibStatut($statut,$mode=0) From ad50810c7ab71cc8557e55e4bf75c0117d9b6ca7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Apr 2015 02:48:19 +0200 Subject: [PATCH 345/412] Fix deprecated code --- htdocs/core/lib/bank.lib.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php index df9a25ae7c8..0ed32bec16c 100644 --- a/htdocs/core/lib/bank.lib.php +++ b/htdocs/core/lib/bank.lib.php @@ -84,7 +84,7 @@ function bank_prepare_head(Account $object) } /** * Prepare array with list of tabs - * + * * @param Object $object Object related to tabs * @return array Array of tabs to shoc */ @@ -99,13 +99,13 @@ function bank_admin_prepare_head($object) $head[$h][2] = 'general'; $h++; - + // Show more tabs from modules // Entries must be declared in modules descriptor with line // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab // $this->tabs = array('entity:-tabname); to remove a tab complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank_admin'); - + $head[$h][0] = DOL_URL_ROOT.'/admin/bank_extrafields.php'; $head[$h][1] = $langs->trans("ExtraFields"); $head[$h][2] = 'attributes'; @@ -120,12 +120,12 @@ function bank_admin_prepare_head($object) * Check SWIFT informations for a bank account * * @param Account $account A bank account - * @return boolean True if informations are valid, false otherwise + * @return boolean True if informations are valid, false otherwise */ function checkSwiftForAccount($account) { $swift = $account->bic; - if (eregi("^([a-zA-Z]){4}([a-zA-Z]){2}([0-9a-zA-Z]){2}([0-9a-zA-Z]{3})?$", $swift)) { + if (preg_march("/^([a-zA-Z]){4}([a-zA-Z]){2}([0-9a-zA-Z]){2}([0-9a-zA-Z]{3})?$/", $swift)) { return true; } else { return false; From 6fa0234409683beb49a2aa14668b90e45ccf5148 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Apr 2015 03:00:11 +0200 Subject: [PATCH 346/412] Uniformize code --- htdocs/admin/askpricesupplier.php | 1 - htdocs/categories/categorie.php | 2 +- htdocs/compta/bank/class/account.class.php | 2 +- htdocs/compta/sociales/document.php | 4 +- htdocs/contact/card.php | 2 +- htdocs/contact/document.php | 2 +- htdocs/core/lib/contact.lib.php | 2 +- htdocs/core/lib/product.lib.php | 5 +- htdocs/core/lib/tax.lib.php | 2 +- htdocs/fichinter/document.php | 2 +- htdocs/loan/document.php | 4 +- htdocs/margin/tabs/productMargins.php | 2 +- .../product/actions_card_product.class.php | 2 +- .../service/actions_card_service.class.php | 2 +- htdocs/product/card.php | 2 +- htdocs/product/composition/card.php | 2 +- htdocs/product/document.php | 2 +- htdocs/product/fournisseurs.php | 12 ++--- htdocs/product/photos.php | 2 +- htdocs/product/price.php | 2 +- htdocs/product/stats/card.php | 2 +- htdocs/product/stats/commande.php | 2 +- htdocs/product/stats/commande_fournisseur.php | 2 +- htdocs/product/stats/contrat.php | 2 +- htdocs/product/stats/facture.php | 16 +++--- htdocs/product/stats/facture_fournisseur.php | 50 ++++++++--------- htdocs/product/stats/propal.php | 54 +++++++++---------- htdocs/product/stock/product.php | 2 +- htdocs/product/traduction.php | 4 +- htdocs/societe/admin/societe.php | 2 +- htdocs/societe/admin/societe_extrafields.php | 2 +- 31 files changed, 96 insertions(+), 98 deletions(-) diff --git a/htdocs/admin/askpricesupplier.php b/htdocs/admin/askpricesupplier.php index 6307e81042c..d2072a0c79c 100644 --- a/htdocs/admin/askpricesupplier.php +++ b/htdocs/admin/askpricesupplier.php @@ -319,7 +319,6 @@ foreach ($dirmodels as $reldir) // Info $htmltooltip=''; $htmltooltip.=''.$langs->trans("Version").': '.$module->getVersion().'
    '; - $askpricesupplier->type=0; $nextval=$module->getNextValue($mysoc,$askpricesupplier); if ("$nextval" != $langs->trans("NotAvailable")) { // Keep " on nextval $htmltooltip.=''.$langs->trans("NextValue").': '; diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index 76af3708c8b..1cd605ea9ca 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -341,7 +341,7 @@ else if ($id || $ref) llxHeader("","",$langs->trans("CardProduct".$product->type)); - $head=product_prepare_head($product, $user); + $head=product_prepare_head($product); $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'category', $titre,0,$picto); diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php index 900a970d949..b6215165d35 100644 --- a/htdocs/compta/bank/class/account.class.php +++ b/htdocs/compta/bank/class/account.class.php @@ -781,8 +781,8 @@ class Account extends CommonObject $result=$this->deleteExtraFields(); if ($result < 0) { - return -1; dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR); + return -1; } } diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php index ad5af8f84c2..f87791dfed9 100644 --- a/htdocs/compta/sociales/document.php +++ b/htdocs/compta/sociales/document.php @@ -88,8 +88,8 @@ llxHeader("",$langs->trans("SocialContribution"),$help_url); if ($object->id) { $alreadypayed=$object->getSommePaiement(); - - $head=tax_prepare_head($object, $user); + + $head=tax_prepare_head($object); dol_fiche_head($head, 'documents', $langs->trans("SocialContribution"), 0, 'bill'); diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index f8ebe12cd9b..5936e596fb7 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -255,7 +255,7 @@ if (empty($reshook)) } else { - setEventMessage($object->error,$object->errors,'errors'); + setEventMessages($object->error,$object->errors,'errors'); } } diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index 970f3543c45..2241a1e67f1 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -79,7 +79,7 @@ llxHeader("",$langs->trans("Contact"), $helpurl); if ($object->id) { - $head = contact_prepare_head($object, $user); + $head = contact_prepare_head($object); dol_fiche_head($head, 'documents', $langs->trans("Contact"), 0, 'contact'); diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php index ba2d8ad5772..278402679f8 100644 --- a/htdocs/core/lib/contact.lib.php +++ b/htdocs/core/lib/contact.lib.php @@ -94,7 +94,7 @@ function contact_prepare_head(Contact $object) $head[$tab][2] = 'category'; $tab++; } - + // Info $head[$tab][0] = DOL_URL_ROOT.'/contact/info.php?id='.$object->id; $head[$tab][1] = $langs->trans("Info"); diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index a02747bb8aa..a35ab95a24a 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -28,12 +28,11 @@ * Prepare array with list of tabs * * @param Product $object Object related to tabs - * @param User $user Object user * @return array Array of tabs to show */ -function product_prepare_head($object, $user) +function product_prepare_head($object) { - global $langs, $conf; + global $langs, $conf, $user; $langs->load("products"); $h = 0; diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php index bee6999d183..f6623362dcc 100644 --- a/htdocs/core/lib/tax.lib.php +++ b/htdocs/core/lib/tax.lib.php @@ -36,7 +36,7 @@ */ function tax_prepare_head(ChargeSociales $object) { - global $langs, $conf; + global $langs, $conf, $user; $h = 0; $head = array(); diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index fd039efff24..bd6746c98e4 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -88,7 +88,7 @@ if ($object->id) { $object->fetch_thirdparty(); - $head=fichinter_prepare_head($object, $user); + $head=fichinter_prepare_head($object); dol_fiche_head($head, 'documents', $langs->trans("InterventionCard"), 0, 'intervention'); diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php index 788048a215b..3831f73a7ea 100644 --- a/htdocs/loan/document.php +++ b/htdocs/loan/document.php @@ -81,8 +81,8 @@ llxHeader("",$langs->trans("Loan"),$help_url); if ($object->id) { $alreadypayed=$object->getSumPayment(); - - $head = loan_prepare_head($object, $user); + + $head = loan_prepare_head($object); dol_fiche_head($head, 'documents', $langs->trans("Loan"), 0, 'bill'); diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php index 2123f683c21..eb3ac32c424 100644 --- a/htdocs/margin/tabs/productMargins.php +++ b/htdocs/margin/tabs/productMargins.php @@ -77,7 +77,7 @@ if ($id > 0 || ! empty($ref)) */ if ($result > 0) { - $head=product_prepare_head($object, $user); + $head=product_prepare_head($object); $titre=$langs->trans("CardProduct".$object->type); $picto=($object->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'margin', $titre, 0, $picto); diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php index 84140ee3f6a..260c8996fc4 100644 --- a/htdocs/product/canvas/product/actions_card_product.class.php +++ b/htdocs/product/canvas/product/actions_card_product.class.php @@ -138,7 +138,7 @@ class ActionsCardProduct if ($action == 'view') { - $head = product_prepare_head($this->object,$user); + $head = product_prepare_head($this->object); $this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref'); diff --git a/htdocs/product/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php index 5926beab083..f7de783cd99 100644 --- a/htdocs/product/canvas/service/actions_card_service.class.php +++ b/htdocs/product/canvas/service/actions_card_service.class.php @@ -137,7 +137,7 @@ class ActionsCardService if ($action == 'view') { - $head = product_prepare_head($this->object,$user); + $head = product_prepare_head($this->object); $this->tpl['showrefnav'] = $form->showrefnav($this->object,'ref','',1,'ref'); diff --git a/htdocs/product/card.php b/htdocs/product/card.php index eecec0705f7..1803c35629b 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1306,7 +1306,7 @@ else // Fiche en mode visu else { - $head=product_prepare_head($object, $user); + $head=product_prepare_head($object); $titre=$langs->trans("CardProduct".$object->type); $picto=($object->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'card', $titre, 0, $picto); diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 96f2a589429..fc3a41a8861 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -174,7 +174,7 @@ if ($action == 'search') llxHeader("","",$langs->trans("CardProduct".$object->type)); -$head=product_prepare_head($object, $user); +$head=product_prepare_head($object); $titre=$langs->trans("CardProduct".$object->type); $picto=($object->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'subproduct', $titre, 0, $picto); diff --git a/htdocs/product/document.php b/htdocs/product/document.php index 9a71eac4f55..810a131be60 100644 --- a/htdocs/product/document.php +++ b/htdocs/product/document.php @@ -100,7 +100,7 @@ llxHeader("","",$langs->trans("CardProduct".$object->type)); if ($object->id) { - $head=product_prepare_head($object, $user); + $head=product_prepare_head($object); $titre=$langs->trans("CardProduct".$object->type); $picto=($object->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'documents', $titre, 0, $picto); diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index c2196aba00b..f35e6628ad6 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -143,7 +143,7 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel")) $_POST["price"] = 0; } } - + $product = new ProductFournisseur($db); $result=$product->fetch($id); if ($result <= 0) @@ -191,7 +191,7 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel")) } else { - if ($price_expression !== '') + if ($price_expression !== '') { //Check the expression validity by parsing it $priceparser = new PriceParser($db); @@ -257,7 +257,7 @@ if ($id || $ref) * En mode visu */ - $head=product_prepare_head($product, $user); + $head=product_prepare_head($product); $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'suppliers', $titre, 0, $picto); @@ -323,7 +323,7 @@ if ($id || $ref) $supplier->fetch($socid); print $supplier->getNomUrl(1); print ''; - print ''; + print ''; print ''; } else @@ -380,7 +380,7 @@ if ($id || $ref) { print ''; } - print ''; + print ''; // Vat rate $default_vat=''; @@ -450,7 +450,7 @@ if ($id || $ref) print ''; print ''; - + // Delai livraison jours print ''; print ''.$langs->trans('NbDaysToDelivery').''; diff --git a/htdocs/product/photos.php b/htdocs/product/photos.php index 8a6e2ddbd6b..c6245cf203c 100644 --- a/htdocs/product/photos.php +++ b/htdocs/product/photos.php @@ -100,7 +100,7 @@ if ($object->id) /* * En mode visu */ - $head=product_prepare_head($object, $user); + $head=product_prepare_head($object); $titre=$langs->trans("CardProduct".$object->type); $picto=($object->type== Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'photos', $titre, 0, $picto); diff --git a/htdocs/product/price.php b/htdocs/product/price.php index 3e7ba24d3dd..2c9ab9a7794 100644 --- a/htdocs/product/price.php +++ b/htdocs/product/price.php @@ -353,7 +353,7 @@ if (! empty($id) || ! empty($ref)) llxHeader("", "", $langs->trans("CardProduct" . $object->type)); -$head = product_prepare_head($object, $user); +$head = product_prepare_head($object); $titre = $langs->trans("CardProduct" . $object->type); $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product'); dol_fiche_head($head, 'price', $titre, 0, $picto); diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php index 788068ea5ec..ce161a1af60 100644 --- a/htdocs/product/stats/card.php +++ b/htdocs/product/stats/card.php @@ -67,7 +67,7 @@ if (! empty($id) || ! empty($ref)) if ($result) { - $head=product_prepare_head($object, $user); + $head=product_prepare_head($object); $titre=$langs->trans("CardProduct".$object->type); $picto=($object->type==Product::TYPE_SERVICE?'service':'product'); diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 81b251d795b..7dcf6139534 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -89,7 +89,7 @@ if ($id > 0 || ! empty($ref)) if ($result > 0) { - $head=product_prepare_head($product, $user); + $head=product_prepare_head($product); $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index f0444356bcc..e6ced5ad905 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref)) { llxHeader("", "", $langs->trans("CardProduct" . $product->type)); if ($result > 0) { - $head = product_prepare_head($product, $user); + $head = product_prepare_head($product); $titre = $langs->trans("CardProduct" . $product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index aa535f02575..d098ca3399b 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -79,7 +79,7 @@ if ($id > 0 || ! empty($ref)) if ($result > 0) { - $head=product_prepare_head($product,$user); + $head=product_prepare_head($product); $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index c0fa1481269..1f4e9b985e5 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -90,7 +90,7 @@ if ($id > 0 || ! empty($ref)) if ($result > 0) { - $head=product_prepare_head($product, $user); + $head=product_prepare_head($product); $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); @@ -148,7 +148,7 @@ if ($id > 0 || ! empty($ref)) if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id; if ($socid) $sql.= " AND f.fk_soc = ".$socid; $sql.= " ORDER BY $sortfield $sortorder "; - + //Calcul total qty and amount for global if full scan list $total_ht=0; $total_qty=0; @@ -163,21 +163,21 @@ if ($id > 0 || ! empty($ref)) } } } - + $sql.= $db->plimit($conf->liste_limit +1, $offset); $result = $db->query($sql); - if ($result) + if ($result) { $num = $db->num_rows($result); - + if (! empty($id)) $option .= '&id='.$product->id; if (! empty($search_month)) $option .= '&search_month='.$search_month; if (! empty($search_year)) $option .= '&search_year='.$search_year; - + print '
    ' . "\n"; if (! empty($sortfield)) print ''; @@ -187,7 +187,7 @@ if ($id > 0 || ! empty($ref)) print ''; $option .= '&page=' . $page; } - + print_barre_liste($langs->trans("CustomersInvoices"),$page,$_SERVER["PHP_SELF"],"&id=".$product->id,$sortfield,$sortorder,'',$num,$totalrecords,''); print '
    '; print $langs->trans('Period').' ('.$langs->trans("DateInvoice") .') - '; @@ -235,7 +235,7 @@ if ($id > 0 || ! empty($ref)) print ''.$invoicestatic->LibStatut($objp->paye,$objp->statut,5).''; print "\n"; $i++; - + if (!empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { $total_ht+=$objp->total_ht; $total_qty+=$objp->qty; diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index 275a2ff8604..debb0698c44 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -82,52 +82,52 @@ if ($id > 0 || ! empty($ref)) { $product = new Product($db); $result = $product->fetch($id, $ref); - + $parameters = array('id' => $id); $reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - + llxHeader("", "", $langs->trans("CardProduct" . $product->type)); - + if ($result > 0) { - $head = product_prepare_head($product, $user); + $head = product_prepare_head($product); $titre = $langs->trans("CardProduct" . $product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); - + $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - + print ''; - + // Reference print ''; print ''; print ''; - + // Libelle print ''; print ''; - + // Status (to sell) print ''; - + // Status (to buy) print ''; - + show_stats_for_company($product, $socid); - + print "
    ' . $langs->trans("Ref") . ''; print $form->showrefnav($product, 'ref', '', 1, 'ref'); print '
    ' . $langs->trans("Label") . '' . $product->libelle . '
    ' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')'; print $product->getLibStatut(2, 0); print '
    ' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')'; print $product->getLibStatut(2, 1); print '
    "; - + print '
    '; - + if ($user->rights->fournisseur->facture->lire) { $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, f.ref, d.total_ht as total_ht,"; @@ -142,14 +142,14 @@ if ($id > 0 || ! empty($ref)) $sql .= " AND f.entity = " . $conf->entity; $sql .= " AND d.fk_facture_fourn = f.rowid"; $sql .= " AND d.fk_product =" . $product->id; - if (! empty($search_month)) + if (! empty($search_month)) $sql .= ' AND MONTH(f.datef) IN (' . $search_month . ')'; - if (! empty($search_year)) + if (! empty($search_year)) $sql .= ' AND YEAR(f.datef) IN (' . $search_year . ')'; if (! $user->rights->societe->client->voir && ! $socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id; if ($socid) $sql .= " AND f.fk_soc = " . $socid; $sql .= " ORDER BY $sortfield $sortorder "; - + // Calcul total qty and amount for global if full scan list $total_ht = 0; $total_qty = 0; @@ -164,21 +164,21 @@ if ($id > 0 || ! empty($ref)) } } } - + $sql .= $db->plimit($conf->liste_limit + 1, $offset); - + $result = $db->query($sql); if ($result) { $num = $db->num_rows($result); - + if (! empty($id)) $option .= '&id=' . $product->id; if (! empty($search_month)) $option .= '&search_month=' . $search_month; if (! empty($search_year)) $option .= '&search_year=' . $search_year; - + print '' . "\n"; if (! empty($sortfield)) print ''; @@ -199,7 +199,7 @@ if ($id > 0 || ! empty($ref)) print ''; print '
    '; print '
    '; - + $i = 0; print ''; print ''; @@ -211,7 +211,7 @@ if ($id > 0 || ! empty($ref)) print_liste_field_titre($langs->trans("AmountHT"), $_SERVER["PHP_SELF"], "f.total_ht", "", $option, 'align="right"', $sortfield, $sortorder); print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder); print "\n"; - + if ($num > 0) { $var = True; @@ -219,7 +219,7 @@ if ($id > 0 || ! empty($ref)) { $objp = $db->fetch_object($result); $var = ! $var; - + print ''; print ''; print "\n"; $i ++; - + if (! empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { $total_ht += $objp->total_ht; $total_qty += $objp->qty; diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php index 4eae4c238e1..1776ba571e0 100644 --- a/htdocs/product/stats/propal.php +++ b/htdocs/product/stats/propal.php @@ -80,52 +80,52 @@ if ($id > 0 || ! empty($ref)) { $product = new Product($db); $result = $product->fetch($id, $ref); - + $parameters = array ('id' => $id); $reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - + llxHeader("", "", $langs->trans("CardProduct" . $product->type)); - + if ($result > 0) { - $head = product_prepare_head($product, $user); + $head = product_prepare_head($product); $titre = $langs->trans("CardProduct" . $product->type); $picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product'); dol_fiche_head($head, 'referers', $titre, 0, $picto); - + $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); - + print '
    '; $supplierinvoicestatic->id = $objp->facid; @@ -236,7 +236,7 @@ if ($id > 0 || ! empty($ref)) print '' . $supplierinvoicestatic->LibStatut($objp->paye, $objp->statut, 5) . '
    '; - + // Reference print ''; print ''; print ''; - + // Libelle print ''; print ''; - + // Status (to sell) print ''; - + // Status (to buy) print ''; - + show_stats_for_company($product, $socid); - + print "
    ' . $langs->trans("Ref") . ''; print $form->showrefnav($product, 'ref', '', 1, 'ref'); print '
    ' . $langs->trans("Label") . '' . $product->libelle . '
    ' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')'; print $product->getLibStatut(2, 0); print '
    ' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')'; print $product->getLibStatut(2, 1); print '
    "; - + print ''; - + if ($user->rights->propale->lire) { $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, d.total_ht as amount,"; $sql .= " p.ref_client,"; @@ -150,7 +150,7 @@ if ($id > 0 || ! empty($ref)) if ($socid) $sql .= " AND p.fk_soc = " . $socid; $sql .= " ORDER BY $sortfield $sortorder "; - + // Calcul total qty and amount for global if full scan list $total_ht = 0; $total_qty = 0; @@ -165,21 +165,21 @@ if ($id > 0 || ! empty($ref)) } } } - + $sql .= $db->plimit($conf->liste_limit + 1, $offset); - + $result = $db->query($sql); if ($result) { $num = $db->num_rows($result); - + if (! empty($id)) $option .= '&id=' . $product->id; if (! empty($search_month)) $option .= '&search_month=' . $search_month; if (! empty($search_year)) $option .= '&search_year=' . $search_year; - + print '' . "\n"; if (! empty($sortfield)) print ''; @@ -189,7 +189,7 @@ if ($id > 0 || ! empty($ref)) print ''; $option .= '&page=' . $page; } - + print_barre_liste($langs->trans("Proposals"), $page, $_SERVER["PHP_SELF"], "&id=$product->id", $sortfield, $sortorder, '', $num, $totalrecords, ''); print '
    '; print $langs->trans('Period') . ' (' . $langs->trans("DatePropal") . ') - '; @@ -200,7 +200,7 @@ if ($id > 0 || ! empty($ref)) print ''; print '
    '; print ''; - + $i = 0; print ''; print ''; @@ -211,7 +211,7 @@ if ($id > 0 || ! empty($ref)) print_liste_field_titre($langs->trans("AmountHT"), $_SERVER["PHP_SELF"], "p.total", "", $option, 'align="right"', $sortfield, $sortorder); print_liste_field_titre($langs->trans("Status"), $_SERVER["PHP_SELF"], "p.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder); print "\n"; - + if ($num > 0) { $var = True; @@ -219,7 +219,7 @@ if ($id > 0 || ! empty($ref)) { $objp = $db->fetch_object($result); $var = ! $var; - + print ''; print ''; print "\n"; $i ++; - + if (! empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) { $total_ht += $objp->total_ht; $total_qty += $objp->qty; } } - } + } print ''; print ''; print ''; @@ -251,12 +251,12 @@ if ($id > 0 || ! empty($ref)) print ''; print "
    '; $propalstatic->id=$objp->propalid; @@ -236,13 +236,13 @@ if ($id > 0 || ! empty($ref)) print '' . $propalstatic->LibStatut($objp->statut, 5) . '
    ' . $langs->trans('Total') . '
    "; print ''; - print '
    '; + print '
    '; } else { dol_print_error($db); } $db->free($result); - } + } } } else { dol_print_error(); diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index d4a190a482a..c6942e8c8e2 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -384,7 +384,7 @@ if ($id > 0 || $ref) if ($result > 0) { - $head=product_prepare_head($product, $user); + $head=product_prepare_head($product); $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'stock', $titre, 0, $picto); diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php index 480f739285d..413cb589dff 100644 --- a/htdocs/product/traduction.php +++ b/htdocs/product/traduction.php @@ -143,7 +143,7 @@ $cancel != $langs->trans("Cancel") && $product->fetch($id); $langtodelete=GETPOST('langdel','alpha'); - + if ( $product->delMultiLangs($langtodelete) > 0 ) { $action = ''; @@ -168,7 +168,7 @@ llxHeader("","",$langs->trans("Translation")); $form = new Form($db); $formadmin=new FormAdmin($db); -$head=product_prepare_head($product, $user); +$head=product_prepare_head($product); $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type==Product::TYPE_SERVICE?'service':'product'); dol_fiche_head($head, 'translation', $titre, 0, $picto); diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 881946cb1cd..3dd00e8d860 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -291,7 +291,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("CompanySetup"),$linkback,'setup'); -$head = societe_admin_prepare_head(null); +$head = societe_admin_prepare_head(); dol_fiche_head($head, 'general', $langs->trans("ThirdParties"), 0, 'company'); diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php index 928cac01f7c..a680703e811 100644 --- a/htdocs/societe/admin/societe_extrafields.php +++ b/htdocs/societe/admin/societe_extrafields.php @@ -69,7 +69,7 @@ $linkback=''.$langs->trans("BackToM print_fiche_titre($langs->trans("CompanySetup"),$linkback,'setup'); -$head = societe_admin_prepare_head(null); +$head = societe_admin_prepare_head(); dol_fiche_head($head, 'attributes', $langs->trans("ThirdParties"), 0, 'company'); From 7a2942684cffef8e02bc8994cec776b108c5d655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 7 Apr 2015 12:45:25 +0200 Subject: [PATCH 347/412] Fix #2559 Bug: Untranslated "Total" in Bank module --- htdocs/compta/bank/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index c9b70e94257..c74c5509139 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -130,7 +130,7 @@ if (! $found) print ''.$langs->trans("None").' // Total foreach ($total as $key=>$solde) { - print ''.$langs->trans("Total ").$key.''.price($solde, 0, $langs, 0, 0, -1, $key).''; + print ''.$langs->trans("Total").' '.$key.''.price($solde, 0, $langs, 0, 0, -1, $key).''; } print ''; From 0dc7bc0ddbc4310a1eced84c0f8cc543d6749901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 7 Apr 2015 12:54:10 +0200 Subject: [PATCH 348/412] Add badge --- htdocs/core/lib/loan.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php index be04beb1d9a..1dcd2fea7f9 100644 --- a/htdocs/core/lib/loan.lib.php +++ b/htdocs/core/lib/loan.lib.php @@ -62,7 +62,7 @@ function loan_prepare_head($object) $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); $head[$tab][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id; $head[$tab][1] = $langs->trans("Documents"); - if($nbFiles > 0) $head[$tab][1].= ' ('.$nbFiles.')'; + if($nbFiles > 0) $head[$tab][1].= ' '.$nbFiles.''; $head[$tab][2] = 'documents'; $tab++; @@ -74,4 +74,4 @@ function loan_prepare_head($object) complete_head_from_modules($conf,$langs,$object,$head,$tab,'loan','remove'); return $head; -} \ No newline at end of file +} From 547b7d5f91f6f79cb620322fa62255be5ced3a3b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 7 Apr 2015 18:14:20 +0200 Subject: [PATCH 349/412] Fix #2539 --- htdocs/install/mysql/migration/3.7.0-3.8.0.sql | 5 +++-- htdocs/install/mysql/tables/llx_commande.sql | 4 +++- htdocs/install/mysql/tables/llx_commande_fournisseur.sql | 2 ++ htdocs/install/mysql/tables/llx_expedition.sql | 4 +++- htdocs/install/mysql/tables/llx_facture.sql | 3 +++ htdocs/install/mysql/tables/llx_facture_fourn.sql | 8 +++++--- htdocs/install/mysql/tables/llx_livraison.sql | 4 +++- htdocs/install/mysql/tables/llx_propal.sql | 2 ++ htdocs/install/mysql/tables/llx_societe.sql | 2 ++ 9 files changed, 26 insertions(+), 8 deletions(-) diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql index d8f47651153..6af1a0fe647 100644 --- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql +++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql @@ -378,6 +378,9 @@ CREATE TABLE llx_askpricesupplierdet_extrafields ( -- End Module AskPriceSupplier -- +ALTER TABLE llx_commande_fournisseur ADD COLUMN date_approve2 datetime after date_approve; +ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_approve2 integer after fk_user_approve; + ALTER TABLE llx_societe ADD COLUMN fk_incoterms integer; ALTER TABLE llx_societe ADD COLUMN location_incoterms varchar(255); ALTER TABLE llx_propal ADD COLUMN fk_incoterms integer; @@ -386,8 +389,6 @@ ALTER TABLE llx_commande ADD COLUMN fk_incoterms integer; ALTER TABLE llx_commande ADD COLUMN location_incoterms varchar(255); ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_incoterms integer; ALTER TABLE llx_commande_fournisseur ADD COLUMN location_incoterms varchar(255); -ALTER TABLE llx_commande_fournisseur ADD COLUMN date_approve2 datetime after date_approve; -ALTER TABLE llx_commande_fournisseur ADD COLUMN fk_user_approve2 integer after fk_user_approve; ALTER TABLE llx_facture ADD COLUMN fk_incoterms integer; ALTER TABLE llx_facture ADD COLUMN location_incoterms varchar(255); ALTER TABLE llx_facture_fourn ADD COLUMN fk_incoterms integer; diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql index 7bf22df1a1d..3511aa7ec78 100644 --- a/htdocs/install/mysql/tables/llx_commande.sql +++ b/htdocs/install/mysql/tables/llx_commande.sql @@ -62,10 +62,12 @@ create table llx_commande fk_mode_reglement integer, -- mode de reglement date_livraison date default NULL, - fk_shipping_method integer, -- shipping method id + fk_shipping_method integer, -- shipping method id fk_availability integer NULL, fk_input_reason integer, -- id coming from c_input_reason, '0' if no defined fk_delivery_address integer, -- delivery address (deprecated) + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms import_key varchar(14), extraparams varchar(255) -- for stock other parameters with json format diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql index 247c8e8d6af..33588d8bf66 100644 --- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql +++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql @@ -62,6 +62,8 @@ create table llx_commande_fournisseur fk_cond_reglement integer, -- condition de reglement fk_mode_reglement integer, -- mode de reglement fk_input_method integer default 0, -- id coming from c_input_reason, '0' if no defined + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms import_key varchar(14), extraparams varchar(255) -- for stock other parameters with json format diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql index 0a152b13069..d142a5cc628 100644 --- a/htdocs/install/mysql/tables/llx_expedition.sql +++ b/htdocs/install/mysql/tables/llx_expedition.sql @@ -50,6 +50,8 @@ create table llx_expedition weight float, -- weight note_private text, note_public text, - model_pdf varchar(255) + model_pdf varchar(255), + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255) -- for incoterms )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql index eada5b46c2e..93a376c599c 100644 --- a/htdocs/install/mysql/tables/llx_facture.sql +++ b/htdocs/install/mysql/tables/llx_facture.sql @@ -75,6 +75,9 @@ create table llx_facture note_private text, note_public text, model_pdf varchar(255), + + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms import_key varchar(14), extraparams varchar(255), -- for stock other parameters with json format diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql index 33773b7a9cb..703b86841f9 100644 --- a/htdocs/install/mysql/tables/llx_facture_fourn.sql +++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql @@ -60,12 +60,14 @@ create table llx_facture_fourn fk_projet integer, -- projet auquel est associee la facture fk_account integer, -- bank account - fk_cond_reglement integer, -- condition de reglement (30 jours, fin de mois ...) - fk_mode_reglement integer, -- mode de reglement (CHQ, VIR, ...) - date_lim_reglement date, -- date limite de reglement + fk_cond_reglement integer, -- condition de reglement (30 jours, fin de mois ...) + fk_mode_reglement integer, -- mode de reglement (CHQ, VIR, ...) + date_lim_reglement date, -- date limite de reglement note_private text, note_public text, + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms model_pdf varchar(255), import_key varchar(14), extraparams varchar(255) -- for stock other parameters with json format diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql index 486212158aa..ed97eb33f94 100644 --- a/htdocs/install/mysql/tables/llx_livraison.sql +++ b/htdocs/install/mysql/tables/llx_livraison.sql @@ -39,6 +39,8 @@ create table llx_livraison total_ht double(24,8) DEFAULT 0, note_private text, note_public text, - model_pdf varchar(255) + model_pdf varchar(255), + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255) -- for incoterms )ENGINE=innodb; diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql index 90996073021..8090b1fcb4d 100644 --- a/htdocs/install/mysql/tables/llx_propal.sql +++ b/htdocs/install/mysql/tables/llx_propal.sql @@ -65,6 +65,8 @@ create table llx_propal fk_shipping_method integer, -- shipping method id fk_availability integer NULL, fk_input_reason integer, + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms import_key varchar(14), extraparams varchar(255), -- for stock other parameters with json format fk_delivery_address integer -- delivery address (deprecated) diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql index e28cf062224..b3464f9fc1f 100644 --- a/htdocs/install/mysql/tables/llx_societe.sql +++ b/htdocs/install/mysql/tables/llx_societe.sql @@ -70,6 +70,8 @@ create table llx_societe fournisseur tinyint DEFAULT 0, -- fournisseur 0/1 supplier_account varchar(32), -- compte client chez un fournisseur fk_prospectlevel varchar(12), -- prospect level (in llx_c_prospectlevel) + fk_incoterms integer, -- for incoterms + location_incoterms varchar(255), -- for incoterms customer_bad tinyint DEFAULT 0, -- mauvais payeur 0/1 customer_rate real DEFAULT 0, -- taux fiabilite client (0 a 1) supplier_rate real DEFAULT 0, -- taux fiabilite fournisseur (0 a 1) From 06c749942a8ec344bb6c66483d19ebcb1e04b081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 7 Apr 2015 18:40:19 +0200 Subject: [PATCH 350/412] Update index.php --- htdocs/compta/bank/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php index c74c5509139..553979f51c3 100644 --- a/htdocs/compta/bank/index.php +++ b/htdocs/compta/bank/index.php @@ -179,7 +179,7 @@ if (! $found) print ''.$langs->trans("None").' // Total foreach ($total as $key=>$solde) { - print ''.$langs->trans("Total ").$key.''.price($solde, 0, $langs, 0, 0, -1, $key).''; + print ''.$langs->trans("Total").' '.$key.''.price($solde, 0, $langs, 0, 0, -1, $key).''; } print ''; @@ -238,7 +238,7 @@ if (! $found) print ''.$langs->trans("None").' // Total foreach ($total as $key=>$solde) { - print ''.$langs->trans("Total ").$key.''.price($solde, 0, $langs, 0, 0, -1, $key).''; + print ''.$langs->trans("Total").' '.$key.''.price($solde, 0, $langs, 0, 0, -1, $key).''; } print ""; From 345b609ff05bb0edf8a943fdebdb479fc35418fe Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 7 Apr 2015 18:41:40 +0200 Subject: [PATCH 351/412] Closes #2545 Bug: Missing object_margin.png in Amarok theme --- ChangeLog | 1 + htdocs/theme/amarok/img/object_margin.png | Bin 0 -> 579 bytes 2 files changed, 1 insertion(+) create mode 100644 htdocs/theme/amarok/img/object_margin.png diff --git a/ChangeLog b/ChangeLog index 34c26a04e18..bc57dfce49b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -34,6 +34,7 @@ English Dolibarr ChangeLog - Fix: [ bug #2543 ] Untranslated "Contract" origin string when creating an invoice from a contract - Fix: [ bug #2534 ] SQL error when editing a supplier invoice line - Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project +- Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/theme/amarok/img/object_margin.png b/htdocs/theme/amarok/img/object_margin.png new file mode 100644 index 0000000000000000000000000000000000000000..13e4b92c9ce2e0a3698d31fcfc2b82704653f7a0 GIT binary patch literal 579 zcmV-J0=)f+P)AcnU72+nI~k7O&wbPhKp(25S7yLez;ORgKES18>^qZMxkS#t4;4mP!Tkxe+YuKR~p# z$@oMS%NT}+&HxFcfQVpOE|z7b`l*-e*o5sSUdH9q`!{4z zY}=+hGKO=k6tl2Go9vMSK*{xkcH6fG93;^_SAQs`< z{(cHnFI|}=th_KaaqN?Qc zCjh-}k1uO$6!RW|XLIq=Wef@DrfbBaWOD(c3Aube1@!k|XJ_aB{QRpKpjs>h)nXxF zV!T4J5a9bh)6?g%EknKjAqAw@>R4{yeRvJ19-WzA_asS(wl*I>ee~caz)y}P@RPTh R<>vqZ002ovPDHLkV1h?{2Q~lz literal 0 HcmV?d00001 From 2dfaf08f6188400038fb6ee32f7d6f67eeba545c Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 7 Apr 2015 18:54:38 +0200 Subject: [PATCH 352/412] Closes #2545 Bug: Missing object_margin.png in Amarok theme Conflicts: ChangeLog --- ChangeLog | 4 ++++ htdocs/theme/amarok/img/object_margin.png | Bin 0 -> 579 bytes 2 files changed, 4 insertions(+) create mode 100644 htdocs/theme/amarok/img/object_margin.png diff --git a/ChangeLog b/ChangeLog index 456f58e3d60..22a6f55fda4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -209,6 +209,10 @@ Dolibarr better: - Fix: Bad SEPA xml file creation - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment - Fix: Showing system error if not enough stock of product into orders creation with lines +- Fix: [ bug #2543 ] Untranslated "Contract" origin string when creating an invoice from a contract +- Fix: [ bug #2534 ] SQL error when editing a supplier invoice line +- Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project +- Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/theme/amarok/img/object_margin.png b/htdocs/theme/amarok/img/object_margin.png new file mode 100644 index 0000000000000000000000000000000000000000..13e4b92c9ce2e0a3698d31fcfc2b82704653f7a0 GIT binary patch literal 579 zcmV-J0=)f+P)AcnU72+nI~k7O&wbPhKp(25S7yLez;ORgKES18>^qZMxkS#t4;4mP!Tkxe+YuKR~p# z$@oMS%NT}+&HxFcfQVpOE|z7b`l*-e*o5sSUdH9q`!{4z zY}=+hGKO=k6tl2Go9vMSK*{xkcH6fG93;^_SAQs`< z{(cHnFI|}=th_KaaqN?Qc zCjh-}k1uO$6!RW|XLIq=Wef@DrfbBaWOD(c3Aube1@!k|XJ_aB{QRpKpjs>h)nXxF zV!T4J5a9bh)6?g%EknKjAqAw@>R4{yeRvJ19-WzA_asS(wl*I>ee~caz)y}P@RPTh R<>vqZ002ovPDHLkV1h?{2Q~lz literal 0 HcmV?d00001 From a0de33912ef1274bde7f751a465dfc22795b0c2e Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 7 Apr 2015 18:54:38 +0200 Subject: [PATCH 353/412] Closes #2545 Bug: Missing object_margin.png in Amarok theme Conflicts: ChangeLog --- ChangeLog | 4 ++++ htdocs/theme/amarok/img/object_margin.png | Bin 0 -> 579 bytes 2 files changed, 4 insertions(+) create mode 100644 htdocs/theme/amarok/img/object_margin.png diff --git a/ChangeLog b/ChangeLog index 6ed93c77235..6617e8af742 100644 --- a/ChangeLog +++ b/ChangeLog @@ -243,6 +243,10 @@ Dolibarr better: - Fix: Bad SEPA xml file creation - Fix: [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment - Fix: Showing system error if not enough stock of product into orders creation with lines +- Fix: [ bug #2543 ] Untranslated "Contract" origin string when creating an invoice from a contract +- Fix: [ bug #2534 ] SQL error when editing a supplier invoice line +- Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project +- Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/theme/amarok/img/object_margin.png b/htdocs/theme/amarok/img/object_margin.png new file mode 100644 index 0000000000000000000000000000000000000000..13e4b92c9ce2e0a3698d31fcfc2b82704653f7a0 GIT binary patch literal 579 zcmV-J0=)f+P)AcnU72+nI~k7O&wbPhKp(25S7yLez;ORgKES18>^qZMxkS#t4;4mP!Tkxe+YuKR~p# z$@oMS%NT}+&HxFcfQVpOE|z7b`l*-e*o5sSUdH9q`!{4z zY}=+hGKO=k6tl2Go9vMSK*{xkcH6fG93;^_SAQs`< z{(cHnFI|}=th_KaaqN?Qc zCjh-}k1uO$6!RW|XLIq=Wef@DrfbBaWOD(c3Aube1@!k|XJ_aB{QRpKpjs>h)nXxF zV!T4J5a9bh)6?g%EknKjAqAw@>R4{yeRvJ19-WzA_asS(wl*I>ee~caz)y}P@RPTh R<>vqZ002ovPDHLkV1h?{2Q~lz literal 0 HcmV?d00001 From 35a6ed90a04ff841aad672e47b8bd303cecedbbd Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 7 Apr 2015 20:02:12 +0200 Subject: [PATCH 354/412] Solves #2542 Bug: Contracts store localtax preferences --- ChangeLog | 1 + htdocs/compta/facture.php | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc57dfce49b..a69eab23790 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,7 @@ English Dolibarr ChangeLog - Fix: [ bug #2534 ] SQL error when editing a supplier invoice line - Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project - Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme +- Fix: [ bug #2542 ] Contracts store localtax preferences ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index d5c11cf5b63..4a2b13b0069 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -5,7 +5,7 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2010-2013 Juanjo Menent + * Copyright (C) 2010-2015 Juanjo Menent * Copyright (C) 2012-2013 Christophe Battarel * Copyright (C) 2013 Jean-Francois FERRY * Copyright (C) 2013-2014 Florian Henry @@ -991,8 +991,12 @@ if (empty($reshook)) { $lines [$i]->fetch_optionals($lines [$i]->rowid); $array_option = $lines [$i]->array_options; } + + // View third's localtaxes for now + $localtax1_tx = get_localtax($lines[$i]->tva_tx, 1, $object->client); + $localtax2_tx = get_localtax($lines[$i]->tva_tx, 2, $object->client); - $result = $object->addline($desc, $lines [$i]->subprice, $lines [$i]->qty, $lines [$i]->tva_tx, $lines [$i]->localtax1_tx, $lines [$i]->localtax2_tx, $lines [$i]->fk_product, $lines [$i]->remise_percent, $date_start, $date_end, 0, $lines [$i]->info_bits, $lines [$i]->fk_remise_except, 'HT', 0, $product_type, $lines [$i]->rang, $lines [$i]->special_code, $object->origin, $lines [$i]->rowid, $fk_parent_line, $lines [$i]->fk_fournprice, $lines [$i]->pa_ht, $label, $array_option); + $result = $object->addline($desc, $lines [$i]->subprice, $lines [$i]->qty, $lines [$i]->tva_tx, $localtax1_tx, $localtax2_tx, $lines [$i]->fk_product, $lines [$i]->remise_percent, $date_start, $date_end, 0, $lines [$i]->info_bits, $lines [$i]->fk_remise_except, 'HT', 0, $product_type, $lines [$i]->rang, $lines [$i]->special_code, $object->origin, $lines [$i]->rowid, $fk_parent_line, $lines [$i]->fk_fournprice, $lines [$i]->pa_ht, $label, $array_option); if ($result > 0) { $lineid = $result; From 1ab70a70869575a9aa5a874ce46c781b0c353dfb Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 7 Apr 2015 20:05:56 +0200 Subject: [PATCH 355/412] Solves #2542 Bug: Contracts store localtax preferences Conflicts: htdocs/compta/facture.php --- ChangeLog | 1 + htdocs/compta/facture.php | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22a6f55fda4..619cae68ef4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -213,6 +213,7 @@ Dolibarr better: - Fix: [ bug #2534 ] SQL error when editing a supplier invoice line - Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project - Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme +- Fix: [ bug #2542 ] Contracts store localtax preferences ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 87cbbec398b..903844ece09 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -5,7 +5,7 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2010-2013 Juanjo Menent + * Copyright (C) 2010-2015 Juanjo Menent * Copyright (C) 2012-2013 Christophe Battarel * Copyright (C) 2013 Jean-Francois FERRY * Copyright (C) 2013-2014 Florian Henry @@ -1045,8 +1045,12 @@ if (empty($reshook)) $lines[$i]->fetch_optionals($lines[$i]->rowid); $array_option = $lines[$i]->array_options; } + + // View third's localtaxes for now + $localtax1_tx = get_localtax($lines[$i]->tva_tx, 1, $object->client); + $localtax2_tx = get_localtax($lines[$i]->tva_tx, 2, $object->client); - $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option); + $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_option); if ($result > 0) { $lineid = $result; From c2bc2c9ea64701563a22e582e18bafba3ec3aafc Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 7 Apr 2015 20:10:27 +0200 Subject: [PATCH 356/412] Solves #2542 Bug: Contracts store localtax preferences Conflicts: htdocs/compta/facture.php --- ChangeLog | 1 + htdocs/compta/facture.php | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6617e8af742..51fed6df120 100644 --- a/ChangeLog +++ b/ChangeLog @@ -247,6 +247,7 @@ Dolibarr better: - Fix: [ bug #2534 ] SQL error when editing a supplier invoice line - Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project - Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme +- Fix: [ bug #2542 ] Contracts store localtax preferences ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index e8f3bde2fd9..75f829be46e 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -5,7 +5,7 @@ * Copyright (C) 2005 Marc Barilley / Ocebo * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2006 Andre Cianfarani - * Copyright (C) 2010-2013 Juanjo Menent + * Copyright (C) 2010-2015 Juanjo Menent * Copyright (C) 2012-2013 Christophe Battarel * Copyright (C) 2012-2013 Cédric Salvador * Copyright (C) 2012-2014 Raphaël Doursenaud @@ -1076,8 +1076,12 @@ if (empty($reshook)) $lines[$i]->fetch_optionals($lines[$i]->rowid); $array_options = $lines[$i]->array_options; } + + // View third's localtaxes for now + $localtax1_tx = get_localtax($lines[$i]->tva_tx, 1, $object->client); + $localtax2_tx = get_localtax($lines[$i]->tva_tx, 2, $object->client); - $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id); + $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $lines[$i]->tva_tx, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options, $lines[$i]->situation_percent, $lines[$i]->fk_prev_id); if ($result > 0) { $lineid = $result; From 9d8cb459f1c935ee82ee315da5f505ed0e3ad23c Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 7 Apr 2015 20:28:45 +0200 Subject: [PATCH 357/412] Fix: Bad permission assignments for stock movements actions --- ChangeLog | 1 + htdocs/core/menus/init_menu_auguria.sql | 4 ++-- htdocs/core/menus/standard/eldy.lib.php | 6 +++--- htdocs/product/stock/mouvement.php | 3 ++- htdocs/product/stock/product.php | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a69eab23790..a55e95630d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,7 @@ English Dolibarr ChangeLog - Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project - Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme - Fix: [ bug #2542 ] Contracts store localtax preferences +- Fix: Bad permission assignments for stock movements actions ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index cf05e461e35..89c37098f2a 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -102,8 +102,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/liste.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3103__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/valo.php', 'EnhancedValue', 1, 'stocks', '$user->rights->stock->lire', '', 2, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3104__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->creer', '', 2, 5, __ENTITY__); -- Product - Categories insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3200__+MAX_llx_menu__, 'products', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&type=0', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index b42fc258c6d..273ea7f6336 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1,7 +1,7 @@ * Copyright (C) 2010 Regis Houssin - * Copyright (C) 2012-2013 Juanjo Menent + * Copyright (C) 2012-2015 Juanjo Menent * Copyright (C) 2013 Cédric Salvador * * This program is free software; you can redistribute it and/or modify @@ -1000,8 +1000,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/liste.php", $langs->trans("List"), 1, $user->rights->stock->lire); if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/valo.php", $langs->trans("EnhancedValue"), 1, $user->rights->stock->lire); if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/mouvement.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire); - if ($conf->fournisseur->enabled) if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); - if ($conf->fournisseur->enabled) if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); + if ($conf->fournisseur->enabled) if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire); + if (empty($leftmenu) || $leftmenu=="stock") $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->creer); } // Expeditions diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 1498b12a033..8794b00137d 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2006 Rodolphe Quiedeville * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005-2009 Regis Houssin + * Copyright (C) 2015 Juanjo Menent * * 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 @@ -387,7 +388,7 @@ if ($resql) { print "
    \n"; - if ($user->rights->stock->creer) + if ($user->rights->stock->mouvement->creer) { print ''.$langs->trans("StockCorrection").''; } diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 400c3c1f006..0241c0d4dcf 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -5,7 +5,7 @@ * Copyright (C) 2005 Simon TOSSER * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2013-2015 Juanjo Menent * Copyright (C) 2014 Cédric Gross * * This program is free software; you can redistribute it and/or modify @@ -543,7 +543,7 @@ if (empty($action) && $product->id) { print "
    \n"; - if ($user->rights->stock->creer) + if ($user->rights->stock->mouvement->creer) { print ''.$langs->trans("StockCorrection").''; } From d7ba9b3312ae22df2b7f0b4fbabdf38e3d948714 Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 7 Apr 2015 20:40:48 +0200 Subject: [PATCH 358/412] Fix: Bad permission assignments for stock movements actions Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/product/stock/mouvement.php --- ChangeLog | 1 + htdocs/core/menus/init_menu_auguria.sql | 4 ++-- htdocs/core/menus/standard/eldy.lib.php | 6 +++--- htdocs/product/stock/mouvement.php | 3 ++- htdocs/product/stock/product.php | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 619cae68ef4..61ef5f890d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -214,6 +214,7 @@ Dolibarr better: - Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project - Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme - Fix: [ bug #2542 ] Contracts store localtax preferences +- Fix: Bad permission assignments for stock movements actions ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index e550a20ad5f..a020f607acc 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -103,8 +103,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3101__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/card.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/list.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3104__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->creer', '', 2, 5, __ENTITY__); -- Product - Categories insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3200__+MAX_llx_menu__, 'products', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&type=0', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index c88c8375a41..6b94b251d50 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1,7 +1,7 @@ * Copyright (C) 2010 Regis Houssin - * Copyright (C) 2012-2014 Juanjo Menent + * Copyright (C) 2012-2015 Juanjo Menent * Copyright (C) 2013 Cédric Salvador * * This program is free software; you can redistribute it and/or modify @@ -1061,8 +1061,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer); $newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire); $newmenu->add("/product/stock/mouvement.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire); - if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); - if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); + if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire); + $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->creer); } // Expeditions diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 83d856ed0cc..177d8c5e0b3 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2006 Rodolphe Quiedeville * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2015 Juanjo Menent * * 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 @@ -387,7 +388,7 @@ if ($resql) { print "
    \n"; - if ($user->rights->stock->creer) + if ($user->rights->stock->mouvement->creer) { print ''.$langs->trans("StockCorrection").''; } diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index 9bc0cd6f9c3..6dad4256aef 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -5,7 +5,7 @@ * Copyright (C) 2005 Simon TOSSER * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2013-2015 Juanjo Menent * Copyright (C) 2014 Cédric Gross * * This program is free software; you can redistribute it and/or modify @@ -646,7 +646,7 @@ if (empty($action) && $product->id) { print "
    \n"; - if ($user->rights->stock->creer) + if ($user->rights->stock->mouvement->creer) { print ''.$langs->trans("StockCorrection").''; } From 1f4a1316910f02bb64f593a533c7d753b1df66aa Mon Sep 17 00:00:00 2001 From: Juanjo Menent Date: Tue, 7 Apr 2015 20:43:27 +0200 Subject: [PATCH 359/412] Fix: Bad permission assignments for stock movements actions Conflicts: htdocs/product/stock/product.php --- ChangeLog | 1 + htdocs/core/menus/init_menu_auguria.sql | 4 ++-- htdocs/core/menus/standard/eldy.lib.php | 6 +++--- htdocs/product/stock/mouvement.php | 3 ++- htdocs/product/stock/product.php | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 51fed6df120..618231d8937 100644 --- a/ChangeLog +++ b/ChangeLog @@ -248,6 +248,7 @@ Dolibarr better: - Fix: [ bug #2535 ] Untranslated string in "Linked objects" page of a project - Fix: [ bug #2545 ] Missing object_margin.png in Amarok theme - Fix: [ bug #2542 ] Contracts store localtax preferences +- Fix: Bad permission assignments for stock movements actions ***** ChangeLog for 3.6.2 compared to 3.6.1 ***** - Fix: fix ErrorBadValueForParamNotAString error message in price customer multiprice. diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index 37d074b9f16..f1db486bfc0 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -104,8 +104,8 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3101__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/card.php?action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3102__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/list.php', 'List', 1, 'stocks', '$user->rights->stock->lire', '', 2, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3104__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/mouvement.php', 'Movements', 1, 'stocks', '$user->rights->stock->mouvement->lire', '', 2, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire', '', 2, 5, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled && $conf->fournisseur->enabled', __HANDLER__, 'left', 3105__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/replenish.php', 'Replenishments', 1, 'stocks', '$user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire', '', 2, 4, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3106__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/massstockmove.php', 'StockTransfer', 1, 'stocks', '$user->rights->stock->mouvement->creer', '', 2, 5, __ENTITY__); -- Product - Categories insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3200__+MAX_llx_menu__, 'products', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?leftmenu=cat&type=0', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 069d672609c..09f4321e668 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -1,7 +1,7 @@ * Copyright (C) 2010 Regis Houssin - * Copyright (C) 2012-2014 Juanjo Menent + * Copyright (C) 2012-2015 Juanjo Menent * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2015 Marcos García * @@ -1094,8 +1094,8 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu $newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer); $newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire); $newmenu->add("/product/stock/mouvement.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire); - if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); - if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->lire && $user->rights->fournisseur->lire); + if ($conf->fournisseur->enabled) $newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire); + $newmenu->add("/product/stock/massstockmove.php", $langs->trans("StockTransfer"), 1, $user->rights->stock->mouvement->creer); } // Expeditions diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 44cf9df493f..9182708ec8d 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -2,6 +2,7 @@ /* Copyright (C) 2001-2006 Rodolphe Quiedeville * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005-2014 Regis Houssin + * Copyright (C) 2015 Juanjo Menent * * 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 @@ -400,7 +401,7 @@ if ($resql) { print "
    \n"; - if ($user->rights->stock->creer) + if ($user->rights->stock->mouvement->creer) { print ''.$langs->trans("StockCorrection").''; } diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index c6942e8c8e2..b5639228325 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -5,7 +5,7 @@ * Copyright (C) 2005 Simon TOSSER * Copyright (C) 2005-2009 Regis Houssin * Copyright (C) 2013 Cédric Salvador - * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2013-2015 Juanjo Menent * Copyright (C) 2014-2015 Cédric Gross * Copyright (C) 2015 Marcos García * @@ -803,7 +803,7 @@ if (empty($action) && $product->id) { print "
    \n"; - if ($user->rights->stock->creer) + if ($user->rights->stock->mouvement->creer) { print ''.$langs->trans("StockCorrection").''; } From bc69703888813ed705b301723c26a061e9415e86 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 00:07:46 +0200 Subject: [PATCH 360/412] Fix phpcs --- .../filemanagerdol/connectors/php/commands.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php index 0dc17d7313c..0449635aaac 100644 --- a/htdocs/core/filemanagerdol/connectors/php/commands.php +++ b/htdocs/core/filemanagerdol/connectors/php/commands.php @@ -23,9 +23,13 @@ */ /** - * @param string $currentFolder + * GetFolders + * + * @param string $resourceType Resource type + * @param string $currentFolder Current folder + * @return void */ -function GetFolders( $resourceType, $currentFolder ) +function GetFolders($resourceType, $currentFolder) { // Map the virtual path to the local server path. $sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFolders'); @@ -182,7 +186,13 @@ function CreateFolder( $resourceType, $currentFolder ) // DOL_CHANGE //function FileUpload( $resourceType, $currentFolder, $sCommand ) /** - * @param string $currentFolder + * FileUpload + * + * @param string $resourceType Resource type + * @param string $currentFolder Current folder + * @param string $sCommand Command + * @param string $CKEcallback Callback + * @return null */ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '') { From 369d6915b82b86f7d7bc48266e17f4410b04ad37 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 00:14:44 +0200 Subject: [PATCH 361/412] Fix: PHPCS --- htdocs/paypal/lib/paypal.lib.php | 67 ++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 76ea5ab4834..5eb4549f0fa 100644 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -415,36 +415,45 @@ function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$re } -/* - '------------------------------------------------------------------------------------------------------------------------------------------- - ' Purpose: Prepares the parameters for the SetExpressCheckout API Call. - ' Inputs: - ' paymentAmount: Total value of the shopping cart - ' currencyCodeType: Currency code value the PayPal API - ' paymentType: paymentType has to be one of the following values: Sale or Order or Authorization - ' returnURL: the page where buyers return to after they are done with the payment review on PayPal - ' cancelURL: the page where buyers return to when they cancel the payment review on PayPal - ' shipToName: the Ship to name entered on the merchant's site - ' shipToStreet: the Ship to Street entered on the merchant's site - ' shipToCity: the Ship to City entered on the merchant's site - ' shipToState: the Ship to State entered on the merchant's site - ' shipToCountryCode: the Code for Ship to Country entered on the merchant's site - ' shipToZip: the Ship to ZipCode entered on the merchant's site - ' shipToStreet2: the Ship to Street2 entered on the merchant's site - ' phoneNum: the phoneNum entered on the merchant's site - ' email: the buyer email - ' desc: Product description - '-------------------------------------------------------------------------------------------------------------------------------------------- - */ /** - * @param double $paymentAmount - * @param string $currencyCodeType - * @param string $paymentType - * @param string $returnURL - * @param string $cancelURL - * @param string $tag - * @param string $solutionType - * @param string $landingPage + *------------------------------------------------------------------------------------------------------------------------------------------- + * Purpose: Prepares the parameters for the SetExpressCheckout API Call. + * Inputs: + * paymentAmount: Total value of the shopping cart + * currencyCodeType: Currency code value the PayPal API + * paymentType: paymentType has to be one of the following values: Sale or Order or Authorization + * returnURL: the page where buyers return to after they are done with the payment review on PayPal + * cancelURL: the page where buyers return to when they cancel the payment review on PayPal + * shipToName: the Ship to name entered on the merchant's site + * shipToStreet: the Ship to Street entered on the merchant's site + * shipToCity: the Ship to City entered on the merchant's site + * shipToState: the Ship to State entered on the merchant's site + * shipToCountryCode: the Code for Ship to Country entered on the merchant's site + * shipToZip: the Ship to ZipCode entered on the merchant's site + * shipToStreet2: the Ship to Street2 entered on the merchant's site + * phoneNum: the phoneNum entered on the merchant's site + * email: the buyer email + * desc: Product description + * + * @param double $paymentAmount Payment amount + * @param string $currencyCodeType Currency + * @param string $paymentType Payment type + * @param string $returnURL Return Url + * @param string $cancelURL Cancel Url + * @param string $tag Tag + * @param string $solutionType Type + * @param string $landingPage Landing page + * @param string $shipToName Ship to name + * @param string $shipToStreet Ship to street + * @param string $shipToCity Ship to city + * @param string $shipToState Ship to state + * @param string $shipToCountryCode Ship to country code + * @param string $shipToZip Ship to zip + * @param string $shipToStreet2 Ship to street2 + * @param string $phoneNum Phone + * @param string $email Email + * @param string $desc Description + * @return array Array */ function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum, $email='', $desc='') { From 856238c8760c5cc306b471172b52d38c7cd3eced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 8 Apr 2015 09:09:11 +0200 Subject: [PATCH 362/412] Accounts "from" & "to" need to have same currency --- htdocs/compta/bank/virement.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index 5583edbe357..0c2c62c052f 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -79,7 +79,7 @@ if ($action == 'add') $accountto=new Account($db); $accountto->fetch(GETPOST('account_to','int')); - if ($accountto->id != $accountfrom->id) + if (($accountto->id != $accountfrom->id) && ($accountto->currency_code == $accountfrom->currency_code)) { $db->begin(); From 7f62892609edd60c32ca7536c059275cc4a19564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Wed, 8 Apr 2015 09:19:41 +0200 Subject: [PATCH 363/412] Display total with currency code --- htdocs/compta/bank/treso.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php index 91c41aa5e3c..292742315bb 100644 --- a/htdocs/compta/bank/treso.php +++ b/htdocs/compta/bank/treso.php @@ -329,8 +329,8 @@ if ($_REQUEST["account"] || $_REQUEST["ref"]) // Solde actuel $var=!$var; print ''; - print ''.$langs->trans("FutureBalance").''; - print ''.price($solde).''; + print ''.$langs->trans("FutureBalance").' ('.$acct->currency_code.')'; + print ''.price($solde, 0, $langs, 0, 0, -1, $acct->currency_code).''; print ''; print ""; From 94087f539f09576e9afdaec1956e2359641366ec Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 11:50:40 +0200 Subject: [PATCH 364/412] Fix style --- htdocs/fourn/commande/card.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 995c493df51..33b5eaf79e3 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -950,40 +950,40 @@ if (empty($reshook)) if (empty($lines[$i]->subprice) || $lines[$i]->qty <= 0) continue; - $label = (! empty($lines [$i]->label) ? $lines [$i]->label : ''); - $desc = (! empty($lines [$i]->desc) ? $lines [$i]->desc : $lines [$i]->libelle); - $product_type = (! empty($lines [$i]->product_type) ? $lines [$i]->product_type : 0); + $label = (! empty($lines[$i]->label) ? $lines[$i]->label : ''); + $desc = (! empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->libelle); + $product_type = (! empty($lines[$i]->product_type) ? $lines[$i]->product_type : 0); // Reset fk_parent_line for no child products and special product - if (($lines [$i]->product_type != 9 && empty($lines [$i]->fk_parent_line)) || $lines [$i]->product_type == 9) { + if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) { $fk_parent_line = 0; } // Extrafields - if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines [$i], 'fetch_optionals')) // For avoid conflicts if + if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) // For avoid conflicts if // trigger used { - $lines [$i]->fetch_optionals($lines [$i]->rowid); - $array_option = $lines [$i]->array_options; + $lines[$i]->fetch_optionals($lines[$i]->rowid); + $array_option = $lines[$i]->array_options; } - $idprod = $productsupplier->find_min_price_product_fournisseur($lines [$i]->fk_product, $lines [$i]->qty); + $idprod = $productsupplier->find_min_price_product_fournisseur($lines[$i]->fk_product, $lines[$i]->qty); $res = $productsupplier->fetch($idProductFourn); $result = $object->addline( $desc, - $lines [$i]->subprice, - $lines [$i]->qty, - $lines [$i]->tva_tx, - $lines [$i]->localtax1_tx, - $lines [$i]->localtax2_tx, - $lines [$i]->fk_product, + $lines[$i]->subprice, + $lines[$i]->qty, + $lines[$i]->tva_tx, + $lines[$i]->localtax1_tx, + $lines[$i]->localtax2_tx, + $lines[$i]->fk_product, $productsupplier->product_fourn_price_id, $productsupplier->ref_fourn, - $lines [$i]->remise_percent, + $lines[$i]->remise_percent, 'HT', 0, - $lines [$i]->product_type, + $lines[$i]->product_type, '', '', null, @@ -996,7 +996,7 @@ if (empty($reshook)) } // Defined the new fk_parent_line - if ($result > 0 && $lines [$i]->product_type == 9) { + if ($result > 0 && $lines[$i]->product_type == 9) { $fk_parent_line = $result; } } From 17fa1ce5b6b5263108d0d91186f83cef1e88ddff Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 12:22:52 +0200 Subject: [PATCH 365/412] Fix #2552 --- htdocs/langs/en_US/errors.lang | 2 + htdocs/product/fournisseurs.php | 119 +++++++++++++++++--------------- 2 files changed, 64 insertions(+), 57 deletions(-) diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 37670b7f003..6a7da2d3ece 100755 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -167,6 +167,8 @@ ErrorGlobalVariableUpdater2=Missing parameter '%s' ErrorGlobalVariableUpdater3=The requested data was not found in result ErrorGlobalVariableUpdater4=SOAP client failed with error '%s' ErrorGlobalVariableUpdater5=No global variable selected +ErrorFieldMustBeANumeric=Field %s must be a numeric value +ErrorFieldMustBeAnInteger=Field %s must be an integer # Warnings WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index f35e6628ad6..2d0b9a81576 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -43,6 +43,7 @@ $id = GETPOST('id', 'int'); $ref = GETPOST('ref', 'alpha'); $rowid=GETPOST('rowid','int'); $action=GETPOST('action', 'alpha'); +$cancel=GETPOST('cancel', 'alpha'); $socid=GETPOST('socid', 'int'); $backtopage=GETPOST('backtopage','alpha'); $error=0; @@ -77,6 +78,8 @@ if (! $sortorder) $sortorder="ASC"; * Actions */ +if ($cancel) $action=''; + $parameters=array('socid'=>$socid, 'id_prod'=>$id); $reshook=$hookmanager->executeHooks('doActions',$parameters,$product,$action); // Note that $action and $object may have been modified by some hooks if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); @@ -97,59 +100,70 @@ if (empty($reshook)) } } -if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel")) -{ - $id_fourn=GETPOST("id_fourn"); - if (empty($id_fourn)) $id_fourn=GETPOST("search_id_fourn"); - $ref_fourn=GETPOST("ref_fourn"); - if (empty($ref_fourn)) $ref_fourn=GETPOST("search_ref_fourn"); - $quantity=GETPOST("qty"); - $remise_percent=price2num(GETPOST('remise_percent','alpha')); - $npr = preg_match('/\*/', $_POST['tva_tx']) ? 1 : 0 ; - $tva_tx = str_replace('*','', GETPOST('tva_tx','alpha')); - $tva_tx = price2num($tva_tx); - $price_expression = GETPOST('eid', 'int') ? GETPOST('eid', 'int') : ''; // Discard expression if not in expression mode - $delivery_time_days = GETPOST('delivery_time_days', 'int') ? GETPOST('delivery_time_days', 'int') : ''; + if ($action == 'updateprice') + { + $id_fourn=GETPOST("id_fourn"); + if (empty($id_fourn)) $id_fourn=GETPOST("search_id_fourn"); + $ref_fourn=GETPOST("ref_fourn"); + if (empty($ref_fourn)) $ref_fourn=GETPOST("search_ref_fourn"); + $quantity=GETPOST("qty"); + $remise_percent=price2num(GETPOST('remise_percent','alpha')); + $npr = preg_match('/\*/', $_POST['tva_tx']) ? 1 : 0 ; + $tva_tx = str_replace('*','', GETPOST('tva_tx','alpha')); + $tva_tx = price2num($tva_tx); + $price_expression = GETPOST('eid', 'int') ? GETPOST('eid', 'int') : ''; // Discard expression if not in expression mode + $delivery_time_days = GETPOST('delivery_time_days', 'int') ? GETPOST('delivery_time_days', 'int') : ''; - if ($tva_tx == '') - { - $error++; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("VATRateForSupplierProduct")), 'errors'); - } - if (empty($quantity)) - { - $error++; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Qty")), 'errors'); - } - if (empty($ref_fourn)) - { - $error++; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("RefSupplier")), 'errors'); - } - if ($id_fourn <= 0) - { - $error++; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Supplier")), 'errors'); - } - if ($_POST["price"] < 0 || $_POST["price"] == '') - { - if ($price_expression === '') // Return error of missing price only if price_expression not set + if ($tva_tx == '') { $error++; - setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")), 'errors'); + $langs->load("errors"); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("VATRateForSupplierProduct")), 'errors'); } - else + if (! is_numeric($tva_tx)) { - $_POST["price"] = 0; + $error++; + $langs->load("errors"); + setEventMessage($langs->trans("ErrorFieldMustBeANumeric",'eeee'), 'errors'); + } + if (empty($quantity)) + { + $error++; + $langs->load("errors"); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Qty")), 'errors'); + } + if (empty($ref_fourn)) + { + $error++; + $langs->load("errors"); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("RefSupplier")), 'errors'); + } + if ($id_fourn <= 0) + { + $error++; + $langs->load("errors"); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Supplier")), 'errors'); + } + if ($_POST["price"] < 0 || $_POST["price"] == '') + { + if ($price_expression === '') // Return error of missing price only if price_expression not set + { + $error++; + $langs->load("errors"); + setEventMessage($langs->trans("ErrorFieldRequired",$langs->transnoentities("Price")), 'errors'); + } + else + { + $_POST["price"] = 0; + } } - } $product = new ProductFournisseur($db); $result=$product->fetch($id); if ($result <= 0) { $error++; - setEventMessage($product->error, 'errors'); + setEventMessages($product->error, $product->errors, 'errors'); } if (! $error) @@ -222,13 +236,10 @@ if ($action == 'updateprice' && GETPOST('cancel') <> $langs->trans("Cancel")) $db->rollback(); } } - } - - if (GETPOST('cancel') == $langs->trans("Cancel")) - { - $action = ''; - header("Location: fournisseurs.php?id=".$_GET["id"]); - exit; + else + { + $action = 'add_price'; + } } } @@ -253,10 +264,6 @@ if ($id || $ref) { if ($action <> 'edit' && $action <> 're-edit') { - /* - * En mode visu - */ - $head=product_prepare_head($product); $titre=$langs->trans("CardProduct".$product->type); $picto=($product->type== Product::TYPE_SERVICE?'service':'product'); @@ -325,6 +332,8 @@ if ($id || $ref) print ''; print ''; print ''; + print ''; + print ''; } else { @@ -487,11 +496,7 @@ if ($id || $ref) print ''; } - /* ************************************************************************** */ - /* */ - /* Barre d'action */ - /* */ - /* ************************************************************************** */ + // Actions buttons print "\n
    \n"; From 1efa5bcabdd1a6c5eaab13e863afa3db52589c04 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 12:44:11 +0200 Subject: [PATCH 366/412] Fix: Avoid duplicate tooltip --- .../fourn/class/fournisseur.product.class.php | 18 +++++++++++------- htdocs/product/list.php | 7 +++++-- htdocs/societe/class/societe.class.php | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index adc1f3a50fc..8f839b08452 100755 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -631,17 +631,19 @@ class ProductFournisseur extends Product /** * Display supplier of product * - * @param int $withpicto Add picto - * @param string $option Target of link ('', 'customer', 'prospect', 'supplier') - * @return string String with supplier price + * @param int $withpicto Add picto + * @param string $option Target of link ('', 'customer', 'prospect', 'supplier') + * @param int $maxlen Max length of name + * @param integer $notooltip 1=Disable tooltip + * @return string String with supplier price * TODO Remove this method. Use getNomUrl directly. */ - function getSocNomUrl($withpicto=0,$option='supplier') + function getSocNomUrl($withpicto=0,$option='supplier',$maxlen=0,$notooltip=0) { $thirdparty = new Fournisseur($this->db); $thirdparty->fetch($this->fourn_id); - return $thirdparty->getNomUrl($withpicto,$option); + return $thirdparty->getNomUrl($withpicto,$option,$maxlen,$notooltip); } /** @@ -649,13 +651,15 @@ class ProductFournisseur extends Product * * @param int $showunitprice Show "Unit price" into output string * @param int $showsuptitle Show "Supplier" into output string + * @param int $maxlen Max length of name + * @param integer $notooltip 1=Disable tooltip * @return string String with supplier price */ - function display_price_product_fournisseur($showunitprice=1,$showsuptitle=1) + function display_price_product_fournisseur($showunitprice=1,$showsuptitle=1,$maxlen=0,$notooltip=0) { global $langs; $langs->load("suppliers"); - $out=($showunitprice?price($this->fourn_unitprice).' '.$langs->trans("HT").'   (':'').($showsuptitle?$langs->trans("Supplier").': ':'').$this->getSocNomUrl(1, 'supplier').' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice?')':''); + $out=($showunitprice?price($this->fourn_unitprice).' '.$langs->trans("HT").'   (':'').($showsuptitle?$langs->trans("Supplier").': ':'').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / '.$langs->trans("SupplierRef").': '.$this->fourn_ref.($showunitprice?')':''); return $out; } diff --git a/htdocs/product/list.php b/htdocs/product/list.php index f9503778411..ededdbaff01 100644 --- a/htdocs/product/list.php +++ b/htdocs/product/list.php @@ -476,8 +476,11 @@ else { if ($product_fourn->product_fourn_price_id > 0) { - $htmltext=$product_fourn->display_price_product_fournisseur(); - if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) print $form->textwithpicto(price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"),$htmltext); + if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) + { + $htmltext=$product_fourn->display_price_product_fournisseur(1, 1, 0, 1); + print $form->textwithpicto(price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"),$htmltext); + } else print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT"); } } diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php index 7e2bdeef3a6..7f8df5ed810 100644 --- a/htdocs/societe/class/societe.class.php +++ b/htdocs/societe/class/societe.class.php @@ -1727,7 +1727,7 @@ class Societe extends CommonObject * * @param int $withpicto Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only) * @param string $option Target of link ('', 'customer', 'prospect', 'supplier') - * @param int $maxlen Max length of text + * @param int $maxlen Max length of name * @param integer $notooltip 1=Disable tooltip * @return string String with URL */ From b3355df3bf7f3215b237bf140372d1abfb34e2f3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 13:00:03 +0200 Subject: [PATCH 367/412] Fix delivery delay could not be set to unknown --- htdocs/fourn/class/fournisseur.product.class.php | 14 +++++++------- htdocs/fourn/commande/card.php | 2 +- htdocs/product/fournisseurs.php | 13 +++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php index 8f839b08452..280ea8cec2e 100755 --- a/htdocs/fourn/class/fournisseur.product.class.php +++ b/htdocs/fourn/class/fournisseur.product.class.php @@ -154,7 +154,7 @@ class ProductFournisseur extends Product * @param float $remise_percent Discount regarding qty (percent) * @param float $remise Discount regarding qty (amount) * @param int $newnpr Set NPR or not - * @param int $delivery_time_days Delay in days for delivery (max) + * @param int $delivery_time_days Delay in days for delivery (max). May be '' if not defined. * @return int <0 if KO, >=0 if OK */ function update_buyprice($qty, $buyprice, $user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges=0, $remise_percent=0, $remise=0, $newnpr=0, $delivery_time_days=0) @@ -167,7 +167,7 @@ class ProductFournisseur extends Product if (empty($charges)) $charges=0; if (empty($availability)) $availability=0; if (empty($remise_percent)) $remise_percent=0; - if (empty($delivery_time_days)) $delivery_time_days=0; + if ($delivery_time_days != '' && ! is_numeric($delivery_time_days)) $delivery_time_days = ''; if ($price_base_type == 'TTC') { //$ttx = get_default_tva($fourn,$mysoc,$this->id); // We must use the VAT rate defined by user and not calculate it @@ -202,7 +202,7 @@ class ProductFournisseur extends Product $sql.= " entity = ".$conf->entity.","; $sql.= " info_bits = ".$newnpr.","; $sql.= " charges = ".$charges.","; - $sql.= " delivery_time_days = ".$delivery_time_days; + $sql.= " delivery_time_days = ".($delivery_time_days != '' ? $delivery_time_days : 'null'); $sql.= " WHERE rowid = ".$this->product_fourn_price_id; // TODO Add price_base_type and price_ttc @@ -437,16 +437,16 @@ class ProductFournisseur extends Product $prodfourn->fourn_remise_percent = $record["remise_percent"]; $prodfourn->fourn_remise = $record["remise"]; $prodfourn->fourn_unitprice = $record["unitprice"]; - $prodfourn->fourn_charges = $record["charges"]; - $prodfourn->fourn_unitcharges = $record["unitcharges"]; + $prodfourn->fourn_charges = $record["charges"]; + $prodfourn->fourn_unitcharges = $record["unitcharges"]; $prodfourn->fourn_tva_tx = $record["tva_tx"]; $prodfourn->fourn_id = $record["fourn_id"]; $prodfourn->fourn_name = $record["supplier_name"]; $prodfourn->fk_availability = $record["fk_availability"]; $prodfourn->delivery_time_days = $record["delivery_time_days"]; $prodfourn->id = $prodid; - $prodfourn->fourn_tva_npr = $record["info_bits"]; - $prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"]; + $prodfourn->fourn_tva_npr = $record["info_bits"]; + $prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"]; if (!empty($prodfourn->fk_supplier_price_expression)) { $priceparser = new PriceParser($this->db); diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index 33b5eaf79e3..b1d20b72371 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1911,7 +1911,7 @@ elseif (! empty($object->id)) print ''; - // Delai livraison jours + // Delivery delay (in days) print ''; print ''.$langs->trans('NbDaysToDelivery').' '.img_picto($langs->trans('DescNbDaysToDelivery'), 'info', 'style="cursor:help"').''; print ''.$object->getMaxDeliveryTimeDay($langs).''; diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php index 2d0b9a81576..9d7a9215ef1 100644 --- a/htdocs/product/fournisseurs.php +++ b/htdocs/product/fournisseurs.php @@ -201,7 +201,7 @@ if (empty($reshook)) { $error++; - setEventMessage($product->error, 'errors'); + setEventMessage($product->error, $product->errors, 'errors'); } else { @@ -528,13 +528,9 @@ if ($id || $ref) print_liste_field_titre($langs->trans("QtyMin"),$_SERVER["PHP_SELF"],"pfp.quantity","",$param,'align="right"',$sortfield,$sortorder); print ''.$langs->trans("VATRate").''; print ''.$langs->trans("PriceQtyMinHT").''; - // Charges ???? - if ($conf->global->PRODUCT_CHARGES) - { - if (! empty($conf->margin->enabled)) print ''.$langs->trans("Charges").''; - } print_liste_field_titre($langs->trans("UnitPriceHT"),$_SERVER["PHP_SELF"],"pfp.unitprice","",$param,'align="right"',$sortfield,$sortorder); print ''.$langs->trans("DiscountQtyMin").''; + print_liste_field_titre($langs->trans("NbDaysToDelivery"),$_SERVER["PHP_SELF"],"pfp.delivery_time_days","",$param,'align="right"',$sortfield,$sortorder); // Charges ???? if ($conf->global->PRODUCT_CHARGES) { @@ -606,6 +602,11 @@ if ($id || $ref) print price2num($productfourn->fourn_remise_percent).'%'; print ''; + // Delivery delay + print ''; + print $productfourn->delivery_time_days; + print ''; + // Charges ???? if ($conf->global->PRODUCT_CHARGES) { From fc803e70008a6cc7a59655a05ea5310e85f99997 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 17:33:38 +0200 Subject: [PATCH 368/412] Fix permission lost when enabled/disabled module. --- htdocs/admin/supplier_order.php | 46 +++++++------------- htdocs/core/modules/modFournisseur.class.php | 20 +++++++++ htdocs/fourn/commande/card.php | 2 +- 3 files changed, 36 insertions(+), 32 deletions(-) diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index 5a3c3808201..b7c7d3b5c3d 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -182,43 +182,27 @@ else if ($action == 'set_SUPPLIER_ORDER_OTHER') $res3=1; }*/ - // TODO We add/delete permission until permission can have a condition on a global var - $r_id = 1190; - $entity = $conf->entity; - $r_desc=$langs->trans("Permission1190"); - $r_modul='fournisseur'; - $r_type='w'; - $r_perms='commande'; - $r_subperms='approve2'; - $r_def=0; + // TODO We add/delete permission here until permission can have a condition on a global var + include_once DOL_DOCUMENT_ROOT.'/core/modules/modFournisseur.class.php'; + $newmodule=new modFournisseur($db); + // clear default rights array + $newmodule->rights=array(); + // add new right + $r=0; + $newmodule->rights[$r][0] = 1190; + $newmodule->rights[$r][1] = $langs->trans("Permission1190"); + $newmodule->rights[$r][2] = 'w'; + $newmodule->rights[$r][3] = 0; + $newmodule->rights[$r][4] = 'commande'; + $newmodule->rights[$r][5] = 'approve2'; if ($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL) { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."rights_def"; - $sql.= " (id, entity, libelle, module, type, bydefault, perms, subperms)"; - $sql.= " VALUES "; - $sql.= "(".$r_id.",".$entity.",'".$db->escape($r_desc)."','".$r_modul."','".$r_type."',".$r_def.",'".$r_perms."','".$r_subperms."')"; - - $resqlinsert=$db->query($sql,1); - if (! $resqlinsert) - { - if ($db->errno() != "DB_ERROR_RECORD_ALREADY_EXISTS") - { - setEventMessage($db->lasterror(),'errors'); - $error++; - } - } + $newmodule->insert_permissions(1); } else { - $sql = "DELETE FROM ".MAIN_DB_PREFIX."rights_def"; - $sql.= " WHERE id = ".$r_id; - $resqldelete=$db->query($sql,1); - if (! $resqldelete) - { - setEventMessage($db->lasterror(),'errors'); - $error++; - } + $newmodule->delete_permissions(); } } diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php index 2e42c1f8b66..dc537426179 100644 --- a/htdocs/core/modules/modFournisseur.class.php +++ b/htdocs/core/modules/modFournisseur.class.php @@ -161,6 +161,14 @@ class modFournisseur extends DolibarrModules $this->rights[$r][4] = 'commande'; $this->rights[$r][5] = 'approuver'; + /*$r++; + $this->rights[$r][0] = 1191; + $this->rights[$r][1] = 'Approuver une commande fournisseur (si supérieur hiérarchique)'; + $this->rights[$r][2] = 'w'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'commande'; + $this->rights[$r][5] = 'approve_ifsupervisor_advance';*/ + $r++; $this->rights[$r][0] = 1186; $this->rights[$r][1] = 'Commander une commande fournisseur'; @@ -250,6 +258,18 @@ class modFournisseur extends DolibarrModules $this->rights[$r][4] = 'commande'; $this->rights[$r][5] = 'export'; + if ($conf->global->SUPPLIER_ORDER_DOUBLE_APPROVAL) + { + $r++; + $this->rights[$r][0] = 1190; + $this->rights[$r][1] = 'Approve supplier order (second level)'; // $langs->trans("Permission1190"); + $this->rights[$r][2] = 'w'; + $this->rights[$r][3] = 0; + $this->rights[$r][4] = 'commande'; + $this->rights[$r][5] = 'approve2'; + } + + // Exports //-------- $r=0; diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index b1d20b72371..e2f7fb0ca03 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -190,7 +190,7 @@ if (empty($reshook)) if ($result < 0) setEventMessages($object->error, $object->errors, 'errors'); } - if ($action == 'reopen' && $user->rights->fournisseur->commande->approuver) + if ($action == 'reopen') // no test on permission here, permission to use will depends on status { if (in_array($object->statut, array(1, 2, 5, 6, 7, 9))) { From 0987aa1c747228184c17261592834329ca7c4e9b Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 17:42:28 +0200 Subject: [PATCH 369/412] Bad trans key --- htdocs/core/menus/standard/eldy.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 09f4321e668..748f7111e54 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -695,7 +695,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if ((empty($leftmenu) || $leftmenu=="orders_suppliers") && empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->fournisseur->commande->lire); if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire); if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire); - if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusOrderReceivedPartially"), 2, $user->rights->fournisseur->commande->lire); + if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire); if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire); if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusOrderCanceled"), 2, $user->rights->fournisseur->commande->lire); if (empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusOrderRefused"), 2, $user->rights->fournisseur->commande->lire); From 742b50b532e131fc0e10db473152479b7765a56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= Date: Wed, 8 Apr 2015 17:58:40 +0200 Subject: [PATCH 370/412] [Contributing] Added a link to the forum --- CONTRIBUTING.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6e779b97463..a603fd242cc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,7 +3,10 @@ How to contribute to Dolibarr Bug reports and feature requests -------------------------------- -** NEW ** + +*Note*: Issues are not a support forum. If you need help using the software, please use [the forums](http://www.dolibarr.org/forum). + +**NEW** Issues are now managed on [GitHub](https://github.com/Dolibarr/dolibarr/Issues). From 1bbecc0912976a1f7306a4bb8940e5e772b2d7c2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 19:26:36 +0200 Subject: [PATCH 371/412] Restore link to stock for products. --- htdocs/comm/card.php | 2 +- htdocs/core/lib/product.lib.php | 2 +- htdocs/fourn/card.php | 6 +++--- htdocs/langs/en_US/orders.lang | 4 +++- htdocs/product/class/product.class.php | 2 +- htdocs/product/stock/product.php | 13 +++++++------ 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php index 14bf6e42fe8..beaa179cb60 100644 --- a/htdocs/comm/card.php +++ b/htdocs/comm/card.php @@ -627,7 +627,7 @@ if ($id > 0) print ''; print ''; - print '
    '; + print '
    '.$langs->trans("LastOrders",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' '.$num.''; print ''; //if($num2 > 0) print ''; //else print ''; diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php index a35ab95a24a..87e22ac8cc9 100644 --- a/htdocs/core/lib/product.lib.php +++ b/htdocs/core/lib/product.lib.php @@ -93,7 +93,7 @@ function product_prepare_head($object) $head[$h][2] = 'referers'; $h++; - if($object->isproduct()) // Si produit stockable + if ($object->isproduct() || ($object->isservice() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES))) // If physical product we can stock (or service with option) { if (! empty($conf->stock->enabled) && $user->rights->stock->lire) { diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index 97004783ae6..3794fa1e184 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -364,7 +364,7 @@ if ($object->id > 0) /* - * Last orders + * Last supplier orders */ $orderstatic = new CommandeFournisseur($db); @@ -409,7 +409,7 @@ if ($object->id > 0) print ''; print '
    '.$langs->trans("LastCustomerOrders",($num<=$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').''.img_picto($langs->trans("CreateInvoiceForThisCustomer"),'object_bill').''.img_picto($langs->trans("NoOrdersToInvoice"),'object_bill').'
    '; - print ''; + print '
    '.$langs->trans("LastOrders",($num<$MAXLIST?"":$MAXLIST)).'
    '; print ''; print ''; print '
    '.$langs->trans("LastSupplierOrders",($num<$MAXLIST?"":$MAXLIST)).''.$langs->trans("AllOrders").' '.$num.''.img_picto($langs->trans("Statistics"),'stats').'
    '; @@ -455,7 +455,7 @@ if ($object->id > 0) } /* - * Last invoices + * Last supplier invoices */ $MAXLIST=5; diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 278fb39f0ee..088e239d955 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -79,7 +79,9 @@ NoOpenedOrders=No opened orders NoOtherOpenedOrders=No other opened orders NoDraftOrders=No draft orders OtherOrders=Other orders -LastOrders=Last %s orders +LastOrders=Last %s customer orders +LastCustomerOrders=Last %s customer orders +LastSupplierOrders=Last %s supplier orders LastModifiedOrders=Last %s modified orders LastClosedOrders=Last %s closed orders AllOrders=All orders diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index 397f06ce156..c3f8cf5994d 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -3689,7 +3689,7 @@ class Product extends CommonObject */ function isproduct() { - return ($this->type != Product::TYPE_PRODUCT ? true : false); + return ($this->type == Product::TYPE_PRODUCT ? true : false); } /** diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php index b5639228325..39a81abe86d 100644 --- a/htdocs/product/stock/product.php +++ b/htdocs/product/stock/product.php @@ -821,8 +821,9 @@ if (empty($action) && $product->id) /* - * Stock detail + * Stock detail (by warehouse). Do not go down into batch. */ + print '
    '; print ''; print ''; @@ -870,9 +871,9 @@ if ($resql) print ''; print ''; // PMP - print ''; // Ditto : Show PMP from movement or from product + print ''; // Value purchase - print ''; // Ditto : Show PMP from movement or from product + print ''; // Sell price print ''; // Value sell print ''; // Ditto : Show PMP from movement or from product + if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT'),1).''; else print $langs->trans("Variable"); print ''; ; $total += $obj->reel; if (price2num($product->pmp)) $totalwithpmp += $obj->reel; - $totalvalue = $totalvalue + ($product->pmp*$obj->reel); // Ditto : Show PMP from movement or from product - $totalvaluesell = $totalvaluesell + ($product->price*$obj->reel); // Ditto : Show PMP from movement or from product + $totalvalue = $totalvalue + ($product->pmp*$obj->reel); + $totalvaluesell = $totalvaluesell + ($product->price*$obj->reel); //Batch Detail if ((! empty($conf->productbatch->enabled)) && $product->hasbatch()) { From aaef3a41c015667ff58d4e3cd6d39dcc4b159467 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 19:33:06 +0200 Subject: [PATCH 372/412] Short label into table --- htdocs/langs/en_US/productbatch.lang | 1 + htdocs/langs/en_US/stocks.lang | 1 + htdocs/product/stock/mouvement.php | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang index 45263681965..8508a26e96d 100644 --- a/htdocs/langs/en_US/productbatch.lang +++ b/htdocs/langs/en_US/productbatch.lang @@ -7,6 +7,7 @@ ProductStatusNotOnBatchShort=No Batch=Batch/Serial atleast1batchfield=Eat-by date or Sell-by date or Batch number batch_number=Batch/Serial number +BatchNumberShort=Batch/Serial l_eatby=Eat-by date l_sellby=Sell-by date DetailBatchNumber=Batch/Serial details diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang index 9019240490b..998168decdd 100644 --- a/htdocs/langs/en_US/stocks.lang +++ b/htdocs/langs/en_US/stocks.lang @@ -132,3 +132,4 @@ ShowWarehouse=Show warehouse MovementCorrectStock=Stock content correction for product %s MovementTransferStock=Stock transfer of product %s into another warehouse WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps. +InventoryCodeShort=Inv./Mov. code \ No newline at end of file diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php index 9182708ec8d..913be813815 100644 --- a/htdocs/product/stock/mouvement.php +++ b/htdocs/product/stock/mouvement.php @@ -440,13 +440,13 @@ if ($resql) if (! empty($conf->productbatch->enabled)) { $langs->load("productbatch"); - print ''; + print ''; print ''; print ''; } print_liste_field_titre($langs->trans("Warehouse"),$_SERVER["PHP_SELF"], "","",$param,"",$sortfield,$sortorder); // We are on a specific warehouse card, no filter on other should be possible print_liste_field_titre($langs->trans("Author"),$_SERVER["PHP_SELF"], "m.fk_user_author","",$param,"",$sortfield,$sortorder); - print_liste_field_titre($langs->trans("InventoryCode"),$_SERVER["PHP_SELF"], "m.inventorycode","",$param,"",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("InventoryCodeShort"),$_SERVER["PHP_SELF"], "m.inventorycode","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("LabelMovement"),$_SERVER["PHP_SELF"], "m.label","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Source"),$_SERVER["PHP_SELF"], "m.label","",$param,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Units"),$_SERVER["PHP_SELF"], "m.value","",$param,'align="right"',$sortfield,$sortorder); From 091420f8aefb3b1eaa9bb3712a4a0ccec7945b84 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 20:40:01 +0200 Subject: [PATCH 373/412] Close #2568 --- htdocs/projet/tasks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php index 1b69fd5757e..eafe92c5aa4 100644 --- a/htdocs/projet/tasks.php +++ b/htdocs/projet/tasks.php @@ -412,7 +412,7 @@ else } print '
    '.$langs->trans("Warehouse").''.$langs->trans("NumberOfUnit").''.$entrepotstatic->getNomUrl(1).''.$obj->reel.($obj->reel<0?' '.img_warning():'').''.(price2num($product->pmp)?price2num($product->pmp,'MU'):'').''.(price2num($product->pmp)?price2num($product->pmp,'MU'):'').''.(price2num($product->pmp)?price(price2num($product->pmp*$obj->reel,'MT')):'').''.(price2num($product->pmp)?price(price2num($product->pmp*$obj->reel,'MT')):'').''; if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'),1); @@ -880,13 +881,13 @@ if ($resql) print ''; - if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT'),1).'
    '.$langs->trans("batch_number").''.$langs->trans("BatchNumberShort").''.$langs->trans("l_eatby").''.$langs->trans("l_sellby").'
    '; - print ''; + print ''; // print ''; print ''; print ''; From e3bbbaf2e147a1da6e40f9a1fc44feec7b63e9a2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 20:52:18 +0200 Subject: [PATCH 374/412] Comments --- htdocs/install/mysql/tables/llx_facture_rec.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql index cba4b580cf0..7c1151f36ca 100644 --- a/htdocs/install/mysql/tables/llx_facture_rec.sql +++ b/htdocs/install/mysql/tables/llx_facture_rec.sql @@ -50,9 +50,9 @@ create table llx_facture_rec note_private text, note_public text, - usenewprice integer DEFAULT 0, - frequency integer, - unit_frequency varchar(2) DEFAULT 'd', + usenewprice integer DEFAULT 0, -- update invoice with current price of product instead of recorded price + frequency integer, -- frequency (for example: 3 for every 3 month) + unit_frequency varchar(2) DEFAULT 'm', -- 'm' for month (date_when must be a day <= 28), 'y' for year, ... date_when datetime DEFAULT NULL, -- date for next gen (when an invoice is generated, this field must be updated with next date) date_last_gen datetime DEFAULT NULL, -- date for last gen (date with last successfull generation of invoice) From c4daca2bac72f4908333219e61c9a3078b86f916 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 21:34:04 +0200 Subject: [PATCH 375/412] Fix #1682 --- htdocs/core/class/commonobject.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index ac87f1e693d..db4c1fc5a03 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1887,10 +1887,11 @@ abstract class CommonObject * @param int $targetid Object target id * @param string $targettype Object target type * @param string $clause 'OR' or 'AND' clause used when both source id and target id are provided + * @param int $alsosametype 0=Return only links to different object than source. 1=Include also link to objects of same type. * @return void * @see add_object_linked, updateObjectLinked, deleteObjectLinked */ - function fetchObjectLinked($sourceid='',$sourcetype='',$targetid='',$targettype='',$clause='OR') + function fetchObjectLinked($sourceid='',$sourcetype='',$targetid='',$targettype='',$clause='OR',$alsosametype=1) { global $conf; @@ -1924,7 +1925,7 @@ abstract class CommonObject return -1; } - // Links beetween objects are stored in this table + // Links between objects are stored in table element_element $sql = 'SELECT fk_source, sourcetype, fk_target, targettype'; $sql.= ' FROM '.MAIN_DB_PREFIX.'element_element'; $sql.= " WHERE "; @@ -1983,7 +1984,7 @@ abstract class CommonObject $classpath = $element.'/class'; - // To work with non standard path + // To work with non standard classpath or module name if ($objecttype == 'facture') { $classpath = 'compta/facture/class'; } @@ -2019,7 +2020,7 @@ abstract class CommonObject $classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur'; } - if ($conf->$module->enabled && $element != $this->element) + if ($conf->$module->enabled && (($element != $this->element) || $alsosametype)) { dol_include_once('/'.$classpath.'/'.$classfile.'.class.php'); From ddde869ca498db71acaaa8e1cd8d977a5e78ed50 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 21:35:27 +0200 Subject: [PATCH 376/412] Sync transifex --- htdocs/langs/fr_FR/admin.lang | 2 +- htdocs/langs/fr_FR/bills.lang | 6 +++--- htdocs/langs/fr_FR/categories.lang | 14 +++++++------- htdocs/langs/fr_FR/cron.lang | 2 +- htdocs/langs/fr_FR/donations.lang | 10 +++++----- htdocs/langs/fr_FR/errors.lang | 16 ++++++++-------- htdocs/langs/fr_FR/main.lang | 10 +++++----- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 4dea57677d3..dedbc1d5f50 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -1606,7 +1606,7 @@ SalariesSetup=Configuration du module salariés SortOrder=Ordre de tri Format=Format TypePaymentDesc=0:Type de paiement client, 1:Type de paiement fournisseur, 2:Paiement de type client et fournisseur -IncludePath=Chemin Include (définir dans la variable %s) +IncludePath=Chemin Include (défini dans la variable %s) ExpenseReportsSetup=Configuration du module Notes de frais TemplatePDFExpenseReports=Modèles de documents pour générer les document de Notes de frais NoModueToManageStockDecrease=Aucun module capable d'assurer la réduction de stock en automatique a été activé. La réduction de stock se fera donc uniquement sur mise à jour manuelle. diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang index 9e79b16af11..a6a4c1a85a4 100644 --- a/htdocs/langs/fr_FR/bills.lang +++ b/htdocs/langs/fr_FR/bills.lang @@ -190,7 +190,7 @@ AlreadyPaid=Déjà réglé AlreadyPaidBack=Déjà remboursé AlreadyPaidNoCreditNotesNoDeposits=Déjà réglé (hors avoirs et acomptes) Abandoned=Abandonné -RemainderToPay=Restant impayé +RemainderToPay=Reste à payer RemainderToTake=Montant restant à percevoir RemainderToPayBack=Montant à rembourser Rest=Créance @@ -294,8 +294,8 @@ TotalOfTwoDiscountMustEqualsOriginal=La somme du montant des 2 nouvelles réduct ConfirmRemoveDiscount=Êtes-vous sûr de vouloir supprimer cette réduction ? RelatedBill=Facture associée RelatedBills=Factures associées -RelatedCustomerInvoices=Related customer invoices -RelatedSupplierInvoices=Related supplier invoices +RelatedCustomerInvoices=Factures clients liées +RelatedSupplierInvoices=Factures fournisseurs liées LatestRelatedBill=Dernière facture en rapport WarningBillExist=Attention, une ou plusieurs factures existent déjà diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang index 5a6ac7abc31..c310342feff 100644 --- a/htdocs/langs/fr_FR/categories.lang +++ b/htdocs/langs/fr_FR/categories.lang @@ -1,9 +1,9 @@ # Dolibarr language file - Source file is en_US - categories -Rubrique=Tag/Category -Rubriques=Tags/Categories -categories=tags/categories -TheCategorie=The tag/category -NoCategoryYet=No tag/category of this type created +Rubrique=Label/Catégorie +Rubriques=Labels/Catégories +categories=labels/catégories +TheCategorie=Le label/Catégorie +NoCategoryYet=Aucun label/catégorie de ce type n'a été créé In=Dans AddIn=Ajouter dans modify=modifier @@ -18,8 +18,8 @@ ContactsCategoriesArea=Contacts tags/categories area MainCats=Main tags/categories SubCats=Sous-catégories CatStatistics=Statistiques -CatList=List of tags/categories -AllCats=All tags/categories +CatList=Liste des labels/catégories +AllCats=Tous les labels/catégories ViewCat=View tag/category NewCat=Add tag/category NewCategory=New tag/category diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang index 7c67426510d..b009c0b54d6 100644 --- a/htdocs/langs/fr_FR/cron.lang +++ b/htdocs/langs/fr_FR/cron.lang @@ -18,7 +18,7 @@ CronExplainHowToRunUnix=Sur un environnement Unix vous pouvez utiliser l'entrée CronExplainHowToRunWin=Sur un environement Microsoft(tm) Windows vous pouvez utiliser le planificateur de tache pour lancer cette commande toute les 5 minutes. # Menu CronJobs=Travaux programmés -CronListActive=Liste des travaux actifs/programmés +CronListActive=Liste des travaux CronListInactive=Liste des travaux inactifs # Page list CronDateLastRun=Dernier lancement diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang index a2625c9c0fa..3dbb4cc5f76 100644 --- a/htdocs/langs/fr_FR/donations.lang +++ b/htdocs/langs/fr_FR/donations.lang @@ -6,8 +6,8 @@ Donor=Donateur Donors=Donateurs AddDonation=Créer un don NewDonation=Nouveau don -DeleteADonation=Delete a donation -ConfirmDeleteADonation=Are you sure you want to delete this donation ? +DeleteADonation=Effacer le don +ConfirmDeleteADonation=Êtes-vous sûr de vouloir supprimer ce don ? ShowDonation=Montrer don DonationPromise=Promesse de don PromisesNotValid=Promesses non validées @@ -23,8 +23,8 @@ DonationStatusPaid=Don payé DonationStatusPromiseNotValidatedShort=Non validée DonationStatusPromiseValidatedShort=Validée DonationStatusPaidShort=Payé -DonationTitle=Donation receipt -DonationDatePayment=Payment date +DonationTitle=Reçu de dons +DonationDatePayment=Date paiement ValidPromess=Valider promesse DonationReceipt=Reçu de dons BuildDonationReceipt=Créer reçu @@ -40,4 +40,4 @@ FrenchOptions=Options propres à la france DONATION_ART200=Afficher article 200 du CGI si vous êtes concernés DONATION_ART238=Afficher article 238 du CGI si vous êtes concernés DONATION_ART885=Afficher article 885 du CGI si vous êtes concernés -DonationPayment=Donation payment +DonationPayment=Paiement du don diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index d784017964d..dd92729aa4d 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Les comptes source et destination doivent être d ErrorBadThirdPartyName=Nom de tiers incorrect ErrorProdIdIsMandatory=Le %s est obligatoire ErrorBadCustomerCodeSyntax=La syntaxe du code client est incorrecte -ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned. +ErrorBadBarCodeSyntax=Mauvaise syntaxe pour le code barre. Peut être que vous avez défini un mauvais type de code-barres ou que vous avez défini un masque de code à barres pour la numérotation qui ne correspond pas à la valeur scannée. ErrorCustomerCodeRequired=Code client obligatoire ErrorBarCodeRequired=Code-barre requis ErrorCustomerCodeAlreadyUsed=Code client déjà utilisé @@ -160,13 +160,13 @@ ErrorPriceExpressionInternal=Erreur interne '%s' ErrorPriceExpressionUnknown=Erreur inconnue '%s' ErrorSrcAndTargetWarehouseMustDiffers=Les entrepôts source et destination doivent être différents ErrorTryToMakeMoveOnProductRequiringBatchData=Erreur, vous essayez de faire un mouvement sans lot/numéro de série, sur un produit qui exige un lot/numéro de série. -ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action -ErrorGlobalVariableUpdater0=HTTP request failed with error '%s' -ErrorGlobalVariableUpdater1=Invalid JSON format '%s' -ErrorGlobalVariableUpdater2=Missing parameter '%s' -ErrorGlobalVariableUpdater3=The requested data was not found in result -ErrorGlobalVariableUpdater4=SOAP client failed with error '%s' -ErrorGlobalVariableUpdater5=No global variable selected +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Toutes les réceptions enregistrées doivent d'abord être vérifiées avant d'être autorisés à faire cette action +ErrorGlobalVariableUpdater0=La requête HTTP a échoué avec l'erreur '%s' +ErrorGlobalVariableUpdater1=Format JSON invalide '%s' +ErrorGlobalVariableUpdater2=Paramètre manquant '%s' +ErrorGlobalVariableUpdater3=La donnée recherché n'a pas été trouvée +ErrorGlobalVariableUpdater4=Le client SOAP a échoué avec l'erreur '%s' +ErrorGlobalVariableUpdater5=Pas de variable globale # Warnings WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 97aa65f021e..94676450fbc 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -141,7 +141,7 @@ Cancel=Annuler Modify=Modifier Edit=Éditer Validate=Valider -ValidateAndApprove=Validate and Approve +ValidateAndApprove=Valider et Approuver ToValidate=À valider Save=Enregistrer SaveAs=Enregistrer sous @@ -159,7 +159,7 @@ Search=Rechercher SearchOf=Recherche de Valid=Valider Approve=Approuver -Disapprove=Disapprove +Disapprove=Désapprouver ReOpen=Réouvrir Upload=Envoyer fichier ToLink=Lier @@ -221,7 +221,7 @@ Cards=Fiches Card=Fiche Now=Maintenant Date=Date -DateAndHour=Date and hour +DateAndHour=Date et heure DateStart=Date début DateEnd=Date fin DateCreation=Date création @@ -395,8 +395,8 @@ Available=Disponible NotYetAvailable=Pas encore disponible NotAvailable=Non disponible Popularity=Popularité -Categories=Tags/categories -Category=Tag/category +Categories=Tags/catégories +Category=Tag/catégorie By=Par From=Du to=au From f6c2472d92d8420c90ce10870534b1659daf5ceb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 8 Apr 2015 21:50:17 +0200 Subject: [PATCH 377/412] fix var not declared --- htdocs/core/class/events.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php index 4ab3ce8f6fe..f94252d076d 100644 --- a/htdocs/core/class/events.class.php +++ b/htdocs/core/class/events.class.php @@ -31,7 +31,6 @@ /** * Events class - * Initialy built by build_class_from_table on 2008-02-28 17:25 */ class Events // extends CommonObject { @@ -41,6 +40,8 @@ class Events // extends CommonObject var $id; var $db; + var $error; + var $tms; var $type; var $entity; From 914b324a674b014aace9f7e802a7346422450340 Mon Sep 17 00:00:00 2001 From: braito4 Date: Thu, 9 Apr 2015 10:37:54 +0200 Subject: [PATCH 378/412] minor bug drag and drop total line in tasks list --- htdocs/core/lib/project.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index a564a312ac2..20b7bb1ec83 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -416,7 +416,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0) && $level==0) { - print ''; + print ''; print ''; if ($showproject) print ''; print ''; From ed6f2e93869ea618a203fe116d4334176f487a54 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Apr 2015 15:14:50 +0200 Subject: [PATCH 379/412] Fix error management --- .../class/fournisseur.commande.class.php | 12 +++++-- htdocs/fourn/commande/dispatch.php | 33 +++++++++++++++---- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 22ac415b511..732a381694d 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1392,13 +1392,19 @@ class CommandeFournisseur extends CommonOrder function dispatchProduct($user, $product, $qty, $entrepot, $price=0, $comment='', $eatby='', $sellby='', $batch='', $fk_commandefourndet=0, $notrigger=0) { global $conf; + $error = 0; require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php'; - // Check parameters - if ($entrepot <= 0 || $qty <= 0) + // Check parameters (if test are wrong here, there is bug into caller) + if ($entrepot <= 0) { - $this->error='BadValueForParameterWarehouseOrQty'; + $this->error='ErrorBadValueForParameterWarehouse'; + return -1; + } + if ($qty <= 0) + { + $this->error='ErrorBadValueForParameterQty'; return -1; } diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 84b03f1953a..1da5f5eb29a 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -101,6 +101,23 @@ if ($action == 'uncheckdispatchline' && } } +if ($action == 'denydispatchline' && + ! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) + || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check))) +) +{ + $supplierorderdispatch = new CommandeFournisseurDispatch($db); + $result=$supplierorderdispatch->fetch($lineid); + if (! $result) dol_print_error($db); + $result=$supplierorderdispatch->setStatut(-1); + if ($result < 0) + { + setEventMessages($supplierorderdispatch->error, $supplierorderdispatch->errors, 'errors'); + $error++; + $action=''; + } +} + if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner) { $commande = new CommandeFournisseur($db); @@ -123,7 +140,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner) if (GETPOST($qty) > 0) // We ask to move a qty { - if (! GETPOST($ent,'int') > 0) + if (! (GETPOST($ent,'int') > 0)) { dol_syslog('No dispatch for line '.$key.' as no warehouse choosed'); $text = $langs->transnoentities('Warehouse').', '.$langs->transnoentities('Line').' ' .($numline); @@ -133,7 +150,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner) if (! $error) { - $result = $commande->DispatchProduct($user, GETPOST($prod,'int'),GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), '', '', '', GETPOST($fk_commandefourndet, 'int'), $notrigger); + $result = $commande->DispatchProduct($user, GETPOST($prod,'int'), GETPOST($qty), GETPOST($ent,'int'), GETPOST($pu), GETPOST("comment"), '', '', '', GETPOST($fk_commandefourndet, 'int'), $notrigger); if ($result < 0) { setEventMessages($commande->error, $commande->errors, 'errors'); @@ -643,11 +660,13 @@ if ($id > 0 || ! empty($ref)) { if (empty($objp->status)) { - print ''.$langs->trans("Check").''; + print ''.$langs->trans("Approve").''; + print ''.$langs->trans("Deny").''; } else { - print ''.$langs->trans("Uncheck").''; + print ''.$langs->trans("Disapprove").''; + print ''.$langs->trans("Deny").''; } } else @@ -656,11 +675,13 @@ if ($id > 0 || ! empty($ref)) if ($commande->statut == 5) $disabled=1; if (empty($objp->status)) { - print 'dispatchlineid.'">'.$langs->trans("Check").''; + print 'dispatchlineid.'">'.$langs->trans("Approve").''; + print 'dispatchlineid.'">'.$langs->trans("Deny").''; } else { - print 'dispatchlineid.'">'.$langs->trans("Uncheck").''; + print 'dispatchlineid.'">'.$langs->trans("Disapprove").''; + print 'dispatchlineid.'">'.$langs->trans("Deny").''; } } print ''; From e01e0faeef86d46ce0801228f1fef45cfefee556 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Apr 2015 16:15:52 +0200 Subject: [PATCH 380/412] Can reopen to edit supplier order once ordered --- .../class/fournisseur.commande.class.php | 39 ++++++++++++++----- .../fournisseur.commande.dispatch.class.php | 3 ++ htdocs/fourn/commande/card.php | 5 ++- htdocs/fourn/commande/dispatch.php | 11 ++++-- htdocs/langs/en_US/errors.lang | 3 +- htdocs/langs/en_US/main.lang | 1 + 6 files changed, 46 insertions(+), 16 deletions(-) diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php index 732a381694d..7f091749660 100644 --- a/htdocs/fourn/class/fournisseur.commande.class.php +++ b/htdocs/fourn/class/fournisseur.commande.class.php @@ -1747,18 +1747,37 @@ class CommandeFournisseur extends CommonOrder if ($type == 'nev') $statut = 7; if ($type == 'can') $statut = 7; - if (! $error && ! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS) && ($type == 'tot')) - { - // If option SUPPLIER_ORDER_USE_DISPATCH_STATUS is on, we check all reception are approved to allow status "total/done" - $dispatchedlinearray=$this->getDispachedLines(0); - if (count($dispatchedlinearray) > 0) + // Some checks to accept the record + if (! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) + { + // If option SUPPLIER_ORDER_USE_DISPATCH_STATUS is on, we check all reception are approved to allow status "total/done" + if (! $error && ($type == 'tot')) + { + $dispatchedlinearray=$this->getDispachedLines(0); + if (count($dispatchedlinearray) > 0) + { + $result=-1; + $error++; + $this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionToApprove'; + dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG); + } + + } + if (! $error && ! empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot')) // Accept to move to rception done, only if status of all line are ok (refuse denied) { - $result=-1; - $error++; - $this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionToApprove'; - dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG); + $dispatcheddenied=$this->getDispachedLines(2); + if (count($dispatchedlinearray) > 0) + { + $result=-1; + $error++; + $this->errors[]='ErrorCantSetReceptionToTotalDoneWithReceptionDenied'; + dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionDenied', LOG_DEBUG); + } } - } + } + + // TODO LDR01 Add option to accept only if ALL predefined products are received (same qty). + if (! $error && ! ($statut == 4 or $statut == 5 or $statut == 7)) { diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php index e7aea53945e..4d6f75444b8 100644 --- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php +++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php @@ -495,16 +495,19 @@ class CommandeFournisseurDispatch extends CommonObject { if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0'); if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4'); + if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut8'); } if ($mode == 4) { if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]); if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]); + if ($statut==2) return img_picto($langs->trans($this->statuts[$statut]),'statut8').' '.$langs->trans($this->statuts[$statut]); } if ($mode == 5) { if ($statut==0) return ''.$langs->trans($this->statutshort[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut0'); if ($statut==1) return ''.$langs->trans($this->statutshort[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut4'); + if ($statut==2) return ''.$langs->trans($this->statutshort[$statut]).' '.img_picto($langs->trans($this->statuts[$statut]),'statut8'); } } diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index e2f7fb0ca03..755dd1249ea 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -192,10 +192,11 @@ if (empty($reshook)) if ($action == 'reopen') // no test on permission here, permission to use will depends on status { - if (in_array($object->statut, array(1, 2, 5, 6, 7, 9))) + if (in_array($object->statut, array(1, 2, 3, 5, 6, 7, 9))) { if ($object->statut == 1) $newstatus=0; // Validated->Draft else if ($object->statut == 2) $newstatus=0; // Approved->Draft + else if ($object->statut == 3) $newstatus=2; // Ordered->Approved else if ($object->statut == 5) $newstatus=4; // Received->Received partially else if ($object->statut == 6) $newstatus=2; // Canceled->Approved else if ($object->statut == 7) $newstatus=3; // Canceled->Process running @@ -2671,7 +2672,7 @@ elseif (! empty($object->id)) print ''.$langs->trans("Disapprove").''; } } - if (in_array($object->statut, array(5, 6, 7, 9))) + if (in_array($object->statut, array(3, 5, 6, 7, 9))) { if ($user->rights->fournisseur->commande->commander) { diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 1da5f5eb29a..bac6ace77e3 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -109,7 +109,7 @@ if ($action == 'denydispatchline' && $supplierorderdispatch = new CommandeFournisseurDispatch($db); $result=$supplierorderdispatch->fetch($lineid); if (! $result) dol_print_error($db); - $result=$supplierorderdispatch->setStatut(-1); + $result=$supplierorderdispatch->setStatut(2); if ($result < 0) { setEventMessages($supplierorderdispatch->error, $supplierorderdispatch->errors, 'errors'); @@ -678,11 +678,16 @@ if ($id > 0 || ! empty($ref)) print 'dispatchlineid.'">'.$langs->trans("Approve").''; print 'dispatchlineid.'">'.$langs->trans("Deny").''; } - else + if ($objp->status == 1) { - print 'dispatchlineid.'">'.$langs->trans("Disapprove").''; + print 'dispatchlineid.'">'.$langs->trans("Reinit").''; print 'dispatchlineid.'">'.$langs->trans("Deny").''; } + if ($objp->status == 2) + { + print 'dispatchlineid.'">'.$langs->trans("Reinit").''; + print 'dispatchlineid.'">'.$langs->trans("Approve").''; + } } print ''; } diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 6a7da2d3ece..32a66564b07 100755 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -160,7 +160,8 @@ ErrorPriceExpressionInternal=Internal error '%s' ErrorPriceExpressionUnknown=Unknown error '%s' ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information -ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action +ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action +ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action ErrorGlobalVariableUpdater0=HTTP request failed with error '%s' ErrorGlobalVariableUpdater1=Invalid JSON format '%s' ErrorGlobalVariableUpdater2=Missing parameter '%s' diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index bd2112cf871..ce4300e67c2 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -700,6 +700,7 @@ SelectElementAndClickRefresh=Select an element and click Refresh PrintFile=Print File %s ShowTransaction=Show transaction GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide. +Denied=Denied # Week day Monday=Monday Tuesday=Tuesday From 3ee27907377dca510784b2c1cac10f11aedea6a5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Apr 2015 16:26:21 +0200 Subject: [PATCH 381/412] Always sho project info when opening task card --- htdocs/core/lib/project.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 0d4b43c9172..63aca7c7e92 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -371,7 +371,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t $taskstatic->id=$lines[$i]->id; $taskstatic->ref=$lines[$i]->ref; $taskstatic->label=($taskrole[$lines[$i]->id]?$langs->trans("YourRole").': '.$taskrole[$lines[$i]->id]:''); - print $taskstatic->getNomUrl(1,($showproject?'':'withproject')); + print $taskstatic->getNomUrl(1,'withproject'); } print ''; From 503a4ff7a05ce892d4614d8cc3aaf259be9dbc3e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Apr 2015 20:40:49 +0200 Subject: [PATCH 382/412] Enhance filtering for bank transaction and timesheet. --- htdocs/compta/bank/account.php | 2 +- htdocs/compta/bank/search.php | 7 +-- htdocs/core/lib/project.lib.php | 56 +++++++++++++++++------- htdocs/langs/en_US/main.lang | 1 + htdocs/langs/en_US/projects.lang | 1 + htdocs/projet/activity/perday.php | 70 +++++++++++++++++++++++++++--- htdocs/projet/activity/perweek.php | 42 ++++++++++++------ 7 files changed, 139 insertions(+), 40 deletions(-) diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 6ba80304188..ce2bbc5381e 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -403,7 +403,7 @@ if ($id > 0 || ! empty($ref)) print ''; if ($nbcategories) { - print '
    '.$langs->trans("Category").': '; + print '
    '.$langs->trans("Rubrique").': '; } print ''; print '    '; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index a1e114430ce..f367149a19c 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -178,9 +178,10 @@ if ($resql) print ''."\n"; print ''."\n"; - $moreforfilter .= $langs->trans('Period') . ' ' . $langs->trans('StartDate') . ': '; - $moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 1, 1); - $moreforfilter .= $langs->trans('EndDate') . ':' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 1, 1); + $moreforfilter .= $langs->trans('Period') . ' ('.$langs->trans('DateOperationShort').') : ' . $langs->trans('StartDate') . ' '; + $moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 1); + $moreforfilter .= ' - '; + $moreforfilter .= $langs->trans('EndDate') . ' ' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 1); if ($moreforfilter) { diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 63aca7c7e92..828c7c359d1 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -504,9 +504,10 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t * @param string $tasksrole Array of roles user has on task * @param string $mine Show only task lines I am assigned to * @param int $restricteditformytask 0=No restriction, 1=Enable add time only if task is a task i am affected to + * @param int $preselectedday Preselected day * @return $inc */ -function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0) +function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask=0, $preselectedday='') { global $db, $user, $bc, $langs; global $form, $formother, $projectstatic, $taskstatic; @@ -527,6 +528,12 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t { $var = !$var; $lastprojectid=$lines[$i]->fk_project; + + if ($preselectedday) + { + $projectstatic->id = $lines[$i]->fk_project; + $projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent into this->weekWorkLoad and this->weekWorkLoadPerTaks for all day of a week + } } // If we want all or we have a role on task, we show it @@ -549,7 +556,7 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t // Ref print ''; // Label task @@ -559,7 +566,7 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t $taskstatic->ref=$lines[$i]->label; $taskstatic->date_start=$lines[$i]->date_start; $taskstatic->date_end=$lines[$i]->date_end; - print $taskstatic->getNomUrl(0); + print $taskstatic->getNomUrl(0,'withproject'); //print "
    "; //for ($k = 0 ; $k < $level ; $k++) print "   "; //print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0); @@ -613,14 +620,21 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t // Form to add new time print ''; print ''; print $tableCell; } + + print ''; + print "\n"; } diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index ce4300e67c2..52ab660e21b 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -220,6 +220,7 @@ Next=Next Cards=Cards Card=Card Now=Now +HourStart=Start hour Date=Date DateAndHour=Date and hour DateStart=Date start diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang index 40b1c2e308d..e56ddf2ec4a 100644 --- a/htdocs/langs/en_US/projects.lang +++ b/htdocs/langs/en_US/projects.lang @@ -14,6 +14,7 @@ MyTasksDesc=This view is limited to projects or tasks you are a contact for (wha OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible). TasksPublicDesc=This view presents all projects and tasks you are allowed to read. TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything). +AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. ProjectsArea=Projects area NewProject=New project AddProject=Create project diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 9c55874a762..1df9359dfa5 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -48,11 +48,33 @@ $socid=0; if ($user->societe_id > 0) $socid=$user->societe_id; $result = restrictedArea($user, 'projet', $projectid); +$now=dol_now(); +$nowtmp=dol_getdate($now); +$nowday=$nowtmp['mday']; +$nowmonth=$nowtmp['mon']; +$nowyear=$nowtmp['year']; + +$year=GETPOST('reyear')?GETPOST('reyear'):(GETPOST("year","int")?GETPOST("year","int"):date("Y")); +$month=GETPOST('remonth')?GETPOST('remonth'):(GETPOST("month","int")?GETPOST("month","int"):date("m")); +$day=GETPOST('reday')?GETPOST('reday'):(GETPOST("day","int")?GETPOST("day","int"):date("d")); +$day = (int) $day; +$week=GETPOST("week","int")?GETPOST("week","int"):date("W"); + +$daytoparse = $now; +if ($year && $month && $day) $daytoparse=dol_mktime(0, 0, 0, $month, $day, $year); + /* * Actions */ +if (GETPOST('submitdateselect')) +{ + $daytoparse = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); + + $action = ''; +} + if ($action == 'addtime' && $user->rights->projet->creer) { $task = new Task($db); @@ -133,6 +155,16 @@ $projectstatic=new Project($db); $project = new Project($db); $taskstatic = new Task($db); +$prev = dol_getdate($daytoparse - (24 * 3600)); +$prev_year = $prev['year']; +$prev_month = $prev['mon']; +$prev_day = $prev['mday']; + +$next = dol_getdate($daytoparse + (24 * 3600)); +$next_year = $next['year']; +$next_month = $next['mon']; +$next_day = $next['mday']; + $title=$langs->trans("TimeSpent"); if ($mine) $title=$langs->trans("MyTimeSpent"); @@ -160,7 +192,18 @@ llxHeader("",$title,""); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num); -print ''; +// Show navigation bar +$nav ="".img_previous($langs->trans("Previous"))."\n"; +$nav.=" ".dol_print_date(dol_mktime(0,0,0,$month,$day,$year),"day")." \n"; +$nav.="".img_next($langs->trans("Next"))."\n"; +$nav.="   (".$langs->trans("Today").")"; +$nav.='
    '.$form->select_date(-1,'',0,0,2,"addtime",1,0,1).' '; +$nav.=' '; + +$picto='calendarweek'; + + +print 'id > 0 ? '?id='.$project->id : '').'">'; print ''; print ''; print ''; @@ -169,13 +212,15 @@ $head=project_timesheet_prepare_head($mode); dol_fiche_head($head, 'inputperday', '', 0, 'task'); // Show description of content -if ($mine) print $langs->trans("MyTasksDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'

    '; +if ($mine) print $langs->trans("MyTasksDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'
    '; else { - if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'

    '; - else print $langs->trans("ProjectsPublicTaskDesc").($onlyopened?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'

    '; + if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'
    '; + else print $langs->trans("ProjectsPublicTaskDesc").($onlyopened?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'
    '; } - +print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'
    '; +print '
    '; +print "\n"; // Filter on user /* dol_fiche_head(''); @@ -197,6 +242,10 @@ else dol_fiche_end(); */ + +print '
    '.$nav.'
    '; + + print '
    '.$langs->trans("Project").''.$langs->trans("RefTask").''.$langs->trans("LabelTask").'
    '.$langs->trans("Total").'
    '; $taskstatic->ref=($lines[$i]->ref?$lines[$i]->ref:$lines[$i]->id); - print $taskstatic->getNomUrl(1); + print $taskstatic->getNomUrl(1,'withproject'); print ''; - $s=''; - $s.=$form->select_date('',$lines[$i]->id,1,1,2,"addtime",1,0,1,$disabledtask); - print $s; + $tableCell=$form->select_date($preselectedday,$lines[$i]->id,1,1,2,"addtime",0,0,1,$disabledtask); + print $tableCell; print ''; - //$s.='   '; - $s=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1); - //$s.=' '; - print $s; + + $dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id]; + $alreadyspent=''; + if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin'); + + $tableCell=''; + $tableCell.=''; + $tableCell.=' + '; + //$tableCell.='   '; + $tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1); + //$tableCell.=' '; + print $tableCell; print ''; @@ -633,7 +647,7 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t $inc++; $level++; - if ($lines[$i]->id) projectLinesPerDay($inc, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); + if ($lines[$i]->id) projectLinesPerDay($inc, $lines[$i]->id, $lines, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday); $level--; } else @@ -776,18 +790,30 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$ for ($idw = 0; $idw < 7; $idw++) { $tmpday=dol_time_plus_duree($firstdaytoshow, $idw, 'd'); + $tmparray=dol_getdate($tmpday); $dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id]; $alreadyspent=''; if ($dayWorkLoad > 0) $alreadyspent=convertSecondToTime($dayWorkLoad,'allhourmin'); $tableCell =''; $tableCell.=''; - $tableCell.='+'; - $tableCell.=''; + //$placeholder=' placeholder="00:00"'; + $placeholder=''; + //if (! $disabledtask) + //{ + $tableCell.='+'; + $tableCell.=''; + //} $tableCell.=''; + if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject")); + else if ($disabledtask) print $form->textwithpicto('',$langs->trans("TaskIsNotAffectedToYou")); + print '
    '; print ''; print ''; @@ -207,7 +256,7 @@ print ''; print ''; if ($usertoprocess->id == $user->id) print ''; else print ''; -print ''; +print ''; print ''; print "\n"; @@ -217,7 +266,7 @@ $restricteditformytask=(empty($conf->global->PROJECT_TIME_ON_ALL_TASKS_MY_PROJEC if (count($tasksarray) > 0) { $j=0; - projectLinesPerDay($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask); + projectLinesPerDay($j, 0, $tasksarray, $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $daytoparse); } else { @@ -234,6 +283,13 @@ print ''; print ''; +print ''; + + llxFooter(); $db->close(); diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index b7ab0a8bd71..77b65a19c6b 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -49,12 +49,15 @@ if ($user->societe_id > 0) $socid=$user->societe_id; $result = restrictedArea($user, 'projet', $projectid); $now=dol_now(); - -$year=GETPOST("year","int")?GETPOST("year","int"):date("Y"); -$month=GETPOST("month","int")?GETPOST("month","int"):date("m"); -$week=GETPOST("week","int")?GETPOST("week","int"):date("W"); -$day=GETPOST("day","int")?GETPOST("day","int"):date("d"); +$nowtmp=dol_getdate($now); +$nowday=$nowtmp['mday']; +$nowmonth=$nowtmp['mon']; +$nowyear=$nowtmp['year']; +$year=GETPOST('reyear')?GETPOST('reyear'):(GETPOST("year","int")?GETPOST("year","int"):date("Y")); +$month=GETPOST('remonth')?GETPOST('remonth'):(GETPOST("month","int")?GETPOST("month","int"):date("m")); +$day=GETPOST('reday')?GETPOST('reday'):(GETPOST("day","int")?GETPOST("day","int"):date("d")); $day = (int) $day; +$week=GETPOST("week","int")?GETPOST("week","int"):date("W"); $startdayarray=dol_get_first_day_week($day, $month, $year); @@ -83,6 +86,13 @@ $usertoprocess=$user; * Actions */ +if (GETPOST('submitdateselect')) +{ + $daytoparse = dol_mktime(0, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')); + + $action = ''; +} + if ($action == 'addtime' && $user->rights->projet->creer) { $task = new Task($db); @@ -176,16 +186,15 @@ llxHeader("",$title,"",'','','',array('/core/js/timesheet.js')); print_barre_liste($title, $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, "", $num); -$tmpday = $first_day; - // Show navigation bar $nav ="".img_previous($langs->trans("Previous"))."\n"; -$nav.=" ".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week; -$nav.=" \n"; +$nav.=" ".dol_print_date(dol_mktime(0,0,0,$first_month,$first_day,$first_year),"%Y").", ".$langs->trans("Week")." ".$week." \n"; $nav.="".img_next($langs->trans("Next"))."\n"; $nav.="   (".$langs->trans("Today").")"; -$picto='calendarweek'; +$nav.='
    '.$form->select_date(-1,'',0,0,2,"addtime",1,0,1).' '; +$nav.=' '; +$picto='calendarweek'; print ''; print ''; @@ -199,12 +208,14 @@ $head=project_timesheet_prepare_head($mode); dol_fiche_head($head, 'inputperweek', '', 0, 'task'); // Show description of content -if ($mine) print $langs->trans("MyTasksDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'

    '; +if ($mine) print $langs->trans("MyTasksDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'
    '; else { - if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'

    '; - else print $langs->trans("ProjectsPublicTaskDesc").($onlyopened?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'

    '; + if ($user->rights->projet->all->lire && ! $socid) print $langs->trans("ProjectsDesc").($onlyopened?' '.$langs->trans("OnlyOpenedProject"):'').'
    '; + else print $langs->trans("ProjectsPublicTaskDesc").($onlyopened?' '.$langs->trans("AlsoOnlyOpenedProject"):'').'
    '; } +print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'
    '; +print '
    '; print "\n"; // Filter on user @@ -248,6 +259,7 @@ for($i=0;$i<7;$i++) { print ''; } +print ''; print "\n"; @@ -268,11 +280,12 @@ if (count($tasksarray) > 0) + '; } else { - print ''; + print ''; } print "
    '.$langs->trans("Project").''.$langs->trans("ProgressDeclared").''.$langs->trans("TimeSpent").''.$langs->trans("TimeSpentByYou").''.$langs->trans("TimeSpentByUser").''.$langs->trans("DateAndHour").''.$langs->trans("HourStart").''.$langs->trans("Duration").'
    '.dol_print_date($startday + ($i * 3600 * 24), '%a').'
    '.dol_print_date($startday + ($i * 3600 * 24), 'day').'
     
     
     
    '.$langs->trans("NoTasks").'
    '.$langs->trans("NoTasks").'
    "; @@ -287,6 +300,7 @@ print ''; print ''."\n\n"; + $modeinput='hours'; print '

    Un!*U~a&?P!6baJd`D zdNaMjrSI)*i-3a10fb>a#<@1YbRj$p8LicmI~+?CltARnf0n`a$u1!6Cr^csa^+|v za@ay-!@avt>B{%#rq#Nw3rqDW3ZAmyh(XviJ5P!myY%B|BJnwVy@U*nQSfyw8Xl%8 zuNYdnb%P0*$q#llbt8c1WaIeEMX#O{eZYQajeo(bq9w{=_3N5uMT@mr0I>vYwEHig z6?sy7Ix#cQrX|C2-bYR(mZlH=$<=dW*N3dC;ydb2b^)$tVg_JTnWpjk06b>nHbBJ~ zFoVS;16YLBXz&>1oBOKXbs4Hz_|sj1P{Wo0NuQD(81Acf+yT)C#|5YrkbFPXqgyyB z&0SA~?>1l{o(9kqVPDdyzs>cjM;~UAML8WocgCFEk!E2Y2x3h0=@euYo!6!Rgfe0m zYp8-hlEwboWO{QJV1dF<01qRer3RBSvJVSmL3h3K;ZZX^#;3JDQV;$~S#6`uNhA#P z6aWu6Aek2Tvts*j0K{LAzJn%?0PjGvYLEs0vl}$DV0)C}KWAZR;ivqrPu5M)S#HJ! zb)61LYVJv58TL=Q+}D4dDcO@%&iNK*Jx68r^O18*d!n2Dc=+@lmT~eW_Ig3K79_i- zWR9)#-+D%>d91;M?$UI+O1RZP(!+ki=9VN{itVY%BNd&~ePYigvJ3>mlqlGfmnp?A zz8eL-OV3jU&blboMRW;-q4w3`KQMIpMwe2sT~wrF4+p#SMhMF6NKNaaR5fgHhvRbk z`iV{P36qSVl~V)JVh!J)&~CWX7Q6}mSNs&?1dV`%OU|b>h3^)=ry!P4g;^WBk9Wr&wOm6fLLE-yC6hp8tCfd56gC)piB;|E}u*opN@) zDlCPXhuGb~f|&h$zQbgNSod=TO<-6o+Yf%-{jk;ctB)xeG*C zD0#pFgx?k%SXu(+;Ff`P_9SL$1akd81KI#h8zlBNzt8r$`JO)i99n^LKbCn7UJ-2T zEzxgD-`Dx~$Gg1`pcbBoLnLB!k~}h-MjZ^F2OXWa&cExrpV#)%J7ptazfF9Z)E^0G zP7eF#pBhoit+k#6Y$KYh!rM+PrR)dWH#2>XPyZ7wC(Vj=n#3-Yda0@ zU^!q}?zy&K;>EU1h1+7Vrt2rs%}p^^rTlXQqM7BZn;!f7Q`Zfw zxHat9gbVZTi**J%?Ds{WY-w9OHJp^76NInv-6hgvaUUt6lBIX(hgyp9m(4ut7w2T9 z&Z76P$%OdLWimUgJZ>6@6tl+vl)EfshPD4C@{~9&8^UzPNqx>$r&WOE`Iw)KtWV%~ zgX`U0yZ6~e%soE$mr_Cg;Gan|EMn-I?_}1!kPfhT=>Y*u56k*N-YHlh1ZLN0IdLGw zfU20L4&ZRm%0cYF_ud~SYq^@~zQgp>7ZL^YR%X|`r89uflGx0#jC*u#E*eBLuMzsu`tu;tXX+OWNy8uehAuv?uWF4 zh8@9wjZ(sN-P>;NBY0lDG>pf-c#&ICjBlU)rP+~`BkW?pN_Fq~k~#fpSxC~KQkimb zGzzQww(kF2>dTH5OcG8Y9zGj^Z>}8#(*Bu;AJYQY)qWN&bm^bjLla5q*Xb>9%Em>& zDGICZ)G5Zzaf9P|qTXp2;{Efiu1$c%Ysd8d8@>I=(85AnO_IJEB{>w=?$EGSD5y=+N8$M0^1It&WjN_}F$t0#;7Went^ zIyNOlaxuEA2!h;T+d`)YM=9YR>ZssOMWy7QOPQ3?5+|6Ri0`+(nq}#C(`Egz=-@5s zTDxz=rgaM&W1M)S)p7U4V&baOxTGZe$AXN*$F*;XRMpLWA=b$n&PDX|n&ecE*5R`r z)dp83rv=T)N8i=j34!LBu}l=s7^N~z?%j}r5&_*ia2k3MNQ*`UMX@+aOT-~8~c#9YGY!gCit?avu4ude4>P4|=%>stOC zX&wQqQ11L3X#&+F1o2SKdi1>42Ke2IBWXz0(BGD9fwfK0`Xe zJ>tA$^M(r(-I(~b3v|p)W?FEvf~l5pq3U(MkpAPxP1rQOhe?WK+qvoFOyEZ<^@4RM z#QEC%hvQadej*>2c4@JtW^~f&ZelXW-s!zzT7;=vn9{^M!v~z;nOy+*llrg${p*W5?(!P+9cs~9ZG4qas@SYf zkjfLVH?(4dd}rs|snsf~H7;U=0L|MsQWvPsirR5y_+A7_r|i11#E%BIEa(j56?;O}` z<0SBtIYIhASK4WNZOk(YpMO-b6C;sCO#)0L+V`bxN+zHsxk-Dxx(@cmn)Gm!kdj=a z52Cdq_fx5xVf28Pdwv=Zb~8Dkf9lT%{Xd@>Y!Z)$Sn0Wms{Rs;RGJnanm+Pv^{Kp-72cz?w;{u{Npe^ z<9YB>V&xlPUO;h&Gf6cmG&y_3_Ro7O)T#*ZxJAoJcJnq`l@p9Fq-1%R=f*@W$j<+z zlTk?jkL4-2-a@M*&EL)A8dJqDP@Wm0YZ-Z3_mK%wrpTZWG{W5cwRa>>Y?@g_!@nS`jYvCWxokhfiR-!vErOT_R6)nm}V!?_bb$N;< z_{vf~`C4$;B>tiKngwtlpBpI?q+Cu#OB1HV-Zf*s%+WQY#a>bI)h)a+U?IWGxd4HHn^25~k>RRinPM-ZoHjpPOqQ%pwZ?BEzDuwa>?|YO2H^pOBgF;tRyL8UQ$|t=4 zo{4XK-kT~WAeD?Ayb<)!vqG+(@=Y1`A{%_;Xq5bZvt_hHmjr!ErrvqD#Zqa6G91$I zzMryu)HXJ$Gi{8&V!Z-`u10)Fg1PAA9IK&_ukM>!N3Mc1JJH`{LTd%Hmf5=m@=-kF zFSvEA1v*wE5j-%=8ZBBcHxGRCU=@72@RWG~lt926ND;}i`wSSnR&>zHx1%6{HHs;7pP9gSOKhDULzwr=uo-|@q;xd!tq3b zq9F24!Y{b1`Ynebq@JtUdAQ?I@ohv!r2#U%N%BZ$GCn(C@~ZAe#9&AkF^7*+N07&t zN=ND$$OWl<=hVaaqsLO&JZl9D-Q+jnW5t~4!{ z!8fp2Hv0*@MR)FsLek5zXE*VS3sg$eSQ9F?Q7~w6^1W3!xmE(>F(}ute(X8+P1VWC7uOriGyQ!| z@khwwSC!f@@QxSuhRZy;d4BIRF=gC7_+ihnFcONEx?ukNY#H3+E58f5N;O5#_j+QQ zto{goxmC|a(4x>qyei)L;uK6>*e`F5lUENp?wZAqaYOPbVbljhaE_QG2p++dKpS%P zQHzA{It{sls_dz+IwbV=8{R-0E^5ozOLV?MDjHkVHZIz$h=1bJ9kSS`>a=K_b#0wf zQWvY5uBtN;Wr3K!ktEt7M@C-@>5rD_4{$o0n63oxy!~X6-w0;tXN(j$Zhfjmg%hiP zXq$A6+$JY)Mt?yyLh;}@#EV~LYq{V}2&w{QW|UQle=UoRUS>MT_?bh(YEg(0_zR=lll^9{P)8S;?@Bdvd*y=Mm}{AcNlWC zrO>bHBJ(`kEGohXMT*Dwi4#KlISHIHl}?3lp61|pRF!86>EDONqm_cf+buXvRthq=Uar829OBf?i&*$(7!sV>M1$RAZYprWXSX#IOx z5oCs2+t#06b;2xUay^aR3Ap`BT6k+^c$flzrpvV(uUN0EyMHsMz6(VS z(+igI;}?gyN^2%272tA;7=hrr6r5tf>M;v(O`WtDP5zA9*lmspwR5aZ#ZBm<=bZAc zAwo4TQ=o?tDR#l5bWY=pni1p)CaVHjg|XWawP zuFw0VRL56X(flv?l}#xaMxr~Mka*par6?$}8iu_-SQH;PL#e$kBUjk^Sq9Cy_uxJh z>9CObAq9t>$yAxlmXwzPL2eH4cAkr@CEF770%Bj<;8+Ds$`JZ-EoW%jp-R)-UZk6` zQ-Rht%5w)1WPIaeRkV$wG1h`izVXya<)MqXKWoY05Yf&A=7PD>MnxRzaU7PYaTa&{ z${O`B1yl2af-S5pYSlo3{~}@nPr)vm6K+!rMm&de+E|6E?;#~Lkx#KlTx7&~2HW=v zm1;Ipy1u_dHe9K~v8r{nEg}iQ7I>JfnlZa7*)*3Ra&6^4KSt8i#5_PxL&3JXH_%9_ znF~|({XQIP?V0V4Bt&?C6XfXNL&Ury*iO0cy@Ega3wh+kg#5>Ms0wAHl*dV*Hbos& zl!XX^7)NoKz;ig(J^o8L_L!CxBVA5@I0V&{sgg1nP>EqJ7~)Bh$b2G(B+MU|MSMRl z%heQn(TmE}#XmiXXwx%zUz8W$Ah$ofPx9ic0%XU{6wD8wQWyR_$7t4qX)H|8Fa(ZG z;KgI`HHE@Q5I8?49W2XWK&~|namzYpXqHrm89=JBas}sv?L!|MN7UJUSmRbgXWof~ zI~+4da}r=j)~-=fZz9Dcvb35ok|_A~f6H5xO&SHJu4JNZTkn`(MPtfj47B_l|6_?r zm6>={Cu@@A&_6#wQIL4G$3g(}0_K7?O37S6)EW8zLgJFm%>Tw*X_3_vms>Sg5>#WE z#M<-oD!JFP=G^bou!Eub$@>Sp*7&cj;|<7x&f=&Vui+9Z@`4PCG{=vweW@E}fD$B) z-kgnF5J2U#=;7xPcNM)?H(|0Sc)M%j;THPAc?#w-tJQc~)|woIwP4ys zs;*RF5w)vCVL*&qR2c9w5Y#SIVXP%i1k*uL*yC0y?jL4|XVwN4`s`Qw2fruet4szv#Ko z!?y9*U`!BR%>|lc8w9~4W{(Xg!~1hx2c^AnDL#-potGt9m1H0(x}<=-tmb7cuY!W2 z6*MTTK-M@&QFTQFie{)fP<5yRr0GD@4GnOh##h7C0n!buBLWN)KnVE3qz1$WchiE% zga|`Kpot-0F@@NM#6ieJCPpSfm_re^5U~+;OiWB-VGgC3a(A%BVc2GbT7=rfvWVpn zixJx)JaibfY-%&=FpI;O?aJY0JIrRxam9E!jLWs^n@Au3qm#v4X2{L{gM=&dZ$*B` zvveXhEY>B_TPiP???gj0p4q9HW^L+dyxG+#f6umFSgKw-ayC@2@9V4{PksD$sJhhg zKDhR`w(-mF_4Q)ZdpXk5cX%=Ub+s{SY$=U)PmE6t?Yh`IG7^~VtS^6F%sjaJj@Ha< z==|#^w{P|BoPYeNeNLRMER5~gU9D6;eDY0Rzxh&q{xIAfsGaz+b>-@Sz7p+kDNSpM g1Dkpq*)x%ZNBGkg{q?jb>Emw}(#cF>A%1T9ALDq4X#fBK literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/helpdoc.png b/htdocs/theme/md_dev/img/helpdoc.png new file mode 100644 index 0000000000000000000000000000000000000000..8cd950e7be1aabd9b452c150ddd128e6223f72e1 GIT binary patch literal 693 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~i!3-n?Kj!QJQtTz3zOL*yIm8(h1*R4sQwIuh z7I;J!Gca%qfiUBxyLEqnf-LEdzK#qG8~eHcB(gFvFbW3vgt#WhMCT+Y<)x(*q^A{T zq!(wTmtW@nYe1b)pXa_PHJtQ(%w3?qit$u`?Ri(ncbbUdwb^e_0F5nw|MI0)pKU8nKygW z;ssllEZVwc(Y9racPwAJW5u$aE0^tBxqSD^<$G4G*t2@&-Zd-tty#5i?dtvO)*Rlr z{>Y~FN4IP|wr$Jt?ORXo*mi2yj?=q$p5C+T%--GS5AHvI=)i@;2QM5sboJ!%tEWy} zKXdBl`LlN}UATMs(u3>Q9^Sn1=+@20w{JbUd;96VyHD@md-3Sui^q>%J$dr_>C+Fd zUw?Z4?(>KDUp{{L{_W$>@85s_{8_O+r3V;T(Ir8C!T)In80P%iu?J|)0Z$jl5RU7< z{l|rx92lIhx4M>XOnBe4_xrj8ap`RvdH?)xf6>tQY|@$CDvY~U8m*eeI3ujYSz1p6?#fDol7fyyMQn;~@~bO(*jkIbo15g5+^oDJ*!SLv-94?NHTAgq&26>YkF*?h z-hD;pQ=P-MV|}4EcJ*1?o$qh^rx$wU$|uW5X7%wRialj+Rg5pQ^%CbiI4TMB3xlVt KpUXO@geCx!B8$ub literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/high.png b/htdocs/theme/md_dev/img/high.png new file mode 100644 index 0000000000000000000000000000000000000000..c0eaee6542fc0d716f1fd9ecaf7e30a7c96ecd36 GIT binary patch literal 611 zcmV-p0-XJcP)>3L-(7Q67r4%>d*izJF!^bsP-=|RSCh6Vd#qM%qnqj ziWEzVv}}wF4`Y0^1R04y%uMTASA1S0v@#G1sUbqZx;Urzds9P3Z}OHpH(x+`j0jc5 z!NEQp+kzX70)_$pbJzB3-&l^(H;?xAe$X}7wbYnTpirxU`9ApLCy)Th{sB}* zov6aEtafy~1(+4GH3dOIYy_bS1QG;Ff(nvVh%uWXdvb4Y>hv$@nK|d1@3-^3&s()EiD+%P#u5gD zS;vv^snB#ZU4$9*D#+I@V6dfvZHegwXf-#7Bdsj$tgY==*f`kRxvgL0x4|_4g$nm^ z4)<}1@bZZ8b&d3Mi}Z7k^moVjqp)7SShPD9?SVymZt?bu3iKv?g(ijvCtw4%ZpLoi zvMHGunU0Uij7I0C;diG+?@7m>+?`dnlXRvi=UidNrLzZboZsKpP}NaaIyBHfeE;%P zPYvs7?ex&&xv4?XbeBpvspj;k1vK^h5w&<$`;nzzlo%El3`(i-(>p*h2k14RbQ)Y_ zgDN4Y{RsUEqFA=f+y-f7i$p>oD{YYu4)%`rE1Voxt#fj8abDxL)*j;Wa9jT$n#*UF zsK6jxpjQlb6F$hB5E>dA9!3leg;+?~p!m%Ji5M(IlpG$O3_%e>Ag+|?s8m8kDiLo2 zj0?^pg=NLzv*Tj36GC(1V|S(CKJ(^hCX#cqN(*vN?A?Bfyb}U1FG#yscHruFg*U%1 zY`$=$rMjfGa$j4+IVgnA`ft0MYx-I$pFg}YK)D2EGTQMAz5OS8M-5}BZ|qU^_+wK< z%-(A(>aVY72JVE zUjHI*SUK0H6fjhL8e~KzWSXQvM&^gq!g0upTEf-v1~d}3Mj_S;X^qO%^ z8CNf)>&26LInU%yHuG7ZK`k|?KN)3HkVm6hVpJ=PI+anU1|%#%&NP`-3IUZE&`1HT z0?;l3S{39P&}#vM78H$v5;~|5n7k|Bg35pGYuY{{EAJTBcS)BO4Hp~)yG82c<{Pvn<{ z#Z^4tAct%OJOyzChDs{;p^NXItDh+nwWpL_|Y;xH$d6ON8^p8dGP!+DA_GQygz^}WO# zj(>55Qf1Xyzzf7KP|>5^JHF&6e@!lpow#8^ukczj`6#oJA2Z!AopqBS1qrv#G#>A{ z*mK(lYbLKBvq6|$P5_&zo(S9GKZI{Ws?~^B&i6(WUUf5%rLM9>{Z(2Ni>ix=7|Oew z1-IZmTiu-KmJ&6x=fje`m)TCO<67WonCH5@nO#q}X5_4HD&MhztS8Rb@>Af9y5QgP zxf52##+wH#6jxw&J@8vA8Qd^-qvo52x%P_lXUsK?MFK(j)D`*HmS;_d3cicyn&{Vlv3wW$%>pz1KHA zr5a1xW&C{1cGuxd^fPwrWqQkr+wS7z?ss?UHMB>?*egrHjn%P}{Q9DwC(=IbJ-z%Y z+5hpW>3JgE`|M%OUC!qFheGZYW_HaKtj(vmHUWW7#TTX3pcyMg%#_z9EtrZDM@Yg` IqVvxE0}@!kQUCw| literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/index.html b/htdocs/theme/md_dev/img/index.html new file mode 100644 index 00000000000..e69de29bb2d diff --git a/htdocs/theme/md_dev/img/info.png b/htdocs/theme/md_dev/img/info.png new file mode 100644 index 0000000000000000000000000000000000000000..12e6cd655d6630345cd24c74b5e85bec38524c1a GIT binary patch literal 657 zcmcJL&ubGw6vsDhC7XnlC~AWkXchcH4@M|dv4V*SO^OXMt)RA|WyKx>)|woIwP4ys zs;*RF5w)vCVL*&qR2c9w5Y#SIVXP%i1k*uL*yC0y?jL4|XVwN4`s`Qw2fruet4szv#Ko z!?y9*U`!BR%>|lc8w9~4W{(Xg!~1hx2c^AnDL#-potGt9m1H0(x}<=-tmb7cuY!W2 z6*MTTK-M@&QFTQFie{)fP<5yRr0GD@4GnOh##h7C0n!buBLWN)KnVE3qz1$WchiE% zga|`Kpot-0F@@NM#6ieJCPpSfm_re^5U~+;OiWB-VGgC3a(A%BVc2GbT7=rfvWVpn zixJx)JaibfY-%&=FpI;O?aJY0JIrRxam9E!jLWs^n@Au3qm#v4X2{L{gM=&dZ$*B` zvveXhEY>B_TPiP???gj0p4q9HW^L+dyxG+#f6umFSgKw-ayC@2@9V4{PksD$sJhhg zKDhR`w(-mF_4Q)ZdpXk5cX%=Ub+s{SY$=U)PmE6t?Yh`IG7^~VtS^6F%sjaJj@Ha< z==|#^w{P|BoPYeNeNLRMER5~gU9D6;eDY0Rzxh&q{xIAfsGaz+b>-@Sz7p+kDNSpM g1Dkpq*)x%ZNBGkg{q?jb>Emw}(#cF>A%1T9ALDq4X#fBK literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/liste_titre.png b/htdocs/theme/md_dev/img/liste_titre.png new file mode 100644 index 0000000000000000000000000000000000000000..a58ee63e1b6af52557ef53ae424a77bf940d478a GIT binary patch literal 196 zcmV;#06YJQP)u#Oov6V41S-TI7Z{)gpr^t*fLpYo0HT^sS|G`Hc2A%6P%v_0000bnWCl=>CEd~2k%3`jKlh(RRv^F4)5S5Q;#O+^ML`xt4rk6A z_5R_9LO1m46iFSqD=lk(uZ2a~?ml-z#}+vy!O3@G7c9}VTE3T?e>uD1kN3OZ8-JXY z_o^=Ipzopr0AUSi-v9sr literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/lock.png b/htdocs/theme/md_dev/img/lock.png new file mode 100644 index 0000000000000000000000000000000000000000..3d99cf1eaef689386c6bcae4b7e3f237d53bf43b GIT binary patch literal 646 zcmV;10(t$3P)e) z%S%*o7>1v7&TkwY@0X;A%0)zrqE#hD)*>uKv}hGrv?|*97qksTT2v5(DUq9&5rJZX zMlJ#oHT2j_UNUub9HzN>W;|!k?`x5X+6&+E;rU)(W@cxZw(Zc=^z@bSsj0VPlare> z;jn($+xz8wW8+N~2$Zs&zP>(01QEd$kpR%FlzNp;r`rby2RGjI_s6ZAClAJbGnmb}g^*zwdjF>?H*u%5P~Tb`@|H`^o$yY!oDN-RZU_`IF~^OrOoY52 zYr!h*S0!N&tcv{c=Z6j-Id$v0Vclpt+gX%OJ+z`RDf8E5Zs>8H5%rDB_4#|QHfMm* z9ndNcT&*||ETY&zXUZxKad0;rGVT^}-y?28NsT&Qn=%`LNgxZLw6Bpu6v_KYHh~vk zAr_6ZxbCr#fLI z>(?rYnH2M3pV>wDnS^8k@&YC1fAgcVnV>eD45TvTvp%^TxCPJ}EP@~07*qoM6N<$f*|29;{X5v literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/login_background.png b/htdocs/theme/md_dev/img/login_background.png new file mode 100644 index 0000000000000000000000000000000000000000..facc2c6f4423ed902fc2c478068417b0a08bd823 GIT binary patch literal 79 zcmeAS@N?(olHy`uVBq!ia0vp^j6j^i0VEib+*$VkDKSqM#}JO|$v@5?VQ3MU)R^(@ c!9~Va2KP>Z?f!}q6F@3GUHx3vIVCg!0He_qmjD0& literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/logo_setup.svg b/htdocs/theme/md_dev/img/logo_setup.svg new file mode 100644 index 00000000000..4db2a11dff1 --- /dev/null +++ b/htdocs/theme/md_dev/img/logo_setup.svg @@ -0,0 +1,475 @@ + + + + + + + Ruota dentata grigia 2 + + + + gears + machine + + + + + Open Clip Art Library + + + + + Architetto Francesco Rollandin + + + + + Architetto Francesco Rollandin + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/htdocs/theme/md_dev/img/logout.png b/htdocs/theme/md_dev/img/logout.png new file mode 100644 index 0000000000000000000000000000000000000000..26ae717bc1abfd13b94f215a02ca4c462dc614ca GIT binary patch literal 608 zcmW-dOK8+k6owOPoi?R*(E~z?kGl|pAOs&5M1pO(({^n7@LI*VkSnz|E;K?r?ZPfp zMp07KsX7L%WeSDaXuuK>A-h>9gJKlwWT8YX1f>_zg`l9|tv}y6|2hBaaBdC{_O>dj zB1uwfu8&aRo7bzUL3FM3aaCAmGB=RTtSH;tl$}#28sV8<4j5yi0U?Ho!8A>ZfMTFT zr36t*Eew_cmSr&nOao>BW6Z{28(>rH=-?1=Ox3Xs$8qu)@&?Kim=QR5rcfvlD3~DJ zCCH^v6xdLl(ThT!=TY!1@baqXx?Z_lwxCj}_)PWvzz>4JhM-ao{*R#pVID#shhbRF zqpAm0p<1n0)@qfa@W_S8N0F~Z0gBcY$1cQ0h&_k{6o({^ zP8|4g<$3d4ws1?y+*o_?@X^Bjm(j&tZ(2*Qb3+5l)VsNR^2Fa|`nh}FJVO>g%>H7% z?fZ|M%IWpJyWhV!K6H$Bs;|cMmHNs^>F%9RnPvIO`E3UewJiM_YP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#q{Lk(I000KNoL_t(o!|mC@)k^_kQ=x z%rkR6tE;QZYFm`py6|22O#nZZ^6XSu;2&cq0FPk~H}itunnTQ!c-_tU4l4f$2T`qi zJ{o+@>|TA1>oqxbMe2zT#zQ z@9+S3acMK8O+Rj6JjFK>+F4XEiBEVEphjcDw_DHm;eJqjInmzYPPnc;8^l9g2=7kf zMcsR8EjRdk0jgTpY6;cqeG{S1ho|_N(kCreRQPcWWT;hZ;J+38|1i~Q<+tNp3u@IG z_;=t;=rbKl`Bn$)Q23(NjOlHqNuMKlg@v%|+SaM5av);`txuaYJCL}q;83Tg%H0|8 zYiiHnLyG@=O8@1J?uA>0ueGTB`v(5gDPyfsyuY#GKPRTUG~0#i8NW<&EbMGDHu_@2 ze`%p$+LHlaN%U(L>w9eY3jUyX1GUgxxE{_(!TCIDo7r`ixWcMBmsqG~8;qL;EVUZ6 z-4nBm*t?F+#Z)*Ai)!uGHq&iF{>G0gi*aA0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Uj0XJcGUf00EszL_t(o!|j;SZG$inhJUKQHye}TLe;1Qe& z>THk^$OPAyi)0~)ZLr-~^+~({#vk@?-+wNM2&u*$5{?X?;co!Gp14<~0^b2p3|s>^ z0cb+O-v{{S7Qj!|e8iFO0F*Q9pfj{p00sckrNhEwhV}8GGykkgQ8o_%+LSe4r3^o0 z_&M@(MuDY5oPk@fP7rHe8Z@`^8xGnunL1F~5V*6Orq+ zA)-$*ha#d%YuA%qNL!XA;Oa_;a^hL5wHH3&U1cM=QgVqe&1|)7d!uWn8Z zGhzZN$4P zS{E)O?|Nb;E#xt!_1f3=xW*DUj{ZCt_!9Vmr~lnz4IKF0AmB@6Gv2Ek9@%mvEfEsh f2Yfy~__y%C#jBVt_@Tw}00000NkvXXu0mjfo}S{j literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/bank.png b/htdocs/theme/md_dev/img/menus/bank.png new file mode 100644 index 0000000000000000000000000000000000000000..fbaee7cc6bd21fb4f562365a376918f52633026f GIT binary patch literal 827 zcmV-B1H}A^P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UjF*gs!;&00O&7L_t(o!|juHgdX)@yEDi7t@D1>FBoln*mjVY;#P?LKYVapg1n-0aZv&+i z!HQiyFylX)-s1DpZw8Do2-uc^%gjst6xj(I=n1)lq)x&qJ%TnDCx%{G~U z%zL$8z(rsYa2m)O_kU3E76M0f?cF8a2}X#*zE^ysHErzdW;gIquQ7c%lt!^{YNd*>0{XDL`IKc z|0Yi6{TA#eSAV^LSGp$$yfylRz*k^#8maQAtAEGGey;Qd*LW$7KdINikAOe`{z~66 z#@d0IX)ymzrEysn0NXt5yQS|MW1FjGJ`*tJE49@w`=6>j$Fdy&o&b{#`}sh#hkrXP z^Onc_N~Ojj=|jpU_f^ZZ$?mhthP)B;LkbxyuFZ&FwrN%dxve9TtU{v*JT?|+(bxm; zlI;UvjgNmj&X@;S1{@Ugmw-NFZmaZF>G$%v1K1b9cOr$^6y^NB0I$8M3bZAOlGqAZ zRjvSbi`{P;GatMa*Z{0j--;XjcuHbafNfVed^Z+sURy`T=`Zn}l(}UrOG}l0B0F?S zLn1qLN<&8eTjra5K4nfM{=-y!3c0~*!Pm4jzDcDe{{W+U8l>_!?qmP}002ovPDHLk FV1m@oVeJ3_ literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/bank_over.png b/htdocs/theme/md_dev/img/menus/bank_over.png new file mode 100644 index 0000000000000000000000000000000000000000..d395710a8777d9c9612301f716557ccffc9188f6 GIT binary patch literal 620 zcmV-y0+aoTP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UjR=>1v<=00HbtL_t(o!|ho?PJ>VoeKqdO4XP)Q6WAUB6J46(0n~Z|>&|7HxN&3Z z0Zi}&(i4d8P4EV7To_l+&5-;|3bch5(EpNIOc~%o9`ok^wn(C>*g=C~$y@T4e1ou? zb9@hgUm?FxVr}x*6~Ex{U&=;f3Lr4#)NTs-DS)1lPXN3&rQ3{D9?1jQR=H{NLjaDE z_W*R8qWJ@nN+1u>Z(6tM0J!|iYVtCl6W+@^b(;@ir_*i^^uA@(%zPDYb_HPL+&;DmAZX?Yo?M zPvtXdrCTv6jh6*Iewmk5%1&2N@{iK~5-hu9yiwTGH%sD?$29$=VPJ>y3zUbM@*uYA59NKm0^BP@=xx8W57==3}->Y=; z3EFCLzLCu-yTxtEuYp$1Uzv{a(N%$14Sp+;x3aP17vLAzGvAk&!lohs0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2k> z3ppAMu)+8M00gN?L_t(o!|j<%i(FL{g}-&G@=i=b5PSqdM2t?Hh(!DY4n#z7>crpR zpK&hEon+uZP!z#|5-<=9Y79mt4(ZhNYpq360gl^#A9zR7Mc`xGUrFjD)kh9|t@Vhcw}AJ67eL+N@0YTE(0y%e7{%1l;8o9UvImt@ot$u#x@o z{xa|ea1xkG`nA^j1#qU6a%Gj^`}Epwhe-OX*7_0fI&cU$XxoyWm-HI&o9%CbQYjIzvdq~ogz>AU&KQQ`1~eDEaHzQ&TPpY_(xi_jQrlL} zP@+#4_bwx~WjSuMg#8-*m5)FX{iZO28b4u!Q{1%KgZHK6vEQ&Fcd6Y8>CFuqoo1 z^OGoOU3R8{BQ3S7tYh|-=@64tA9Tppm)n~Tn8hag_?=QO#3GqqxG`%*YM#$GiX|F& zq@eZTKE0&2wlv`JUYF_f^8~Bl`tDfQCz`ZbH+P?tq>mb6&u-H%#chVZJsdy=4VOk5 zvmw2D+qWBSA_E$6xaC-74A!HxNuM|nU*(1;*d`)vhOM!_MNuQ*rzuKX3eOZlJ%_nBtoH8_hbR%_u)Tm+m67YniT|v!%B%K3( z0j^29wW=c3TxmU`UbDaxaK-m~ZGSH5Ebx@1KY**YZxkWrzVSlKQ3wi@aQA_Tgicn z?MZ5`ZU8qP+WEZg-N4c2+2Qx?5NQ*afyPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UjeGh88CP00PZPL_t(o!|j>RYg0iG$3H3lwoO%1!D^@?{x;PLS}Z930Hb)3BJ`#n z1dpPiAove>62z0B7r~PU4n9_&F+VyX3JY+8-P1Z#izBhmHH2`rC&`x5)|HUS5Q zyxp07`+f7~&CX0>N-3I^T4-WwYVh;wbl)?;0bnig6?iTDAkAdvcpb#d3=Q^4~o9&QkLq0M~* zlE5RE(WVXf=C&W@S{Lc9zv)4z(wE!aMmCPC;>-++pfTm z0egX7V5`hMmHCIj77eJ0T3sJfr+_uUi1_j$pdaY8fUeL+*Wlj*=YZn|w+NzP*Wlk- zKH4D4x(5Fdcm?#-xNfS7FdIo$c}v`+7QP2ex;|kmbQHK;rS22pS|g>zkAcPV@!Du; zuE6V+&vzN3%rvl68z*Hv-AI+xN?^aoudf4FfC+7G0Wi>LW#CB<@EgE0;5~5FBTEAv zjRL*{=<@*Fq{-8UXw%;)KHq0JsCp$`_#)RP`CVYfrRA3Z2Yq7s6p**X`opf>rd!^k zANZ^V{BGB7v(J)*Wr2c4-X_)9kPFLq0txYF6OVh6Hxuu2W%(Y9Reu2AwW1~IqqhNA zB>ItBJ_VG0cudnPSoF%k=BO>-B?j=z<;S(_PXRf9Qd)wMfnOg`Efuxv4*|OCqPG01 z06?ETUCp_bvq|CM+P$b}2R8hB18s5Zei~jPc+(rdhJ!hE9 z2dw$sDBw+D_-DYHKT*Z`B9O7Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Uju{RL`#f00I6JOUe(4N5oY2F(Z=AtTTY=md2) zpc~K$)IZ9d&llT#2pe?gABk=Bc#-5MrywF6)gEwQJ2d#mjh@>Ar~#A!MgWFKC+dZW zB!?!Vf&4ZQQ6uF~5_n6~?YbxMn&#VOt=~eZR2l%)f_=prrxM^bfbYnfF91D{n~j{% zUCwHw0&_oHc?JLt4{hzM06g=2mTFTH(HKa|vuFNh?@N74FhB6mUt6qp{QZ<%P`OXo zcMgfs3X!QvtaG2R2EYe^*M)ntGH+IfT~_b|m&3XCx29A|s><_%Jr~ZCT?n(J`bHW& zxNgU+m+-YkGon4Q?XFR49Z7>P@080oKEUi3I4#VPO=JG*ghv~Z&E;Og<{s;{a|%mT zs7;tZ2bzvh606+ID-W}<^iD_@Wlh+Ilh6m=L~a_gtICk>2{He~FP{axj!0i)wSuDT zOMq`9!fTwMJYSX^T3drRGo){m8hjl{R2RIN@T{cZV{F-M_j_c1PKWgySbLh=&#nQl zCN$W?%yzL%1%3)kbHVGBVH3OJlWf$Jf>$1?unX`8z-M5-0&sO+<|2B9A|Qop?ny(9 zwjv_qnICygnd^T3mTWDT&+3j$I60qtzO(6;hEuW8|FFtxvb7_Phc&lkDZnSOL;nx^ Y4;OV literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/company.png b/htdocs/theme/md_dev/img/menus/company.png new file mode 100644 index 0000000000000000000000000000000000000000..828bf8f2e709d32ecb911377c85b8538f558671d GIT binary patch literal 572 zcmV-C0>k}@P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Uj=0H)@&y00F#7L_t(o!|j>BOT;h~$3Lfnhae(|aEm`c4ip6i5eIQO1pg2J13~`? zXIEFjKf*x-CkI7G!9&pDI8eu?ca2MiBQ&|T*K1SEgDiP3FW-Ke=A~^-N=a31f(n}# z@5OuZUVJe&Rlpo8s-?BIYDTLSP^8+xa)xog>Y{(j6fZ^?dj#B-xoiaR0-Rf7E`Y6= z{;2FVFMuv^Z;9y|?vN~7d-mN9$1kl`D4}6+8c1GiLV3OmNE6b$)9E(GJfyr*aB+)Kdcv@-u?jKF}KY$N0!k50000< KMNUMnLSTY?!u9k3 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/company_over.png b/htdocs/theme/md_dev/img/menus/company_over.png new file mode 100644 index 0000000000000000000000000000000000000000..bed6b8dcbfbb062a2ff1d6affd40c1b072b2c2dd GIT binary patch literal 406 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?hRKk6QcL#T#LS5yxbDj z0E;X!#V4_weWx!>|NKnv|EtGu&89A{;LNF4DP%sUyZntkb7zOHi%VZ$jbfQduietc z{A%~FJy*Vxd(2Aijf~#I#{$hg?2+xMNk)$wv*J!3-_vs=?yfV>6YmEWY@b$Ds;+;c v?zE5V%};~X54cO)?NVPzt=JU!Nz8^(ebcG0kG<|@fPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UkBiQloYN00R(7L_t(o!|j>LYZOrs#($9<6g3e=M59Su5y68*TtXlbQLl=K3ldyF z4ITtR@aTWw0(w&P5 z&DY&ue_gNY^-O`8k*hX_9JW09Jo!BN%v(8d4rudzq?wJD*O=Ko``60-oFmi9PXcyG z<-0(&=lhy$Oq+7xh)ACW$`at#XH(i#o7ovNi#mSW%xXQcn0Na*e?gkI2ixUUPOKg{ z2{dZnpWxU^2a_@7i_NUg%o@$CN8WB`hs~@s4!+0Zjb^sZgQ+sJdY$9HYlcC3mYJO} zvlcV!k~f&y7Tr(`S1DYj=3cBT!XCwAm_zZdT^JxWRsy?$wNC6la1?mx#5M`HNb?K8 zOrRS$Ej)@H1l9o)6^m#bibo(7@*9BzK#As2;1X~g=uoT(*eR@w0~iK+b@RQz8ex|^ z*NA$qIUJOHEwJCCN|WM!ij@fCmb{2}naMZk*cl0Mt_4@|IrJCIi#-6y7?`DpNWCJ=JP+71-+RU0NKn z>CXB0z-8b|s^p&lOMp4RY@iir2d1Y{`47NNjR`H;CUpbYrHTX4tZEdt@;`w)>L(*w zvgAK1UCNxtSrMZ05#YKiS<>cbdvFEVC-vJzIH>XwmEWhSlv_XKe*rJGXg_HY1yTMH z@H|M5@Vha404#HMnMEm(f2ShQ7j%L6CEo{h>GNlG-DJsk>IJ mo@TZ3C>gYZ{GZ69WPbsyx*6lY>ctfR0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UkNtxZG$in#b2s?4;$2(pmc)J4YEP$28=*9$Oa`7G#i9& zKsO*8xD#BzoF#fP34e@-hU_n1%SHuKZ$6r zD4C>E$G6uv`%*Ze?{@MS0q_6Xq0pI^9)n*+Wcy4&PJ z_demj0lYSLyWa3cL+3_1KOUgpc)V)tLn`;A`zwGC9_RiTJuI>D+{S~O;sZ23w50@e zTEi;g$6dgiYAPC1&Gj{AC%&cHf$k5D^BnENnB_bmMm%j#0JdYGhr-tl=yJdgvTb;# z@iFqqql@NkCkjrk^@w@bcQSYdkO4S9>iK+iW3N_If&;+H(W^{i2YM8CV$xVU>gT}V h8XjY{yhNTU{s4BK^m~$Nny>%>002ovPDHLkV1nqy7Iy#u literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/externalsite.png b/htdocs/theme/md_dev/img/menus/externalsite.png new file mode 100644 index 0000000000000000000000000000000000000000..01e30553fc569e01123faefa7ef3c019cbb36b5d GIT binary patch literal 531 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?kymxs9pc?p3FMN--{Y$aT(A&9uv>Kw{59X(ZGyAAIoZy6yR=qdsl%PB8wk zFeP(F5j-(yt?6IQgi%v`O*!-B5m_b(trNyYCrLB*7N-NHB3B3e#hF+ zf8rJ4pZJ&k|GOu<9V{=TDW}&3&iwhZVrZR561CN*1OzzA5xdfz;$Z(DcuC;w6&}z4dDsW5y4+fo*fMq{L5xBeb%ZM zx(}Fke0$|}VBVegm3vRe?dM;a`C|cV^~J0YZ21V3e4M`{qNQ%tnJccK==5~;b6Mw< G&;$T2cj_tt literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/externalsite_over.png b/htdocs/theme/md_dev/img/menus/externalsite_over.png new file mode 100644 index 0000000000000000000000000000000000000000..8e227ddc83f7c92994716cbe7c75cfdb4814feea GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?{il#0xY<#M8wwB;xSf z8G*Tn4FuZOUuIx&QebgX6gi|I0ws?fNDkmg`|$Ru(%m)Qua@es{_=m)(;qeE|B~F( zHQ5iuh30=dB(&!NtA52n?zj(4;(H#@_h zQ}Yc&jE$L-x@R?dCtIu8J^MTDzUs$~=l;y>XZ-aHWX6BtA0H1^_y)VLo3|s;IB)T} z?-?sUZzU=*VPjdU6YcJ2GTL*@hZDU$|yw~oWpW0>3HIb8k zZkqI7sxrEQ`JCbpHlK%D=ihkGz7r?=>&>^|iq4&k<_QdTjk}-k-=+IZd*46(Yt40A hxFF63``};ZUxs3rV>T01q(edB>FMg{vd$@?2>`CysPX^+ literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/ftp.png b/htdocs/theme/md_dev/img/menus/ftp.png new file mode 100644 index 0000000000000000000000000000000000000000..d9d96f0255b04e220db0fb0549d01c42bb2df960 GIT binary patch literal 788 zcmV+v1MB>WP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Urkjp2N2Q00NXrL_t(o!|j;AYZO5g$3GD@D2h!KF`&^Xhz4U}W8(#ag(&DBAXWjp zC@4`uLWqSDEyP05*x4xlC~PbQwG(XAXkwuxK{!Q21mUi@+}=%^R}7E2-MP)~c?&!6 zSY~eCo6miB_RZVvFvgJ8wu%h596pE7;WN}$tNuaYwuj$G;CvJ7^Z*0EDPT<2>9Kwv zi$!mYv8`Z?2|Vnz@(VK^vmpNV7;#K1Z-6C_|6KLd<^b?m#Wdo-l=QZ#1C<2fF9Dq@ zW?lS!*4Zuw@Ix#VK1t>Gs(9ys&kp5(1Gj*i((eQA0Q*(EN#JTDc$2X5o2_^=z$43F zuM^1iFz^7_=$LZ`*a{4};NMxdDT!t;-V1yKPB(zB$@Mz0Hble%a1?lzcAl>|%--|1 z1wc2@WsNNYQ@Pr$Vm)IQT5bLYj7 zyKKk*1w8YuZ8Ur}<=Tgc__byVvncol;JF9HVodll@Wtx?37gyz^4;bbuty4{OuR`& zDZdRk=@GXGy!fB+f#c!ql=>r1S-S literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/ftp_over.png b/htdocs/theme/md_dev/img/menus/ftp_over.png new file mode 100644 index 0000000000000000000000000000000000000000..e3ea742e7c7edd0d0e970ae45c28e464d90fce7e GIT binary patch literal 563 zcmV-30?hr1P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Uru@FTV-^00FZ}L_t(o!|j;iae_b)g+DX?j~z%VkPf_55KAx>Bv{*QfxRp|WRJ4x3mqg9R!j-VeMK!n`UL+Y!MHE(||E*eNr=C9oS&im5HFBB& z%Zi3r_>{^?MFpusQBhTLi{J*Bt9&>ms+Q4D&0<@Vk5%~UkU0`_EgqeDMDSF#oU&Pp zH&$1cP$7%kc@Q^EJM2_te_On2ovLvxW@?((!IDz0w;JOM!|y`caEF>(4N8+w{>6UY zg#+;2@HyXH$eO-qbmrV9kuaJ^@%*j+v^pU_QO%{-Kj3rO3HI_#@S%@BGHVYXJb%xG zP5TsuaNKtY`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?`XeJfkzEgKWroxlsyxRP*3bOO7PRLHVh5B4-HKdZBWO-EYDbZd43|BdSh)=a+78s?*nvSYh+ zU}C;r_LJ=m#t*JspB8eYAv1UOst3<6w%?Jr``y57dsb_9$Bcwvmpqr0XqTk6}LjodY}Ekti%cR>yn?%_pxT%nIX%f*6>cC^FE{avej=wKQ5T|;QOML@*NQhbFNQ4 z%Ovl}R%N=6&8<;SS2<+gW__moeV>+2J8AoU%F7emC4b5vbQIsgZ7L84igiy{KbLh* G2~7Z_uj}Ff literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/generic1_over.png b/htdocs/theme/md_dev/img/menus/generic1_over.png new file mode 100644 index 0000000000000000000000000000000000000000..adfa8c1599b9c2b74e15d0b86e5cba6dfbe8587a GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?if!v#l>^8Umr0u{387!;VsMgq7~=$b(UP6Ti&X<-Ic9C+F;Y{zHhH(ZWm89 z3enS95<2PAi4Rh%W-jU7DjcHrP2JRVZR673pv%RM+l|9#&F@dre(}3~uc2+(y|q>o zSN=@hJ%Ks=`L^vZfBl~OUQ71gLp0RRbAQf+%&Ag!oIW1&b8c-9S29YA>}TFO(=_0c za_q<6wLg6p+6d2FexA>UH^(@QHU6@+edKJh%=KRtd(-Qty!`N==O6Q5>Ds50%W@q- OG34p$=d#Wzp$PyNUC@aD literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/generic2.png b/htdocs/theme/md_dev/img/menus/generic2.png new file mode 100644 index 0000000000000000000000000000000000000000..f4dfc5f360a87341fd9e6a59f10bc733c68028ee GIT binary patch literal 570 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?&`c`6eW&h%Oob=M$&=N7_nyQF`MYFDKH7{u|d1teJeDHOzV1N9zqM z4n`>NXMA%dQ{Ijt+067mm&j|Ef2Y5-*|JPJP<7%+vEws?slG9?#~Vd9FdWgDWXE>t zz{GsL>?hkBj2~RNJ}u-(LuT&mRS%wDY`-IK_q&1F_N>WTt$*DX8t25R&EpBcJeij|| z+0P6F^*;N7S&0+s*Cjuj?_K+O=Y2-;WvkzWeq1o^!S_WgPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UbDk&Ws2E00E>)L_t(o!|j>dO~Wu0hQ9z(ctC0e0}#XjWCOYZY*5&s8_*398)SsC zLD?YPpnV2J5lH2JcsZ3Kgo>RwH|irDwY3`iv;F(G>jol1TVsP3hlj5#wo0nE3&i?< zs@W*`o@S&O1093sCcqpRYp2G!J0~JG*%OgOMCRf)QV|)5NY{oZu&~Mm=$9?%k4V-H`#&hw(Pdav@NjFJB>LX}>qKPkgMI`gT3 mU;4Tz(s%A_P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UsIsk^a;G00Fv5L_t(o!|jQgSZP0byDzW z=znlk2M2#a9qg*8pt#sU1S<#%R*Q?Z9tY2GDPnWm+qP#`_J%zKlE8Y%#B)LBFqKVQ9mjzb zumHp?l0F8~z>#k*Yvi|pGvL(MmQ=)mX>FUT;OEhY+#f#sfCD|vDw~LyU{geHL}Xh; zVuoXaVnsyKI*-v9Q_X+thFwx*ffL{yxCIJTNM%GZ3CsgM+FrE1VM}FBhZHGa+ohHT z4bE@9z_8W_6y+B9Gz*&f|7_G(pQ+H-%CQ?H^PjEyS6Qm#N2(#RY3j^7**Mv>Q|4P* z^G-HSHcmD!^G@?lHcmESkbkaY=ATSE2DxY*1SWv)5Q*Ob7pAN1Rq>#f;P;}bABb2W zoY$4j0v|yJdNsZVMu9FZBUHY#F9L7A@}-u^J@=I9$hR5!AHhKvxC=E9UH||907*qo IM6N<$f;5xuNdN!< literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/generic3_over.png b/htdocs/theme/md_dev/img/menus/generic3_over.png new file mode 100644 index 0000000000000000000000000000000000000000..0672d20bce4bb1776f71dc8038e32a8382f5ae87 GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?5iL3@)IZ1~;#a?Jzp;5@B{K!=^C8I!mt3EpOG_?#fmmZLn!}-?!H?w~Hql zh3M%l37z!m#0RNWGne#k6%JARrfzDwwsC21(B)#s?Z)A==JzLQzxdt0*U+}?-dd}P zD}Sc$p1>UbeB1VyzkbhsuO)l$AsTAuxj$z@=2WRVP9Kl?Ik&clD;cFl_A_stX&P`z zIrd}k+MhlPZG>koKhI~wn`4~D8h=^ZK618L=K8OSz3FvRUViw`^N;zjbnVm0Wx0-^ O81i)Wb6Mw<&;$S`U(e_O literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/generic4.png b/htdocs/theme/md_dev/img/menus/generic4.png new file mode 100644 index 0000000000000000000000000000000000000000..5f9240240da3f037ca1918367f6b6489b972c260 GIT binary patch literal 570 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?&`c`6eW&h%Oob=M$&=N7_nyQF`MYFDKH7{u|d1teJeDHOzV1N9zqM z4n`>NXMA%dQ{Ijt+067mm&j|Ef2Y5-*|JPJP<7%+vEws?slG9?#~Vd9FdWgDWXE>t zz{GsL>?hkBj2~RNJ}u-(LuT&mRS%wDY`-IK_q&1F_N>WTt$*DX8t25R&EpBcJeij|| z+0P6F^*;N7S&0+s*Cjuj?_K+O=Y2-;WvkzWeq1o^!S_WgY`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?5iL3@)IZ1~;#a?Jzp;5@B{K!=^C8I!mt3EpOG_?#fmmZLn!}-?!H?w~Hql zh3M%l37z!m#0RNWGne#k6%JARrfzDwwsC21(B)#s?Z)A==JzLQzxdt0*U+}?-dd}P zD}Sc$p1>UbeB1VyzkbhsuO)l$AsTAuxj$z@=2WRVP9Kl?Ik&clD;cFl_A_stX&P`z zIrd}k+MhlPZG>koKhI~wn`4~D8h=^ZK618L=K8OSz3FvRUViw`^N;zjbnVm0Wx0-^ O81i)Wb6Mw<&;$Tu*w1GG literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/globe.png b/htdocs/theme/md_dev/img/menus/globe.png new file mode 100644 index 0000000000000000000000000000000000000000..8c2380eda131f90b77a1f3792b2afbbcabb5b7b4 GIT binary patch literal 1175 zcmV;I1Zew-P)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Us!>PyX%z00b9FL_t(o!|j;yYnD|M$3LsKGI3kILmJ!LG-)f%wxU*A)T$p6L@+Rl zAQJ?CRj@yxs2}_#5Q>b*h>FOc5<<$Xbg-bdtmz!)RyGo9&D7~MeBXhmU%n3>@1Ez` zv-hRx;5~4;&pr2^bH2~_J@?-8yj5n#T$SsX!%_iX0bc>1EcL(^V8j1_Bl5j=MpkB) zrFEIvh+UR(Gux8Ub~?X{>G-N3KFxY}-@9~c1+B=}jR)*+u= zKpoHxJO+FSv;&XJUq?C2*Q+5WJ`h72)UpU-ayscZvlcVkZf36paT7770q--jVKZAF z%(X~g$j~seeHqq;aq7+NJ;=A3U#ctxo&}x;nw;;In%m{pey^8H1iuY< z#*HWR#&-c9rGWSa=oLdhIDM}`H92ycfKK4#4xI@F+=i|VK0WOspyj<|b1n|YAqjFA(Xa3z_?hW7=@UnJ(DYB^y z`_I+dfUQp754;_M|IJ+{K5Yhd?ay}FOsH=R?0=7Aegwz`yLuS-<0|F+A$RI{`=L1S zhk<2od?&C^zsNXn(=37?1SkIIx*pvu_~ zByCvqxwp!VSE$PDPS|uORi=)qC@bjM%U<9{pcYuD)|>+Tq_P0uq2O2RP6I!v`k_JN zC3^lx)ndCg%yIQu7#$1zM{)Rzo%TFm7NMjy3->;O33~Lmy2+Y?NomUD>C%Kq)XMn%; ztDMlO7L_COfu|hflltf(3wV?kmjw1t=kx+lt&5{NW7-sB*4?a>S*&WdPq~g_^eRQ8 zJiideuG$1m-z*&bdC4V>*5tWD_TYBCA&UKLq?Ma;o)Aso-mY`&{r* zy#V@1IF%M4##e)gr~`hMeOqvv^(juO%%m`DQ}EI7E51y5(0wUQ>X*pm|5~Xk^V$c; p^#aT#@Rk4PE8r{OE8wqT`470EiOhy-AhiGh002ovPDHLkV1kzDC9MDe literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/globe_over.png b/htdocs/theme/md_dev/img/menus/globe_over.png new file mode 100644 index 0000000000000000000000000000000000000000..fd1e54f4754189e57bbdb7ff41d7c8e7f2618ff4 GIT binary patch literal 844 zcmV-S1GD^zP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Us+gMz2%=00PWOL_t(o!|hnnaoaEqea`jY+92u#(FBdUfj6kSfksd#s5hwE3DgOq zPEh*4cU3o#CqRE5TNp=DvSY_dPPoIJMVjCv2tasRi3nb*+~5Vv0)7F%fR9TCpaxJ~ z0Ef4|Ick-N%+XRr2Kg_eh}1LJPT9?A&r8p-$@On$oUa7%V8%KCzW|KX4uAtN0O%uj za%w@FC4e=69{}C~_y*t(z&-61kMVp)1wGNyLlt$7fS#NZCnC2ZvK5iW>>I_H0`3?p zm6^*;2%Q7G-6x~7B(VP^_|_Qj0{the zo^JtsP|tf+As!NWzvIn}rrPx8HvI3BHrEk*p8zymf3L>hAJ{iZVx{3+C#T8Wgbn2b zro6Ag*8w9LLrI<(yfCB?sBHhr=Z#4?E#Dai<&|2Ojd~#>gfj)cS5@O0QWzX|`~bX7 z9(QH%nJTZ7;Ge6Ev5D1dA>d-PR52$f>SNY7Di`&57XrVF9I(G~xD=6GJOJ+^CCOb0 zd^b@A55RYkI@_~NcuLu^3Cj%leG2>^^?b)ZWDFea(y~iX7qE-5k#ct|6>?t5%9`Tz|0VqdSndG>0$M^e#)x?8 zS}S8bSL|mzV@o`!P|0000P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U7}1jiONi00X{BL_t(o!|j+$ZyZGwg}*xw;#Y72!E$(t@DPs(P%Hyd#0nPd$Oa@N z7D$LCEB*sN0g3+rDG>Vy6cTmrrW&I8{@#Kus3 zP13lek0o8w!R04OpGtZ|($p}(zbNT^4v@r}Ez8y?lDe6?i;~`zbYxH*m3`u0^K$=| z;pst-JpKwt)^Xm1C@|0Xzsy zmkK^2I>4$GNj0;~72s*$xQ&?xUI%^z{si8#u|2J4NaHflDtqShjJX9Y01Gzes15oM z_yJf1E&{VQt_E!R{e<;*pn1>if|AZjn(I@4zc;tu_p!1Ac2MABK-*d*iDLpulY5!@ zN{PV3Zqw?4E0E@Y&2=2uiHMz{`ur|Ccw#Mzmjt-EpU!Io%;0#cU6P_U0bQUI5k$(kZRM!ez@^QPx=G_864}1hXYu`;AfOTL6_zL)}pzr6L ze65!Oevp9u9{AOq-0`ee{G0*i`uO_{(C*__rO*5Y;41KPPFfp4RZ`U}GVK`HO1YQH zVuM}5M?@m&GO+9|Kh4kKKHhQJtXFE$dCW3!=dOXb{OlE&&j80qybs*hB+!&}0eA}d zrL17x3-}v8x@{J@j^7*3D9@Uu7J)HIofNeuUeN=)(?G{SN%O!t;K`h=Ju-QD%WPEh znYHV(HQ+Dc4^Kn`xDgTEQou`k#>;;icmg<*nf1K)qBCn^&cE&FE$fDjS&oR+1A#Yl zoHVbW@>RxEpA(WYbw%Ig7~A#UvF=-iHM?j7xE>MBfxtVFn)3CGzO_9Z_W2NC0`XBf+ zz@xT&t3-hP%2w@06W-0Y9TN?^R=bEQubLftXUptuSJlrljcNO=yOLtFPD)h-e#J~M zkvjEPQaMoXyW;v<%E;b#HDzQa^mN>&)+5V$nkd~Esj$|Yw8Og!rUk|JSbi{;{RR91007*qoM6N<$ Ef)z6M7XSbN literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/home.png b/htdocs/theme/md_dev/img/menus/home.png new file mode 100644 index 0000000000000000000000000000000000000000..2c174340c7696473d43c94ba34399b19fbd6fbac GIT binary patch literal 679 zcmV;Y0$BZtP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0Us_zEL+C^P<)SlA#NHW(?Tq}f1A!op@03ws+IrLZDduriUbQWEKT^Sd^`sn=`X{Qk`E{@(9tPThL<_s+TZ z`%dScbMEgAg%Av?tT4c`3|~;TVXTUURu5Q>cP z5JIxRSj=WJgfQE~E=j*vW)$^&g1qAl>sq`g| z#mMvXVH0!g!?jp3->#vMox%$|sVZ#t;|g}vREdA$G~O=-el4bOvJb7qR~%1&NMZO1 zT)>(>_Fu2kY?d2-Gp=H9LmJ4(xSj|82+m@(VIA-}yw1utQ&_cxViQY}JgM?Cwl@g+ z1D@kenQXHw?OE!Shj>s$kqUhXp}DFmY|;n#q$>Ds&ws+N9ClkVl74=dp*z}fX{prn z-S9JumFy0=+|f$h$k5%1OLcfYZ!^>`5N_RjM2q<(0(_}G{(H}tg`Zmje5IammxON@ zfNw8{O~zq5j6XT-Ha79VZYWSG8*yM;;!5`(1J&Ckb!D4ap06d_#DcG-NYw#fndiR` zvgcd)f=x9Z*l&4^^1kjHPA?0?CE>FA|B;T%$nW&RQyF|CWuX6u{Ri8ndcY`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?bhi@pN$vi8%ar z=KH`F1A(LWEo-Lp?crO{?9F+-u|z?2j;IHFP?Kzj=nB~*d@mCIKDc+bck*Q37Vk%I zW+(nIW~pmA`%E{dgJb6_Hc9V?wp&>P+IIvztgPc*P%LBKw2ikx%;D(o_?ny>u&iC-!-Gk(L|Q0q~l{C1+lD|Pk_ z2}T;7D;8U9s;O6(X4(AMqtNunq5PeJTCbLV(EPH^`;q+uMP(xP`NGM6SU$Yi za*jLa!z?QgosH8PH-?<)IT-ljbwBfe--P8rmD>;PDz^CiHMq6y;Uic3T8%x2wEx(j z{5;ovoPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UtEEPNJaz00K@)L_t(o!|mA5i_K9O$MM%N*`SmSjSwXpjr>@kZ2Z`bmE=dHNt03% z3pO?=Wurv-ogYc5`2%E#g;GkBvN4T8CX&%aGjs2Zac!Pk-@eVApWl0H^nL1d`#$HK z=e+Ovp7VL0d+SQ2lIdzQOk>O8bNC!ShtJ{1wEA(5TNi;H$7i`U;yJcW0{kfMVSXZBGJdA; zMZCpc^u%)!vtsv7VeU9$HJ}wOi5Nw^L{s89Q}_Y~@j7<;arnw@C$3?|C~=zb083JH zFX14%6TYgz!*86x1^h@XxEQywD>Z)(&f{dHJ`Y{=T@l>0B_g zf^T?~wF+5FCBQ9#{K^*zCx03JyA`{OPgi<~hWnL4@i zs;xG=u^Jyn054ll3cPGzBC+*`_BYg0DmP*kx^QKZbxk)eN8DyCtOa}{w%`+PPO;kj z8nRi8BeQYKec=?6%1jZ#+d zy-`Hf(#AZJb@^Z1IeZSE!{_ihd=8((|3~ou0IMM4$}o!v+5i9m07*qoM6N<$g1l~1 AHvj+t literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/mail_over.png b/htdocs/theme/md_dev/img/menus/mail_over.png new file mode 100644 index 0000000000000000000000000000000000000000..f9de32d30029fe43864afaeb341ca2204ee30d83 GIT binary patch literal 534 zcmV+x0_pvUP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UtLYNAnv100EXsL_t(o!|j;eQNlnJg+CnM!3v}Uw*x~3+JUhG=|HGJtw5|mtiVu# zp@Y~#sNnkG%}i#^l9(*vXZFnO19x}WFXW!H2?G(~Sarq`E5HZ%03YB3e67wKt{dy< zQz?-9fRBO4p5Z4z5_Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0UtVE_K&6j00WdsL_t(o!|j<%Yza`1nI6+8X-c2qR}AK>o!$Q>k(QUoBt$}=FXfmGi{`CzvRo@oAW>C z{LeSvYi3f$7zV2hVGv7}e3pEc{J)Xu!0Le}zZy6L+>~AccEuz-1~>?G0zy&-xM zc&Ds0(}L|4X0z5l4ScrXO_EgEB!3Um%ffB9;QYEtbGm`Y7VNVm0ec514Hw$2i!CxW*64qcjI zyc5_1wDd=N&19l!T+Y*pDKpJ?havoG+AF6}& z`kSSey;p^icX6AQ4nABj;^hk9AlxF~!A?7@TLp}ZOMa|+i=P&~DEwLntXH7gb!Z#D zIxhJY4%WE^d;&_;=GyQxd>!Q#2Yh8*pI_=we6H%cAwr?50iFXLz8s>K(- z08fRjj8I)YE$h>{hGB>5NiCAw^jKPDfQi7!7?vNYxoLHeODy>D>Y=RUCpeI4*0mx* zM_D2AY2C@Z5Nv^~<#Qbfz45&;ic8+_3a^w#gXFg>`9JctAo-*MGFq9YH^GZ1PtuAr zLO3~*?*=}o@MMw>U5j;yBr;ihy$yMyYRU9Cm=p3w;Ib?+D}zPabuCI@^}ZJEd$&I; zjlNMA8o9!@N^=#&Mba*xANC|9Z+v9y^t;VvVk+S`sbRn}rPVmn4%`F2#hIMyrw?j{ z$`liIAe*FtmkRvYk{W=ofhB6CN2m~a?<#+ZY)5}>l*)d}%##1l$o~Z`gD literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/members_over.png b/htdocs/theme/md_dev/img/menus/members_over.png new file mode 100644 index 0000000000000000000000000000000000000000..8c77498c304af9150165b348fc08498d7aa3f11c GIT binary patch literal 720 zcmV;>0x$iEP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!alBTT*k00K}+L_t(o!|hqoP3$lb91#DP4lotq4#=y3&_POo4z7eN!E|6MczGS< zRe#KznZREdU2# zkjDe)3jsF(jsPYAuK@l6h?19kkr*TMG%-dWmt&MMY(5)f3~@dBTpo5YAM>GkfiZH? zuH|85(*w9Cb!(G3enDQ1{EdlIt!!A%C=e=qlu6-ziFWe*c>j_9(VxH3;&zhc~P+Kleve5A~9`c z4=hp6EXn#@T61;YZDkJz0#HW)n&n`&um=qAmR!gZFY1+@+tq@1ibYxlo95j1K)Zlf zHYkReQz`hPf_0-Pl^XV^Qt&~+x+}B?%x-mB@J#9RNwd+0QJfQ}ZBiZ4Y+Q2r(8gop zZQe3tJ8hF16j}@g%!g$DNl}U^=I_WBZvk8vFn^s~8yzv;vaZr9{7GNoDCfB&;am+1 zzESx6ZX-K9XeXC`G5asB&lE}~y%Hi}e-rRQ0IuDhSb4GRuQC7p)wx&$Zvi|k`1El@ z@N2vK1mH%_M)*A7ia3;B&Oj?*?N^C5h!MaamHrjq7fZfjGB&}Ku3rm2wGvM8`NQWf z8q9NXhF=3)c}!B9N2yLjNl9FabAaD}*4e@TPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!j&Nw_fp00e7EL_t(o!|j<{OdVAehQF#6Ewu=g(gKB2FtyeeY?Z3D(Kd=kZS=v$ zq(*%(A@Ri+qi;U=V4_hIH9mNWK6r^q^~snfjUWZ@)?PHV7ZKZv(n2XHSZJXp`0`CM z8Rr~^!^x=_R`@-yUT$j^}ff0Mr;gE95M zrS{wY%jA~;cjM6wyqRnA-M}f} zeqdjQ#J_TU*||`gHlPXU0M-DTY!{`$IS%XwKDOPYH|3iA8^D#o2f$W|1-3c{qr|>ZQfg#hSv|y zxgF@4Oypk!9tW;BcS|SnCVPQ*o%~_oDX*8h>#oXBwO);TBXQ)n0w+wLeZW%STHCom zHINSs14jfs418m|5_rBI0=UfUCqobLtHm3@0$_e<{P)1yF4|pIqGMSgU!P>b zt^)oBUXav!U^!43D%NTvV>*F@z~@H&QComNfjL^ib4~;0~9Nl8=Z7> zCjp zbrSMjs?BmWw%zMBz(tXodbI%z#_R?TO%(ZC zmAX*&qA?Rya~zwrQ)>s5CuL!fpQsF5}Z)` z2bI=qLduY@+B5?%8*iB_l`Vq_KP)?CgSr{u@$P!DDY`C@~Nb<#YyATr90Fw0WJ*v9&?91q(Zca_pNy4 zk$d}M@S~XBF4j8n(xy#`^48{I(h?P>STBkB5b0NOjvC>{P)Sf?&A!cV<7F<$;xsi+ zu$X@mr!lU?h>Lu!>M&-W9Z+{CvLdy;HgxpS6T$1$1H8FPx#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!n`N7)?!00S&ZL_t(o!|hqUj?+L8{(`7zE)8`o(Zlip=#~~ygo@${jD#p5qC{7O z8X<)zz`TKZ0`^KOj6{EXZ{RDS9hz^Y(Q52CIVW%^Bdy}wpSj7*H}j1*6A{66l^eLm zaxng2{K5Ex@dxAoZ{u%namE3d@;Us=#uotQ91g%y$G$TFHAmc=^&(=8LPToWPAUCii>+;CxK|`}BNd$j6W``>yi^fVU&) zy#(-K-^ND(zX3c1@MBAzX8=5aJAb28wj$#A>{ng+B~+Vbz3>pD+bWxP{oww2b3f@S<^ z7QS*__*A5V`e%>07G)f%hx9fzfF+alSj}IkUZr90l9F_mmC9ED-Z0r^XN+xlF@4J^ zL%zxq*pi0(9HZ2zQrYgx^Oo`NRp?h4WE?S_hRc$2rHnn{{L2vxZ>{QOb(OyWJm>Rk zHfoV@nzJsaF;_1j=iCnfPXOHJ^DO}P38!%xy8|{QVY3(j84VqMPQ%9Ug0U@z{RZF@ zy}DF=x#zp9%X*=xn9(y5#{k|b#{LT6Gxe=w?2t8z-HhGAu)#>ixxuoY^LbKNoZpnO zryY!4i^$`lB;~TYJye292qVAC>m3x>7GKCQ;A;h9KiEC`>jBQ5pS{Pa8@hQQ{9DtA#qX4=E9J}Z-rDs87~ekfxX24g=R0-HooRSz^m*5~MY zycCfc&nJD(fMA>H>e3lRIK^LlZWS zLcKxbRBq5V4=KB4-__w{gWqA(?Qp>nv(mPySd87MQoZqw+2O~9eaRn}6|ZO5h}_r! O0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!yv_{59=00Ev!L_t(o!|j;8O2j}Eg};>uim)oI7NV3+Y6hmtbKuO7nLEIvP3IFJGz4F_9h(^F z0&U>ljg$9JKV$&6NoKPq8Cc8}o zIM%Gu(1}f8(D`}bP*BH-^LMJh&j{@9_8x?Lryie zls~|4Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?vyi!_&nvB;xSf znFn(Z8Hlv)S71A_wY{rn0x!p86XhwKk8%#M88}_#oaOxfB}44OpmQ>3j(RW(Y92f0 zcj~vQ_s$qYlySK3jEyXD4_IMn{gy8R%B*D$&m^87J|d~VcI)eaTl0%% zZ(W`?+hp2vX@#A|CPlY6_8jn@D7BU+fUkJ*q4f<}dE0(6S@9Rv`K)>HVWpyLdCe;&SZ<~pMT_vDM+%6B%1>dgyhd=SdN&*Z>O8S^*M?|;AGTF-Rz*_yQ< zO%Kf1t`W8Pyw*2;r^E}PU4BhU{zDOC{T9D#SI@HE%L`is3`Pb| LS3j3^P6Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U!=1oKY_T00DkUL_t(o!|j-{PQx$|hQFdp3~amtREUL{r4l>511!7%5(5jcF);8X zs7o1`c>-WSVyKwdkSGgn+{7#%Jfy^&V`^7E$&z)E&tHFCE_dx{tx45ZNZ2xbhR^UB zKEpR!w}lvcz@_l)5%4CyS!?aP23qS@=J$7o9dUKmm`y zgXRA){^;Qgpqk^48eSPlJ;$F!+MEMp%fIE2HdQQXvr+RbnY58uG%swj@G2{xnDPs+ zHlHage+#S%&))l7+{ypjL^_OY182h61G517z_BpS74RZ~?|Hn8o7R5UBTi2WUzsv^ z2MjI$0kHpvN>Z9QH^8gqKQVBka@utOC~8Vt>7b;l>3^y=+vbq)vzo84ZgXH+dgYa= z7X4q~T$ES9VZ)CMqP(={3EI4cgjb;l7S~egdubV>^IU4>eH5F8p0-@zr!6Tz{cre* zhhpE>ehjP&<4mORBagQE-P%6`U&1(}JdDIY`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?> za)F6bQ&g$LQ6-y)ocxaQrmO#8P*E}ucIw4UL@ zw0maqz6|qTRXyZBeKjrG`I6T2Sr4MO@dCB~h=yuqZV&t}=Smy9M_Rmvw+Pkv51FTC%9@2h=n;r!=7PWbV^`MU(K vZP~rUZ*tatzL;p@Rw^gMFOccxby@n*`5Pxp#TQHj`k2Af)z4*}Q$iB}abJjV literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/project.png b/htdocs/theme/md_dev/img/menus/project.png new file mode 100644 index 0000000000000000000000000000000000000000..ae4d177c6cdb769943524b09e643971c1382a7e9 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?Ub7z-u>W_#-k-A;#-`jJ6&FK{%K3Q z#!ha}x2wOmPpB^Vf4u+kq;gN~7Kc?)iiwtc4qNXzeBS-7)c0L%eIk|V-5mFs{esv2 z5t*@sXMW{V*?Y@$Qh(g3{KwBT*LK@ z+Jzr@8rgOKY}})(^WpY^ou5?t9-7W;WZicv(=xcKD?ht8Ju7pz*5;o+FE#5dW@fi< z53|#-{b{2$Kj(G|@1gLOHEE6Ojb^vARoi{v7P(~G&s>`uELL5<_KS8X?=$Ls`s-5P orcaBP&dU9xzY*j~>zb8zjLrfDE33{4+y(`{r>mdKI;Vst06z-BXaE2J literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/project_over.png b/htdocs/theme/md_dev/img/menus/project_over.png new file mode 100644 index 0000000000000000000000000000000000000000..d6c28b6d7ee28267dd5792dd34045956a5d8e92b GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?hRC6YJJoDZ6 zhVSOhGu7u~wk91D+Vg-_|HpX^|A^I$Ue0k}yFaLI2*1q{_n}FA&x2si*`Iy2>XY9J z-DtT{D_!@>=MsZ!2fy%Mz0%t@!qyM+PTXgFEfCN9({)R5dCCwzW2Lx|7WwK^G>~3S#8&SM_{>M#6fPLP4Q-bZg5t2 xwW+MmJN9zp+uCTGyN}YOzk*y=ad7_?=9+hBE5&799f5vk@O1TaS?83{1OO9*jYR+e literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/shop.png b/htdocs/theme/md_dev/img/menus/shop.png new file mode 100644 index 0000000000000000000000000000000000000000..fab7db59040300ef6fbcbd91ced1831ac17c4df1 GIT binary patch literal 679 zcmV;Y0$BZtP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#NqPt@oD00JjTL_t(o!|j+qXcR#dhrg(YMUL~(O3WES4E{k8L$I_6DHMxXTE)sz zw9&#sYnv2yVqq^>*_~ixAdOKYDx!koAy|lsB;cLrJ)7Uc5xmXpFcUX84<2(f^V`RF zZ|A*TcF4@wthR+sYzaQWC-?-P;1hg;FBAMt;3Hu2C9Tyr5`L)Qi&-6L0>=jIF9K8g zGo^!{1CI91e`u`rt-S=!0Lx`MHdlc$pbablr-2dq5#X`*#-xpJX6E8GGkarZEi;?V z(alQJGP8zbY;SkX{1i|DJ^(jzbXS09z)#>@j;;orlpl(n`P*jp%FL!6v=h=k7_dKW zX7kcy-ZZm=MKkYOuup*%;FM!d9s;|8@ipt?z#aWw0luh4viU{eZODSHst}t6Zs;Rj zb7IZl^1}SKz-o_a9J_m15f^*x-DmKuL>`O zRW#lQRtIRV1NVT*5b)b|>qFQcjjK7DuX=toT!ZGpw*zKAvteK~XTPOdIIQ_=U-(}E zGoM)lxVDa_-KUxHh2IxA^Sg9xg2i0#*o3s5z`KHR59peI4&U>L+bc`vHw=C>LZ`{z z`Ips(qrvwgWWK8LbAety0(|m;51sk0#!i9QU7yTXB4obn@%-?DuSbC2q4B%gri*R$ zf$v6u&upnc?5Zz(=riB(h~4plH{f@qK3^nuFXVTdQd#=Yn&AI8_&;Knr+6#HVN?JB N002ovPDHLkV1jidGt>Y8 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/shop_over.png b/htdocs/theme/md_dev/img/menus/shop_over.png new file mode 100644 index 0000000000000000000000000000000000000000..bda5823f8c36729b82f6d310cb6c7e1991821c95 GIT binary patch literal 502 zcmeAS@N?(olHy`uVBq!ia0vp^`arDB!3HE>Y`eG%NHG=%xjQkeJ16rJ$YD$Jc6R~N zK=9LfcRi5eEbxddW?KUgF*5nBSUrfJ647TSD_CPA~Hl93@QO7rOaQWMF5NQi<;J zWB;!@zql;t9hcIf$hAj0eIJU(K~Zs2K0^h=k>m&2&pdu8Z89`wuwwXn=C40P-`taY z`{p;)e|-JaUPeRNc_|-*{Lk424C@%~{fs+%>u+y|%3*W=NXpY`l(g1;NlE@{uS%m58sx(w#iYncjbx5mfo8T o`CsRpzsU91Jm8_|Kbvp7A39FBd9tU?21W{lr>mdKI;Vst04SH#jQ{`u literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menus/tools.png b/htdocs/theme/md_dev/img/menus/tools.png new file mode 100644 index 0000000000000000000000000000000000000000..de7f2b7b22164a355844cc2f6c6b738d1e88e4ba GIT binary patch literal 1052 zcmV+%1mpXOP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#SnLAAsH00W#!L_t(o!|mBwXq{CM2k>8tu}R#bm1?B1iYq9R7eNXZL0bhE>YE!_ zX%$gis4t4z7eNK9_#i5%wD_hz6hssaic76l5EB$ptV`WWX;Pz6X>N?imkAuc-tCL` zW`PV0_xt9|%=bUb%$aj;M@q>;r6m?HErMSJzX*O2{QLxe3f5y_K7c>0gzl5LD|;Wt zMHp*fH-O%F9>Y+}(5IA|<#p*$8cHek7W8^kN_VG}-c8kMETy!qid|{$C|Mq?$JTT z$5~DKeg`jx|E9qog%@yU$x+>mSL?Jtgezx|6bH(z`EhKBEHF`pM{CIM#}#!twzi{m}w&F_XE@ zR=hcrY||{A8bR2T$$p5AEw9oBPem4~M$>uzCG2YS@s1YU+pLUW?7`o-H=Z|F0sbuB zYgI+u(S}Q>9y}f!T~0gj{9GMI>QR5>?`|xMSju9z#yWdXd>K<`WZ81?&j95xP# zxhNgPj=K~4+ZC`EpwFyn$UM>iv;cgYU!TP3Rqn(^YY1mW6%ZfxTJb zbwRZ4saFQiblEJgadgY+H@sD2NsUIQ)}k|HgPHCWR+S0jGT{Gd0Ddy6z{v))@_Ag9 z>@Re3yote?G5CErqYm&L4S?q$D>x?j_pCy#L~+-0@FP*~_E!PEGY%ik(B9Z(JFz;J zQ%~#}Q?cgTRvz?c9hk(|C4lGGAFHyppP#0N+6lf@)EU9qlg;etT-WonMhp6Ho&Nxd WZ(6pU8BH(%0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0U#baD?v*D00KfuL_t(o!|j>jQS2ZP$N%2=T{`eOcy!>Ea3!PzQ$k9xgNGfY1YQTR zgV;f=VEwY0VURso5m80H)pOiKw)l>8njdWTJ6~hI1@M@e*L3CAmRiws!Msyq?m|Q_wYzZ0Bxk9WB(Ud|ehvB_IFIHk z5fHrUcx5`Fzh>pbHVe66HP4Yg7=wrQ+}B@7K<$=~!n3A5;3cI<(H6SHrIkICf%vGg^*E z%?=C&>LQt~h1bemN7xa3@yQKG3-xwgW` z4lJAxHQ>#w$`UhNt2{*guUwU0e$O5h9_DK`s9n)bM_fL;PU_xKAAIqlAgkCb6rIf*SBsA^0TR2BaMD{MPM)&&C$;!v=840V5pln@eSE9|f04 z6JHwwz`tnh+){1)M(`N&DN>rAf4;X;8@I!Ki-|(VM+cFiWqHu?7y24`%czgLc1f&x oOP_;lMV|@HFLq7%|NGxMpPMEXG=2^^yZ`_I07*qoM6N<$g6e)Wq5uE@ literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/menutab-r.png b/htdocs/theme/md_dev/img/menutab-r.png new file mode 100644 index 0000000000000000000000000000000000000000..95c2324b6125c5da3759c9af2eeb4c5fb2dbabb6 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^tUzqZ!2%>h?rH7-QoWuojv*Sst^Ei24jXVBmAUoU zu0lROfqlUeuT@`DBI{Nh++V}sP|y-sAtJ@TX=`>u?Zd?7VM>BMf_2HM!YZ$1Y|_%t zvm|n`6)yg;O)`UR)0R(J!iiT{kAK+Em(V~Y zFW9$G#BJ{_AWy{8#W6(Vd~$*W>*9nN&Hw-ZH)mkrNnoy9d%$fWP@cil)z4*}Q$iB} DE>j%l literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/nav-overlay3.png b/htdocs/theme/md_dev/img/nav-overlay3.png new file mode 100644 index 0000000000000000000000000000000000000000..3d73145dab7eab4a524f451f15cb7a3ae66cc5cb GIT binary patch literal 1780 zcmV(^SUHijfy!O3FGgDPvGwS)`UA>)r=hL&*(~?{K ze|sG5c6;U3*n0k6tDg7lQCB_hU4Qoc??&7$jnhjxdnu2qJOiii#$M-LKl^81wO8>i zWE6j!{4+rQM7_>-blcG*zx?|3ch4_58ga1X<##<7jlM0iF0NUZ`g}zB=e6p2n|~PoR!9-IH0DWIBPir8;_>$6~;OEWPv%)LyFh0ZaT!KcR ztVrHx7|F=ws+oLe)|Vo_#V7j|d6hCLyYM>8B6bZjp^m^hpJDy5oy9l=d6@?^B3~ot zzhAoWdgX1;GQP`Kp&qTpKemvm7*ozd@^hpko;{QvGl?q>_sz{RW^GYG2W7A5TEolB zGX!I}&cHhhawnQIzK)FY7JpkawhD}DJn?1QvwJZUD`tz{3_H$kADxb6XCB4syv$3` z=mK~~+1w3juVkOpl-J@fBMfI|Cvh{Cb7fmqCdKSE&a5V}&gIoiZ2gMPy&OAX><9E~ z&?!+y7RS|TyBDuLXuiA8_fHalc{7!3lx-OWU0ksj{a!N<+uwJL;}(x?n@qA;j$>kd zP?iQ{N#BD?+zQ}1#c_4=p7|KSXoCZl&RhIJ1~a#J77L-0Qd|mM3)b_1jwRTZjx9eE zhhSfHF78Re+`QZit`2BKYDUw`OWuBvgI~A!XaHt@*%r@bPO*0uP86(+49mdw9ED?C zuGj56z8^jp&tuHw_y|cX(7pw5>|NTc;XV1f#Rn>Q>&}My6?8(dG_5gav0=O5^;}m05Y2-6FOU&{=cYiDmN^zYl`z(pZGzQCI9`++O37VNnT|n{D%M5z?_8X~&wy zcyuiyG3V!Hbq{yOLrxeunM*GvIk)%?MqOsHm-ncA_CpL=uwtp@-^{~pl2YCz77ldaqR-+UOo`UIAR4wynzMEqEMXbVRBM-?BjG4Gj2RUBU_4GQkK@&VWF zfw2q4N{m;{%kw?kzH`veZr$QX0kjNQ9p_=^utkRq zW{)+#v1`q|JYTRTf&BQ#oA~m&J+!+k$TeY|%cd^as_(W%W!n{~y><~gl8%CXlm|B# zJN8(sF!rBcrUHFWYTrNDuFJ|p`|e7_p?8-IyBoF`N|}$pm`5^;+3~L%NoO4LBd9Uv zryp# z9V~N2bVGbGbRXi)#CDaZMa|Fax;+2`@o&0rHDbaXlKld@T}&N=(PfRwzY>hUuHJ>u z!dH*@?%6iy@fRcDRWsFYSvjcNdpycxv0Pke7QWkY{^VQloNXPjU8kAq%5%QxuM-Aa zv-_lB6yLuoDhuBlslY$`1J2@BhwYV{sr-S~HDv{1+aZd-T~ILAD12+kJ_H=dWf+uf85Ct1 zlx-Q6ZJAu`6qM`)B$KP1vVo|@3y6w)ysD=JWfuok&k1S)qNP#U)lopQXKmD!t;s!0 zlc(%Wo&!Y3vRitxdzNM|JyzV(Q@r$Cbx%)q&z$NxTdUWetKNF8rKhK*XHLu7V=Y_H z^-P)5vvh0E-fL5~9-A{~>72D&=j=VVbnmsL$L_5?c5drl5IA=2-Z>z+cJ17~=jZOd zKll9owdc>TJ%4`>2%dw$dm#7@0sp`M2Z2*xR!RW9=2{Zu7Yr7lkYL#KZleXzz!{z{ zjv*YfvIn!dn+zlxE?)16xpwI4iNMX>Q?Bf~7&>7e%lZHReN&%v*w6nJ6xzxsu67ZL75RDl?r8`M+e9_S~n!jI;hOSU<@^F87_nmRX^O+GX3# aKd^58Ea#$BXqpCeBZH@_pUXO@geCy>!9cG7 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_account.png b/htdocs/theme/md_dev/img/object_account.png new file mode 100644 index 0000000000000000000000000000000000000000..46be8b6fe0f6c733bc1130255b140d9d0da85c9f GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC^h#VKN}P*Q6H7Al^Atidb5j|L z6La+x3{4gClS}jzj0_A+6%5U+j0~(yOck^Z3=IsDBr}!)b+VUu`ns~;Nn{1`s{?#OT>t<7f9=|}y&!Px z+_`ht?%jL-{Q3L$@3(H*1p>+0*~Qh>Ej>L`jvYI;cI{eCO-(N^uQ_w(0ELQ+ zi-UrKs;jFN6%_>p1h#J7yL9Q&o}QkTmX_@7Yz_{NIdhgynKEa}lqq|U9b39|?Y(>V zzJLF2X=!O_XgG=U)C!<87)yfuf*Bm1-ADs++B{txLpZMIo;xXYNI`%lV8$YW4pr}z z$qlnOe*KTnm>}~uc>iG^Qzv%=JFbaB63r%mKDHcqHzjm=T{VNkl1rs8uWSptr7!lvI6;>1s;*b z3=DjSL74G){)!Z!ppU1EV~B-+@(+Kdgca-8w;OdbEAY;!dSiR;fM5s*+lJc?4$OOV zDzq0fxwDu!M5tsO$Zx*nCU4P{#qe6i^{~OlMh}Kd3}$mPKK!?5_?j)8|83)j^+0nO NJYD@<);T3K0RT{uGx`7k literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_action.png b/htdocs/theme/md_dev/img/object_action.png new file mode 100644 index 0000000000000000000000000000000000000000..0b02fada4147e31e71f53a800b91839be9b66f07 GIT binary patch literal 528 zcmV+r0`L8aP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=8 z0t*4d6%UR800EFmL_t(2&vlY9Ya2ljh2PtCV<`mOL`bA?qb?w6Riz&Upa;0sAe5=n*-UIT!&_E&ip6C6#a(+duV!yRMHcap6VkOY$35qu~$ z04Qm>Ua#M5kvy%6@E9gOwcIl@Et01OKpKIn=r0^y@r+3g$$e}NjYgw;053?^LI|%U zjbnm+vq?b`A%wSs!C*Vq_D^g{x+0l8v65u1&0~`w3D(-`{gnZbm2kz8)y9--g~^Ph zb4klM2H}4NKaOfC>D<=q_212A^9O+AQvAHb)%gNA@!ntC#bSZgYIW0Yw`TzMNWR?A zEXFT)l4aRNQ53MwIn3vC)M~YxMx*fwz^x<$U^kk5lk`E-nfLy>C<^p?J^TU2f!<4^ S*#w3F0000F|9LJxA`chUVP#pRLyAa``m$i}>$=qQ#-KjNs8q}Q3A)$sM8mYr5RL;R- zy2MbSbDfLy>@>%Lm0~E6$7=Xi%7*?xQ*@Y6aE`CH@cn&%pYQkj`#qf)A5FC%Z3h6P z%40>ucV}bZA@02|zy9Q_Nk^j+SR=>(a9)_WJXHb!0+0tl0zd~)0#F75mjMJ5LIVmi z6bvZJP()BvplHI3A_$@&n1Uz@q9KT;khO)JD&#aF?~0-+O0FnjQO239mB~37$<1&^ zUPj^aGpe7>=d-etMQ&E{vOH=*4&j_0zZL`7SSB6IaK3~M>LY?F4b|U<47loVG{#~h8GzmHf`5* zsmXyPmLFN%X=2-s?GhV%wjbC&v3V0R2U91YPMEkJb-mE#5Hak9IEXNfaG2nTd12y3 z%#RYEd(46;31UW~m_&?lNEnS18Z(-(FlJ%GA}+>a#umFTzG_@$4vkNOkzYHrjWBa* zvN(fjvpKxMs~6>BVG7pOY0%tV zsZ>h0T48N_@SyYG!`fu6Wq;1^_&b1B_1)_Hop@_`d2jE>@8YpsYwOj0=XSdH!QfJA z^V@9ge*Y?H9y(hexw4S1pYMNr=0kaB<6Zr;xl;JF{v}->M%Q*~RqCu1KCV~OLw%=C x_ib0J&sH9#CqzeojoGi`1S>%rfK)EztT$84s{0EqyHfsO? literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_address.png b/htdocs/theme/md_dev/img/object_address.png new file mode 100644 index 0000000000000000000000000000000000000000..201577281f048ad530a5ffc90ae5ddcde1ea09cb GIT binary patch literal 358 zcmV-s0h#`ZP)L0Z}plWdk}vvjJrS(g|RMG6Aqb7$A{1XxV@ckc4-Yja>Hv5+YJ0 z`@Zk)|9@v@%2$@0LdF-ORexYj_a=L>JU3B;5xtXV9(=v z7=~AQoFqwQjCqhVOm0FZM+J(aXn1%{@;#lN!cJf-ut%_WFfVNuGZ zE9D-K?ne(ih?E>DjohI=hq~2#Q6&T{Dmml)MoX617w|ux5f5W7c>n+a07*qoM6N<$ Ef*ux?eE>P;keeKdY=e91rcWmqP z=g+rpU3+Zr-ebp(tzEnJ{rmSzmoA+$WlB#^&)%(Di;Ihslar^^$XftyWGo5t3ubV5 zb|VeQN%3@X4B@!$d;Bz0lY#*2g^yX+9?VtodgJ=)|NoS3CY#;LN(>AhY@xlUXKjl* z%AR>${Qk<7y#4CsR|Vd0ee!14r2`)MOO@GwX_{Mn%G!SC;>FpqMRy&Ht^eQNc6Z_X f{^jwrot|)q-(z*oKW`Waw2#5l)z4*}Q$iB}Jj;&> literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_barcode.png b/htdocs/theme/md_dev/img/object_barcode.png new file mode 100644 index 0000000000000000000000000000000000000000..6f1931ab96cab03c827544dd17a96ad2e785d713 GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uk%)r1Xs`&K^ki%Z$>FdgVm7SAOTFc1c&Rw7o zXMsm#F#`j)5C}6~x?A@LD9DoT=t3@7BG}t(3;SweQ}>&b6HH@9(9Yl-|z0&b6ig|Noqv zjMlxioRoz3_xI=L-qzO6jEsbgjEr-0b8BmBLPA2$&d!{ioZ6koWdHyG0d!JMQvg8b z*k%9#0CP!1K~xCWP0HI6f-nq4(NJtPHeM#9MnJ`Q2ekkHc|Jf3`)$oR0Dy=n5MT&Z z_1tNgP}`q|Y-H1R-;vMPTRw@#(xa3}q?=si9_dMZU0nw*nVD^Mn$jJMbmpC}_lLN8 oqSbn{?P*Ltv(C*IJ+lt3@7BG}t(3;SweQ}>&b6HH@9(9Yl-|z0&b6ig|Noqv zjMlxioRoz3_xI=L-qzO6jEsbgjEr-0b8BmBLPA2$&d!{ioZ6koWdHyG0d!JMQvg8b z*k%9#0CY)2K~xCWP0HI6f-nq4(NJwQHi(l^qg)N%LHYmB^8s4fZ)?s007OKA0j5w@ zt6qbVnYH`ski=ErUH|#>{&>nO(pb9X5{T4FE!RL#;+x_!al_1Pi*inPI>$5beRDX5 p)f1)LY&X)F#nL*rT8~U(06(yq36LU!1SJ3f002ovPDHLkV1l{)y3+sv literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_billd.png b/htdocs/theme/md_dev/img/object_billd.png new file mode 100644 index 0000000000000000000000000000000000000000..2080958f0fb04a7ddb9fe953bd9294e3666d43b8 GIT binary patch literal 341 zcmV-b0jmCqP)t3@7BG}t(3;SweQ}>&b6HH@9(9Yl-|z0&b6ig|NoqvjMlxi zoRoz3_xI=L-qzO6jEsbgjEr-0b8BmBLPA2$&d!{ioZ6koWdHyG0d!JMQvg8b*k%9# z0Cq`4K~xCWP0C#p!9Wa!;dI%p*r1a^*rMWFOaK4RbJ1qUd-u#a0DzcKpocM3)?=sU z#LTJvYG344-);9XCcQtN@-nLPbW37Hy2wec#z+#I`aE*Z%t3@7BG}t(3;SweQ}>&b6HH@9(9Yl-|z0&b6ig|Noqv zjMlxioRoz3_xI=L-qzO6jEsbgjEr-0b8BmBLPA2$&d!{ioZ6koWdHyG0d!JMQvg8b z*k%9#0C-76K~xCWP0HI6f-nq4(NJumHeMzpMnT1(sDSeSpC?Xf$Njc)0s!_Gj4(%~ z(0PzxA|dHNGA5of9lCyads-1`A5VToDvkG&11&au;ai|Xc6D`~xuhvwo&ISK$M{S; tR~P%RI>gm_v-MOeU1(#n+%t&*d;yfrGR$X3U-QIt~^=wzu Uc1-Wfiv>B{)78&qol`;+0L?R41ONa4 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_bookmark.png b/htdocs/theme/md_dev/img/object_bookmark.png new file mode 100644 index 0000000000000000000000000000000000000000..39109ef5ee61c102adfab2c4c7378fd83f76c040 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=%3?!FCJ6-`&Ea{HEjtmSN`?>!lvI6;90X`wF z|NsAAyLRo~y?c)xJ2qv?lzaE?egFRb`Sa)3u3g)@b?dov=ia}6zjW!+mX?;D>e*9) zx)@7>{DK)Ap4~_Ta%??a978y+Cnp?Ws{raQk(7{NW!*Z>z@XsGy?xc{%*@$QuQsVD wOqE*7y2wcF97|xPYpO$6;LRHmtjnYs7Mk%eyI5Cl1{%cR>FVdQ&MBb@0LwH@(f|Me literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_calendar.png b/htdocs/theme/md_dev/img/object_calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODaPU;cPEB*=VV?2IYI$GA+G=b z|6jIj*|b?Nu3o(gWX~_#;#?)61X7yh?e4vL>4nJaD4z_MyE9? lK9WujUNMOxAp(mS8H6JFu1;5C6$k2M@O1TaS?83{1OOqAH4Oj& literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_calendarday.png b/htdocs/theme/md_dev/img/object_calendarday.png new file mode 100644 index 0000000000000000000000000000000000000000..5678cdd2411bf87a5a55920770749aaab067ca5b GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODe)55h!U67;^d;tf|AVqJci`N z9Im`{r!WPy)*8db&7Y i#!7AiYi@TiGBMOF<2MpC+~@;T%i!ti=d#Wzp$PyHSUGC| literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_calendarweek.png b/htdocs/theme/md_dev/img/object_calendarweek.png new file mode 100644 index 0000000000000000000000000000000000000000..4ea2c09ccc96b569c2ed0e2aac8f2fb0b987cdc2 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODaPU;cPEB*=VV?2IYI$GA+G=b z|6jIj*|b?Nu3o(gWX~_#;#?)61X7yh?e4vL>4nJaD4z_MyE9p7fyGVSSrQE(s+bJOPaY+u~|Wa Zfx$9|&+>+|^+TX?22WQ%mvv4FO#u5)GkX94 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_category-expanded.png b/htdocs/theme/md_dev/img/object_category-expanded.png new file mode 100644 index 0000000000000000000000000000000000000000..8168f76fa26b3e8f5002b4e21966d23e5f026cdc GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCbW2<#N}P*Q6H7Al^Atidb5j{| zQ;YNzOce6+%k&hC3=Aw43@xopEPzNs+rZGkpdseIDo`VPiKnkC`%P{ZVGhOxFQ07# z3UL;AL>4nJa0`Jj5jgR3=A9lx&I`x0{IdFJ|V9E|NoCj%6swp-I+@_ zfN1}*vp|_|-+#oeG_wG*7)yfuf*Bm1-ADs+d^}woLn>~?_Bsk3P~cz|?)dWGUXROa z8~1csXBGy(4G)t~md(;WZsinQ>G~^l-sxAFNA#jjO3Yc_T3v8=nrF}A%~>pk;n$Cg d|FEdrGlPvW{na)08JYD@<);T3K0RVHlW8we+ literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_category.png b/htdocs/theme/md_dev/img/object_category.png new file mode 100644 index 0000000000000000000000000000000000000000..aaea38dbef2c74ef5ec519976be9b70ecf4e94d2 GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCbW2<#N}P*Q6H7Al^Atidb5j{| zQ;YNzOce6+%k&hC3=Aw43@xopEUb)76|@Zu4Gh$uY)=AeWH0gbb!ETF%_7Xf?DxEV z7Ep+@z$3Dlfq`2Hgc&d0t@{HMWJ!1Qb!1@J*w6hZkrl|72=EDU{r~@eL{i?1*YD0; zx&cJZ RW(G8g!PC{xWt~$(699-`U&a6c literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_commercial.png b/htdocs/theme/md_dev/img/object_commercial.png new file mode 100644 index 0000000000000000000000000000000000000000..36cdcc8d4a2d0220e02cdddb5d62dea514d60a54 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~x+Sg=CC){ui6xo&c?uz!xv2~( znYnrjW(v89Ma2q61_q`I1_o9J=2iyA3fcyS1_sq-mEJ&&>?NMQuIyKtS;gh~&R(+K z1Qg;d@Q5sCVBq=y!i-L9OlANDS<)SS9T^xl_H+M9WCilo1AIbUfpm3sbx%*voH=ur zE?pWF6qKBtTwGk7ot-^p%9N<6C?_YUmX;Q|rF)xzN*POn{DK)Ap4~_Ta@;&!978y+ zCnq>C9Ck1`8az#rVNw6`R7nQSXPZ7rZ74X(*s;om*&uf^$Hml%Wei^C4VmBiSPaf; nFicDjF>A{Z5D`gBU|`rYle_!xQMrpi6B#^R{an^LB{Ts5*fLyA literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_company.png b/htdocs/theme/md_dev/img/object_company.png new file mode 100644 index 0000000000000000000000000000000000000000..2a582b8bd4c899f370f0e74a234005c1f00d6ac1 GIT binary patch literal 492 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCSkfJR9T^xl_H+M9WCilq1^9%x zwoKXT6x8Ar)e;mnB`CQkDtk&Y5EW0!E}oNJJ*T*MX)%zjURvBTr=@3Y%apa2UM)R6 zTYILg?U}N*XU^6sQ?^b4l5_UX0ivZqbZqIIy-Sw@(Xpj#_by!vB+so~du%O`+q(_1xaA*Y@r`w-?AhcI_Al-8%`sfRYo}>T^8$<<0pVZ%ROBjLn>~W_TA=da^P`!&HG+qfwWoBY_?7OtFN+MKmG52 zKd0OCw<&&V%pbaM70Lf&@c(kO>UYCx?azxRpSzr7b&5g!$=rFq?`jTVlx-W=m~m>2Zaq~&?RU*>`)(a(<`U%L%-GJ~h9 KpUXO@geCwuwC|Vz literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_contact.png b/htdocs/theme/md_dev/img/object_contact.png new file mode 100644 index 0000000000000000000000000000000000000000..e98202b367d15cdb2509122e8d4f0e009396f2ba GIT binary patch literal 593 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUDNSs54@nF4%5TlQt)Tl}G6#jD1Z-zW8T z&YspcYu2oFE0^xrx@rI3JspcK^{>3yvF3Tl#!uawKD2K9(YO2mqKzk4?!3Qu@1bS8 zKP@}-ebbSbyH3A5b>_<5>lg0czIp5JqeEA}AHDnk?&Hr-9^d`><;DO1zyJULZ<^0> z92h!bB|(0{KrZzGgO_j4O`r`0o-U3d9M_XMSeX@FT@B7MJj^<|uxRUqok@OvR*MSO zE!wtr+gu^}DcUO*EnT^6p{5$g!&MnAQqtNjuRb^JRIu)mIdXt!#mQygqCC{3ttBk9 zm3FkT{WpHC?x?)M35G!;_ERwD+M@Xzh zRuPj3jx1;j=6*>>katcn`czhol(HE{(y0YqXsMq**B{Y~=ga$f|MKwgw7Hr6w)BE@ z48v?rs>*}<%6O(GqPnd#s|K}{W~Ylxd7HY%mX}CvgNp;v|DpEKd0e0w>~-1W6MVL(m+F28tmm z4@r9{1ns35AC2&G3{5kPmqEg>Fr4n8Ne{xWcsbe2DL$6>3A#@JEP|6*(eQJ;pO^gs z!!PQ75pbf;Nr00~PLA>%%gcb5O<9LO=?c64E-93@FQ@teUa`6kHi-AmQ|-j8r~Hw(JKI(mJAHYuJNZHW!Gg6L zGiOd!K0UGd+w?+l{yIGz`4wJn%=^8x^lGj%lbzM(hwhH^XFhi{T@9`b-oF2}v2SbZ z?n`3(Xz7L4^JP=-idxF69bz9g=IXD*U%GRO_ug!X1S^&{*bZ0sZm%oOaO~Jr=eQoM z?|N39JMcP3EPOcC7Ak6K9ZMGH%&FW}!}EXi#fW|VNM&c)%&uf~H0C6ksvd$3{so|5 B#G(KI literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_contract.png b/htdocs/theme/md_dev/img/object_contract.png new file mode 100644 index 0000000000000000000000000000000000000000..a75f954555ed53222249ca6921a7df634949d1ef GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>ZPvx-Yua!6$T019yy zctjR6FmQbUVMeDlCNqG7Ea{HEjtmSN`?>!lvI6;~0X`wFQBhGrK|%L`;M%!+=Z>A* zyY|}FIp>!4{Qv*|`}^nb?_E2#b!&2R^4_&`fc*E*pJ!)hAKSV%J30B>R-nlD;_U3_ z*N#0uxA)xErRR?Ay?1Qu-mOcYKYxB~@7`m_j;&q0wxy-z{rmSzmoA+$WlB#^&)%(D zi;IhE{|4&;9l%%;F3P?G@z6(VpPJ4GRVtiNc zl77MNTRtO${sTq9osUywy>}?9*XGNgOM3fxtE%ejYfId=x~_<|`a8qvY=C~v_pMng zj%9u`&AmRo=5uK1+EV3zXS;(qG@q`IWca{3|1;}*MxUe;Ksy;cUHx3vIVCg!0ND|w ABLDyZ literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_cron.png b/htdocs/theme/md_dev/img/object_cron.png new file mode 100644 index 0000000000000000000000000000000000000000..6186d18da70caa5acaa255752415d8136edcdc98 GIT binary patch literal 433 zcmV;i0Z#sjP)~|kR?MNMiPaA~<1&fT(45k-CkV*f&VThu-2XQXM(%4mWz@--t(5WD?%;ydD zp!s-7V_=jxE>)_y#2KYC<|Tb(O$8l`0uFU5KrdYwShSp`(&zS#gJigYMImSISvU4z zFrm>ydDaf-%lE6%AKH|7-_dV*tXgs{f?y_`pObaUn1lfb8_)qC6OB50%FCxBVM#yM z&`;Hy8ca_n{`e*PVV{U?yv>QrVfv61fdp;7D3RaNFJw&%ba$drB+fMO!8;*>vNS%G}%0G|-o|Ns9-MMW)Ls`&r^ zwg1P8*i j9hGeOUEbgI(M#rK!i*gTe~DWM4fD7IvR literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_email.png b/htdocs/theme/md_dev/img/object_email.png new file mode 100644 index 0000000000000000000000000000000000000000..d5cd141733d3b07e6d6348aaf0afecac51346718 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUDwQKjTT?3Nu?}5Pcd-vWye-1?7--Ez+F!&Dy z$?j5{fhJ3p1o;Jn_*emhh!VpspsIRL7sn8e>$d%oe9VR%&X;qRs5wbZ*mURrqNS5F z|2BR}>G8SIzawP+Lx=nW@~jelSAV zrHU)zs%iUU;}VNMzscPu^2exxFYuw%>Z}a=wE>#fgTLv`y!3t| Zf6-~4uQJ`9B|xVzc)I$ztaD0e0sslJwVVI| literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_energie.png b/htdocs/theme/md_dev/img/object_energie.png new file mode 100644 index 0000000000000000000000000000000000000000..bc3966d2fa2e83c5810278c33a37ea5fc6718d90 GIT binary patch literal 376 zcmV-;0f+vHP)ZPvx+nEuHMcj0uX?%lfe*xtRzjvYIp03V8*}>pCo^YWg|_K525hyQyhXKy>}46&cI5UZq}pxYl&J)vnXCN( literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_globe.png b/htdocs/theme/md_dev/img/object_globe.png new file mode 100644 index 0000000000000000000000000000000000000000..aae8bf6eba03015d44032e7fafb2450c05a19dda GIT binary patch literal 366 zcmV-!0g?WRP)8K(as|6!e|CXMMYM0o63^NB9)?xg%PAt5GI7U3tF}EGqiHmrf=E*ogN`4 zX7O7%p7(l=b6&@V#ITAxG;n~4f9FCUvbewtTKGmAZ}6i6_f)~MU!#T`&hdzMRqqL0 z(7{a{BY^^zv8LaLc*b@&a2#c|S;Q{pRmuLFMPAj;)Y+s{?sZm@qynvrw36DaSMJa7`{-Aa4Q#1ZTh^^Q%HRkkrvoJozl1?8$PZ@u zO=L+2kiu&)r&_3K2D^quoMKKD^Qz|QdhE<__c|iElox)Q%osUN-A4QDpOEDSy(=5UMgi@ zKW<($b8A0OPft=&OI}??T~<TySn(b#`B6XJ%|{Y-n+BZ*XdAba8!pY;|>XaCvrrd~tbsd3$?%etv#p zSb%Y9h;(d=cyWz=dWU&)kb-e8iF-the@cmeRDpkRl!ZN(j8=hwaEXU@kB)zqkZ+-s zR;!&^s-JASt!=WXd%3Z7!nJb2w|0ewhK7cQhlhuWiG_%Wh>DAfh>nbnjg5_on~{-^ zm6eT{l8T+3kCv8}k(-&GnU$WNmzR^GpQ@*pw5*@8tfHN;qn@#(p1rTDo3gEiySbF2 zqN1dvq@|>%rlPN|uBEA|s;jTAuCA`Hudk({x}dzYtFp1IwX(Cat+TVUv$D0ewX?Og zxVpN!n!~u7#JHZoxYEjt(a4?H(wo`Sp4`@)$-||{$DqZ=vChn})Xt;U)1=tcq}gA~Eb3CfxA5q=@$9+s z?z;2uyY%e5#>LCZ%f`sa&dbWq&dkr%+Qi$|)#2sVvm6{&cG0#)X<$8zjgc09UFm?3@+J??UhctwbQad zyzGRk`j*x>ql~-|bs*O{xuChP$i_asx-J;#4Cj=>-ku!o#EuP{I!zcDtSqf<9V~*n mHgDUur41+z0>MEL5DWnIMoJ6<)(Eu#0000DR5Xdz%4GRi(@fCP3jdfvt%Mw!lFP?LTfa@`YvQIk^F^t+ z)VVn}ob%CdsbmVNKZl9g>sKi#mCn&y($k%Y5I*X_hkFk9e$V6HYi0EhYtN686w0;g z)(#x2)#B_D70$qM+tucuRxgs zSFf9(Co7Z?Fl`vTay{{A%nYN`^Uypx595=w@KnZu2CV_44?EYMf3!3T%e`=bjFDig zE;DouzX2837fLn#Agb15D5K;65l*9})4$r|2?MJxV zYl7#hJV<8RLs~&4@mE!Gm>nfZiZgVI5+bFtiO5&9LaojK9I+hE75721ZW@e3&!C*g zg2eb35QRFdo_#RWpW2+@P4XEwOLGMk=$Vp>PE}bUwlAdD13<-(02Vvi%!@qA$3h$$ z(UH9fJH(Eq1f8iqL(;G%_wGG*?AW<;=T4P7Jb(WD|NsAU^zA+Z^$L^(`2_>H z$bjL2a;zj!F3{7(F{I*F@(+GSo*fzD;^K?~Z#O^x^06xA*O|4C&%AH^a&!0FSB3v2 z_ng0TXIbP0l+XkKd0K;r literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_invoice.png b/htdocs/theme/md_dev/img/object_invoice.png new file mode 100644 index 0000000000000000000000000000000000000000..b4022e77740bb96770f8fee065c58284e3518c45 GIT binary patch literal 394 zcmV;50d@X~P)t3@7BG}t(3;SweQ}>&b6HH@9(9Yl-|z0&b6ig|Noqv zjMlxioRoz3_xI=L-qzO6jEsbgjEr-0b8BmBLPA2$&d!{ioZ6koWdHyG0d!JMQvg8b z*k%9#0CP!1K~xCWP0HI6f-nq4(NJtPHeM#9MnJ`Q2ekkHc|Jf3`)$oR0Dy=n5MT&Z z_1tNgP}`q|Y-H1R-;vMPTRw@#(xa3}q?=si9_dMZU0nw*nVD^Mn$jJMbmpC}_lLN8 oqSbn{?P*Ltv(C*IJ+l#A>U&k?6&ZNsAWdVon5Ltzs0Piw;syV8Fy85O9@m>k&T_3*t~Z*r+4u|L zQB!q_Tnv4pkeey)#0K#06Lm5r%T*~JLpTyayZs9)Rqv}RRn^G;xioUp>-G7Oo}V3I z#E)>L+w0#Cu1YPB7(g;3qo*naP@s?tT{lPrN>tDwho`6A1#!7Up=J(*ljWqg597(rBE<=vvib2y3!cgj}t786&lA=>27&< z-*ePHenYSG=0yO>vTTS@+uMIT>u|y2U#7%(D_1DaHx3V{=~v#cXnkbCem|E2_`Bc> zt@iQMLA~*ex;i7|Nr0WpDPncQIfa23quF1tOt<8S>O>_%)r3)0fZTy)|kuy3bL1Y`ns~; zU=|UPW9nwQy%Z><;OXKR!f`#BgO@jT#sB~8J*&gkGG4wKAa(3~)Yc|O4u%KcMf#)P Sh<^d9W$<+Mb6Mw<&;$UTzBQTv literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_margin.png b/htdocs/theme/md_dev/img/object_margin.png new file mode 100644 index 0000000000000000000000000000000000000000..cd0eb4109f7768afd725ee12fc5213b3d4c31adb GIT binary patch literal 571 zcmV-B0>u4^P)JmY-AwgLbNZ69N!67EK*kWT$3~kIB zC&X+CrS0+U*o{#YVKUOIu{{1Bd&Zx|ay7iW1&##&g5o1-NUmqKcqq>5if66P zAal!deP~4$qPX{D9;U!Xib9B?5Kgh! z&GX1s+9)-8`kK=JjV0d}ZqL}J1BoLai5EM98?pQvKKbpK`|t?mlQwM6oi_tUXmJzC zqwp9Is>iUs_&goh7n<1P>qr$_pt6Vfn#+zsxqX3$FPEkRn{*C&xeKn^L!mw(=|dpl z+9g5+{0=h2B|f` zJZU6TpnP(n7ifnVq*&yRJ35&8uIjT$8p;u%&4E&*4@PJpT{+hwV`il@Ec>DmY8|-a z>B+!qB#o^D0fJ0gw@!YetRh3&I8{=>hzdNBq<$~7FHQy)+|=yd2XAPS+Wk2PIc*Qt zLVMUqmAsg!O6h&K_Dy19g;Cjf*IRu4Oljw`wO{bPPfti9%ldm002ov JPDHLkV1lRN1oHp@ literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_opensurvey.png b/htdocs/theme/md_dev/img/object_opensurvey.png new file mode 100644 index 0000000000000000000000000000000000000000..b5de3223bd4944e9ba35075c3c6a0052731a12d2 GIT binary patch literal 743 zcmV?P)Qy!jUi)4FJ@#+a+0a zEYUWPlVLp$E-I_b#>`vIwAE&nz=fFC7w}Qrki+eijo3c3W%^nqyv)Ro$Eny!lu(}u zwXOz378AR`T4Yi0ze$`+_HMp!?L?~zarI}#q_!L}xg!@*9V7XHR~cez`*pN`(XK7n zwqOtEk&HTK*pvou(^h+i-x;EwD zm+AZCwMc9^Bj#wbLHA_iHlsx0z-8PSP{QD15REQYheOTh#qzOdm}kv2)w`8;rdZ z6?!Ee8m}PoGmP)QHc&V78U?*ssGgAHswN3eubqp5w|bADbv6%=A8`13mo0KSc~GmI8n_=(KxLDAGXB6HuD=4Xr!ndjK@8qBI0>(u7S;Er71xO zNbCVK`*d7^(tZN>OVKcuiAm0gd~FKZWFMIp4>hSh8B@T*&9W|XVX*@cf-ADG-qE%C zsa#^%C6@L}#mb=+sF^*u%j_0Q$Xgw$&AN?i9?mU;{lDu864ZPvx?~n$@y?q0EIXU zJR*x37`Q%wFr(8NlNmrkmUKs7M+SzC{oH>NS%Lhb0G|-oprD|rsHo)Rzr#q^4zg|$F|-BlGo1NyLa#TxxLS?9ee)#`TKj<-UG?^@4vr){{Q>?|KGp=|Nq~G zi(3_FJ5x!JU+{m1r`rv@fV>P(7sn8e>%PYW#hMfZ7#y};Te|6xNSr1s*PFlVXPjr6 zxnGc>j9Gf)w3&CGYVcRzoHR95+{SaG`Q7soQz!2Z?M;;PzPvee-TO-(QJ1yNS-;5F xJUKSAt#Q|#2c}8c|K=XMC$aR(`b7*sm=sQM=ghH>7X;eL;OXk;vd$@?2>{fEq*4F? literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_payment.png b/htdocs/theme/md_dev/img/object_payment.png new file mode 100644 index 0000000000000000000000000000000000000000..5691147d8ffc7e161001fe58d28bd306815f779a GIT binary patch literal 339 zcmWkoF-Sr|0R7UCDC*K6LEsV=H7FDjMPwn5isA?_2NTkrJzD#uj-0+W zrIq8+WXLp4!!RgiLI}nfCb->hb1n#B5CcRIfDk}{5G1l&4$rnjAD!+ z(6mfO%V~sA&bdxBp+kbPP6@?Gir@{-07VIg6FSWa9q3dwc&@>bAt)m%XDX+f!Lj=m z?8|$WgG6jing4uB$&d{P14--Sk+^hP0`Aaz&Q}|#ZbbC$H*1r;P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=G z5-v5)pJ!kSDS+&{-L5pA`*kxuOD?yNLEQI|7OBBX11Avs$lNe)VtwoIS{{YUpDbgGZvVk$i zJR`ZI93+dPC_aqG<4zO|fJXqp9Fhd!#&9_Fod6`g&u^`PQc91jstVrwP8+<<+$rf- zN@=&Msw3|`LI|AzzDW8;5&(W1W6rF#otgo_gb;oJcn3fvhbg6l)oR6ye)tz1lW+fA z(jsecI2a6G0yy`&Iv8WPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^=G z5->DyhOY_$00H?)L_t(I%Z-vTYZXBhh0mGYkVLKWgrG&R5$xXVEU^)>u@L+RmNteo zvG6BY2sWmOM(oAPUm%KD%FNF82JDi6*a(`y&K!%(dn}J2o@Qs3z4xB;?M2(R0Dz`x zE;#2_0l->|{}lnCZQJXT_5mR0{3OQMS!+>M6#(eGI`942p=p{+BtMee1OQ1xO6f-5 z_XowDW`m06ckexnG3FV`O%;)>>$?81v9U3)DAP1@Gd~*uj{ty0k_6z|WHND!zPHVlHNHXXAxa+!b*6ZIg0N$4Dl=M62e5dQWUFRG^2q=&>el9lnBIz4R0Qh5! zIkMIwgn$B(Bg3KK&33E&+7k(}h5w@*(`2>>Z2c<*Nr$M7_EfSmJlNyml3&dSQl zO8|&50sx$I@ZK}$d~0cGiQaprln4NvWt~o^)4Hx>;UP({Pfkv@mzS3nV?@(5JI0t7 z0KN~yaJTRK18ePB9&0UPjBw6v0oWsHBtg=yF=j8Nbfv1Q&t*?2X~;R>j4^g|ATuY< zxh;~f=Aoq@09FB9B#BXzPm=DN*@vYVA%y*57_6kD0`_t#Ui^guz-s*F@bD1UTJ(K? zyuQBvhGYV8mE>9(j57Tz$%i3?W1hEN<0W#=tpT`A@`0p#0QMz4?Yiz)+qU=%*8vob TUmP9000000NkvXXu0mjfTM`(a literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_product.png b/htdocs/theme/md_dev/img/object_product.png new file mode 100644 index 0000000000000000000000000000000000000000..79910e5e214f7cda81bc1e7a1e9e2d45a05eb813 GIT binary patch literal 559 zcmV+~0?_@5P)CgPB(!7000SaNLh0L01EH`01EH{Laa2H00004XF*Lt006O%3;baP0003RP)t-s z000050|NyG0}BWR5ef$p4F?zz3K$d$9uo{IA`n3_8AvW1Pd_zRJ}p~GIay6ZVN5$- zP)2N4KzLv-b7ez*S1@;IPlRAHfn_~^Xh(W(T!Cvnjd4MVc2$XZRfl_Fhkap{Z8?d8 zca4B!l!98ClZL3Bkh6$IvW`yCzoEjjc*MAV%EFM($D6v6M!J-$+d6LyMoELZ_K-P&c1xmzk=J#pUl5@&cS@n z#eC4ng3`!{)y$3F)u!OstnKB`(943-%!t>~liSvx-r1(<a^L=e_Ca!|muEjw#tMKD*^GCDHc+T2h>T@=KXGqCXY zvo}+gotbxE>62#@vasdKodwY8^uvz@tzP|46?rz#b x5UcogLPJAzl(=CI;n($4xLr*6QTc z>fzDuk-iJ71Zw&H0Tqz>S8t6B4Dvq%x0^w-A)0U!;1dt#N54xQ%`I@d9JYg}@Be9n}>^li==7sJYrL{=T} zuX$A5u)4BsV|B|e&z7rU-B%+g-j1GpD`v_a_m=nm{T~CmKE_XYk~!;c_RM!V3+`tv z{+_$!NACK+bt@lMuKm>1x4moXzP7pNdL|#3Fyr9lSx2YMJuz+m>6V4J+E?D6vf%jK z73U_byE|{$g~l}xTUI`3S^KDe?W30UUt2c3YTNavbLW?iJ%6UGe>8dTiz)lw&)xQP z(TcOn*56pN;mV55S9k9|yJYvH4Z9z;ANV`t;LllSe(yeTd*7k^3y!{CeEj{Y15cM< z_`Uqb(Sb8> z&Ruw`bn`y7~0y)i3{V{`mjo$=fII|Gs$f_3gXw@7{fR_4enp z-~Zlx|Nr5`&+p%VfBgOb@85s_|NjR@tE;QBFk{R?AZu<(kY6xRaL@vV(|`8(03ABp z)5S4_<9hOpW+n-RkaPzDA#;PpTa6{oY%Scd`K$h`d4?-*NF6C%uX8eYzKyA^>J^?N zTm5@=RiO>SVrDJI!sIl@qt>@>Jv+;7$WnAT?fg93;!`c_rahApR=93sZEdZsbm#o_QGZ{Qx{an^LB{Ts5chDL% literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_projectpub.png b/htdocs/theme/md_dev/img/object_projectpub.png new file mode 100644 index 0000000000000000000000000000000000000000..1444573cf05c248eaad1c94fa6ad2cedcd7a78d8 GIT binary patch literal 929 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD!lvNA9*UJvjIaRrKVaq%&5NOSWD^YV-F z2}lSCii?WLGH@s|bE`3MX)$tZG4g6N^J=m1YAGt~DXSWY>iVf^Ir#)vv#NG*YjtvJ z_3&tS^6GT)>2&k!^$6(q3hMU>8uW=jr7}^)jD2ht6{eo$DCAH7>b5K4(f``Zni`i(%zQBC8Jg z*E}k2SY6q+vASiKXUo;F?yHd#Z%0qQ6*J|Id&_(O{*M7&ALA!H$((gJd*-{G1^2TS zf6ra=BX|AZx|I(r*M4g1+uk*GU)$VsJ(CYim~n9OtfSNBo|rcObj!k9?JMt3S#W&r zigOdz-JQ4WLgSi;Eh`_itbNqK_EF3FuPqy1we9-Tx${fMou)UCaAn2jtGjofU9$VphTV_a5B!~R@aL>Ezjq(Fz3&%;7XWs6(_-^CH54*2@*!uYI?kE5DKmBv$=+$%Q?;Jbz=)jpb z=dQjwd-KzU%P(%+cyjB`+cR%|-F*7<>X-jFfBb*)||Nq}mvhV;#?c9NtJbnUI(BB3-Nx;Ub@h$4jtHFKoo!qF?Tn`IuBchXJ`FLS-@JLVrlY_< jUfa7^K%Dc;OlF418$!KbZvLABbT5OatDnm{r-UW|n4cfS literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_projecttask.png b/htdocs/theme/md_dev/img/object_projecttask.png new file mode 100644 index 0000000000000000000000000000000000000000..4a01b50435a54567ce0d53cad192e728aba5505a GIT binary patch literal 941 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUDNSs54@uLt;qxB|twxcC@2q`7&7dHKco z1SA9m#YM$r88{S~xz!lBv>3Uy7yai2v}?tv)L+aw^P98u%iEdBcBD*&PSzO zjw^VbRtmXl9C6$t>X>ozb%V6~dYMn1L+81K&UK958kgK2pED&eeVcQ}#jx@tkyQu$ zYaSIhtgdX^SlzPAv*l`7_tnUWx1%TDikWi9z2&`s|Hpu?kMR?pWX`&qJ@Z}8g8NyE zzvnLbk-PqH-O7iRYdfT_mX!}$);{WA`>198*Om>h+IIcv-1((r&z~vlA5Gr-V#>bvbGJQR zwBqct^*5GmxUypN)!n<#F4_HP!|q4z2ma1D_;c2o-@6ao-goH!f}^h&AAi5_{kGjDfXe7Eu9huzmcY<>K9_mhA7pZ+;=^y<0ucaEKUbl}XJ zb5~!Tz4__F?^7hI5zb{^Vef#eFyLVq+z5V&@ z_rEva|9|-K^ZWPTAAkS<`}g1f|Nn0&S$F`Wc5X?KUoen6XaU3NKYM(D4&C7C;uykl zJ$Xhmlf<(#hC)I{uXs3`3YK#i8*SoF*;2;Vywj{Pr^o4#aGH>P;keeKdY=e91rcWmqP z=g+rpU3+Zr-ebp(tzEnJ{rmSzmoA+$WlB#^&)%(Di;Ihslar^^$XftyWGo5t3ubV5 zb|VeQN%3@X4B@!$d;Bz0lY#*2g^yX+9?VtodgJ=)|NoS3CY#;LN(>AhY@xlUXKjl* z%AR>${Qk<7y#4CsR|Vd0ee!14r2`)MOO@GwX_{Mn%G!SC;>FpqMRy&Ht^eQNc6Z_X f{^jwrot|)q-(z*oKW`Waw2#5l)z4*}Q$iB}Jj;&> literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_reduc.png b/htdocs/theme/md_dev/img/object_reduc.png new file mode 100644 index 0000000000000000000000000000000000000000..ccfd2d2f5b2cc8a689ef175cbece501f8084084b GIT binary patch literal 361 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>ZPvx+nEuHMcj0uX?%lfe*xtRzjvYIp03V8*}>pCo^YWg|_K525hyQyhXKy>}46&cI5UZq}pxYl&J)vnXCN( literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_resource.png b/htdocs/theme/md_dev/img/object_resource.png new file mode 100644 index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!VDyL#uerODaPU;cPEB*=VV?2IYI$GA+G=b z|6jIj*|b?Nu3o(gWX~_#;#?)61X7yh?e4vL>4nJaD4z_MyE9? lK9WujUNMOxAp(mS8H6JFu1;5C6$k2M@O1TaS?83{1OOqAH4Oj& literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_rss.png b/htdocs/theme/md_dev/img/object_rss.png new file mode 100644 index 0000000000000000000000000000000000000000..37372031157d10aa794a333dcadd1f62ce4a7b13 GIT binary patch literal 362 zcmV-w0hRuVP)ErM1=kf39^zrTW^Y8Zc@%Q%g`S_|hV<31N%`K#VCuKQ+^*4FE#k-OWM^#|S`P zq21kQuHpv3bv&LmTOV6-L$3Yzs4LlphuY+laW^@1p0eS^iq=l6d;Z5xja9X3w?p6W zwV3$dg0G84jUEKz%L3%sXk?6JTyS1ScbkxXAk$=VOa#cx4}M5nFdczmfdBvi07*qo IM6N<$g3s;DegFUf literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_sending.png b/htdocs/theme/md_dev/img/object_sending.png new file mode 100644 index 0000000000000000000000000000000000000000..c798ced0b5c113d90d6987b597b477a0face49fa GIT binary patch literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^d?3ui3?$#C89V|~jKx9jP7LeL$-D$|3<7*YT>t<7 z@9F88oSdAUon2g9TwNTre0uJbDN|OiT)B6O*SWPp=Z^L4+`04Ev18}XoqPWL`Fe*< zS3w4q1o;IsI6S+N2I3@nySp%Su*!M>Ih+L^k;M!QTpvJ~(P@pz44@!;iKnkC`)zJH zZejL@r#Xs1Azx1y#}JO|$q5P!F)=YBj$7{U-L5Y+;pKHp{T6$MmuIHRO8w*E*%xV? zp0VYH!H?9nvo8MsC*16I`_k)LHCG-zHC;75y*h_x8HpQrB^mNLrR`6Odba}&X7F_N Kb6Mw<&;$U{r(lu* literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_service.png b/htdocs/theme/md_dev/img/object_service.png new file mode 100644 index 0000000000000000000000000000000000000000..65e9041589f39e0c76746ea08669baa778442a61 GIT binary patch literal 365 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCrUm$fxB_V>LkTZU2`@{->>#J& zWFQJE&i1MfGOSM4tj>0-&W>tHHf+hZY^hG}DR$~94(h26>S;;tX(^tPZMk;Nl&w8Z zTYJ3rPI1~h$7}DLpks5QjxCKkwl?|L*6d?jtIzE%KDW2}+%X`Ua&2qNwY^KPool&v zZOXlKbM9ROqNVrlEq(rc@B8QH-oHQh{r$b~-=F{g|6ff$?lsV5j3q&S!3+-1ZlnP@ zt)4E9Aso@Br(a7oDeyEr6m?Cv7El!kKE2`$&%6K6CMDkQx7}0C#$dW?`AbLHdA+y) zY}`@5d-mbnpl=^@gB4~e7lxO=m0oK%|JlUq*7fXhCG*z5yde=Cxp=D5x`GpWouO;q z%x2smBK|JQhoR!kZ-E&S&WkwggqvC$dpz}*KG6C5R$Z5|PD7E$GEmGT2k0OMPgg&e IbxsLQ08x~q)&Kwi literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_skype.png b/htdocs/theme/md_dev/img/object_skype.png new file mode 100644 index 0000000000000000000000000000000000000000..b209cd8d16e340a330069c891053a431d7a9e01c GIT binary patch literal 682 zcmV;b0#*HqP)c!Hgig9>ZD%!3laEIQ9cMkPbIx%MD^fHBqT)jPy|sA5khJDAmwzX zwNgQ|SfMFGB!N-1+3x;%XA_;4>zI9DBDMeAsNXo5RI*Py}b~n6q;l`Js zHu;);3A$$vYWp&<_=RZ`g?dxYSH5a=mrnvgYtw3a~6dy9CGI z1#4ji(e0se)k0UXq-*rBy~v}9`aF1eB}L+)8hbGD7gA6naWl-!H{Zt$GYphtp)Px$ z9RSc32?yc=yPMI`DzfYD$Ik-VCnM2d`)X_3F3+B$zqVcwQs+c?^dbQEpUr6TKXu;| zqV1e7>H{D>6V{mSA$T`DEXN)4K zA*fnRWr7gQkj${cuxweTuxhnhHW4Q(#|e|F22rr?!BD|S#ky=V4QrCgiOCU$NkcTy zq}g;uY(q#d3o|j&B&0f%38$v)uhnXn$t;6f93rUbinC;h{gOeF1Y@Wrpsq74YMo$2 zDWNDykwTFKp-wTRSY?!Q9O8@-7!nf(Nf2G)j1Z&}r2QK{{!aX%WilQ+2D}?3=~d^dqE@^3q12HssHYr4Nm|7 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_task.png b/htdocs/theme/md_dev/img/object_task.png new file mode 100644 index 0000000000000000000000000000000000000000..14dc14a9602dbabc7b0702b0db699610bbd68313 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCL<4+6T>t<7f9A{?AeokyHgo1o zV`F2WOl!f*CLqOF666=m;PC858j$1Z>Eal|aXqxpQHaG+fKgNR|NkeJx#jDl*%&=1 z9b2rt{Om){3*FqE{uN&GAqmB|#iD8sGyIljT5#O=baZb1y!c7~3-2X*Zd0jk(PvZ& TSaR_#&`<_XS3j3^P6vL>4nJaD4z_MyE9? lK9WujUNMOxAp(mS8H6JFu1;5C6$k2M@O1TaS?83{1OOqAH4Oj& literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_technic.png b/htdocs/theme/md_dev/img/object_technic.png new file mode 100644 index 0000000000000000000000000000000000000000..6186d18da70caa5acaa255752415d8136edcdc98 GIT binary patch literal 433 zcmV;i0Z#sjP)~|kR?MNMiPaA~<1&fT(45k-CkV*f&VThu-2XQXM(%4mWz@--t(5WD?%;ydD zp!s-7V_=jxE>)_y#2KYC<|Tb(O$8l`0uFU5KrdYwShSp`(&zS#gJigYMImSISvU4z zFrm>ydDaf-%lE6%AKH|7-_dV*tXgs{f?y_`pObaUn1lfb8_)qC6OB50%FCxBVM#yM z&`;Hy8ca_n{`e*PVV{U?yv>QrVfv61fdp;7D3RaNFJw&%ba$drB+fMO!8;*>vTn9*sC$qb+%OS+@4BLl<6e(pbstU$g&fKQ04t*vcTR8(?ua&~rh zadB~Vb@hY^6BaC3uy*a*ty{P5-MjbLv18}Xox67J+Vkhn|NsAQqoUma)GJUDF!$v^lRd3I!oi;FV~yxsi#%g3seUuRZ5KJ)%y$?mE<^=$8r zt+!`S$zb}K-gkX&^^pY^r|n&P%%t<+QIjKAjvj4)=$~=se}3YBMxG@u?CTpI*aA&v N@O1TaS?83{1OPx4herSa literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/object_user.png b/htdocs/theme/md_dev/img/object_user.png new file mode 100644 index 0000000000000000000000000000000000000000..d26d8899ee80f1e4976260b265a3e7d75ebab61d GIT binary patch literal 607 zcmb`C&ubGw6vwx=AvHCnNGddzqJm)cVo^$q7qcXqge1h6Rtz3m7V$@{s9Or@s-SGu z+713-5yjDiFhbKzAmD&0OfSMvQT8CXD&k&R9MjA6)Zh<@v;GZ!c<=jt?;RfR&8AaF z{l1`2k|cjD8qNssbhEux=$=R4R)l#cW66m3i??^{?tMO1d@DwqFGWwPlH^-=vqdf+ zd@P1-XF|!4BvtQq{2BL%el4BIMuz+2@<2u&$i;{Axww+cXo`~0E1Ih4YTi^;O;dGE zH4R-ibi>ers7%BB2Lgr$OdYsD2y_Sx2oQ7;iV-xCs}#9lgeZnU7{($5gg}E}NH8VD zBm@ycDAXx|lv2wAmSx#Cwr$(7f#YDuaTrpWLl}dMA;vIcqP7@goFUFI=a6%ugmcQd z%{gyy+~Bm)5YcEho5dixD85cjW>UvR`~Q&2$={aP{5%#8W!pa~>z+;ioep)mIc>bvd1gCc@!dZp*SqI`po8=}M{P)4sdN=qp%#lNC1GzKrRLGcRWLXo&kFcqXEv8cEa#hq9|L}Jo9og|GRPSSQF ziI_Ac={RQ0WFoyt*X8YZ4l`w}iwC~*o%cC6j^k%ro5Mov?R}VVyM3oKGm^ZppyvYt zU7DTEQ7=GqkL_8zupiy#T`-X?|0HJf7ECcnjqjR z7K0jzKs`L6qlD#+Sq`emtmAHV3fF_csa$A|O^CFox(i1+nDn3{qxJq^+2LZeiI91io0DYlsSnGNWHAdZaS`cgr0 zbrr`Q9eCH?jy&C~QNKcba*}6E@tlb-ts}4%1)mQZ1?#yS>RAa5O@p|&2*K&JAN4g8 z9}z!TBRM#Tx82=%L$4gA`^Lf{>Db~;I~-!` z=vbmN_$Yl`p2?h$#}ZvDlylqSjk}DsM(NaeqFa8iP9j$GVRiEzCsuof59$;ql1DVE z>H9~t$D2>y{eI}TUz?x#zh{AZe4F-Auf7Q`(NX^mPHgr{rgsb;G_QDb6+U9OAUFf8mvUP)7TD=r8oSP8a8QC-JK>;N@v z)Baa!TS(x+p%MtxV#n|9Kp+;Es pdZWnLLrf4+La8GVQ^Y=F?H>#$+i6j^&6EHD002ovPDHLkV1h@)5;Xt- literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/pdf2.png b/htdocs/theme/md_dev/img/pdf2.png new file mode 100644 index 0000000000000000000000000000000000000000..06634550daa62ede26dc024bb75b36a3d901ba16 GIT binary patch literal 636 zcmV-?0)zdDP)) zZQnnxK-W=5?~D^aeoFKCE{a=sV2t3Lp;B1@6zA+j7^XRwwy#-%slNtFok$Tt05FDS zY>A?Ta=C+Qb>X^;)@@onwa|g~50QPHLh?QWh!|9r?(RAxLwIq-^z>}%5FssgV46$Ag{fzw;ot~C5Tn}%(4!}jmrsbkeJ0s+0552+ zZVu!@FKH5uR{I8bdS}Kd3=Dxn7AWzt<3t&F^$=|}$#i+&Ou1jnbU0`w&1&D^OFJ+` zLBR$IHcPOLkhXe&m!%kMvDN^HL+C4sEL@xC!sMsL-KQSD?r+u>(bdQ2|ENM3#^E18 WVhhIx-L@?N0000P*+S=#a+vVHa=-k}t z-JYG^-s|At?BU_<U(PH z>htTZqU-DQ>`E}~?DXweK<$fs?tW_SytD4^_3yE!@9*#L@AmNU_wn)Z@$vTY@%Zxc z`SVgX^Yi)jI~(;zDD_7u^=()6_5Aic8}^=(_ubq0F%I}X9r%@o`1t<$`TqKHTKj)# z`hu~_M0rz!Rxvo`1!R<^Yybd&e`6d(my8fnj{pDw07*qoM6N<$ Ef||)YJpcdz literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/play.png b/htdocs/theme/md_dev/img/play.png new file mode 100644 index 0000000000000000000000000000000000000000..4922ea1ec12a8606851317be0927fa7c83132889 GIT binary patch literal 653 zcmV;80&@L{P)c8BOlfbI$K#7JzXv8rz9tLeSw=&&{vy+ zAX{t$K@Lf#{_!}zfVLSPBSp#ZPhZe{kj5nrPIvhn+m1mpDd=0ET!`0}hHN9-z3X#w z7G!;n*58dhLbt*&%D&>7_*|D2$6uwuApkw_teg^^HRmB%(3CZP*Z^3b=Z)x~N@?91mxwIso5d08ZM#q761; zv*L^F@xCPOAIsVVlI8K+a>K(x=32s_H=z>kh!NOF2>|&AZ#Eg}zwVfHZV-UjG5t*- z_-Vj!K7Gu;^<}aT`IdgnW%NZH$kh&j+YbPN?|i17hyxjci8FB4suneh?D7_ORLJz|u8)DF z5@@$wlblat=pcG+DQVX)_j5;q;(O4!4jEff`2h4cG|qFMDNn{1`&jeIMY#?g!0;1v`uj(m5*~LNCbAnocXlYb-brg{7SsOKFYjV%h zFH_dnbWfNSj*OP zJyYiNEZy3(_u7=L$L7pgI%n1dd(1cMb@yT|0O0`MG=V z&pm&C?fLU-&)?qzg6AOc9tgfe!2j?6LEzMvl@dU&xt0X^1%m}BBp5cm+h_qaaGIx! zV+e<=?7^FSO$H(k2fGDUdQZ(#?iCYXAJ0231{C5f z@Q5sCVBq=y!i-L9OlANDS<)SS9T^xl_H+M9WCik#1AIbUr%hY1diCnHYuBz{zkbJ# z9XogKJaFK^;lqcI9Xod7#EGq2x8A;e``NQ+FJHd={Q2|u@8AFb|6jagu02q@U`dc) zFp!G^7*yBJOae+edb&7N!CzK(sU}yE+O;_NzuvkmhQc_^w_<%$Iflt3j)Wk-8%;a*RGwr_x#+w_vfC! zzxMq3wde2e0l{++cn<{MA>jY_{~&Pc%Ss8L*IY}2{DQ#(6cP-Z-fgr18aUb0#W92< zn)P5bS5tsU+r{;d1NWpvIx2j55;5yPgOtNwk=CHDH~-&UyA{LuciPN7uNagJe3hSV zdREhvlTfwf*xkwJ&nI~|lxt}+UdUB3=+)6-NXTdEzHPPcnZ*)u!SJ*PlTOPjwQ@VG z+j2?ZMVZ>kNi!=qsyqFk%c#2fLU;;uWpvGwlr7Vf-C17!Dww`$**fnZ%ym*B!7NOT Rj6mlxc)I$ztaD0e0st>n9KQen literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/recent.png b/htdocs/theme/md_dev/img/recent.png new file mode 100644 index 0000000000000000000000000000000000000000..a49fc171c06d79261f00cc16118595d22077b29b GIT binary patch literal 447 zcmV;w0YLtVP)O?LSsr8V@e@oQZZv%N@H45gkvFuV=0VlF^qd-jC*U8glnywd##*=wQ~Tya{#@2 z0KIz%y?YS7rF*@lgvNUS#)JUIgb2=r0M3L6&Ws4olqt@XG1i0t){Fqwj0o10A>NDt z-joR5ln~yW0N$J--lam`ty1Td0Oy<#=bRYlr77pFLg%$w=f-pIoEYz=81JPa@2x5C zwLM){Otwl>gqG|K6ql-mU-VwQC`%hyVZp0d!JM zQvg8b*k%9#0HjGoK~xCWO^(S9fNs|f~on?Yq5#NdKxf=fV=Ek^wRkMaN#>sIgZ zssLsHkm$n90zxVPz5)Q#Dm|(9dxxFh0Epu&C8B*8G#yIjrAAuybX&mQwKm9jr^+?~ z%x_g$e8x1YifAR6!Mr}@^~{)7SrW$q0Knd6%gLfVJFNr$<3dFD#Nl>j6Iw*%L_rIr pw8dbkGjCk({;L20i$C!5;R}*T4|EuOrfvWL002ovPDHLkV1g_I%Z&g4 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/redstar.png b/htdocs/theme/md_dev/img/redstar.png new file mode 100644 index 0000000000000000000000000000000000000000..486fd6770a231ed55293df7f54edce03ee55c303 GIT binary patch literal 533 zcmV+w0_y#VP)^ps^(>@s;Ez_ng1qr&iKyKta64K}Qr=h;~c<_+oAK-cmRZ zknuJ1n|w|b12ljLG#VBJY!%2i&JJbmGyuR}UjqQ30hEG9V5!#)p%=E2=-fBHy=@e5 z2VBL)c9+lsfX0ASL23|`1e>boFvI>p$F_|_35I859$r&n0zklVH_Nzx&`gFU9Y_#Z zcRjo4%tPf9k0$4Cca_YdG3aPaT>mlGoNp`kOROgx*eZU%O`SpQ$bwD6zZTM6rw46$ zZcwjV;OVdC$7jD~H8P4m#AmSEEj~{u~q67 zSbC|*`C&fG1^`PNaxuqQ)(YuO0^z=DDTP&~xV zx99lL7b6RB6u8>XNO_9o=`@!C0MvWH0lp?VJX0n3T;&D8gobtty>W66EbhB1&jJ1e X&11fpJ&W{W00000NkvXXu0mjf%YH zKm%ON42;6;44maEEON_y_)3;}a?MFlVvu6M2S6HfG??{Q1@TrKZ_qjae0RaWBQ;JJ z3v{?_RJj@Wd6{r%^pjyw+!)2X_{kcRZ-39Z|NnbB?%&Jx$=}a5yPjL)FIN>K$D+u~ z!oY~3QJs&0x5JJ-`a-wjxgUqk|NPly@&Elw+y6h-2K|3JHSq1GaD{$%ekMs)kYXMd z2IfR%2I&N429-E@22od02JS9PR==~&ve(|O()+q2mS_8w3h67~X4(C}*I@N#vMG0z z01E>vgD5AX=+;D%AB z^#AV(5m+h8!63*W!ObXlp+fP?>+Pw(weOTlLQ|~a4||Th;uPWpUIVY_-S?E-#wW+^DRXfB>7kwm_^tb1O-?bz~N}X z!@#`EovY$ii^A8NSt4I0ftE3da4-n$4Ch|*ZNB~g>+ROJVzfEJYxNm)SNn@Bm|)Is zDb3EnVj;l5zQUEg@O-Aom4gvHr^LA!B^iW(9-VK@5`M2v>CKk~ZvRi0=$%^QFEahk zoRp8p>)g(^8gsh<1B@eHfk81@jlm{Sjlmcgpll2rK&M3TGe~U>;+p!RP2=O&S&sjo zOmzMEV^iM0uN%{TpQ>>@)?&>csLBiRI|=|sDpP_oqxu$qj?SxvlK0+q>;3*a-R$4L zX}bU4PImaUJzjCEuPlQO)>Oj>Oc5IV45G!lOfH9G_)dOoRrq^7TlnpcVD5#pj5xfV z*%|oprq@VW2JYo9EXy|du+8r_W3&MU9xxnO*wNGh0HJEuBo)&9!2kdN07*qoM6N<$ Eg5ua`M*si- literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/reload.png b/htdocs/theme/md_dev/img/reload.png new file mode 100644 index 0000000000000000000000000000000000000000..a4029f119def5d9ca4c5f7f1bc6a452176bf5b06 GIT binary patch literal 704 zcmb7??@Lor9LBF`=^U1X>V4y5N$e2{G6k^_+1%BMO-*2b|;o^^|?8?hdl^qD(~U7?6ySOppu+gG7)!Q4hvMSYQj|No=(Kykg?MTQ)Jvq%YX^x9` z<~II3e3`G%>{>ifvstipIJmpH^0&q~lxANZzwr5ye<^4kE@;2R-G0>>G;ihPIQy!4 zPOU`7?hhi(v26Y5#Cl)v*noY9_R!V0D-$zQvwQt=_^YF8PlvI>ZY}jIQu5~uf4Ht} zo_Tsr-L__EPhx)dj^+;R&tEea_v^b=+0TwYzo$4q)c;r;XZ_XkX7U7UEu8!?m_9wd z{6H*CU+OGAZO?SfKP}kkoJ<`2(q+{(&R|Clt_;1 zNltDlw&W=G(kw3SDPDT7c4>$Mgqj+X4~mbJ%P_P%d9 z_r2vB5dH6Q;^+x7?AiLfXYcc#Yu|hB{hxB|`IP7X=VV*XS-W@6-g|S--JA3L`<(ax zmma&e^!@*}*_vxxoYr2uw>4X0Ymd{`bN9A>|G)MB|Gnp~?fw3L@BjbDiY1Qy|9|fP z|7-vM-&-1V@BjbjYrURtje7q5|E#$=-+)eMED7=pW^j0RBMr#O_jGX#k+__kpupwP zeM&?5^Uk9wsi{u|Yw8SZm3c#XOLs6#Uo&yy#El!xVjLV|9Pghw6T`1}K%Grw!dk*Ar0Tg0#W>&W=bkYi;y X{D&*ed<(lF&}s%xS3j3^P6Tn9*sC$qb+%OS+@4BLl<6e(pbstU&(u0G|+7Anhf=5oBo@rOAHGg{vo+VYIIX>QZ)>*1)*h#==k9I&{(tNL|9j6}+xz|h-v9rP6-ylZ|Nq?o z|JVNizqd5#-v9s4*LpqQ8uk49|5-qMG()Oq)nSPeR5#)aq+tE;T+0!F8#rzsYXVVjIOnDb988Xc+Q;p`XK9%BO*)A zEXkQNp=atP^UYHpiMT~5FIu$rh#IT0nAb+FsF@rKcl3o{k7}27ZHYY16xzopr0Dc3&>Hq)$ literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/setup.png b/htdocs/theme/md_dev/img/setup.png new file mode 100644 index 0000000000000000000000000000000000000000..f997e53799b568372453abbdc854c78d5c628a40 GIT binary patch literal 702 zcmV;v0zv(WP)L`hzKc=0lo$X z24&~ZpT7un9)=-dVPUD)uV4REQ&Y7WsMZ*!IXpZ(2WWUQT%oqMcG>CEr!PiFN23@L z92}f?_3G9CAnfdH4|0Jq(6C8B?|kz1_Rd7H4P?lnLx(N`Z775KkI~oHxA4M+3;%&( z05+tuvT`%XJ3DslIBITg9)jU#O-;?RJ$v?Cw6(P@v$nPl^6>B|J%0T7e~=;9u3q_n z<;tZmt5>f+VPRoWBQ7p3hBewihAf=Ze|=i3!{x&}=Kj~!)otYDCmzP)P<`upF^OJO+AKB9J zZGOMwMj$RBXn>NEQn0^&;G~NeuY%&d$Ja%(u&3JM%#|ba{?G2V-!iMqt_-IE5)u+2 z{{Eq}u3fwH9~f{`_Soj^JZh>d_)6Nu%2SQv=;fLH*CC4pE4i1p%v k)TUHs8=eVtRRqTh02?mmtpET3 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/sort_asc.png b/htdocs/theme/md_dev/img/sort_asc.png new file mode 100644 index 0000000000000000000000000000000000000000..e327d952fa47a490b79b8b9c6d32854de82a0961 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3I*a!(h>5R22vKmPx>XWnYS9Lu{p zYsYEUBf|CvALDuk(>Hdx^1rZA7&l%q|(>BvdL zGlCuW7fOEP?8x;n;#tus-tm2*B+Fszh8c534huE@P#35_-sJdbBJ=!nZoJZ_IU6L| Z7%p5>T3>DUI|}Fo22WQ%mvv4FO#q#PKEeP1 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/sort_asc_disabled.png b/htdocs/theme/md_dev/img/sort_asc_disabled.png new file mode 100644 index 0000000000000000000000000000000000000000..e327d952fa47a490b79b8b9c6d32854de82a0961 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3I*a!(h>5R22vKmPx>XWnYS9Lu{p zYsYEUBf|CvALDuk(>Hdx^1rZA7&l%q|(>BvdL zGlCuW7fOEP?8x;n;#tus-tm2*B+Fszh8c534huE@P#35_-sJdbBJ=!nZoJZ_IU6L| Z7%p5>T3>DUI|}Fo22WQ%mvv4FO#q#PKEeP1 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/sort_desc.png b/htdocs/theme/md_dev/img/sort_desc.png new file mode 100644 index 0000000000000000000000000000000000000000..db99fd9ad478bf432bb8491ed7e0e38dcb856030 GIT binary patch literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3I*a!(h>5R22vKmPx>XWnXXctzsk zHeT+-tEAq!F@5w`_}9nUd_>sOut&C|oZ(}=PKCU{=Sfd|7qCey{A)?OV69N5VtJ-v zmPBKP(yYW{$44oy3;~Oc1n##7u;-UBK25>H=O_M04RBHX%xziK^zLYxI2 zk;M!QTpvJ~(P@pz44@!Ox}&cn1H;CC?mvmFAVmQ_A+BrJu6_Uh{r~^}ojRP>0tJ~% zg8YL2|7W;zopr06x4mw*UYD literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/star.png b/htdocs/theme/md_dev/img/star.png new file mode 100644 index 0000000000000000000000000000000000000000..4b6b458467588e6c444e1d4e23a00622db915374 GIT binary patch literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CN!3-p8*3HQUQjEnx?oJHr&dIz4a=HS1LR=Y? z7?u@#EvWEVR^_#yD@+t3}brZ;8Ngt{%0%GOUy+%!FG z)6B4q^V7F3j^4STa{H3Z{R^u1&F|T}aO$2_IR{siA6(J6e@)@xRnzxxs6M&2bI+EX zLu(i8-(0wVN8yRhv-a;PJhyGixgB$^9a(q#^v+wS58XX`{O!Y=AD-Xqm6((Ra$-r4 zUoeBivm0q3PLj8~3quF1tOt<8S>O>_%)r3)0fZTy)|kuy3bL1Y`ns~;U||zB(ovrE z!WAeK@9E+g!g1ZT`?-*VfdHHTdsUbI7rGVyuOF67u77*3oc+UwbswBB-{(KqfBt-y zghp7f(KY|z`7Z0&4a9YYQqFH{`Pdt~-(E^lWlH>gle;FesmCQmy*WZ(8Px1K$J@Yt XH;ZjqbP0l+XkK(n6rf literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/stats.png b/htdocs/theme/md_dev/img/stats.png new file mode 100644 index 0000000000000000000000000000000000000000..d883f7faea9eb6f03f125190ed895c8bb4323553 GIT binary patch literal 640 zcmV-`0)PF9P)`-a9Agawu=Aypjm);F>LC+L zZQ|Dlj9-{!c4eM)@0jdRQzQnHmXxL#HYQo>;`be9uFavE0YA2T?5yuFIy1(>hZx=0 z{nCJ?^8zfa18oI!9$Jx-5oZnxt~nP5Aii zGe=*0s6gSY$9qp0g_ykj4VI2fXG3%HqL8wxh_||k7fj#KnjWLdEy?$sa3UlxGO|i@ zY?EPQth*a;x8Gfff~c-g2!h0d!{NnY_bnwB<8`HdwlPo+VCDSE86!mh5<60uwNGn1 a0KWjAyEVyp&ENC@0000zopr0QP${ga7~l literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/statut3.png b/htdocs/theme/md_dev/img/statut3.png new file mode 100644 index 0000000000000000000000000000000000000000..e75157966839a5a704853b3a48cd290183dae710 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=(3?#Lsx0HZ50X`wFi#IITe17x$cZdG}|G#(* z=Mtc}nx~6n2uC#QK}W^|3Oo!OzqB#feGdM=$|K?5-$%#No}8F^^}<4K8zp^4HQ|c0 Qc|aWup00i_>zopr06!fm5C8xG literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/statut4.png b/htdocs/theme/md_dev/img/statut4.png new file mode 100644 index 0000000000000000000000000000000000000000..6ec1ba559613fc19c80ae08681f3b47459cfd0bd GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=(3?#Lsx0C=W&H|6fVxatW1_r((jEapZn}LGt zC7!;n?AMqD#5J|w&0O6K6p}4*jVN)>&&^HED`9XhN=+ZM*w9RJYD@<);T3K0RSW4G*JKm literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/statut5.png b/htdocs/theme/md_dev/img/statut5.png new file mode 100644 index 0000000000000000000000000000000000000000..53264a0515d664babba63581e6735b811532a01a GIT binary patch literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=-3?y@QpIZW?I14-?i-GcMK$!78+c9^bAbW|Y zuPggCW&v?Eo-^D`>Odj30G|-ohK7d!|NlR~)(ce4z?kIi?!x$=N%tO*qvGk}7{YNq zIUylogZ%-4{SAutjSJr}I;%=BN;>ET2xuHVz`$@sfa~Xhjb;mg>KQy;{an^LB{Ts5 DpGYlI literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/statut6.png b/htdocs/theme/md_dev/img/statut6.png new file mode 100644 index 0000000000000000000000000000000000000000..b964afff603903135c2e897900f1dddf3ffaf779 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=(3?#Lsx0C=W&H|6fVxatW1_r((jEapZn}LGt zC7!;n?AMru1Vm-JCa$an3dxqZMwB?`=jNv7l`uFLr6!i7rYMwWmSiY|WTYy%d-?{v zPf^VS85rOb;+j4=ee?Ov|NsAABP*K>6l6^Dc6VV)< z>&kwOonJtJUuCsv3P@dmPl#(nL&N6toB#j+f2=ZI04T_qDmPbwu1ruY!d@`*#aku@+|TTShKOoF=Z-S^MzG>Z0ka~9lRL#9pRLD{&ET< PP%DF{tDnm{r-UW|UbZkg literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/statut8.png b/htdocs/theme/md_dev/img/statut8.png new file mode 100644 index 0000000000000000000000000000000000000000..c24d4a9dac21aa0a6e03b96185f94db180c2c128 GIT binary patch literal 78 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1SD^YpWXnZL_J*`LnOkJ6BLC09Pf4$4U89b aWMDYGDtYd|724)N1q`09elF{r5}E*La1$T^ literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/statut9.png b/htdocs/theme/md_dev/img/statut9.png new file mode 100644 index 0000000000000000000000000000000000000000..94b6dabf265571f7f830cc164413b84506526b67 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=(3?#Lsx0C=W#^NA%Cx&(BWL^R}oCO|{#X!Z^ z85sDEFe)~tYz7Llmw5WRvfpMF;bt>Fsd-fuC?s3r8d2h$pPQSSSHj?2l$uzQnxasi zS(2d;l98(5?&%xwK1DSTWMF_#i0kUrtDii1^8f$;IBQ2wpde$Cx4R2d8h1?!kR#;j p;uyklJvo7a>EZ=}MFs*44C`;P=ZZbw908PN@O1TaS?83{1OS%cI4b}E literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/stcomm-1.png b/htdocs/theme/md_dev/img/stcomm-1.png new file mode 100644 index 0000000000000000000000000000000000000000..df442fc1edaa803c7a3304408a2259aaa95ec7f4 GIT binary patch literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBkdGCVoy%{*dRnKq1Zo zkH}&M2Cfev%;>bnWCl=>CEd~2k%3`jKlh(RRv>?JfKP}k0|$qqqN1jRgrTCMB@k(9 zdI6E4VGs~mT1Ej;R8)3yao)~-Fbb?Y@C+PnAKv19ju=-j#IKy>Ze^LzK+ z-@Ety{rm6VzyAlK|Nqktrau5WkEtZcFZe&h)9nUcK;A@87sn8Z%dzJZxehDvv^{*s zApK}tU&QJb32m{Xzvt(aokNuVR+u5%JHsu3`yv9D}E;pUXO@geCy6 CDYCo( literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/stcomm-1_grayed.png b/htdocs/theme/md_dev/img/stcomm-1_grayed.png new file mode 100644 index 0000000000000000000000000000000000000000..5942e6c72af8bf19fd85fcf34071f869638ba036 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UAm`Z~Df*BafCZDwc@@9CtIEF}s z=bljHV^$Psedw#DJ@JH^>FQa9CA>ndD`yD%1U%;8>U_kdp|V_OgNg6tf6t!Q-u|Yp zCMUQ~-tuW&m%ru8B@#EP%Utv=9axvWklEYzKGITK3`mSt?j@iKcB8RalUSZvaTTffouetwJDeSqt(eFF=@BJ(= Up5mdKI;Vst0MM~f{Qv*} literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/stcomm0.png b/htdocs/theme/md_dev/img/stcomm0.png new file mode 100644 index 0000000000000000000000000000000000000000..cbe60a02d28bfe7c944b1bc0e2d778b89c23ff42 GIT binary patch literal 782 zcmV+p1M&QcP)x6?7L7fh1FJ)PW)s1W^$`8YtrMPBdFnrn7zIS95J;Vm6#Z zZCh?y&X0+To6|NG_vz-;rqfOL{dCS7jl#knIK1cL{Qu{Fe$VrgNEcL7lk8eUgY+Sj zIo^ZzE;@ZEx4QcMrHgc=)>cIlgYhY?yv`L7~Ae=>o? zQC;P7)sN6#GBmX8ve^#d^fUy1e+ZVAtia=`eC6e$JLkmR-Cu8ab$u!9@7K!IYE#JR z^g<*O16=s)cKblD-vNbU9V#oujJQxJoV_6s%#;ocER1Tk<|DiP5DB92t75Sj1OgGz z=^U`VeE=I9`%qIeprcaxDTIMQpm{tzyyA5_k79m*Fn;T=3WuX`auR~^@l|j*j=*gG z4!yn8zWjXN)0`Z30*-!HDqUH&T0Q8%A#85$gWc`{Y!;2i&^HWwdp;N&(*r((6R1>1 zC@vO^WM#G8B6W67UE%R2TT#3)j_&dJ!DQM6rP2UXQzk-WGPwzZt*w1nU*83-)&h-< z(u2&*mM6qBSS-Z@iDcRSd;CBkjHugy!%;#8JP6tWu_h*r2-FJDr|43zJ!pmsA zlFQd3BGF8wu5NIZLSdI?XSdxX{cjZ(c9E;9#5*M=ubGJQy^GHO0Ia+>n;mOIy#N3J M07*qoM6N<$g6xZQzW@LL literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/stcomm0_grayed.png b/htdocs/theme/md_dev/img/stcomm0_grayed.png new file mode 100644 index 0000000000000000000000000000000000000000..9016db48b027bb23d07b6217818abe89b3d982d1 GIT binary patch literal 456 zcmV;(0XP1MP)oFttJpC@u=iBrBKK+P-N+r)y7p$uum31kiU`9n@`DGes%iZWlD^%MG z*&n1Amqh3^`lE(N0bAVTD0L?&e{n^Ep}F>?-?NN;xcIHYf-WS@`e9YHsiXeX{Os^U z7Y?z5N!T!l)XQ)M3ryOkm*o#<0K2e~6i?;SQk%`Yk9EwT8-t8ySzyI9%*c5nJ)5YD8t=aib~t?rv>b4R@h~b8vde

    MMa)k3;hsbtW>BjQ)RB yTxi@{r?1ABel6;t*njA!W1wY}wmA5-(H$0000Hv7~}jkbV>q6+yQj6_Li!Od(S9)=Kk|p-GA+MUi0{Ewywuw=`>-mPv?A z=cT+&ZQdrj+*;<;nsYi^ThrVoHr-C&w@8QzpFhw0<2mO&oaZ?Nu}r0>^PSStst#vl z)EAQPsjF8jf|8P6u2>F7WMwrtFc`1Ba&j7rJc8f7Cu4LO^;Kz^Ox)v0)hnJO!_yU34 ztX6-=;-VE)QC*`kLMoj^L&G5A<4YM!z~bVr4P0(#OnG^4tw^MpQK_a$fCazHYPDj1 zei0JM1U`S(VR%@JdAp=jErcZQt3gFSu9qvFW~D}BkJm;pk^oq zEiFTcj^+n8)ax~liNUYxyD8?I;zFs;1`HQ zW4L|0O6TjF=}EXm5sp_Pc3n%SxfwF{J0SCb6YkUZf!|q%jvhH!tVZPKHjw6hKu^z@ z4cy(WKv7W#f`cEH5vTo#kO#Yo$r^Wi^rVJhyyhvI12^N5ryE|><%8V6O^H;hhD~T$b&&O0;^>a+SXTK(ws@-bZBlKB2DA{pwrpK z-rfwFm)G5uONVqm-cBs^b%G?&8M2$FV3<^3R@@9x*mm4Gu@z(%W+NjD1pxs$zNBQw z#U}^m4Vh$41Bk0+=y=e%TxUAG@=J9f~^0@eEGcvs`L_0uNL`?xiKnL;wH)07*qoM6N<$f>>Rj AIsgCw literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/stcomm1_grayed.png b/htdocs/theme/md_dev/img/stcomm1_grayed.png new file mode 100644 index 0000000000000000000000000000000000000000..367a55921e44767f726c115921a09a0df0be3cac GIT binary patch literal 472 zcmV;}0Vn>6P)NklHd z%}dh(0EhAK%%S^HkSSR-N|Tj{wFMy(OVp(zI-)e-`AR#XzQ7blxTFv>%2 zMlFBPq3GP7FbIT>(m}j*uo^*zK3ytm&-HVBq>@~FPMm33bZs~;AF-60S}RYVb7!x9 zn%oKCTDBYikf*GDcZb{a+P{$|M~-`R7Hb`Uxu>>!=+fKp);xJk@+>e#kb^NvlDDdF zT4VPGQX4k%_c8d;u;xd=`B{=Qki-hhYBe&B$y-1 zD{?$$m=tktvhR)dtE-|jnf#e&kto+0B}I&35=;}p`B@&xsJ?UPTOIW@5n_yX+6Xd1 zgmL<@zL3?|u-?TW_wmxq0F#U|#Umnw>8HG?szNsx2(e5OFZHCECCUSCb9T%4sF02l zCQ5>5m_%`qCeB^XZ`;>2ExV)!#+V__6IO_EoEdK5{9#*Chsq^M)rE@$2=bH+eh%aQ zy7#@MSBCzq+U09n_cK9;0LQj%tCkVf{J+q!`VJIMa*CSomIXOW5B~yH5bu#x@(m3D O0000zT|q{<*oW&l(yO+TPwVC!enXA$gvdSn2*x5Qo$5 zR#4Ekv9M5dl+<;#wX%uv@hQyB*Ue3YatC&7#T4`r?Y@2b2ywNFXG!bE1H{?pnGTq zZEZuie3{!26qK`-Dk|z&$7Z)@5qXQWbc@9XwfZYsTUF@jP`f~CwaG;=I%>w?;8#ec zW5~#;p9~Cqbb{J?iE_W1vM-g9wtY4;bv+)Xc_52<5d7{cbV<}GC}>4qo`9G)0EuMG z1@7t5pscJ5;ow>QV?_?Zji|c2qVOfz02fM5#1FrJ8UN zh(yDLpc`Rfc~&Yefs!?qtwrZ+52(6hVV}2P((o4Vs(0aTh7agHpp6?EGC?laLo6Nz zi}lWa{ygW?>C>6<)b)Fw7?32xq^*Nl--!7+Bbl9pylaqi*V{!v8`syTMMcF2M`Gd& zO+diI`+k0mUt^4Bc;d4>4c`qsm~}kNPLGh;FTp%s16H~>F>Vq<;Se#6w-6P@E)NJ` z`uY1mShKuHemC7@;#vh8`C{zj9Re1iUw9I%2iqLS;-Xcdp{&^8;G8Z0Kf4Q*`-b?n5oc1o wWQ=TIb%7 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/stcomm2_grayed.png b/htdocs/theme/md_dev/img/stcomm2_grayed.png new file mode 100644 index 0000000000000000000000000000000000000000..f667e3573d092f8114a72edaefe3dfd2bbb552c5 GIT binary patch literal 343 zcmV-d0jU0oP)^+<000SSjU=7xhF1sO@cu9Z zB!EUZ6}l_w&Dq#%fEJ*&VQguNzfS;2K!Xk2R*Fynkbn@f-r6Nq3xEV1`=TmB#bR>r z6F`Du?ylSD6jklwAxq(%M98Y}+uW{Xkgfgn!&U#ZgsPEDjD0sXQl0wdvWX-?14efA zPF$Eew(Xj+krt|oaHO^8#KMl5l@=*GQ}jAVvOR0JWYw0hsM4R8pH=;x2m33#&J|f0 pgqvmt4RHTa{dBOYl&cy%#002ovPDHLkV1fpsoX`LO literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/stcomm3.png b/htdocs/theme/md_dev/img/stcomm3.png new file mode 100644 index 0000000000000000000000000000000000000000..5a6c0aeface51c0bd908a4aeadfc2df1345bc274 GIT binary patch literal 832 zcmV-G1Hb%D0XBCc3%(d*4?aM1>DLoae*&|IYtB=R5>)MsT?u&Y78Q z_XUEkDym*fO>K!tPHsAPmX65J?{?(#Klv9G^}K6uS7^t_7p)x~3Q&;xq@?#w{}hSE z{dT3LeHY8hq&`&rp`~SNZE0x-2L~n?jV4S^Y9SK!84?oeZu}*#to(YVqTh%UFm8Mp*tsQZbNQUE^o5w%OWSZUOP@7iG%MI_@l^&OkqkX-ZI$oobh}og@yK@SX_(Cx?C+b<)%6W4 zE4$EWexka1&=4IhdKnfbw4<$iw6)2nwAyWI!w%-=HnF_C4H{;#SgF;FjST}jJC&gK z&<^_gREUd{w1^y)9I0W8}vV*8>dp~A(yXUaBv<%;b&7!jCeLENRU9d zUWcE2OK_83+yIs5!_`W#FFJ z2h=S5ijA$3hKCmgQfm80U=oTSXA;8wMl<-zl()8XO5_|VY8 zOaC9c$Apu^3x_DTH*Qm&Z$05%>5XfzZytC&dnERYeC2i4)cyuFEIHWKO>&_C0000< KMNUMnLSTXP)D+01e=_&kcHg@+e%)_h$S7Hn?zQyAa>3xuC%v!?_;1pP0?YW7r&_;gAl* z7It6L0BvSYisx?*rjz`lgbxkS86-NroudSj|1vRoF%n^wHIkU<=-3=%XzOR}cX-P8 z)lp5>DAUUb{UnHyrA?fk8(ac)@ba*gz(rvY#N{k8!bE6rImry7PL_X`8u$s&p@K&c zKYlv2NCl&_3@K-S=i}CK4<|S%{D9!`8x0#7C#{yc-S^)sCUL5O2Xy$s3Kk#strwI9 z{#yD-d}@LX_UKaM8*fqGKd=7Ged@LZz^Kb&R{ChuVUIG0E8){Z^mM4Q#ijrR8tt4p zst_vOPvzSBx4>Kz>l?!&lHjBU&{0Ac`+y#DE`-V`>nhq(TtI(t=tP zDK-Ysf&yL?S`~~%i?$$IAXF&ULMf%8m!ZAwUEY@9&rISvIobQ;thLwP=Ny9g4RUho z7G`BB<3yr{+id+x}a7Y{3L^6*e}r6 zXGM3n1scsaWM?Z!ckH;f#oxy198vr=`Tb$iKtg3u!E86PebemJ2T@Q+;$kj|yt`UR z9(JPo=@+!M8Btc&iln5Ql>~8|_>&`?QxRD5$0VJT3jh?Wd+*6=ihJ=gn*FFt(;3IYm@Q9_5#tGXmF}ING#_=ByUBS@HV4Fn3e59_(3(Zb5~J+e7q=)2oMEKrRY*%ow94XgX+Lb$4kU?#enyohj3XGqEAV%B;SQcU4Y2} zY_9+!3V;Qt`zMH?th8x?49*2^1((|2vmeTFB@+4)5T*>rCgEPszSPprkVEh6o5U2V zKLh8V15uZ32#irQ5ybh(>9>4{2noy#ybzinYL1o1VySo;wfgL4N5WyDh@JA<;MlUH wu&s|ju0N{suG-f~bJxk#bAm3do%sqs0T_i{@G(cP5C8xG07*qoM6N<$f~N4oEdT%j literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/stcomm4_grayed.png b/htdocs/theme/md_dev/img/stcomm4_grayed.png new file mode 100644 index 0000000000000000000000000000000000000000..4271aafb6ceaa0e364ba20610e20bfe1aeaf5699 GIT binary patch literal 488 zcmVP)NG$#F1DUfuco>qBT3k zeUR7Oy<6tZ!dNbqMF0^YO_CHyTsiQhvm{EV+?VCyLxzI@KoL-(7uZVHm(*uHT-9oU zw$38UwAmw|LxduvU|ARG76Y4Je(-d!F7T+ZLL8qKE+O!*yZJ%XRYG_Z(%K|LkqzE5 zgJKmQgV1b9$>Fuzar-|3DbCY{U>y&|Hboqw8=CX<*z{33#21zcahc;FimAsV>X~Cd2eu~91Z!F7k?;6nB=Ri e^niDa0PF)~9hO)a?_`+(0000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipiA z5jqg5-Ax_<00d-7L_t(Y$F-JCY*bYg$A9PE``*lSI@phCr?iNC#nK9t1x5maQdb1y zPNNWGL|7T43wOo^LBq}%)-KqaxX>84D4M8P1tqo;k+cfb3PtS4y!&R}eb>cI%k%>R ziYIx=z4x7S?)jf{?m0*H?j1Z>EEZp@R;%42;%Ff6J@-QQ!sorgz@`G~gS)h5JNAX2&j%A2&Tc-N$zB-1(?;?vBPZo{PZzRzw>9d2X}K zFQj2FSZf&?8ltmQ+A=dejrSfAS#npS{GFX9BINUV6gp$Ny1J^xVmsDaKo*pGp8|r% z*G-YTD4z$gn8*9uphX~xEG|u%o14Qg_UgZid>qG!NN8GHTjNrxgtc~=LZuWYFoV;|?bK%DeOioR)dUZG3whj;&$1fLuWoqgsE=_PQW!dgmqMCyR)7IXWbgk~DTrN|8 zE||bzqghV9e~Pko^lskB58n-Q{g0a*K5~#xKKhtzlYi6Oy8&x0`Q`${U!7-ce3HK2 zjYM%wn90-C(^F4Nk5WSRRukp9GRBzu_WVi|7=wty#m`t zb8~*N{odEpM?E+Y^KU|H?O5S)ZQrqjGpE1ch@yzpIVzRvGQCPYxJU#hs8vv{b+S@@Xv!CO^^Mp0?DT1_ zT$^Cm;FApQ8$^q+duSh-LMw4JhfBbxFt~3IL2eb+TAZtOT%V@P^oj^!7%r@rw#UX6 zdDnCAF(#N#PqWZ?8d;OXk-XhnOBXr??M}qoDGB2l;BCf=d85{fU%^=9eK^WxlDgPIV zK$@hCjQ%X;$VyW-D{1O$lMNsZ1E6mh00n&;fuwbw+IVDbB^ntSJ@yZNhzfv5NXKCS O0000Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipiA z5j!x8s9cu-00c})L_t(Y$E}u2Y*j@V$A8~9bI!T1UP@bP3K$|u1I8#+gAWLMOmLwq z7sjm%Ltuk=MN#;NQ|M&RM$oTm9@SZ(;j-_dOPmD1a5jHXmaO&gaFBe8WoP7DAR{E!U zNn#BDf+yY0%irZSR?Tm@&4>gq?Y^t~ho5{=CMG6MjEs!D)ND2}Gd383IwBA5llK)q7RGBU}!5nj{!8u0=VN)6DszJr!)09$HCMD~s38SFRmTV{2=B9bT zKf`1DpGL*=&Gg4iwBBN{KFra9SGhQUhRg00JL_ZY8+w+r@dQ@5wRj=~0iPx2%?wq= zIrl#ZF(iWbj#8yU8q35UArg&xI>;{nC`U$*bH4E&tvJV#2cIXKgrD7M#zqe^I(vXO zubiiEsLsBTgPi@*C{--fz``Sx{6l`8eh5Eg~6TPNAO z{V2usB6-oGuU4b20cU>Ic|uerq)A7f_lk-8N8i4qgeVA#7e|sN_?WK4R19ZAL;m2d z)&b7ncpuXS_gBYQ8oW;K7s#~6Y;l#zeT+5@OgjNk)ti`|(lT@6nW5yp%XM{|u+fUlYm-6gTJ`g`~-B**>^3A&Umae>BR=>r1 z-9;75u$VOb)YR0whz<`843t9*VWSxl6%%tdId!2nQ~PyCy5Q41mx!3$vX`(fKf}5# qWexkD7wP%~BZA~hX+F@}G5$9kaK7(InJlgV0000mVOY89ijj9SOZ4hUlg}F+TAuy;ch=2$kA#1nm0Vr9%zks5-t<7fA{l!!<`NxM-vaf zKCZCYPIPVpMHPtzd2*+!!@S6 zU1LsU9)EM@^xN|d*84UC&15VI@(X5gcy=QV$no@aaSY+OUVH8$SAzmi>%+jG=YvGF zKK{MGMLJRV(B0ZM1r|!(uP2MFmp#vO@yZ8(*_0Ze_gie7VgxprH(&u6{1-oD!M=W5hb53#(jnf%LRYAImoVy$=K)qi~X=i zo_YW9`uuju?b_WIY&h%{yn-nRJ(AiZ!5*21`Vw*yIcm`!A)lFv688eu! zGo4?P8K!PAbc1Ia7JgR^(=^Og)3R!={_j8Z1*!zj`WFPpKfn?L1Citz(xqJ*JGmI|&8uyW&4;EVuRS;#_3Vs&9Zg=S*?Z1epWgh1uXT@m`|(FV zT*!U;rKh3ySh@6FtrV$vd(i*b*LHV9-Qa_3owu(Pl@7TN4i+u76pmG=pZ!(8{Kkog zHIZ9l|Ft}E1~S)U$#)Na|JzSTZ_fLJTXUn8;cu!AH}AMHHaB^D{H@%&2uMaV-LsV) zj$^*5uAi^$Z>?Jjggg5E-lnsmjUChu^7W6?3nwlXbgpEZPOtnrJn{L`9jD~7HB8yumCo2ia{c1AwI$8rbX)7j zcyGAy#b|e2+`A~uJpYQgQsJ%|DD$0etV^!7ZJ&(YTkj3mrV6Xyx#e+f@n(n47R+64 zE`9j)mm{bAi|LfjUi9O>m&JHf>io`>y+!o6Lm}72+WtHCH^E@1*bu9kUK9VbF6XNL zV`S?(TlqqG+&%L&R2-b04hiC;4evL7)LyejC~oha%M^S#l`0#3J+L$h4m9oy3Brzl E0f6{pyZ`_I literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/title.png b/htdocs/theme/md_dev/img/title.png new file mode 100644 index 0000000000000000000000000000000000000000..bb48d617379cfd5d92909464a4571e9b987649d7 GIT binary patch literal 1607 zcmV-N2Dtf&P)hVDXBA!i{oS8mx&%XU%*Iz0+4rm9B31k8YF-Uf`cKs~?;z1*m z$ERmZn)-5LVrs(E5duDeHyheJ-d?=nt7g5iDKkAOQ^+TXtgNi}ZvA}h(nAG+94>ch zc242D)6)|<7zQy800pLQpKpY(TOiV&*%DfpFQ^Ld4N-oBVF&-l< z3=#yv;}Haob1^OwbWoJtX13UE<0ic^>FU{oCm$GqgYz+QP(uN6h>Z#l z36jeg&oHFS0Py)do=7MZ@zH@Izyu$#g~K2?NSoDazFe)Te|Zo5fOtz)k@?Q<18!8I4O}xq!Ni(f?Vb~MbTjBjG_-bZS-fiSb?+kr>Wg&wph%szq4>=Md|*MUI8MLW-XmKE+I}NH(@Y;1UI`jiP~!=08M0E0(NeQjLI=!qhM zfWQeZ9vl?hFSuX-P^nZZcRpfhP~i5sThKcKzCgZxB+7-pRj1u|`1Ik;D?gY|Q+C=n z1+snvC(Ky1dQ^POFr*!db8+0`Ei(`+?iT8vX#UZFF1vS~jSMO#Q=7iJroL|3itNSO z%A=><0NCug@6Ud5LdHBzi{nW}&_KZBa#(tAkDy1`WrN+(@E7-nGFvIoVWEJb(*|1F zY;megdqw6R%(XDn0SnLk=9`+X3nY5GE!h*b<)}}j^cQ5W< z&j9e0O4ZD~q7&I@@(Hfg-UXB}1US&0H0{g~tLqZ>F!;2gr_s#_{o2kkn0mX>*nGI) z;CJn}E*x~vfsmB67qYU~ZhEz@t`;bBuGX80mq^%J+e33 z4S+HSMtqjNZtIw_sZU&~)&Mgv%=4@=k)T;+=qpC|6~uX8h=LE)aslY*?6Q5Izq_ex4>-6YpYQ>%i1e`c3gVoIVJaa|N(G=*Z?qI0*#6_u z1KV=ijjgB9C5`?|asQ;TX)8Zpvte3!RW0bi!#w%z3DVQdWo1al@l)wIpy5Qs2P=@S1QvQ-c<7pq2>$ zPT=6K_BT`UzKthN7Jj?SX0=>!2~+pmjCeA+Vp?uN$r`P$MPz^>K2h)vxpzeP1Q!Gd z3D98$;C92Ewx0?%A1gbtKZhboMwnT89S^b{2aZWjU9oJ%syC~DH9(S3A|=MlZg1Vf zB0d+OJp$-V6wqii`twCwj#ivKvlUK7nVCzJO;Rz=JQ~#V7DA9()9= zAil{uTdU9%3eLbDe!iXg#=W^Op!4O~5)c*C(%?Se6pRjnKpT0CF=3R%kyJVu93-4( z8K=y7S&#E#GGeY~)nqztnkFB&^VZI5+gLvYh<< zy+A3d2wN3|k{A6Hw0nm{BPh}YfUCvv=hKytBicbTL1RhLsJn-SXLyIUqN9W=+_sMu3t)Zyf?aKU>74o86?p2dpuAP5n^r52ZgZ+6QMLrCWUie^N^> literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/tmenu2.jpg b/htdocs/theme/md_dev/img/tmenu2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b8f434c6d1f1fcc6ef65415ad336b2efee8f786a GIT binary patch literal 569 zcmb7=zfJ-{5XNVA*}FAdxEVMPf^Y|fMhkdj`Frj=@^+ex~OBu(-V6szy~C2LDb#8L9^a<{-1 zwn1y`fMV2)?jEXwiU{+im7hN#=-+)nrQI_G(pIDi0LR0dhvVzv!C*HNM@)-J3@tHO z$w#A(PDK;(LgqxF5i?Bx5U81e7881t8D6Hs9GsTGiAPh8tbMm`9ZdHCEt}Klt8~Q4 zOHO3^cIJGv**_Ci%*$*3h;l~Sx)9A8fkHF?slX$o!R5z{gU08r-qp#*;hTH<0$aRR AT>t<8 literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/tmenu3.jpg b/htdocs/theme/md_dev/img/tmenu3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d42f804b026fdd4d6a1402c4be09b78232d06fe3 GIT binary patch literal 571 zcmaivy-Gtt5QWd|=7xwuX8eUHYJ3Dsn?(Wv#U=>$K7xO>q_WV)$~s6Mz`|M(3tJ1p z9|Rx3B8dGubMYGYB4oDM-Qk-v=ftP@4&H2Uv_a&spa=04E&Yuy=X6FfSJd$3OyrM3 zf))74JKjQSScLbq0w?5!;vHtq9Foe$v_D7iY2R0}YJ9*MfX*Kjs} ziOiHtDqhnrW$v=yP-;d>3|Ml;69qa^Vp>uWfO9}22MPvo8Cd?=QVnkDe<#xE7EVI* ztku8KUmgQq9do^IV^Ypbymy|DnK`~XRj47FCEZW5-t7%?&OGw|#hS^@GpJ(f!yltFvuTd2qPaKpRk~?ny9Fn zzp1XNKgr<#AqGJX1`P&gW=16jCP7AKLB{__7{q{1Wn@4BOe{cgaiAzOiZBBs6Z8LD z3_Q$?3`_#d0t^g{ceZX`Dx3gREFyqr1cL%lB?r(5Mph>VAeI1KVXvrUupj1lu)hROA0Xr~0YVM~D-Z?RiyBS>f-uk9 K3%JPtzX<^N4_tHr literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/unlock.png b/htdocs/theme/md_dev/img/unlock.png new file mode 100644 index 0000000000000000000000000000000000000000..afefaa94d47dbe2e173bbcb9d464e02dd2bfc771 GIT binary patch literal 686 zcmV;f0#W^mP)Olo!!}OW@h)zdp|!P)sG@X1m~PTGv-6!D^nC_25~G} zYw|4Hx_9^P?eAAselo^njYfl|r6n}VLn+X{f7UORJ~`}m&unjRr%(6y2cGBIh0B*O zy|ujj^Z{{(mfpf`S9M=7bE2&!|*vy}Cz`?wKDu%B!twi`e;xSRKb2c6VH6d4o|ge1u=>4) z_DNGe_xfw~!mT}M@4j43y^oe_7e71Sb(OSps^?B#Z#Eys8*9I8L{YQ@SO8srCHS_! zaB1<4^IAT>9^#Tjm81V~2cbN?e@nLx{FnZn5Xa%PZ;S~63!uG9>7Afnt5WrGlK@3d zG0F&woPn7U0kfL_e4y1lPyc);d@|ncK zIDz8~Dk=CzsnB@QPG+}&91sA#`bTo7@fY_M@`5-72O=N>2#A2i7E_@M3;_WC2fUM9 Unei{ZxBvhE07*qoM6N<$g5&^0kpKVy literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/uparrow.png b/htdocs/theme/md_dev/img/uparrow.png new file mode 100644 index 0000000000000000000000000000000000000000..5d54c6a4c91bb97934aa53b8116985016417559b GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4%JB>7u;-UBK25>H=O_G{d%e5PjlE8a~33UL;A zL>4nJaD4z_MyE95jgR3=A9lx&I`xf)oY#gt)Fa5vj}T*ADJ(?6DY)4 z;1OBOz`!j8!i<;h*8KqrvZOouIx;Y9?C1WI$O`0N3h)VW1=1WG90CFYii(<=nub7N zX=&-?N!BLbm^R>Tj#9ZJLg=` zoO4l2w;tOH0(-X}ySMdP_SSoI_5#7NV|$OC+k5QV-edRnp4+?k+LXQ5=IjOXfZ*J7 zpxCkJQ_h`xe(u__bJxzDyLRu~wdd#V9Xki4?>)ZgU?7)rz>qo3rEa-RUoUAnsv0J=i2VOQ{mj0bpH12u6UF!GDm<=FX%Kzx^dq8DplQ0Hm*nEL z>J1K4wPkX=boD2F**Lqj>UGe$?xV(Ea%*3-eg8G%{-Q0@ZJ?*AZsuVbQ08H0UKgYv=Is~~8eS6RUL5U{kdTm`p6;F8GqNhM_28=yJO$U?T4@JIdXBwk()bDJ==Zy+1}Gn_MLgY@9gt~ zOQ&33+Vkl2+9$`hK0dSI@!1WJ&jZn>>ldyZJpbb0g%?LJy*hUJ^|33jPhNX-`udx* zH(s5&`S$#+cjs@vyL9LMrMvI1+iO#Adu zxZ!*2_Q!kb=HLGLIcb5=MSbS2Ya@l({Fx#&epbijN4)rWW257Q!K2W6f%frX}wAomjn>{@%gqW*c zsd{P7AIX|Y{rvMUQz0@Zn(M7qqYbGMx3DV36tdJE2PRwJL8 zA@-04hBuko%=J;23&WDp!Wh9?sF6*ScDjgtg8@NXlN)udaF8`DG^d3UQbN)v)o1WE zx0Q4dikfY$Emjsn#IlbNFa=@gM8lFX7NdZ~Lj;Bt+x9%$t-FSE#6^MusZEV_CzmUh z9L6H1K-t%fC-6(Uv$vF=ZeNts@_41?%-F9w!``p#+vOhxym|7`-O9(S s3k!QU4j!%#7JHW~-~O4-;hz^7@q6dY@ekS8OX(w`w%VwU-RqD40~M+QAOHXW literal 0 HcmV?d00001 diff --git a/htdocs/theme/md_dev/img/working.gif b/htdocs/theme/md_dev/img/working.gif new file mode 100644 index 0000000000000000000000000000000000000000..1e421c3113fbe4f3ddc96bb743cecc8530fd4c21 GIT binary patch literal 2483 zcmeH|@oyVv8ONXZeece1&S&?vbM3s$lyl~-*J8@i1mUio^x92YZ_6TgOKH&h!?{#d z3kbPTXg~tqa~zVewRml!B@m%YP}VMOB}dv1o4Oy)skT*xv4DgW2~`}UAec~b)d@1G zES%e4x@vy`+Iv5obUK|r&*%9*&+U0)cXoRz3Q_nEgSEA_8#iuTyLRo;rArG73)9on zV`F0{PMkP=`0&1c`+9nMy1KeLJ3C{s7{nkr!TYV-r{_}x{}%>QYvKOhfoFH+ioM&m zS_B0}r9PD85HQHJ3T%xD(B~n=ff)c2)iAr#G%!Ru5}H@G1zw|8%@lJUgfv=Qwi}g- zv}xn&OU8A9+IQfo?Y85L;I{X=YcTuv%x2R3=F$4W+yp2_LbT__sqNuRvAOMKabAir zus!eBFG2mc+IbELBTAP)T;$HH(#*Dt=eqtOoGw|BKF$}p!*?7~R8ROGqDX=SZ5UM< z$4usxeXK|yeP+v^~RH8i^RXX*4~kuK#NMP{9{ydi{>htmrz+k+KD^nl+9k zX8uTP9-HmMvZ)rIeD#qkBJf7li-B|Dxijj2pLnsvKMoRwNFeI_0Z4Mt1L4qA!h%!- zLntosq2&gQ5~aUd6#TMGSw7eVZQD>w3x&J`a%f8$ zP!3atnZb8+mq#NSFBCX{Ory!7y$BURYI-@#g-7C>-b$XkY3DF`R6XQ%H2}*>S~q!a zSWzX#KF0)1AcKO6X7^Pdnt$?#3+=|$g#=Sg3_*p><&eIXPdk&ZY-81Of7{ zj!5wf8hge-rz2n4x*9?a9L%GCd(XEUPfa4-oVvni`zP0*`QFY4*(WLZK}$ix2o&IO zo*9M^C=_|@z)DR(m8n~j+%ENugSjEgjr3cNytN}e#tu3TbZnHkC!AAE$?$U7Lz9Tz z{^RCmsw!zJ(7Go;j<95*2Kjg9NSj%No7eY3Sm#-<{c8~HFI%Jc;-Fx+v}D}rNWu^t zk#;phOJZphN!0p#)6EY{s!;{ub0jI9w#S{NQ^ATXE{ojo$#Ce+PcXRHnRg%&yG0#kpm>@AsY!hwkkN1Rc2xajfMeYw=)EF*Rt; zYdAE(Ei(M(2-0sqYYBJh6eetSRJ_MW@w&|5>vdNkBBgD}q02w9o{JWXqV(=4`LXgi z#2ruC8P+Y;;a41@C7FFDB}fP-t@l6p+b;b0)9PInZTI~M?krly-NrB`X)fw1iL6m5 zn{|*BO-g1ca7@E7y{}OFOD}zR@5|k;(b!W((vh8YJ6D-tk6zWYH~*T$+vN`1DD(c4 kB%|)E-2#k@pI5Dp7f_WB5Ce@CU|?W2 z=Gb-TpTQ~5Y~f@MD-Ovy?0z%SI9)dy9@-@`^WZkUgd>LvFX%=~Sl(U6ZYjaT?v?%A z1857TIVK=;{CX4>q+57)Z+O<_Qs@*Il3*yQkl^DQEw!RXW^3vFw}}$$4GPyK9<@13 zZcWjMbhu1r&HpL)deyixXx_eD|2jxHdEwV z@jr~shxv_Grbx}-&w|Y;px=^IwNDwfO?)#aEWWjS8E2~^4~wBod!mfsDz~N$7v-6g zf?_}0${SedNcEpsQe^3a)o(@|yNcAcy`HCte31C;)5xP%b~qs>DP&4(%TBqBNGHwn zryK;B^?n{z^AXEDCJRah`Jq2q4ioVzB|S{>bv z8i-6tn7xgWm*tRyz-+^YL)Xqt#BB^P=2xdWU74eKU5 + * Copyright (C) 2006 Rodolphe Quiedeville + * Copyright (C) 2007-2012 Regis Houssin + * Copyright (C) 2011 Philippe Grand + * Copyright (C) 2012 Juanjo Menent + * + * 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 + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/theme/eldy/style.css.php + * \brief File for CSS style sheet Eldy + */ + +//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled because need to load personalized language +//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled to increase speed. Language code is found on url. +if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1'); +//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled because need to do translations +if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1); +if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1); +if (! defined('NOLOGIN')) define('NOLOGIN',1); // File must be accessed by logon page so without login +if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); +if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1); +if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1'); + +session_cache_limiter(FALSE); + +require_once '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + +// Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined) +if (empty($user->id) && ! empty($_SESSION['dol_login'])) $user->fetch('',$_SESSION['dol_login']); + + +// Define css type +header('Content-type: text/css'); +// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. +if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate'); +else header('Cache-Control: no-cache'); + +// On the fly GZIP compression for all pages (if browser support it). Must set the bit 3 of constant to 1. +if (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x04)) { ob_start("ob_gzhandler"); } + +if (GETPOST('lang')) $langs->setDefaultLang(GETPOST('lang')); // If language was forced on URL +if (GETPOST('theme')) $conf->theme=GETPOST('theme'); // If theme was forced on URL +$langs->load("main",0,1); +$right=($langs->trans("DIRECTION")=='rtl'?'left':'right'); +$left=($langs->trans("DIRECTION")=='rtl'?'right':'left'); + +$path=''; // This value may be used in future for external module to overwrite theme +$theme='eldy'; // Value of theme +if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; } + +// Define image path files and other constants +$fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif'; +$img_head=''; +$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); +$dol_hide_topmenu=$conf->dol_hide_topmenu; +$dol_hide_leftmenu=$conf->dol_hide_leftmenu; +$dol_optimize_smallscreen=$conf->dol_optimize_smallscreen; +$dol_no_mouse_hover=$conf->dol_no_mouse_hover; +$dol_use_jmobile=$conf->dol_use_jmobile; + + +// Define reference colors +// Example: Light grey: $colred=235;$colgreen=235;$colblue=235; +// Example: Pink: $colred=230;$colgreen=210;$colblue=230; +// Example: Green: $colred=210;$colgreen=230;$colblue=210; +// Example: Ocean: $colred=220;$colgreen=220;$colblue=240; +//$conf->global->THEME_ELDY_ENABLE_PERSONALIZED=0; +//$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0; +//var_dump($user->conf->THEME_ELDY_RGB); +$colred =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,0,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,0,2))); +$colgreen=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,2,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,2,2))); +$colblue =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_RGB)?235:hexdec(substr($conf->global->THEME_ELDY_RGB,4,2))):(empty($user->conf->THEME_ELDY_RGB)?235:hexdec(substr($user->conf->THEME_ELDY_RGB,4,2))); + +// Colors +$isred=max(0,(2*$colred-$colgreen-$colblue)/2); // 0 - 255 +$isgreen=max(0,(2*$colgreen-$colred-$colblue)/2); // 0 - 255 +$isblue=max(0,(2*$colblue-$colred-$colgreen)/2); // 0 - 255 +$colorbackhmenu1=($colred-3).','.($colgreen-3).','.($colblue-3); // topmenu +$colorbackhmenu2=($colred+5).','.($colgreen+5).','.($colblue+5); +$colorbackvmenu1=($colred+15).','.($colgreen+16).','.($colblue+17); // vmenu +$colorbackvmenu1b=($colred+5).','.($colgreen+6).','.($colblue+7); // vmenu (not menu) +$colorbackvmenu2=($colred-15).','.($colgreen-15).','.($colblue-15); +$colorbacktitle1=($colred-5).','.($colgreen-5).','.($colblue-5); // title of array +$colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15); +$colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17); // card +$colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15); +$colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15); +$colorbacklineimpair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line impair +$colorbacklineimpair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line impair +$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair +$colorbacklinepair1='255,255,255'; // line pair +$colorbacklinepair2='255,255,255'; // line pair +$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line pair +$colorbackbody='#f0f0f0'; +$colortext='40,40,40'; +$fontsize='12'; +$fontsizesmaller='11'; + +// Eldy colors +if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) +{ + //$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474f')); // topmenu #607D8B + $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#607D8B')); // topmenu #607D8B + //$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('000')); // topmenu #607D8B + $conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236'; + $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu + $conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232'; // vmenu (not menu) + $conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240'; + $conf->global->THEME_ELDY_BACKTITLE1=join(',',colorStringToArray('607D8B')); // title of arrays + $conf->global->THEME_ELDY_BACKTITLE2='230,230,230'; + $conf->global->THEME_ELDY_BACKTABCARD2='255,255,255'; // card + $conf->global->THEME_ELDY_BACKTABCARD1='234,234,234'; + $conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234'; + $conf->global->THEME_ELDY_BACKBODY='#f0f0f0;'; + $conf->global->THEME_ELDY_LINEPAIR1='242,242,242'; + $conf->global->THEME_ELDY_LINEPAIR2='248,248,248'; + $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252'; + $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255'; + $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255'; + $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252'; + $conf->global->THEME_ELDY_TEXT='50,50,130'; + if ($dol_use_jmobile) + { + $conf->global->THEME_ELDY_BACKTABCARD1='245,245,245'; // topmenu + $conf->global->THEME_ELDY_BACKTABCARD2='245,245,245'; + $conf->global->THEME_ELDY_BACKTABACTIVE='245,245,245'; + } +} + +$colorbackhmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1); +$colorbackhmenu2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK2)?$colorbackhmenu2:$conf->global->THEME_ELDY_TOPMENU_BACK2) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK2)?$colorbackhmenu2:$user->conf->THEME_ELDY_TOPMENU_BACK2); +$colorbackvmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1) :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1); +$colorbackvmenu1b =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1b)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1b) :(empty($user->conf->THEME_ELDY_VERMENU_BACK1b)?$colorbackvmenu1b:$user->conf->THEME_ELDY_VERMENU_BACK1b); +$colorbackvmenu2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK2)?$colorbackvmenu2:$conf->global->THEME_ELDY_VERMENU_BACK2) :(empty($user->conf->THEME_ELDY_VERMENU_BACK2)?$colorbackvmenu2:$user->conf->THEME_ELDY_VERMENU_BACK2); +$colorbacktitle1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE1) ?$colorbacktitle1:$conf->global->THEME_ELDY_BACKTITLE1) :(empty($user->conf->THEME_ELDY_BACKTITLE1)?$colorbacktitle1:$user->conf->THEME_ELDY_BACKTITLE1); +$colorbacktitle2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTITLE2) ?$colorbacktitle2:$conf->global->THEME_ELDY_BACKTITLE2) :(empty($user->conf->THEME_ELDY_BACKTITLE2)?$colorbacktitle2:$user->conf->THEME_ELDY_BACKTITLE2); +$colorbacktabcard1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD1) ?$colorbacktabcard1:$conf->global->THEME_ELDY_BACKTABCARD1) :(empty($user->conf->THEME_ELDY_BACKTABCARD1)?$colorbacktabcard1:$user->conf->THEME_ELDY_BACKTABCARD1); +$colorbacktabcard2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABCARD2) ?$colorbacktabcard2:$conf->global->THEME_ELDY_BACKTABCARD2) :(empty($user->conf->THEME_ELDY_BACKTABCARD2)?$colorbacktabcard2:$user->conf->THEME_ELDY_BACKTABCARD2); +$colorbacktabactive =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$conf->global->THEME_ELDY_BACKTABACTIVE):(empty($user->conf->THEME_ELDY_BACKTABACTIVE)?$colorbacktabactive:$user->conf->THEME_ELDY_BACKTABACTIVE); +$colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR1) ?$colorbacklineimpair1:$conf->global->THEME_ELDY_LINEIMPAIR1):(empty($user->conf->THEME_ELDY_LINEIMPAIR1)?$colorbacklineimpair1:$user->conf->THEME_ELDY_LINEIMPAIR1); +$colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2) ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2); +$colorbacklineimpairhover=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIRHOVER) ?$colorbacklineimpairhover:$conf->global->THEME_ELDY_LINEIMPAIRHOVER):(empty($user->conf->THEME_ELDY_LINEIMPAIRHOVER)?$colorbacklineimpairhover:$user->conf->THEME_ELDY_LINEIMPAIRHOVER); +$colorbacklinepair1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1) ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1) :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1); +$colorbacklinepair2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2) ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2) :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2); +$colorbacklinepairhover =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIRHOVER) ?$colorbacklinepairhover:$conf->global->THEME_ELDY_LINEPAIRHOVER) :(empty($user->conf->THEME_ELDY_LINEPAIRHOVER)?$colorbacklinepairhover:$user->conf->THEME_ELDY_LINEPAIRHOVER); +$colorbackbody =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY) ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY) :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY); +$colortext =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXT) ?$colortext:$conf->global->THEME_ELDY_TEXT) :(empty($user->conf->THEME_ELDY_TEXT)?$colortext:$user->conf->THEME_ELDY_TEXT); +$fontsize =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1) :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1); +$fontsizesmaller =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2) :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2); +// No hover by default, we keep only if we set var THEME_ELDY_USE_HOVER +if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->THEME_ELDY_USE_HOVER)) + || (empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($conf->global->THEME_ELDY_USE_HOVER))) +{ + $colorbacklineimpairhover=''; + $colorbacklinepairhover=''; +} + +// Format color value to match expected format (may be 'FFFFFF' or '255,255,255') +$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1)); +$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2)); + +// Format color value to match expected format (may be 'FFFFFF' or '255,255,255') +$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1)); +$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2)); + +// Set text color to black or white +$tmppart=explode(',',$colorbackhmenu1); +$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); +if ($tmpval <= 360) $colortextbackhmenu='FFF'; +else $colortextbackhmenu='111'; +$tmppart=explode(',',$colorbackvmenu1); +$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); +if ($tmpval <= 360) { $colortextbackvmenu='FFF'; } +else { $colortextbackvmenu='111'; } +$tmppart=explode(',',$colorbacktitle1); +$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); +if ($tmpval <= 360) { $colortexttitle='FFF'; $colorshadowtitle='888'; } +else { $colortexttitle='111'; $colorshadowtitle='FFF'; } +$tmppart=explode(',',$colorbacktabcard1); +$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); +if ($tmpval <= 340) { $colortextbacktab='FFF'; } +else { $colortextbacktab='111'; } + + +$usecss3=true; +if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false; +elseif ($conf->browser->name == 'iceweasel') $usecss3=false; +elseif ($conf->browser->name == 'epiphany') $usecss3=false; + +print '/*'."\n"; +print 'colred='.$colred.' colgreen='.$colgreen.' colblue='.$colblue."\n"; +print 'isred='.$isred.' isgreen='.$isgreen.' isblue='.$isblue."\n"; +print 'colorbacklineimpair1='.$colorbacklineimpair1."\n"; +print 'colorbacklineimpair2='.$colorbacklineimpair2."\n"; +print 'colorbacklineimpairhover='.$colorbacklineimpairhover."\n"; +print 'colorbacklinepair1='.$colorbacklinepair1."\n"; +print 'colorbacklinepair2='.$colorbacklinepair2."\n"; +print 'colorbacklinepairhover='.$colorbacklinepairhover."\n"; +print 'usecss3='.$usecss3."\n"; +print 'dol_hide_topmenu='.$dol_hide_topmenu."\n"; +print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n"; +print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n"; +print 'dol_no_mouse_hover='.$dol_no_mouse_hover."\n"; +print 'dol_use_jmobile='.$dol_use_jmobile."\n"; +print 'dol_screenwidth='.$_SESSION['dol_screenwidth']."\n"; +print 'dol_screenheight='.$_SESSION['dol_screenheight']."\n"; +print '*/'."\n"; + +if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11; +?> + +/* ============================================================================== */ +/* Default styles */ +/* ============================================================================== */ + + +body { + + background-color: #FFFFFF; + + background: ; + + color: #101010; + font-size: px; + font-family: ; + margin-top: 0; + margin-bottom: 0; + margin-right: 0; + margin-left: 0; + trans("DIRECTION").";\n"; ?> +} + +a:link, a:visited, a:hover, a:active { font-family: ; font-weight: bold; color: #4A4A4A; text-decoration: none; } + +a:hover { text-decoration: underline; color: #000000;} + + + +input:focus, textarea:focus, button:focus, select:focus { + box-shadow: 0 0 4px #8091BF; +} +textarea.cke_source:focus +{ + box-shadow: none; +} + +input, input.flat, textarea, textarea.flat, form.flat select, select.flat { + font-size: px; + font-family: ; + background: #FDFDFD; + border: 1px solid #C0C0C0; + /*padding: 1px 1px 1px 1px; */ + margin: 0px 0px 0px 0px; +} + +input, textarea, select { + border-radius:4px; + border:solid 1px rgba(0,0,0,.3); + border-top:solid 1px rgba(0,0,0,.3); + border-bottom:solid 1px rgba(0,0,0,.2); + /* box-shadow: 1px 1px 1px rgba(0,0,0,.2) inset;*/ + padding:4px; + margin-left:1px; + margin-bottom:1px; + margin-top:1px; + } + + +select.flat, form.flat select { + font-weight: normal; +} +input:disabled { + background:#ddd; +} + +input.liste_titre { + box-shadow: none !important; +} +input.removedfile { + padding: 0px !important; + border: 0px !important; +} +textarea:disabled { + background:#ddd; +} +input[type=checkbox] { background-color: transparent; border: none; box-shadow: none; } +input[type=radio] { background-color: transparent; border: none; box-shadow: none; } +input[type=image] { background-color: transparent; border: none; box-shadow: none; } +input[type=text] { min-width: 20px; } +input:-webkit-autofill { + background-color: !important; + background-image:none !important; + -webkit-box-shadow: 0 0 0 50px inset; +} +::-webkit-input-placeholder { color:#ccc; } +::-moz-placeholder { color:#ccc; } /* firefox 19+ */ +:-ms-input-placeholder { color:#ccc; } /* ie */ +input:-moz-placeholder { color:#ccc; } + + +legend { margin-bottom: 8px; } + +fieldset { border: 1px solid #AAAAAA !important; box-shadow: 2px 2px 3px #DDD; } + + +.button, sbmtConnexion { + font-family: ; + border-color: #c5c5c5; + border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); + display: inline-block; + padding: 4px 14px; + margin-bottom: 0; + margin-top: 0; + text-align: center; + cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + border: 1px solid #bbbbbb; + border-bottom-color: #a2a2a2; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); +} +.button:focus { + -moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1); + -webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1); + box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1); +} +.button:hover { + -moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1); + -webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1); + box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1); +} +.button:disabled { + opacity: 0.4; + filter: alpha(opacity=40); /* For IE8 and earlier */ + box-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + cursor: auto; +} +.buttonRefused { + pointer-events: none; + cursor: default; + opacity: 0.4; + filter: alpha(opacity=40); /* For IE8 and earlier */ + box-shadow: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; +} +form { + padding:0px; + margin:0px; +} +div.float +{ + float:; +} +div.floatright +{ + float:; +} +.inline-block +{ + display:inline-block; +} + +th .button { + -moz-box-shadow: none !important; + -webkit-box-shadow: none !important; + box-shadow: none !important; + -moz-border-radius:0px !important; + -webkit-border-radius:0px !important; + border-radius:0px !important; +} + +.valignmiddle { + vertical-align: middle; +} +.centpercent { + width: 100%; +} +textarea.centpercent { + width: 96%; +} +.center { + text-align: center; +} +.left { + text-align: ; +} +.right { + text-align: ; +} +.nowrap { + white-space: ; +} +.nobold { + font-weight: normal !important; +} +.nounderline { + text-decoration: none; +} +.cursorpointer { + cursor: pointer; +} +.badge { + display: inline-block; + min-width: 10px; + padding: 2px 5px; + font-size: 10px; + font-weight: 700; + line-height: 0.9em; + color: #fff; + text-align: center; + white-space: nowrap; + vertical-align: baseline; + background-color: #777; + border-radius: 10px; +} +.movable { + cursor: move; +} + +.borderrightlight +{ + border-right: 1px solid #DDD; +} + +/* ============================================================================== */ +/* Styles to hide objects */ +/* ============================================================================== */ + +.hideobject { display: none; } +.minwidth100 { min-width: 100px; } +.minwidth200 { min-width: 200px; } +.minwidth300 { min-width: 300px; } +.maxwidth100 { max-width: 100px; } +.maxwidth200 { max-width: 200px; } +.maxwidth300 { max-width: 300px; } + +.hideonsmartphone { display: none; } +.noenlargeonsmartphone { width : 50px !important; display: inline !important; } +.maxwidthonsmartphone { max-width: 100px; } +.maxwidth100onsmartphone { max-width: 100px; } +.maxwidth200onsmartphone { max-width: 200px; } +.maxwidth300onsmartphone { max-width: 300px; } + +.linkobject { cursor: pointer; } + +.hideonprint { display: none; } + + + +/* ============================================================================== */ +/* Styles for dragging lines */ +/* ============================================================================== */ + +.dragClass { + color: #002255; +} +td.showDragHandle { + cursor: move; +} +.tdlineupdown { + white-space: nowrap; + min-width: 10px; +} + + +/* ============================================================================== */ +/* Styles de positionnement des zones */ +/* ============================================================================== */ + +#id-container { + margin-top: 0px; + margin-bottom: 0px; + display: table; + table-layout: fixed; +} +#id-right, #id-left { + padding-top: 8px; + display: table-cell; + float: none; + vertical-align: top; +} +#id-left { + min-height: 100%; + position: relative; + width: 184px; +} +#id-right { /* This must stay id-right ant not be replaced with echo $right */ + width: 100%; + padding-left: 184px; +} + +.side-nav { + background: #FFF; + border-right: 1px solid rgba(0,0,0,0.14); + bottom: 0; + color: #333; + display: block; + font-family: "RobotoDraft","Roboto",sans-serif; + left: 0; + position: fixed; + top: 50px; + width: 192px; + z-index: 4; + -webkit-transform: translateZ(0); + -moz-transform: translateZ(0); + -ms-transform: translateZ(0); + -o-transform: translateZ(0); + transform: translateZ(0); + -webkit-transform-style: preserve-3d; + -moz-transform-style: preserve-3d; + -ms-transform-style: preserve-3d; + -o-transform-style: preserve-3d; + transform-style: preserve-3d; + -webkit-transition-delay: 0.1s; + -moz-transition-delay: 0.1s; + transition-delay: 0.1s; + -webkit-transition-duration: 0.2s; + -moz-transition-duration: 0.2s; + transition-duration: 0.2s; + -webkit-transition-property: -webkit-transform; + -moz-transition-property: -moz-transform; + transition-property: transform; + -webkit-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); + -moz-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); + transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); + -webkit-overflow-scrolling: touch; + overflow-x: hidden; + overflow-y: auto; +} + + +div.fiche { + margin-: global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px; + margin-: dol_optimize_smallscreen)?'12':'4')); ?>px; + dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> +} + +div.fichecenter { + width: 100%; + clear: both; /* This is to have div fichecenter that are true rectangles */ +} +div.fichethirdleft { + browser->layout != 'phone') { print "float: ".$left.";\n"; } ?> + browser->layout != 'phone') { print "width: 35%;\n"; } ?> + browser->layout == 'phone') { print "padding-bottom: 6px;\n"; } ?> +} +div.fichetwothirdright { + browser->layout != 'phone') { print "float: ".$right.";\n"; } ?> + browser->layout != 'phone') { print "width: 65%;\n"; } ?> + browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?> +} +div.fichehalfleft { + browser->layout != 'phone') { print "float: ".$left.";\n"; } ?> + browser->layout != 'phone') { print "width: 50%;\n"; } ?> +} +div.fichehalfright { + browser->layout != 'phone') { print "float: ".$right.";\n"; } ?> + browser->layout != 'phone') { print "width: 50%;\n"; } ?> +} +div.ficheaddleft { + browser->layout != 'phone') { print "padding-".$left.": 16px;\n"; } + else print "margin-top: 10px;\n"; ?> +} +.containercenter { +display : table; +margin : 0px auto; +} + + +/* ============================================================================== */ +/* Menu top et 1ere ligne tableau */ +/* ============================================================================== */ + + + +div#tmenu_tooltip { + + display:none; + + padding-: 100px; + background: ; + /*box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;*/ + + background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); + background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); + background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); + background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); + background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); + background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(128,128,128,.3)) ); + + background-image: rgb(); + border-bottom: 1px solid #CCC; + + +} + +div.tmenudiv { + + display:none; + + position: relative; + display: block; + white-space: nowrap; + border-top: 0px; + border-: 0px; + border-: 0px; + padding: 0px 0px 0px 0px; /* t r b l */ + margin: 0px 0px 0px 0px; /* t r b l */ + font-size: 13px; + font-weight: normal; + color: #000000; + text-decoration: none; + +} +div.tmenudisabled, a.tmenudisabled { + opacity: 0.6; +} +a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudisabled:active { + font-weight: normal; + padding: 0px 5px 0px 5px; + white-space: nowrap; + color: #; + text-decoration: none; + cursor: not-allowed; +} + +a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { + font-weight: normal; + padding: 0px 5px 0px 5px; + white-space: nowrap; + /* text-shadow: 1px 1px 1px #000000; */ + color: #; + text-decoration: none; +} +a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { + font-weight: normal; + padding: 0px 5px 0px 5px; + margin: 0px 0px 0px 0px; + white-space: nowrap; + color: #; + text-decoration: none !important; +} + + +ul.tmenu { /* t r b l */ + padding: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; + list-style: none; + /* box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important; */ +} +ul.tmenu li { + background: rgb(); + + + /* + background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); + background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); + background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); + background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); + background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); + background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) ); + */ + + background-image: rgb(); + border-bottom: 1px solid #CCC; + +} +li.tmenu, li.tmenusel { + + text-align: center; + vertical-align: bottom; + global->MAIN_MENU_INVERT)) { ?> + float: ; + height: px; + + position:relative; + display: block; + padding: 0px 0px 2px 0px; + margin: 0px 0px 0px 0px; + font-weight: normal; +} +li.tmenusel, li.tmenu:hover { + background-image: -o-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; + background-image: -moz-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; + background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0) 100%) !important; + background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; + background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important; + background: rgb(); + /* background: url() 50% 0 repeat-x !important; Nicer but problem when menu wrap on 2 lines */ +} +.tmenuend .tmenuleft { width: 0px; } +div.tmenuleft +{ + float: ; + margin-top: 0px; + dol_optimize_smallscreen)) { ?> + width: 5px; + height: px; + background: url() 0 -6px no-repeat; + +} +div.tmenucenter +{ + padding-top: 2px; + padding-left: 0px; + padding-right: 0px; + height: px; + width: 100%; +} +.mainmenuaspan +{ + padding-right: 4px; +} + +div.mainmenu { + position : relative; + background-repeat:no-repeat; + background-position:center top; + height: px; + margin-left: 0px; + min-width: 40px; +} + +/* Do not load menu img if hidden to save bandwidth */ + + +div.mainmenu.home{ + background-image: url(); + background-position-x: middle; +} + +div.mainmenu.accountancy { + background-image: url(); +} + +div.mainmenu.agenda { + background-image: url(); +} + +div.mainmenu.bank { + background-image: url(); +} + +div.mainmenu.cashdesk { + background-image: url(); +} + +div.mainmenu.companies { + background-image: url(); +} + +div.mainmenu.commercial { + background-image: url(); +} + +div.mainmenu.ecm { + background-image: url(); +} + +div.mainmenu.externalsite { + background-image: url(); +} + +div.mainmenu.ftp { + background-image: url(); +} + +div.mainmenu.hrm { + background-image: url(); +} + +div.mainmenu.members { + background-image: url(); +} + +div.mainmenu.products { + background-image: url(); + margin-left: 10px; +} + +div.mainmenu.project { + background-image: url(); +} + +div.mainmenu.tools { + background-image: url(); +} + +'name of class for div') + +$moduletomainmenu=array('user'=>'','syslog'=>'','societe'=>'companies','projet'=>'project','propale'=>'commercial','commande'=>'commercial', + 'produit'=>'products','service'=>'products','stock'=>'products', + 'don'=>'accountancy','tax'=>'accountancy','banque'=>'accountancy','facture'=>'accountancy','compta'=>'accountancy','accounting'=>'accountancy','adherent'=>'members','import'=>'tools','export'=>'tools','mailing'=>'tools', + 'contrat'=>'commercial','ficheinter'=>'commercial','deplacement'=>'commercial', + 'fournisseur'=>'companies', + 'barcode'=>'','fckeditor'=>'','categorie'=>'', +); +$mainmenuused='home'; +foreach($conf->modules as $val) +{ + $mainmenuused.=','.(isset($moduletomainmenu[$val])?$moduletomainmenu[$val]:$val); +} +//var_dump($mainmenuused); +$mainmenuusedarray=array_unique(explode(',',$mainmenuused)); + +$generic=1; +$divalreadydefined=array('home','companies','products','commercial','accountancy','project','tools','members','agenda','holiday','bookmark','cashdesk','ecm','geoipmaxmind','gravatar','clicktodial','paypal','webservices'); +foreach($mainmenuusedarray as $val) +{ + if (empty($val) || in_array($val,$divalreadydefined)) continue; + //print "XXX".$val; + + // Search img file in module dir + $found=0; $url=''; + foreach($conf->file->dol_document_root as $dirroot) + { + if (file_exists($dirroot."/".$val."/img/".$val.".png")) + { + $url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1); + $found=1; + break; + } + } + // Img file not found + if (! $found) + { + $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png",1); + $found=1; + if ($generic < 4) $generic++; + print "/* A mainmenu entry but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n"; + } + if ($found) + { + print "div.mainmenu.".$val." {\n"; + print " background-image: url(".$url.");\n"; + print "}\n"; + } +} +// End of part to add more div class css +?> + + + +.tmenuimage { + padding:0 0 0 0 !important; + margin:0 0px 0 0 !important; +} + + + +/* Login */ + +.bodylogin +{ + background: #f0f0f0; +} +.login_vertical_align { + padding: 10px; +} +form#login { + margin-top: px; + margin-bottom: 30px; + font-size: 13px; + vertical-align: middle; +} +.login_table_title { + max-width: 530px; + color: #888888; + text-shadow: 1px 1px 1px #FFF; +} +.login_table label { + text-shadow: 1px 1px 1px #FFF; +} +.login_table { + margin-left: 10px; + margin-right: 10px; + padding-left:6px; + padding-right:6px; + padding-top:16px; + padding-bottom:12px; + max-width: 560px; + + background-color: #FFFFFF; + + -moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); + -webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); + box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15); + /*-moz-box-shadow: 3px 2px 20px #CCC; + -webkit-box-shadow: 3px 2px 20px #CCC; + box-shadow: 3px 2px 20px #CCC;*/ + + border-radius: 8px; + border:solid 1px rgba(80,80,80,.4); + + border-top:solid 1px f8f8f8; + /* + background-color: #f8f8f8; + background-image: -o-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); + background-image: -moz-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); + background-image: -webkit-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); + background-image: -ms-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); + background-image: linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%); + */ +} +div#login_left, div#login_right { + display: inline-block; + min-width: 245px; + padding-top: 10px; + padding-left: 16px; + padding-right: 16px; + text-align: center; + vertical-align: middle; +} +table.login_table tr td table.none tr td { + padding: 2px; +} +table.login_table_securitycode { + border-spacing: 0px; +} +table.login_table_securitycode tr td { + padding-left: 0px; + padding-right: 4px; +} +#securitycode { + min-width: 60px; +} +#img_securitycode { + border: 1px solid #DDDDDD; +} +#img_logo { + max-width: 200px; + max-height: 100px; +} + +div.login_block { + position: absolute; + : 5px; + top: 3px; + font-weight: bold; + max-width: 110px; + + display: none; + +} +div.login_block table { + display: inline; +} +div.login { + white-space:nowrap; + font-weight: bold; + float: right; +} +div.login a { + color: #; +} +div.login a:hover { + color: #; + text-decoration:underline; +} +div.login_block_user, div.login_block_other { clear: both; } +div.login_block_other { padding-top: 3px; } +.login_block_elem { + float: right; + vertical-align: top; + padding: 0px 0px 0px 4px !important; + height: 16px; +} +.alogin, .alogin:hover { + color: #888 !important; + font-weight: normal !important; + font-size: px !important; +} +.alogin:hover { + text-decoration:underline !important; +} +img.login, img.printer, img.entity { + /* padding: 0px 0px 0px 4px; */ + /* margin: 0px 0px 0px 8px; */ + text-decoration: none; + color: white; + font-weight: bold; +} + +.span-icon-user { + background: url() no-repeat scroll 7px 7px; +} +.span-icon-password { + background-image: url(); + background-repeat: no-repeat; +} +/* +.span-icon-user input, .span-icon-password input { + margin-right: 30px; +} +*/ + +/* ============================================================================== */ +/* Menu gauche */ +/* ============================================================================== */ + +div.vmenu, td.vmenu { + margin-: 2px; + position: relative; + float: left; + padding: 0px; + padding-bottom: 0px; + padding-top: 1px; + width: 174px; +} + +.vmenu { + margin-left: 4px; + + display: none; + +} + +.menu_contenu { padding-top: 4px; padding-bottom: 3px;} + +a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:px; font-family: ; text-align: ; font-weight: bold; } +font.vmenudisabled { font-size:px; font-family: ; text-align: ; font-weight: bold; color: #93a5aa; } +a.vmenu:link, a.vmenu:visited { color: #; } + +a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active { font-size:px; font-family: ; text-align: ; font-weight: normal; color: #202020; margin: 1px 1px 1px 8px; } +font.vsmenudisabled { font-size:px; font-family: ; text-align: ; font-weight: normal; color: #93a5aa; } +a.vsmenu:link, a.vsmenu:visited { color: #; } +font.vsmenudisabledmargin { margin: 1px 1px 1px 8px; } + +a.help:link, a.help:visited, a.help:hover, a.help:active { font-size:px; font-family: ; text-align: ; font-weight: normal; color: #666666; text-decoration: none; } + + +div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks +{ + font-family: ; + color: #000000; + text-align: ; + text-decoration: none; + padding-left: 5px; + padding-right: 1px; + padding-top: 3px; + padding-bottom: 3px; + margin: 1px 0px 8px 0px; +/* + + + background-image: -o-linear-gradient(bottom, rgb() 0px, rgb() 3px); + background-image: -moz-linear-gradient(bottom, rgb() 0px, rgb() 3px); + background-image: -webkit-linear-gradient(right, rgb() 0px, rgb() 3px); + background-image: -ms-linear-gradient(bottom, rgb() 0px, rgb() 3px); + background-image: linear-gradient(bottom, rgb() 0px, rgb() 3px); + + + background-position:top; + background-repeat:repeat-x; + + border-left: 1px solid #AAA; + border-right: 1px solid #BBB; + border-bottom: 1px solid #BBB; + border-top: 1px solid #BBB; + border-radius: 5px; + -moz-border-radius: 5px; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD;*/ + + padding-bottom: 10px; + border-bottom: 1px solid #DDD; +} + +div.blockvmenusearch +{ + font-family: ; + color: #000000; + text-align: ; + text-decoration: none; + padding-left: 5px; + padding-right: 1px; + padding-top: 3px; + padding-bottom: 3px; + margin: 1px 0px 8px 0px; +/* + background: #E3E6E8; + + background-image: -o-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 90%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); + + + border-left: 1px solid #AAA; + border-right: 1px solid #CCC; + border-bottom: 1px solid #CCC; + border-top: 1px solid #CCC; + border-radius: 5px; + -moz-border-radius: 5px; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; +*/ + + padding-bottom: 10px; + border-bottom: 1px solid #DDD; +} + +div.blockvmenuhelp +{ +dol_optimize_smallscreen)) { ?> + font-family: ; + color: #000000; + text-align: center; + text-decoration: none; + padding-left: 0px; + padding-right: 3px; + padding-top: 3px; + padding-bottom: 3px; + margin: 4px 0px 0px 0px; + + display: none; + +} + + +td.barre { + border-right: 1px solid #000000; + border-bottom: 1px solid #000000; + background: #b3c5cc; + font-family: ; + color: #000000; + text-align: ; + text-decoration: none; +} + +td.barre_select { + background: #b3c5cc; + color: #000000; +} + +td.photo { + background: #F4F4F4; + color: #000000; + border: 1px solid #b3c5cc; +} + +/* ============================================================================== */ +/* Panes for Main */ +/* ============================================================================== */ + +/* + * PANES and CONTENT-DIVs + */ + +#mainContent, #leftContent .ui-layout-pane { + padding: 0px; + overflow: auto; +} + +#mainContent, #leftContent .ui-layout-center { + padding: 0px; + position: relative; /* contain floated or positioned elements */ + overflow: auto; /* add scrolling to content-div */ +} + + +/* ============================================================================== */ +/* Toolbar for ECM or Filemanager */ +/* ============================================================================== */ + +.largebutton { + + background-image: -o-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; + background-image: -moz-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; + background-image: -webkit-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; + background-image: -ms-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; + background-image: linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; + + background: #FFF; + background-repeat: repeat-x !important; + border: 1px solid #CCC !important; + + -moz-border-radius: 5px 5px 5px 5px !important; + -webkit-border-radius: 5px 5px 5px 5px !important; + border-radius: 5px 5px 5px 5px !important; + -moz-box-shadow: 2px 2px 4px #DDD; + -webkit-box-shadow: 2px 2px 4px #DDD; + box-shadow: 2px 2px 4px #DDD; + + padding: 0 4px 0 4px !important; + min-height: 32px; +} + + +a.toolbarbutton { + margin-top: 0px; + margin-left: 4px; + margin-right: 4px; + height: 30px; +} +img.toolbarbutton { + margin-top: 1px; + height: 30px; +} + +/* ============================================================================== */ +/* Panes for ECM or Filemanager */ +/* ============================================================================== */ + +#containerlayout .layout-with-no-border { + border: 0 !important; + border-width: 0 !important; +} + +#containerlayout .layout-padding { + padding: 2px !important; +} + +/* + * PANES and CONTENT-DIVs + */ +#containerlayout .ui-layout-pane { /* all 'panes' */ + background: #FFF; + border: 1px solid #BBB; + /* DO NOT add scrolling (or padding) to 'panes' that have a content-div, + otherwise you may get double-scrollbars - on the pane AND on the content-div + */ + padding: 0px; + overflow: auto; +} +/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */ +#containerlayout .ui-layout-content { + padding: 10px; + position: relative; /* contain floated or positioned elements */ + overflow: auto; /* add scrolling to content-div */ +} + + +/* + * RESIZER-BARS + */ +.ui-layout-resizer { /* all 'resizer-bars' */ + width: dol_optimize_smallscreen)?'8':'24'); ?>px !important; +} +.ui-layout-resizer-hover { /* affects both open and closed states */ +} +/* NOTE: It looks best when 'hover' and 'dragging' are set to the same color, + otherwise color shifts while dragging when bar can't keep up with mouse */ +/*.ui-layout-resizer-open-hover ,*/ /* hover-color to 'resize' */ +.ui-layout-resizer-dragging { /* resizer beging 'dragging' */ + background: #DDD; + width: dol_optimize_smallscreen)?'8':'24'); ?>px; +} +.ui-layout-resizer-dragging { /* CLONED resizer being dragged */ + border-left: 1px solid #BBB; + border-right: 1px solid #BBB; +} +/* NOTE: Add a 'dragging-limit' color to provide visual feedback when resizer hits min/max size limits */ +.ui-layout-resizer-dragging-limit { /* CLONED resizer at min or max size-limit */ + background: #E1A4A4; /* red */ +} +.ui-layout-resizer-closed { + background-color: #DDDDDD; +} +.ui-layout-resizer-closed:hover { + background-color: #EEDDDD; +} +.ui-layout-resizer-sliding { /* resizer when pane is 'slid open' */ + opacity: .10; /* show only a slight shadow */ + filter: alpha(opacity=10); +} +.ui-layout-resizer-sliding-hover { /* sliding resizer - hover */ + opacity: 1.00; /* on-hover, show the resizer-bar normally */ + filter: alpha(opacity=100); +} +/* sliding resizer - add 'outside-border' to resizer on-hover */ +/* this sample illustrates how to target specific panes and states */ +/*.ui-layout-resizer-north-sliding-hover { border-bottom-width: 1px; } +.ui-layout-resizer-south-sliding-hover { border-top-width: 1px; } +.ui-layout-resizer-west-sliding-hover { border-right-width: 1px; } +.ui-layout-resizer-east-sliding-hover { border-left-width: 1px; } +*/ + +/* + * TOGGLER-BUTTONS + */ +.ui-layout-toggler { + dol_optimize_smallscreen)) { ?> + border-top: 1px solid #AAA; /* match pane-border */ + border-right: 1px solid #AAA; /* match pane-border */ + border-bottom: 1px solid #AAA; /* match pane-border */ + background-color: #DDD; + top: 5px !important; + + diplay: none; + +} +.ui-layout-toggler-open { + height: 54px !important; + width: dol_optimize_smallscreen)?'7':'22'); ?>px !important; + -moz-border-radius:0px 10px 10px 0px; + -webkit-border-radius:0px 10px 10px 0px; + border-radius:0px 10px 10px 0px; +} +.ui-layout-toggler-closed { + height: dol_optimize_smallscreen)?'54':'2'); ?>px !important; + width: dol_optimize_smallscreen)?'7':'22'); ?>px !important; + -moz-border-radius:0px 10px 10px 0px; + -webkit-border-radius:0px 10px 10px 0px; + border-radius:0px 10px 10px 0px; +} +.ui-layout-toggler .content { /* style the text we put INSIDE the togglers */ + color: #666; + font-size: 12px; + font-weight: bold; + width: 100%; + padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */ +} + +/* hide the toggler-button when the pane is 'slid open' */ +.ui-layout-resizer-sliding ui-layout-toggler { + display: none; +} + +.ui-layout-north { + height: dol_optimize_smallscreen)?'54':'21'); ?>px !important; +} + + +/* ECM */ + +#containerlayout .ecm-layout-pane { /* all 'panes' */ + background: #FFF; + border: 1px solid #BBB; + /* DO NOT add scrolling (or padding) to 'panes' that have a content-div, + otherwise you may get double-scrollbars - on the pane AND on the content-div + */ + padding: 0px; + overflow: auto; +} +/* (scrolling) content-div inside pane allows for fixed header(s) and/or footer(s) */ +#containerlayout .ecm-layout-content { + padding: 10px; + position: relative; /* contain floated or positioned elements */ + overflow: auto; /* add scrolling to content-div */ +} + +.ecm-layout-toggler { + border-top: 1px solid #AAA; /* match pane-border */ + border-right: 1px solid #AAA; /* match pane-border */ + border-bottom: 1px solid #AAA; /* match pane-border */ + background-color: #CCC; + } +.ecm-layout-toggler-open { + height: 48px !important; + width: 6px !important; + -moz-border-radius:0px 10px 10px 0px; + -webkit-border-radius:0px 10px 10px 0px; + border-radius:0px 10px 10px 0px; +} +.ecm-layout-toggler-closed { + height: 48px !important; + width: 6px !important; +} + +.ecm-layout-toggler .content { /* style the text we put INSIDE the togglers */ + color: #666; + font-size: 12px; + font-weight: bold; + width: 100%; + padding-bottom: 0.35ex; /* to 'vertically center' text inside text-span */ +} +#ecm-layout-west-resizer { + width: 6px !important; +} + +.ecm-layout-resizer { /* all 'resizer-bars' */ + border: 1px solid #BBB; + border-width: 0; + } +.ecm-layout-resizer-closed { +} + +.ecm-in-layout-center { + border-left: 1px !important; + border-right: 0px !important; + border-top: 0px !important; +} + +.ecm-in-layout-south { + border-left: 0px !important; + border-right: 0px !important; + border-bottom: 0px !important; + padding: 4px 0 4px 4px !important; +} + + + +/* ============================================================================== */ +/* Onglets */ +/* ============================================================================== */ +div.tabs { +/* margin: 0px 0px 2px 6px; + padding: 0px 6px 3px 0px; */ + text-align: ; + margin-left: 6px !important; + margin-right: 6px !important; + clear:both; + height:100%; +} +div.tabsElem { margin-top: 8px; } /* To avoid overlap of tabs when not browser */ + +div.tabBar { + color: #; + padding-top: 9px; + padding-left: px; + padding-right: px; + padding-bottom: 8px; + margin: 0px 0px 14px 0px; + -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; + border-right: 1px solid #BBB; + border-bottom: 1px solid #BBB; + border-left: 1px solid #BBB; + border-top: 1px solid #CCC; + width: auto; + + background: rgb(); + /* + background-image: -o-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); + background-image: -moz-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); + background-image: -webkit-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); + background-image: -ms-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); + background-image: linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); + */ + + background: rgb(); + + + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; + +} + +div.tabsAction { + margin: 20px 0em 10px 0em; + padding: 0em 0em; + text-align: right; +} + + +a.tabTitle { +/* background: #657090; + color: white;*/ + color:rgba(0,0,0,.5); + margin-right:10px; + text-shadow:1px 1px 1px #ffffff; + font-family: ; + font-weight: normal; + padding: 4px 6px 2px 6px; + margin: 0px 6px; + text-decoration: none; + white-space: nowrap; +} + +a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { + font-family: ; + padding: 5px 12px 5px; + /* padding: 3px 6px 2px 6px;*/ + margin: 0em 0.2em; + text-decoration: none; + white-space: nowrap; + + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; + + -moz-box-shadow: 0 -1px 4px rgba(0,0,0,.1); + -webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1); + box-shadow: 0 -1px 4px rgba(0,0,0,.1); + + border-bottom: none; + border-right: 1px solid #CCCCCC; + border-left: 1px solid #D0D0D0; + border-top: 1px solid #D8D8D8; + + + background: rgb(); + /*background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); + background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%); + background-image: -webkit-linear-gradient(bottom, rgb() 35%, rgb() 100%); + background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%); + background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%);*/ + + background-image: none !important; +} + +.tabactive { + + background: rgb() !important; +/* border-bottom: 1px solid rgb() !important; + background: rgba(, 0.5) url() 50% 0 repeat-x; */ + + background: rgb() url() 50% 0 repeat-x; + + /*background-image: none !important; */ + color: #; +} +a.tab:hover +{ + background: rgba(, 0.5) url() 50% 0 repeat-x; + color: #; +} +a.tab:link, a.tab:visited +{ + /* color: #888; */ + /* font-weight: normal !important; */ +} +a.tabimage { + color: #434956; + font-family: ; + text-decoration: none; + white-space: nowrap; +} + +td.tab { + background: #dee7ec; +} + +span.tabspan { + background: #dee7ec; + color: #434956; + font-family: ; + padding: 0px 6px; + margin: 0em 0.2em; + text-decoration: none; + white-space: nowrap; + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; + + border-: 1px solid #555555; + border-: 1px solid #D8D8D8; + border-top: 1px solid #D8D8D8; +} + +/* ============================================================================== */ +/* Boutons actions */ +/* ============================================================================== */ + +div.divButAction { margin-bottom: 1.4em; } + +.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { + text-decoration: none; + white-space: nowrap; + padding: 0.4em em; + margin: 0em em; + font-family: ; + + font-weight: bold; + background: white; + border: 1px solid #8CACBB; + color: #434956; + -moz-border-radius:0px 5px 0px 5px; + -webkit-border-radius:0px 5px 0px 5px; + border-radius:0px 5px 0px 5px; + -moz-box-shadow: 2px 2px 3px #DDD; + -webkit-box-shadow: 2px 2px 3px #DDD; + box-shadow: 2px 2px 3px #DDD; +} + +.butAction:hover { + background: #dee7ec; +} + +.butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active { + border: 1px solid #997777; +} + +.butActionDelete:hover { + background: #FFe7ec; +} + +.butActionRefused { + text-decoration: none !important; + white-space: nowrap !important; + cursor: not-allowed; + padding: 0.4em em; + margin: 0em em; + font-family: !important; + + font-weight: bold !important; + background: white !important; + border: 1px solid #AAAAAA !important; + color: #AAAAAA !important; + -moz-border-radius:0px 5px 0px 5px; + -webkit-border-radius:0px 5px 0px 5px; + border-radius:0px 5px 0px 5px; + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; +} + +global->MAIN_BUTTON_HIDE_UNAUTHORIZED)) { ?> +.butActionRefused { + display: none; +} + + +span.butAction, span.butActionDelete { + cursor: pointer; +} + +/* Preapre for bootstrap look +.butAction, .butActionDelete, .butActionRefused { + border-color: #c5c5c5; + border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25); + display: inline-block; + padding: 4px 14px; + margin-bottom: 0; + line-height: 20px; + text-align: center; + vertical-align: middle; + cursor: pointer; + color: #333333; + text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + background-color: #f5f5f5; + background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); + background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); + background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); + background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0); + border-color: #e6e6e6 #e6e6e6 #bfbfbf; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + border: 1px solid #bbbbbb; + border-bottom-color: #a2a2a2; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); +} + +.butAction { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #006dcc; + background-image: -moz-linear-gradient(top, #0088cc, #0044cc); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); + background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); + background-image: -o-linear-gradient(top, #0088cc, #0044cc); + background-image: linear-gradient(to bottom, #0088cc, #0044cc); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0); + border-color: #0044cc #0044cc #002a80; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} + +.butActionDelete { + color: #ffffff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #cc6d00; + background-image: -moz-linear-gradient(top, #cc8800, #cc4400); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cc8800), to(#cc4400)); + background-image: -webkit-linear-gradient(top, #cc8800, #cc4400); + background-image: -o-linear-gradient(top, #cc8800, #cc4400); + background-image: linear-gradient(to bottom, #cc8800, #cc4400); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffcc8800', endColorstr='#ffcc4400', GradientType=0); + border-color: #cc4400 #cc4400 #802a00; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); +} +a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active { + color: #FFFFFF; +} +End bootstrap */ + + + +/* ============================================================================== */ +/* Tables */ +/* ============================================================================== */ + +.allwidth { + width: 100%; +} + +#undertopmenu { + background-repeat: repeat-x; + margin-top: px; +} + + +.paddingrightonly { + border-collapse: collapse; + border: 0px; + margin-left: 0px; + padding-: 0px !important; + padding-: 4px !important; +} +.nocellnopadd { + list-style-type:none; + margin: 0px !important; + padding: 0px !important; +} + +.notopnoleft { + border-collapse: collapse; + border: 0px; + padding-top: 0px; + padding-: 0px; + padding-: 16px; + padding-bottom: 4px; + margin-right: 0px 0px; +} +.notopnoleftnoright { + border-collapse: collapse; + border: 0px; + padding-top: 0px; + padding-left: 0px; + padding-right: 0px; + padding-bottom: 4px; + margin: 0px 0px 0px 0px; +} + + +table.border, table.dataTable, .table-border, .table-border-col, .table-key-border-col, .table-val-border-col, div.border { + border: 1px solid #D0D0D0; + border-collapse: collapse; + padding: 1px 2px 1px 3px; /* t r b l */ +} + +table.border td, div.border div div.tagtd { + padding: 2px 2px 2px 2px; + border: 1px solid #D0D0D0; + border-collapse: collapse; +} + +td.border, div.tagtable div div.border { + border-top: 1px solid #000000; + border-right: 1px solid #000000; + border-bottom: 1px solid #000000; + border-left: 1px solid #000000; +} + +.table-key-border-col { + width: 25%; + vertical-align:top; +} +.table-val-border-col { + width:auto; +} + +/* Main boxes */ + +table.noborder, table.formdoc, div.noborder { + width: 100%; + + border-collapse: separate !important; + border-spacing: 0px; + + border-right-width: 1px; + border-right-color: #BBBBBB; + border-right-style: solid; + + border-left-width: 1px; + border-left-color: #B0B0B0; + border-left-style: solid; + + border-bottom-width: 1px; + border-bottom-color: #BBBBBB; + border-bottom-style: solid; + + margin: 0px 0px 2px 0px; + + -moz-box-shadow: 2px 2px 4px #DDD; + -webkit-box-shadow: 2px 2px 4px #DDD; + box-shadow: 2px 2px 4px #DDD; + + -moz-border-radius: 0.2em; + -webkit-border-radius: 0.2em; + border-radius: 0.2em; +} + +table.noborder tr, div.noborder form { + border-top-color: #FEFEFE; + + border-right-width: 1px; + border-right-color: #BBBBBB; + border-right-style: solid; + + border-left-width: 1px; + border-left-color: #BBBBBB; + border-left-style: solid; + height: 20px; +} + +table.noborder th, table.noborder td, div.noborder form, div.noborder form div { + padding: 1px 2px 1px 3px; /* t r b l */ +} + +table.nobordernopadding { + border-collapse: collapse !important; + border: 0px; +} +table.nobordernopadding tr { + border: 0px !important; + padding: 0px 0px; +} +table.nobordernopadding td { + border: 0px !important; + padding: 0px 0px; +} + +/* For lists */ + +table.liste { + width: 100%; + border-collapse: collapse; + border-top-color: #FEFEFE; + + border-right-width: 1px; + border-right-color: #BBBBBB; + border-right-style: solid; + + border-left-width: 1px; + border-left-color: #CCCCCC; + border-left-style: solid; + + border-bottom-width: 1px; + border-bottom-color: #BBBBBB; + border-bottom-style: solid; + + margin-bottom: 2px; + margin-top: 0px; + + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; +} +table.liste td { + padding-right: 2px; +} + +.tagtable, .table-border { display: table; } +.tagtr, .table-border-row { display: table-row; } +.tagtd, .table-border-col, .table-key-border-col, .table-val-border-col { display: table-cell; } + + +/* Prepare to remove class pair - impair +.noborder > tbody > tr:nth-child(even) td { + background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + font-family: ; + border: 0px; + margin-bottom: 1px; + color: #202020; + min-height: 18px; +} + +.noborder > tbody > tr:nth-child(odd) td { + background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + font-family: ; + border: 0px; + margin-bottom: 1px; + color: #202020; +} +*/ + +.impair:hover, td.nohover { + + background: rgb(); + + background: #fafafa; + + border: 0px; +} + +.impair, .nohover .impair:hover, tr.impair td.nohover { + + background: linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + + background: #eaeaea; + + font-family: ; + border: 0px; + margin-bottom: 1px; + color: #202020; + min-height: 18px; /* seems to not be used */ +} + +.pair:hover { + + background: rgb(); + + background: #fafafa; + + border: 0px; +} + +.pair, .nohover .pair:hover, tr.pair td.nohover { + + background: linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; + + background: #ffffff; + + font-family: ; + border: 0px; + margin-bottom: 1px; + color: #202020; +} + + +tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr +{ + height: 26px !important; +} +div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr +{ + background: rgb(); + background-repeat: repeat-x; + + /* + background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + */ + font-weight: bold; + + color: #; + font-family: ; + border-bottom: 1px solid #FDFFFF; + text-align: ; +} +tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div, div.liste_titre +{ + font-family: ; + font-weight: bold; + border-bottom: 1px solid #FDFFFF; + text-shadow: 1px 0px 1px #; + vertical-align: middle; +} +tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a { + text-shadow: none !important; +} +.liste_titre td a { + text-shadow: none !important; + color: #; +} +div.liste_titre { + padding-left: 3px; +} +tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel, form.liste_titre_sel div +{ + font-family: ; + font-weight: normal; + border-bottom: 1px solid #FDFFFF; + text-decoration: underline; + text-shadow: 1px 0px 1px #; +} +input.liste_titre { + background: transparent; + border: 0px; +} + +.noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total { + background: #F0F0F0; +} +.noborder tr.liste_total td, tr.liste_total td, form.liste_total div { + border-top: 1px solid #DDDDDD; + color: #332266; + font-weight: normal; + white-space: nowrap; +} + + +.tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair { + background: none; +} + +.margintable td { + border: 0px !important; +} + +/* Disable shadows */ +.noshadow { + -moz-box-shadow: 0px 0px 0px #DDD !important; + -webkit-box-shadow: 0px 0px 0px #DDD !important; + box-shadow: 0px 0px 0px #DDD !important; +} + +div.tabBar .noborder { + -moz-box-shadow: 0px 0px 0px #DDD !important; + -webkit-box-shadow: 0px 0px 0px #DDD !important; + box-shadow: 0px 0px 0px #DDD !important; +} + + +/* + * Boxes + */ + +.tdboxstats { + + background: -o-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; + background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; + background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; + background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; + background: linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; + + background: #ffffff !important; + +} + +.boxstats { + + margin: 3px; + padding: 3px; + /*-moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; + margin-bottom: 8px !important;*/ + border: 1px solid #AAA; + text-align: center; + border-radius: 5px; +} + +.boxtable { + -moz-box-shadow: 3px 3px 4px #DDD; + -webkit-box-shadow: 3px 3px 4px #DDD; + box-shadow: 3px 3px 4px #DDD; + margin-bottom: 8px !important; +} + + +.box { + padding-right: 0px; + padding-left: 0px; + padding-bottom: 4px; +} + +tr.box_titre { + height: 26px !important; + background: rgb(); + background-repeat: repeat-x; + + /* + background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); + background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); + background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); + background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); + background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); + background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) ); + */ + + color: #; + text-shadow: 1px 0px 1px #; + font-family: , sans-serif; + font-weight: bold; + border-bottom: 1px solid #FDFFFF; + white-space: nowrap; +} + +tr.box_titre td.boxclose { + width: 30px; +} + +tr.box_impair { + + background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + + background: #eaeaea; + + font-family: ; +} + +tr.box_pair { + + background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); + background: linear-gradient(bottom, rgb() 85%, rgb() 100%); + + background: #ffffff; + + font-family: ; +} + +.formboxfilter { + vertical-align: middle; + margin-bottom: 6px; +} +.formboxfilter input[type=image] +{ + top: 5px; + position: relative; +} + + + + + + +/* + * Ok, Warning, Error + */ +.ok { color: #114466; } +.warning { color: #887711; } +.error { color: #550000 !important; font-weight: bold; } + +div.ok { + color: #114466; +} + +div.warning { + color: #302020; + padding: 0.3em 0.3em 0.3em 0.3em; + margin: 0.5em 0em 0.5em 0em; + border: 1px solid #e0d0b0; + -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; + background: #EFDF9A; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +} + +div.error { + color: #550000; font-weight: bold; + padding: 0.3em 0.3em 0.3em 0.3em; + margin: 0.5em 0em 0.5em 0em; + border: 1px solid #DC9CAB; + -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius: 6px; + background: #EFCFCF; +} + +/* Info admin */ +div.info { + color: #302010; + padding: 0.4em 0.4em 0.4em 0.4em; + margin: 0.5em 0em 0.5em 0em; + border: 1px solid #DFBF9A; + -moz-border-radius:6px; + -webkit-border-radius: 6px; + border-radius:6px; + background: #EFCFAA; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); +} + + +/* + * Liens Payes/Non payes + */ + +a.normal:link { font-weight: normal } +a.normal:visited { font-weight: normal } +a.normal:active { font-weight: normal } +a.normal:hover { font-weight: normal } + +a.impayee:link { font-weight: bold; color: #550000; } +a.impayee:visited { font-weight: bold; color: #550000; } +a.impayee:active { font-weight: bold; color: #550000; } +a.impayee:hover { font-weight: bold; color: #550000; } + + + +/* + * Other + */ + +.product_line_stock_ok { color: #002200; } +.product_line_stock_too_low { color: #664400; } + +.fieldrequired { font-weight: bold; color: #000055; } + +.dolgraphtitle { margin-top: 6px; margin-bottom: 4px; } +.dolgraphtitlecssboxes { margin: 0px; } +.legendColorBox, .legendLabel { border: none !important; } +div.dolgraph div.legend, div.dolgraph div.legend div { background-color: rgba(255,255,255,0) !important; } +div.dolgraph div.legend table tbody tr { height: auto; } + +.photo { + border: 0px; +} +.photowithmargin { + margin-bottom: 2px; + margin-top: 2px; +} + +.logo_setup +{ + content:url(); +} + +div.titre { + font-family: ; + font-weight: bold; + color: rgb(); + text-decoration: none; + text-shadow: 1px 1px 2px #FFFFFF; + dol_optimize_smallscreen)?'':'margin-top: 4px;'); ?> +} + +#dolpaymenttable { width: 600px; font-size: 13px; } +#tablepublicpayment { border: 1px solid #CCCCCC !important; width: 100%; } +#tablepublicpayment .CTableRow1 { background-color: #F0F0F0 !important; } +#tablepublicpayment tr.liste_total { border-bottom: 1px solid #CCCCCC !important; } +#tablepublicpayment tr.liste_total td { border-top: none; } + +#divsubscribe { width: 700px; } +#tablesubscribe { width: 100%; } + + +/* + * Effect Postit + */ +.effectpostit +{ + position: relative; +} +.effectpostit:before, .effectpostit:after +{ + z-index: -1; + position: absolute; + content: ""; + bottom: 15px; + left: 10px; + width: 50%; + top: 80%; + max-width:300px; + background: #777; + -webkit-box-shadow: 0 15px 10px #777; + -moz-box-shadow: 0 15px 10px #777; + box-shadow: 0 15px 10px #777; + -webkit-transform: rotate(-3deg); + -moz-transform: rotate(-3deg); + -o-transform: rotate(-3deg); + -ms-transform: rotate(-3deg); + transform: rotate(-3deg); +} +.effectpostit:after +{ + -webkit-transform: rotate(3deg); + -moz-transform: rotate(3deg); + -o-transform: rotate(3deg); + -ms-transform: rotate(3deg); + transform: rotate(3deg); + right: 10px; + left: auto; +} + + + +/* ============================================================================== */ +/* Formulaire confirmation (When Ajax JQuery is used) */ +/* ============================================================================== */ + +.ui-dialog-titlebar { +} +.ui-dialog-content { + font-size: px !important; +} + +/* ============================================================================== */ +/* Formulaire confirmation (When HTML is used) */ +/* ============================================================================== */ + +table.valid { + border-top: solid 1px #E6E6E6; + border-: solid 1px #E6E6E6; + border-: solid 1px #444444; + border-bottom: solid 1px #555555; + padding-top: 0px; + padding-left: 0px; + padding-right: 0px; + padding-bottom: 0px; + margin: 0px 0px; + background: #D5BAA8; +} + +.validtitre { + background: #D5BAA8; + font-weight: bold; +} + + +/* ============================================================================== */ +/* Tooltips */ +/* ============================================================================== */ + +#tooltip { +position: absolute; +width: px; +border-top: solid 1px #BBBBBB; +border-: solid 1px #BBBBBB; +border-: solid 1px #444444; +border-bottom: solid 1px #444444; +padding: 2px; +z-index: 3000; +background-color: #EFCFAA; +opacity: 1; +-moz-border-radius:6px; +-webkit-border-radius: 6px; +border-radius: 6px; +} +#tiptip_content { + background-color: rgb(252,248,246); + background-color: rgba(252,248,246,0.95); +} + +/* ============================================================================== */ +/* Calendar */ +/* ============================================================================== */ + +img.datecallink { padding-left: 2px !important; padding-right: 2px !important; } + +.ui-datepicker-trigger { + vertical-align: middle; + cursor: pointer; +} + +.bodyline { + -moz-border-radius: 8px; + -webkit-border-radius: 8px; + border-radius: 8px; + border: 1px #E4ECEC outset; + padding: 0px; + margin-bottom: 5px; +} +table.dp { + width: 180px; + background-color: #FFFFFF; + border-top: solid 2px #DDDDDD; + border-: solid 2px #DDDDDD; + border-: solid 1px #222222; + border-bottom: solid 1px #222222; + padding: 0px; + border-spacing: 0px; + border-collapse: collapse; +} +.dp td, .tpHour td, .tpMinute td{padding:2px; font-size:10px;} +/* Barre titre */ +.dpHead,.tpHead,.tpHour td:Hover .tpHead{ + font-weight:bold; + background-color:#b3c5cc; + color:white; + font-size:11px; + cursor:auto; +} +/* Barre navigation */ +.dpButtons,.tpButtons { + text-align:center; + background-color:#617389; + color:#FFFFFF; + font-weight:bold; + cursor:pointer; +} +.dpButtons:Active,.tpButtons:Active{border: 1px outset black;} +.dpDayNames td,.dpExplanation {background-color:#D9DBE1; font-weight:bold; text-align:center; font-size:11px;} +.dpExplanation{ font-weight:normal; font-size:11px;} +.dpWeek td{text-align:center} + +.dpToday,.dpReg,.dpSelected{ + cursor:pointer; +} +.dpToday{font-weight:bold; color:black; background-color:#DDDDDD;} +.dpReg:Hover,.dpToday:Hover{background-color:black;color:white} + +/* Jour courant */ +.dpSelected{background-color:#0B63A2;color:white;font-weight:bold; } + +.tpHour{border-top:1px solid #DDDDDD; border-right:1px solid #DDDDDD;} +.tpHour td {border-left:1px solid #DDDDDD; border-bottom:1px solid #DDDDDD; cursor:pointer;} +.tpHour td:Hover {background-color:black;color:white;} + +.tpMinute {margin-top:5px;} +.tpMinute td:Hover {background-color:black; color:white; } +.tpMinute td {background-color:#D9DBE1; text-align:center; cursor:pointer;} + +/* Bouton X fermer */ +.dpInvisibleButtons +{ + border-style:none; + background-color:transparent; + padding:0px; + font-size:9px; + border-width:0px; + color:#0B63A2; + vertical-align:middle; + cursor: pointer; +} + + +/* ============================================================================== */ +/* Afficher/cacher */ +/* ============================================================================== */ + +div.visible { + display: block; +} + +div.hidden { + display: none; +} + +tr.visible { + display: block; +} + +td.hidden { + display: none; +} + + +/* ============================================================================== */ +/* Module agenda */ +/* ============================================================================== */ + +table.cal_month { border-spacing: 0px; } +.cal_current_month { border-top: 0; border-left: solid 1px #E0E0E0; border-right: 0; border-bottom: solid 1px #E0E0E0; } +.cal_current_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B; border-right: 0; border-bottom: solid 1px #E0E0E0; } +.cal_current_month_oneday { border-right: solid 1px #E0E0E0; } +.cal_other_month { border-top: 0; border-left: solid 1px #C0C0C0; border-right: 0; border-bottom: solid 1px #C0C0C0; } +.cal_other_month_peruserleft { border-top: 0; border-left: solid 3px #6C7C7B !important; border-right: 0; } +.cal_current_month_right { border-right: solid 1px #E0E0E0; } +.cal_other_month_right { border-right: solid 1px #C0C0C0; } +.cal_other_month { opacity: 0.6; background: #EAEAEA; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } +.cal_past_month { opacity: 0.6; background: #EEEEEE; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } +.cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } +.cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 3px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } +.cal_today { background: #FDFDF0; border-left: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } +.cal_today_peruser { background: #FDFDF0; border-right: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } +.cal_today_peruser_peruserleft { background: #FDFDF0; border-left: solid 3px #6C7C7B; border-right: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } +.cal_past { } +.cal_peruser { padding: 0px; } +.peruser_busy { background: #CC8888; } +.peruser_notbusy { background: #EEDDDD; opacity: 0.5; } +table.cal_event { border: none; border-collapse: collapse; margin-bottom: 1px; -webkit-border-radius: 6px; border-radius: 6px; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25); + moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.25); + background: -webkit-gradient(linear, left top, left bottom, from(#006aac), to(#00438d)); + min-height: 20px; + } +table.cal_event td { border: none; padding-: 2px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } +ul.cal_event { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -moz-padding-start: 0px; -webkit-padding-start: 0px; } +li.cal_event { border: none; list-style-type: none; } +.cal_event a:link { color: #111111; font-size: 11px; font-weight: normal !important; } +.cal_event a:visited { color: #111111; font-size: 11px; font-weight: normal !important; } +.cal_event a:active { color: #111111; font-size: 11px; font-weight: normal !important; } +.cal_event a:hover { color: #111111; font-size: 11px; font-weight: normal !important; color:rgba(255,255,255,.75); } +.cal_event_busy { } +.cal_peruserviewname { max-width: 100px; height: 22px; } + +.topmenuimage { + background-size: 28px auto; +} + +/* ============================================================================== */ +/* Ajax - Liste deroulante de l'autocompletion */ +/* ============================================================================== */ + +.ui-widget-content { border: solid 1px rgba(0,0,0,.3); background: #fff !important; } + +.ui-autocomplete-loading { background: white url() right center no-repeat; } +.ui-autocomplete { + position:absolute; + width:auto; + font-size: 1.0em; + background-color:white; + border:1px solid #888; + margin:0px; +/* padding:0px; This make combo crazy */ + } +.ui-autocomplete ul { + list-style-type:none; + margin:0px; + padding:0px; + } +.ui-autocomplete ul li.selected { background-color: #D3E5EC;} +.ui-autocomplete ul li { + list-style-type:none; + display:block; + margin:0; + padding:2px; + height:18px; + cursor:pointer; + } + +/* ============================================================================== */ +/* jQuery - jeditable */ +/* ============================================================================== */ + +.editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete { + background: url() right top no-repeat; + cursor: pointer; +} + +.editkey_datepicker { + background: url() right center no-repeat; + cursor: pointer; +} + +.editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover { + background: white; + cursor: pointer; +} + +.viewval_textarea.active:hover, .viewval_ckeditor.active:hover, .viewval_string.active:hover, .viewval_email.active:hover, .viewval_numeric.active:hover, .viewval_select.active:hover, .viewval_autocomplete.active:hover, .viewval_datepicker.active:hover { + background: white; + cursor: pointer; +} + +.viewval_hover { + background: white; +} + + +/* ============================================================================== */ +/* Admin Menu */ +/* ============================================================================== */ + +/* CSS for treeview */ +.treeview ul { background-color: transparent !important; margin-top: 0; } +.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 20px; } +.treeview .hover { color: black !important; } + + + +/* ============================================================================== */ +/* Show Excel tabs */ +/* ============================================================================== */ + +.table_data +{ + border-style:ridge; + border:1px solid; +} +.tab_base +{ + background:#C5D0DD; + font-weight:bold; + border-style:ridge; + border: 1px solid; + cursor:pointer; +} +.table_sub_heading +{ + background:#CCCCCC; + font-weight:bold; + border-style:ridge; + border: 1px solid; +} +.table_body +{ + background:#F0F0F0; + font-weight:normal; + font-family:sans-serif; + border-style:ridge; + border: 1px solid; + border-spacing: 0px; + border-collapse: collapse; +} +.tab_loaded +{ + background:#222222; + color:white; + font-weight:bold; + border-style:groove; + border: 1px solid; + cursor:pointer; +} + + +/* ============================================================================== */ +/* CSS for color picker */ +/* ============================================================================== */ + +A.color, A.color:active, A.color:visited { + position : relative; + display : block; + text-decoration : none; + width : 10px; + height : 10px; + line-height : 10px; + margin : 0px; + padding : 0px; + border : 1px inset white; +} +A.color:hover { + border : 1px outset white; +} +A.none, A.none:active, A.none:visited, A.none:hover { + position : relative; + display : block; + text-decoration : none; + width : 10px; + height : 10px; + line-height : 10px; + margin : 0px; + padding : 0px; + cursor : default; + border : 1px solid #b3c5cc; +} +.tblColor { + display : none; +} +.tdColor { + padding : 1px; +} +.tblContainer { + background-color : #b3c5cc; +} +.tblGlobal { + position : absolute; + top : 0px; + left : 0px; + display : none; + background-color : #b3c5cc; + border : 2px outset; +} +.tdContainer { + padding : 5px; +} +.tdDisplay { + width : 50%; + height : 20px; + line-height : 20px; + border : 1px outset white; +} +.tdDisplayTxt { + width : 50%; + height : 24px; + line-height : 12px; + font-family : ; + font-size : 8pt; + color : black; + text-align : center; +} +.btnColor { + width : 100%; + font-family : ; + font-size : 10pt; + padding : 0px; + margin : 0px; +} +.btnPalette { + width : 100%; + font-family : ; + font-size : 8pt; + padding : 0px; + margin : 0px; +} + + +/* Style to overwrites JQuery styles */ +.ui-menu .ui-menu-item a { + text-decoration:none; + display:block; + padding:.2em .4em; + line-height:1.5; + zoom:1; + font-weight: normal; + font-family:; + font-size:1em; +} +.ui-widget { + font-family:; + font-size:px; +} +.ui-button { margin-left: -2px; browser->name)?'padding-top: 1px;':''); ?> } +.ui-button-icon-only .ui-button-text { height: 8px; } +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: 2px 0px 6px 0px; } +.ui-button-text +{ + line-height: 1em !important; +} +.ui-autocomplete-input { margin: 0; padding: 4px; } + + +/* ============================================================================== */ +/* CKEditor */ +/* ============================================================================== */ + +.cke_editable +{ + margin: 5px !important; +} +.cke_editor table, .cke_editor tr, .cke_editor td +{ + border: 0px solid #FF0000 !important; +} +span.cke_skin_kama { padding: 0 !important; } +.cke_wrapper { padding: 4px !important; } +a.cke_dialog_ui_button +{ + font-family: !important; + background-image: url() !important; + background-position: bottom !important; + border: 1px solid #C0C0C0 !important; + -moz-border-radius:0px 5px 0px 5px !important; + -webkit-border-radius:0px 5px 0px 5px !important; + border-radius:0px 5px 0px 5px !important; + -moz-box-shadow: 3px 3px 4px #DDD !important; + -webkit-box-shadow: 3px 3px 4px #DDD !important; + box-shadow: 3px 3px 4px #DDD !important; +} +.cke_dialog_ui_hbox_last +{ + vertical-align: bottom ! important; +} +.cke_editable +{ + line-height: 1.4 !important; + margin: 6px !important; +} + + +/* ============================================================================== */ +/* File upload */ +/* ============================================================================== */ + +.template-upload { + height: 72px !important; +} + + +/* ============================================================================== */ +/* Holiday */ +/* ============================================================================== */ + +#types .btn { + cursor: pointer; +} + +#types .btn-primary { + font-weight: bold; +} + +#types form { + padding: 20px; +} + +#types label { + display:inline-block; + width:100px; + margin-right: 20px; + padding: 4px; + text-align: right; + vertical-align: top; +} + +#types input.text, #types textarea { + width: 400px; +} + +#types textarea { + height: 100px; +} + + + +/* ============================================================================== */ +/* JSGantt */ +/* ============================================================================== */ + +div.scroll2 { + width: px !important; +} + + +/* ============================================================================== */ +/* jFileTree */ +/* ============================================================================== */ + +.ecmfiletree { + width: 99%; + height: 99%; + background: #FFF; + padding-left: 2px; + font-weight: normal; +} + +.fileview { + width: 99%; + height: 99%; + background: #FFF; + padding-left: 2px; + padding-top: 4px; + font-weight: normal; +} + +div.filedirelem { + position: relative; + display: block; + text-decoration: none; +} + +ul.filedirelem { + padding: 2px; + margin: 0 5px 5px 5px; +} +ul.filedirelem li { + list-style: none; + padding: 2px; + margin: 0 10px 20px 10px; + width: 160px; + height: 120px; + text-align: center; + display: block; + float: ; + border: solid 1px #DDDDDD; +} + +ui-layout-north { + +} + +ul.ecmjqft { + font-size: 11px; + line-height: 16px; + padding: 0px; + margin: 0px; + font-weight: normal; +} + +ul.ecmjqft li { + list-style: none; + padding: 0px; + padding-left: 20px; + margin: 0px; + white-space: nowrap; + display: block; +} + +ul.ecmjqft a { + line-height: 16px; + vertical-align: middle; + color: #333; + padding: 0px 0px; + font-weight:normal; + display: inline-block !important; +/* float: left;*/ +} +ul.ecmjqft a:active { + font-weight: bold !important; +} +ul.ecmjqft a:hover { + text-decoration: underline; +} +div.ecmjqft { + vertical-align: middle; + display: inline-block !important; + text-align: right; + position:absolute; + right:4px; +} + +/* Core Styles */ +.ecmjqft LI.directory { font-weight:normal; background: url() left top no-repeat; } +.ecmjqft LI.expanded { font-weight:normal; background: url() left top no-repeat; } +.ecmjqft LI.wait { font-weight:normal; background: url() left top no-repeat; } + + +/* ============================================================================== */ +/* jNotify */ +/* ============================================================================== */ + +.jnotify-container { + position: fixed !important; +global->MAIN_JQUERY_JNOTIFY_BOTTOM)) { ?> + top: auto !important; + bottom: 4px !important; + + text-align: center; + min-width: px; + width: auto; + padding-left: 10px !important; + padding-right: 10px !important; +} + +/* use or not ? */ +div.jnotify-background { + opacity : 0.95 !important; + -moz-box-shadow: 3px 3px 4px #888 !important; + -webkit-box-shadow: 3px 3px 4px #888 !important; + box-shadow: 3px 3px 4px #888 !important; +} + +/* ============================================================================== */ +/* blockUI */ +/* ============================================================================== */ + +/*div.growlUI { background: url(check48.png) no-repeat 10px 10px }*/ +div.dolEventValid h1, div.dolEventValid h2 { + color: #567b1b; + background-color: #e3f0db; + padding: 5px 5px 5px 5px; + text-align: left; +} +div.dolEventError h1, div.dolEventError h2 { + color: #a72947; + background-color: #d79eac; + padding: 5px 5px 5px 5px; + text-align: left; +} + +/* ============================================================================== */ +/* Maps */ +/* ============================================================================== */ + +.divmap, #google-visualization-geomap-embed-0, #google-visualization-geomap-embed-1, google-visualization-geomap-embed-2 { + -moz-box-shadow: 0px 0px 10px #AAA; + -webkit-box-shadow: 0px 0px 10px #AAA; + box-shadow: 0px 0px 10px #AAA; +} + + +/* ============================================================================== */ +/* Datatable */ +/* ============================================================================== */ + +.sorting_asc { background: url('') no-repeat center right; } +.sorting_desc { background: url('') no-repeat center right; } +.sorting_asc_disabled { background: url('') no-repeat center right; } +.sorting_desc_disabled { background: url('') no-repeat center right; } +.paginate_disabled_previous:hover, .paginate_enabled_previous:hover, .paginate_disabled_next:hover, .paginate_enabled_next:hover +{ + font-weight: normal; +} +.paginate_enabled_previous:hover, .paginate_enabled_next:hover +{ + text-decoration: underline !important; +} + +/* For jquery plugin combobox */ +/* Disable this. It breaks wrapping of boxes +.ui-corner-all { white-space: nowrap; } */ + +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled, .paginate_button_disabled { + opacity: .35; + filter: Alpha(Opacity=35); + background-image: none; +} + +/* ============================================================================== */ +/* Select2 */ +/* ============================================================================== */ + +.select2-choice, +.select2-drop.select2-drop-above.select2-drop-active, +.select2-container-active .select2-choice, +.select2-container-active .select2-choices, +.select2-dropdown-open.select2-drop-above .select2-choice, +.select2-dropdown-open.select2-drop-above .select2-choices, +.select2-container-multi.select2-container-active .select2-choices +{ + border: 1px solid #aaa; +} +.select2-disabled +{ + color: #888; +} +.select2-drop-active +{ + border: 1px solid #aaa; + border-top: none; +} +a span.select2-chosen +{ + font-weight: normal !important; +} +.select2-container .select2-choice { + background-image: none; +} +.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit +{ + background: #FFFFFF; +} + + +/* ============================================================================== */ +/* JMobile */ +/* ============================================================================== */ + +li.ui-li-divider .ui-link { + color: #FFF !important; +} +.ui-btn { + margin: 0.1em 2px +} +a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-inner:hover { + text-decoration: none !important; +} + +.ui-btn-inner { + min-width: .4em; + padding-left: 10px; + padding-right: 10px; + + font-size: 13px; + + font-size: px; + + /* white-space: normal; */ /* Warning, enable this break the truncate feature */ +} +.ui-btn-icon-right .ui-btn-inner { + padding-right: 34px; +} +.ui-btn-icon-left .ui-btn-inner { + padding-left: 34px; +} +.ui-select .ui-btn-icon-right .ui-btn-inner { + padding-right: 38px; +} +.ui-select .ui-btn-icon-left .ui-btn-inner { + padding-left: 38px; +} +.fiche .ui-controlgroup { + margin: 0px; + padding-bottom: 0px; +} +div.ui-controlgroup-controls div.tabsElem +{ + margin-top: 2px; +} +div.ui-controlgroup-controls div.tabsElem a +{ + -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.2); + -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.2); + box-shadow: 0 -3px 6px rgba(0,0,0,.2); +} +div.ui-controlgroup-controls div.tabsElem a#active { + -moz-box-shadow: 0 -3px 6px rgba(0,0,0,.3); + -webkit-box-shadow: 0 -3px 6px rgba(0,0,0,.3); + box-shadow: 0 -3px 6px rgba(0,0,0,.3); +} + +a.tab span.ui-btn-inner +{ + border: none; + padding: 0; +} + +.ui-link { + color: rgb(); +} +.liste_titre .ui-link { + color: # !important; +} + +a.ui-link { + word-wrap: break-word; +} + +/* force wrap possible onto field overflow does not works */ +.formdoc .ui-btn-inner +{ + white-space: normal; + overflow: hidden; + text-overflow: hidden; +} + +/* Warning: setting this may make screen not beeing refreshed after a combo selection */ +/*.ui-body-c { + background: #fff; +}*/ + +div.ui-radio, div.ui-checkbox +{ + display: inline-block; + border-bottom: 0px !important; +} +.ui-checkbox input, .ui-radio input { + height: auto; + width: auto; + margin: 4px; + position: static; +} +div.ui-checkbox label+input, div.ui-radio label+input { + position: absolute; +} +.ui-mobile fieldset +{ + padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important; +} + +ul.ulmenu { + border-radius: 0; + -webkit-border-radius: 0; +} + +.ui-field-contain label.ui-input-text { + vertical-align: middle !important; +} +.ui-mobile fieldset { + border-bottom: none !important; +} + +/* Style for first level menu with jmobile */ +.ui-bar-b, .lilevel0 { + border: 1px solid #5f5f7a !important; + background: rgb(); + background-repeat: repeat-x; + + background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + font-weight: bold; + + color: # !important; +} +.alilevel0 { + color: # !important; + text-shadow: 1px 0px 1px #; +} + +.ui-body-c { + border: 1px solid #ccc; + text-shadow: none; +} +.ui-btn-up-c, .ui-btn-hover-c { + border: 1px solid #ccc; + text-shadow: none; +} +.ui-body-c .ui-link, .ui-body-c .ui-link:visited, .ui-body-c .ui-link:hover { + color: rgb(); +} +.ui-btn-up-c .vsmenudisabled { + color: # !important; + text-shadow: none !important; +} +.ui-controlgroup-horizontal .ui-btn.ui-first-child { +-webkit-border-top-left-radius: 6px; +border-top-left-radius: 6px; +} +.ui-controlgroup-horizontal .ui-btn.ui-last-child { +-webkit-border-top-right-radius: 6px; +border-top-right-radius: 6px; +} +.alilevel1 { + color: # !important; + text-shadow: 1px 0px 1px #; +} +.lilevel1 { + background-image: -webkit-gradient(linear,left top,left bottom,from( #ddd ),to( #d1d1d1 )) !important; + background-image: -webkit-linear-gradient( #ddd,#d1d1d1 ) !important; + background-image: -moz-linear-gradient( #ddd,#d1d1d1 ) !important; + background-image: -ms-linear-gradient( #ddd,#d1d1d1 ) !important; + background-image: -o-linear-gradient( #ddd,#d1d1d1 ) !important; + background-image: linear-gradient( #ddd,#d1d1d1 ) !important; +} +.lilevel2 +{ + padding-left: 22px; +} +.lilevel3 +{ + padding-left: 54px; +} + +close(); diff --git a/htdocs/theme/md_dev/thumb.png b/htdocs/theme/md_dev/thumb.png new file mode 100644 index 0000000000000000000000000000000000000000..6b4c467bead7e991a22ad47a394bd135b8837094 GIT binary patch literal 3839 zcmV|4I3mR z)+{ZAg@q6j28>GX0oqN2+g(*zSvkI!Z@%*sd=Zg(JF{|nm6@ixQC*d?-f&;U`Of&A z6PNtyU;bdN&YnEpwN}>Fms*-uS~SZFt{<%%p@8T)Z3{?7Fp<<9KkcPI$;I8X$&hp2Y%k(3B^o|tgc~GF3XKy>{FrO)y3?xLy`di^c@~GY(I>Ih z;>~qJnRas*=bCHjzxnHL*p>kl{%pG6J0O4fXMg=0Z@=NX&fov@e=N0YfD^}~I2kva zcL{!i9}!xwJDzKgCw?5KP(qj%NgUKYk5QVJ1uZj1O^#nOA?`tMr&e#;jwiM(OF}8< zWfUG{Mc8b78J`t-v9`Ln+HF1B+#65BGK&Wv{uAr0x4(3s>H3WV=AL7G=bK-1Y?DhU zoaf~GfAkl?0Igf5VH;Ev@@a;y7iE#>h0bVE^1LW)3kD}il9s%5Y#54WsW3YT@C)gbQVRaMl@*0V0xBkc&%aYW4B=;h=V)D=bYc5g=?<)+u!=S z>zHcQvPj4u|M_3lJQv&gK@3r9uFG_qBrqBQ;G!&Ru7l5kj%Y;J+06ILl6#(;WqBAy zt_!cxDb)t!spHtTX)#9fqQruL0gv!p2fCw_VnOU$6h)k5wr#=9!Z3={464-e8v@Pd zz8_&njoc96l6P8--~YYu0$`;_GPg!?8_~Xi7gP+4q)JFxmg%~VG&P%rmZgu!Guwux znDB?1o97uq_v5DlGxV;dw z_-&e|Wm$;NG+y^?I5UxU#@k9~Up&CDa9Nf?5Fn^b)4*$h@jTD6EGVLPF#Pxzo4vsV zP=PVYOQaa>IniRxwWan~@7?<7=Nsc$2*ojqoQ6L_l|>1RzLO$o*AXHw%q%hc}JShoDlkmY$-<$bSqgh8*UA}$iwO8&|;=;nvNUyg)91ILYUs+jg zwL6-sDf}5Z$kx`=qR4|NxwX35Y&QAv+e9hi2eb5(otYjFTXq5S;%3iv(=7A6dbiuv zWm%fnGl>=_F|^-oHh@XchbRn#E!T5wXVv$^$z&3zsi~Xm>+7=MWl{)TSQvqNUg1V0 z8wP{s@n7{JT!0>3&-g7?!`|vE+=kb-ZCAQWl30~T1PkIwxe}2VetUYsOTz@0e#BL< z8nO)pCd^2a1fQraz#Z_V_V`Z-*wLLoAZZ-_?GJwhFI`(~!Z`JM{k7NcFD-V|Dv0m| zzeuq{a!MDvX`07VS1D?20--AmLR*YgE&%_+J@^%6x*|TXs8CHQSPmAnY@5!V9ZDI; z)%qf&lQAWwZnpAVY{ca~5IzVaQugTVZ)$7bmoY3i&gGU|2qiA=M9f=t7LIFkIFcNV&>R%?E=lAnpoaU4}<(=<=QN0!Mg@9yr-K^TR|6d*!t zYirZ#bmj-h#f_#%vNYb<+=iDM$eF@}8Dc>r%ysO=#YO08w?BOUzaIAc1CS+v7IeRO z-XtwD)2-#scfR>mgOLPOJc%hPyUwySg}4raxK^k1`4-LLeiHDZGp1P*4=md>%r=Uv z@6WI)+y`E!oKATGK{2YNm&uh&-xGh8&3gx)vU?Awnr6wVo=m=q9m{H|kD&{+fl}Xtd z{5dbQjqToO8VJTHdkooTXi_{LP6tk{O|Lq9JL*C>NXYB2-1^1FZk*-300uD$6Gc$& zh?|HkW~Ceqik3j5{E(q@)#A@Xzo{y=%CPUf_wIN!&~@kbowc+eZ{B}hapwL0;K5Hn z7!C)NF-|~Lb2Ma0nt(TyyxiKKXv|cA$w?%KHSXy3c``u;uo2fbfA_oJ`teU53?~8J z!cC#ww9ptYyqX<_sb%YFR)XTXUM-FzKjBHn=L`<%?Znc>m{9;eGp>$P0<<+3xEfsJ z!}s5f%VIW*Y;+pXiWpH5$EhW0T!{IuVO#cFZ@sCMd#3JD{Lp4ReE28~#{Hqc*y+6b z>b)C@c8K@iAAPj5zk_O`!&A-^;&@ampFcs2Dc#xL4x)&u{ziJa$Q)99r7YC|sV`wJ z{8L>!I!8fTj|!o>Pz68|13#$Mz42%QstJbM>2$6S7&7#GJy0%5q~-v8UQNP6v)OEE zX=$FG&i9k;t@jD9N%o^cwAUt8rFZ=6RMouC4lNd#T5uivWXGZ#hNe|``I5n2?H`K|_7A%x~C3!e#C z5Yhm~D;qTy&Vt5bCz5pSJixy1i=n^4{G<>GD$5oZ7GUUWdiCz^F4R zx7(cqaIvu9Dm#VpIukHlT5?ZYRHCEJ)GXnIh4Uf~lV+!06<+1r7gPcDty<@bfbkju z3@9rrE0+Pr0!63eRDes{5~O;o)F_wtj7Gb$$ygz({rQ-e-0}lj1n;5B}j_gD@?NTyQ=ym7>yY z6gD2*4@F+=EmY3=IWk~|g0T>omju*-6w1rjDilbSY z6;YJnhhTw07>TK}JYl|C^Q)Ela6Cg^DDvENT%z-<0|pM{pJfU7MzSyE^xp1Xv)L%6`@tE-69$s%BfOt?rdgd4XSt-toa?5!HNJ*RCrRx4VL0>8jWZ2>XAzaSzfAuwOu!p!mIZ^bDNI#~E}c4wmJ>gbAW9M_&Rw1$<3D8GsJcI6ZKO7-$v7 zqXR6s+aHF$|MoZDX7t)~g(BPB?UOQtV>K3*MrrSIz)6-5M&SIZtcr&tcz*1_RK31V zC&$H+CtY4>4tm@0z=;?(kT?v#^2UAi64$XOI_LepeH22%%f`ZTFWtTbFr09AzyITZ ze|L9pfUPZqg-I?RPcaQtR|?uwkcLZVQ9kf5sQu>_6E2TnOr1Ek`Of#gty8$h;c=80 zAtIEn?ZZqwK%yG^f^a%lKa8Ayu?6wvY&K2O9GL~qtRDZ#axSJ8No>2dR-;~?uMjZ+ zh!fj!Zg!@5_FnVEFq#-7m5b*Oh}&vTz}4Zpd`=5nFhe&kLjtWXEG$UM@j?NM$I#+* zyEmEz2_>KL(xV_2C!lJSLC6&g$KlkP(Yv>oY|FUuIqvfTMhx%u`v3Oe{hhr5quexT z6lXA*DL84NQ>0xp4r8z8=4rAw$MkSuUj56aS%2{{oTSCUG_eiZs_AM92NES7ULv|M93@XTc5dBX zMXpkhv#6Q&#YdZ`8uVg1-SNDxX*!<+z*#x=(>NGsu@9J*Y2}61^7@^{uTWhWB=E;s zu7RAC^4JlDbY*$zMA}Q!UcV1u^4L*Vq^e#&H0F3bGEJ*2Bg1gP)n0VcBHAR(KH3;& zvxAPES+mHMG;RWfNWD zlgFD&D_wE)&X{_T59!+VyeiqElaJy=vN53m^{`9zSdc7un(uFW-m+=BFCK7~ Date: Sun, 22 Mar 2015 18:17:25 +0100 Subject: [PATCH 167/412] Method colorStringToArray can accept the # Method monthArray can return short label of month --- htdocs/core/class/html.formother.class.php | 2 +- htdocs/core/lib/date.lib.php | 25 +++++++++++++++++++--- htdocs/core/lib/functions2.lib.php | 2 +- htdocs/main.inc.php | 4 ++-- htdocs/societe/consumption.php | 2 +- htdocs/user/class/user.class.php | 13 ++++++----- 6 files changed, 33 insertions(+), 15 deletions(-) diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php index 4ea60dbf2c1..786d2c53a34 100644 --- a/htdocs/core/class/html.formother.class.php +++ b/htdocs/core/class/html.formother.class.php @@ -782,7 +782,7 @@ class FormOther require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; - $montharray = monthArray($langs); // Get array + $montharray = monthArray($langs, 1); // Get array $select_month = ''; print ''; -print ''; // date +print ''; // date print $formother->select_month($month?$month:-1,'month',1); $formother->select_year($year?$year:-1,'year',1, 20, 1); print ''; diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index e8f3487a32c..9ffa762afd1 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1793,13 +1793,13 @@ class User extends CommonObject $label = '' . $langs->trans("User") . ''; $label.= '

    '; - $label .= '' . $langs->trans('Name') . ': ' . $this->getFullName($langs,'',''); + $label.= '' . $langs->trans('Name') . ': ' . $this->getFullName($langs,'',''); if (! empty($this->login)) - $label .= '
    ' . $langs->trans('Login') . ': ' . $this->login; + $label.= '
    ' . $langs->trans('Login') . ': ' . $this->login; if (! empty($this->email)) - $label .= '
    ' . $langs->trans("EMail").': '.$this->email; + $label.= '
    ' . $langs->trans("EMail").': '.$this->email; if (! empty($this->admin)) - $label .= '
    ' . $langs->trans("Administrator").': '.yn($this->admin); + $label.= '
    ' . $langs->trans("Administrator").': '.yn($this->admin); if (! empty($this->societe_id)) { $thirdpartystatic = new Societe($db); $thirdpartystatic->fetch($this->societe_id); @@ -1807,11 +1807,10 @@ class User extends CommonObject $company=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')'; } $type=($this->societe_id?$langs->trans("External").$company:$langs->trans("Internal")); - $label .= '
    ' . $langs->trans("Type") . ': ' . $type; + $label.= '
    ' . $langs->trans("Type") . ': ' . $type; if (! empty($this->photo)) { - $label.= '
    '; - //if (! is_object($form)) $form = new Form($db); + $label.= '
    '; $label.= Form::showphoto('userphoto', $this, 80); } $label.= '
    '; From d678b554e0037309ae3f69917c504083bf6a5bd4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 18:39:05 +0100 Subject: [PATCH 168/412] Fix css --- htdocs/societe/notify/card.php | 1 + htdocs/theme/md_dev/style.css.php | 33 +++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php index f8594a545ea..2e63d243526 100644 --- a/htdocs/societe/notify/card.php +++ b/htdocs/societe/notify/card.php @@ -262,6 +262,7 @@ if ($result > 0) foreach($conf->global as $key => $val) { if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue; + $var = ! $var; print ''; $listtmp=explode(',',$val); $first=1; diff --git a/htdocs/theme/md_dev/style.css.php b/htdocs/theme/md_dev/style.css.php index 4dc84c90792..4d3e0937e4d 100644 --- a/htdocs/theme/md_dev/style.css.php +++ b/htdocs/theme/md_dev/style.css.php @@ -734,7 +734,7 @@ div.tmenuleft dol_optimize_smallscreen)) { ?> width: 5px; height: px; - background: url() 0 -6px no-repeat; + /* background: url() 0 -6px no-repeat; */ } div.tmenucenter @@ -1512,6 +1512,13 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { text-decoration: none; white-space: nowrap; + /*border-bottom: none; + border-right: 1px solid #CCCCCC; + border-left: 1px solid #D0D0D0; + border-top: 1px solid #D8D8D8; + */ + + /* -moz-border-radius:6px 6px 0px 0px; -webkit-border-radius:6px 6px 0px 0px; border-radius:6px 6px 0px 0px; @@ -1520,11 +1527,6 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { -webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1); box-shadow: 0 -1px 4px rgba(0,0,0,.1); - border-bottom: none; - border-right: 1px solid #CCCCCC; - border-left: 1px solid #D0D0D0; - border-top: 1px solid #D8D8D8; - background: rgb(); /*background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); @@ -1533,10 +1535,23 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%); background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%);*/ + */ background-image: none !important; } -.tabactive { +.tabactive, a.tab#active { + border-right: 1px solid #CCCCCC; + border-left: 1px solid #D0D0D0; + border-top: 1px solid #D8D8D8; + + -moz-border-radius:6px 6px 0px 0px; + -webkit-border-radius:6px 6px 0px 0px; + border-radius:6px 6px 0px 0px; + + -moz-box-shadow: 0 -1px 4px rgba(0,0,0,.1); + -webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1); + box-shadow: 0 -1px 4px rgba(0,0,0,.1); + background: rgb() !important; /* border-bottom: 1px solid rgb() !important; @@ -1549,8 +1564,10 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { } a.tab:hover { + /* background: rgba(, 0.5) url() 50% 0 repeat-x; - color: #; + color: #;*/ + text-decoration: underline; } a.tab:link, a.tab:visited { From 221d44a4b8cd03544d11242f9dd942bd9da79000 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 18:54:12 +0100 Subject: [PATCH 169/412] br at wrong place --- htdocs/fourn/card.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php index c88dae2e8f3..40d51c89b90 100644 --- a/htdocs/fourn/card.php +++ b/htdocs/fourn/card.php @@ -305,6 +305,8 @@ if ($object->id > 0) print '    '.$langs->trans("ShowSupplierPreview").''; print ''; print ''; + print '
    '; + /* * List of products @@ -361,8 +363,6 @@ if ($object->id > 0) } - print '
    '; - /* * Last orders */ @@ -370,8 +370,6 @@ if ($object->id > 0) if ($user->rights->fournisseur->commande->lire) { - - // TODO move to DAO class // Check if there are supplier orders billable $sql2 = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,'; From ad0f1aae6bc1eaff3f0d8f660735e590fac5e8c4 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 22 Mar 2015 20:19:22 +0100 Subject: [PATCH 170/412] Move loan in htdocs --- htdocs/core/lib/loan.lib.php | 6 +++--- htdocs/core/menus/init_menu_auguria.sql | 8 ++++---- htdocs/core/menus/standard/eldy.lib.php | 8 ++++---- htdocs/{compta => }/loan/calc.php | 2 +- htdocs/{compta => }/loan/card.php | 16 ++++++++-------- htdocs/{compta => }/loan/class/index.html | 0 htdocs/{compta => }/loan/class/loan.class.php | 4 ++-- .../loan/class/paymentloan.class.php | 6 +++--- htdocs/{compta => }/loan/document.php | 6 +++--- htdocs/{compta => }/loan/index.html | 0 htdocs/{compta => }/loan/index.php | 6 +++--- htdocs/{compta => }/loan/info.php | 6 +++--- htdocs/{compta => }/loan/payment/card.php | 16 +++++++--------- htdocs/{compta => }/loan/payment/index.html | 0 htdocs/{compta => }/loan/payment/payment.php | 14 +++++++------- 15 files changed, 48 insertions(+), 50 deletions(-) rename htdocs/{compta => }/loan/calc.php (99%) rename htdocs/{compta => }/loan/card.php (94%) rename htdocs/{compta => }/loan/class/index.html (100%) rename htdocs/{compta => }/loan/class/loan.class.php (99%) rename htdocs/{compta => }/loan/class/paymentloan.class.php (98%) rename htdocs/{compta => }/loan/document.php (96%) rename htdocs/{compta => }/loan/index.html (100%) rename htdocs/{compta => }/loan/index.php (97%) rename htdocs/{compta => }/loan/info.php (91%) rename htdocs/{compta => }/loan/payment/card.php (92%) rename htdocs/{compta => }/loan/payment/index.html (100%) rename htdocs/{compta => }/loan/payment/payment.php (95%) diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php index 58ebaef7bfd..323516bbbd6 100644 --- a/htdocs/core/lib/loan.lib.php +++ b/htdocs/core/lib/loan.lib.php @@ -35,7 +35,7 @@ function loan_prepare_head($object) $h = 0; $head = array(); - $head[$h][0] = DOL_URL_ROOT.'/compta/loan/card.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/loan/card.php?id='.$object->id; $head[$h][1] = $langs->trans('Card'); $head[$h][2] = 'card'; $h++; @@ -49,13 +49,13 @@ function loan_prepare_head($object) require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; $upload_dir = $conf->loan->dir_output . "/" . dol_sanitizeFileName($object->ref); $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview\.png)$')); - $head[$h][0] = DOL_URL_ROOT.'/compta/loan/document.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id; $head[$h][1] = $langs->trans("Documents"); if($nbFiles > 0) $head[$h][1].= ' ('.$nbFiles.')'; $head[$h][2] = 'documents'; $h++; - $head[$h][0] = DOL_URL_ROOT.'/compta/loan/info.php?id='.$object->id; + $head[$h][0] = DOL_URL_ROOT.'/loan/info.php?id='.$object->id; $head[$h][1] = $langs->trans("Info"); $head[$h][2] = 'info'; $h++; diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql index a2d77f611f0..c385eaab4bf 100644 --- a/htdocs/core/menus/init_menu_auguria.sql +++ b/htdocs/core/menus/init_menu_auguria.sql @@ -181,10 +181,10 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled', __HANDLER__, 'left', 2210__+MAX_llx_menu__, 'accountancy', 'tax_sal', 2200__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary&mainmenu=accountancy', 'Salaries', 1, 'salaries', '$user->rights->salaries->read', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2211__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/card.php?leftmenu=tax_salary&action=create', 'NewPayment', 2, 'companies', '$user->rights->salaries->write', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2212__+MAX_llx_menu__, 'accountancy', '', 2210__+MAX_llx_menu__, '/compta/salaries/index.php?leftmenu=tax_salary', 'Payments', 2, 'companies', '$user->rights->salaries->read', '', 0, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled', __HANDLER__, 'left', 2220__+MAX_llx_menu__, 'accountancy', 'tax_loan', 2200__+MAX_llx_menu__, '/compta/loan/index.php?leftmenu=tax_loan&mainmenu=accountancy', 'Loans', 1, 'loan', '$user->rights->loan->read', '', 0, 1, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2221__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/compta/loan/card.php?leftmenu=tax_loan&action=create', 'NewLoan', 2, 'loan', '$user->rights->loan->write', '', 0, 2, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2222__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/compta/loan/index.php?leftmenu=tax_loan', 'Payments', 2, 'companies', '$user->rights->loan->read', '', 0, 3, __ENTITY__); -insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2223__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/compta/loan/calc.php?leftmenu=tax_loan', 'Calculator', 2, 'companies', '$user->rights->loan->calc', '', 0, 4, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled', __HANDLER__, 'left', 2220__+MAX_llx_menu__, 'accountancy', 'tax_loan', 2200__+MAX_llx_menu__, '/loan/index.php?leftmenu=tax_loan&mainmenu=accountancy', 'Loans', 1, 'loan', '$user->rights->loan->read', '', 0, 1, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2221__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/loan/card.php?leftmenu=tax_loan&action=create', 'NewLoan', 2, 'loan', '$user->rights->loan->write', '', 0, 2, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2222__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/loan/index.php?leftmenu=tax_loan', 'Payments', 2, 'companies', '$user->rights->loan->read', '', 0, 3, __ENTITY__); +insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2223__+MAX_llx_menu__, 'accountancy', '', 2220__+MAX_llx_menu__, '/loan/calc.php?leftmenu=tax_loan', 'Calculator', 2, 'companies', '$user->rights->loan->calc', '', 0, 4, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled', __HANDLER__, 'left', 2250__+MAX_llx_menu__, 'accountancy', 'tax_social', 2200__+MAX_llx_menu__, '/compta/sociales/index.php?leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2251__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/sociales/charges.php?leftmenu=tax_social&action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__); insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'accountancy', '', 2250__+MAX_llx_menu__, '/compta/charges/index.php?leftmenu=tax_social&mainmenu=accountancy&mode=sconly', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__); diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 13781f0f8b4..0b8e30c746a 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -815,10 +815,10 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu if (! empty($conf->loan->enabled)) { $langs->load("loan"); - $newmenu->add("/compta/loan/index.php?leftmenu=tax_loan&mainmenu=accountancy",$langs->trans("Loans"),1,$user->rights->loan->read, '', $mainmenu, 'tax_loan'); - if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/card.php?leftmenu=tax_loan&action=create",$langs->trans("NewLoan"),2,$user->rights->loan->write); - if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/index.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read); - if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/compta/loan/calc.php?leftmenu=tax_loan",$langs->trans("Calculator"),2,$user->rights->loan->calc); + $newmenu->add("/loan/index.php?leftmenu=tax_loan&mainmenu=accountancy",$langs->trans("Loans"),1,$user->rights->loan->read, '', $mainmenu, 'tax_loan'); + if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create",$langs->trans("NewLoan"),2,$user->rights->loan->write); + if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/loan/index.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read); + if (empty($leftmenu) || preg_match('/^tax_loan/i',$leftmenu)) $newmenu->add("/loan/calc.php?leftmenu=tax_loan",$langs->trans("Calculator"),2,$user->rights->loan->calc); } // Social contributions diff --git a/htdocs/compta/loan/calc.php b/htdocs/loan/calc.php similarity index 99% rename from htdocs/compta/loan/calc.php rename to htdocs/loan/calc.php index 009c61095c9..0b40ef38f70 100644 --- a/htdocs/compta/loan/calc.php +++ b/htdocs/loan/calc.php @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -require '../../main.inc.php'; +require '../main.inc.php'; $langs->load("loan"); diff --git a/htdocs/compta/loan/card.php b/htdocs/loan/card.php similarity index 94% rename from htdocs/compta/loan/card.php rename to htdocs/loan/card.php index 88a4429e7c5..6a62ffe09ea 100644 --- a/htdocs/compta/loan/card.php +++ b/htdocs/loan/card.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/compta/loan/card.php + * \file htdocs/loan/card.php * \ingroup loan * \brief Loan card */ -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; @@ -416,7 +416,7 @@ if ($id > 0) $objp = $db->fetch_object($resql); $var=!$var; print ""; - print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''; + print ''.img_object($langs->trans("Payment"),"payment").' '.$objp->rowid.''; print ''.dol_print_date($db->jdate($objp->dp),'day')."\n"; print "".$objp->paiement_type.' '.$objp->num_payment."\n"; print ''.price($objp->amount_insurance)." ".$langs->trans("Currency".$conf->currency)."\n"; @@ -457,25 +457,25 @@ if ($id > 0) // Edit if ($user->rights->loan->write) { - print "id&action=edit\">".$langs->trans("Modify").""; + print "id&action=edit\">".$langs->trans("Modify").""; } // Emit payment if ($object->paid == 0 && ((price2num($object->capital) > 0 && round($staytopay) < 0) || (price2num($object->capital) > 0 && round($staytopay) > 0)) && $user->rights->loan->write) { - print "id&action=create\">".$langs->trans("DoPayment").""; + print "id&action=create\">".$langs->trans("DoPayment").""; } // Classify 'paid' if ($object->paid == 0 && round($staytopay) <=0 && $user->rights->loan->write) { - print "id&action=paid\">".$langs->trans("ClassifyPaid").""; + print "id&action=paid\">".$langs->trans("ClassifyPaid").""; } // Delete if ($user->rights->loan->delete) { - print "id&action=delete\">".$langs->trans("Delete").""; + print "id&action=delete\">".$langs->trans("Delete").""; } print ""; diff --git a/htdocs/compta/loan/class/index.html b/htdocs/loan/class/index.html similarity index 100% rename from htdocs/compta/loan/class/index.html rename to htdocs/loan/class/index.html diff --git a/htdocs/compta/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php similarity index 99% rename from htdocs/compta/loan/class/loan.class.php rename to htdocs/loan/class/loan.class.php index b8fcf04728f..d1b770f744c 100644 --- a/htdocs/compta/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/compta/loan/class/loan.class.php + * \file htdocs/loan/class/loan.class.php * \ingroup loan * \brief Class for loan module */ @@ -386,7 +386,7 @@ class Loan extends CommonObject $result=''; - $link = ''; + $link = ''; $linkend=''; if ($withpicto) $result.=($link.img_object($langs->trans("ShowLoan").': '.$this->label,'bill').$linkend.' '); diff --git a/htdocs/compta/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php similarity index 98% rename from htdocs/compta/loan/class/paymentloan.class.php rename to htdocs/loan/class/paymentloan.class.php index 944cfe4ce2f..bb94a86d945 100644 --- a/htdocs/compta/loan/class/paymentloan.class.php +++ b/htdocs/loan/class/paymentloan.class.php @@ -16,7 +16,7 @@ */ /** - * \file htdocs/compta/loan/class/paymentloan.class.php + * \file htdocs/loan/class/paymentloan.class.php * \ingroup facture * \brief File of class to manage payment of loans */ @@ -429,7 +429,7 @@ class PaymentLoan extends CommonObject // Add link 'payment_loan' in bank_url between payment and bank transaction $url=''; - if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/compta/loan/payment/card.php?id='; + if ($mode == 'payment_loan') $url=DOL_URL_ROOT.'/loan/payment/card.php?id='; if ($url) { $result=$acc->add_url_line($bank_line_id, $this->id, $url, '(payment)', $mode); @@ -448,7 +448,7 @@ class PaymentLoan extends CommonObject { $loan = new Loan($this->db); $loan->fetch($key); - $result=$acc->add_url_line($bank_line_id, $loan->id, DOL_URL_ROOT.'/compta/loan/card.php?id=', $loan->type_libelle.(($loan->lib && $loan->lib!=$loan->type_libelle)?' ('.$loan->lib.')':''),'loan'); + $result=$acc->add_url_line($bank_line_id, $loan->id, DOL_URL_ROOT.'/loan/card.php?id=', $loan->type_libelle.(($loan->lib && $loan->lib!=$loan->type_libelle)?' ('.$loan->lib.')':''),'loan'); if ($result <= 0) dol_print_error($this->db); } } diff --git a/htdocs/compta/loan/document.php b/htdocs/loan/document.php similarity index 96% rename from htdocs/compta/loan/document.php rename to htdocs/loan/document.php index b263fa1687d..788048a215b 100644 --- a/htdocs/compta/loan/document.php +++ b/htdocs/loan/document.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/compta/loan/document.php + * \file htdocs/loan/document.php * \ingroup loan * \brief Page with attached files on loan */ -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; diff --git a/htdocs/compta/loan/index.html b/htdocs/loan/index.html similarity index 100% rename from htdocs/compta/loan/index.html rename to htdocs/loan/index.html diff --git a/htdocs/compta/loan/index.php b/htdocs/loan/index.php similarity index 97% rename from htdocs/compta/loan/index.php rename to htdocs/loan/index.php index 720b52de0a1..db6e9544cee 100644 --- a/htdocs/compta/loan/index.php +++ b/htdocs/loan/index.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/compta/loan/index.php + * \file htdocs/loan/index.php * \ingroup loan * \brief Page to list all loans */ -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'; $langs->load("loan"); $langs->load("compta"); diff --git a/htdocs/compta/loan/info.php b/htdocs/loan/info.php similarity index 91% rename from htdocs/compta/loan/info.php rename to htdocs/loan/info.php index 74319ba40b8..5e90474642a 100644 --- a/htdocs/compta/loan/info.php +++ b/htdocs/loan/info.php @@ -16,13 +16,13 @@ */ /** - * \file htdocs/compta/loan/info.php + * \file htdocs/loan/info.php * \ingroup loan * \brief Page with info about loan */ -require '../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; diff --git a/htdocs/compta/loan/payment/card.php b/htdocs/loan/payment/card.php similarity index 92% rename from htdocs/compta/loan/payment/card.php rename to htdocs/loan/payment/card.php index 4dc1407e8ad..901daffaa2d 100644 --- a/htdocs/compta/loan/payment/card.php +++ b/htdocs/loan/payment/card.php @@ -16,16 +16,14 @@ */ /** - * \file htdocs/compta/loan/payment/card.php + * \file htdocs/loan/payment/card.php * \ingroup loan * \brief Payment's card of loan */ -require '../../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/paymentloan.class.php'; -// require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; -// require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php'; +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'; +require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php'; if (! empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load('bills'); @@ -62,7 +60,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->del if ($result > 0) { $db->commit(); - header("Location: ".DOL_URL_ROOT."/compta/loan/index.php"); + header("Location: ".DOL_URL_ROOT."/loan/index.php"); exit; } else @@ -122,7 +120,7 @@ $form = new Form($db); $h=0; -$head[$h][0] = DOL_URL_ROOT.'/compta/loan/payment/card.php?id='.$_GET["id"]; +$head[$h][0] = DOL_URL_ROOT.'/loan/payment/card.php?id='.$_GET["id"]; $head[$h][1] = $langs->trans("Card"); $hselected = $h; $h++; @@ -205,7 +203,7 @@ $sql.= ' WHERE pl.fk_loan = l.rowid'; $sql.= ' AND l.entity = '.$conf->entity; $sql.= ' AND pl.rowid = '.$payment->id; -dol_syslog("compta/loan/payment/card.php", LOG_DEBUG); +dol_syslog("loan/payment/card.php", LOG_DEBUG); $resql=$db->query($sql); if ($resql) { diff --git a/htdocs/compta/loan/payment/index.html b/htdocs/loan/payment/index.html similarity index 100% rename from htdocs/compta/loan/payment/index.html rename to htdocs/loan/payment/index.html diff --git a/htdocs/compta/loan/payment/payment.php b/htdocs/loan/payment/payment.php similarity index 95% rename from htdocs/compta/loan/payment/payment.php rename to htdocs/loan/payment/payment.php index 678ca1b8429..9a087d60633 100644 --- a/htdocs/compta/loan/payment/payment.php +++ b/htdocs/loan/payment/payment.php @@ -16,14 +16,14 @@ */ /** - * \file htdocs/compta/loan/payment.php + * \file htdocs/loan/payment/payment.php * \ingroup Loan * \brief Page to add payment of a loan */ -require '../../../main.inc.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/loan.class.php'; -require_once DOL_DOCUMENT_ROOT.'/compta/loan/class/paymentloan.class.php'; +require '../../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php'; +require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; $langs->load("bills"); @@ -50,7 +50,7 @@ if ($action == 'add_payment') if ($cancel) { - $loc = DOL_URL_ROOT.'/compta/loan/card.php?id='.$chid; + $loc = DOL_URL_ROOT.'/loan/card.php?id='.$chid; header("Location: ".$loc); exit; } @@ -132,7 +132,7 @@ if ($action == 'add_payment') if (! $error) { $db->commit(); - $loc = DOL_URL_ROOT.'/compta/loan/card.php?id='.$chid; + $loc = DOL_URL_ROOT.'/loan/card.php?id='.$chid; header('Location: '.$loc); exit; } @@ -183,7 +183,7 @@ if ($_GET["action"] == 'create') print ''.$langs->trans("Loan").''; - print ''.$langs->trans("Ref").''.$chid.''; + print ''.$langs->trans("Ref").''.$chid.''; print ''.$langs->trans("DateStart").''.dol_print_date($loan->datestart,'day')."\n"; print ''.$langs->trans("Label").''.$loan->label."\n"; print ''.$langs->trans("Amount").''.price($loan->capital,0,$outputlangs,1,-1,-1,$conf->currency).''; From 730593b525c491fd6f1c889a5e7a4c1d95c61e38 Mon Sep 17 00:00:00 2001 From: BENKE Charles Date: Sun, 22 Mar 2015 20:26:20 +0100 Subject: [PATCH 171/412] Update extrafields.class.php if no elementtype send at the function, they return an empty array --- htdocs/core/class/extrafields.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index c821f6a1f34..94772eac79a 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -567,10 +567,12 @@ class ExtraFields { global $conf; + if ( empty($elementtype) ) return array(); + if ($elementtype == 'thirdparty') $elementtype='societe'; $array_name_label=array(); - + // For avoid conflicts with external modules if (!$forceload && !empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return $array_name_label; From c4d852ffd73e3fa6af264aaf6a254ab3a80f1cfb Mon Sep 17 00:00:00 2001 From: aspangaro Date: Sun, 22 Mar 2015 20:57:41 +0100 Subject: [PATCH 172/412] Correct from frederic34 --- htdocs/langs/en_US/loan.lang | 1 + htdocs/loan/calc.php | 33 +++++++++++++++----------------- htdocs/loan/class/loan.class.php | 26 ++++++++++++++++++------- htdocs/loan/index.php | 13 +++++++------ htdocs/loan/info.php | 25 ++++++++++++++---------- htdocs/loan/payment/card.php | 21 ++++++++------------ 6 files changed, 65 insertions(+), 54 deletions(-) diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang index a035c8cf68c..4922c0fc0a1 100644 --- a/htdocs/langs/en_US/loan.lang +++ b/htdocs/langs/en_US/loan.lang @@ -20,6 +20,7 @@ ErrorLoanInterest=Annual interest has to be numeric and g # Calc Totalsforyear=Totals for year MonthlyPayment=Monthly Payment +LoanCalcDesc=This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.
    This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    # Admin ConfigLoan=Configuration of the module loan LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default diff --git a/htdocs/loan/calc.php b/htdocs/loan/calc.php index 0b40ef38f70..0a5ee21923a 100644 --- a/htdocs/loan/calc.php +++ b/htdocs/loan/calc.php @@ -121,10 +121,7 @@ if (! empty($errors)) { llxHeader(); -echo "This mortgage calculator can be used to figure out monthly payments of a home mortgage loan, - based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate. - This calculator factors in PMI (Private Mortgage Insurance) for loans where less than 20% is put as a down payment. Also taken - into consideration are the town property taxes, and their effect on the total monthly mortgage payment.
    "; +print $langs->trans('LoanCalcDesc'); print '
    '; print ''; @@ -190,7 +187,7 @@ if ($form_complete && $monthly_payment) print 'Monthly Payment:'; print '' . number_format($monthly_payment, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '
    (Principal & Interest ONLY)'; print ''; - + if ($down_percent < 20) { $pmi_per_month = 55 * ($financing_price / 100000); @@ -216,11 +213,11 @@ if ($form_complete && $monthly_payment) print ' '; print ''; print '
    '; - + $assessed_price = ($sale_price * .85); $residential_yearly_tax = ($assessed_price / 1000) * 14; $residential_monthly_tax = $residential_yearly_tax / 12; - + if ($pmi_per_month) { $pmi_text = "PMI and "; @@ -304,8 +301,8 @@ if ($form_complete && $show_progress) { print ''; print ''; print '
    '; - - + + // Set some base variables $principal = $financing_price; $current_month = 1; @@ -315,11 +312,11 @@ if ($form_complete && $show_progress) { $power = -($month_term); $denom = pow((1 + $monthly_interest_rate), $power); $monthly_payment = $principal * ($monthly_interest_rate / (1 - $denom)); - - print "

    Amortization For Monthly Payment: " . number_format($monthly_payment, "2", ".", ",") . " over " . $year_term . " years
    \n"); - + + print "

    Amortization For Monthly Payment: " . number_format($monthly_payment, "2", ".", ",") . " over " . $year_term . " years
    \n"; + print ''; - + // This LEGEND will get reprinted every 12 months $legend = ''; $legend.= ''; @@ -327,7 +324,7 @@ if ($form_complete && $show_progress) { $legend.= ''; $legend.= ''; $legend.= ''; - + print $legend; // Loop through and get the current month's payments for @@ -348,14 +345,14 @@ if ($form_complete && $show_progress) { print ''; print ''; print ''; - + ($current_month % 12) ? $show_legend = FALSE : $show_legend = TRUE; if ($show_legend) { print ''; print ''; print ''; - + $total_spent_this_year = $this_year_interest_paid + $this_year_principal_paid; print ''; print ''; @@ -369,11 +366,11 @@ if ($form_complete && $show_progress) { print ''; print ''; print ''; - + $current_year++; $this_year_interest_paid = 0; $this_year_principal_paid = 0; - + if (($current_month + 6) < $month_term) { echo $legend; diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php index d1b770f744c..9ab8a690494 100644 --- a/htdocs/loan/class/loan.class.php +++ b/htdocs/loan/class/loan.class.php @@ -69,7 +69,7 @@ class Loan extends CommonObject * Load object in memory from database * * @param int $id id object - * @return void + * @return int <0 error , >=0 no error */ function fetch($id) { @@ -146,8 +146,8 @@ class Loan extends CommonObject if (($conf->accounting->enabled) && empty($this->account_capital) && empty($this->account_insurance) && empty($this->account_interest)) { $this->error="ErrorAccountingParameter"; - return -2; - } + return -2; + } $this->db->begin(); @@ -304,8 +304,12 @@ class Loan extends CommonObject $sql.= " paid = 1"; $sql.= " WHERE rowid = ".$this->id; $return = $this->db->query($sql); - if ($return) return 1; - else return -1; + if ($return) { + return 1; + } else { + $this->error=$this->db->lasterror(); + return -1; + } } /** @@ -423,7 +427,8 @@ class Loan extends CommonObject } else { - return -1; + $this->error=$this->db->lasterror(); + return -1; } } @@ -464,12 +469,19 @@ class Loan extends CommonObject $this->date_creation = $this->db->jdate($obj->datec); if (empty($obj->fk_user_modif)) $obj->tms = ""; $this->date_modification = $this->db->jdate($obj->tms); + + return 1; + } + else + { + return 0; } $this->db->free($result); } else { - dol_print_error($this->db); + $this->error=$this->db->lasterror(); + return -1; } } } \ No newline at end of file diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php index db6e9544cee..082e5d0d0c2 100644 --- a/htdocs/loan/index.php +++ b/htdocs/loan/index.php @@ -50,7 +50,8 @@ $search_label=GETPOST('search_label','alpha'); $search_amount=GETPOST('search_amount','alpha'); $filtre=GETPOST("filtre"); -if (GETPOST("button_removefilter")) +// Purge search criteria +if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter")) // Both test are required to be compatible with all browsers { $search_ref=""; $search_label=""; @@ -112,11 +113,11 @@ if ($resql) print ''; print ''; print ''; - + while ($i < min($num,$limit)) { $obj = $db->fetch_object($resql); - + $var = !$var; print ""; @@ -135,7 +136,7 @@ if ($resql) print ''; print "\n"; - + $i++; } @@ -147,6 +148,6 @@ else { dol_print_error($db); } -$db->close(); - llxFooter(); + +$db->close(); \ No newline at end of file diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php index 5e90474642a..16c349b92e9 100644 --- a/htdocs/loan/info.php +++ b/htdocs/loan/info.php @@ -46,20 +46,25 @@ $result = restrictedArea($user, 'loan', $id, '',''); $help_url='EN:Module_Loan|FR:Module_Emprunt'; llxHeader("",$langs->trans("Loan"),$help_url); -$loan = new Loan($db); -$loan->fetch($id); -$loan->info($id); +if ($id > 0) { + $loan = new Loan($db); + $loan->fetch($id); + $loan->info($id); -$head = loan_prepare_head($loan); + $head = loan_prepare_head($loan); -dol_fiche_head($head, 'info', $langs->trans("Loan"), 0, 'bill'); + dol_fiche_head($head, 'info', $langs->trans("Loan"), 0, 'bill'); + print '
    ' . $langs->trans("Month") . '' . $langs->trans("Capital") . '' . $langs->trans("Position") . '
    ' . number_format($principal_paid, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '' . number_format($remaining_balance, "2", ".", ",") . ' ' . $langs->trans("Currency".$conf->currency) . '
    ' . $langs->trans("Totalsforyear") . ' ' . $current_year . '
     
     
    '.$loan_static->LibStatut($obj->paid,5,$obj->alreadypayed).'
    '; + dol_print_object_info($loan); + print '
    '; -print '
    '; -dol_print_object_info($loan); -print '
    '; - -print ''; + print ''; +} +else +{ + // $id ? +} llxFooter(); diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php index 901daffaa2d..f75a2244154 100644 --- a/htdocs/loan/payment/card.php +++ b/htdocs/loan/payment/card.php @@ -133,7 +133,6 @@ dol_fiche_head($head, $hselected, $langs->trans("PaymentLoan"), 0, 'payment'); if ($action == 'delete') { print $form->formconfirm('card.php?id='.$payment->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete','',0,2); - } /* @@ -142,8 +141,7 @@ if ($action == 'delete') if ($action == 'valide') { $facid = $_GET['facid']; - print $form->formconfirm('card.php?id='.$payment->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2); - + print $form->formconfirm('card.php?id='.$payment->id.'&facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2); } @@ -283,18 +281,15 @@ if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) } */ -if ($_GET['action'] == '') +if (empty($action) && ! empty($user->rights->loan->delete)) { - if ($user->rights->loan->delete) + if (! $disable_delete) { - if (! $disable_delete) - { - print ''.$langs->trans('Delete').''; - } - else - { - print ''.$langs->trans('Delete').''; - } + print ''.$langs->trans('Delete').''; + } + else + { + print ''.$langs->trans('Delete').''; } } From 1a1959b52c4f05ae46692fa19d8aa1241249bf4a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 Mar 2015 21:18:25 +0100 Subject: [PATCH 173/412] Fix: Solve conflict with imgup and imgdown class use for sort fields and to drag and drop lines. --- htdocs/core/lib/functions.lib.php | 12 +-- htdocs/core/tpl/ajaxrow.tpl.php | 8 +- htdocs/core/tpl/objectline_view.tpl.php | 4 +- htdocs/public/test/test_arrays.php | 110 +++++++++++++----------- htdocs/theme/eldy/style.css.php | 16 +++- htdocs/theme/md_dev/style.css.php | 14 +++ 6 files changed, 99 insertions(+), 65 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index d2ce8023a65..cb3752f817c 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2280,15 +2280,16 @@ function img_previous($titlealt = 'default') * * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param int $selected Selected + * @param string $moreclass Add more CSS classes * @return string Return img tag */ -function img_down($titlealt = 'default', $selected = 0) +function img_down($titlealt = 'default', $selected = 0, $moreclass='') { global $conf, $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Down'); - return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown"'); + return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass?" ".$moreclass:"").'"'); } /** @@ -2296,15 +2297,16 @@ function img_down($titlealt = 'default', $selected = 0) * * @param string $titlealt Text on alt and title of image. Alt only if param notitle is set to 1. If text is "TextA:TextB", use Text A on alt and Text B on title. * @param int $selected Selected + * @param string $moreclass Add more CSS classes * @return string Return img tag */ -function img_up($titlealt = 'default', $selected = 0) +function img_up($titlealt = 'default', $selected = 0, $moreclass='') { global $conf, $langs; if ($titlealt == 'default') $titlealt = $langs->trans('Up'); - return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup"'); + return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass?" ".$moreclass:"").'"'); } /** @@ -2622,7 +2624,7 @@ function print_liste_field_titre($name, $file="", $field="", $begin="", $morepar * Get title line of an array * * @param string $name Label of field - * @param int $thead 0=To use with standard table forat, 1=To use inside , 2=To use with
    + * @param int $thead 0=To use with standard table format, 1=To use inside , 2=To use with
    * @param string $file Url used when we click on sort picto * @param string $field Field to use for new sorting. Empty if this field is not sortable. * @param string $begin ("" by defaut) diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php index 27b14d859f3..4b8d82bce40 100644 --- a/htdocs/core/tpl/ajaxrow.tpl.php +++ b/htdocs/core/tpl/ajaxrow.tpl.php @@ -33,8 +33,8 @@ $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd); if (GETPOST('action') != 'editline' && $nboflines > 1) { ?> diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 1fd86ed871d..8da915ddd9a 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -203,12 +203,12 @@ if (empty($usemargins)) $usemargins=0; 0) { ?> id; ?>"> - + id; ?>"> - + diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php index cae90530d36..ea0791dc984 100644 --- a/htdocs/public/test/test_arrays.php +++ b/htdocs/public/test/test_arrays.php @@ -1,5 +1,5 @@ - - - - - - -Test page - - - - - - -" /> - - - - - --- - - + ?> + + + + + + + Test page + + + + + + + " /> + + + + + + + + - + -
    +
    - This page is a sample of page using tables. It is designed to make test with
    - css (edit page to change to test another css)
    -- jmobile (add parameter dol_use_jmobile=1 to enable view with jmobile)
    +- jmobile (add parameter dol_use_jmobile=1&dol_optimize_smallscreen=1 to enable view with jmobile)
    - dataTables
    - tablednd